419 files changed, 58099 insertions, 62945 deletions

diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 17a8eef1bdb..2b30382f4a4 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -30,13 +30,14 @@ if(WITH_BLENDER)
 	add_subdirectory(interface)
 	add_subdirectory(io)
 	add_subdirectory(lattice)
+	add_subdirectory(manipulator_library)
 	add_subdirectory(mask)
 	add_subdirectory(mesh)
 	add_subdirectory(metaball)
 	add_subdirectory(object)
 	add_subdirectory(physics)
 	add_subdirectory(render)
-	add_subdirectory(screen)
+	add_subdirectory(scene)
 	add_subdirectory(sculpt_paint)
 	add_subdirectory(sound)
 	add_subdirectory(space_action)
@@ -48,20 +49,21 @@ if(WITH_BLENDER)
 	add_subdirectory(space_graph)
 	add_subdirectory(space_image)
 	add_subdirectory(space_info)
-	add_subdirectory(space_logic)
 	add_subdirectory(space_nla)
 	add_subdirectory(space_node)
 	add_subdirectory(space_outliner)
 	add_subdirectory(space_script)
 	add_subdirectory(space_sequencer)
+	add_subdirectory(space_statusbar)
 	add_subdirectory(space_text)
-	add_subdirectory(space_time)
+	add_subdirectory(space_topbar)
 	add_subdirectory(space_userpref)
 	add_subdirectory(space_view3d)
 	add_subdirectory(transform)
 	add_subdirectory(undo)
 	add_subdirectory(util)
 	add_subdirectory(uvedit)
+	add_subdirectory(screen)
 endif()
 
 add_subdirectory(datafiles)
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 1bf1bb2a474..13432e38669 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -23,6 +23,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 304d548b01b..5d5d8f10a88 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -68,6 +68,10 @@
 #include "BKE_nla.h"
 #include "BKE_context.h"
 
+#include "GPU_immediate.h"
+
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 #include "UI_resources.h"
@@ -76,7 +80,6 @@
 #include "ED_keyframing.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -119,11 +122,10 @@ static void acf_generic_root_backdrop(bAnimContext *ac, bAnimListElem *ale, floa
 
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
 
 	/* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */
 	UI_draw_roundbox_corner_set((expanded) ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT));
-	UI_draw_roundbox_gl_mode(GL_POLYGON, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
+	UI_draw_roundbox_3fvAlpha(true, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f);
 }
 
 
@@ -142,12 +144,18 @@ static void acf_generic_dataexpand_backdrop(bAnimContext *ac, bAnimListElem *ale
 	short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
 	float color[3];
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
 
 	/* no rounded corner - just rectangular box */
-	glRectf(offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+	immRectf(pos, offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+
+	immUnbindProgram();
 }
 
 /* helper method to test if group colors should be drawn */
@@ -225,12 +233,18 @@ static void acf_generic_channel_backdrop(bAnimContext *ac, bAnimListElem *ale, f
 	short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
 	float color[3];
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
 
 	/* no rounded corners - just rectangular box */
-	glRectf(offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+	immRectf(pos, offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+
+	immUnbindProgram();
 }
 
 /* Indention + Offset ------------------------------------------- */
@@ -421,14 +435,13 @@ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float ymi
 
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
 
 	/* rounded corners on LHS only
 	 *	- top and bottom
 	 *	- special hack: make the top a bit higher, since we are first...
 	 */
 	UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, 0,  yminc - 2, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
+	UI_draw_roundbox_3fvAlpha(true, 0,  yminc - 2, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f);
 }
 
 /* name for summary entries */
@@ -636,6 +649,8 @@ static int acf_object_icon(bAnimListElem *ale)
 			return ICON_OUTLINER_OB_LATTICE;
 		case OB_SPEAKER:
 			return ICON_OUTLINER_OB_SPEAKER;
+		case OB_LIGHTPROBE:
+			return ICON_OUTLINER_OB_LIGHTPROBE;
 		case OB_ARMATURE:
 			return ICON_OUTLINER_OB_ARMATURE;
 		case OB_FONT:
@@ -814,11 +829,10 @@ static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc
 
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
 
 	/* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */
 	UI_draw_roundbox_corner_set(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT));
-	UI_draw_roundbox_gl_mode(GL_POLYGON, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
+	UI_draw_roundbox_3fvAlpha(true, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8, color, 1.0f);
 }
 
 /* name for group entries */
@@ -1071,11 +1085,10 @@ static void acf_nla_controls_backdrop(bAnimContext *ac, bAnimListElem *ale, floa
 
 	/* set backdrop drawing color */
 	acf->get_backdrop_color(ac, ale, color);
-	glColor3fv(color);
 
 	/* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */
 	UI_draw_roundbox_corner_set(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT));
-	UI_draw_roundbox_gl_mode(GL_POLYGON, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 5);
+	UI_draw_roundbox_3fvAlpha(true, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 5, color, 1.0f);
 }
 
 /* name for nla controls expander entries */
@@ -2018,7 +2031,7 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settin
 
 	switch (setting) {
 		case ACHANNEL_SETTING_EXPAND: /* expanded */
-			return PART_DS_EXPAND;
+			return 0;
 
 		case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */
 			return ADT_NLA_EVAL_OFF;
@@ -2036,22 +2049,18 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settin
 }
 
 /* get pointer to the setting */
-static void *acf_dspart_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings setting, short *type)
+static void *acf_dspart_setting_ptr(bAnimListElem *UNUSED(ale), eAnimChannel_Settings setting, short *type)
 {
-	ParticleSettings *part = (ParticleSettings *)ale->data;
-
 	/* clear extra return data first */
 	*type = 0;
 
 	switch (setting) {
 		case ACHANNEL_SETTING_EXPAND: /* expanded */
-			return GET_ACF_FLAG_PTR(part->flag, type);
+			return NULL;
 
 		case ACHANNEL_SETTING_SELECT: /* selected */
 		case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */
 		case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
-			if (part->adt)
-				return GET_ACF_FLAG_PTR(part->adt->flag, type);
 			return NULL;
 
 		default: /* unsupported */
@@ -3420,14 +3429,10 @@ static void acf_nlaaction_backdrop(bAnimContext *ac, bAnimListElem *ale, float y
 	 */
 	nla_action_get_color(adt, (bAction *)ale->data, color);
 
-	if (adt && (adt->flag & ADT_NLA_EDIT_ON)) {
-		/* Yes, the color vector has 4 components, BUT we only want to be using 3 of them! */
-		glColor3fv(color);
-	}
-	else {
-		float alpha = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3f : 1.0f;
-		glColor4f(color[0], color[1], color[2], alpha);
-	}
+	if (adt && (adt->flag & ADT_NLA_EDIT_ON))
+		color[3] = 1.0f;
+	else
+		color[3] = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3f : 1.0f;
 
 	/* only on top left corner, to show that this channel sits on top of the preceding ones
 	 * while still linking into the action line strip to the right
@@ -3437,7 +3442,7 @@ static void acf_nlaaction_backdrop(bAnimContext *ac, bAnimListElem *ale, float y
 	/* draw slightly shifted up vertically to look like it has more separation from other channels,
 	 * but we then need to slightly shorten it so that it doesn't look like it overlaps
 	 */
-	UI_draw_roundbox_gl_mode(GL_POLYGON, offset,  yminc + NLACHANNEL_SKIP, (float)v2d->cur.xmax, ymaxc + NLACHANNEL_SKIP - 1, 8);
+	UI_draw_roundbox_4fv(true, offset,  yminc + NLACHANNEL_SKIP, (float)v2d->cur.xmax, ymaxc + NLACHANNEL_SKIP - 1, 8, color);
 }
 
 /* name for nla action entries */
@@ -3826,7 +3831,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 		selected = 0;
 
 	/* set blending again, as may not be set in previous step */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
 
 	/* step 1) draw backdrop ...........................................  */
@@ -3861,15 +3866,20 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 			/* for F-Curves, draw color-preview of curve behind checkbox */
 			if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) {
 				FCurve *fcu = (FCurve *)ale->data;
+				unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 				/* F-Curve channels need to have a special 'color code' box drawn, which is colored with whatever
 				 * color the curve has stored
 				 */
-				glColor3fv(fcu->color);
+				immUniformColor3fv(fcu->color);
 
 				/* just a solid color rect
 				 */
-				glRectf(offset, yminc, offset + ICON_WIDTH, ymaxc);
+				immRectf(pos, offset, yminc, offset + ICON_WIDTH, ymaxc);
+
+				immUnbindProgram();
 			}
 			/* icon is drawn as widget now... */
 			if (acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE)) {
@@ -3894,27 +3904,39 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 	if (acf->name && !achannel_is_being_renamed(ac, acf, channel_index)) {
 		const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
 		char name[ANIM_CHAN_NAME_SIZE]; /* hopefully this will be enough! */
+		unsigned char col[4];
 
 		/* set text color */
 		/* XXX: if active, highlight differently? */
+
 		if (selected)
-			UI_ThemeColor(TH_TEXT_HI);
+			UI_GetThemeColor4ubv(TH_TEXT_HI, col);
 		else
-			UI_ThemeColor(TH_TEXT);
+			UI_GetThemeColor4ubv(TH_TEXT, col);
 
 		/* get name */
 		acf->name(ale, name);
 
 		offset += 3;
-		UI_fontstyle_draw_simple(fstyle, offset, ytext, name);
+		UI_fontstyle_draw_simple(fstyle, offset, ytext, name, col);
 
 		/* draw red underline if channel is disabled */
 		if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE) && (ale->flag & FCURVE_DISABLED)) {
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 			/* FIXME: replace hardcoded color here, and check on extents! */
-			glColor3f(1.0f, 0.0f, 0.0f);
-			glLineWidth(2.0);
-			fdrawline((float)(offset), yminc,
-			          (float)(v2d->cur.xmax), yminc);
+			immUniformColor3f(1.0f, 0.0f, 0.0f);
+
+			glLineWidth(2.0f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, (float)offset, yminc);
+			immVertex2f(pos, (float)v2d->cur.xmax, yminc);
+			immEnd();
+
+			immUnbindProgram();
 		}
 	}
 
@@ -3928,10 +3950,13 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 		short draw_sliders = 0;
 		float ymin_ofs = 0.0f;
 		float color[3];
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 		/* get and set backdrop color */
 		acf->get_backdrop_color(ac, ale, color);
-		glColor3fv(color);
+		immUniformColor3fv(color);
 
 		/* check if we need to show the sliders */
 		if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) {
@@ -3989,7 +4014,9 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 		 *	- starts from the point where the first toggle/slider starts,
 		 *	- ends past the space that might be reserved for a scroller
 		 */
-		glRectf(v2d->cur.xmax - (float)offset, yminc + ymin_ofs, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+		immRectf(pos, v2d->cur.xmax - (float)offset, yminc + ymin_ofs, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
+
+		immUnbindProgram();
 	}
 }
 
@@ -4022,6 +4049,15 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
 	if (ale_setting->type == ANIMTYPE_GPLAYER)
 		WM_event_add_notifier(C, NC_GPENCIL | ND_DATA, NULL);
 
+	/* tag copy-on-write flushing (so that the settings will have an effect) */
+	if (ale_setting->id) {
+		DEG_id_tag_update(ale_setting->id, DEG_TAG_COPY_ON_WRITE);
+	}
+	if (ale_setting->adt && ale_setting->adt->action) {
+		/* action is it's own datablock, so has to be tagged specifically... */
+		DEG_id_tag_update(&ale_setting->adt->action->id, DEG_TAG_COPY_ON_WRITE);
+	}
+
 	/* verify animation context */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return;
@@ -4072,6 +4108,7 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
 	AnimData *adt = BKE_animdata_from_id(id);
 	FCurve *fcu = (FCurve *)fcu_poin;
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ReportList *reports = CTX_wm_reports(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
@@ -4097,7 +4134,7 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
 			flag |= INSERTKEY_REPLACE;
 
 		/* insert a keyframe for this F-Curve */
-		done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
+		done = insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
 
 		if (done)
 			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
@@ -4111,6 +4148,7 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi
 	KeyBlock *kb = (KeyBlock *)kb_poin;
 	char *rna_path = BKE_keyblock_curval_rnapath_get(key, kb);
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ReportList *reports = CTX_wm_reports(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
@@ -4141,7 +4179,7 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi
 			flag |= INSERTKEY_REPLACE;
 
 		/* insert a keyframe for this F-Curve */
-		done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
+		done = insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
 
 		if (done)
 			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
@@ -4162,6 +4200,7 @@ static void achannel_setting_slider_nla_curve_cb(bContext *C, void *UNUSED(id_po
 	PropertyRNA *prop;
 	int index;
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ReportList *reports = CTX_wm_reports(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
@@ -4184,7 +4223,7 @@ static void achannel_setting_slider_nla_curve_cb(bContext *C, void *UNUSED(id_po
 			flag |= INSERTKEY_REPLACE;
 
 		/* insert a keyframe for this F-Curve */
-		done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
+		done = insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, ts->keyframe_type, flag);
 
 		if (done)
 			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 1158145ad6b..ebe977420c6 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -50,13 +50,15 @@
 
 #include "BKE_animsys.h"
 #include "BKE_action.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
+#include "BKE_library.h"
 #include "BKE_mask.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_scene.h"
+
+#include "DEG_depsgraph_build.h"
 
 #include "UI_view2d.h"
 
@@ -1747,7 +1749,7 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* send notifier that things have changed */
 	WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-	DAG_relations_tag_update(CTX_data_main(C));
+	DEG_relations_tag_update(CTX_data_main(C));
 
 	return OPERATOR_FINISHED;
 }
@@ -2681,18 +2683,21 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 		}
 		case ANIMTYPE_OBJECT:
 		{
+#if 0
 			bDopeSheet *ads = (bDopeSheet *)ac->data;
 			Scene *sce = (Scene *)ads->source;
+#endif
+			ViewLayer *view_layer = ac->view_layer;
 			Base *base = (Base *)ale->data;
 			Object *ob = base->object;
 			AnimData *adt = ob->adt;
 
 			/* set selection status */
-			if ((ob->restrictflag & OB_RESTRICT_SELECT) == 0) {
+			if (base->flag & BASE_SELECTABLED) {
 				if (selectmode == SELECT_INVERT) {
 					/* swap select */
-					base->flag ^= SELECT;
-					ob->flag = base->flag;
+					ED_object_base_select(base, BA_INVERT);
+					BKE_scene_object_base_flag_sync_from_base(base);
 
 					if (adt) adt->flag ^= ADT_UI_SELECTED;
 				}
@@ -2701,26 +2706,26 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 
 					/* deselect all */
 					/* TODO: should this deselect all other types of channels too? */
-					for (b = sce->base.first; b; b = b->next) {
-						b->flag &= ~SELECT;
-						b->object->flag = b->flag;
+					for (b = view_layer->object_bases.first; b; b = b->next) {
+						ED_object_base_select(b, BA_DESELECT);
+						BKE_scene_object_base_flag_sync_from_base(b);
 						if (b->object->adt) b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE);
 					}
 
 					/* select object now */
-					base->flag |= SELECT;
-					ob->flag |= SELECT;
+					ED_object_base_select(base, BA_SELECT);
+					BKE_scene_object_base_flag_sync_from_base(base);
 					if (adt) adt->flag |= ADT_UI_SELECTED;
 				}
 
 				/* change active object - regardless of whether it is now selected [T37883] */
-				ED_base_object_activate(C, base); /* adds notifier */
+				ED_object_base_activate(C, base); /* adds notifier */
 
 				if ((adt) && (adt->flag & ADT_UI_SELECTED))
 					adt->flag |= ADT_UI_ACTIVE;
 
 				/* ensure we exit editmode on whatever object was active before to avoid getting stuck there - T48747 */
-				if (ob != sce->obedit) {
+				if (ob != CTX_data_edit_object(C)) {
 					ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
 				}
 
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 7eddb3bc3b2..cfdbe87c8a1 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -49,11 +49,12 @@
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "ED_anim_api.h"
@@ -77,7 +78,10 @@ void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
 	adt = BKE_animdata_from_id(id);
 	if (adt) {
 		adt->recalc |= ADT_RECALC_ANIM;
-		DAG_id_tag_update(id, OB_RECALC_TIME);
+		DEG_id_tag_update(id, OB_RECALC_TIME);
+		if (adt->action != NULL) {
+			DEG_id_tag_update(&adt->action->id, DEG_TAG_COPY_ON_WRITE);
+		}
 	}
 
 	/* update data */
@@ -98,7 +102,7 @@ void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
 	else {
 		/* in other case we do standard depsgraph update, ideally
 		 * we'd be calling property update functions here too ... */
-		DAG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
+		DEG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
 	}
 }
 
@@ -114,7 +118,7 @@ void ANIM_id_update(Scene *UNUSED(scene), ID *id)
 			adt->recalc |= ADT_RECALC_ANIM;
 
 		/* set recalc flags */
-		DAG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
+		DEG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
 	}
 }
 
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 3feb14cd0f1..c2cfb877745 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -58,55 +58,76 @@
 
 #include "RNA_access.h"
 
-#include "BIF_gl.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 /* *************************************************** */
 /* CURRENT FRAME DRAWING */
 
 /* Draw current frame number in a little green box beside the current frame indicator */
-static void draw_cfra_number(Scene *scene, View2D *v2d, const float cfra, const bool time)
+void ANIM_draw_cfra_number(const bContext *C, View2D *v2d, short flag)
 {
+	Scene *scene = CTX_data_scene(C);
+	const float time = scene->r.cfra + scene->r.subframe;
+	const float cfra = (float)(time * scene->r.framelen);
+	const bool show_time = (flag & DRAWCFRA_UNIT_SECONDS) != 0;
+
 	const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
-	float xscale, yscale, x, y;
-	char numstr[32] = "    t";  /* t is the character to start replacing from */
+	unsigned char col[4];
+	float color[4];
+	float xscale, x, y;
+	char numstr[32] = "  t  ";  /* t is the character to start replacing from */
+	float hlen;
 	int slen;
 
 	/* because the frame number text is subject to the same scaling as the contents of the view */
-	UI_view2d_scale_get(v2d, &xscale, &yscale);
-	glScalef(1.0f / xscale, 1.0f, 1.0f);
+	UI_view2d_scale_get(v2d, &xscale, NULL);
+	gpuPushMatrix();
+	gpuScale2f(1.0f / xscale, 1.0f);
 
 	/* get timecode string
 	 *	- padding on str-buf passed so that it doesn't sit on the frame indicator
-	 *	- power = 0, gives 'standard' behavior for time
-	 *	  but power = 1 is required for frames (to get integer frames)
 	 */
-	if (time) {
-		BLI_timecode_string_from_time(&numstr[4], sizeof(numstr) - 4, 0, FRA2TIME(cfra), FPS, U.timecode_style);
+	if (show_time) {
+		BLI_timecode_string_from_time(&numstr[2], sizeof(numstr) - 2, 0, FRA2TIME(cfra), FPS, U.timecode_style);
 	}
 	else {
-		BLI_timecode_string_from_time_seconds(&numstr[4], sizeof(numstr) - 4, 1, cfra);
+		BLI_timecode_string_from_time_seconds(&numstr[2], sizeof(numstr) - 2, 1, cfra);
 	}
 
 	slen = UI_fontstyle_string_width(fstyle, numstr) - 1;
+	hlen = slen * 0.5f;
 
 	/* get starting coordinates for drawing */
 	x = cfra * xscale;
-	y = 0.9f * U.widget_unit;
+	y = -0.1f * U.widget_unit;
 
 	/* draw green box around/behind text */
-	UI_ThemeColorShade(TH_CFRAME, 0);
-	glRectf(x, y,  x + slen,  y + 0.75f * U.widget_unit);
-
-	/* draw current frame number - black text */
-	UI_ThemeColor(TH_TEXT);
-	UI_fontstyle_draw_simple(fstyle, x - 0.25f * U.widget_unit, y + 0.15f * U.widget_unit, numstr);
+	UI_GetThemeColor4fv(TH_CFRAME, color);
+	color[3] = 3.0f;
+
+	UI_draw_roundbox_corner_set(UI_CNR_ALL);
+	UI_draw_roundbox_aa(true,
+	                    x - hlen - 0.1f * U.widget_unit,
+	                    y + 3.0f,
+	                    x + hlen + 0.1f * U.widget_unit,
+	                    y -3.0f + U.widget_unit,
+	                    0.1f * U.widget_unit,
+	                    color);
+
+	/* draw current frame number */
+	UI_GetThemeColor4ubv(TH_TEXT_HI, col);
+	UI_fontstyle_draw_simple(fstyle,
+	                         x - hlen - 0.15f * U.widget_unit,
+	                         y        + 0.28f * U.widget_unit,
+	                         numstr, col);
 
 	/* restore view transform */
-	glScalef(xscale, 1.0, 1.0);
+	gpuPopMatrix();
 }
 
 /* General call for drawing current frame indicator in animation editor */
@@ -114,24 +135,24 @@ void ANIM_draw_cfra(const bContext *C, View2D *v2d, short flag)
 {
 	Scene *scene = CTX_data_scene(C);
 
-	/* Draw a light green line to indicate current frame */
-	UI_ThemeColor(TH_CFRAME);
-
 	const float time = scene->r.cfra + scene->r.subframe;
 	const float x = (float)(time * scene->r.framelen);
 
 	glLineWidth((flag & DRAWCFRA_WIDE) ? 3.0 : 2.0);
 
-	glBegin(GL_LINES);
-	glVertex2f(x, v2d->cur.ymin - 500.0f); /* XXX arbitrary... want it go to bottom */
-	glVertex2f(x, v2d->cur.ymax);
-	glEnd();
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	/* Draw current frame number in a little box */
-	if (flag & DRAWCFRA_SHOW_NUMBOX) {
-		UI_view2d_view_orthoSpecial(CTX_wm_region(C), v2d, 1);
-		draw_cfra_number(scene, v2d, x, (flag & DRAWCFRA_UNIT_SECONDS) != 0);
-	}
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	/* Draw a light green line to indicate current frame */
+	immUniformThemeColor(TH_CFRAME);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(pos, x, v2d->cur.ymin - 500.0f); /* XXX arbitrary... want it go to bottom */
+	immVertex2f(pos, x, v2d->cur.ymax);
+	immEnd();
+	immUnbindProgram();
 }
 
 /* *************************************************** */
@@ -145,24 +166,74 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
 
 	/* only draw this if preview range is set */
 	if (PRVRANGEON) {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
-		glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColorShadeAlpha(TH_ANIM_ACTIVE, -25, -30);
+		//immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f); /* XXX: Fix this hardcoded color (anim_active) */
 
 		/* only draw two separate 'curtains' if there's no overlap between them */
 		if (PSFRA < PEFRA + end_frame_width) {
-			glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-			glRectf((float)(PEFRA + end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+			immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
+			immRectf(pos, (float)(PEFRA + end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 		}
 		else {
-			glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+			immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 		}
 
+		immUnbindProgram();
+
 		glDisable(GL_BLEND);
 	}
 }
 
 /* *************************************************** */
+/* SCENE FRAME RANGE */
+
+/* Draw frame range guides (for scene frame range) in background */
+// TODO: Should we still show these when preview range is enabled?
+void ANIM_draw_framerange(Scene *scene, View2D *v2d)
+{
+	/* draw darkened area outside of active timeline frame range */
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShadeAlpha(TH_BACK, -25, -100);
+
+	if (SFRA < EFRA) {
+		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
+		immRectf(pos, (float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+	}
+	else {
+		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+	}
+
+	glDisable(GL_BLEND);
+
+	/* thin lines where the actual frames are */
+	immUniformThemeColorShade(TH_BACK, -60);
+
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, (float)SFRA, v2d->cur.ymin);
+	immVertex2f(pos, (float)SFRA, v2d->cur.ymax);
+
+	immVertex2f(pos, (float)EFRA, v2d->cur.ymin);
+	immVertex2f(pos, (float)EFRA, v2d->cur.ymax);
+
+	immEnd();
+	immUnbindProgram();
+}
+
+/* *************************************************** */
 /* NLA-MAPPING UTILITIES (required for drawing and also editing keyframes)  */
 
 /* Obtain the AnimData block providing NLA-mapping for the given channel (if applicable) */
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index b41302f4706..6f748725790 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -74,6 +74,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_object_types.h"
 #include "DNA_userdef_types.h"
+#include "DNA_layer_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -83,13 +84,14 @@
 #include "BLI_ghash.h"
 #include "BLI_string.h"
 
-#include "BKE_animsys.h"
 #include "BKE_action.h"
-#include "BKE_fcurve.h"
+#include "BKE_animsys.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
+#include "BKE_fcurve.h"
 #include "BKE_global.h"
-#include "BKE_group.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
@@ -130,11 +132,11 @@ static void animedit_get_yscale_factor(bAnimContext *ac)
 /* Note: there's a similar function in key.c (BKE_key_from_object) */
 static Key *actedit_get_shapekeys(bAnimContext *ac)
 {
-	Scene *scene = ac->scene;
+	ViewLayer *view_layer = ac->view_layer;
 	Object *ob;
 	Key *key;
 
-	ob = OBACT;
+	ob = OBACT(view_layer);
 	if (ob == NULL)
 		return NULL;
 
@@ -228,6 +230,7 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction)
 			ac->mode = saction->mode;
 			return true;
 		}
+
 		case SACTCONT_DOPESHEET: /* DopeSheet */
 			/* update scene-pointer (no need to check for pinning yet, as not implemented) */
 			saction->ads.source = (ID *)ac->scene;
@@ -238,6 +241,16 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction)
 			ac->mode = saction->mode;
 			return true;
 
+		case SACTCONT_TIMELINE: /* Timeline */
+			/* update scene-pointer (no need to check for pinning yet, as not implemented) */
+			saction->ads.source = (ID *)ac->scene;
+
+			ac->datatype = ANIMCONT_TIMELINE;
+			ac->data = &saction->ads;
+
+			ac->mode = saction->mode;
+			return true;
+
 		default: /* unhandled yet */
 			ac->datatype = ANIMCONT_NONE;
 			ac->data = NULL;
@@ -378,8 +391,10 @@ bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac)
 	ac->scene = scene;
 	if (scene) {
 		ac->markers = ED_context_get_markers(C);
-		ac->obact = (scene->basact) ?  scene->basact->object : NULL;
 	}
+	ac->depsgraph = CTX_data_depsgraph(C);
+	ac->view_layer = CTX_data_view_layer(C);
+	ac->obact = (ac->view_layer->basact) ? ac->view_layer->basact->object : NULL;
 	ac->sa = sa;
 	ac->ar = ar;
 	ac->sl = sl;
@@ -1671,6 +1686,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi
 
 	if (ads->filterflag & ADS_FILTER_GP_3DONLY) {
 		Scene *scene = (Scene *)ads->source;
+		ViewLayer *view_layer = (ViewLayer *)ac->view_layer;
 		Base *base;
 
 		/* Active scene's GPencil block first - No parent item needed... */
@@ -1679,7 +1695,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi
 		}
 
 		/* Objects in the scene */
-		for (base = scene->base.first; base; base = base->next) {
+		for (base = view_layer->object_bases.first; base; base = base->next) {
 			/* Only consider this object if it has got some GP data (saving on all the other tests) */
 			if (base->object && base->object->gpd) {
 				Object *ob = base->object;
@@ -1695,14 +1711,14 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi
 				 */
 				if ((filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
 					/* layer visibility - we check both object and base, since these may not be in sync yet */
-					if ((scene->lay & (ob->lay | base->lay)) == 0) continue;
+					if ((base->flag & BASE_VISIBLED) == 0) continue;
 
 					/* outliner restrict-flag */
 					if (ob->restrictflag & OB_RESTRICT_VIEW) continue;
 				}
 
 				/* check selection and object type filters */
-				if ( (ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & SELECT) /*|| (base == scene->basact)*/) ) {
+				if ( (ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & BASE_SELECTED) /*|| (base == scene->basact)*/) ) {
 					/* only selected should be shown */
 					continue;
 				}
@@ -1712,7 +1728,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi
 				 *	- used to ease the process of doing multiple-character choreographies
 				 */
 				if (ads->filterflag & ADS_FILTER_ONLYOBGROUP) {
-					if (BKE_group_object_exists(ads->filter_grp, ob) == 0)
+					if (BKE_collection_has_object_recursive(ads->filter_grp, ob) == 0)
 						continue;
 				}
 
@@ -1942,25 +1958,26 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data,
 
 static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
 {
-	SceneRenderLayer *srl;
+	ViewLayer *view_layer;
 	FreestyleLineSet *lineset;
 	size_t items = 0;
 
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
-		for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			if (lineset->linestyle) {
 				lineset->linestyle->id.tag |= LIB_TAG_DOIT;
 			}
 		}
 	}
 
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
 		/* skip render layers without Freestyle enabled */
-		if (!(srl->layflag & SCE_LAY_FRS))
+		if ((view_layer->flag & VIEW_LAYER_FREESTYLE) == 0) {
 			continue;
+		}
 
 		/* loop over linesets defined in the render layer */
-		for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			ListBase tmp_data = {NULL, NULL};
 			size_t tmp_items = 0;
@@ -2045,7 +2062,9 @@ static size_t animdata_filter_ds_texture(bAnimContext *ac, ListBase *anim_data,
 	return items;
 }
 
-/* NOTE: owner_id is either material, lamp, or world block, which is the direct owner of the texture stack in question */
+/* NOTE: owner_id is the direct owner of the texture stack in question
+ *       It used to be Material/Lamp/World before the Blender Internal removal for 2.8
+ */
 static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *owner_id, int filter_mode)
 {
 	MTex **mtex = NULL;
@@ -2057,24 +2076,6 @@ static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase *anim_data,
 		return 0;
 
 	switch (GS(owner_id->name)) {
-		case ID_MA:
-		{
-			Material *ma = (Material *)owner_id;
-			mtex = (MTex **)(&ma->mtex);
-			break;
-		}
-		case ID_LA:
-		{
-			Lamp *la = (Lamp *)owner_id;
-			mtex = (MTex **)(&la->mtex);
-			break;
-		}
-		case ID_WO:
-		{
-			World *wo = (World *)owner_id;
-			mtex = (MTex **)(&wo->mtex);
-			break;
-		}
 		case ID_PA:
 		{
 			ParticleSettings *part = (ParticleSettings *)owner_id;
@@ -2119,10 +2120,6 @@ static size_t animdata_filter_ds_material(bAnimContext *ac, ListBase *anim_data,
 		/* material's animation data */
 		tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID *)ma, filter_mode);
 
-		/* textures */
-		if (!(ads->filterflag & ADS_FILTER_NOTEX))
-			tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, (ID *)ma, filter_mode);
-
 		/* nodes */
 		if ((ma->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE))
 			tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)ma, ma->nodetree, filter_mode);
@@ -2441,10 +2438,6 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
 				/* nodetree */
 				if ((ntree) && !(ads->filterflag & ADS_FILTER_NONTREE))
 					tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, &la->id, ntree, filter_mode);
-
-				/* textures */
-				if (!(ads->filterflag & ADS_FILTER_NOTEX))
-					tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode);
 				break;
 			}
 		}
@@ -2619,7 +2612,7 @@ static size_t animdata_filter_dopesheet_ob(bAnimContext *ac, ListBase *anim_data
 		if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
 			/* check if filtering by selection */
 			// XXX: double-check on this - most of the time, a lot of tools need to filter out these channels!
-			if (ANIMCHANNEL_SELOK((base->flag & SELECT))) {
+			if (ANIMCHANNEL_SELOK((base->flag & BASE_SELECTED))) {
 				/* check if filtering by active status */
 				if (ANIMCHANNEL_ACTIVEOK(ob)) {
 					ANIMCHANNEL_NEW_CHANNEL(base, ANIMTYPE_OBJECT, ob);
@@ -2649,10 +2642,6 @@ static size_t animdata_filter_ds_world(bAnimContext *ac, ListBase *anim_data, bD
 		/* animation data filtering */
 		tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID *)wo, filter_mode);
 
-		/* textures for world */
-		if (!(ads->filterflag & ADS_FILTER_NOTEX))
-			tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, (ID *)wo, filter_mode);
-
 		/* nodes */
 		if ((wo->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE))
 			tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)wo, wo->nodetree, filter_mode);
@@ -2843,7 +2832,7 @@ static size_t animdata_filter_dopesheet_movieclips(bAnimContext *ac, ListBase *a
 }
 
 /* Helper for animdata_filter_dopesheet() - For checking if an object should be included or not */
-static bool animdata_filter_base_is_ok(bDopeSheet *ads, Scene *scene, Base *base, int filter_mode)
+static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_mode)
 {
 	Object *ob = base->object;
 
@@ -2861,7 +2850,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Scene *scene, Base *base
 	 */
 	if ((filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
 		/* layer visibility - we check both object and base, since these may not be in sync yet */
-		if ((scene->lay & (ob->lay | base->lay)) == 0)
+		if ((base->flag & BASE_VISIBLED) == 0)
 			return false;
 
 		/* outliner restrict-flag */
@@ -2896,7 +2885,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Scene *scene, Base *base
 	}
 
 	/* check selection and object type filters */
-	if ((ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & SELECT) /*|| (base == sce->basact)*/)) {
+	if ((ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & BASE_SELECTED) /*|| (base == sce->basact)*/)) {
 		/* only selected should be shown */
 		return false;
 	}
@@ -2906,7 +2895,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Scene *scene, Base *base
 	 *	- used to ease the process of doing multiple-character choreographies
 	 */
 	if (ads->filterflag & ADS_FILTER_ONLYOBGROUP) {
-		if (BKE_group_object_exists(ads->filter_grp, ob) == 0)
+		if (BKE_collection_has_object_recursive(ads->filter_grp, ob) == 0)
 			return false;
 	}
 
@@ -2924,15 +2913,15 @@ static int ds_base_sorting_cmp(const void *base1_ptr, const void *base2_ptr)
 }
 
 /* Get a sorted list of all the bases - for inclusion in dopesheet (when drawing channels) */
-static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, Scene *scene, int filter_mode, size_t *r_usable_bases)
+static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, ViewLayer *view_layer, int filter_mode, size_t *r_usable_bases)
 {
 	/* Create an array with space for all the bases, but only containing the usable ones */
-	size_t tot_bases = BLI_listbase_count(&scene->base);
+	size_t tot_bases = BLI_listbase_count(&view_layer->object_bases);
 	size_t num_bases = 0;
 
 	Base **sorted_bases = MEM_mallocN(sizeof(Base *) * tot_bases, "Dopesheet Usable Sorted Bases");
-	for (Base *base = scene->base.first; base; base = base->next) {
-		if (animdata_filter_base_is_ok(ads, scene, base, filter_mode)) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		if (animdata_filter_base_is_ok(ads, base, filter_mode)) {
 			sorted_bases[num_bases++] = base;
 		}
 	}
@@ -2950,6 +2939,7 @@ static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, Scene *scene, int
 static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, int filter_mode)
 {
 	Scene *scene = (Scene *)ads->source;
+	ViewLayer *view_layer = (ViewLayer *)ac->view_layer;
 	size_t items = 0;
 
 	/* check that we do indeed have a scene */
@@ -2988,14 +2978,14 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
 	 *  - Don't do this if there's just a single object
 	 */
 	if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && !(ads->flag & ADS_FLAG_NO_DB_SORT) &&
-	    (scene->base.first != scene->base.last))
+	    (view_layer->object_bases.first != view_layer->object_bases.last))
 	{
 		/* Filter list of bases (i.e. objects), sort them, then add their contents normally... */
 		// TODO: Cache the old sorted order - if the set of bases hasn't changed, don't re-sort...
 		Base **sorted_bases;
 		size_t num_bases;
 
-		sorted_bases = animdata_filter_ds_sorted_bases(ads, scene, filter_mode, &num_bases);
+		sorted_bases = animdata_filter_ds_sorted_bases(ads, view_layer, filter_mode, &num_bases);
 		if (sorted_bases) {
 			/* Add the necessary channels for these bases... */
 			for (size_t i = 0; i < num_bases; i++) {
@@ -3012,8 +3002,8 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
 		/* Filter and add contents of each base (i.e. object) without them sorting first
 		 * NOTE: This saves performance in cases where order doesn't matter
 		 */
-		for (Base *base = scene->base.first; base; base = base->next) {
-			if (animdata_filter_base_is_ok(ads, scene, base, filter_mode)) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if (animdata_filter_base_is_ok(ads, base, filter_mode)) {
 				/* since we're still here, this object should be usable */
 				items += animdata_filter_dopesheet_ob(ac, anim_data, ads, base, filter_mode);
 			}
@@ -3256,6 +3246,15 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, eAnimFilter_F
 			}
 
 
+			/* Timeline Mode - Basically the same as dopesheet, except we only have the summary for now */
+			case ANIMCONT_TIMELINE:
+			{
+				/* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
+				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
+					items += animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
+				break;
+			}
+
 			/* Special/Internal Use */
 			case ANIMCONT_CHANNEL: /* animation channel */
 			{
diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h
index 8c4e2acd48d..de91ce06c8b 100644
--- a/source/blender/editors/animation/anim_intern.h
+++ b/source/blender/editors/animation/anim_intern.h
@@ -79,6 +79,7 @@ void ANIM_OT_keying_set_active_set(struct wmOperatorType *ot);
 /* Driver management operators for UI buttons (RMB menu) */
 void ANIM_OT_driver_button_add(struct wmOperatorType *ot);
 void ANIM_OT_driver_button_remove(struct wmOperatorType *ot);
+void ANIM_OT_driver_button_edit(struct wmOperatorType *ot);
 void ANIM_OT_copy_driver_button(struct wmOperatorType *ot);
 void ANIM_OT_paste_driver_button(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 2450d0740f2..624c6e9f5de 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -36,13 +36,14 @@
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_math_base.h"
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
@@ -56,9 +57,11 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 #include "UI_view2d.h"
@@ -332,6 +335,44 @@ void debug_markers_print_list(ListBase *markers)
 
 /* ************* Marker Drawing ************ */
 
+static void draw_marker_name(
+        const uiFontStyle *fstyle, TimeMarker *marker, const char *name,
+        int cfra, const float xpos, const float ypixels)
+{
+	unsigned char text_col[4];
+	float x, y;
+
+	/* minimal y coordinate which wouldn't be occluded by scroll */
+	int min_y = 17.0f * UI_DPI_FAC;
+
+	if (marker->flag & SELECT) {
+		UI_GetThemeColor4ubv(TH_TEXT_HI, text_col);
+		x = xpos + 4.0f * UI_DPI_FAC;
+		y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
+		y = max_ii(y, min_y);
+	}
+	else {
+		UI_GetThemeColor4ubv(TH_TEXT, text_col);
+		if ((marker->frame <= cfra) && (marker->frame + 5 > cfra)) {
+			x = xpos + 8.0f * UI_DPI_FAC;
+			y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
+			y = max_ii(y, min_y);
+		}
+		else {
+			x = xpos + 8.0f * UI_DPI_FAC;
+			y = 17.0f * UI_DPI_FAC;
+		}
+	}
+
+#ifdef DURIAN_CAMERA_SWITCH
+	if (marker->camera && (marker->camera->restrictflag & OB_RESTRICT_RENDER)) {
+		text_col[3] = 100;
+	}
+#endif
+
+	UI_fontstyle_draw_simple(fstyle, x, y, name, text_col);
+}
+
 /* function to draw markers */
 static void draw_marker(
         View2D *v2d, const uiFontStyle *fstyle, TimeMarker *marker, int cfra, int flag,
@@ -339,10 +380,15 @@ static void draw_marker(
         const float ypixels, const float xscale, const float yscale)
 {
 	const float xpos = marker->frame * xscale;
+#ifdef DURIAN_CAMERA_SWITCH
+	const float yoffs = (marker->camera) ?  0.2f * UI_DPI_ICON_SIZE : 0.0f;
+#else
+	const float yoffs = 0.0f;
+#endif
 	int icon_id;
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* vertical line - dotted */
 #ifdef DURIAN_CAMERA_SWITCH
@@ -351,19 +397,30 @@ static void draw_marker(
 	if (flag & DRAW_MARKERS_LINES)
 #endif
 	{
-		setlinestyle(3);
+		Gwn_VertFormat *format = immVertexFormat();
+		uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-		if (marker->flag & SELECT)
-			glColor4ub(255, 255, 255, 96);
-		else
-			glColor4ub(0, 0, 0, 96);
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+		if (marker->flag & SELECT) {
+			immUniformColor4f(1.0f, 1.0f, 1.0f, 0.38f);
+		}
+		else {
+			immUniformColor4f(0.0f, 0.0f, 0.0f, 0.38f);
+		}
+		immUniform1f("dash_width", 6.0f);
+		immUniform1f("dash_factor", 0.5f);
 
-		glBegin(GL_LINES);
-		glVertex2f(xpos + 0.5f, 12.0f);
-		glVertex2f(xpos + 0.5f, (v2d->cur.ymax + 12.0f) * yscale);
-		glEnd();
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, xpos + 0.5f, 12.0f);
+		immVertex2f(pos, xpos + 0.5f, (v2d->cur.ymax + 12.0f) * yscale);
+		immEnd();
 
-		setlinestyle(0);
+		immUnbindProgram();
 	}
 
 	/* 5 px to offset icon to align properly, space / pixels corrects for zoom */
@@ -372,52 +429,35 @@ static void draw_marker(
 		          (marker->flag & SELECT) ? ICON_PMARKER_SEL :
 		          ICON_PMARKER;
 	}
+#ifdef DURIAN_CAMERA_SWITCH
+	else if (marker->camera) {
+		icon_id = (marker->flag & SELECT) ? ICON_OUTLINER_OB_CAMERA :
+		          ICON_OUTLINER_DATA_CAMERA;
+	}
+#endif
 	else {
 		icon_id = (marker->flag & SELECT) ? ICON_MARKER_HLT :
 		          ICON_MARKER;
 	}
 
-	UI_icon_draw(xpos - 0.45f * UI_DPI_ICON_SIZE, UI_DPI_ICON_SIZE, icon_id);
+	UI_icon_draw(xpos - 0.45f * UI_DPI_ICON_SIZE, yoffs + UI_DPI_ICON_SIZE, icon_id);
 
 	glDisable(GL_BLEND);
 
 	/* and the marker name too, shifted slightly to the top-right */
-	if (marker->name[0]) {
-		float x, y;
-
-		/* minimal y coordinate which wouldn't be occluded by scroll */
-		int min_y = 17.0f * UI_DPI_FAC;
-
-		if (marker->flag & SELECT) {
-			UI_ThemeColor(TH_TEXT_HI);
-			x = xpos + 4.0f * UI_DPI_FAC;
-			y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
-			y = max_ii(y, min_y);
-		}
-		else {
-			UI_ThemeColor(TH_TEXT);
-			if ((marker->frame <= cfra) && (marker->frame + 5 > cfra)) {
-				x = xpos + 8.0f * UI_DPI_FAC;
-				y = (ypixels <= 39.0f * UI_DPI_FAC) ? (ypixels - 10.0f * UI_DPI_FAC) : 29.0f * UI_DPI_FAC;
-				y = max_ii(y, min_y);
-			}
-			else {
-				x = xpos + 8.0f * UI_DPI_FAC;
-				y = 17.0f * UI_DPI_FAC;
-			}
-		}
-
 #ifdef DURIAN_CAMERA_SWITCH
-		if (marker->camera && (marker->camera->restrictflag & OB_RESTRICT_RENDER)) {
-			float col[4];
-			glGetFloatv(GL_CURRENT_COLOR, col);
-			col[3] = 0.4;
-			glColor4fv(col);
-		}
-#endif
+	if (marker->camera) {
+		draw_marker_name(fstyle, marker, marker->camera->id.name + 2, cfra, xpos, ypixels);
+	}
+	else if (marker->name[0]) {
+		draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
+	}
+#else
+	if (marker->name[0]) {
+		draw_marker_name(fstyle, marker, marker->name, cfra, xpos, ypixels);
 
-		UI_fontstyle_draw_simple(fstyle, x, y, marker->name);
 	}
+#endif
 }
 
 /* Draw Scene-Markers in time window */
@@ -443,21 +483,27 @@ void ED_markers_draw(const bContext *C, int flag)
 	v2d = UI_view2d_fromcontext(C);
 
 	if (flag & DRAW_MARKERS_MARGIN) {
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		const unsigned char shade[4] = {0, 0, 0, 16};
-		glColor4ubv(shade);
+		immUniformColor4ubv(shade);
 
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-		glRectf(v2d->cur.xmin, 0, v2d->cur.xmax, UI_MARKER_MARGIN_Y);
+		immRectf(pos, v2d->cur.xmin, 0, v2d->cur.xmax, UI_MARKER_MARGIN_Y);
 
 		glDisable(GL_BLEND);
+
+		immUnbindProgram();
 	}
 
 	/* no time correction for framelen! space is drawn with old values */
 	ypixels = BLI_rcti_size_y(&v2d->mask);
 	UI_view2d_scale_get(v2d, &xscale, &yscale);
-	glScalef(1.0f / xscale, 1.0f, 1.0f);
+	gpuPushMatrix();
+	gpuScale2f(1.0f / xscale, 1.0f);
 
 	/* x-bounds with offset for text (adjust for long string, avoid checking string width) */
 	font_width_max = (10 * UI_DPI_FAC) / xscale;
@@ -480,7 +526,7 @@ void ED_markers_draw(const bContext *C, int flag)
 		}
 	}
 
-	glScalef(xscale, 1.0f, 1.0f);
+	gpuPopMatrix();
 }
 
 /* ************************ Marker Wrappers API ********************* */
@@ -552,7 +598,6 @@ static int ed_markers_poll_markers_exist(bContext *C)
 static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wmEvent *event,
                                            int (*invoke_func)(bContext *, wmOperator *, const wmEvent *))
 {
-	ScrArea *sa = CTX_wm_area(C);
 	int retval = OPERATOR_PASS_THROUGH;
 
 	/* removed check for Y coord of event, keymap has bounbox now */
@@ -565,12 +610,10 @@ static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wm
 	else
 		BKE_report(op->reports, RPT_ERROR, "Programming error: operator does not actually have code to do anything!");
 
-	/* return status modifications - for now, make this spacetype dependent as above */
-	if (sa->spacetype != SPACE_TIME) {
-		/* unless successful, must add "pass-through" to let normal operator's have a chance at tackling this event */
-		if ((retval & (OPERATOR_FINISHED | OPERATOR_INTERFACE)) == 0) {
-			retval |= OPERATOR_PASS_THROUGH;
-		}
+
+	/* unless successful, must add "pass-through" to let normal operator's have a chance at tackling this event */
+	if ((retval & (OPERATOR_FINISHED | OPERATOR_INTERFACE)) == 0) {
+		retval |= OPERATOR_PASS_THROUGH;
 	}
 
 	return retval;
@@ -672,8 +715,7 @@ typedef struct MarkerMove {
 
 static bool ed_marker_move_use_time(MarkerMove *mm)
 {
-	if (((mm->slink->spacetype == SPACE_TIME) && !(((SpaceTime *)mm->slink)->flag & TIME_DRAWFRAMES)) ||
-	    ((mm->slink->spacetype == SPACE_SEQ) && !(((SpaceSeq *)mm->slink)->flag & SEQ_DRAWFRAMES)) ||
+	if (((mm->slink->spacetype == SPACE_SEQ) && !(((SpaceSeq *)mm->slink)->flag & SEQ_DRAWFRAMES)) ||
 	    ((mm->slink->spacetype == SPACE_ACTION) && (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) ||
 	    ((mm->slink->spacetype == SPACE_IPO) && !(((SpaceIpo *)mm->slink)->flag & SIPO_DRAWTIME)) ||
 	    ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME)))
@@ -844,7 +886,7 @@ static void ed_marker_move_apply(bContext *C, wmOperator *op)
 	BKE_scene_camera_switch_update(scene);
 
 	if (camera != scene->camera) {
-		BKE_screen_view3d_scene_sync(sc);
+		BKE_screen_view3d_scene_sync(sc, scene);
 		WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
 	}
 #endif
@@ -917,10 +959,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even
 						mm->evtx = event->x;
 						fac = ((float)(event->x - mm->firstx) * dx);
 
-						if (mm->slink->spacetype == SPACE_TIME)
-							apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, FPS, 0.1 * FPS, 0);
-						else
-							apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
+						apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
 
 						RNA_int_set(op->ptr, "frames", (int)fac);
 						ed_marker_move_apply(C, op);
@@ -1129,12 +1168,13 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool
 
 	if (camera) {
 		Scene *scene = CTX_data_scene(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 		Base *base;
 		TimeMarker *marker;
 		int sel = 0;
 
 		if (!extend)
-			BKE_scene_base_deselect_all(scene);
+			BKE_view_layer_base_deselect_all(view_layer);
 
 		for (marker = markers->first; marker; marker = marker->next) {
 			if (marker->frame == cfra) {
@@ -1146,11 +1186,11 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool
 		for (marker = markers->first; marker; marker = marker->next) {
 			if (marker->camera) {
 				if (marker->frame == cfra) {
-					base = BKE_scene_base_find(scene, marker->camera);
+					base = BKE_view_layer_base_find(view_layer, marker->camera);
 					if (base) {
-						ED_base_object_select(base, sel);
+						ED_object_base_select(base, sel);
 						if (sel)
-							ED_base_object_activate(C, base);
+							ED_object_base_activate(C, base);
 					}
 				}
 			}
@@ -1517,7 +1557,7 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot)
 #ifdef DURIAN_CAMERA_SWITCH
 /* ******************************* camera bind marker ***************** */
 
-static int ed_marker_camera_bind_exec(bContext *C, wmOperator *UNUSED(op))
+static int ed_marker_camera_bind_exec(bContext *C, wmOperator *op)
 {
 	bScreen *sc = CTX_wm_screen(C);
 	Scene *scene = CTX_data_scene(C);
@@ -1525,15 +1565,37 @@ static int ed_marker_camera_bind_exec(bContext *C, wmOperator *UNUSED(op))
 	ListBase *markers = ED_context_get_markers(C);
 	TimeMarker *marker;
 
-	marker = ED_markers_get_first_selected(markers);
-	if (marker == NULL)
+	/* Don't do anything if we don't have a camera selected */
+	if (ob == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Select a camera to bind to a marker on this frame");
+		return OPERATOR_CANCELLED;
+	}
+
+	/* add new marker, unless we already have one on this frame, in which case, replace it */
+	if (markers == NULL)
 		return OPERATOR_CANCELLED;
 
+	marker = ED_markers_find_nearest_marker(markers, CFRA);
+	if ((marker == NULL) || (marker->frame != CFRA)) {
+		marker = MEM_callocN(sizeof(TimeMarker), "Camera TimeMarker");
+		marker->flag = SELECT;
+		marker->frame = CFRA;
+		BLI_addtail(markers, marker);
+
+		/* deselect all others, so that the user can then move it without problems */
+		for (TimeMarker *m = markers->first; m; m = m->next) {
+			if (m != marker) {
+				m->flag &= ~SELECT;
+			}
+		}
+	}
+
+	/* bind to the nominated camera (as set in operator props) */
 	marker->camera = ob;
 
 	/* camera may have changes */
 	BKE_scene_camera_switch_update(scene);
-	BKE_screen_view3d_scene_sync(sc);
+	BKE_screen_view3d_scene_sync(sc, scene);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_MARKERS, NULL);
 	WM_event_add_notifier(C, NC_ANIMATION | ND_MARKERS, NULL);
@@ -1546,13 +1608,13 @@ static void MARKER_OT_camera_bind(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Bind Camera to Markers";
-	ot->description = "Bind the active camera to selected marker(s)";
+	ot->description = "Bind the selected camera to a marker on the current frame";
 	ot->idname = "MARKER_OT_camera_bind";
 
 	/* api callbacks */
 	ot->exec = ed_marker_camera_bind_exec;
 	ot->invoke = ed_markers_opwrap_invoke;
-	ot->poll = ed_markers_poll_selected_no_locked_markers;
+	ot->poll = ED_operator_animview_active;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index d817433bcb1..23563e7f15f 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -75,7 +75,7 @@ static int change_frame_poll(bContext *C)
 	 * this shouldn't show up in 3D editor (or others without 2D timeline view) via search
 	 */
 	if (sa) {
-		if (ELEM(sa->spacetype, SPACE_TIME, SPACE_ACTION, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) {
+		if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) {
 			return true;
 		}
 		else if (sa->spacetype == SPACE_IPO) {
@@ -86,7 +86,7 @@ static int change_frame_poll(bContext *C)
 		}
 	}
 
-	CTX_wm_operator_poll_msg_set(C, "Expected an timeline/animation area to be active");
+	CTX_wm_operator_poll_msg_set(C, "Expected an animation area to be active");
 	return false;
 }
 
@@ -276,6 +276,116 @@ static void ANIM_OT_change_frame(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
+
+/* ****************** Start/End Frame Operators *******************************/
+
+static int anim_set_end_frames_poll(bContext *C)
+{
+	ScrArea *sa = CTX_wm_area(C);
+
+	/* XXX temp? prevent changes during render */
+	if (G.is_rendering) return false;
+
+	/* although it's only included in keymaps for regions using ED_KEYMAP_ANIMATION,
+	 * this shouldn't show up in 3D editor (or others without 2D timeline view) via search
+	 */
+	if (sa) {
+		if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) {
+			return true;
+		}
+	}
+
+	CTX_wm_operator_poll_msg_set(C, "Expected an animation area to be active");
+	return false;
+}
+
+static int anim_set_sfra_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	int frame;
+
+	if (scene == NULL)
+		return OPERATOR_CANCELLED;
+
+	frame = CFRA;
+
+	/* if Preview Range is defined, set the 'start' frame for that */
+	if (PRVRANGEON)
+		scene->r.psfra = frame;
+	else
+		scene->r.sfra = frame;
+
+	if (PEFRA < frame) {
+		if (PRVRANGEON)
+			scene->r.pefra = frame;
+		else
+			scene->r.efra = frame;
+	}
+
+	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+static void ANIM_OT_start_frame_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Set Start Frame";
+	ot->idname = "ANIM_OT_start_frame_set";
+	ot->description = "Set the start frame";
+
+	/* api callbacks */
+	ot->exec = anim_set_sfra_exec;
+	ot->poll = anim_set_end_frames_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+
+static int anim_set_efra_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	int frame;
+
+	if (scene == NULL)
+		return OPERATOR_CANCELLED;
+
+	frame = CFRA;
+
+	/* if Preview Range is defined, set the 'end' frame for that */
+	if (PRVRANGEON)
+		scene->r.pefra = frame;
+	else
+		scene->r.efra = frame;
+
+	if (PSFRA > frame) {
+		if (PRVRANGEON)
+			scene->r.psfra = frame;
+		else
+			scene->r.sfra = frame;
+	}
+
+	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+static void ANIM_OT_end_frame_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Set End Frame";
+	ot->idname = "ANIM_OT_end_frame_set";
+	ot->description = "Set the end frame";
+
+	/* api callbacks */
+	ot->exec = anim_set_efra_exec;
+	ot->poll = anim_set_end_frames_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
 /* ****************** set preview range operator ****************************/
 
 static int previewrange_define_exec(bContext *C, wmOperator *op)
@@ -383,6 +493,9 @@ void ED_operatortypes_anim(void)
 	/* Animation Editors only -------------------------- */
 	WM_operatortype_append(ANIM_OT_change_frame);
 
+	WM_operatortype_append(ANIM_OT_start_frame_set);
+	WM_operatortype_append(ANIM_OT_end_frame_set);
+
 	WM_operatortype_append(ANIM_OT_previewrange_set);
 	WM_operatortype_append(ANIM_OT_previewrange_clear);
 
@@ -399,6 +512,7 @@ void ED_operatortypes_anim(void)
 
 	WM_operatortype_append(ANIM_OT_driver_button_add);
 	WM_operatortype_append(ANIM_OT_driver_button_remove);
+	WM_operatortype_append(ANIM_OT_driver_button_edit);
 	WM_operatortype_append(ANIM_OT_copy_driver_button);
 	WM_operatortype_append(ANIM_OT_paste_driver_button);
 
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index be9875ef95a..03639b0ad77 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -41,14 +41,17 @@
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
+#include "DNA_space_types.h"
 #include "DNA_texture_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
@@ -115,7 +118,6 @@ FCurve *verify_driver_fcurve(ID *id, const char rna_path[], const int array_inde
 
 			/* add some new driver data */
 			fcu->driver = MEM_callocN(sizeof(ChannelDriver), "ChannelDriver");
-			fcu->driver->flag |= DRIVER_FLAG_SHOWDEBUG;
 
 			/* F-Modifier or Keyframes? */
 			// FIXME: replace these magic numbers with defines
@@ -843,7 +845,7 @@ static int add_driver_button_none(bContext *C, wmOperator *op, short mapping_typ
 	if (success) {
 		/* send updates */
 		UI_context_update_anim_flag(C);
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 		WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
 
 		return OPERATOR_FINISHED;
@@ -941,7 +943,7 @@ static int remove_driver_button_exec(bContext *C, wmOperator *op)
 	if (success) {
 		/* send updates */
 		UI_context_update_anim_flag(C);
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 		WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
 	}
 
@@ -966,6 +968,46 @@ void ANIM_OT_driver_button_remove(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "all", 1, "All", "Delete drivers for all elements of the array");
 }
 
+/* Edit Driver Button Operator ------------------------ */
+
+static int edit_driver_button_exec(bContext *C, wmOperator *op)
+{
+	PointerRNA ptr = {{NULL}};
+	PropertyRNA *prop = NULL;
+	int index;
+	const bool all = 0; // RNA_boolean_get(op->ptr, "all");
+
+	/* try to find driver using property retrieved from UI */
+	UI_context_active_but_prop_get(C, &ptr, &prop, &index);
+
+	if (all)
+		index = -1;
+
+	if (ptr.id.data && ptr.data && prop) {
+		UI_popover_panel_invoke(C, SPACE_IPO, RGN_TYPE_UI, "GRAPH_PT_drivers_popover", true, op->reports);
+	}
+
+	return OPERATOR_INTERFACE;
+}
+
+void ANIM_OT_driver_button_edit(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Edit Driver";
+	ot->idname = "ANIM_OT_driver_button_edit";
+	ot->description = "Edit the drivers for the property connected represented by the highlighted button";
+
+	/* callbacks */
+	ot->exec = edit_driver_button_exec;
+	//op->poll = ??? // TODO: need to have some driver to be able to do this...
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
+
+	/* properties */
+	//RNA_def_boolean(ot->srna, "all", 1, "All", "Edit drivers for all elements of the array");
+}
+
 /* Copy Driver Button Operator ------------------------ */
 
 static int copy_driver_button_exec(bContext *C, wmOperator *op)
@@ -1031,8 +1073,8 @@ static int paste_driver_button_exec(bContext *C, wmOperator *op)
 
 			UI_context_update_anim_flag(C);
 
-			DAG_relations_tag_update(CTX_data_main(C));
-			DAG_id_tag_update(ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
+			DEG_relations_tag_update(CTX_data_main(C));
+			DEG_id_tag_update(ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
 
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME_PROP, NULL);  // XXX
 
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 6e786873950..d1377703949 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -52,7 +52,8 @@
 
 #include "BKE_fcurve.h"
 
-#include "BIF_gl.h"
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -463,47 +464,13 @@ bool actkeyblock_is_valid(ActKeyBlock *ab, DLRBT_Tree *keys)
 
 /* *************************** Keyframe Drawing *************************** */
 
-/* coordinates for diamond shape */
-static const float _unit_diamond_shape[4][2] = {
-	{0.0f, 1.0f},   /* top vert */
-	{1.0f, 0.0f},   /* mid-right */
-	{0.0f, -1.0f},  /* bottom vert */
-	{-1.0f, 0.0f}   /* mid-left */
-};
-
-/* draw a simple diamond shape with OpenGL */
-void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel, short key_type, short mode, float alpha)
+void draw_keyframe_shape(float x, float y, float size, bool sel, short key_type, short mode, float alpha,
+                         unsigned int pos_id, unsigned int size_id, unsigned int color_id, unsigned int outline_color_id)
 {
-	static GLuint displist1 = 0;
-	static GLuint displist2 = 0;
-
-	/* initialize 2 display lists for diamond shape - one empty, one filled */
-	if (displist1 == 0) {
-		displist1 = glGenLists(1);
-		glNewList(displist1, GL_COMPILE);
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2fv(_unit_diamond_shape[0]);
-		glVertex2fv(_unit_diamond_shape[1]);
-		glVertex2fv(_unit_diamond_shape[2]);
-		glVertex2fv(_unit_diamond_shape[3]);
-		glEnd();
-
-		glEndList();
-	}
-	if (displist2 == 0) {
-		displist2 = glGenLists(1);
-		glNewList(displist2, GL_COMPILE);
-
-		glBegin(GL_QUADS);
-		glVertex2fv(_unit_diamond_shape[0]);
-		glVertex2fv(_unit_diamond_shape[1]);
-		glVertex2fv(_unit_diamond_shape[2]);
-		glVertex2fv(_unit_diamond_shape[3]);
-		glEnd();
-
-		glEndList();
-	}
+	bool draw_fill = ELEM(mode, KEYFRAME_SHAPE_INSIDE, KEYFRAME_SHAPE_BOTH);
+	bool draw_outline = ELEM(mode, KEYFRAME_SHAPE_FRAME, KEYFRAME_SHAPE_BOTH);
+
+	BLI_assert(draw_fill || draw_outline);
 
 	/* tweak size of keyframe shape according to type of keyframe
 	 * - 'proper' keyframes have key_type = 0, so get drawn at full size
@@ -513,120 +480,92 @@ void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel,
 			break;
 
 		case BEZT_KEYTYPE_BREAKDOWN: /* slightly smaller than normal keyframe */
-			hsize *= 0.85f;
+			size *= 0.85f;
 			break;
 
 		case BEZT_KEYTYPE_MOVEHOLD:  /* slightly smaller than normal keyframes (but by less than for breakdowns) */
-			//hsize *= 0.72f;
-			hsize *= 0.95f;
+			size *= 0.925f;
 			break;
 
 		case BEZT_KEYTYPE_EXTREME:   /* slightly larger */
-			hsize *= 1.2f;
+			size *= 1.2f;
 			break;
 
 		default:
-			hsize -= 0.5f * key_type;
-			break;
+			size -= 0.8f * key_type;
 	}
 
-	/* adjust view transform before starting */
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * hsize, hsize, 1.0f);
-
-	/* anti-aliased lines for more consistent appearance */
-	glEnable(GL_LINE_SMOOTH);
+	unsigned char fill_col[4];
+	unsigned char outline_col[4];
 
 	/* draw! */
-	if (ELEM(mode, KEYFRAME_SHAPE_INSIDE, KEYFRAME_SHAPE_BOTH)) {
-		float inner_col[4];
-
+	if (draw_fill) {
 		/* get interior colors from theme (for selected and unselected only) */
 		switch (key_type) {
 			case BEZT_KEYTYPE_BREAKDOWN: /* bluish frames (default theme) */
-			{
-				if (sel)  UI_GetThemeColor4fv(TH_KEYTYPE_BREAKDOWN_SELECT, inner_col);
-				else UI_GetThemeColor4fv(TH_KEYTYPE_BREAKDOWN, inner_col);
+				UI_GetThemeColor4ubv(sel ? TH_KEYTYPE_BREAKDOWN_SELECT : TH_KEYTYPE_BREAKDOWN, fill_col);
 				break;
-			}
 			case BEZT_KEYTYPE_EXTREME: /* reddish frames (default theme) */
-			{
-				if (sel) UI_GetThemeColor4fv(TH_KEYTYPE_EXTREME_SELECT, inner_col);
-				else UI_GetThemeColor4fv(TH_KEYTYPE_EXTREME, inner_col);
+				UI_GetThemeColor4ubv(sel ? TH_KEYTYPE_EXTREME_SELECT : TH_KEYTYPE_EXTREME, fill_col);
 				break;
-			}
 			case BEZT_KEYTYPE_JITTER: /* greenish frames (default theme) */
-			{
-				if (sel) UI_GetThemeColor4fv(TH_KEYTYPE_JITTER_SELECT, inner_col);
-				else UI_GetThemeColor4fv(TH_KEYTYPE_JITTER, inner_col);
+				UI_GetThemeColor4ubv(sel ? TH_KEYTYPE_JITTER_SELECT : TH_KEYTYPE_JITTER, fill_col);
 				break;
-			}
 			case BEZT_KEYTYPE_MOVEHOLD: /* similar to traditional keyframes, but different... */
-			{
 				/* XXX: Should these get their own theme options instead? */
-				if (sel) UI_GetThemeColorShade4fv(TH_STRIP_SELECT, 35, inner_col);
-				else UI_GetThemeColorShade4fv(TH_STRIP, 50, inner_col);
-
-				inner_col[3] = 1.0f; /* full opacity, to avoid problems with visual glitches */
+				if (sel) UI_GetThemeColorShade3ubv(TH_STRIP_SELECT, 35, fill_col);
+				else UI_GetThemeColorShade3ubv(TH_STRIP, 50, fill_col);
+				fill_col[3] = 255; /* full opacity, to avoid problems with visual glitches */
 				break;
-			}
 			case BEZT_KEYTYPE_KEYFRAME: /* traditional yellowish frames (default theme) */
 			default:
-			{
-				if (sel) UI_GetThemeColor4fv(TH_KEYTYPE_KEYFRAME_SELECT, inner_col);
-				else UI_GetThemeColor4fv(TH_KEYTYPE_KEYFRAME, inner_col);
-				break;
-			}
+				UI_GetThemeColor4ubv(sel ? TH_KEYTYPE_KEYFRAME_SELECT : TH_KEYTYPE_KEYFRAME, fill_col);
 		}
 
 		/* NOTE: we don't use the straight alpha from the theme, or else effects such as
 		 * graying out protected/muted channels doesn't work correctly!
 		 */
-		inner_col[3] *= alpha;
-		glColor4fv(inner_col);
-
-		/* draw the "filled in" interior poly now */
-		glCallList(displist2);
+		fill_col[3] *= alpha;
+
+		if (!draw_outline) {
+			/* force outline color to match */
+			outline_col[0] = fill_col[0];
+			outline_col[1] = fill_col[1];
+			outline_col[2] = fill_col[2];
+			outline_col[3] = fill_col[3];
+		}
 	}
 
-	if (ELEM(mode, KEYFRAME_SHAPE_FRAME, KEYFRAME_SHAPE_BOTH)) {
-		float border_col[4];
-
+	if (draw_outline) {
 		/* exterior - black frame */
-		if (sel)  UI_GetThemeColor4fv(TH_KEYBORDER_SELECT, border_col);
-		else  UI_GetThemeColor4fv(TH_KEYBORDER, border_col);
-
-		border_col[3] *= alpha;
-		glColor4fv(border_col);
-
-		glCallList(displist1);
+		UI_GetThemeColor4ubv(sel ? TH_KEYBORDER_SELECT : TH_KEYBORDER, outline_col);
+		outline_col[3] *= alpha;
+
+		if (!draw_fill) {
+			/* fill color needs to be (outline.rgb, 0) */
+			fill_col[0] = outline_col[0];
+			fill_col[1] = outline_col[1];
+			fill_col[2] = outline_col[2];
+			fill_col[3] = 0;
+		}
 	}
 
-	glDisable(GL_LINE_SMOOTH);
-
-	/* restore view transform */
-	glScalef(xscale / hsize, 1.0f / hsize, 1.0f);
-	glTranslatef(-x, -y, 0.0f);
+	immAttrib1f(size_id, size);
+	immAttrib4ubv(color_id, fill_col);
+	immAttrib4ubv(outline_color_id, outline_col);
+	immVertex2f(pos_id, x, y);
 }
 
 static void draw_keylist(View2D *v2d, DLRBT_Tree *keys, DLRBT_Tree *blocks, float ypos, float yscale_fac, bool channelLocked)
 {
-	ActKeyColumn *ak;
-	ActKeyBlock *ab;
-	float alpha;
-	float xscale;
-
-	const float iconsize = (U.widget_unit / 4.0f) * yscale_fac;
-	const float mhsize   = iconsize * 0.7f;
+	const float icon_sz = U.widget_unit * 0.5f * yscale_fac;
+	const float half_icon_sz = 0.5f * icon_sz;
 
 	glEnable(GL_BLEND);
 
-	/* get View2D scaling factor */
-	UI_view2d_scale_get(v2d, &xscale, NULL);
-
 	/* locked channels are less strongly shown, as feedback for locked channels in DopeSheet */
 	/* TODO: allow this opacity factor to be themed? */
-	alpha = (channelLocked) ? 0.25f : 1.0f;
+	float alpha = channelLocked ? 0.25f : 1.0f;
 
 	/* draw keyblocks */
 	if (blocks) {
@@ -645,44 +584,73 @@ static void draw_keylist(View2D *v2d, DLRBT_Tree *keys, DLRBT_Tree *blocks, floa
 		copy_v4_v4(unsel_mhcol, unsel_color);
 		unsel_mhcol[3] *= 0.8f;
 
-		/* NOTE: the tradeoff for changing colors between each draw is dwarfed by the cost of checking validity */
-		for (ab = blocks->first; ab; ab = ab->next) {
+		unsigned int block_ct = 0;
+		for (ActKeyBlock *ab = blocks->first; ab; ab = ab->next) {
 			if (actkeyblock_is_valid(ab, keys)) {
-				if (ab->flag & ACTKEYBLOCK_FLAG_MOVING_HOLD) {
-					/* draw "moving hold" long-keyframe block - slightly smaller */
-					if (ab->sel)
-						glColor4fv(sel_mhcol);
-					else
-						glColor4fv(unsel_mhcol);
-
-					glRectf(ab->start, ypos - mhsize, ab->end, ypos + mhsize);
-				}
-				else {
-					/* draw standard long-keyframe block */
-					if (ab->sel)
-						glColor4fv(sel_color);
-					else
-						glColor4fv(unsel_color);
-
-					glRectf(ab->start, ypos - iconsize, ab->end, ypos + iconsize);
+				block_ct++;
+			}
+		}
+
+		if (block_ct > 0) {
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int color_id = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+			immBegin(GWN_PRIM_TRIS, 6 * block_ct);
+			for (ActKeyBlock *ab = blocks->first; ab; ab = ab->next) {
+				if (actkeyblock_is_valid(ab, keys)) {
+					if (ab->flag & ACTKEYBLOCK_FLAG_MOVING_HOLD) {
+						/* draw "moving hold" long-keyframe block - slightly smaller */
+						immRectf_fast_with_color(pos_id, color_id,
+						                         ab->start, ypos - half_icon_sz, ab->end, ypos + half_icon_sz,
+						                         (ab->sel) ? sel_mhcol : unsel_mhcol);
+					}
+					else {
+						/* draw standard long-keyframe block */
+						immRectf_fast_with_color(pos_id, color_id,
+						                         ab->start, ypos - half_icon_sz, ab->end, ypos + half_icon_sz,
+						                         (ab->sel) ? sel_color : unsel_color);
+					}
 				}
 			}
+			immEnd();
+			immUnbindProgram();
 		}
 	}
 
-	/* draw keys */
 	if (keys) {
-		for (ak = keys->first; ak; ak = ak->next) {
+		/* count keys */
+		unsigned int key_ct = 0;
+		for (ActKeyColumn *ak = keys->first; ak; ak = ak->next) {
 			/* optimization: if keyframe doesn't appear within 5 units (screenspace) in visible area, don't draw
 			 *	- this might give some improvements, since we current have to flip between view/region matrices
 			 */
-			if (IN_RANGE_INCL(ak->cfra, v2d->cur.xmin, v2d->cur.xmax) == 0)
-				continue;
+			if (IN_RANGE_INCL(ak->cfra, v2d->cur.xmin, v2d->cur.xmax))
+				key_ct++;
+		}
+
+		if (key_ct > 0) {
+			/* draw keys */
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int size_id = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+			unsigned int color_id = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+			unsigned int outline_color_id = GWN_vertformat_attr_add(format, "outlineColor", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+			immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND);
+			GPU_enable_program_point_size();
+			immBegin(GWN_PRIM_POINTS, key_ct);
+
+			for (ActKeyColumn *ak = keys->first; ak; ak = ak->next) {
+				if (IN_RANGE_INCL(ak->cfra, v2d->cur.xmin, v2d->cur.xmax)) {
+					draw_keyframe_shape(ak->cfra, ypos, icon_sz, (ak->sel & SELECT), ak->key_type, KEYFRAME_SHAPE_BOTH, alpha,
+					                    pos_id, size_id, color_id, outline_color_id);
+				}
+			}
 
-			/* draw using OpenGL - uglier but faster */
-			/* NOTE1: a previous version of this didn't work nice for some intel cards
-			 * NOTE2: if we wanted to go back to icons, these are  icon = (ak->sel & SELECT) ? ICON_SPACE2 : ICON_SPACE3; */
-			draw_keyframe_shape(ak->cfra, ypos, xscale, iconsize, (ak->sel & SELECT), ak->key_type, KEYFRAME_SHAPE_BOTH, alpha);
+			immEnd();
+			GPU_disable_program_point_size();
+			immUnbindProgram();
 		}
 	}
 
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 0bb35dcbf3e..25b3b4f58fa 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -56,7 +56,6 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_idcode.h"
 #include "BKE_nla.h"
@@ -66,6 +65,10 @@
 #include "BKE_key.h"
 #include "BKE_material.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
+
 #include "ED_anim_api.h"
 #include "ED_keyframing.h"
 #include "ED_keyframes_edit.h"
@@ -155,9 +158,11 @@ bAction *verify_adt_action(ID *id, short add)
 
 		/* tag depsgraph to be rebuilt to include time dependency */
 		/* XXX: we probably should have bmain passed down, but that involves altering too many API's */
-		DAG_relations_tag_update(G.main);
+		DEG_relations_tag_update(G.main);
 	}
 
+	DEG_id_tag_update(&adt->action->id, DEG_TAG_COPY_ON_WRITE);
+
 	/* return the action */
 	return adt->action;
 }
@@ -611,31 +616,34 @@ static short new_key_needed(FCurve *fcu, float cFrame, float nValue)
 /* ------------------ RNA Data-Access Functions ------------------ */
 
 /* Try to read value using RNA-properties obtained already */
-static float setting_get_rna_value(PointerRNA *ptr, PropertyRNA *prop, int index)
+static float setting_get_rna_value(Depsgraph *depsgraph, PointerRNA *ptr, PropertyRNA *prop, int index)
 {
+	PointerRNA ptr_eval;
 	float value = 0.0f;
 
+	DEG_get_evaluated_rna_pointer(depsgraph, ptr, &ptr_eval);
+
 	switch (RNA_property_type(prop)) {
 		case PROP_BOOLEAN:
 			if (RNA_property_array_check(prop))
-				value = (float)RNA_property_boolean_get_index(ptr, prop, index);
+				value = (float)RNA_property_boolean_get_index(&ptr_eval, prop, index);
 			else
-				value = (float)RNA_property_boolean_get(ptr, prop);
+				value = (float)RNA_property_boolean_get(&ptr_eval, prop);
 			break;
 		case PROP_INT:
 			if (RNA_property_array_check(prop))
-				value = (float)RNA_property_int_get_index(ptr, prop, index);
+				value = (float)RNA_property_int_get_index(&ptr_eval, prop, index);
 			else
-				value = (float)RNA_property_int_get(ptr, prop);
+				value = (float)RNA_property_int_get(&ptr_eval, prop);
 			break;
 		case PROP_FLOAT:
 			if (RNA_property_array_check(prop))
-				value = RNA_property_float_get_index(ptr, prop, index);
+				value = RNA_property_float_get_index(&ptr_eval, prop, index);
 			else
-				value = RNA_property_float_get(ptr, prop);
+				value = RNA_property_float_get(&ptr_eval, prop);
 			break;
 		case PROP_ENUM:
-			value = (float)RNA_property_enum_get(ptr, prop);
+			value = (float)RNA_property_enum_get(&ptr_eval, prop);
 			break;
 		default:
 			break;
@@ -796,7 +804,7 @@ static bool visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
  * In the event that it is not possible to perform visual keying, try to fall-back
  * to using the default method. Assumes that all data it has been passed is valid.
  */
-static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_index)
+static float visualkey_get_value(Depsgraph *depsgraph, PointerRNA *ptr, PropertyRNA *prop, int array_index)
 {
 	const char *identifier = RNA_property_identifier(prop);
 	float tmat[4][4];
@@ -811,20 +819,25 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
 	 */
 	if (ptr->type == &RNA_Object) {
 		Object *ob = (Object *)ptr->data;
+		const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 
 		/* Loc code is specific... */
 		if (strstr(identifier, "location")) {
-			return ob->obmat[3][array_index];
+			return ob_eval->obmat[3][array_index];
 		}
 
-		copy_m4_m4(tmat, ob->obmat);
-		rotmode = ob->rotmode;
+		copy_m4_m4(tmat, ob_eval->obmat);
+		rotmode = ob_eval->rotmode;
 	}
 	else if (ptr->type == &RNA_PoseBone) {
+		Object *ob = (Object *)ptr->id.data;
 		bPoseChannel *pchan = (bPoseChannel *)ptr->data;
 
-		BKE_armature_mat_pose_to_bone(pchan, pchan->pose_mat, tmat);
-		rotmode = pchan->rotmode;
+		const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+		bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name);
+
+		BKE_armature_mat_pose_to_bone(pchan_eval, pchan_eval->pose_mat, tmat);
+		rotmode = pchan_eval->rotmode;
 
 		/* Loc code is specific... */
 		if (strstr(identifier, "location")) {
@@ -834,7 +847,7 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
 		}
 	}
 	else {
-		return setting_get_rna_value(ptr, prop, array_index);
+		return setting_get_rna_value(depsgraph, ptr, prop, array_index);
 	}
 
 	/* Rot/Scale code are common! */
@@ -872,7 +885,7 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
 	}
 
 	/* as the function hasn't returned yet, read value from system in the default way */
-	return setting_get_rna_value(ptr, prop, array_index);
+	return setting_get_rna_value(depsgraph, ptr, prop, array_index);
 }
 
 /* ------------------------- Insert Key API ------------------------- */
@@ -887,7 +900,7 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
  *	the keyframe insertion. These include the 'visual' keyframing modes, quick refresh,
  *	and extra keyframe filtering.
  */
-bool insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag)
+bool insert_keyframe_direct(Depsgraph *depsgraph, ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag)
 {
 	float curval = 0.0f;
 
@@ -953,11 +966,11 @@ bool insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *pr
 		 * it works by keyframing using a value extracted from the final matrix
 		 * instead of using the kt system to extract a value.
 		 */
-		curval = visualkey_get_value(&ptr, prop, fcu->array_index);
+		curval = visualkey_get_value(depsgraph, &ptr, prop, fcu->array_index);
 	}
 	else {
 		/* read value from system */
-		curval = setting_get_rna_value(&ptr, prop, fcu->array_index);
+		curval = setting_get_rna_value(depsgraph, &ptr, prop, fcu->array_index);
 	}
 
 	/* only insert keyframes where they are needed */
@@ -1006,7 +1019,7 @@ bool insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *pr
  *
  *	index of -1 keys all array indices
  */
-short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char group[], const char rna_path[], int array_index, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag)
+short insert_keyframe(Depsgraph *depsgraph, ReportList *reports, ID *id, bAction *act, const char group[], const char rna_path[], int array_index, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag)
 {
 	PointerRNA id_ptr, ptr;
 	PropertyRNA *prop = NULL;
@@ -1084,7 +1097,7 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
 			}
 
 			/* insert keyframe */
-			ret += insert_keyframe_direct(reports, ptr, prop, fcu, cfra, keytype, flag);
+			ret += insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, keytype, flag);
 		}
 	}
 
@@ -1618,7 +1631,7 @@ static int clear_anim_v3d_exec(bContext *C, wmOperator *UNUSED(op))
 				/* delete F-Curve completely */
 				if (can_delete) {
 					ANIM_fcurve_delete_from_animdata(NULL, adt, fcu);
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 					changed = true;
 				}
 			}
@@ -1725,7 +1738,7 @@ static int delete_key_v3d_exec(bContext *C, wmOperator *op)
 		else
 			BKE_reportf(op->reports, RPT_ERROR, "No keyframes removed from Object '%s'", id->name + 2);
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 	}
 	CTX_DATA_END;
 
@@ -1757,6 +1770,7 @@ void ANIM_OT_keyframe_delete_v3d(wmOperatorType *ot)
 
 static int insert_key_button_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
 	PointerRNA ptr = {{NULL}};
@@ -1789,7 +1803,7 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
 			FCurve *fcu = list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), index);
 
 			if (fcu) {
-				success = insert_keyframe_direct(op->reports, ptr, prop, fcu, cfra, ts->keyframe_type, 0);
+				success = insert_keyframe_direct(depsgraph, op->reports, ptr, prop, fcu, cfra, ts->keyframe_type, 0);
 			}
 			else {
 				BKE_report(op->reports, RPT_ERROR,
@@ -1804,7 +1818,7 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
 			fcu = rna_get_fcurve_context_ui(C, &ptr, prop, index, NULL, NULL, &driven, &special);
 
 			if (fcu && driven) {
-				success = insert_keyframe_direct(op->reports, ptr, prop, fcu, cfra, ts->keyframe_type, INSERTKEY_DRIVER);
+				success = insert_keyframe_direct(depsgraph, op->reports, ptr, prop, fcu, cfra, ts->keyframe_type, INSERTKEY_DRIVER);
 			}
 		}
 		else {
@@ -1812,12 +1826,35 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
 			path = RNA_path_from_ID_to_property(&ptr, prop);
 
 			if (path) {
+				const char *identifier = RNA_property_identifier(prop);
+				const char *group = NULL;
+
+				/* Special exception for keyframing transforms:
+				 * Set "group" for this manually, instead of having them appearing at the bottom (ungrouped)
+				 * part of the channels list. Leaving these ungrouped is not a nice user behaviour in this case.
+				 *
+				 * TODO: Perhaps we can extend this behaviour in future for other properties...
+				 */
+				if (ptr.type == &RNA_PoseBone) {
+					bPoseChannel *pchan = (bPoseChannel *)ptr.data;
+					group = pchan->name;
+				}
+				else if ((ptr.type == &RNA_Object) &&
+				         (strstr(identifier, "location") || strstr(identifier, "rotation") || strstr(identifier, "scale")))
+				{
+					/* NOTE: Keep this label in sync with the "ID" case in
+					 * keyingsets_utils.py :: get_transform_generators_base_info()
+					 */
+					group = "Object Transforms";
+				}
+
+
 				if (all) {
 					/* -1 indicates operating on the entire array (or the property itself otherwise) */
 					index = -1;
 				}
 
-				success = insert_keyframe(op->reports, ptr.id.data, NULL, NULL, path, index, cfra, ts->keyframe_type, flag);
+				success = insert_keyframe(depsgraph, op->reports, ptr.id.data, NULL, group, path, index, cfra, ts->keyframe_type, flag);
 
 				MEM_freeN(path);
 			}
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 3e491ce3ade..c443c66d0f5 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -48,9 +48,10 @@
 #include "BKE_main.h"
 #include "BKE_animsys.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_keyframing.h"
 #include "ED_screen.h"
 
@@ -957,6 +958,7 @@ static short keyingset_apply_keying_flags(const short base_flags, const short ov
  */
 int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSet *ks, short mode, float cfra)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	ReportList *reports = CTX_wm_reports(C);
 	KS_Path *ksp;
@@ -1037,7 +1039,7 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 		for (; i < arraylen; i++) {
 			/* action to take depends on mode */
 			if (mode == MODIFYKEY_MODE_INSERT)
-				success += insert_keyframe(reports, ksp->id, act, groupname, ksp->rna_path, i, cfra, keytype, kflag2);
+				success += insert_keyframe(depsgraph, reports, ksp->id, act, groupname, ksp->rna_path, i, cfra, keytype, kflag2);
 			else if (mode == MODIFYKEY_MODE_DELETE)
 				success += delete_keyframe(reports, ksp->id, act, groupname, ksp->rna_path, i, cfra, kflag2);
 		}
@@ -1049,10 +1051,11 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
 				Object *ob = (Object *)ksp->id;
 
 				// XXX: only object transforms?
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 				break;
 			}
 			default:
+				DEG_id_tag_update(ksp->id, DEG_TAG_COPY_ON_WRITE);
 				break;
 		}
 
diff --git a/source/blender/editors/armature/BIF_generate.h b/source/blender/editors/armature/BIF_generate.h
deleted file mode 100644
index e229b0f342a..00000000000
--- a/source/blender/editors/armature/BIF_generate.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/BIF_generate.h
- *  \ingroup edarmature
- */
-
-
-#ifndef __BIF_GENERATE_H__
-#define __BIF_GENERATE_H__
-
-struct ToolSettings;
-struct EditBone;
-struct BArcIterator;
-struct bArmature;
-struct ListBase;
-
-typedef int (NextSubdivisionFunc)(struct ToolSettings *, struct BArcIterator *, int, int, float[3], float[3]);
-
-float calcArcCorrelation(struct BArcIterator *iter, int start, int end, float v0[3], float n[3]);
-
-int nextFixedSubdivision(struct ToolSettings *toolsettings, struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
-int nextLengthSubdivision(struct ToolSettings *toolsettings, struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
-int nextAdaptativeSubdivision(struct ToolSettings *toolsettings, struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
-
-struct EditBone *subdivideArcBy(struct ToolSettings *toolsettings, struct bArmature *arm, ListBase *editbones, struct BArcIterator *iter,
-                                float invmat[4][4], float tmat[3][3], NextSubdivisionFunc next_subdividion);
-
-void setBoneRollFromNormal(struct EditBone *bone, const float no[3], float invmat[4][4], float tmat[3][3]);
-
-
-#endif /* __BIF_GENERATE_H__ */
diff --git a/source/blender/editors/armature/BIF_retarget.h b/source/blender/editors/armature/BIF_retarget.h
deleted file mode 100644
index 2bd2b80190b..00000000000
--- a/source/blender/editors/armature/BIF_retarget.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/BIF_retarget.h
- *  \ingroup edarmature
- */
-
-#ifndef __BIF_RETARGET_H__
-#define __BIF_RETARGET_H__
-
-#include "DNA_listBase.h"
-
-#include "BLI_graph.h"
-#include "BLI_ghash.h"
-#include "BLI_task.h"
-#include "BLI_threads.h"
-
-#include "reeb.h"
-
-struct Object;
-struct bArmature;
-struct bContext;
-
-struct EditBone;
-
-struct RigGraph;
-struct RigNode;
-struct RigArc;
-struct RigEdge;
-
-#define USE_THREADS
-
-typedef struct RigGraph {
-	ListBase arcs;
-	ListBase nodes;
-
-	float length;
-
-	FreeArc         free_arc;
-	FreeNode        free_node;
-	RadialSymmetry  radial_symmetry;
-	AxialSymmetry   axial_symmetry;
-	/*********************************/
-
-	int flag;
-
-	ListBase   controls;
-	ListBase  *editbones;
-
-	struct RigNode *head;
-	ReebGraph *link_mesh;
-
-
-	TaskScheduler *task_scheduler;
-	TaskPool *task_pool;
-
-	GHash *bones_map;     /* map of editbones by name */
-	GHash *controls_map;  /* map of rigcontrols by bone pointer */
-
-	struct Object *ob;
-} RigGraph;
-
-typedef struct RigNode {
-	void *next, *prev;
-	float p[3];
-	int flag;
-
-	int degree;
-	struct BArc **arcs;
-
-	int subgraph_index;
-
-	int symmetry_level;
-	int symmetry_flag;
-	float symmetry_axis[3];
-	/*********************************/
-
-	ReebNode *link_mesh;
-} RigNode;
-
-typedef struct RigArc {
-	void *next, *prev;
-	RigNode *head, *tail;
-	int flag;
-
-	float length;
-
-	int symmetry_level;
-	int symmetry_group;
-	int symmetry_flag;
-	/*********************************/
-
-	ListBase edges;
-	int count;
-	ReebArc *link_mesh;
-} RigArc;
-
-typedef struct RigEdge {
-	struct RigEdge *next, *prev;
-	float head[3], tail[3];
-	float length;
-	float angle; /* angle to next edge */
-	float up_angle; /* angle between up_axis and the joint normal (defined as Previous edge CrossProduct Current edge */
-	struct EditBone *bone;
-	float up_axis[3];
-} RigEdge;
-
-/* Graph flags */
-#define RIG_FREE_BONELIST       1
-
-/* Control flags */
-#define RIG_CTRL_HEAD_DONE      1
-#define RIG_CTRL_TAIL_DONE      2
-#define RIG_CTRL_PARENT_DEFORM  4
-#define RIG_CTRL_FIT_ROOT       8
-#define RIG_CTRL_FIT_BONE       16
-
-#define RIG_CTRL_DONE   (RIG_CTRL_HEAD_DONE | RIG_CTRL_TAIL_DONE)
-
-/* Control tail flags */
-typedef enum {
-	TL_NONE = 0,
-	TL_TAIL,
-	TL_HEAD
-} LinkTailMode;
-
-typedef struct RigControl {
-	struct RigControl *next, *prev;
-	float head[3], tail[3];
-	struct EditBone *bone;
-	struct EditBone *link;
-	struct EditBone *link_tail;
-	float  up_axis[3];
-	float  offset[3];
-	float  qrot[4];   /* for dual linked bones, store the rotation of the linked bone for the finalization */
-	int    flag;
-	LinkTailMode tail_mode;
-} RigControl;
-
-void BIF_retargetArc(struct bContext *C, ReebArc *earc, RigGraph *template_rigg);
-RigGraph *RIG_graphFromArmature(const struct bContext *C, struct Object *ob, struct bArmature *arm);
-int RIG_nbJoints(RigGraph *rg);
-const char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index);
-void RIG_freeRigGraph(BGraph *rg);
-
-/* UNUSED */
-void BIF_retargetArmature(bContext *C);
-void BIF_adjustRetarget(bContext *C);
-/* UNUSED / print funcs */
-void RIG_printArc(struct RigGraph *rg, struct RigArc *arc);
-void RIG_printGraph(struct RigGraph *rg);
-void RIG_printArcBones(struct RigArc *arc);
-
-#endif /* __BIF_RETARGET_H__ */
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 4c394d7836a..96467ee2c2a 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -23,10 +23,12 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
 	../../windowmanager
+	../../../../intern/clog
 	../../../../intern/guardedalloc
 	../../../../intern/eigen
 	../../../../intern/glew-mx
@@ -45,9 +47,6 @@ set(SRC
 	armature_select.c
 	armature_skinning.c
 	armature_utils.c
-	editarmature_generate.c
-	editarmature_retarget.c
-	editarmature_sketch.c
 	editarmature_undo.c
 	meshlaplacian.c
 	pose_edit.c
@@ -57,13 +56,9 @@ set(SRC
 	pose_slide.c
 	pose_transform.c
 	pose_utils.c
-	reeb.c
 
-	BIF_generate.h
-	BIF_retarget.h
 	armature_intern.h
 	meshlaplacian.h
-	reeb.h
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c
index b268baf0f97..c1fb1dcf82f 100644
--- a/source/blender/editors/armature/armature_add.c
+++ b/source/blender/editors/armature/armature_add.c
@@ -126,7 +126,6 @@ static int armature_click_extrude_exec(bContext *C, wmOperator *UNUSED(op))
 	bArmature *arm;
 	EditBone *ebone, *newbone, *flipbone;
 	float mat[3][3], imat[3][3];
-	const float *curs;
 	int a, to_root = 0;
 	Object *obedit;
 	Scene *scene;
@@ -188,8 +187,8 @@ static int armature_click_extrude_exec(bContext *C, wmOperator *UNUSED(op))
 			newbone->flag |= BONE_CONNECTED;
 		}
 
-		curs = ED_view3d_cursor3d_get(scene, v3d);
-		copy_v3_v3(newbone->tail, curs);
+		const View3DCursor *curs = ED_view3d_cursor3d_get(scene, v3d);
+		copy_v3_v3(newbone->tail, curs->location);
 		sub_v3_v3v3(newbone->tail, newbone->tail, obedit->obmat[3]);
 
 		if (a == 1)
@@ -221,26 +220,26 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, const wmEv
 	Scene *scene;
 	ARegion *ar;
 	View3D *v3d;
-	float *fp, tvec[3], oldcurs[3], mval_f[2];
+	float tvec[3], oldcurs[3], mval_f[2];
 	int retv;
 
 	scene = CTX_data_scene(C);
 	ar = CTX_wm_region(C);
 	v3d = CTX_wm_view3d(C);
 
-	fp = ED_view3d_cursor3d_get(scene, v3d);
+	View3DCursor *cursor = ED_view3d_cursor3d_get(scene, v3d);
 
-	copy_v3_v3(oldcurs, fp);
+	copy_v3_v3(oldcurs, cursor->location);
 
 	VECCOPY2D(mval_f, event->mval);
-	ED_view3d_win_to_3d(v3d, ar, fp, mval_f, tvec);
-	copy_v3_v3(fp, tvec);
+	ED_view3d_win_to_3d(v3d, ar, cursor->location, mval_f, tvec);
+	copy_v3_v3(cursor->location, tvec);
 
 	/* extrude to the where new cursor is and store the operation result */
 	retv = armature_click_extrude_exec(C, op);
 
 	/* restore previous 3d cursor position */
-	copy_v3_v3(fp, oldcurs);
+	copy_v3_v3(cursor->location, oldcurs);
 
 	return retv;
 }
@@ -829,7 +828,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit;
 	bArmature *arm;
-	EditBone *newbone, *ebone, *flipbone, *first = NULL;
+	EditBone *newbone = NULL, *ebone, *flipbone, *first = NULL;
 	int a, totbone = 0, do_extrude;
 	bool forked = RNA_boolean_get(op->ptr, "forked");
 
@@ -1013,7 +1012,7 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op)
 
 	RNA_string_get(op->ptr, "name", name);
 
-	copy_v3_v3(curs, ED_view3d_cursor3d_get(CTX_data_scene(C), CTX_wm_view3d(C)));
+	copy_v3_v3(curs, ED_view3d_cursor3d_get(CTX_data_scene(C), CTX_wm_view3d(C))->location);
 
 	/* Get inverse point for head and orientation for tail */
 	invert_m4_m4(obedit->imat, obedit->obmat);
@@ -1074,7 +1073,6 @@ void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot)
 static int armature_subdivide_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit = CTX_data_edit_object(C);
-	bArmature *arm = obedit->data;
 	EditBone *newbone, *tbone;
 	int cuts, i;
 
@@ -1083,7 +1081,7 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op)
 
 	/* loop over all editable bones */
 	// XXX the old code did this in reverse order though!
-	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN_WITH_ID(C, EditBone *, ebone, selected_editable_bones, bArmature *, arm)
 	{
 		for (i = cuts + 1; i > 1; i--) {
 			/* compute cut ratio first */
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index 539d56a4ede..9fcf6ad4826 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -48,8 +48,10 @@
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
+#include "BKE_layer.h"
 #include "BKE_global.h"
 #include "BKE_report.h"
+#include "BKE_object.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -138,17 +140,16 @@ void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do
 
 /* exported for use in editors/object/ */
 /* 0 == do center, 1 == center new, 2 == center cursor */
-void ED_armature_origin_set(Scene *scene, Object *ob, float cursor[3], int centermode, int around)
+void ED_armature_origin_set(Object *ob, float cursor[3], int centermode, int around)
 {
-	Object *obedit = scene->obedit; // XXX get from context
+	const bool is_editmode = BKE_object_is_in_editmode(ob);
 	EditBone *ebone;
 	bArmature *arm = ob->data;
 	float cent[3];
 
 	/* Put the armature into editmode */
-	if (ob != obedit) {
+	if (is_editmode == false) {
 		ED_armature_to_edit(arm);
-		obedit = NULL; /* we cant use this so behave as if there is no obedit */
 	}
 
 	/* Find the centerpoint */
@@ -188,13 +189,13 @@ void ED_armature_origin_set(Scene *scene, Object *ob, float cursor[3], int cente
 	}
 
 	/* Turn the list into an armature */
-	if (obedit == NULL) {
+	if (is_editmode == false) {
 		ED_armature_from_edit(arm);
 		ED_armature_edit_free(arm);
 	}
 
 	/* Adjust object location for new centerpoint */
-	if (centermode && obedit == NULL) {
+	if (centermode && (is_editmode == false)) {
 		mul_mat3_m4_v3(ob->obmat, cent); /* omit translation part */
 		add_v3_v3(ob->loc, cent);
 	}
@@ -317,10 +318,10 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op)
 		Scene *scene = CTX_data_scene(C);
 		View3D *v3d = CTX_wm_view3d(C); /* can be NULL */
 		float cursor_local[3];
-		const float   *cursor = ED_view3d_cursor3d_get(scene, v3d);
+		const View3DCursor *cursor = ED_view3d_cursor3d_get(scene, v3d);
 
 		invert_m4_m4(ob->imat, ob->obmat);
-		copy_v3_v3(cursor_local, cursor);
+		copy_v3_v3(cursor_local, cursor->location);
 		mul_m4_v3(ob->imat, cursor_local);
 
 
@@ -630,25 +631,39 @@ static void fill_add_joint(EditBone *ebo, short eb_tail, ListBase *points)
 /* bone adding between selected joints */
 static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	bArmature *arm = (obedit) ? obedit->data : NULL;
+	Object *obedit_active = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	ListBase points = {NULL, NULL};
 	EditBone *newbone = NULL;
 	int count;
+	bool mixed_object_error = false;
 
 	/* sanity checks */
-	if (ELEM(NULL, obedit, arm))
+	if (ELEM(NULL, obedit_active, obedit_active->data)) {
 		return OPERATOR_CANCELLED;
+	}
 
 	/* loop over all bones, and only consider if visible */
-	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
+	bArmature *arm = NULL;
+	CTX_DATA_BEGIN_WITH_ID(C, EditBone *, ebone, visible_bones, bArmature *, arm_iter)
 	{
-		if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL))
+		bool check = false;
+		if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL)) {
 			fill_add_joint(ebone, 0, &points);
-		if (ebone->flag & BONE_TIPSEL)
+			check = true;
+		}
+		if (ebone->flag & BONE_TIPSEL) {
 			fill_add_joint(ebone, 1, &points);
+			check = true;
+		}
+
+		if (check) {
+			if (arm && (arm != arm_iter)) {
+				mixed_object_error = true;
+			}
+			arm = arm_iter;
+		}
 	}
 	CTX_DATA_END;
 
@@ -663,7 +678,25 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "No joints selected");
 		return OPERATOR_CANCELLED;
 	}
-	else if (count == 1) {
+	else if (mixed_object_error) {
+		BKE_report(op->reports, RPT_ERROR, "Bones for different objects selected");
+		BLI_freelistN(&points);
+		return OPERATOR_CANCELLED;
+	}
+
+	Object *obedit = NULL;
+	{
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_EDIT, ob_iter) {
+			if (ob_iter->data == arm) {
+				obedit = ob_iter;
+			}
+		}
+		FOREACH_OBJECT_IN_MODE_END;
+	}
+	BLI_assert(obedit != NULL);
+
+	if (count == 1) {
 		EditBonePoint *ebp;
 		float curs[3];
 
@@ -672,7 +705,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 
 		/* Get points - cursor (tail) */
 		invert_m4_m4(obedit->imat, obedit->obmat);
-		mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d));
+		mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d)->location);
 
 		/* Create a bone */
 		newbone = add_points_bone(obedit, ebp->vec, curs);
@@ -710,7 +743,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 
 				/* get cursor location */
 				invert_m4_m4(obedit->imat, obedit->obmat);
-				mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d));
+				mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d)->location);
 
 				/* get distances */
 				dist_sq_a = len_squared_v3v3(ebp_a->vec, curs);
@@ -1301,38 +1334,50 @@ static bool armature_delete_ebone_cb(const char *bone_name, void *arm_p)
 /* only editmode! */
 static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	bArmature *arm;
 	EditBone *curBone, *ebone_next;
-	Object *obedit = CTX_data_edit_object(C);
-	bool changed = false;
-	arm = obedit->data;
+	bool changed_multi = false;
 
 	/* cancel if nothing selected */
 	if (CTX_DATA_COUNT(C, selected_bones) == 0)
 		return OPERATOR_CANCELLED;
 
-	armature_select_mirrored(arm);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		bArmature *arm = obedit->data;
+		bool changed = false;
+
+		armature_select_mirrored(arm);
+
+		BKE_pose_channels_remove(obedit, armature_delete_ebone_cb, arm);
+
+		for (curBone = arm->edbo->first; curBone; curBone = ebone_next) {
+			ebone_next = curBone->next;
+			if (arm->layer & curBone->layer) {
+				if (curBone->flag & BONE_SELECTED) {
+					if (curBone == arm->act_edbone) arm->act_edbone = NULL;
+					ED_armature_ebone_remove(arm, curBone);
+					changed = true;
+				}
+			}
+		}
+
+		if (changed) {
+			changed_multi = true;
 
-	BKE_pose_channels_remove(obedit, armature_delete_ebone_cb, arm);
+			ED_armature_edit_sync_selection(arm->edbo);
+			BKE_pose_tag_recalc(CTX_data_main(C), obedit->pose);
 
-	for (curBone = arm->edbo->first; curBone; curBone = ebone_next) {
-		ebone_next = curBone->next;
-		if (arm->layer & curBone->layer) {
-			if (curBone->flag & BONE_SELECTED) {
-				if (curBone == arm->act_edbone) arm->act_edbone = NULL;
-				ED_armature_ebone_remove(arm, curBone);
-				changed = true;
-			}
+			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit);
 		}
 	}
+	MEM_freeN(objects);
 
-	if (!changed)
+	if (!changed_multi) {
 		return OPERATOR_CANCELLED;
-
-	ED_armature_edit_sync_selection(arm->edbo);
-	BKE_pose_tag_recalc(CTX_data_main(C), obedit->pose);
-
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit);
+	}
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 288d9f0f86b..1fe729b7c4b 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -137,18 +137,7 @@ void POSE_OT_rotation_mode_set(struct wmOperatorType *ot);
 void POSE_OT_quaternions_flip(struct wmOperatorType *ot);
 
 void POSE_OT_bone_layers(struct wmOperatorType *ot);
-
-/* ******************************************************* */
-/* Etch-A-Ton (Skeleton Sketching) Operators */
-
-void SKETCH_OT_gesture(struct wmOperatorType *ot);
-void SKETCH_OT_delete(struct wmOperatorType *ot);
-void SKETCH_OT_draw_stroke(struct wmOperatorType *ot);
-void SKETCH_OT_draw_preview(struct wmOperatorType *ot);
-void SKETCH_OT_finish_stroke(struct wmOperatorType *ot);
-void SKETCH_OT_cancel_stroke(struct wmOperatorType *ot);
-void SKETCH_OT_convert(struct wmOperatorType *ot);
-void SKETCH_OT_select(struct wmOperatorType *ot);
+void POSE_OT_toggle_bone_selection_overlay(struct wmOperatorType *ot);
 
 /* ******************************************************* */
 /* Pose Tool Utilities (for PoseLib, Pose Sliding, etc.) */
@@ -225,7 +214,6 @@ void POSE_OT_propagate(struct wmOperatorType *ot);
  */
 
 EditBone *make_boneList(struct ListBase *edbo, struct ListBase *bones, struct EditBone *parent, struct Bone *actBone);
-bool BIF_sk_selectStroke(struct bContext *C, const int mval[2], const bool extend);
 
 /* duplicate method */
 void preEditBoneDuplicate(struct ListBase *editbones);
@@ -248,10 +236,15 @@ void armature_select_mirrored_ex(struct bArmature *arm, const int flag);
 void armature_select_mirrored(struct bArmature *arm);
 void armature_tag_unselect(struct bArmature *arm);
 
-void *get_nearest_bone(struct bContext *C, const int xy[2], bool findunsel);
+void *get_nearest_bone(
+        struct bContext *C, const int xy[2], bool findunsel,
+        struct Base **r_base);
+
 void *get_bone_from_selectbuffer(
-        struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits,
-        bool findunsel, bool do_nearest);
+        struct Base **bases, uint bases_len,
+        bool is_editmode, const unsigned int *buffer, short hits,
+        bool findunsel, bool do_nearest,
+        struct Base **r_base);
 
 int bone_looper(struct Object *ob, struct Bone *bone, void *data,
                 int (*bone_func)(struct Object *, struct Bone *, void *));
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index c49e9a2b820..1a5e9e38099 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -48,11 +48,12 @@
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -378,7 +379,7 @@ static int armature_flip_names_exec(bContext *C, wmOperator *op)
 	BLI_freelistN(&bones_names);
 
 	/* since we renamed stuff... */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* copied from #rna_Bone_update_renamed */
 	/* redraw view */
@@ -432,7 +433,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 
 	/* since we renamed stuff... */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c
index 31a22b41f54..cee99c3b8f8 100644
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -85,16 +85,6 @@ void ED_operatortypes_armature(void)
 	WM_operatortype_append(ARMATURE_OT_armature_layers);
 	WM_operatortype_append(ARMATURE_OT_bone_layers);
 
-	/* SKETCH */
-	WM_operatortype_append(SKETCH_OT_gesture);
-	WM_operatortype_append(SKETCH_OT_delete);
-	WM_operatortype_append(SKETCH_OT_draw_stroke);
-	WM_operatortype_append(SKETCH_OT_draw_preview);
-	WM_operatortype_append(SKETCH_OT_finish_stroke);
-	WM_operatortype_append(SKETCH_OT_cancel_stroke);
-	WM_operatortype_append(SKETCH_OT_convert);
-	WM_operatortype_append(SKETCH_OT_select);
-
 	/* POSE */
 	WM_operatortype_append(POSE_OT_hide);
 	WM_operatortype_append(POSE_OT_reveal);
@@ -142,6 +132,8 @@ void ED_operatortypes_armature(void)
 
 	WM_operatortype_append(POSE_OT_bone_layers);
 
+	WM_operatortype_append(POSE_OT_toggle_bone_selection_overlay);
+
 	WM_operatortype_append(POSE_OT_propagate);
 
 	/* POSELIB */
@@ -204,23 +196,6 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
 	keymap = WM_keymap_find(keyconf, "Armature", 0, 0);
 	keymap->poll = ED_operator_editarmature;
 
-	/* Armature -> Etch-A-Ton ------------------------ */
-	WM_keymap_add_item(keymap, "SKETCH_OT_delete", XKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "SKETCH_OT_delete", DELKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "SKETCH_OT_finish_stroke", RIGHTMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "SKETCH_OT_cancel_stroke", ESCKEY, KM_PRESS, 0, 0);
-	/* Already part of view3d select */
-	//WM_keymap_add_item(keymap, "SKETCH_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
-
-	/* sketch poll checks mode */
-	WM_keymap_add_item(keymap, "SKETCH_OT_gesture", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_add_item(keymap, "SKETCH_OT_draw_stroke", LEFTMOUSE, KM_PRESS, 0, 0);
-	kmi = WM_keymap_add_item(keymap, "SKETCH_OT_draw_stroke", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
-	RNA_boolean_set(kmi->ptr, "snap", true);
-	WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, 0, 0);
-	kmi = WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, KM_CTRL, 0);
-	RNA_boolean_set(kmi->ptr, "snap", true);
-
 	/* only set in editmode armature, by space_view3d listener */
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_hide", HKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(kmi->ptr, "unselected", false);
@@ -390,6 +365,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "ARMATURE_OT_layers_show_all", ACCENTGRAVEKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "ARMATURE_OT_armature_layers", MKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "POSE_OT_bone_layers", MKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "POSE_OT_toggle_bone_selection_overlay", ZKEY, KM_PRESS, 0, 0);
 
 	/* special transforms: */
 	/*  1) envelope/b-bone size */
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index 95c8b1d5460..5d6c383b24b 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -47,12 +47,15 @@
 #include "BKE_animsys.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -370,7 +373,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
 			if (base->object->adt) {
 				if (ob->adt == NULL) {
 					/* no animdata, so just use a copy of the whole thing */
-					ob->adt = BKE_animdata_copy(bmain, base->object->adt, false);
+					ob->adt = BKE_animdata_copy(bmain, base->object->adt, false, true);
 				}
 				else {
 					/* merge in data - we'll fix the drivers manually */
@@ -381,7 +384,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
 			if (curarm->adt) {
 				if (arm->adt == NULL) {
 					/* no animdata, so just use a copy of the whole thing */
-					arm->adt = BKE_animdata_copy(bmain, curarm->adt, false);
+					arm->adt = BKE_animdata_copy(bmain, curarm->adt, false, true);
 				}
 				else {
 					/* merge in data - we'll fix the drivers manually */
@@ -390,12 +393,12 @@ int join_armature_exec(bContext *C, wmOperator *op)
 			}
 
 			/* Free the old object data */
-			ED_base_object_free_and_unlink(bmain, scene, base);
+			ED_object_base_free_and_unlink(bmain, scene, base->object);
 		}
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);  /* because we removed object(s) */
+	DEG_relations_tag_update(bmain);  /* because we removed object(s) */
 
 	ED_armature_from_edit(arm);
 	ED_armature_edit_free(arm);
@@ -569,6 +572,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *oldob, *newob;
 	Base *oldbase, *newbase;
@@ -592,14 +596,18 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 	/* TODO: use context iterators for this? */
 	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
-		if (base->object == obedit) base->flag |= SELECT;
-		else base->flag &= ~SELECT;
+		if (base->object == obedit) {
+			ED_object_base_select(base, BA_SELECT);
+		}
+		else {
+			ED_object_base_select(base, BA_DESELECT);
+		}
 	}
 	CTX_DATA_END;
 
 	/* 1) store starting settings and exit editmode */
 	oldob = obedit;
-	oldbase = BASACT;
+	oldbase = view_layer->basact;
 	oldob->mode &= ~OB_MODE_POSE;
 	//oldbase->flag &= ~OB_POSEMODE;
 
@@ -607,11 +615,11 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 	ED_armature_edit_free(obedit->data);
 
 	/* 2) duplicate base */
-	newbase = ED_object_add_duplicate(bmain, scene, oldbase, USER_DUP_ARM); /* only duplicate linked armature */
-	DAG_relations_tag_update(bmain);
+	newbase = ED_object_add_duplicate(bmain, scene, view_layer, oldbase, USER_DUP_ARM); /* only duplicate linked armature */
+	DEG_relations_tag_update(bmain);
 
 	newob = newbase->object;
-	newbase->flag &= ~SELECT;
+	newbase->flag &= ~BASE_SELECTED;
 
 
 	/* 3) remove bones that shouldn't still be around on both armatures */
@@ -622,8 +630,8 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
 	/* 4) fix links before depsgraph flushes */ // err... or after?
 	separated_armature_fix_links(oldob, newob);
 
-	DAG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
-	DAG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
+	DEG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
+	DEG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
 
 
 	/* 5) restore original conditions */
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index a4e916b8e63..95acc8ab6ba 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -29,6 +29,8 @@
  *  \ingroup edarmature
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -39,7 +41,9 @@
 
 #include "BKE_context.h"
 #include "BKE_action.h"
+#include "BKE_object.h"
 #include "BKE_report.h"
+#include "BKE_layer.h"
 
 #include "BIF_gl.h"
 
@@ -53,6 +57,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "DEG_depsgraph.h"
+
 #include "armature_intern.h"
 
 /* utility macros for storing a temp int in the bone (selection flag) */
@@ -61,27 +67,84 @@
 
 /* **************** PoseMode & EditMode Selection Buffer Queries *************************** */
 
-/* only for opengl selection indices */
-Bone *ED_armature_bone_find_index(Object *ob, int index)
+Base *ED_armature_base_and_ebone_from_select_buffer(
+        Base **bases, uint bases_len, int hit, EditBone **r_ebone)
 {
-	bPoseChannel *pchan;
-	if (ob->pose == NULL) return NULL;
-	index >>= 16;     // bone selection codes use left 2 bytes
+	const uint hit_object = hit & 0xFFFF;
+	Base *base = NULL;
+	EditBone *ebone = NULL;
+	/* TODO(campbell): optimize, eg: sort & binary search. */
+	for (uint base_index = 0; base_index < bases_len; base_index++) {
+		if (bases[base_index]->object->select_color == hit_object) {
+			base = bases[base_index];
+			break;
+		}
+	}
+	if (base != NULL) {
+		const uint hit_bone = (hit & ~BONESEL_ANY) >> 16;
+		bArmature *arm = base->object->data;
+		ebone = BLI_findlink(arm->edbo, hit_bone);
+	}
+	*r_ebone = ebone;
+	return base;
+}
 
-	pchan = BLI_findlink(&ob->pose->chanbase, index);
-	return pchan ? pchan->bone : NULL;
+Object *ED_armature_object_and_ebone_from_select_buffer(
+        Object **objects, uint objects_len, int hit, EditBone **r_ebone)
+{
+	const uint hit_object = hit & 0xFFFF;
+	Object *ob = NULL;
+	EditBone *ebone = NULL;
+	/* TODO(campbell): optimize, eg: sort & binary search. */
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		if (objects[ob_index]->select_color == hit_object) {
+			ob = objects[ob_index];
+			break;
+		}
+	}
+	if (ob != NULL) {
+		const uint hit_bone = (hit & ~BONESEL_ANY) >> 16;
+		bArmature *arm = ob->data;
+		ebone = BLI_findlink(arm->edbo, hit_bone);
+	}
+	*r_ebone = ebone;
+	return ob;
+}
+
+Base *ED_armature_base_and_bone_from_select_buffer(
+        Base **bases, uint bases_len, int hit, Bone **r_bone)
+{
+	const uint hit_object = hit & 0xFFFF;
+	Base *base = NULL;
+	Bone *bone = NULL;
+	/* TODO(campbell): optimize, eg: sort & binary search. */
+	for (uint base_index = 0; base_index < bases_len; base_index++) {
+		if (bases[base_index]->object->select_color == hit_object) {
+			base = bases[base_index];
+			break;
+		}
+	}
+	if (base != NULL) {
+		if (base->object->pose != NULL) {
+			const uint hit_bone = (hit & ~BONESEL_ANY) >> 16;
+			bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone);;
+			bone = pchan ? pchan->bone : NULL;
+		}
+	}
+	*r_bone = bone;
+	return base;
 }
 
 /* See if there are any selected bones in this buffer */
 /* only bones from base are checked on */
 void *get_bone_from_selectbuffer(
-        Scene *scene, Base *base, const unsigned int *buffer, short hits,
-        bool findunsel, bool do_nearest)
+        Base **bases, uint bases_len, bool is_editmode, const unsigned int *buffer, short hits,
+        bool findunsel, bool do_nearest, Base **r_base)
 {
-	Object *obedit = scene->obedit; // XXX get from context
 	Bone *bone;
 	EditBone *ebone;
 	void *firstunSel = NULL, *firstSel = NULL, *data;
+	Base *firstunSel_base = NULL, *firstSel_base = NULL;
 	unsigned int hitresult;
 	short i;
 	bool takeNext = false;
@@ -92,15 +155,14 @@ void *get_bone_from_selectbuffer(
 
 		if (!(hitresult & BONESEL_NOSEL)) {
 			if (hitresult & BONESEL_ANY) {  /* to avoid including objects in selection */
+				Base *base = NULL;
 				bool sel;
 
 				hitresult &= ~(BONESEL_ANY);
 				/* Determine what the current bone is */
-				if (obedit == NULL || base->object != obedit) {
-					/* no singular posemode, so check for correct object */
-					if (base->selcol == (hitresult & 0xFFFF)) {
-						bone = ED_armature_bone_find_index(base->object, hitresult);
-
+				if (is_editmode == false) {
+					base = ED_armature_base_and_bone_from_select_buffer(bases, bases_len, hitresult, &bone);
+					if (bone != NULL) {
 						if (findunsel)
 							sel = (bone->flag & BONE_SELECTED);
 						else
@@ -114,9 +176,7 @@ void *get_bone_from_selectbuffer(
 					}
 				}
 				else {
-					bArmature *arm = obedit->data;
-
-					ebone = BLI_findlink(arm->edbo, hitresult);
+					base = ED_armature_base_and_ebone_from_select_buffer(bases, bases_len, hitresult, &ebone);
 					if (findunsel)
 						sel = (ebone->flag & BONE_SELECTED);
 					else
@@ -130,11 +190,15 @@ void *get_bone_from_selectbuffer(
 						if (do_nearest) {
 							if (minsel > buffer[4 * i + 1]) {
 								firstSel = data;
+								firstSel_base = base;
 								minsel = buffer[4 * i + 1];
 							}
 						}
 						else {
-							if (!firstSel) firstSel = data;
+							if (!firstSel) {
+								firstSel = data;
+								firstSel_base = base;
+							}
 							takeNext = 1;
 						}
 					}
@@ -142,12 +206,19 @@ void *get_bone_from_selectbuffer(
 						if (do_nearest) {
 							if (minunsel > buffer[4 * i + 1]) {
 								firstunSel = data;
+								firstunSel_base = base;
 								minunsel = buffer[4 * i + 1];
 							}
 						}
 						else {
-							if (!firstunSel) firstunSel = data;
-							if (takeNext) return data;
+							if (!firstunSel) {
+								firstunSel = data;
+								firstunSel_base = base;
+							}
+							if (takeNext) {
+								*r_base = base;
+								return data;
+							}
 						}
 					}
 				}
@@ -155,16 +226,22 @@ void *get_bone_from_selectbuffer(
 		}
 	}
 
-	if (firstunSel)
+	if (firstunSel) {
+		*r_base = firstunSel_base;
 		return firstunSel;
-	else
+	}
+	else {
+		*r_base = firstSel_base;
 		return firstSel;
+	}
 }
 
 /* used by posemode as well editmode */
 /* only checks scene->basact! */
 /* x and y are mouse coords (area space) */
-void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel)
+void *get_nearest_bone(
+        bContext *C, const int xy[2], bool findunsel,
+        Base **r_base)
 {
 	ViewContext vc;
 	rcti rect;
@@ -179,9 +256,27 @@ void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel)
 
 	hits = view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect, VIEW3D_SELECT_PICK_NEAREST);
 
-	if (hits > 0)
-		return get_bone_from_selectbuffer(vc.scene, vc.scene->basact, buffer, hits, findunsel, true);
+	*r_base = NULL;
+
+	if (hits > 0) {
+		uint bases_len = 0;
+		Base **bases;
+
+		if (vc.obedit != NULL) {
+			bases = BKE_view_layer_array_from_bases_in_mode(
+			        vc.view_layer, &bases_len, {
+			            .object_mode = OB_MODE_EDIT});
+		}
+		else {
+			bases = BKE_object_pose_base_array_get(vc.view_layer, &bases_len);
+		}
+
+		void *bone = get_bone_from_selectbuffer(
+		        bases, bases_len, vc.obedit != NULL, buffer, hits, findunsel, true, r_base);
 
+		MEM_freeN(bases);
+		return bone;
+	}
 	return NULL;
 }
 
@@ -194,16 +289,17 @@ static int armature_select_linked_invoke(bContext *C, wmOperator *op, const wmEv
 	bArmature *arm;
 	EditBone *bone, *curBone, *next;
 	const bool extend = RNA_boolean_get(op->ptr, "extend");
-	Object *obedit = CTX_data_edit_object(C);
-	arm = obedit->data;
 
 	view3d_operator_needs_opengl(C);
 
-	bone = get_nearest_bone(C, event->mval, !extend);
+	Base *base = NULL;
+	bone = get_nearest_bone(C, event->mval, !extend, &base);
 
 	if (!bone)
 		return OPERATOR_CANCELLED;
 
+	arm = base->object->data;
+
 	/* Select parents */
 	for (curBone = bone; curBone; curBone = next) {
 		if ((curBone->flag & BONE_UNSELECTABLE) == 0) {
@@ -246,7 +342,7 @@ static int armature_select_linked_invoke(bContext *C, wmOperator *op, const wmEv
 
 	ED_armature_edit_sync_selection(arm->edbo);
 
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, base->object);
 
 	return OPERATOR_FINISHED;
 }
@@ -292,36 +388,42 @@ static int selectbuffer_ret_hits_5(unsigned int *buffer, const int hits12, const
 /* note that BONE ROOT only gets drawn for root bones (or without IK) */
 static EditBone *get_nearest_editbonepoint(
         ViewContext *vc,
-        bool findunsel, bool use_cycle, int *r_selmask)
+        bool findunsel, bool use_cycle,
+        Base **r_base, int *r_selmask)
 {
-	bArmature *arm = (bArmature *)vc->obedit->data;
-	EditBone *ebone_next_act = arm->act_edbone;
-
-	EditBone *ebone;
-	rcti rect;
-	unsigned int buffer[MAXPICKBUF];
-	unsigned int hitresult, besthitresult = BONESEL_NOSEL;
-	int i, mindep = 5;
-	int hits12, hits5 = 0;
-
-	static int last_mval[2] = {-100, -100};
+	uint buffer[MAXPICKBUF];
+	struct {
+		uint hitresult;
+		Base *base;
+		EditBone *ebone;
+	} best = {
+		.hitresult = BONESEL_NOSEL,
+		.base = NULL,
+		.ebone = NULL,
+	};
 
 	/* find the bone after the current active bone, so as to bump up its chances in selection.
 	 * this way overlapping bones will cycle selection state as with objects. */
-	if (ebone_next_act &&
-	    EBONE_VISIBLE(arm, ebone_next_act) &&
-	    ebone_next_act->flag & (BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL))
+	EditBone *ebone_next_act = ((bArmature *)vc->obedit->data)->act_edbone;
 	{
-		ebone_next_act = ebone_next_act->next ? ebone_next_act->next : arm->edbo->first;
-	}
-	else {
-		ebone_next_act = NULL;
+		bArmature *arm = (bArmature *)vc->obedit->data;
+		if (ebone_next_act &&
+		    EBONE_VISIBLE(arm, ebone_next_act) &&
+		    ebone_next_act->flag & (BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL))
+		{
+			ebone_next_act = ebone_next_act->next ? ebone_next_act->next : arm->edbo->first;
+		}
+		else {
+			ebone_next_act = NULL;
+		}
 	}
 
 	bool do_nearest = false;
 
 	/* define if we use solid nearest select or not */
 	if (use_cycle) {
+		static int last_mval[2] = {-100, -100};
+
 		if (vc->v3d->drawtype > OB_WIRE) {
 			do_nearest = true;
 			if (len_manhattan_v2v2_int(vc->mval, last_mval) < 3) {
@@ -337,52 +439,64 @@ static EditBone *get_nearest_editbonepoint(
 	}
 
 	/* matching logic from 'mixed_bones_object_selectbuffer' */
-	const int select_mode = (do_nearest ? VIEW3D_SELECT_PICK_NEAREST : VIEW3D_SELECT_PICK_ALL);
 	int hits = 0;
 
 	/* we _must_ end cache before return, use 'goto cache_end' */
 	view3d_opengl_select_cache_begin();
 
-	BLI_rcti_init_pt_radius(&rect, vc->mval, 12);
-	hits12 = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, select_mode);
-	if (hits12 == 1) {
-		hits = selectbuffer_ret_hits_12(buffer, hits12);
-		goto cache_end;
-	}
-	else if (hits12 > 0) {
-		int offs;
-
-		offs = 4 * hits12;
-		BLI_rcti_init_pt_radius(&rect, vc->mval, 5);
-		hits5 = view3d_opengl_select(vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode);
-
-		if (hits5 == 1) {
-			hits = selectbuffer_ret_hits_5(buffer, hits12, hits5);
+	{
+		const int select_mode = (do_nearest ? VIEW3D_SELECT_PICK_NEAREST : VIEW3D_SELECT_PICK_ALL);
+		rcti rect;
+		BLI_rcti_init_pt_radius(&rect, vc->mval, 12);
+		const int hits12 = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, select_mode);
+		if (hits12 == 1) {
+			hits = selectbuffer_ret_hits_12(buffer, hits12);
 			goto cache_end;
 		}
+		else if (hits12 > 0) {
+			int offs;
+
+			offs = 4 * hits12;
+			BLI_rcti_init_pt_radius(&rect, vc->mval, 5);
+			const int hits5 = view3d_opengl_select(vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode);
+
+			if (hits5 == 1) {
+				hits = selectbuffer_ret_hits_5(buffer, hits12, hits5);
+				goto cache_end;
+			}
 
-		if      (hits5 > 0) { hits = selectbuffer_ret_hits_5(buffer,  hits12, hits5); goto cache_end; }
-		else                { hits = selectbuffer_ret_hits_12(buffer, hits12); goto cache_end; }
+			if      (hits5 > 0) { hits = selectbuffer_ret_hits_5(buffer,  hits12, hits5); goto cache_end; }
+			else                { hits = selectbuffer_ret_hits_12(buffer, hits12); goto cache_end; }
+		}
 	}
 
 cache_end:
 	view3d_opengl_select_cache_end();
 
+	uint bases_len;
+	Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data(vc->view_layer, &bases_len);
+
 	/* See if there are any selected bones in this group */
 	if (hits > 0) {
-
 		if (hits == 1) {
-			if (!(buffer[3] & BONESEL_NOSEL))
-				besthitresult = buffer[3];
+			if (!(buffer[3] & BONESEL_NOSEL)) {
+				best.hitresult = buffer[3];
+				best.base = ED_armature_base_and_ebone_from_select_buffer(
+				        bases, bases_len, best.hitresult, &best.ebone);
+			}
 		}
 		else {
-			for (i = 0; i < hits; i++) {
-				hitresult = buffer[3 + (i * 4)];
+			int dep_min = 5;
+			for (int i = 0; i < hits; i++) {
+				const uint hitresult = buffer[3 + (i * 4)];
 				if (!(hitresult & BONESEL_NOSEL)) {
-					int dep;
-
-					ebone = BLI_findlink(arm->edbo, hitresult & ~BONESEL_ANY);
+					Base *base = NULL;
+					EditBone *ebone;
+					base = ED_armature_base_and_ebone_from_select_buffer(bases, bases_len, hitresult, &ebone);
+					/* If this fails, selection code is setting the selection ID's incorrectly. */
+					BLI_assert(base && ebone);
 
+					int dep;
 					/* clicks on bone points get advantage */
 					if (hitresult & (BONESEL_ROOT | BONESEL_TIP)) {
 						/* but also the unselected one */
@@ -415,29 +529,36 @@ cache_end:
 						dep -= 1;
 					}
 
-					if (dep < mindep) {
-						mindep = dep;
-						besthitresult = hitresult;
+					if (dep < dep_min) {
+						dep_min = dep;
+						best.hitresult = hitresult;
+						best.base = base;
+						best.ebone = ebone;
 					}
 				}
 			}
 		}
 
-		if (!(besthitresult & BONESEL_NOSEL)) {
-
-			ebone = BLI_findlink(arm->edbo, besthitresult & ~BONESEL_ANY);
+		if (!(best.hitresult & BONESEL_NOSEL)) {
+			*r_base = best.base;
 
 			*r_selmask = 0;
-			if (besthitresult & BONESEL_ROOT)
+			if (best.hitresult & BONESEL_ROOT) {
 				*r_selmask |= BONE_ROOTSEL;
-			if (besthitresult & BONESEL_TIP)
+			}
+			if (best.hitresult & BONESEL_TIP) {
 				*r_selmask |= BONE_TIPSEL;
-			if (besthitresult & BONESEL_BONE)
+			}
+			if (best.hitresult & BONESEL_BONE) {
 				*r_selmask |= BONE_SELECTED;
-			return ebone;
+			}
+			MEM_freeN(bases);
+			return best.ebone;
 		}
 	}
 	*r_selmask = 0;
+	*r_base = NULL;
+	MEM_freeN(bases);
 	return NULL;
 }
 
@@ -466,6 +587,23 @@ void ED_armature_edit_deselect_all_visible(Object *obedit)
 	ED_armature_edit_sync_selection(arm->edbo);
 }
 
+
+void ED_armature_edit_deselect_all_multi(struct Object **objects, uint objects_len)
+{
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		ED_armature_edit_deselect_all(obedit);
+	}
+}
+
+void ED_armature_edit_deselect_all_visible_multi(struct Object **objects, uint objects_len)
+{
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		ED_armature_edit_deselect_all_visible(obedit);
+	}
+}
+
 /* accounts for connected parents */
 static int ebone_select_flag(EditBone *ebone)
 {
@@ -480,25 +618,25 @@ static int ebone_select_flag(EditBone *ebone)
 /* context: editmode armature in view3d */
 bool ED_armature_edit_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
 {
-	Object *obedit = CTX_data_edit_object(C);
 	ViewContext vc;
 	EditBone *nearBone = NULL;
 	int selmask;
+	Base *basact = NULL;
 
 	ED_view3d_viewcontext_init(C, &vc);
 	vc.mval[0] = mval[0];
 	vc.mval[1] = mval[1];
 
-	if (BIF_sk_selectStroke(C, mval, extend)) {
-		return true;
-	}
-
-	nearBone = get_nearest_editbonepoint(&vc, true, true, &selmask);
+	nearBone = get_nearest_editbonepoint(&vc, true, true, &basact, &selmask);
 	if (nearBone) {
-		bArmature *arm = obedit->data;
+		ED_view3d_viewcontext_init_object(&vc, basact->object);
+		bArmature *arm = vc.obedit->data;
 
 		if (!extend && !deselect && !toggle) {
-			ED_armature_edit_deselect_all(obedit);
+			uint objects_len = 0;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer, &objects_len);
+			ED_armature_edit_deselect_all_multi(objects, objects_len);
+			MEM_freeN(objects);
 		}
 
 		/* by definition the non-root connected bones have no root point drawn,
@@ -576,9 +714,14 @@ bool ED_armature_edit_select_pick(bContext *C, const int mval[2], bool extend, b
 			if (ebone_select_flag(nearBone)) {
 				arm->act_edbone = nearBone;
 			}
+
+			if (vc.view_layer->basact != basact) {
+				vc.view_layer->basact = basact;
+				WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, vc.scene);
+			}
 		}
 
-		WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, vc.obedit);
+		WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, basact->object);
 		return true;
 	}
 
@@ -1291,17 +1434,23 @@ static int armature_shortest_path_pick_invoke(bContext *C, wmOperator *op, const
 	EditBone *ebone_isect_parent = NULL;
 	EditBone *ebone_isect_child[2];
 	bool changed;
+	Base *base_dst = NULL;
 
 	view3d_operator_needs_opengl(C);
 
 	ebone_src = arm->act_edbone;
-	ebone_dst = get_nearest_bone(C, event->mval, false);
+	ebone_dst = get_nearest_bone(C, event->mval, false, &base_dst);
 
 	/* fallback to object selection */
 	if (ELEM(NULL, ebone_src, ebone_dst) || (ebone_src == ebone_dst)) {
 		return OPERATOR_PASS_THROUGH;
 	}
 
+	if (base_dst && base_dst->object != obedit) {
+		/* Disconnected, ignore. */
+		return OPERATOR_CANCELLED;
+	}
+
 	ebone_isect_child[0] = ebone_src;
 	ebone_isect_child[1] = ebone_dst;
 
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c
index 8ab8d60af75..463e00957e6 100644
--- a/source/blender/editors/armature/armature_skinning.c
+++ b/source/blender/editors/armature/armature_skinning.c
@@ -43,12 +43,15 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
+#include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
 #include "BKE_subsurf.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 #include "ED_mesh.h"
 
@@ -57,13 +60,9 @@
 #include "armature_intern.h"
 #include "meshlaplacian.h"
 
-#if 0
-#include "reeb.h"
-#endif
-
 /* ********************************** Bone Skinning *********************************************** */
 
-static int bone_skinnable_cb(Object *ob, Bone *bone, void *datap)
+static int bone_skinnable_cb(Object *UNUSED(ob), Bone *bone, void *datap)
 {
 	/* Bones that are deforming
 	 * are regarded to be "skinnable" and are eligible for
@@ -89,9 +88,9 @@ static int bone_skinnable_cb(Object *ob, Bone *bone, void *datap)
 	 */
 	Bone ***hbone;
 	int a, segments;
-	struct { Object *armob; void *list; int heat; } *data = datap;
+	struct { Object *armob; void *list; int heat; bool is_weight_paint; } *data = datap;
 
-	if (!(ob->mode & OB_MODE_WEIGHT_PAINT) || !(bone->flag & BONE_HIDDEN_P)) {
+	if (!(data->is_weight_paint) || !(bone->flag & BONE_HIDDEN_P)) {
 		if (!(bone->flag & BONE_NO_DEFORM)) {
 			if (data->heat && data->armob->pose && BKE_pose_channel_find_name(data->armob->pose, bone->name))
 				segments = bone->segments;
@@ -154,18 +153,17 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap)
 	 */
 	bDeformGroup ***hgroup, *defgroup = NULL;
 	int a, segments;
-	struct { Object *armob; void *list; int heat; } *data = datap;
-	int wpmode = (ob->mode & OB_MODE_WEIGHT_PAINT);
+	struct { Object *armob; void *list; int heat; bool is_weight_paint; } *data = datap;
 	bArmature *arm = data->armob->data;
 
-	if (!wpmode || !(bone->flag & BONE_HIDDEN_P)) {
+	if (!data->is_weight_paint || !(bone->flag & BONE_HIDDEN_P)) {
 		if (!(bone->flag & BONE_NO_DEFORM)) {
 			if (data->heat && data->armob->pose && BKE_pose_channel_find_name(data->armob->pose, bone->name))
 				segments = bone->segments;
 			else
 				segments = 1;
 
-			if (!wpmode || ((arm->layer & bone->layer) && (bone->flag & BONE_SELECTED))) {
+			if (!data->is_weight_paint || ((arm->layer & bone->layer) && (bone->flag & BONE_SELECTED))) {
 				if (!(defgroup = defgroup_find_name(ob, bone->name))) {
 					defgroup = BKE_object_defgroup_add_name(ob, bone->name);
 				}
@@ -189,9 +187,10 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap)
 	return 0;
 }
 
-static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], int numbones, Bone **bonelist,
-                                    bDeformGroup **dgrouplist, bDeformGroup **dgroupflip,
-                                    float (*root)[3], float (*tip)[3], const int *selected, float scale)
+static void envelope_bone_weighting(
+        Object *ob, Mesh *mesh, float (*verts)[3], int numbones, Bone **bonelist,
+        bDeformGroup **dgrouplist, bDeformGroup **dgroupflip,
+        float (*root)[3], float (*tip)[3], const int *selected, float scale)
 {
 	/* Create vertex group weights from envelopes */
 
@@ -247,8 +246,9 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i
 	}
 }
 
-static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob, Object *par,
-                                 int heat, const bool mirror)
+static void add_verts_to_dgroups(
+        ReportList *reports, Depsgraph *depsgraph, Scene *scene, Object *ob, Object *par,
+        int heat, const bool mirror)
 {
 	/* This functions implements the automatic computation of vertex group
 	 * weights, either through envelopes or using a heat equilibrium.
@@ -272,12 +272,13 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
 	float (*root)[3], (*tip)[3], (*verts)[3];
 	int *selected;
 	int numbones, vertsfilled = 0, i, j, segments = 0;
-	int wpmode = (ob->mode & OB_MODE_WEIGHT_PAINT);
-	struct { Object *armob; void *list; int heat; } looper_data;
+	const bool wpmode = (ob->mode & OB_MODE_WEIGHT_PAINT);
+	struct { Object *armob; void *list; int heat; bool is_weight_paint; } looper_data;
 
 	looper_data.armob = par;
 	looper_data.heat = heat;
 	looper_data.list = NULL;
+	looper_data.is_weight_paint = wpmode;
 
 	/* count the number of skinnable bones */
 	numbones = bone_looper(ob, arm->bonebase.first, &looper_data, bone_skinnable_cb);
@@ -372,7 +373,7 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
 
 	if (wpmode) {
 		/* if in weight paint mode, use final verts from derivedmesh */
-		DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
+		DerivedMesh *dm = mesh_get_derived_final(depsgraph, scene, ob, CD_MASK_BAREMESH);
 
 		if (dm->foreachMappedVert) {
 			mesh_get_mapped_verts_coords(dm, verts, mesh->totvert);
@@ -400,15 +401,17 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
 	if (heat) {
 		const char *error = NULL;
 
-		heat_bone_weighting(ob, mesh, verts, numbones, dgrouplist, dgroupflip,
-		                    root, tip, selected, &error);
+		heat_bone_weighting(
+		        ob, mesh, verts, numbones, dgrouplist, dgroupflip,
+		        root, tip, selected, &error);
 		if (error) {
 			BKE_report(reports, RPT_WARNING, error);
 		}
 	}
 	else {
-		envelope_bone_weighting(ob, mesh, verts, numbones, bonelist, dgrouplist,
-		                        dgroupflip, root, tip, selected, mat4_to_scale(par->obmat));
+		envelope_bone_weighting(
+		        ob, mesh, verts, numbones, bonelist, dgrouplist,
+		        dgroupflip, root, tip, selected, mat4_to_scale(par->obmat));
 	}
 
 	/* only generated in some cases but can call anyway */
@@ -424,8 +427,9 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
 	MEM_freeN(verts);
 }
 
-void ED_object_vgroup_calc_from_armature(ReportList *reports, Scene *scene, Object *ob, Object *par,
-                                  const int mode, const bool mirror)
+void ED_object_vgroup_calc_from_armature(
+        ReportList *reports, Depsgraph *depsgraph, Scene *scene, Object *ob, Object *par,
+        const int mode, const bool mirror)
 {
 	/* Lets try to create some vertex groups
 	 * based on the bones of the parent armature.
@@ -451,6 +455,6 @@ void ED_object_vgroup_calc_from_armature(ReportList *reports, Scene *scene, Obje
 		 * that are populated with the vertices for which the
 		 * bone is closest.
 		 */
-		add_verts_to_dgroups(reports, scene, ob, par, (mode == ARM_GROUPS_AUTO), mirror);
+		add_verts_to_dgroups(reports, depsgraph, scene, ob, par, (mode == ARM_GROUPS_AUTO), mirror);
 	}
 }
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index f0e4d5e1102..a8116ce26cf 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -39,11 +39,12 @@
 #include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_main.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 #include "ED_util.h"
 
@@ -684,7 +685,7 @@ void ED_armature_from_edit(bArmature *arm)
 		}
 	}
 
-	DAG_id_tag_update(&arm->id, 0);
+	DEG_id_tag_update(&arm->id, 0);
 }
 
 void ED_armature_edit_free(struct bArmature *arm)
@@ -715,8 +716,6 @@ void ED_armature_to_edit(bArmature *arm)
 	ED_armature_edit_free(arm);
 	arm->edbo = MEM_callocN(sizeof(ListBase), "edbo armature");
 	arm->act_edbone = make_boneList(arm->edbo, &arm->bonebase, NULL, arm->act_bone);
-
-//	BIF_freeTemplates(); /* force template update when entering editmode */
 }
 
 /* *************************************************************** */
diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c
deleted file mode 100644
index f0135676523..00000000000
--- a/source/blender/editors/armature/editarmature_generate.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/editarmature_generate.c
- *  \ingroup edarmature
- */
-
-#include "DNA_scene_types.h"
-#include "DNA_armature_types.h"
-
-#include "BLI_math.h"
-#include "BLI_graph.h"
-
-#include "ED_armature.h"
-#include "BIF_generate.h"
-
-void setBoneRollFromNormal(EditBone *bone, const float no[3], float UNUSED(invmat[4][4]), float tmat[3][3])
-{
-	if (no != NULL && !is_zero_v3(no)) {
-		float normal[3];
-
-		copy_v3_v3(normal, no);
-		mul_m3_v3(tmat, normal);
-
-		bone->roll = ED_armature_ebone_roll_to_vector(bone, normal, false);
-	}
-}
-
-float calcArcCorrelation(BArcIterator *iter, int start, int end, float v0[3], float n[3])
-{
-	int len = 2 + abs(end - start);
-
-	if (len > 2) {
-		float avg_t = 0.0f;
-		float s_t = 0.0f;
-		float s_xyz = 0.0f;
-		int i;
-
-		/* First pass, calculate average */
-		for (i = start; i <= end; i++) {
-			float v[3];
-
-			IT_peek(iter, i);
-			sub_v3_v3v3(v, iter->p, v0);
-			avg_t += dot_v3v3(v, n);
-		}
-
-		avg_t /= dot_v3v3(n, n);
-		avg_t += 1.0f; /* adding start (0) and end (1) values */
-		avg_t /= len;
-
-		/* Second pass, calculate s_xyz and s_t */
-		for (i = start; i <= end; i++) {
-			float v[3], d[3];
-			float dt;
-
-			IT_peek(iter, i);
-			sub_v3_v3v3(v, iter->p, v0);
-			project_v3_v3v3(d, v, n);
-			sub_v3_v3(v, d);
-
-			dt = len_v3(d) - avg_t;
-
-			s_t += dt * dt;
-			s_xyz += dot_v3v3(v, v);
-		}
-
-		/* adding start(0) and end(1) values to s_t */
-		s_t += (avg_t * avg_t) + (1 - avg_t) * (1 - avg_t);
-
-		return 1.0f - s_xyz / s_t;
-	}
-	else {
-		return 1.0f;
-	}
-}
-
-int nextFixedSubdivision(ToolSettings *toolsettings, BArcIterator *iter, int start, int end, float UNUSED(head[3]), float p[3])
-{
-	static float stroke_length = 0;
-	static float current_length;
-	static char n;
-	float *v1, *v2;
-	float length_threshold;
-	int i;
-
-	if (stroke_length == 0) {
-		current_length = 0;
-
-		IT_peek(iter, start);
-		v1 = iter->p;
-
-		for (i = start + 1; i <= end; i++) {
-			IT_peek(iter, i);
-			v2 = iter->p;
-
-			stroke_length += len_v3v3(v1, v2);
-
-			v1 = v2;
-		}
-
-		n = 0;
-		current_length = 0;
-	}
-
-	n++;
-
-	length_threshold = n * stroke_length / toolsettings->skgen_subdivision_number;
-
-	IT_peek(iter, start);
-	v1 = iter->p;
-
-	/* < and not <= because we don't care about end, it is P_EXACT anyway */
-	for (i = start + 1; i < end; i++) {
-		IT_peek(iter, i);
-		v2 = iter->p;
-
-		current_length += len_v3v3(v1, v2);
-
-		if (current_length >= length_threshold) {
-			copy_v3_v3(p, v2);
-			return i;
-		}
-
-		v1 = v2;
-	}
-
-	stroke_length = 0;
-
-	return -1;
-}
-int nextAdaptativeSubdivision(ToolSettings *toolsettings, BArcIterator *iter, int start, int end, float head[3], float p[3])
-{
-	float correlation_threshold = toolsettings->skgen_correlation_limit;
-	float *start_p;
-	float n[3];
-	int i;
-
-	IT_peek(iter, start);
-	start_p = iter->p;
-
-	for (i = start + 2; i <= end; i++) {
-		/* Calculate normal */
-		IT_peek(iter, i);
-		sub_v3_v3v3(n, iter->p, head);
-
-		if (calcArcCorrelation(iter, start, i, start_p, n) < correlation_threshold) {
-			IT_peek(iter, i - 1);
-			copy_v3_v3(p, iter->p);
-			return i - 1;
-		}
-	}
-
-	return -1;
-}
-
-int nextLengthSubdivision(ToolSettings *toolsettings, BArcIterator *iter, int start, int end, float head[3], float p[3])
-{
-	float lengthLimit = toolsettings->skgen_length_limit;
-	int same = 1;
-	int i;
-
-	i = start + 1;
-	while (i <= end) {
-		float *vec0;
-		float *vec1;
-
-		IT_peek(iter, i - 1);
-		vec0 = iter->p;
-
-		IT_peek(iter, i);
-		vec1 = iter->p;
-
-		/* If lengthLimit hits the current segment */
-		if (len_v3v3(vec1, head) > lengthLimit) {
-			if (same == 0) {
-				float dv[3], off[3];
-				float a, b, c, f;
-
-				/* Solve quadratic distance equation */
-				sub_v3_v3v3(dv, vec1, vec0);
-				a = dot_v3v3(dv, dv);
-
-				sub_v3_v3v3(off, vec0, head);
-				b = 2 * dot_v3v3(dv, off);
-
-				c = dot_v3v3(off, off) - (lengthLimit * lengthLimit);
-
-				f = (-b + sqrtf(b * b - 4 * a * c)) / (2 * a);
-
-				//printf("a %f, b %f, c %f, f %f\n", a, b, c, f);
-
-				if (isnan(f) == 0 && f < 1.0f) {
-					copy_v3_v3(p, dv);
-					mul_v3_fl(p, f);
-					add_v3_v3(p, vec0);
-				}
-				else {
-					copy_v3_v3(p, vec1);
-				}
-			}
-			else {
-				float dv[3];
-
-				sub_v3_v3v3(dv, vec1, vec0);
-				normalize_v3(dv);
-
-				copy_v3_v3(p, dv);
-				mul_v3_fl(p, lengthLimit);
-				add_v3_v3(p, head);
-			}
-
-			return i - 1; /* restart at lower bound */
-		}
-		else {
-			i++;
-			same = 0; // Reset same
-		}
-	}
-
-	return -1;
-}
-
-EditBone *subdivideArcBy(ToolSettings *toolsettings, bArmature *arm, ListBase *UNUSED(editbones), BArcIterator *iter,
-                         float invmat[4][4], float tmat[3][3], NextSubdivisionFunc next_subdividion)
-{
-	EditBone *lastBone = NULL;
-	EditBone *child = NULL;
-	EditBone *parent = NULL;
-	float *normal = NULL;
-	float size_buffer = 1.2;
-	int bone_start = 0;
-	int end = iter->length;
-	int index;
-
-	IT_head(iter);
-
-	parent = ED_armature_ebone_add(arm, "Bone");
-	copy_v3_v3(parent->head, iter->p);
-
-	if (iter->size > FLT_EPSILON) {
-		parent->rad_head = iter->size * size_buffer;
-	}
-
-	normal = iter->no;
-
-	index = next_subdividion(toolsettings, iter, bone_start, end, parent->head, parent->tail);
-	while (index != -1) {
-		IT_peek(iter, index);
-
-		child = ED_armature_ebone_add(arm, "Bone");
-		copy_v3_v3(child->head, parent->tail);
-		child->parent = parent;
-		child->flag |= BONE_CONNECTED;
-
-		if (iter->size > FLT_EPSILON) {
-			child->rad_head = iter->size * size_buffer;
-			parent->rad_tail = iter->size * size_buffer;
-		}
-
-		/* going to next bone, fix parent */
-		mul_m4_v3(invmat, parent->tail);
-		mul_m4_v3(invmat, parent->head);
-		setBoneRollFromNormal(parent, normal, invmat, tmat);
-
-		parent = child; // new child is next parent
-		bone_start = index; // start next bone from current index
-
-		normal = iter->no; /* use normal at head, not tail */
-
-		index = next_subdividion(toolsettings, iter, bone_start, end, parent->head, parent->tail);
-	}
-
-	iter->tail(iter);
-
-	copy_v3_v3(parent->tail, iter->p);
-	if (iter->size > FLT_EPSILON) {
-		parent->rad_tail = iter->size * size_buffer;
-	}
-
-	/* fix last bone */
-	mul_m4_v3(invmat, parent->tail);
-	mul_m4_v3(invmat, parent->head);
-	setBoneRollFromNormal(parent, iter->no, invmat, tmat);
-	lastBone = parent;
-
-	return lastBone;
-}
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
deleted file mode 100644
index ad0025955c2..00000000000
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ /dev/null
@@ -1,2641 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Martin Poirier
- *
- * ***** END GPL LICENSE BLOCK *****
- * autoarmature.c: Interface for automagically manipulating armature (retarget, created, ...)
- */
-
-/** \file blender/editors/armature/editarmature_retarget.c
- *  \ingroup edarmature
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "PIL_time.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_object_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-#include "BKE_constraint.h"
-#include "BKE_armature.h"
-#include "BKE_context.h"
-
-#include "ED_armature.h"
-#include "ED_undo.h"
-
-#include "BIF_retarget.h"
-
-#include "armature_intern.h"
-
-/************ RIG RETARGET DATA STRUCTURES ***************/
-
-typedef struct MemoNode {
-	float weight;
-	int next;
-} MemoNode;
-
-typedef struct RetargetParam {
-	RigGraph    *rigg;
-	RigArc      *iarc;
-	RigNode     *inode_start;
-	bContext    *context;
-} RetargetParam;
-
-typedef enum  {
-	RETARGET_LENGTH,
-	RETARGET_AGGRESSIVE
-} RetargetMode;
-
-typedef enum {
-	METHOD_BRUTE_FORCE = 0,
-	METHOD_MEMOIZE = 1
-} RetargetMethod;
-
-typedef enum {
-	ARC_FREE = 0,
-	ARC_TAKEN = 1,
-	ARC_USED = 2
-} ArcUsageFlags;
-
-static RigGraph *GLOBAL_RIGG = NULL;
-
-/*******************************************************************************************************/
-
-void exec_retargetArctoArc(TaskPool * __restrict pool, void *taskdata, int threadid);
-
-static void RIG_calculateEdgeAngles(RigEdge *edge_first, RigEdge *edge_second);
-float rollBoneByQuat(EditBone *bone, float old_up_axis[3], float qrot[4]);
-
-/* two levels */
-#define SHAPE_LEVELS (SHAPE_RADIX * SHAPE_RADIX)
-
-/*********************************** EDITBONE UTILS ****************************************************/
-
-static int countEditBoneChildren(ListBase *list, EditBone *parent)
-{
-	EditBone *ebone;
-	int count = 0;
-
-	for (ebone = list->first; ebone; ebone = ebone->next) {
-		if (ebone->parent == parent) {
-			count++;
-		}
-	}
-
-	return count;
-}
-
-static EditBone *nextEditBoneChild(ListBase *list, EditBone *parent, int n)
-{
-	EditBone *ebone;
-
-	for (ebone = list->first; ebone; ebone = ebone->next) {
-		if (ebone->parent == parent) {
-			if (n == 0) {
-				return ebone;
-			}
-			n--;
-		}
-	}
-
-	return NULL;
-}
-
-static void getEditBoneRollUpAxis(EditBone *bone, float roll, float up_axis[3])
-{
-	float mat[3][3], nor[3];
-
-	sub_v3_v3v3(nor, bone->tail, bone->head);
-
-	vec_roll_to_mat3(nor, roll, mat);
-	copy_v3_v3(up_axis, mat[2]);
-}
-
-static float rollBoneByQuatAligned(EditBone *bone, float old_up_axis[3], float qrot[4], float qroll[4], float aligned_axis[3])
-{
-	float nor[3], new_up_axis[3], x_axis[3], z_axis[3];
-
-	copy_v3_v3(new_up_axis, old_up_axis);
-	mul_qt_v3(qrot, new_up_axis);
-
-	sub_v3_v3v3(nor, bone->tail, bone->head);
-
-	cross_v3_v3v3(x_axis, nor, aligned_axis);
-	cross_v3_v3v3(z_axis, x_axis, nor);
-
-	normalize_v3(new_up_axis);
-	normalize_v3(x_axis);
-	normalize_v3(z_axis);
-
-	if (dot_v3v3(new_up_axis, x_axis) < 0) {
-		negate_v3(x_axis);
-	}
-
-	if (dot_v3v3(new_up_axis, z_axis) < 0) {
-		negate_v3(z_axis);
-	}
-
-	if (angle_normalized_v3v3(x_axis, new_up_axis) < angle_normalized_v3v3(z_axis, new_up_axis)) {
-		rotation_between_vecs_to_quat(qroll, new_up_axis, x_axis); /* set roll rotation quat */
-		return ED_armature_ebone_roll_to_vector(bone, x_axis, false);
-	}
-	else {
-		rotation_between_vecs_to_quat(qroll, new_up_axis, z_axis); /* set roll rotation quat */
-		return ED_armature_ebone_roll_to_vector(bone, z_axis, false);
-	}
-}
-
-static float rollBoneByQuatJoint(RigEdge *edge, RigEdge *previous, float qrot[4], float qroll[4], float up_axis[3])
-{
-	if (previous == NULL) {
-		/* default to up_axis if no previous */
-		return rollBoneByQuatAligned(edge->bone, edge->up_axis, qrot, qroll, up_axis);
-	}
-	else {
-		float new_up_axis[3];
-		float vec_first[3], vec_second[3], normal[3];
-
-		if (previous->bone) {
-			sub_v3_v3v3(vec_first, previous->bone->tail, previous->bone->head);
-		}
-		else if (previous->prev->bone) {
-			sub_v3_v3v3(vec_first, edge->bone->head, previous->prev->bone->tail);
-		}
-		else {
-			/* default to up_axis if first bone in the chain is an offset */
-			return rollBoneByQuatAligned(edge->bone, edge->up_axis, qrot, qroll, up_axis);
-		}
-
-		sub_v3_v3v3(vec_second, edge->bone->tail, edge->bone->head);
-
-		normalize_v3(vec_first);
-		normalize_v3(vec_second);
-
-		cross_v3_v3v3(normal, vec_first, vec_second);
-		normalize_v3(normal);
-
-		axis_angle_to_quat(qroll, vec_second, edge->up_angle);
-
-		mul_qt_v3(qroll, normal);
-
-		copy_v3_v3(new_up_axis, edge->up_axis);
-		mul_qt_v3(qrot, new_up_axis);
-
-		normalize_v3(new_up_axis);
-
-		/* real qroll between normal and up_axis */
-		rotation_between_vecs_to_quat(qroll, new_up_axis, normal);
-
-		return ED_armature_ebone_roll_to_vector(edge->bone, normal, false);
-	}
-}
-
-float rollBoneByQuat(EditBone *bone, float old_up_axis[3], float qrot[4])
-{
-	float new_up_axis[3];
-
-	copy_v3_v3(new_up_axis, old_up_axis);
-	mul_qt_v3(qrot, new_up_axis);
-
-	return ED_armature_ebone_roll_to_vector(bone, new_up_axis, false);
-}
-
-/************************************ DESTRUCTORS ******************************************************/
-
-static void RIG_freeRigArc(BArc *arc)
-{
-	BLI_freelistN(&((RigArc *)arc)->edges);
-}
-
-void RIG_freeRigGraph(BGraph *rg)
-{
-	RigGraph *rigg = (RigGraph *)rg;
-	BNode *node;
-	BArc *arc;
-
-	BLI_task_pool_free(rigg->task_pool);
-	BLI_task_scheduler_free(rigg->task_scheduler);
-
-	if (rigg->link_mesh) {
-		REEB_freeGraph(rigg->link_mesh);
-	}
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		RIG_freeRigArc(arc);
-	}
-	BLI_freelistN(&rg->arcs);
-
-	for (node = rg->nodes.first; node; node = node->next) {
-		BLI_freeNode(rg, (BNode *)node);
-	}
-	BLI_freelistN(&rg->nodes);
-
-	BLI_freelistN(&rigg->controls);
-
-	BLI_ghash_free(rigg->bones_map, NULL, NULL);
-	BLI_ghash_free(rigg->controls_map, NULL, NULL);
-
-	if (rigg->flag & RIG_FREE_BONELIST) {
-		BLI_freelistN(rigg->editbones);
-		MEM_freeN(rigg->editbones);
-	}
-
-	MEM_freeN(rg);
-}
-
-/************************************* ALLOCATORS ******************************************************/
-
-static RigGraph *newRigGraph(void)
-{
-	RigGraph *rg;
-	int totthread;
-
-	rg = MEM_callocN(sizeof(RigGraph), "rig graph");
-
-	rg->head = NULL;
-
-	rg->bones_map = BLI_ghash_str_new("newRigGraph bones gh");
-	rg->controls_map = BLI_ghash_str_new("newRigGraph cont gh");
-
-	rg->free_arc = RIG_freeRigArc;
-	rg->free_node = NULL;
-
-#ifdef USE_THREADS
-	totthread = TASK_SCHEDULER_AUTO_THREADS;
-#else
-	totthread = TASK_SCHEDULER_SINGLE_THREAD;
-#endif
-
-	rg->task_scheduler = BLI_task_scheduler_create(totthread);
-	rg->task_pool = BLI_task_pool_create(rg->task_scheduler, NULL);
-
-	return rg;
-}
-
-static RigArc *newRigArc(RigGraph *rg)
-{
-	RigArc *arc;
-
-	arc = MEM_callocN(sizeof(RigArc), "rig arc");
-	arc->count = 0;
-	BLI_addtail(&rg->arcs, arc);
-
-	return arc;
-}
-
-static RigControl *newRigControl(RigGraph *rg)
-{
-	RigControl *ctrl;
-
-	ctrl = MEM_callocN(sizeof(RigControl), "rig control");
-
-	BLI_addtail(&rg->controls, ctrl);
-
-	return ctrl;
-}
-
-static RigNode *newRigNodeHead(RigGraph *rg, RigArc *arc, float p[3])
-{
-	RigNode *node;
-	node = MEM_callocN(sizeof(RigNode), "rig node");
-	BLI_addtail(&rg->nodes, node);
-
-	copy_v3_v3(node->p, p);
-	node->degree = 1;
-	node->arcs = NULL;
-
-	arc->head = node;
-
-	return node;
-}
-
-static void addRigNodeHead(RigGraph *UNUSED(rg), RigArc *arc, RigNode *node)
-{
-	node->degree++;
-
-	arc->head = node;
-}
-
-static RigNode *newRigNode(RigGraph *rg, float p[3])
-{
-	RigNode *node;
-	node = MEM_callocN(sizeof(RigNode), "rig node");
-	BLI_addtail(&rg->nodes, node);
-
-	copy_v3_v3(node->p, p);
-	node->degree = 0;
-	node->arcs = NULL;
-
-	return node;
-}
-
-static RigNode *newRigNodeTail(RigGraph *rg, RigArc *arc, float p[3])
-{
-	RigNode *node = newRigNode(rg, p);
-
-	node->degree = 1;
-	arc->tail = node;
-
-	return node;
-}
-
-static void RIG_appendEdgeToArc(RigArc *arc, RigEdge *edge)
-{
-	BLI_addtail(&arc->edges, edge);
-
-	if (edge->prev == NULL) {
-		copy_v3_v3(edge->head, arc->head->p);
-	}
-	else {
-		RigEdge *last_edge = edge->prev;
-		copy_v3_v3(edge->head, last_edge->tail);
-		RIG_calculateEdgeAngles(last_edge, edge);
-	}
-
-	edge->length = len_v3v3(edge->head, edge->tail);
-
-	arc->length += edge->length;
-
-	arc->count += 1;
-}
-
-static void RIG_addEdgeToArc(RigArc *arc, float tail[3], EditBone *bone)
-{
-	RigEdge *edge;
-
-	edge = MEM_callocN(sizeof(RigEdge), "rig edge");
-
-	copy_v3_v3(edge->tail, tail);
-	edge->bone = bone;
-
-	if (bone) {
-		getEditBoneRollUpAxis(bone, bone->roll, edge->up_axis);
-	}
-
-	RIG_appendEdgeToArc(arc, edge);
-}
-/************************************** CLONING TEMPLATES **********************************************/
-
-static void renameTemplateBone(char *name, char *template_name, ListBase *editbones, char *side_string, char *num_string)
-{
-	int i, j;
-
-	for (i = 0, j = 0; i < (MAXBONENAME - 1) && j < (MAXBONENAME - 1) && template_name[i] != '\0'; i++) {
-		if (template_name[i] == '&') {
-			if (template_name[i + 1] == 'S' || template_name[i + 1] == 's') {
-				j += BLI_strncpy_rlen(name + j, side_string, MAXBONENAME);
-				i++;
-			}
-			else if (template_name[i + 1] == 'N' || template_name[i + 1] == 'n') {
-				j += BLI_strncpy_rlen(name + j, num_string, MAXBONENAME);
-				i++;
-			}
-			else {
-				name[j] = template_name[i];
-				j++;
-			}
-		}
-		else {
-			name[j] = template_name[i];
-			j++;
-		}
-	}
-
-	name[j] = '\0';
-
-	ED_armature_ebone_unique_name(editbones, name, NULL);
-}
-
-static RigControl *cloneControl(RigGraph *rg, RigGraph *src_rg, RigControl *src_ctrl, GHash *ptr_hash, char *side_string, char *num_string)
-{
-	RigControl *ctrl;
-	char name[MAXBONENAME];
-
-	ctrl = newRigControl(rg);
-
-	copy_v3_v3(ctrl->head, src_ctrl->head);
-	copy_v3_v3(ctrl->tail, src_ctrl->tail);
-	copy_v3_v3(ctrl->up_axis, src_ctrl->up_axis);
-	copy_v3_v3(ctrl->offset, src_ctrl->offset);
-
-	ctrl->tail_mode = src_ctrl->tail_mode;
-	ctrl->flag = src_ctrl->flag;
-
-	renameTemplateBone(name, src_ctrl->bone->name, rg->editbones, side_string, num_string);
-	ctrl->bone = duplicateEditBoneObjects(src_ctrl->bone, name, rg->editbones, src_rg->ob, rg->ob);
-	ctrl->bone->flag &= ~(BONE_TIPSEL | BONE_SELECTED | BONE_ROOTSEL);
-	BLI_ghash_insert(ptr_hash, src_ctrl->bone, ctrl->bone);
-
-	ctrl->link = src_ctrl->link;
-	ctrl->link_tail = src_ctrl->link_tail;
-
-	return ctrl;
-}
-
-static RigArc *cloneArc(RigGraph *rg, RigGraph *src_rg, RigArc *src_arc, GHash *ptr_hash, char *side_string, char *num_string)
-{
-	RigEdge *src_edge;
-	RigArc  *arc;
-
-	arc = newRigArc(rg);
-
-	arc->head = BLI_ghash_lookup(ptr_hash, src_arc->head);
-	arc->tail = BLI_ghash_lookup(ptr_hash, src_arc->tail);
-
-	arc->head->degree++;
-	arc->tail->degree++;
-
-	arc->length = src_arc->length;
-
-	arc->count = src_arc->count;
-
-	for (src_edge = src_arc->edges.first; src_edge; src_edge = src_edge->next) {
-		RigEdge *edge;
-
-		edge = MEM_callocN(sizeof(RigEdge), "rig edge");
-
-		copy_v3_v3(edge->head, src_edge->head);
-		copy_v3_v3(edge->tail, src_edge->tail);
-		copy_v3_v3(edge->up_axis, src_edge->up_axis);
-
-		edge->length = src_edge->length;
-		edge->angle = src_edge->angle;
-		edge->up_angle = src_edge->up_angle;
-
-		if (src_edge->bone != NULL) {
-			char name[MAXBONENAME];
-			renameTemplateBone(name, src_edge->bone->name, rg->editbones, side_string, num_string);
-			edge->bone = duplicateEditBoneObjects(src_edge->bone, name, rg->editbones, src_rg->ob, rg->ob);
-			edge->bone->flag &= ~(BONE_TIPSEL | BONE_SELECTED | BONE_ROOTSEL);
-			BLI_ghash_insert(ptr_hash, src_edge->bone, edge->bone);
-		}
-
-		BLI_addtail(&arc->edges, edge);
-	}
-
-	return arc;
-}
-
-static RigGraph *cloneRigGraph(RigGraph *src, ListBase *editbones, Object *ob, char *side_string, char *num_string)
-{
-	GHash   *ptr_hash;
-	RigNode *node;
-	RigArc  *arc;
-	RigControl *ctrl;
-	RigGraph *rg;
-
-	ptr_hash = BLI_ghash_ptr_new("cloneRigGraph gh");
-
-	rg = newRigGraph();
-
-	rg->ob = ob;
-	rg->editbones = editbones;
-
-	preEditBoneDuplicate(rg->editbones); /* prime bones for duplication */
-	preEditBoneDuplicate(src->editbones); /* prime bones for duplication */
-
-	/* Clone nodes */
-	for (node = src->nodes.first; node; node = node->next) {
-		RigNode *cloned_node = newRigNode(rg, node->p);
-		BLI_ghash_insert(ptr_hash, node, cloned_node);
-	}
-
-	rg->head = BLI_ghash_lookup(ptr_hash, src->head);
-
-	/* Clone arcs */
-	for (arc = src->arcs.first; arc; arc = arc->next) {
-		cloneArc(rg, src, arc, ptr_hash, side_string, num_string);
-	}
-
-	/* Clone controls */
-	for (ctrl = src->controls.first; ctrl; ctrl = ctrl->next) {
-		cloneControl(rg, src, ctrl, ptr_hash, side_string, num_string);
-	}
-
-	/* Relink bones properly */
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		RigEdge *edge;
-
-		for (edge = arc->edges.first; edge; edge = edge->next) {
-			if (edge->bone != NULL) {
-				EditBone *bone;
-
-				updateDuplicateSubtargetObjects(edge->bone, src->editbones, src->ob, rg->ob);
-
-				if (edge->bone->parent) {
-					bone = BLI_ghash_lookup(ptr_hash, edge->bone->parent);
-
-					if (bone != NULL) {
-						edge->bone->parent = bone;
-					}
-					else {
-						/* disconnect since parent isn't cloned
-						 * this will only happen when cloning from selected bones
-						 * */
-						edge->bone->flag &= ~BONE_CONNECTED;
-					}
-				}
-			}
-		}
-	}
-
-	for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next) {
-		EditBone *bone;
-
-		updateDuplicateSubtargetObjects(ctrl->bone, src->editbones, src->ob, rg->ob);
-
-		if (ctrl->bone->parent) {
-			bone = BLI_ghash_lookup(ptr_hash, ctrl->bone->parent);
-
-			if (bone != NULL) {
-				ctrl->bone->parent = bone;
-			}
-			else {
-				/* disconnect since parent isn't cloned
-				 * this will only happen when cloning from selected bones
-				 * */
-				ctrl->bone->flag &= ~BONE_CONNECTED;
-			}
-		}
-
-		ctrl->link = BLI_ghash_lookup(ptr_hash, ctrl->link);
-		ctrl->link_tail = BLI_ghash_lookup(ptr_hash, ctrl->link_tail);
-	}
-
-	BLI_ghash_free(ptr_hash, NULL, NULL);
-
-	return rg;
-}
-
-
-/*******************************************************************************************************/
-
-static void RIG_calculateEdgeAngles(RigEdge *edge_first, RigEdge *edge_second)
-{
-	float vec_first[3], vec_second[3];
-
-	sub_v3_v3v3(vec_first, edge_first->tail, edge_first->head);
-	sub_v3_v3v3(vec_second, edge_second->tail, edge_second->head);
-
-	normalize_v3(vec_first);
-	normalize_v3(vec_second);
-
-	edge_first->angle = angle_normalized_v3v3(vec_first, vec_second);
-
-	if (edge_second->bone != NULL) {
-		float normal[3];
-
-		cross_v3_v3v3(normal, vec_first, vec_second);
-		normalize_v3(normal);
-
-		edge_second->up_angle = angle_normalized_v3v3(normal, edge_second->up_axis);
-	}
-}
-
-/************************************ CONTROL BONES ****************************************************/
-
-static void RIG_addControlBone(RigGraph *rg, EditBone *bone)
-{
-	RigControl *ctrl = newRigControl(rg);
-	ctrl->bone = bone;
-	copy_v3_v3(ctrl->head, bone->head);
-	copy_v3_v3(ctrl->tail, bone->tail);
-	getEditBoneRollUpAxis(bone, bone->roll, ctrl->up_axis);
-	ctrl->tail_mode = TL_NONE;
-
-	BLI_ghash_insert(rg->controls_map, bone->name, ctrl);
-}
-
-static int RIG_parentControl(RigControl *ctrl, EditBone *link)
-{
-	if (link) {
-		float offset[3];
-		int flag = 0;
-
-		sub_v3_v3v3(offset, ctrl->bone->head, link->head);
-
-		/* if root matches, check for direction too */
-		if (dot_v3v3(offset, offset) < 0.0001f) {
-			float vbone[3], vparent[3];
-
-			flag |= RIG_CTRL_FIT_ROOT;
-
-			sub_v3_v3v3(vbone, ctrl->bone->tail, ctrl->bone->head);
-			sub_v3_v3v3(vparent, link->tail, link->head);
-
-			/* test for opposite direction */
-			if (dot_v3v3(vbone, vparent) > 0) {
-				float nor[3];
-				float len;
-
-				cross_v3_v3v3(nor, vbone, vparent);
-
-				len = dot_v3v3(nor, nor);
-				if (len < 0.0001f) {
-					flag |= RIG_CTRL_FIT_BONE;
-				}
-			}
-		}
-
-		/* Bail out if old one is automatically better */
-		if (flag < ctrl->flag) {
-			return 0;
-		}
-
-		/* if there's already a link
-		 *  overwrite only if new link is higher in the chain */
-		if (ctrl->link && flag == ctrl->flag) {
-			EditBone *bone = NULL;
-
-			for (bone = ctrl->link; bone; bone = bone->parent) {
-				/* if link is in the chain, break and use that one */
-				if (bone == link) {
-					break;
-				}
-			}
-
-			/* not in chain, don't update link */
-			if (bone == NULL) {
-				return 0;
-			}
-		}
-
-
-		ctrl->link = link;
-		ctrl->flag = flag;
-
-		copy_v3_v3(ctrl->offset, offset);
-
-		return 1;
-	}
-
-	return 0;
-}
-
-static void RIG_reconnectControlBones(RigGraph *rg)
-{
-	RigControl *ctrl;
-	bool changed = true;
-
-	/* first pass, link to deform bones */
-	for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next) {
-		bPoseChannel *pchan;
-		bConstraint *con;
-		int found = 0;
-
-		/* DO SOME MAGIC HERE */
-		for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-			for (con = pchan->constraints.first; con; con = con->next) {
-				const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-				ListBase targets = {NULL, NULL};
-				bConstraintTarget *ct;
-
-				/* constraint targets */
-				if (cti && cti->get_constraint_targets) {
-					int target_index;
-
-					cti->get_constraint_targets(con, &targets);
-
-					for (target_index = 0, ct = targets.first; ct; target_index++, ct = ct->next) {
-						if ((ct->tar == rg->ob) && STREQ(ct->subtarget, ctrl->bone->name)) {
-							/* SET bone link to bone corresponding to pchan */
-							EditBone *link = BLI_ghash_lookup(rg->bones_map, pchan->name);
-
-							/* Making sure bone is in this armature */
-							if (link != NULL) {
-								/* for pole targets, link to parent bone instead, if possible */
-								if (con->type == CONSTRAINT_TYPE_KINEMATIC && target_index == 1) {
-									if (link->parent && BLI_ghash_haskey(rg->bones_map, link->parent->name)) {
-										link = link->parent;
-									}
-								}
-
-								found = RIG_parentControl(ctrl, link);
-							}
-						}
-					}
-
-					if (cti->flush_constraint_targets)
-						cti->flush_constraint_targets(con, &targets, 0);
-				}
-			}
-		}
-
-		/* if not found yet, check parent */
-		if (found == 0) {
-			if (ctrl->bone->parent) {
-				/* make sure parent is a deforming bone
-				 * NULL if not
-				 *  */
-				EditBone *link = BLI_ghash_lookup(rg->bones_map, ctrl->bone->parent->name);
-
-				found = RIG_parentControl(ctrl, link);
-			}
-
-			/* check if bone is not superposed on another one */
-			{
-				RigArc *arc;
-				RigArc *best_arc = NULL;
-				EditBone *link = NULL;
-
-				for (arc = rg->arcs.first; arc; arc = arc->next) {
-					RigEdge *edge;
-					for (edge = arc->edges.first; edge; edge = edge->next) {
-						if (edge->bone) {
-							int fit = 0;
-
-							fit = len_v3v3(ctrl->bone->head, edge->bone->head) < 0.0001f;
-							fit = fit || len_v3v3(ctrl->bone->tail, edge->bone->tail) < 0.0001f;
-
-							if (fit) {
-								/* pick the bone on the arc with the lowest symmetry level
-								 * means you connect control to the trunk of the skeleton */
-								if (best_arc == NULL || arc->symmetry_level < best_arc->symmetry_level) {
-									best_arc = arc;
-									link = edge->bone;
-								}
-							}
-						}
-					}
-				}
-
-				found = RIG_parentControl(ctrl, link);
-			}
-		}
-
-		/* if not found yet, check child */
-		if (found == 0) {
-			RigArc *arc;
-			RigArc *best_arc = NULL;
-			EditBone *link = NULL;
-
-			for (arc = rg->arcs.first; arc; arc = arc->next) {
-				RigEdge *edge;
-				for (edge = arc->edges.first; edge; edge = edge->next) {
-					if (edge->bone && edge->bone->parent == ctrl->bone) {
-						/* pick the bone on the arc with the lowest symmetry level
-						 * means you connect control to the trunk of the skeleton */
-						if (best_arc == NULL || arc->symmetry_level < best_arc->symmetry_level) {
-							best_arc = arc;
-							link = edge->bone;
-						}
-					}
-				}
-			}
-
-			found = RIG_parentControl(ctrl, link);
-		}
-
-	}
-
-
-	/* second pass, make chains in control bones */
-	while (changed) {
-		changed = false;
-
-		for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next) {
-			/* if control is not linked yet */
-			if (ctrl->link == NULL) {
-				bPoseChannel *pchan;
-				bConstraint *con;
-				RigControl *ctrl_parent = NULL;
-				RigControl *ctrl_child;
-				int found = 0;
-
-				if (ctrl->bone->parent) {
-					ctrl_parent = BLI_ghash_lookup(rg->controls_map, ctrl->bone->parent->name);
-				}
-
-				/* check constraints first */
-
-				/* DO SOME MAGIC HERE */
-				for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-					for (con = pchan->constraints.first; con; con = con->next) {
-						const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-						ListBase targets = {NULL, NULL};
-						bConstraintTarget *ct;
-
-						/* constraint targets */
-						if (cti && cti->get_constraint_targets) {
-							cti->get_constraint_targets(con, &targets);
-
-							for (ct = targets.first; ct; ct = ct->next) {
-								if ((ct->tar == rg->ob) && STREQ(ct->subtarget, ctrl->bone->name)) {
-									/* SET bone link to ctrl corresponding to pchan */
-									RigControl *link = BLI_ghash_lookup(rg->controls_map, pchan->name);
-
-									/* if owner is a control bone, link with it */
-									if (link && link->link) {
-										RIG_parentControl(ctrl, link->bone);
-										found = 1;
-										break;
-									}
-								}
-							}
-
-							if (cti->flush_constraint_targets)
-								cti->flush_constraint_targets(con, &targets, 0);
-						}
-					}
-				}
-
-				if (found == 0) {
-					/* check if parent is already linked */
-					if (ctrl_parent && ctrl_parent->link) {
-						RIG_parentControl(ctrl, ctrl_parent->bone);
-						changed = true;
-					}
-					else {
-						/* check childs */
-						for (ctrl_child = rg->controls.first; ctrl_child; ctrl_child = ctrl_child->next) {
-							/* if a child is linked, link to that one */
-							if (ctrl_child->link && ctrl_child->bone->parent == ctrl->bone) {
-								RIG_parentControl(ctrl, ctrl_child->bone);
-								changed = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/* third pass, link control tails */
-	for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next) {
-		/* fit bone already means full match, so skip those */
-		if ((ctrl->flag & RIG_CTRL_FIT_BONE) == 0) {
-			GHashIterator ghi;
-
-			/* look on deform bones first */
-			BLI_ghashIterator_init(&ghi, rg->bones_map);
-
-			for (; !BLI_ghashIterator_done(&ghi); BLI_ghashIterator_step(&ghi)) {
-				EditBone *bone = (EditBone *)BLI_ghashIterator_getValue(&ghi);
-
-				/* don't link with parent */
-				if (bone->parent != ctrl->bone) {
-					if (len_v3v3(ctrl->bone->tail, bone->head) < 0.01f) {
-						ctrl->tail_mode = TL_HEAD;
-						ctrl->link_tail = bone;
-						break;
-					}
-					else if (len_v3v3(ctrl->bone->tail, bone->tail) < 0.01f) {
-						ctrl->tail_mode = TL_TAIL;
-						ctrl->link_tail = bone;
-						break;
-					}
-				}
-			}
-
-			/* if we haven't found one yet, look in control bones */
-			if (ctrl->tail_mode == TL_NONE) {
-				/* pass */
-			}
-		}
-	}
-
-}
-
-/*******************************************************************************************************/
-
-static void RIG_joinArcs(RigGraph *rg, RigNode *node, RigArc *joined_arc1, RigArc *joined_arc2)
-{
-	RigEdge *edge, *next_edge;
-
-	/* ignore cases where joint is at start or end */
-	if (joined_arc1->head == joined_arc2->head || joined_arc1->tail == joined_arc2->tail) {
-		return;
-	}
-
-	/* swap arcs to make sure arc1 is before arc2 */
-	if (joined_arc1->head == joined_arc2->tail) {
-		RigArc *tmp = joined_arc1;
-		joined_arc1 = joined_arc2;
-		joined_arc2 = tmp;
-	}
-
-	for (edge = joined_arc2->edges.first; edge; edge = next_edge) {
-		next_edge = edge->next;
-
-		RIG_appendEdgeToArc(joined_arc1, edge);
-	}
-
-	joined_arc1->tail = joined_arc2->tail;
-
-	BLI_listbase_clear(&joined_arc2->edges);
-
-	BLI_removeArc((BGraph *)rg, (BArc *)joined_arc2);
-
-	BLI_removeNode((BGraph *)rg, (BNode *)node);
-}
-
-static void RIG_removeNormalNodes(RigGraph *rg)
-{
-	RigNode *node, *next_node;
-
-	for (node = rg->nodes.first; node; node = next_node) {
-		next_node = node->next;
-
-		if (node->degree == 2) {
-			RigArc *arc, *joined_arc1 = NULL, *joined_arc2 = NULL;
-
-			for (arc = rg->arcs.first; arc; arc = arc->next) {
-				if (arc->head == node || arc->tail == node) {
-					if (joined_arc1 == NULL) {
-						joined_arc1 = arc;
-					}
-					else {
-						joined_arc2 = arc;
-						break;
-					}
-				}
-			}
-
-			RIG_joinArcs(rg, node, joined_arc1, joined_arc2);
-		}
-	}
-}
-
-static void RIG_removeUneededOffsets(RigGraph *rg)
-{
-	RigArc *arc;
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		RigEdge *first_edge, *last_edge;
-
-		first_edge = arc->edges.first;
-		last_edge = arc->edges.last;
-
-		if (first_edge->bone == NULL) {
-			if (first_edge->bone == NULL && len_v3v3(first_edge->tail, arc->head->p) <= 0.001f) {
-				BLI_remlink(&arc->edges, first_edge);
-				MEM_freeN(first_edge);
-			}
-			else if (arc->head->degree == 1) {
-				RigNode *new_node = (RigNode *)BLI_FindNodeByPosition((BGraph *)rg, first_edge->tail, 0.001f);
-
-				if (new_node) {
-					BLI_remlink(&arc->edges, first_edge);
-					MEM_freeN(first_edge);
-					BLI_replaceNodeInArc((BGraph *)rg, (BArc *)arc, (BNode *)new_node, (BNode *)arc->head);
-				}
-				else {
-					RigEdge *next_edge = first_edge->next;
-
-					if (next_edge) {
-						BLI_remlink(&arc->edges, first_edge);
-						MEM_freeN(first_edge);
-
-						copy_v3_v3(arc->head->p, next_edge->head);
-					}
-				}
-			}
-			else {
-				/* check if all arc connected start with a null edge */
-				RigArc *other_arc;
-				for (other_arc = rg->arcs.first; other_arc; other_arc = other_arc->next) {
-					if (other_arc != arc) {
-						RigEdge *test_edge;
-						if (other_arc->head == arc->head) {
-							test_edge = other_arc->edges.first;
-
-							if (test_edge->bone != NULL) {
-								break;
-							}
-						}
-						else if (other_arc->tail == arc->head) {
-							test_edge = other_arc->edges.last;
-
-							if (test_edge->bone != NULL) {
-								break;
-							}
-						}
-					}
-				}
-
-				if (other_arc == NULL) {
-					RigNode *new_node = (RigNode *)BLI_FindNodeByPosition((BGraph *)rg, first_edge->tail, 0.001);
-
-					if (new_node) {
-						/* remove null edge in other arcs too */
-						for (other_arc = rg->arcs.first; other_arc; other_arc = other_arc->next) {
-							if (other_arc != arc) {
-								RigEdge *test_edge;
-								if (other_arc->head == arc->head) {
-									BLI_replaceNodeInArc((BGraph *)rg, (BArc *)other_arc, (BNode *)new_node, (BNode *)other_arc->head);
-									test_edge = other_arc->edges.first;
-									BLI_remlink(&other_arc->edges, test_edge);
-									MEM_freeN(test_edge);
-								}
-								else if (other_arc->tail == arc->head) {
-									BLI_replaceNodeInArc((BGraph *)rg, (BArc *)other_arc, (BNode *)new_node, (BNode *)other_arc->tail);
-									test_edge = other_arc->edges.last;
-									BLI_remlink(&other_arc->edges, test_edge);
-									MEM_freeN(test_edge);
-								}
-							}
-						}
-
-						BLI_remlink(&arc->edges, first_edge);
-						MEM_freeN(first_edge);
-						BLI_replaceNodeInArc((BGraph *)rg, (BArc *)arc, (BNode *)new_node, (BNode *)arc->head);
-					}
-					else {
-						RigEdge *next_edge = first_edge->next;
-
-						if (next_edge) {
-							BLI_remlink(&arc->edges, first_edge);
-							MEM_freeN(first_edge);
-
-							copy_v3_v3(arc->head->p, next_edge->head);
-
-							/* remove null edge in other arcs too */
-							for (other_arc = rg->arcs.first; other_arc; other_arc = other_arc->next) {
-								if (other_arc != arc) {
-									RigEdge *test_edge;
-									if (other_arc->head == arc->head) {
-										test_edge = other_arc->edges.first;
-										BLI_remlink(&other_arc->edges, test_edge);
-										MEM_freeN(test_edge);
-									}
-									else if (other_arc->tail == arc->head) {
-										test_edge = other_arc->edges.last;
-										BLI_remlink(&other_arc->edges, test_edge);
-										MEM_freeN(test_edge);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (last_edge->bone == NULL) {
-			if (len_v3v3(last_edge->head, arc->tail->p) <= 0.001f) {
-				BLI_remlink(&arc->edges, last_edge);
-				MEM_freeN(last_edge);
-			}
-			else if (arc->tail->degree == 1) {
-				RigNode *new_node = (RigNode *)BLI_FindNodeByPosition((BGraph *)rg, last_edge->head, 0.001f);
-
-				if (new_node) {
-					RigEdge *previous_edge = last_edge->prev;
-
-					BLI_remlink(&arc->edges, last_edge);
-					MEM_freeN(last_edge);
-					BLI_replaceNodeInArc((BGraph *)rg, (BArc *)arc, (BNode *)new_node, (BNode *)arc->tail);
-
-					/* set previous angle to 0, since there's no following edges */
-					if (previous_edge) {
-						previous_edge->angle = 0;
-					}
-				}
-				else {
-					RigEdge *previous_edge = last_edge->prev;
-
-					if (previous_edge) {
-						BLI_remlink(&arc->edges, last_edge);
-						MEM_freeN(last_edge);
-
-						copy_v3_v3(arc->tail->p, previous_edge->tail);
-						previous_edge->angle = 0;
-					}
-				}
-			}
-		}
-	}
-}
-
-static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bone, RigNode *starting_node, bool selected)
-{
-	EditBone *bone, *last_bone = root_bone;
-	RigArc *arc = NULL;
-	int contain_head = 0;
-
-	for (bone = root_bone; bone; bone = nextEditBoneChild(list, bone, 0)) {
-		int nb_children;
-
-		if (selected == 0 || (bone->flag & BONE_SELECTED)) {
-			if ((bone->flag & BONE_NO_DEFORM) == 0) {
-				BLI_ghash_insert(rg->bones_map, bone->name, bone);
-
-				if (arc == NULL) {
-					arc = newRigArc(rg);
-
-					if (starting_node == NULL) {
-						starting_node = newRigNodeHead(rg, arc, root_bone->head);
-					}
-					else {
-						addRigNodeHead(rg, arc, starting_node);
-					}
-				}
-
-				if (bone->parent && (bone->flag & BONE_CONNECTED) == 0) {
-					RIG_addEdgeToArc(arc, bone->head, NULL);
-				}
-
-				RIG_addEdgeToArc(arc, bone->tail, bone);
-
-				last_bone = bone;
-
-				if (STREQ(bone->name, "head")) {
-					contain_head = 1;
-				}
-			}
-			else if ((bone->flag & BONE_EDITMODE_LOCKED) == 0) { /* ignore locked bones */
-				RIG_addControlBone(rg, bone);
-			}
-		}
-
-		nb_children = countEditBoneChildren(list, bone);
-		if (nb_children > 1) {
-			RigNode *end_node = NULL;
-			int i;
-
-			if (arc != NULL) {
-				end_node = newRigNodeTail(rg, arc, bone->tail);
-			}
-			else {
-				end_node = newRigNode(rg, bone->tail);
-			}
-
-			for (i = 0; i < nb_children; i++) {
-				root_bone = nextEditBoneChild(list, bone, i);
-				RIG_arcFromBoneChain(rg, list, root_bone, end_node, selected);
-			}
-
-			/* arc ends here, break */
-			break;
-		}
-	}
-
-	/* If the loop exited without forking */
-	if (arc != NULL && bone == NULL) {
-		newRigNodeTail(rg, arc, last_bone->tail);
-	}
-
-	if (contain_head) {
-		rg->head = arc->tail;
-	}
-}
-
-/*******************************************************************************************************/
-static void RIG_findHead(RigGraph *rg)
-{
-	if (rg->head == NULL) {
-		if (BLI_listbase_is_single(&rg->arcs)) {
-			RigArc *arc = rg->arcs.first;
-
-			rg->head = (RigNode *)arc->head;
-		}
-		else {
-			RigArc *arc;
-
-			for (arc = rg->arcs.first; arc; arc = arc->next) {
-				RigEdge *edge = arc->edges.last;
-
-				if (edge->bone->flag & (BONE_TIPSEL | BONE_SELECTED)) {
-					rg->head = arc->tail;
-					break;
-				}
-			}
-		}
-
-		if (rg->head == NULL) {
-			rg->head = rg->nodes.first;
-		}
-	}
-}
-
-/*******************************************************************************************************/
-
-static void RIG_printNode(RigNode *node, const char name[])
-{
-	printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, (void *)node, node->degree, node->p[0], node->p[1], node->p[2]);
-
-	if (node->symmetry_flag & SYM_TOPOLOGICAL) {
-		if (node->symmetry_flag & SYM_AXIAL)
-			printf("Symmetry AXIAL\n");
-		else if (node->symmetry_flag & SYM_RADIAL)
-			printf("Symmetry RADIAL\n");
-
-		print_v3("symmetry axis", node->symmetry_axis);
-	}
-}
-
-void RIG_printArcBones(RigArc *arc)
-{
-	RigEdge *edge;
-
-	for (edge = arc->edges.first; edge; edge = edge->next) {
-		if (edge->bone)
-			printf("%s ", edge->bone->name);
-		else
-			printf("---- ");
-	}
-	printf("\n");
-}
-
-static void RIG_printCtrl(RigControl *ctrl, char *indent)
-{
-	char text[128];
-
-	printf("%sBone: %s\n", indent, ctrl->bone->name);
-	printf("%sLink: %s\n", indent, ctrl->link ? ctrl->link->name : "!NONE!");
-
-	BLI_snprintf(text, sizeof(text), "%soffset", indent);
-	print_v3(text, ctrl->offset);
-
-	printf("%sFlag: %i\n", indent, ctrl->flag);
-}
-
-static void RIG_printLinkedCtrl(RigGraph *rg, EditBone *bone, int tabs)
-{
-	RigControl *ctrl;
-	char indent[64];
-	char *s = indent;
-	int i;
-
-	for (i = 0; i < tabs; i++) {
-		s[0] = '\t';
-		s++;
-	}
-	s[0] = 0;
-
-	for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next) {
-		if (ctrl->link == bone) {
-			RIG_printCtrl(ctrl, indent);
-			RIG_printLinkedCtrl(rg, ctrl->bone, tabs + 1);
-		}
-	}
-}
-
-void RIG_printArc(RigGraph *rg, RigArc *arc)
-{
-	RigEdge *edge;
-
-	RIG_printNode((RigNode *)arc->head, "head");
-
-	for (edge = arc->edges.first; edge; edge = edge->next) {
-		printf("\tinner joints %0.3f %0.3f %0.3f\n", edge->tail[0], edge->tail[1], edge->tail[2]);
-		printf("\t\tlength %f\n", edge->length);
-		printf("\t\tangle %f\n", edge->angle * (float)(180 / M_PI));
-		if (edge->bone) {
-			printf("\t\t%s\n", edge->bone->name);
-			RIG_printLinkedCtrl(rg, edge->bone, 3);
-		}
-	}
-	printf("symmetry level: %i flag: %i group %i\n", arc->symmetry_level, arc->symmetry_flag, arc->symmetry_group);
-
-	RIG_printNode((RigNode *)arc->tail, "tail");
-}
-
-void RIG_printGraph(RigGraph *rg)
-{
-	RigArc *arc;
-
-	printf("---- ARCS ----\n");
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		RIG_printArc(rg, arc);
-		printf("\n");
-	}
-
-	if (rg->head) {
-		RIG_printNode(rg->head, "HEAD NODE:");
-	}
-	else {
-		printf("HEAD NODE: NONE\n");
-	}
-}
-
-/*******************************************************************************************************/
-
-RigGraph *RIG_graphFromArmature(const bContext *C, Object *ob, bArmature *arm)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
-	EditBone *ebone;
-	RigGraph *rg;
-
-	rg = newRigGraph();
-
-	if (obedit == ob) {
-		rg->editbones = ((bArmature *)obedit->data)->edbo;
-	}
-	else {
-		rg->editbones = MEM_callocN(sizeof(ListBase), "EditBones");
-		make_boneList(rg->editbones, &arm->bonebase, NULL, NULL);
-		rg->flag |= RIG_FREE_BONELIST;
-	}
-
-	rg->ob = ob;
-
-	/* Do the rotations */
-	for (ebone = rg->editbones->first; ebone; ebone = ebone->next) {
-		if (ebone->parent == NULL) {
-			RIG_arcFromBoneChain(rg, rg->editbones, ebone, NULL, 0);
-		}
-	}
-
-	BLI_removeDoubleNodes((BGraph *)rg, 0.001);
-
-	RIG_removeNormalNodes(rg);
-
-	RIG_removeUneededOffsets(rg);
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	RIG_findHead(rg);
-
-	BLI_markdownSymmetry((BGraph *)rg, (BNode *)rg->head, scene->toolsettings->skgen_symmetry_limit);
-
-	RIG_reconnectControlBones(rg); /* after symmetry, because we use levels to find best match */
-
-	if (BLI_isGraphCyclic((BGraph *)rg)) {
-		printf("armature cyclic\n");
-	}
-
-	return rg;
-}
-
-static RigGraph *armatureSelectedToGraph(bContext *C, Object *ob, bArmature *arm)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
-	EditBone *ebone;
-	RigGraph *rg;
-
-	rg = newRigGraph();
-
-	if (obedit == ob) {
-		rg->editbones = arm->edbo;
-	}
-	else {
-		rg->editbones = MEM_callocN(sizeof(ListBase), "EditBones");
-		make_boneList(rg->editbones, &arm->bonebase, NULL, NULL);
-		rg->flag |= RIG_FREE_BONELIST;
-	}
-
-	rg->ob = ob;
-
-	/* Do the rotations */
-	for (ebone = rg->editbones->first; ebone; ebone = ebone->next) {
-		if (ebone->parent == NULL) {
-			RIG_arcFromBoneChain(rg, rg->editbones, ebone, NULL, 1);
-		}
-	}
-
-	BLI_removeDoubleNodes((BGraph *)rg, 0.001);
-
-	RIG_removeNormalNodes(rg);
-
-	RIG_removeUneededOffsets(rg);
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	RIG_findHead(rg);
-
-	BLI_markdownSymmetry((BGraph *)rg, (BNode *)rg->head, scene->toolsettings->skgen_symmetry_limit);
-
-	RIG_reconnectControlBones(rg); /* after symmetry, because we use levels to find best match */
-
-	if (BLI_isGraphCyclic((BGraph *)rg)) {
-		printf("armature cyclic\n");
-	}
-
-	return rg;
-}
-/************************************ GENERATING *****************************************************/
-
-#if 0
-static EditBone *add_editbonetolist(char *name, ListBase *list)
-{
-	EditBone *bone = MEM_callocN(sizeof(EditBone), "eBone");
-
-	BLI_strncpy(bone->name, name, sizeof(bone->name));
-	ED_armature_ebone_unique_name(list, bone->name, NULL);
-
-	BLI_addtail(list, bone);
-
-	bone->flag |= BONE_TIPSEL;
-	bone->weight = 1.0F;
-	bone->dist = 0.25F;
-	bone->xwidth = 0.1;
-	bone->zwidth = 0.1;
-	bone->rad_head = 0.10;
-	bone->rad_tail = 0.05;
-	bone->segments = 1;
-	bone->layer =  1; //arm->layer;
-
-	/* Bendy-Bone parameters */
-	bone->roll1 = 0.0f;
-	bone->roll2 = 0.0f;
-	bone->curveInX = 0.0f;
-	bone->curveInY = 0.0f;
-	bone->curveOutX = 0.0f;
-	bone->curveOutY = 0.0f;
-	bone->ease1 = 1.0f;
-	bone->ease2 = 1.0f;
-	bone->scaleIn = 1.0f;
-	bone->scaleOut = 1.0f;
-
-	return bone;
-}
-#endif
-
-#if 0 /* UNUSED */
-static void generateMissingArcsFromNode(RigGraph *rigg, ReebNode *node, int multi_level_limit)
-{
-	while (node->multi_level > multi_level_limit && node->link_up)
-	{
-		node = node->link_up;
-	}
-
-	while (node->multi_level < multi_level_limit && node->link_down)
-	{
-		node = node->link_down;
-	}
-
-	if (node->multi_level == multi_level_limit)
-	{
-		int i;
-
-		for (i = 0; i < node->degree; i++)
-		{
-			ReebArc *earc = node->arcs[i];
-
-			if (earc->flag == ARC_FREE && earc->head == node)
-			{
-				ReebNode *other = BIF_otherNodeFromIndex(earc, node);
-
-				earc->flag = ARC_USED;
-
-				//generateBonesForArc(rigg, earc, node, other);
-				generateMissingArcsFromNode(rigg, other, multi_level_limit);
-			}
-		}
-	}
-}
-
-static void generateMissingArcs(RigGraph *rigg)
-{
-	ReebGraph *reebg;
-	int multi_level_limit = 5;
-
-	for (reebg = rigg->link_mesh; reebg; reebg = reebg->link_up)
-	{
-		ReebArc *earc;
-
-		for (earc = reebg->arcs.first; earc; earc = earc->next)
-		{
-			if (earc->flag == ARC_USED)
-			{
-				generateMissingArcsFromNode(rigg, earc->head, multi_level_limit);
-				generateMissingArcsFromNode(rigg, earc->tail, multi_level_limit);
-			}
-		}
-	}
-}
-#endif
-
-/************************************ RETARGETTING *****************************************************/
-
-static void repositionControl(RigGraph *rigg, RigControl *ctrl, float head[3], float tail[3], float qrot[4], float resize);
-
-static void repositionTailControl(RigGraph *rigg, RigControl *ctrl);
-
-static void finalizeControl(RigGraph *rigg, RigControl *ctrl, float resize)
-{
-	if ((ctrl->flag & RIG_CTRL_DONE) == RIG_CTRL_DONE) {
-		RigControl *ctrl_child;
-
-#if 0
-		printf("CTRL: %s LINK: %s", ctrl->bone->name, ctrl->link->name);
-
-		if (ctrl->link_tail)
-		{
-			printf(" TAIL: %s", ctrl->link_tail->name);
-		}
-
-		printf("\n");
-#endif
-
-		/* if there was a tail link: apply link, recalc resize factor and qrot */
-		if (ctrl->tail_mode != TL_NONE) {
-			float *tail_vec = NULL;
-			float v1[3], v2[3], qtail[4];
-
-			if (ctrl->tail_mode == TL_TAIL) {
-				tail_vec = ctrl->link_tail->tail;
-			}
-			else if (ctrl->tail_mode == TL_HEAD) {
-				tail_vec = ctrl->link_tail->head;
-			}
-
-			sub_v3_v3v3(v1, ctrl->bone->tail, ctrl->bone->head);
-			sub_v3_v3v3(v2, tail_vec, ctrl->bone->head);
-
-			copy_v3_v3(ctrl->bone->tail, tail_vec);
-
-			rotation_between_vecs_to_quat(qtail, v1, v2);
-			mul_qt_qtqt(ctrl->qrot, qtail, ctrl->qrot);
-
-			resize = len_v3(v2) / len_v3v3(ctrl->head, ctrl->tail);
-		}
-
-		ctrl->bone->roll = rollBoneByQuat(ctrl->bone, ctrl->up_axis, ctrl->qrot);
-
-		/* Cascade to connected control bones */
-		for (ctrl_child = rigg->controls.first; ctrl_child; ctrl_child = ctrl_child->next) {
-			if (ctrl_child->link == ctrl->bone) {
-				repositionControl(rigg, ctrl_child, ctrl->bone->head, ctrl->bone->tail, ctrl->qrot, resize);
-			}
-			if (ctrl_child->link_tail == ctrl->bone) {
-				repositionTailControl(rigg, ctrl_child);
-			}
-		}
-	}
-}
-
-static void repositionTailControl(RigGraph *rigg, RigControl *ctrl)
-{
-	ctrl->flag |= RIG_CTRL_TAIL_DONE;
-
-	finalizeControl(rigg, ctrl, 1); /* resize will be recalculated anyway so we don't need it */
-}
-
-static void repositionControl(RigGraph *rigg, RigControl *ctrl, float head[3], float UNUSED(tail[3]), float qrot[4], float resize)
-{
-	float parent_offset[3], tail_offset[3];
-
-	copy_v3_v3(parent_offset, ctrl->offset);
-	mul_v3_fl(parent_offset, resize);
-	mul_qt_v3(qrot, parent_offset);
-
-	add_v3_v3v3(ctrl->bone->head, head, parent_offset);
-
-	ctrl->flag |= RIG_CTRL_HEAD_DONE;
-
-	copy_qt_qt(ctrl->qrot, qrot);
-
-	if (ctrl->tail_mode == TL_NONE) {
-		sub_v3_v3v3(tail_offset, ctrl->tail, ctrl->head);
-		mul_v3_fl(tail_offset, resize);
-		mul_qt_v3(qrot, tail_offset);
-
-		add_v3_v3v3(ctrl->bone->tail, ctrl->bone->head, tail_offset);
-
-		ctrl->flag |= RIG_CTRL_TAIL_DONE;
-	}
-
-	finalizeControl(rigg, ctrl, resize);
-}
-
-static void repositionBone(bContext *C, RigGraph *rigg, RigEdge *edge, float vec0[3], float vec1[3], float up_axis[3])
-{
-	Scene *scene = CTX_data_scene(C);
-	EditBone *bone;
-	RigControl *ctrl;
-	float qrot[4], resize;
-	float v1[3], v2[3];
-	float l1, l2;
-
-	bone = edge->bone;
-
-	sub_v3_v3v3(v1, edge->tail, edge->head);
-	sub_v3_v3v3(v2, vec1, vec0);
-
-	l1 = normalize_v3(v1);
-	l2 = normalize_v3(v2);
-
-	resize = l2 / l1;
-
-	rotation_between_vecs_to_quat(qrot, v1, v2);
-
-	copy_v3_v3(bone->head, vec0);
-	copy_v3_v3(bone->tail, vec1);
-
-	if (!is_zero_v3(up_axis)) {
-		float qroll[4];
-
-		if (scene->toolsettings->skgen_retarget_roll == SK_RETARGET_ROLL_VIEW) {
-			bone->roll = rollBoneByQuatAligned(bone, edge->up_axis, qrot, qroll, up_axis);
-		}
-		else if (scene->toolsettings->skgen_retarget_roll == SK_RETARGET_ROLL_JOINT) {
-			bone->roll = rollBoneByQuatJoint(edge, edge->prev, qrot, qroll, up_axis);
-		}
-		else {
-			unit_qt(qroll);
-		}
-
-		mul_qt_qtqt(qrot, qroll, qrot);
-	}
-	else {
-		bone->roll = rollBoneByQuat(bone, edge->up_axis, qrot);
-	}
-
-	for (ctrl = rigg->controls.first; ctrl; ctrl = ctrl->next) {
-		if (ctrl->link == bone) {
-			repositionControl(rigg, ctrl, vec0, vec1, qrot, resize);
-		}
-		if (ctrl->link_tail == bone) {
-			repositionTailControl(rigg, ctrl);
-		}
-	}
-}
-
-static RetargetMode detectArcRetargetMode(RigArc *arc);
-static void retargetArctoArcLength(bContext *C, RigGraph *rigg, RigArc *iarc, RigNode *inode_start);
-
-
-static RetargetMode detectArcRetargetMode(RigArc *iarc)
-{
-	RetargetMode mode = RETARGET_AGGRESSIVE;
-	ReebArc *earc = iarc->link_mesh;
-	RigEdge *edge;
-	int large_angle = 0;
-	float avg_angle = 0;
-	/* float avg_length = 0; */ /* UNUSED */
-	int nb_edges = 0;
-
-
-	for (edge = iarc->edges.first; edge; edge = edge->next) {
-		avg_angle += edge->angle;
-		nb_edges++;
-	}
-
-	avg_angle /= nb_edges - 1; /* -1 because last edge doesn't have an angle */
-
-	/* avg_length = iarc->length / nb_edges; */  /* UNUSED */
-
-
-	if (nb_edges > 2) {
-		for (edge = iarc->edges.first; edge; edge = edge->next) {
-			if (fabsf(edge->angle - avg_angle) > (float)(M_PI / 6)) {
-				large_angle = 1;
-			}
-		}
-	}
-	else if (nb_edges == 2 && avg_angle > 0) {
-		large_angle = 1;
-	}
-
-
-	if (large_angle == 0) {
-		mode = RETARGET_LENGTH;
-	}
-
-	if (earc->bcount <= (iarc->count - 1)) {
-		mode = RETARGET_LENGTH;
-	}
-
-	return mode;
-}
-
-#ifndef USE_THREADS
-static void printMovesNeeded(int *positions, int nb_positions)
-{
-	int moves = 0;
-	int i;
-
-	for (i = 0; i < nb_positions; i++) {
-		moves += positions[i] - (i + 1);
-	}
-
-	printf("%i moves needed\n", moves);
-}
-
-static void printPositions(int *positions, int nb_positions)
-{
-	int i;
-
-	for (i = 0; i < nb_positions; i++) {
-		printf("%i ", positions[i]);
-	}
-	printf("\n");
-}
-#endif
-
-#define MAX_COST FLT_MAX /* FIX ME */
-
-static float costDistance(BArcIterator *iter, float *vec0, float *vec1, int i0, int i1, float distance_weight)
-{
-	EmbedBucket *bucket = NULL;
-	float max_dist = 0;
-	float v1[3], v2[3], c[3];
-	float v1_inpf;
-
-	if (distance_weight > 0) {
-		sub_v3_v3v3(v1, vec0, vec1);
-
-		v1_inpf = dot_v3v3(v1, v1);
-
-		if (v1_inpf > 0) {
-			int j;
-			for (j = i0 + 1; j < i1 - 1; j++) {
-				float dist;
-
-				bucket = IT_peek(iter, j);
-
-				sub_v3_v3v3(v2, bucket->p, vec1);
-
-				cross_v3_v3v3(c, v1, v2);
-
-				dist = dot_v3v3(c, c) / v1_inpf;
-
-				max_dist = dist > max_dist ? dist : max_dist;
-			}
-
-			return distance_weight * max_dist;
-		}
-		else {
-			return MAX_COST;
-		}
-	}
-	else {
-		return 0;
-	}
-}
-
-static float costAngle(float original_angle, float vec_first[3], float vec_second[3], float angle_weight)
-{
-	if (angle_weight > 0) {
-		float current_angle;
-
-		if (!is_zero_v3(vec_first) && !is_zero_v3(vec_second)) {
-			current_angle = saacos(dot_v3v3(vec_first, vec_second));
-
-			return angle_weight * fabsf(current_angle - original_angle);
-		}
-		else {
-			return angle_weight * (float)M_PI;
-		}
-	}
-	else {
-		return 0;
-	}
-}
-
-static float costLength(float original_length, float current_length, float length_weight)
-{
-	if (current_length == 0) {
-		return MAX_COST;
-	}
-	else {
-		float length_ratio = fabsf((current_length - original_length) / original_length);
-		return length_weight * length_ratio * length_ratio;
-	}
-}
-
-#if 0
-static float calcCostLengthDistance(BArcIterator *iter, float **vec_cache, RigEdge *edge, float *vec1, float *vec2, int i1, int i2)
-{
-	float vec[3];
-	float length;
-
-	sub_v3_v3v3(vec, vec2, vec1);
-	length = normalize_v3(vec);
-
-	return costLength(edge->length, length) + costDistance(iter, vec1, vec2, i1, i2);
-}
-#endif
-
-static float calcCostAngleLengthDistance(BArcIterator *iter, float **UNUSED(vec_cache), RigEdge *edge,
-                                         float *vec0, float *vec1, float *vec2, int i1, int i2,
-                                         float angle_weight, float length_weight, float distance_weight)
-{
-	float vec_second[3], vec_first[3];
-	float length2;
-	float new_cost = 0;
-
-	sub_v3_v3v3(vec_second, vec2, vec1);
-	length2 = normalize_v3(vec_second);
-
-
-	/* Angle cost */
-	if (edge->prev) {
-		sub_v3_v3v3(vec_first, vec1, vec0);
-		normalize_v3(vec_first);
-
-		new_cost += costAngle(edge->prev->angle, vec_first, vec_second, angle_weight);
-	}
-
-	/* Length cost */
-	new_cost += costLength(edge->length, length2, length_weight);
-
-	/* Distance cost */
-	new_cost += costDistance(iter, vec1, vec2, i1, i2, distance_weight);
-
-	return new_cost;
-}
-
-static int indexMemoNode(int nb_positions, int previous, int current, int joints_left)
-{
-	return joints_left * nb_positions * nb_positions + current * nb_positions + previous;
-}
-
-static void copyMemoPositions(int *positions, MemoNode *table, int nb_positions, int joints_left)
-{
-	int previous = 0, current = 0;
-	int i = 0;
-
-	for (i = 0; joints_left > 0; joints_left--, i++) {
-		MemoNode *node;
-		node = table + indexMemoNode(nb_positions, previous, current, joints_left);
-
-		positions[i] = node->next;
-
-		previous = current;
-		current = node->next;
-	}
-}
-
-static MemoNode *solveJoints(MemoNode *table, BArcIterator *iter, float **vec_cache,
-                             int nb_joints, int nb_positions, int previous, int current, RigEdge *edge,
-                             int joints_left, float angle_weight, float length_weight, float distance_weight)
-{
-	MemoNode *node;
-	int index = indexMemoNode(nb_positions, previous, current, joints_left);
-
-	node = table + index;
-
-	if (node->weight != 0) {
-		return node;
-	}
-	else if (joints_left == 0) {
-		float *vec0 = vec_cache[previous];
-		float *vec1 = vec_cache[current];
-		float *vec2 = vec_cache[nb_positions + 1];
-
-		node->weight = calcCostAngleLengthDistance(iter, vec_cache, edge, vec0, vec1, vec2, current, iter->length, angle_weight, length_weight, distance_weight);
-
-		return node;
-	}
-	else {
-		MemoNode *min_node = NULL;
-		float *vec0 = vec_cache[previous];
-		float *vec1 = vec_cache[current];
-		float min_weight = 0.0f;
-		int min_next = 0;
-		int next;
-
-		for (next = current + 1; next <= nb_positions - (joints_left - 1); next++) {
-			MemoNode *next_node;
-			float *vec2 = vec_cache[next];
-			float weight = 0.0f;
-
-			/* ADD WEIGHT OF PREVIOUS - CURRENT - NEXT triple */
-			weight = calcCostAngleLengthDistance(iter, vec_cache, edge, vec0, vec1, vec2, current, next, angle_weight, length_weight, distance_weight);
-
-			if (weight >= MAX_COST) {
-				continue;
-			}
-
-			/* add node weight */
-			next_node = solveJoints(table, iter, vec_cache, nb_joints, nb_positions, current, next, edge->next, joints_left - 1, angle_weight, length_weight, distance_weight);
-			weight += next_node->weight;
-
-			if (min_node == NULL || weight < min_weight) {
-				min_weight = weight;
-				min_node = next_node;
-				min_next = next;
-			}
-		}
-
-		if (min_node) {
-			node->weight = min_weight;
-			node->next = min_next;
-			return node;
-		}
-		else {
-			node->weight = MAX_COST;
-			return node;
-		}
-	}
-
-}
-
-static int testFlipArc(RigArc *iarc, RigNode *inode_start)
-{
-	ReebArc *earc = iarc->link_mesh;
-	ReebNode *enode_start = BIF_NodeFromIndex(earc, inode_start->link_mesh);
-
-	/* no flip needed if both nodes are the same */
-	if ((enode_start == earc->head && inode_start == iarc->head) ||
-	    (enode_start == earc->tail && inode_start == iarc->tail))
-	{
-		return 0;
-	}
-	else {
-		return 1;
-	}
-}
-
-static void retargetArctoArcAggresive(bContext *C, RigGraph *rigg, RigArc *iarc, RigNode *inode_start)
-{
-	ReebArcIterator arc_iter;
-	BArcIterator *iter = (BArcIterator *)&arc_iter;
-	RigEdge *edge;
-	ReebNode *node_start, *node_end;
-	ReebArc *earc = iarc->link_mesh;
-	float angle_weight = 1.0; // GET FROM CONTEXT
-	float length_weight = 1.0;
-	float distance_weight = 1.0;
-#ifndef USE_THREADS
-	float min_cost = FLT_MAX;
-#endif
-	float *vec0, *vec1;
-	int *best_positions;
-	int nb_edges = BLI_listbase_count(&iarc->edges);
-	int nb_joints = nb_edges - 1;
-	RetargetMethod method = METHOD_MEMOIZE;
-	int i;
-
-	if (nb_joints > earc->bcount) {
-		printf("NOT ENOUGH BUCKETS!\n");
-		return;
-	}
-
-	best_positions = MEM_callocN(sizeof(int) * nb_joints, "Best positions");
-
-	if (testFlipArc(iarc, inode_start)) {
-		node_start = earc->tail;
-		node_end = earc->head;
-	}
-	else {
-		node_start = earc->head;
-		node_end = earc->tail;
-	}
-
-	/* equal number of joints and potential position, just fill them in */
-	if (nb_joints == earc->bcount) {
-		/* init with first values */
-		for (i = 0; i < nb_joints; i++) {
-			best_positions[i] = i + 1;
-		}
-	}
-	if (method == METHOD_MEMOIZE) {
-		int nb_positions = earc->bcount;
-		int nb_memo_nodes = nb_positions * nb_positions * (nb_joints + 1);
-		MemoNode *table = MEM_callocN(nb_memo_nodes * sizeof(MemoNode), "memoization table");
-#ifndef USE_THREADS
-		MemoNode *result;
-#endif
-		float **positions_cache = MEM_callocN(sizeof(float *) * (nb_positions + 2), "positions cache");
-
-		positions_cache[0] = node_start->p;
-		positions_cache[nb_positions + 1] = node_end->p;
-
-		initArcIterator(iter, earc, node_start);
-
-		for (i = 1; i <= nb_positions; i++) {
-			EmbedBucket *bucket = IT_peek(iter, i);
-			positions_cache[i] = bucket->p;
-		}
-
-#ifndef USE_THREADS
-		result = solveJoints(table, iter, positions_cache, nb_joints, earc->bcount, 0, 0, iarc->edges.first, nb_joints, angle_weight, length_weight, distance_weight);
-		min_cost = result->weight;
-#else
-		solveJoints(table, iter, positions_cache, nb_joints, earc->bcount, 0, 0, iarc->edges.first, nb_joints, angle_weight, length_weight, distance_weight);
-#endif
-
-		copyMemoPositions(best_positions, table, earc->bcount, nb_joints);
-
-		MEM_freeN(table);
-		MEM_freeN(positions_cache);
-	}
-
-	vec0 = node_start->p;
-	initArcIterator(iter, earc, node_start);
-
-#ifndef USE_THREADS
-	printPositions(best_positions, nb_joints);
-	printMovesNeeded(best_positions, nb_joints);
-	printf("min_cost %f\n", min_cost);
-	printf("buckets: %i\n", earc->bcount);
-#endif
-
-	/* set joints to best position */
-	for (edge = iarc->edges.first, i = 0;
-	     edge;
-	     edge = edge->next, i++)
-	{
-		float *no = NULL;
-		if (i < nb_joints) {
-			EmbedBucket *bucket = IT_peek(iter, best_positions[i]);
-			vec1 = bucket->p;
-			no = bucket->no;
-		}
-		else {
-			vec1 = node_end->p;
-			no = node_end->no;
-		}
-
-		if (edge->bone) {
-			repositionBone(C, rigg, edge, vec0, vec1, no);
-		}
-
-		vec0 = vec1;
-	}
-
-	MEM_freeN(best_positions);
-}
-
-static void retargetArctoArcLength(bContext *C, RigGraph *rigg, RigArc *iarc, RigNode *inode_start)
-{
-	ReebArcIterator arc_iter;
-	BArcIterator *iter = (BArcIterator *)&arc_iter;
-	ReebArc *earc = iarc->link_mesh;
-	ReebNode *node_start, *node_end;
-	RigEdge *edge;
-	EmbedBucket *bucket = NULL;
-	float embedding_length = 0;
-	float *vec0 = NULL;
-	float *vec1 = NULL;
-	float *previous_vec = NULL;
-
-
-	if (testFlipArc(iarc, inode_start)) {
-		node_start = (ReebNode *)earc->tail;
-		node_end = (ReebNode *)earc->head;
-	}
-	else {
-		node_start = (ReebNode *)earc->head;
-		node_end = (ReebNode *)earc->tail;
-	}
-
-	initArcIterator(iter, earc, node_start);
-
-	bucket = IT_next(iter);
-
-	vec0 = node_start->p;
-
-	while (bucket != NULL) {
-		vec1 = bucket->p;
-
-		embedding_length += len_v3v3(vec0, vec1);
-
-		vec0 = vec1;
-		bucket = IT_next(iter);
-	}
-
-	embedding_length += len_v3v3(node_end->p, vec1);
-
-	/* fit bones */
-	initArcIterator(iter, earc, node_start);
-
-	bucket = IT_next(iter);
-
-	vec0 = node_start->p;
-	previous_vec = vec0;
-	vec1 = bucket->p;
-
-	for (edge = iarc->edges.first; edge; edge = edge->next) {
-		float new_bone_length = edge->length / iarc->length * embedding_length;
-		float *no = NULL;
-		float length = 0;
-
-		while (bucket && new_bone_length > length) {
-			length += len_v3v3(previous_vec, vec1);
-			bucket = IT_next(iter);
-			previous_vec = vec1;
-			vec1 = bucket->p;
-			no = bucket->no;
-		}
-
-		if (bucket == NULL) {
-			vec1 = node_end->p;
-			no = node_end->no;
-		}
-
-		/* no need to move virtual edges (space between unconnected bones) */
-		if (edge->bone) {
-			repositionBone(C, rigg, edge, vec0, vec1, no);
-		}
-
-		vec0 = vec1;
-		previous_vec = vec1;
-	}
-}
-
-static void retargetArctoArc(bContext *C, RigGraph *rigg, RigArc *iarc, RigNode *inode_start)
-{
-	RetargetParam *p = MEM_callocN(sizeof(RetargetParam), "RetargetParam");
-
-	p->rigg = rigg;
-	p->iarc = iarc;
-	p->inode_start = inode_start;
-	p->context = C;
-
-	BLI_task_pool_push(rigg->task_pool, exec_retargetArctoArc, p, true, TASK_PRIORITY_HIGH);
-}
-
-void exec_retargetArctoArc(TaskPool * __restrict UNUSED(pool), void *taskdata, int UNUSED(threadid))
-{
-	RetargetParam *p = (RetargetParam *)taskdata;
-	RigGraph *rigg = p->rigg;
-	RigArc *iarc = p->iarc;
-	bContext *C = p->context;
-	RigNode *inode_start = p->inode_start;
-	ReebArc *earc = iarc->link_mesh;
-
-	if (BLI_listbase_is_single(&iarc->edges)) {
-		RigEdge *edge = iarc->edges.first;
-
-		if (testFlipArc(iarc, inode_start)) {
-			repositionBone(C, rigg, edge, earc->tail->p, earc->head->p, earc->head->no);
-		}
-		else {
-			repositionBone(C, rigg, edge, earc->head->p, earc->tail->p, earc->tail->no);
-		}
-	}
-	else {
-		RetargetMode mode = detectArcRetargetMode(iarc);
-
-		if (mode == RETARGET_AGGRESSIVE) {
-			retargetArctoArcAggresive(C, rigg, iarc, inode_start);
-		}
-		else {
-			retargetArctoArcLength(C, rigg, iarc, inode_start);
-		}
-	}
-}
-
-static void matchMultiResolutionNode(RigGraph *rigg, RigNode *inode, ReebNode *top_node)
-{
-	ReebNode *enode = top_node;
-	ReebGraph *reebg = BIF_graphForMultiNode(rigg->link_mesh, enode);
-	int ishape, eshape;
-
-	ishape = BLI_subtreeShape((BGraph *)rigg, (BNode *)inode, NULL, 0) % SHAPE_LEVELS;
-	eshape = BLI_subtreeShape((BGraph *)reebg, (BNode *)enode, NULL, 0) % SHAPE_LEVELS;
-
-	inode->link_mesh = enode;
-
-	while (ishape == eshape && enode->link_down) {
-		inode->link_mesh = enode;
-
-		enode = enode->link_down;
-		reebg = BIF_graphForMultiNode(rigg->link_mesh, enode); /* replace with call to link_down once that exists */
-		eshape = BLI_subtreeShape((BGraph *)reebg, (BNode *)enode, NULL, 0) % SHAPE_LEVELS;
-	}
-}
-
-static void markMultiResolutionChildArc(ReebNode *end_enode, ReebNode *enode)
-{
-	int i;
-
-	for (i = 0; i < enode->degree; i++) {
-		ReebArc *earc = (ReebArc *)enode->arcs[i];
-
-		if (earc->flag == ARC_FREE) {
-			earc->flag = ARC_TAKEN;
-
-			if (earc->tail->degree > 1 && earc->tail != end_enode) {
-				markMultiResolutionChildArc(end_enode, earc->tail);
-			}
-			break;
-		}
-	}
-}
-
-static void markMultiResolutionArc(ReebArc *start_earc)
-{
-	if (start_earc->link_up) {
-		ReebArc *earc;
-		for (earc = start_earc->link_up; earc; earc = earc->link_up) {
-			earc->flag = ARC_TAKEN;
-
-			if (earc->tail->index != start_earc->tail->index) {
-				markMultiResolutionChildArc(earc->tail, earc->tail);
-			}
-		}
-	}
-}
-
-static void matchMultiResolutionArc(RigGraph *rigg, RigNode *start_node, RigArc *next_iarc, ReebArc *next_earc)
-{
-	ReebNode *enode = next_earc->head;
-	ReebGraph *reebg = BIF_graphForMultiNode(rigg->link_mesh, enode);
-	int ishape, eshape;
-
-	ishape = BLI_subtreeShape((BGraph *)rigg, (BNode *)start_node, (BArc *)next_iarc, 1) % SHAPE_LEVELS;
-	eshape = BLI_subtreeShape((BGraph *)reebg, (BNode *)enode, (BArc *)next_earc, 1) % SHAPE_LEVELS;
-
-	while (ishape != eshape && next_earc->link_up) {
-		next_earc->flag = ARC_TAKEN; // mark previous as taken, to prevent backtrack on lower levels
-
-		next_earc = next_earc->link_up;
-		reebg = reebg->link_up;
-		enode = next_earc->head;
-		eshape = BLI_subtreeShape((BGraph *)reebg, (BNode *)enode, (BArc *)next_earc, 1) % SHAPE_LEVELS;
-	}
-
-	next_earc->flag = ARC_USED;
-	next_iarc->link_mesh = next_earc;
-
-	/* mark all higher levels as taken too */
-	markMultiResolutionArc(next_earc);
-//	while (next_earc->link_up)
-//	{
-//		next_earc = next_earc->link_up;
-//		next_earc->flag = ARC_TAKEN;
-//	}
-}
-
-static void matchMultiResolutionStartingNode(RigGraph *rigg, ReebGraph *reebg, RigNode *inode)
-{
-	ReebNode *enode;
-	int ishape, eshape;
-
-	enode = reebg->nodes.first;
-
-	ishape = BLI_subtreeShape((BGraph *)rigg, (BNode *)inode, NULL, 0) % SHAPE_LEVELS;
-	eshape = BLI_subtreeShape((BGraph *)rigg->link_mesh, (BNode *)enode, NULL, 0) % SHAPE_LEVELS;
-
-	while (ishape != eshape && reebg->link_up) {
-		reebg = reebg->link_up;
-
-		enode = reebg->nodes.first;
-
-		eshape = BLI_subtreeShape((BGraph *)reebg, (BNode *)enode, NULL, 0) % SHAPE_LEVELS;
-	}
-
-	inode->link_mesh = enode;
-}
-
-static void findCorrespondingArc(RigGraph *rigg, RigArc *start_arc, RigNode *start_node, RigArc *next_iarc, int root)
-{
-	ReebNode *enode = start_node->link_mesh;
-	ReebArc *next_earc;
-	int symmetry_level = next_iarc->symmetry_level;
-	int symmetry_group = next_iarc->symmetry_group;
-	int symmetry_flag = next_iarc->symmetry_flag;
-	int i;
-
-	next_iarc->link_mesh = NULL;
-
-//	if (root)
-//	{
-//		printf("-----------------------\n");
-//		printf("MATCHING LIMB\n");
-//		RIG_printArcBones(next_iarc);
-//	}
-
-	for (i = 0; i < enode->degree; i++) {
-		next_earc = (ReebArc *)enode->arcs[i];
-
-//		if (next_earc->flag == ARC_FREE)
-//		{
-//			printf("candidate (level %i ?= %i) (flag %i ?= %i) (group %i ?= %i)\n",
-//			symmetry_level, next_earc->symmetry_level,
-//			symmetry_flag, next_earc->symmetry_flag,
-//			symmetry_group, next_earc->symmetry_flag);
-//		}
-
-		if (next_earc->flag == ARC_FREE &&
-		    next_earc->symmetry_flag == symmetry_flag &&
-		    next_earc->symmetry_group == symmetry_group &&
-		    next_earc->symmetry_level == symmetry_level)
-		{
-//			printf("CORRESPONDING ARC FOUND\n");
-//			printf("flag %i -- level %i -- flag %i -- group %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag, next_earc->symmetry_group);
-
-			matchMultiResolutionArc(rigg, start_node, next_iarc, next_earc);
-			break;
-		}
-	}
-
-	/* not found, try at higher nodes (lower node might have filtered internal arcs, messing shape of tree */
-	if (next_iarc->link_mesh == NULL) {
-//		printf("NO CORRESPONDING ARC FOUND - GOING TO HIGHER LEVELS\n");
-
-		if (enode->link_up) {
-			start_node->link_mesh = enode->link_up;
-			findCorrespondingArc(rigg, start_arc, start_node, next_iarc, 0);
-		}
-	}
-
-	/* still not found, print debug info */
-	if (root && next_iarc->link_mesh == NULL) {
-		start_node->link_mesh = enode; /* linking back with root node */
-
-//		printf("NO CORRESPONDING ARC FOUND\n");
-//		RIG_printArcBones(next_iarc);
-//
-//		printf("ON NODE %i, multilevel %i\n", enode->index, enode->multi_level);
-//
-//		printf("LOOKING FOR\n");
-//		printf("flag %i -- level %i -- flag %i -- group %i\n", ARC_FREE, symmetry_level, symmetry_flag, symmetry_group);
-//
-//		printf("CANDIDATES\n");
-//		for (i = 0; i < enode->degree; i++)
-//		{
-//			next_earc = (ReebArc *)enode->arcs[i];
-//			printf("flag %i -- level %i -- flag %i -- group %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag, next_earc->symmetry_group);
-//		}
-
-		/* Emergency matching */
-		for (i = 0; i < enode->degree; i++) {
-			next_earc = (ReebArc *)enode->arcs[i];
-
-			if (next_earc->flag == ARC_FREE && next_earc->symmetry_level == symmetry_level) {
-//				printf("USING:\n");
-//				printf("flag %i -- level %i -- flag %i -- group %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag, next_earc->symmetry_group);
-				matchMultiResolutionArc(rigg, start_node, next_iarc, next_earc);
-				break;
-			}
-		}
-	}
-
-}
-
-static void retargetSubgraph(bContext *C, RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
-{
-	RigNode *inode = start_node;
-	int i;
-
-	/* no start arc on first node */
-	if (start_arc) {
-		ReebNode *enode = start_node->link_mesh;
-		ReebArc *earc = start_arc->link_mesh;
-
-		retargetArctoArc(C, rigg, start_arc, start_node);
-
-		enode = BIF_otherNodeFromIndex(earc, enode);
-		inode = (RigNode *)BLI_otherNode((BArc *)start_arc, (BNode *)inode);
-
-		/* match with lowest node with correct shape */
-		matchMultiResolutionNode(rigg, inode, enode);
-	}
-
-	for (i = 0; i < inode->degree; i++) {
-		RigArc *next_iarc = (RigArc *)inode->arcs[i];
-
-		/* no back tracking */
-		if (next_iarc != start_arc) {
-			findCorrespondingArc(rigg, start_arc, inode, next_iarc, 1);
-			if (next_iarc->link_mesh) {
-				retargetSubgraph(C, rigg, next_iarc, inode);
-			}
-		}
-	}
-}
-
-static void finishRetarget(RigGraph *rigg)
-{
-	BLI_task_pool_work_and_wait(rigg->task_pool);
-}
-
-static void adjustGraphs(bContext *C, RigGraph *rigg)
-{
-	bArmature *arm = rigg->ob->data;
-	RigArc *arc;
-
-	for (arc = rigg->arcs.first; arc; arc = arc->next) {
-		if (arc->link_mesh) {
-			retargetArctoArc(C, rigg, arc, arc->head);
-		}
-	}
-
-	finishRetarget(rigg);
-
-	/* Turn the list into an armature */
-	arm->edbo = rigg->editbones;
-	ED_armature_from_edit(arm);
-
-	ED_undo_push(C, "Retarget Skeleton");
-}
-
-static void retargetGraphs(bContext *C, RigGraph *rigg)
-{
-	bArmature *arm = rigg->ob->data;
-	ReebGraph *reebg = rigg->link_mesh;
-	RigNode *inode;
-
-	/* flag all ReebArcs as free */
-	BIF_flagMultiArcs(reebg, ARC_FREE);
-
-	/* return to first level */
-	inode = rigg->head;
-
-	matchMultiResolutionStartingNode(rigg, reebg, inode);
-
-	retargetSubgraph(C, rigg, NULL, inode);
-
-	//generateMissingArcs(rigg);
-
-	finishRetarget(rigg);
-
-	/* Turn the list into an armature */
-	arm->edbo = rigg->editbones;
-	ED_armature_from_edit(arm);
-}
-
-const char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index)
-{
-	RigArc *arc = BLI_findlink(&rg->arcs, arc_index);
-	RigEdge *iedge;
-
-	if (arc == NULL) {
-		return "None";
-	}
-
-	if (bone_index == BLI_listbase_count(&arc->edges)) {
-		return "Last joint";
-	}
-
-	iedge = BLI_findlink(&arc->edges, bone_index);
-
-	if (iedge == NULL) {
-		return "Done";
-	}
-
-	if (iedge->bone == NULL) {
-		return "Bone offset";
-	}
-
-	return iedge->bone->name;
-}
-
-int RIG_nbJoints(RigGraph *rg)
-{
-	RigArc *arc;
-	int total = 0;
-
-	total += BLI_listbase_count(&rg->nodes);
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		total += BLI_listbase_count(&arc->edges) - 1; /* -1 because end nodes are already counted */
-	}
-
-	return total;
-}
-
-static void BIF_freeRetarget(void)
-{
-	if (GLOBAL_RIGG) {
-		RIG_freeRigGraph((BGraph *)GLOBAL_RIGG);
-		GLOBAL_RIGG = NULL;
-	}
-}
-
-void BIF_retargetArmature(bContext *C)
-{
-	ReebGraph *reebg;
-	double start_time, end_time;
-	double gstart_time, gend_time;
-	double reeb_time, rig_time = 0.0, retarget_time = 0.0, total_time;
-
-	gstart_time = start_time = PIL_check_seconds_timer();
-
-	reebg = BIF_ReebGraphMultiFromEditMesh(C);
-
-	end_time = PIL_check_seconds_timer();
-	reeb_time = end_time - start_time;
-
-	printf("Reeb Graph created\n");
-
-	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
-	{
-		Object *ob = base->object;
-
-		if (ob->type == OB_ARMATURE) {
-			RigGraph *rigg;
-			bArmature *arm;
-
-			arm = ob->data;
-
-			/* Put the armature into editmode */
-
-
-			start_time = PIL_check_seconds_timer();
-
-			rigg = RIG_graphFromArmature(C, ob, arm);
-
-			end_time = PIL_check_seconds_timer();
-			rig_time = end_time - start_time;
-
-			printf("Armature graph created\n");
-
-			//RIG_printGraph(rigg);
-
-			rigg->link_mesh = reebg;
-
-			printf("retargetting %s\n", ob->id.name);
-
-			start_time = PIL_check_seconds_timer();
-
-			retargetGraphs(C, rigg);
-
-			end_time = PIL_check_seconds_timer();
-			retarget_time = end_time - start_time;
-
-			BIF_freeRetarget();
-
-			GLOBAL_RIGG = rigg;
-
-			break; /* only one armature at a time */
-		}
-	}
-	CTX_DATA_END;
-
-
-	gend_time = PIL_check_seconds_timer();
-
-	total_time = gend_time - gstart_time;
-
-	printf("-----------\n");
-	printf("runtime: \t%.3f\n", total_time);
-	printf("reeb: \t\t%.3f (%.1f%%)\n", reeb_time, reeb_time / total_time * 100);
-	printf("rig: \t\t%.3f (%.1f%%)\n", rig_time, rig_time / total_time * 100);
-	printf("retarget: \t%.3f (%.1f%%)\n", retarget_time, retarget_time / total_time * 100);
-	printf("-----------\n");
-
-	ED_undo_push(C, "Retarget Skeleton");
-
-	// XXX
-//	allqueue(REDRAWVIEW3D, 0);
-}
-
-void BIF_retargetArc(bContext *C, ReebArc *earc, RigGraph *template_rigg)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
-	bArmature *armedit = obedit->data;
-	Object *ob;
-	RigGraph *rigg;
-	RigArc *iarc;
-	char *side_string = scene->toolsettings->skgen_side_string;
-	char *num_string = scene->toolsettings->skgen_num_string;
-	int free_template = 0;
-
-	if (template_rigg) {
-		ob = template_rigg->ob;
-	}
-	else {
-		free_template = 1;
-		ob = obedit;
-		template_rigg = armatureSelectedToGraph(C, ob, ob->data);
-	}
-
-	if (BLI_listbase_is_empty(&template_rigg->arcs)) {
-//		XXX
-//		error("No Template and no deforming bones selected");
-		return;
-	}
-
-	rigg = cloneRigGraph(template_rigg, armedit->edbo, obedit, side_string, num_string);
-
-	iarc = rigg->arcs.first;
-
-	iarc->link_mesh = earc;
-	iarc->head->link_mesh = earc->head;
-	iarc->tail->link_mesh = earc->tail;
-
-	retargetArctoArc(C, rigg, iarc, iarc->head);
-
-	finishRetarget(rigg);
-
-	/* free template if it comes from the edit armature */
-	if (free_template) {
-		RIG_freeRigGraph((BGraph *)template_rigg);
-	}
-	RIG_freeRigGraph((BGraph *)rigg);
-
-	ED_armature_edit_validate_active(armedit);
-
-//	XXX
-//	allqueue(REDRAWVIEW3D, 0);
-}
-
-void BIF_adjustRetarget(bContext *C)
-{
-	if (GLOBAL_RIGG) {
-		adjustGraphs(C, GLOBAL_RIGG);
-	}
-}
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c
deleted file mode 100644
index 84eb780b56b..00000000000
--- a/source/blender/editors/armature/editarmature_sketch.c
+++ /dev/null
@@ -1,2664 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/editarmature_sketch.c
- *  \ingroup edarmature
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_armature_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-#include "BKE_context.h"
-#include "BKE_sketch.h"
-
-#include "RNA_define.h"
-#include "RNA_access.h"
-
-#include "ED_view3d.h"
-#include "ED_screen.h"
-
-#include "BIF_gl.h"
-#include "ED_armature.h"
-#include "armature_intern.h"
-#include "BIF_retarget.h"
-#include "BIF_generate.h"
-
-#include "ED_transform.h"
-#include "ED_transform_snap_object_context.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "GPU_select.h"
-
-typedef int (*GestureDetectFct)(bContext *, SK_Gesture *, SK_Sketch *);
-typedef void (*GestureApplyFct)(bContext *, SK_Gesture *, SK_Sketch *);
-
-typedef struct SK_GestureAction {
-	char name[64];
-	GestureDetectFct detect;
-	GestureApplyFct apply;
-} SK_GestureAction;
-
-#if 0 /* UNUSED 2.5 */
-static SK_Point boneSnap;
-#endif
-
-static int LAST_SNAP_POINT_VALID = 0;
-static float LAST_SNAP_POINT[3];
-
-
-typedef struct SK_StrokeIterator {
-	HeadFct     head;
-	TailFct     tail;
-	PeekFct     peek;
-	NextFct     next;
-	NextNFct    nextN;
-	PreviousFct previous;
-	StoppedFct  stopped;
-
-	float *p, *no;
-	float size;
-
-	int length;
-	int index;
-	/*********************************/
-	SK_Stroke *stroke;
-	int start;
-	int end;
-	int stride;
-} SK_StrokeIterator;
-
-/******************** PROTOTYPES ******************************/
-
-void initStrokeIterator(BArcIterator *iter, SK_Stroke *stk, int start, int end);
-
-int sk_detectCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectTrimGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyTrimGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectCommandGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyCommandGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectDeleteGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyDeleteGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectMergeGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyMergeGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectReverseGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyReverseGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-int sk_detectConvertGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-void sk_applyConvertGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
-
-SK_Sketch *contextSketch(const bContext *c, int create);
-SK_Sketch *viewcontextSketch(ViewContext *vc, int create);
-
-void sk_resetOverdraw(SK_Sketch *sketch);
-int sk_hasOverdraw(SK_Sketch *sketch, SK_Stroke *stk);
-
-/******************** GESTURE ACTIONS ******************************/
-
-static SK_GestureAction GESTURE_ACTIONS[] = {
-	{"Cut", sk_detectCutGesture, sk_applyCutGesture},
-	{"Trim", sk_detectTrimGesture, sk_applyTrimGesture},
-	{"Command", sk_detectCommandGesture, sk_applyCommandGesture},
-	{"Delete", sk_detectDeleteGesture, sk_applyDeleteGesture},
-	{"Merge", sk_detectMergeGesture, sk_applyMergeGesture},
-	{"Reverse", sk_detectReverseGesture, sk_applyReverseGesture},
-	{"Convert", sk_detectConvertGesture, sk_applyConvertGesture},
-	{"", NULL, NULL}
-};
-
-/******************** TEMPLATES UTILS *************************/
-
-static char  *TEMPLATES_MENU = NULL;
-static int TEMPLATES_CURRENT = 0;
-static GHash *TEMPLATES_HASH = NULL;
-static RigGraph *TEMPLATE_RIGG = NULL;
-
-void BIF_makeListTemplates(const bContext *C)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	Base *base;
-	int index = 0;
-
-	if (TEMPLATES_HASH != NULL) {
-		BLI_ghash_free(TEMPLATES_HASH, NULL, NULL);
-	}
-
-	TEMPLATES_HASH = BLI_ghash_int_new("makeListTemplates gh");
-	TEMPLATES_CURRENT = 0;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		Object *ob = base->object;
-
-		if (ob != obedit && ob->type == OB_ARMATURE) {
-			index++;
-			BLI_ghash_insert(TEMPLATES_HASH, SET_INT_IN_POINTER(index), ob);
-
-			if (ob == ts->skgen_template) {
-				TEMPLATES_CURRENT = index;
-			}
-		}
-	}
-}
-
-#if 0  /* UNUSED */
-const char *BIF_listTemplates(const bContext *UNUSED(C))
-{
-	GHashIterator ghi;
-	const char *menu_header = IFACE_("Template %t|None %x0|");
-	char *p;
-	const size_t template_size = (BLI_ghash_len(TEMPLATES_HASH) * 32 + 30);
-
-	if (TEMPLATES_MENU != NULL) {
-		MEM_freeN(TEMPLATES_MENU);
-	}
-
-	TEMPLATES_MENU = MEM_callocN(sizeof(char) * template_size, "skeleton template menu");
-
-	p = TEMPLATES_MENU;
-	p += BLI_strncpy_rlen(p, menu_header, template_size);
-
-	BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
-
-	while (!BLI_ghashIterator_done(&ghi)) {
-		Object *ob = BLI_ghashIterator_getValue(&ghi);
-		int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
-
-		p += sprintf(p, "|%s %%x%i", ob->id.name + 2, key);
-
-		BLI_ghashIterator_step(&ghi);
-	}
-
-	return TEMPLATES_MENU;
-}
-#endif
-
-int   BIF_currentTemplate(const bContext *C)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-
-	if (TEMPLATES_CURRENT == 0 && ts->skgen_template != NULL) {
-		GHashIterator ghi;
-		BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
-
-		while (!BLI_ghashIterator_done(&ghi)) {
-			Object *ob = BLI_ghashIterator_getValue(&ghi);
-			int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
-
-			if (ob == ts->skgen_template) {
-				TEMPLATES_CURRENT = key;
-				break;
-			}
-
-			BLI_ghashIterator_step(&ghi);
-		}
-	}
-
-	return TEMPLATES_CURRENT;
-}
-
-static RigGraph *sk_makeTemplateGraph(const bContext *C, Object *ob)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	if (ob == obedit) {
-		return NULL;
-	}
-
-	if (ob != NULL) {
-		if (TEMPLATE_RIGG && TEMPLATE_RIGG->ob != ob) {
-			RIG_freeRigGraph((BGraph *)TEMPLATE_RIGG);
-			TEMPLATE_RIGG = NULL;
-		}
-
-		if (TEMPLATE_RIGG == NULL) {
-			bArmature *arm;
-
-			arm = ob->data;
-
-			TEMPLATE_RIGG = RIG_graphFromArmature(C, ob, arm);
-		}
-	}
-
-	return TEMPLATE_RIGG;
-}
-
-int BIF_nbJointsTemplate(const bContext *C)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	RigGraph *rg = sk_makeTemplateGraph(C, ts->skgen_template);
-
-	if (rg) {
-		return RIG_nbJoints(rg);
-	}
-	else {
-		return -1;
-	}
-}
-
-const char *BIF_nameBoneTemplate(const bContext *C)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	SK_Sketch *stk = contextSketch(C, 1);
-	RigGraph *rg;
-	int index = 0;
-
-	if (stk && stk->active_stroke != NULL) {
-		index = stk->active_stroke->nb_points;
-	}
-
-	rg = sk_makeTemplateGraph(C, ts->skgen_template);
-
-	if (rg == NULL) {
-		return "";
-	}
-
-	return RIG_nameBone(rg, 0, index);
-}
-
-void  BIF_freeTemplates(bContext *UNUSED(C))
-{
-	if (TEMPLATES_MENU != NULL) {
-		MEM_freeN(TEMPLATES_MENU);
-		TEMPLATES_MENU = NULL;
-	}
-
-	if (TEMPLATES_HASH != NULL) {
-		BLI_ghash_free(TEMPLATES_HASH, NULL, NULL);
-		TEMPLATES_HASH = NULL;
-	}
-
-	if (TEMPLATE_RIGG != NULL) {
-		RIG_freeRigGraph((BGraph *)TEMPLATE_RIGG);
-		TEMPLATE_RIGG = NULL;
-	}
-}
-
-void  BIF_setTemplate(bContext *C, int index)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	if (index > 0) {
-		ts->skgen_template = BLI_ghash_lookup(TEMPLATES_HASH, SET_INT_IN_POINTER(index));
-	}
-	else {
-		ts->skgen_template = NULL;
-
-		if (TEMPLATE_RIGG != NULL) {
-			RIG_freeRigGraph((BGraph *)TEMPLATE_RIGG);
-		}
-		TEMPLATE_RIGG = NULL;
-	}
-}
-
-/*********************** CONVERSION ***************************/
-
-static void sk_autoname(bContext *C, ReebArc *arc)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	if (ts->skgen_retarget_options & SK_RETARGET_AUTONAME) {
-		if (arc == NULL) {
-			char *num = ts->skgen_num_string;
-			int i = atoi(num);
-			i++;
-			BLI_snprintf(num, 8, "%i", i);
-		}
-		else {
-			char *side = ts->skgen_side_string;
-			int valid = 0;
-			int caps = 0;
-
-			if (side[0] == '\0') {
-				valid = 1;
-			}
-			else if (STREQ(side, "R") || STREQ(side, "L")) {
-				valid = 1;
-				caps = 1;
-			}
-			else if (STREQ(side, "r") || STREQ(side, "l")) {
-				valid = 1;
-				caps = 0;
-			}
-
-			if (valid) {
-				if (arc->head->p[0] < 0) {
-					BLI_snprintf(side, 8, caps ? "R" : "r");
-				}
-				else {
-					BLI_snprintf(side, 8, caps ? "L" : "l");
-				}
-			}
-		}
-	}
-}
-
-static ReebNode *sk_pointToNode(SK_Point *pt, float imat[4][4], float tmat[3][3])
-{
-	ReebNode *node;
-
-	node = MEM_callocN(sizeof(ReebNode), "reeb node");
-	copy_v3_v3(node->p, pt->p);
-	mul_m4_v3(imat, node->p);
-
-	copy_v3_v3(node->no, pt->no);
-	mul_m3_v3(tmat, node->no);
-
-	return node;
-}
-
-static ReebArc *sk_strokeToArc(SK_Stroke *stk, float imat[4][4], float tmat[3][3])
-{
-	ReebArc *arc;
-	int i;
-
-	arc = MEM_callocN(sizeof(ReebArc), "reeb arc");
-	arc->head = sk_pointToNode(stk->points, imat, tmat);
-	arc->tail = sk_pointToNode(sk_lastStrokePoint(stk), imat, tmat);
-
-	arc->bcount = stk->nb_points - 2; /* first and last are nodes, don't count */
-	arc->buckets = MEM_callocN(sizeof(EmbedBucket) * arc->bcount, "Buckets");
-
-	for (i = 0; i < arc->bcount; i++) {
-		copy_v3_v3(arc->buckets[i].p, stk->points[i + 1].p);
-		mul_m4_v3(imat, arc->buckets[i].p);
-
-		copy_v3_v3(arc->buckets[i].no, stk->points[i + 1].no);
-		mul_m3_v3(tmat, arc->buckets[i].no);
-	}
-
-	return arc;
-}
-
-static void sk_retargetStroke(bContext *C, SK_Stroke *stk)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	Object *obedit = CTX_data_edit_object(C);
-	float imat[4][4];
-	float tmat[3][3];
-	ReebArc *arc;
-	RigGraph *rg;
-
-	invert_m4_m4(imat, obedit->obmat);
-	transpose_m3_m4(tmat, obedit->obmat);
-
-	arc = sk_strokeToArc(stk, imat, tmat);
-
-	sk_autoname(C, arc);
-
-	rg = sk_makeTemplateGraph(C, ts->skgen_template);
-
-	BIF_retargetArc(C, arc, rg);
-
-	sk_autoname(C, NULL);
-
-	MEM_freeN(arc->head);
-	MEM_freeN(arc->tail);
-	REEB_freeArc((BArc *)arc);
-}
-
-/**************************************************************/
-
-static void sk_cancelStroke(SK_Sketch *sketch)
-{
-	if (sketch->active_stroke != NULL) {
-		sk_resetOverdraw(sketch);
-		sk_removeStroke(sketch, sketch->active_stroke);
-	}
-}
-
-
-static float sk_clampPointSize(SK_Point *pt, float size)
-{
-	return max_ff(size * pt->size, size / 2);
-}
-
-static void sk_drawPoint(GLUquadric *quad, SK_Point *pt, float size)
-{
-	glTranslate3fv(pt->p);
-	gluSphere(quad, sk_clampPointSize(pt, size), 8, 8);
-}
-
-static void sk_drawEdge(GLUquadric *quad, SK_Point *pt0, SK_Point *pt1, float size)
-{
-	float vec1[3], vec2[3] = {0, 0, 1}, axis[3];
-	float angle, length;
-
-	sub_v3_v3v3(vec1, pt1->p, pt0->p);
-	length = normalize_v3(vec1);
-	cross_v3_v3v3(axis, vec2, vec1);
-
-	if (is_zero_v3(axis)) {
-		axis[1] = 1;
-	}
-
-	angle = angle_normalized_v3v3(vec2, vec1);
-
-	glRotate3fv(angle * (float)(180.0 / M_PI) + 180.0f, axis);
-
-	gluCylinder(quad, sk_clampPointSize(pt1, size), sk_clampPointSize(pt0, size), length, 8, 8);
-}
-
-static void sk_drawNormal(GLUquadric *quad, SK_Point *pt, float size, float height)
-{
-	float vec2[3] = {0, 0, 1}, axis[3];
-	float angle;
-
-	glPushMatrix();
-
-	cross_v3_v3v3(axis, vec2, pt->no);
-
-	if (is_zero_v3(axis)) {
-		axis[1] = 1;
-	}
-
-	angle = angle_normalized_v3v3(vec2, pt->no);
-
-	glRotate3fv(angle * (float)(180.0 / M_PI), axis);
-
-	glColor3f(0, 1, 1);
-	gluCylinder(quad, sk_clampPointSize(pt, size), 0, sk_clampPointSize(pt, height), 10, 2);
-
-	glPopMatrix();
-}
-
-static void sk_drawStroke(SK_Stroke *stk, int id, float color[3], int start, int end)
-{
-	float rgb[3];
-	int i;
-	GLUquadric *quad = gluNewQuadric();
-	gluQuadricNormals(quad, GLU_SMOOTH);
-
-	if (id != -1) {
-		GPU_select_load_id(id);
-
-		for (i = 0; i < stk->nb_points; i++) {
-			glPushMatrix();
-
-			sk_drawPoint(quad, stk->points + i, 0.1);
-
-			if (i > 0) {
-				sk_drawEdge(quad, stk->points + i - 1, stk->points + i, 0.1);
-			}
-
-			glPopMatrix();
-		}
-
-	}
-	else {
-		float d_rgb[3] = {1, 1, 1};
-
-		copy_v3_v3(rgb, color);
-		sub_v3_v3(d_rgb, rgb);
-		mul_v3_fl(d_rgb, 1.0f / (float)stk->nb_points);
-
-		for (i = 0; i < stk->nb_points; i++) {
-			SK_Point *pt = stk->points + i;
-
-			glPushMatrix();
-
-			if (pt->type == PT_EXACT) {
-				glColor3f(0, 0, 0);
-				sk_drawPoint(quad, pt, 0.15);
-				sk_drawNormal(quad, pt, 0.05, 0.9);
-			}
-
-			if (i >= start && i <= end) {
-				glColor3f(0.3, 0.3, 0.3);
-			}
-			else {
-				glColor3fv(rgb);
-			}
-
-			if (pt->type != PT_EXACT) {
-
-				sk_drawPoint(quad, pt, 0.1);
-			}
-
-			if (i > 0) {
-				sk_drawEdge(quad, pt - 1, pt, 0.1);
-			}
-
-			glPopMatrix();
-
-			add_v3_v3(rgb, d_rgb);
-		}
-	}
-
-	gluDeleteQuadric(quad);
-}
-
-static void drawSubdividedStrokeBy(ToolSettings *toolsettings, BArcIterator *iter, NextSubdivisionFunc next_subdividion)
-{
-	SK_Stroke *stk = ((SK_StrokeIterator *)iter)->stroke;
-	float head[3], tail[3];
-	int bone_start = 0;
-	int end = iter->length;
-	int index;
-	GLUquadric *quad = gluNewQuadric();
-	gluQuadricNormals(quad, GLU_SMOOTH);
-
-	iter->head(iter);
-	copy_v3_v3(head, iter->p);
-
-	index = next_subdividion(toolsettings, iter, bone_start, end, head, tail);
-	while (index != -1) {
-		SK_Point *pt = stk->points + index;
-
-		glPushMatrix();
-
-		glColor3f(0, 1, 0);
-		sk_drawPoint(quad, pt, 0.15);
-
-		sk_drawNormal(quad, pt, 0.05, 0.9);
-
-		glPopMatrix();
-
-		copy_v3_v3(head, tail);
-		bone_start = index; // start next bone from current index
-
-		index = next_subdividion(toolsettings, iter, bone_start, end, head, tail);
-	}
-
-	gluDeleteQuadric(quad);
-}
-
-static void sk_drawStrokeSubdivision(ToolSettings *toolsettings, SK_Stroke *stk)
-{
-	int head_index = -1;
-	int i;
-
-	if (toolsettings->bone_sketching_convert == SK_CONVERT_RETARGET) {
-		return;
-	}
-
-
-	for (i = 0; i < stk->nb_points; i++) {
-		SK_Point *pt = stk->points + i;
-
-		if (pt->type == PT_EXACT || i == stk->nb_points - 1) /* stop on exact or on last point */ {
-			if (head_index == -1) {
-				head_index = i;
-			}
-			else {
-				if (i - head_index > 1) {
-					SK_StrokeIterator sk_iter;
-					BArcIterator *iter = (BArcIterator *)&sk_iter;
-
-					initStrokeIterator(iter, stk, head_index, i);
-
-					if (toolsettings->bone_sketching_convert == SK_CONVERT_CUT_ADAPTATIVE) {
-						drawSubdividedStrokeBy(toolsettings, iter, nextAdaptativeSubdivision);
-					}
-					else if (toolsettings->bone_sketching_convert == SK_CONVERT_CUT_LENGTH) {
-						drawSubdividedStrokeBy(toolsettings, iter, nextLengthSubdivision);
-					}
-					else if (toolsettings->bone_sketching_convert == SK_CONVERT_CUT_FIXED) {
-						drawSubdividedStrokeBy(toolsettings, iter, nextFixedSubdivision);
-					}
-
-				}
-
-				head_index = i;
-			}
-		}
-	}
-}
-
-static SK_Point *sk_snapPointStroke(bContext *C, SK_Stroke *stk, int mval[2], float *r_dist_px, int *index, int all_pts)
-{
-	ARegion *ar = CTX_wm_region(C);
-	SK_Point *pt = NULL;
-	int i;
-
-	for (i = 0; i < stk->nb_points; i++) {
-		if (all_pts || stk->points[i].type == PT_EXACT) {
-			short pval[2];
-			int pdist;
-
-			if (ED_view3d_project_short_global(ar, stk->points[i].p, pval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-
-				pdist = ABS(pval[0] - mval[0]) + ABS(pval[1] - mval[1]);
-
-				if (pdist < *r_dist_px) {
-					*r_dist_px = pdist;
-					pt = stk->points + i;
-
-					if (index != NULL) {
-						*index = i;
-					}
-				}
-			}
-		}
-	}
-
-	return pt;
-}
-
-#if 0 /* UNUSED 2.5 */
-static SK_Point *sk_snapPointArmature(bContext *C, Object *ob, ListBase *ebones, int mval[2], int *dist)
-{
-	ARegion *ar = CTX_wm_region(C);
-	SK_Point *pt = NULL;
-	EditBone *bone;
-
-	for (bone = ebones->first; bone; bone = bone->next)
-	{
-		float vec[3];
-		short pval[2];
-		int pdist;
-
-		if ((bone->flag & BONE_CONNECTED) == 0)
-		{
-			copy_v3_v3(vec, bone->head);
-			mul_m4_v3(ob->obmat, vec);
-			if (ED_view3d_project_short_noclip(ar, vec, pval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-
-				pdist = ABS(pval[0] - mval[0]) + ABS(pval[1] - mval[1]);
-
-				if (pdist < *dist)
-				{
-					*dist = pdist;
-					pt = &boneSnap;
-					copy_v3_v3(pt->p, vec);
-					pt->type = PT_EXACT;
-				}
-			}
-		}
-
-
-		copy_v3_v3(vec, bone->tail);
-		mul_m4_v3(ob->obmat, vec);
-		if (ED_view3d_project_short_noclip(ar, vec, pval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-
-			pdist = ABS(pval[0] - mval[0]) + ABS(pval[1] - mval[1]);
-
-			if (pdist < *dist)
-			{
-				*dist = pdist;
-				pt = &boneSnap;
-				copy_v3_v3(pt->p, vec);
-				pt->type = PT_EXACT;
-			}
-		}
-	}
-
-	return pt;
-}
-#endif
-
-void sk_resetOverdraw(SK_Sketch *sketch)
-{
-	sketch->over.target = NULL;
-	sketch->over.start = -1;
-	sketch->over.end = -1;
-	sketch->over.count = 0;
-}
-
-int sk_hasOverdraw(SK_Sketch *sketch, SK_Stroke *stk)
-{
-	return sketch->over.target &&
-	       sketch->over.count >= SK_OVERDRAW_LIMIT &&
-	       (sketch->over.target == stk || stk == NULL) &&
-	       (sketch->over.start != -1 || sketch->over.end != -1);
-}
-
-static void sk_updateOverdraw(bContext *C, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
-{
-	if (sketch->over.target == NULL) {
-		SK_Stroke *target;
-		int closest_index = -1;
-		float dist_px = SNAP_MIN_DISTANCE * 2;
-
-		for (target = sketch->strokes.first; target; target = target->next) {
-			if (target != stk) {
-				int index;
-
-				SK_Point *spt = sk_snapPointStroke(C, target, dd->mval, &dist_px, &index, 1);
-
-				if (spt != NULL) {
-					sketch->over.target = target;
-					closest_index = index;
-				}
-			}
-		}
-
-		if (sketch->over.target != NULL) {
-			if (closest_index > -1) {
-				if (sk_lastStrokePoint(stk)->type == PT_EXACT) {
-					sketch->over.count = SK_OVERDRAW_LIMIT;
-				}
-				else {
-					sketch->over.count++;
-				}
-			}
-
-			if (stk->nb_points == 1) {
-				sketch->over.start = closest_index;
-			}
-			else {
-				sketch->over.end = closest_index;
-			}
-		}
-	}
-	else if (sketch->over.target != NULL) {
-		SK_Point *closest_pt = NULL;
-		float dist_px = SNAP_MIN_DISTANCE * 2;
-		int index;
-
-		closest_pt = sk_snapPointStroke(C, sketch->over.target, dd->mval, &dist_px, &index, 1);
-
-		if (closest_pt != NULL) {
-			if (sk_lastStrokePoint(stk)->type == PT_EXACT) {
-				sketch->over.count = SK_OVERDRAW_LIMIT;
-			}
-			else {
-				sketch->over.count++;
-			}
-
-			sketch->over.end = index;
-		}
-		else {
-			sketch->over.end = -1;
-		}
-	}
-}
-
-/* return 1 on reverse needed */
-static int sk_adjustIndexes(SK_Sketch *sketch, int *start, int *end)
-{
-	int retval = 0;
-
-	*start = sketch->over.start;
-	*end = sketch->over.end;
-
-	if (*start == -1) {
-		*start = 0;
-	}
-
-	if (*end == -1) {
-		*end = sketch->over.target->nb_points - 1;
-	}
-
-	if (*end < *start) {
-		int tmp = *start;
-		*start = *end;
-		*end = tmp;
-		retval = 1;
-	}
-
-	return retval;
-}
-
-static void sk_endOverdraw(SK_Sketch *sketch)
-{
-	SK_Stroke *stk = sketch->active_stroke;
-
-	if (sk_hasOverdraw(sketch, NULL)) {
-		int start;
-		int end;
-
-		if (sk_adjustIndexes(sketch, &start, &end)) {
-			sk_reverseStroke(stk);
-		}
-
-		if (stk->nb_points > 1) {
-			stk->points->type = sketch->over.target->points[start].type;
-			sk_lastStrokePoint(stk)->type = sketch->over.target->points[end].type;
-		}
-
-		sk_insertStrokePoints(sketch->over.target, stk->points, stk->nb_points, start, end);
-
-		sk_removeStroke(sketch, stk);
-
-		sk_resetOverdraw(sketch);
-	}
-}
-
-
-static void sk_startStroke(SK_Sketch *sketch)
-{
-	SK_Stroke *stk = sk_createStroke();
-
-	BLI_addtail(&sketch->strokes, stk);
-	sketch->active_stroke = stk;
-
-	sk_resetOverdraw(sketch);
-}
-
-static void sk_endStroke(bContext *C, SK_Sketch *sketch)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	sk_shrinkStrokeBuffer(sketch->active_stroke);
-
-	if (ts->bone_sketching & BONE_SKETCHING_ADJUST) {
-		sk_endOverdraw(sketch);
-	}
-
-	sketch->active_stroke = NULL;
-}
-
-static void sk_updateDrawData(SK_DrawData *dd)
-{
-	dd->type = PT_CONTINUOUS;
-
-	dd->previous_mval[0] = dd->mval[0];
-	dd->previous_mval[1] = dd->mval[1];
-}
-
-static float sk_distanceDepth(bContext *C, float p1[3], float p2[3])
-{
-	ARegion *ar = CTX_wm_region(C);
-	RegionView3D *rv3d = ar->regiondata;
-	float vec[3];
-	float distance;
-
-	sub_v3_v3v3(vec, p1, p2);
-
-	project_v3_v3v3(vec, vec, rv3d->viewinv[2]);
-
-	distance = len_v3(vec);
-
-	if (dot_v3v3(rv3d->viewinv[2], vec) > 0) {
-		distance *= -1;
-	}
-
-	return distance;
-}
-
-static void sk_interpolateDepth(bContext *C, SK_Stroke *stk, int start, int end, float length, float distance)
-{
-	ARegion *ar = CTX_wm_region(C);
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = sa->spacedata.first;
-
-	float progress = 0;
-	int i;
-
-	progress = len_v3v3(stk->points[start].p, stk->points[start - 1].p);
-
-	for (i = start; i <= end; i++) {
-		float ray_start[3], ray_normal[3];
-		float delta = len_v3v3(stk->points[i].p, stk->points[i + 1].p);
-		float pval[2] = {0, 0};
-
-		ED_view3d_project_float_global(ar, stk->points[i].p, pval, V3D_PROJ_TEST_NOP);
-		ED_view3d_win_to_ray(ar, v3d, pval, ray_start, ray_normal, false);
-
-		mul_v3_fl(ray_normal, distance * progress / length);
-		add_v3_v3(stk->points[i].p, ray_normal);
-
-		progress += delta;
-	}
-}
-
-static void sk_projectDrawPoint(bContext *C, float vec[3], SK_Stroke *stk, SK_DrawData *dd)
-{
-	ARegion *ar = CTX_wm_region(C);
-	/* copied from grease pencil, need fixing */
-	SK_Point *last = sk_lastStrokePoint(stk);
-	short cval[2];
-	float fp[3] = {0, 0, 0};
-	float dvec[3];
-	float mval_f[2];
-	float zfac;
-
-	if (last != NULL) {
-		copy_v3_v3(fp, last->p);
-	}
-
-	zfac = ED_view3d_calc_zfac(ar->regiondata, fp, NULL);
-
-	if (ED_view3d_project_short_global(ar, fp, cval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-		VECSUB2D(mval_f, cval, dd->mval);
-		ED_view3d_win_to_delta(ar, mval_f, dvec, zfac);
-		sub_v3_v3v3(vec, fp, dvec);
-	}
-	else {
-		zero_v3(vec);
-	}
-}
-
-static int sk_getStrokeDrawPoint(bContext *C, SK_Point *pt, SK_Sketch *UNUSED(sketch), SK_Stroke *stk, SK_DrawData *dd)
-{
-	pt->type = dd->type;
-	pt->mode = PT_PROJECT;
-	sk_projectDrawPoint(C, pt->p, stk, dd);
-
-	return 1;
-}
-
-static int sk_addStrokeDrawPoint(bContext *C, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
-{
-	ARegion *ar = CTX_wm_region(C);
-	RegionView3D *rv3d = ar->regiondata;
-	SK_Point pt;
-
-	sk_initPoint(&pt, dd, rv3d->viewinv[2]);
-
-	sk_getStrokeDrawPoint(C, &pt, sketch, stk, dd);
-
-	sk_appendStrokePoint(stk, &pt);
-
-	return 1;
-}
-
-static int sk_getStrokeSnapPoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	int point_added = 0;
-
-	/* TODO: Since the function `ED_transform_snap_object_context_create_view3d` creates a cache,
-	 * the ideal would be to call this function only at the beginning of the snap operation,
-	 * or at the beginning of the operator itself */
-	struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
-	        CTX_data_main(C), CTX_data_scene(C), 0,
-	        CTX_wm_region(C), CTX_wm_view3d(C));
-
-	float mvalf[2] = {UNPACK2(dd->mval)};
-	float loc[3], dummy_no[3];
-
-	if (ts->snap_mode == SCE_SNAP_MODE_VOLUME) {
-		float size;
-		if (peelObjectsSnapContext(
-		        snap_context, mvalf,
-		        &(const struct SnapObjectParams){
-		            .snap_select = SNAP_NOT_SELECTED,
-		            .use_object_edit_cage = false,
-		        },
-		        (ts->snap_flag & SCE_SNAP_PEEL_OBJECT) != 0,
-		        loc, dummy_no, &size))
-		{
-			pt->type = dd->type;
-			pt->mode = PT_SNAP;
-			pt->size = size / 2;
-			copy_v3_v3(pt->p, loc);
-
-			point_added = 1;
-		}
-	}
-	else {
-		SK_Stroke *snap_stk;
-		float dist_px = SNAP_MIN_DISTANCE; // Use a user defined value here
-
-		/* snap to strokes */
-		// if (ts->snap_mode == SCE_SNAP_MODE_VERTEX) /* snap all the time to strokes */
-		for (snap_stk = sketch->strokes.first; snap_stk; snap_stk = snap_stk->next) {
-			SK_Point *spt = NULL;
-			if (snap_stk == stk) {
-				spt = sk_snapPointStroke(C, snap_stk, dd->mval, &dist_px, NULL, 0);
-			}
-			else {
-				spt = sk_snapPointStroke(C, snap_stk, dd->mval, &dist_px, NULL, 1);
-			}
-
-			if (spt != NULL) {
-				copy_v3_v3(pt->p, spt->p);
-				point_added = 1;
-			}
-		}
-
-		/* try to snap to closer object */
-		{
-			if (ED_transform_snap_object_project_view3d(
-			        snap_context,
-			        ts->snap_mode,
-			        &(const struct SnapObjectParams){
-			            .snap_select = SNAP_NOT_SELECTED,
-			            .use_object_edit_cage = false,
-			        },
-			        mvalf, &dist_px, NULL,
-			        loc, dummy_no))
-			{
-				pt->type = dd->type;
-				pt->mode = PT_SNAP;
-				copy_v3_v3(pt->p, loc);
-
-				point_added = 1;
-			}
-		}
-	}
-
-	/* TODO: The ideal would be to call this function only once.
-	 * At the end of the operator */
-	ED_transform_snap_object_context_destroy(snap_context);
-	return point_added;
-}
-
-static int sk_addStrokeSnapPoint(bContext *C, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
-{
-	int point_added;
-	ARegion *ar = CTX_wm_region(C);
-	RegionView3D *rv3d = ar->regiondata;
-	SK_Point pt;
-
-	sk_initPoint(&pt, dd, rv3d->viewinv[2]);
-
-	point_added = sk_getStrokeSnapPoint(C, &pt, sketch, stk, dd);
-
-	if (point_added) {
-		float final_p[3];
-		float length, distance;
-		int total;
-		int i;
-
-		copy_v3_v3(final_p, pt.p);
-
-		sk_projectDrawPoint(C, pt.p, stk, dd);
-		sk_appendStrokePoint(stk, &pt);
-
-		/* update all previous point to give smooth Z progresion */
-		total = 0;
-		length = 0;
-		for (i = stk->nb_points - 2; i > 0; i--) {
-			length += len_v3v3(stk->points[i].p, stk->points[i + 1].p);
-			total++;
-			if (stk->points[i].mode == PT_SNAP || stk->points[i].type == PT_EXACT) {
-				break;
-			}
-		}
-
-		if (total > 1) {
-			distance = sk_distanceDepth(C, final_p, stk->points[i].p);
-
-			sk_interpolateDepth(C, stk, i + 1, stk->nb_points - 2, length, distance);
-		}
-
-		copy_v3_v3(stk->points[stk->nb_points - 1].p, final_p);
-
-		point_added = 1;
-	}
-
-	return point_added;
-}
-
-static void sk_addStrokePoint(bContext *C, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd, const bool snap)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	int point_added = 0;
-
-	if (snap) {
-		point_added = sk_addStrokeSnapPoint(C, sketch, stk, dd);
-	}
-
-	if (point_added == 0) {
-		point_added = sk_addStrokeDrawPoint(C, sketch, stk, dd);
-	}
-
-	if (stk == sketch->active_stroke && ts->bone_sketching & BONE_SKETCHING_ADJUST) {
-		sk_updateOverdraw(C, sketch, stk, dd);
-	}
-}
-
-static void sk_getStrokePoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd, const bool snap)
-{
-	int point_added = 0;
-
-	if (snap) {
-		point_added = sk_getStrokeSnapPoint(C, pt, sketch, stk, dd);
-		LAST_SNAP_POINT_VALID = 1;
-		copy_v3_v3(LAST_SNAP_POINT, pt->p);
-	}
-	else {
-		LAST_SNAP_POINT_VALID = 0;
-	}
-
-	if (point_added == 0) {
-		point_added = sk_getStrokeDrawPoint(C, pt, sketch, stk, dd);
-	}
-}
-
-/********************************************/
-
-static void *headPoint(void *arg);
-static void *tailPoint(void *arg);
-static void *nextPoint(void *arg);
-static void *nextNPoint(void *arg, int n);
-static void *peekPoint(void *arg, int n);
-static void *previousPoint(void *arg);
-static int   iteratorStopped(void *arg);
-
-static void initIteratorFct(SK_StrokeIterator *iter)
-{
-	iter->head = headPoint;
-	iter->tail = tailPoint;
-	iter->peek = peekPoint;
-	iter->next = nextPoint;
-	iter->nextN = nextNPoint;
-	iter->previous = previousPoint;
-	iter->stopped = iteratorStopped;
-}
-
-static SK_Point *setIteratorValues(SK_StrokeIterator *iter, int index)
-{
-	SK_Point *pt = NULL;
-
-	if (index >= 0 && index < iter->length) {
-		pt = &(iter->stroke->points[iter->start + (iter->stride * index)]);
-		iter->p = pt->p;
-		iter->no = pt->no;
-		iter->size = pt->size;
-	}
-	else {
-		iter->p = NULL;
-		iter->no = NULL;
-		iter->size = 0;
-	}
-
-	return pt;
-}
-
-void initStrokeIterator(BArcIterator *arg, SK_Stroke *stk, int start, int end)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-
-	initIteratorFct(iter);
-	iter->stroke = stk;
-
-	if (start < end) {
-		iter->start = start + 1;
-		iter->end = end - 1;
-		iter->stride = 1;
-	}
-	else {
-		iter->start = start - 1;
-		iter->end = end + 1;
-		iter->stride = -1;
-	}
-
-	iter->length = iter->stride * (iter->end - iter->start + 1);
-
-	iter->index = -1;
-}
-
-
-static void *headPoint(void *arg)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-
-	result = &(iter->stroke->points[iter->start - iter->stride]);
-	iter->p = result->p;
-	iter->no = result->no;
-	iter->size = result->size;
-
-	return result;
-}
-
-static void *tailPoint(void *arg)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-
-	result = &(iter->stroke->points[iter->end + iter->stride]);
-	iter->p = result->p;
-	iter->no = result->no;
-	iter->size = result->size;
-
-	return result;
-}
-
-static void *nextPoint(void *arg)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-
-	iter->index++;
-	if (iter->index < iter->length) {
-		result = setIteratorValues(iter, iter->index);
-	}
-
-	return result;
-}
-
-static void *nextNPoint(void *arg, int n)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-
-	iter->index += n;
-
-	/* check if passed end */
-	if (iter->index < iter->length) {
-		result = setIteratorValues(iter, iter->index);
-	}
-
-	return result;
-}
-
-static void *peekPoint(void *arg, int n)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-	int index = iter->index + n;
-
-	/* check if passed end */
-	if (index < iter->length) {
-		result = setIteratorValues(iter, index);
-	}
-
-	return result;
-}
-
-static void *previousPoint(void *arg)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-	SK_Point *result = NULL;
-
-	if (iter->index > 0) {
-		iter->index--;
-		result = setIteratorValues(iter, iter->index);
-	}
-
-	return result;
-}
-
-static int iteratorStopped(void *arg)
-{
-	SK_StrokeIterator *iter = (SK_StrokeIterator *)arg;
-
-	if (iter->index >= iter->length) {
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-static void sk_convertStroke(bContext *C, SK_Stroke *stk)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	bArmature *arm = obedit->data;
-	SK_Point *head;
-	EditBone *parent = NULL;
-	float invmat[4][4]; /* move in caller function */
-	float tmat[3][3];
-	int head_index = 0;
-	int i;
-
-	head = NULL;
-
-	invert_m4_m4(invmat, obedit->obmat);
-	transpose_m3_m4(tmat, obedit->obmat);
-
-	for (i = 0; i < stk->nb_points; i++) {
-		SK_Point *pt = stk->points + i;
-
-		if (pt->type == PT_EXACT) {
-			if (head == NULL) {
-				head_index = i;
-				head = pt;
-			}
-			else {
-				EditBone *bone = NULL;
-				EditBone *new_parent;
-
-				if (i - head_index > 1) {
-					SK_StrokeIterator sk_iter;
-					BArcIterator *iter = (BArcIterator *)&sk_iter;
-
-					initStrokeIterator(iter, stk, head_index, i);
-
-					if (ts->bone_sketching_convert == SK_CONVERT_CUT_ADAPTATIVE) {
-						bone = subdivideArcBy(ts, arm, arm->edbo, iter, invmat, tmat, nextAdaptativeSubdivision);
-					}
-					else if (ts->bone_sketching_convert == SK_CONVERT_CUT_LENGTH) {
-						bone = subdivideArcBy(ts, arm, arm->edbo, iter, invmat, tmat, nextLengthSubdivision);
-					}
-					else if (ts->bone_sketching_convert == SK_CONVERT_CUT_FIXED) {
-						bone = subdivideArcBy(ts, arm, arm->edbo, iter, invmat, tmat, nextFixedSubdivision);
-					}
-				}
-
-				if (bone == NULL) {
-					bone = ED_armature_ebone_add(arm, "Bone");
-
-					copy_v3_v3(bone->head, head->p);
-					copy_v3_v3(bone->tail, pt->p);
-
-					mul_m4_v3(invmat, bone->head);
-					mul_m4_v3(invmat, bone->tail);
-					setBoneRollFromNormal(bone, head->no, invmat, tmat);
-				}
-
-				new_parent = bone;
-				bone->flag |= BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL;
-
-				/* move to end of chain */
-				while (bone->parent != NULL) {
-					bone = bone->parent;
-					bone->flag |= BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL;
-				}
-
-				if (parent != NULL) {
-					bone->parent = parent;
-					bone->flag |= BONE_CONNECTED;
-				}
-
-				parent = new_parent;
-				head_index = i;
-				head = pt;
-			}
-		}
-	}
-}
-
-static void sk_convert(bContext *C, SK_Sketch *sketch)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	SK_Stroke *stk;
-
-	for (stk = sketch->strokes.first; stk; stk = stk->next) {
-		if (stk->selected == 1) {
-			if (ts->bone_sketching_convert == SK_CONVERT_RETARGET) {
-				sk_retargetStroke(C, stk);
-			}
-			else {
-				sk_convertStroke(C, stk);
-			}
-//			XXX
-//			allqueue(REDRAWBUTSEDIT, 0);
-		}
-	}
-}
-/******************* GESTURE *************************/
-
-
-/* returns the number of self intersections */
-static int sk_getSelfIntersections(bContext *C, ListBase *list, SK_Stroke *gesture)
-{
-	ARegion *ar = CTX_wm_region(C);
-	int added = 0;
-	int s_i;
-
-	for (s_i = 0; s_i < gesture->nb_points - 1; s_i++) {
-		float s_p1[3] = {0, 0, 0};
-		float s_p2[3] = {0, 0, 0};
-		int g_i;
-
-		ED_view3d_project_float_global(ar, gesture->points[s_i].p, s_p1, V3D_PROJ_TEST_NOP);
-		ED_view3d_project_float_global(ar, gesture->points[s_i + 1].p, s_p2, V3D_PROJ_TEST_NOP);
-
-		/* start checking from second next, because two consecutive cannot intersect */
-		for (g_i = s_i + 2; g_i < gesture->nb_points - 1; g_i++) {
-			float g_p1[3] = {0, 0, 0};
-			float g_p2[3] = {0, 0, 0};
-			float vi[3];
-			float lambda;
-
-			ED_view3d_project_float_global(ar, gesture->points[g_i].p, g_p1, V3D_PROJ_TEST_NOP);
-			ED_view3d_project_float_global(ar, gesture->points[g_i + 1].p, g_p2, V3D_PROJ_TEST_NOP);
-
-			if (isect_line_line_strict_v3(s_p1, s_p2, g_p1, g_p2, vi, &lambda)) {
-				SK_Intersection *isect = MEM_callocN(sizeof(SK_Intersection), "Intersection");
-
-				isect->gesture_index = g_i;
-				isect->before = s_i;
-				isect->after = s_i + 1;
-				isect->stroke = gesture;
-
-				sub_v3_v3v3(isect->p, gesture->points[s_i + 1].p, gesture->points[s_i].p);
-				mul_v3_fl(isect->p, lambda);
-				add_v3_v3(isect->p, gesture->points[s_i].p);
-
-				BLI_addtail(list, isect);
-
-				added++;
-			}
-		}
-	}
-
-	return added;
-}
-
-static int cmpIntersections(const void *i1, const void *i2)
-{
-	const SK_Intersection *isect1 = i1, *isect2 = i2;
-
-	if (isect1->stroke == isect2->stroke) {
-		if (isect1->before < isect2->before) {
-			return -1;
-		}
-		else if (isect1->before > isect2->before) {
-			return 1;
-		}
-		else {
-			if (isect1->lambda < isect2->lambda) {
-				return -1;
-			}
-			else if (isect1->lambda > isect2->lambda) {
-				return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-
-/* returns the maximum number of intersections per stroke */
-static int sk_getIntersections(bContext *C, ListBase *list, SK_Sketch *sketch, SK_Stroke *gesture)
-{
-	ARegion *ar = CTX_wm_region(C);
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = sa->spacedata.first;
-	SK_Stroke *stk;
-	int added = 0;
-
-	for (stk = sketch->strokes.first; stk; stk = stk->next) {
-		int s_added = 0;
-		int s_i;
-
-		for (s_i = 0; s_i < stk->nb_points - 1; s_i++) {
-			float s_p1[3] = {0, 0, 0};
-			float s_p2[3] = {0, 0, 0};
-			int g_i;
-
-			ED_view3d_project_float_global(ar, stk->points[s_i].p, s_p1, V3D_PROJ_TEST_NOP);
-			ED_view3d_project_float_global(ar, stk->points[s_i + 1].p, s_p2, V3D_PROJ_TEST_NOP);
-
-			for (g_i = 0; g_i < gesture->nb_points - 1; g_i++) {
-				float g_p1[3] = {0, 0, 0};
-				float g_p2[3] = {0, 0, 0};
-				float vi[3];
-				float lambda;
-
-				ED_view3d_project_float_global(ar, gesture->points[g_i].p, g_p1, V3D_PROJ_TEST_NOP);
-				ED_view3d_project_float_global(ar, gesture->points[g_i + 1].p, g_p2, V3D_PROJ_TEST_NOP);
-
-				if (isect_line_line_strict_v3(s_p1, s_p2, g_p1, g_p2, vi, &lambda)) {
-					SK_Intersection *isect = MEM_callocN(sizeof(SK_Intersection), "Intersection");
-					float ray_start[3], ray_end[3];
-					float mval[2];
-
-					isect->gesture_index = g_i;
-					isect->before = s_i;
-					isect->after = s_i + 1;
-					isect->stroke = stk;
-					isect->lambda = lambda;
-
-					mval[0] = vi[0];
-					mval[1] = vi[1];
-					ED_view3d_win_to_segment(ar, v3d, mval, ray_start, ray_end, true);
-
-					isect_line_line_v3(stk->points[s_i].p,
-					                   stk->points[s_i + 1].p,
-					                   ray_start,
-					                   ray_end,
-					                   isect->p,
-					                   vi);
-
-					BLI_addtail(list, isect);
-
-					s_added++;
-				}
-			}
-		}
-
-		added = MAX2(s_added, added);
-	}
-
-	BLI_listbase_sort(list, cmpIntersections);
-
-	return added;
-}
-
-static int sk_getSegments(SK_Stroke *segments, SK_Stroke *gesture)
-{
-	SK_StrokeIterator sk_iter;
-	BArcIterator *iter = (BArcIterator *)&sk_iter;
-
-	float CORRELATION_THRESHOLD = 0.99f;
-	float *vec;
-	int i, j;
-
-	sk_appendStrokePoint(segments, &gesture->points[0]);
-	vec = segments->points[segments->nb_points - 1].p;
-
-	initStrokeIterator(iter, gesture, 0, gesture->nb_points - 1);
-
-	for (i = 1, j = 0; i < gesture->nb_points; i++) {
-		float n[3];
-
-		/* Calculate normal */
-		sub_v3_v3v3(n, gesture->points[i].p, vec);
-
-		if (calcArcCorrelation(iter, j, i, vec, n) < CORRELATION_THRESHOLD) {
-			j = i - 1;
-			sk_appendStrokePoint(segments, &gesture->points[j]);
-			vec = segments->points[segments->nb_points - 1].p;
-			segments->points[segments->nb_points - 1].type = PT_EXACT;
-		}
-	}
-
-	sk_appendStrokePoint(segments, &gesture->points[gesture->nb_points - 1]);
-
-	return segments->nb_points - 1;
-}
-
-int sk_detectCutGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments == 1 && gest->nb_intersections == 1) {
-		return 1;
-	}
-
-	return 0;
-}
-
-void sk_applyCutGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	SK_Intersection *isect;
-
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		SK_Point pt;
-
-		pt.type = PT_EXACT;
-		pt.mode = PT_PROJECT; /* take mode from neighboring points */
-		copy_v3_v3(pt.p, isect->p);
-		copy_v3_v3(pt.no, isect->stroke->points[isect->before].no);
-
-		sk_insertStrokePoint(isect->stroke, &pt, isect->after);
-	}
-}
-
-int sk_detectTrimGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments == 2 && gest->nb_intersections == 1 && gest->nb_self_intersections == 0) {
-		float s1[3], s2[3];
-		float angle;
-
-		sub_v3_v3v3(s1, gest->segments->points[1].p, gest->segments->points[0].p);
-		sub_v3_v3v3(s2, gest->segments->points[2].p, gest->segments->points[1].p);
-
-		angle = RAD2DEGF(angle_v2v2(s1, s2));
-
-		if (angle > 60 && angle < 120) {
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-void sk_applyTrimGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	SK_Intersection *isect;
-	float trim_dir[3];
-
-	sub_v3_v3v3(trim_dir, gest->segments->points[2].p, gest->segments->points[1].p);
-
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		SK_Point pt;
-		float stroke_dir[3];
-
-		pt.type = PT_EXACT;
-		pt.mode = PT_PROJECT; /* take mode from neighboring points */
-		copy_v3_v3(pt.p, isect->p);
-		copy_v3_v3(pt.no, isect->stroke->points[isect->before].no);
-
-		sub_v3_v3v3(stroke_dir, isect->stroke->points[isect->after].p, isect->stroke->points[isect->before].p);
-
-		/* same direction, trim end */
-		if (dot_v3v3(stroke_dir, trim_dir) > 0) {
-			sk_replaceStrokePoint(isect->stroke, &pt, isect->after);
-			sk_trimStroke(isect->stroke, 0, isect->after);
-		}
-		/* else, trim start */
-		else {
-			sk_replaceStrokePoint(isect->stroke, &pt, isect->before);
-			sk_trimStroke(isect->stroke, isect->before, isect->stroke->nb_points - 1);
-		}
-
-	}
-}
-
-int sk_detectCommandGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments > 2 && gest->nb_intersections == 2 && gest->nb_self_intersections == 1) {
-		SK_Intersection *isect, *self_isect;
-
-		/* get the last intersection of the first pair */
-		for (isect = gest->intersections.first; isect; isect = isect->next) {
-			if (isect->stroke == isect->next->stroke) {
-				isect = isect->next;
-				break;
-			}
-		}
-
-		self_isect = gest->self_intersections.first;
-
-		if (isect && isect->gesture_index < self_isect->gesture_index) {
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-void sk_applyCommandGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	SK_Intersection *isect;
-	int command = 1;
-
-/*	XXX */
-/*	command = pupmenu("Action %t|Flatten %x1|Straighten %x2|Polygonize %x3"); */
-	if (command < 1) return;
-
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		SK_Intersection *i2;
-
-		i2 = isect->next;
-
-		if (i2 && i2->stroke == isect->stroke) {
-			switch (command) {
-				case 1:
-					sk_flattenStroke(isect->stroke, isect->before, i2->after);
-					break;
-				case 2:
-					sk_straightenStroke(isect->stroke, isect->before, i2->after, isect->p, i2->p);
-					break;
-				case 3:
-					sk_polygonizeStroke(isect->stroke, isect->before, i2->after);
-					break;
-			}
-
-			isect = i2;
-		}
-	}
-}
-
-int sk_detectDeleteGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments == 2 && gest->nb_intersections == 2) {
-		float s1[3], s2[3];
-		float angle;
-
-		sub_v3_v3v3(s1, gest->segments->points[1].p, gest->segments->points[0].p);
-		sub_v3_v3v3(s2, gest->segments->points[2].p, gest->segments->points[1].p);
-
-		angle = RAD2DEGF(angle_v2v2(s1, s2));
-
-		if (angle > 120) {
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-void sk_applyDeleteGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *sketch)
-{
-	SK_Intersection *isect;
-
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		/* only delete strokes that are crossed twice */
-		if (isect->next && isect->next->stroke == isect->stroke) {
-			isect = isect->next;
-
-			sk_removeStroke(sketch, isect->stroke);
-		}
-	}
-}
-
-int sk_detectMergeGesture(bContext *C, SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	ARegion *ar = CTX_wm_region(C);
-	if (gest->nb_segments > 2 && gest->nb_intersections == 2) {
-		int start_val[2], end_val[2];
-		int dist;
-
-		if ((ED_view3d_project_int_global(ar, gest->stk->points[0].p,           start_val, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
-		    (ED_view3d_project_int_global(ar, sk_lastStrokePoint(gest->stk)->p, end_val,   V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
-		{
-			dist = len_manhattan_v2v2_int(start_val, end_val);
-
-			/* if gesture is a circle */
-			if (dist <= 20) {
-				SK_Intersection *isect;
-
-				/* check if it circled around an exact point */
-				for (isect = gest->intersections.first; isect; isect = isect->next) {
-					/* only delete strokes that are crossed twice */
-					if (isect->next && isect->next->stroke == isect->stroke) {
-						int start_index, end_index;
-						int i;
-
-						start_index = MIN2(isect->after, isect->next->after);
-						end_index = MAX2(isect->before, isect->next->before);
-
-						for (i = start_index; i <= end_index; i++) {
-							if (isect->stroke->points[i].type == PT_EXACT) {
-								return 1; /* at least one exact point found, stop detect here */
-							}
-						}
-
-						/* skip next */
-						isect = isect->next;
-					}
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-void sk_applyMergeGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	SK_Intersection *isect;
-
-	/* check if it circled around an exact point */
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		/* only merge strokes that are crossed twice */
-		if (isect->next && isect->next->stroke == isect->stroke) {
-			int start_index, end_index;
-			int i;
-
-			start_index = MIN2(isect->after, isect->next->after);
-			end_index = MAX2(isect->before, isect->next->before);
-
-			for (i = start_index; i <= end_index; i++) {
-				/* if exact, switch to continuous */
-				if (isect->stroke->points[i].type == PT_EXACT) {
-					isect->stroke->points[i].type = PT_CONTINUOUS;
-				}
-			}
-
-			/* skip next */
-			isect = isect->next;
-		}
-	}
-}
-
-int sk_detectReverseGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments > 2 && gest->nb_intersections == 2 && gest->nb_self_intersections == 0) {
-		SK_Intersection *isect;
-
-		/* check if it circled around an exact point */
-		for (isect = gest->intersections.first; isect; isect = isect->next) {
-			/* only delete strokes that are crossed twice */
-			if (isect->next && isect->next->stroke == isect->stroke) {
-				float start_v[3], end_v[3];
-				float angle;
-
-				if (isect->gesture_index < isect->next->gesture_index) {
-					sub_v3_v3v3(start_v, isect->p, gest->stk->points[0].p);
-					sub_v3_v3v3(end_v, sk_lastStrokePoint(gest->stk)->p, isect->next->p);
-				}
-				else {
-					sub_v3_v3v3(start_v, isect->next->p, gest->stk->points[0].p);
-					sub_v3_v3v3(end_v, sk_lastStrokePoint(gest->stk)->p, isect->p);
-				}
-
-				angle = RAD2DEGF(angle_v2v2(start_v, end_v));
-
-				if (angle > 120) {
-					return 1;
-				}
-
-				/* skip next */
-				isect = isect->next;
-			}
-		}
-	}
-
-	return 0;
-}
-
-void sk_applyReverseGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	SK_Intersection *isect;
-
-	for (isect = gest->intersections.first; isect; isect = isect->next) {
-		/* only reverse strokes that are crossed twice */
-		if (isect->next && isect->next->stroke == isect->stroke) {
-			sk_reverseStroke(isect->stroke);
-
-			/* skip next */
-			isect = isect->next;
-		}
-	}
-}
-
-int sk_detectConvertGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED(sketch))
-{
-	if (gest->nb_segments == 3 && gest->nb_self_intersections == 1) {
-		return 1;
-	}
-	return 0;
-}
-
-void sk_applyConvertGesture(bContext *C, SK_Gesture *UNUSED(gest), SK_Sketch *sketch)
-{
-	sk_convert(C, sketch);
-}
-
-static void sk_initGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch)
-{
-	BLI_listbase_clear(&gest->intersections);
-	BLI_listbase_clear(&gest->self_intersections);
-
-	gest->segments = sk_createStroke();
-	gest->stk = sketch->gesture;
-
-	gest->nb_self_intersections = sk_getSelfIntersections(C, &gest->self_intersections, gest->stk);
-	gest->nb_intersections = sk_getIntersections(C, &gest->intersections, sketch, gest->stk);
-	gest->nb_segments = sk_getSegments(gest->segments, gest->stk);
-}
-
-static void sk_freeGesture(SK_Gesture *gest)
-{
-	sk_freeStroke(gest->segments);
-	BLI_freelistN(&gest->intersections);
-	BLI_freelistN(&gest->self_intersections);
-}
-
-static void sk_applyGesture(bContext *C, SK_Sketch *sketch)
-{
-	SK_Gesture gest;
-	SK_GestureAction *act;
-
-	sk_initGesture(C, &gest, sketch);
-
-	/* detect and apply */
-	for (act = GESTURE_ACTIONS; act->apply != NULL; act++) {
-		if (act->detect(C, &gest, sketch)) {
-			act->apply(C, &gest, sketch);
-			break;
-		}
-	}
-
-	sk_freeGesture(&gest);
-}
-
-/********************************************/
-
-
-static bool sk_selectStroke(bContext *C, SK_Sketch *sketch, const int mval[2], const bool extend)
-{
-	ViewContext vc;
-	rcti rect;
-	unsigned int buffer[MAXPICKBUF];
-	short hits;
-
-	ED_view3d_viewcontext_init(C, &vc);
-
-	BLI_rcti_init_pt_radius(&rect, mval, 5);
-
-	hits = view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect, VIEW3D_SELECT_PICK_NEAREST);
-
-	if (hits > 0) {
-		int besthitresult = -1;
-
-		if (hits == 1) {
-			besthitresult = buffer[3];
-		}
-		else {
-			besthitresult = buffer[3];
-			/* loop and get best hit */
-		}
-
-		if (besthitresult > 0) {
-			SK_Stroke *selected_stk = BLI_findlink(&sketch->strokes, besthitresult - 1);
-
-			if (extend == 0) {
-				sk_selectAllSketch(sketch, -1);
-
-				selected_stk->selected = 1;
-			}
-			else {
-				selected_stk->selected ^= 1;
-			}
-
-
-		}
-		return 1;
-	}
-
-	return 0;
-}
-
-#if 0 /* UNUSED 2.5 */
-static void sk_queueRedrawSketch(SK_Sketch *sketch)
-{
-	if (sketch->active_stroke != NULL)
-	{
-		SK_Point *last = sk_lastStrokePoint(sketch->active_stroke);
-
-		if (last != NULL)
-		{
-//			XXX
-//			allqueue(REDRAWVIEW3D, 0);
-		}
-	}
-}
-#endif
-
-static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch, int with_names)
-{
-	ToolSettings *ts = scene->toolsettings;
-	SK_Stroke *stk;
-
-	glClear(GL_DEPTH_BUFFER_BIT);
-	glEnable(GL_DEPTH_TEST);
-
-	if (with_names) {
-		int id;
-		for (id = 1, stk = sketch->strokes.first; stk; id++, stk = stk->next) {
-			sk_drawStroke(stk, id, NULL, -1, -1);
-		}
-
-		GPU_select_load_id(-1);
-	}
-	else {
-		float selected_rgb[3] = {1, 0, 0};
-		float unselected_rgb[3] = {1, 0.5, 0};
-
-		for (stk = sketch->strokes.first; stk; stk = stk->next) {
-			int start = -1;
-			int end = -1;
-
-			if (sk_hasOverdraw(sketch, stk)) {
-				sk_adjustIndexes(sketch, &start, &end);
-			}
-
-			sk_drawStroke(stk, -1, (stk->selected == 1 ? selected_rgb : unselected_rgb), start, end);
-
-			if (stk->selected == 1) {
-				sk_drawStrokeSubdivision(ts, stk);
-			}
-		}
-
-		if (sketch->active_stroke != NULL) {
-			SK_Point *last = sk_lastStrokePoint(sketch->active_stroke);
-
-			if (ts->bone_sketching & BONE_SKETCHING_QUICK) {
-				sk_drawStrokeSubdivision(ts, sketch->active_stroke);
-			}
-
-			if (last != NULL) {
-				GLUquadric *quad = gluNewQuadric();
-				gluQuadricNormals(quad, GLU_SMOOTH);
-
-				glPushMatrix();
-
-				glEnable(GL_BLEND);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-				switch (sketch->next_point.mode) {
-					case PT_SNAP:
-						glColor3f(0, 1, 0);
-						break;
-					case PT_PROJECT:
-						glColor3f(0, 0, 0);
-						break;
-				}
-
-				sk_drawPoint(quad, &sketch->next_point, 0.1);
-
-				glColor4f(selected_rgb[0], selected_rgb[1], selected_rgb[2], 0.3);
-
-				sk_drawEdge(quad, last, &sketch->next_point, 0.1);
-
-				glDisable(GL_BLEND);
-
-				glPopMatrix();
-
-				gluDeleteQuadric(quad);
-			}
-		}
-	}
-
-#if 0
-	if (BLI_listbase_is_empty(&sketch->depth_peels) == false) {
-		float colors[8][3] = {
-			{1, 0, 0},
-			{0, 1, 0},
-			{0, 0, 1},
-			{1, 1, 0},
-			{1, 0, 1},
-			{0, 1, 1},
-			{1, 1, 1},
-			{0, 0, 0}
-		};
-		DepthPeel *p;
-		GLUquadric *quad = gluNewQuadric();
-		gluQuadricNormals(quad, GLU_SMOOTH);
-
-		for (p = sketch->depth_peels.first; p; p = p->next)
-		{
-			int index = GET_INT_FROM_POINTER(p->ob);
-			index = (index >> 5) & 7;
-
-			glColor3fv(colors[index]);
-			glPushMatrix();
-			glTranslate3fv(p->p);
-			gluSphere(quad, 0.02, 8, 8);
-			glPopMatrix();
-		}
-
-		gluDeleteQuadric(quad);
-	}
-#endif
-
-	glDisable(GL_DEPTH_TEST);
-
-	/* only draw gesture in active area */
-	if (sketch->gesture != NULL /* && area_is_active_area(G.vd->area) */) {
-		float gesture_rgb[3] = {0, 0.5, 1};
-		sk_drawStroke(sketch->gesture, -1, gesture_rgb, -1, -1);
-	}
-}
-
-static int sk_finish_stroke(bContext *C, SK_Sketch *sketch)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-
-	if (sketch->active_stroke != NULL) {
-		SK_Stroke *stk = sketch->active_stroke;
-
-		sk_endStroke(C, sketch);
-
-		if (ts->bone_sketching & BONE_SKETCHING_QUICK) {
-			if (ts->bone_sketching_convert == SK_CONVERT_RETARGET) {
-				sk_retargetStroke(C, stk);
-			}
-			else {
-				sk_convertStroke(C, stk);
-			}
-//			XXX
-//			BIF_undo_push("Convert Sketch");
-			sk_removeStroke(sketch, stk);
-//			XXX
-//			allqueue(REDRAWBUTSEDIT, 0);
-		}
-
-//		XXX
-//		allqueue(REDRAWVIEW3D, 0);
-		return 1;
-	}
-
-	return 0;
-}
-
-static void sk_start_draw_stroke(SK_Sketch *sketch)
-{
-	if (sketch->active_stroke == NULL) {
-		sk_startStroke(sketch);
-		sk_selectAllSketch(sketch, -1);
-
-		sketch->active_stroke->selected = 1;
-	}
-}
-
-static void sk_start_draw_gesture(SK_Sketch *sketch)
-{
-	sketch->gesture = sk_createStroke();
-}
-
-static int sk_draw_stroke(bContext *C, SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd, bool snap)
-{
-	if (sk_stroke_filtermval(dd)) {
-		sk_addStrokePoint(C, sketch, stk, dd, snap);
-		sk_updateDrawData(dd);
-		sk_updateNextPoint(sketch, stk);
-
-		return 1;
-	}
-
-	return 0;
-}
-
-static int ValidSketchViewContext(ViewContext *vc)
-{
-	Object *obedit = vc->obedit;
-	Scene *scene = vc->scene;
-
-	if (obedit &&
-	    obedit->type == OB_ARMATURE &&
-	    scene->toolsettings->bone_sketching & BONE_SKETCHING)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-int BDR_drawSketchNames(ViewContext *vc)
-{
-	if (ValidSketchViewContext(vc)) {
-		SK_Sketch *sketch = viewcontextSketch(vc, 0);
-		if (sketch) {
-			sk_drawSketch(vc->scene, vc->v3d, sketch, 1);
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-void BDR_drawSketch(const bContext *C)
-{
-	if (ED_operator_sketch_mode(C)) {
-		SK_Sketch *sketch = contextSketch(C, 0);
-		if (sketch) {
-			sk_drawSketch(CTX_data_scene(C), CTX_wm_view3d(C), sketch, 0);
-		}
-	}
-}
-
-static int sketch_delete(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
-{
-	SK_Sketch *sketch = contextSketch(C, 0);
-	if (sketch) {
-		sk_deleteSelectedStrokes(sketch);
-//			allqueue(REDRAWVIEW3D, 0);
-	}
-	WM_event_add_notifier(C, NC_SCREEN | ND_SKETCH | NA_REMOVED, NULL);
-	return OPERATOR_FINISHED;
-}
-
-bool BIF_sk_selectStroke(bContext *C, const int mval[2], const bool extend)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	SK_Sketch *sketch = contextSketch(C, 0);
-
-	if (sketch != NULL && ts->bone_sketching & BONE_SKETCHING) {
-		if (sk_selectStroke(C, sketch, mval, extend)) {
-			ED_area_tag_redraw(CTX_wm_area(C));
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void BIF_convertSketch(bContext *C)
-{
-	if (ED_operator_sketch_full_mode(C)) {
-		SK_Sketch *sketch = contextSketch(C, 0);
-		if (sketch) {
-			sk_convert(C, sketch);
-//			BIF_undo_push("Convert Sketch");
-//			allqueue(REDRAWVIEW3D, 0);
-//			allqueue(REDRAWBUTSEDIT, 0);
-		}
-	}
-}
-
-void BIF_deleteSketch(bContext *C)
-{
-	if (ED_operator_sketch_full_mode(C)) {
-		SK_Sketch *sketch = contextSketch(C, 0);
-		if (sketch) {
-			sk_deleteSelectedStrokes(sketch);
-//			BIF_undo_push("Convert Sketch");
-//			allqueue(REDRAWVIEW3D, 0);
-		}
-	}
-}
-
-#if 0
-void BIF_selectAllSketch(bContext *C, int mode)
-{
-	if (BIF_validSketchMode(C))
-	{
-		SK_Sketch *sketch = contextSketch(C, 0);
-		if (sketch)
-		{
-			sk_selectAllSketch(sketch, mode);
-//			XXX
-//			allqueue(REDRAWVIEW3D, 0);
-		}
-	}
-}
-#endif
-
-SK_Sketch *contextSketch(const bContext *C, int create)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	SK_Sketch *sketch = NULL;
-
-	if (obedit && obedit->type == OB_ARMATURE) {
-		bArmature *arm = obedit->data;
-
-		if (arm->sketch == NULL && create) {
-			arm->sketch = createSketch();
-		}
-		sketch = arm->sketch;
-	}
-
-	return sketch;
-}
-
-SK_Sketch *viewcontextSketch(ViewContext *vc, int create)
-{
-	Object *obedit = vc->obedit;
-	SK_Sketch *sketch = NULL;
-
-	if (obedit && obedit->type == OB_ARMATURE) {
-		bArmature *arm = obedit->data;
-
-		if (arm->sketch == NULL && create) {
-			arm->sketch = createSketch();
-		}
-		sketch = arm->sketch;
-	}
-
-	return sketch;
-}
-
-static int sketch_convert(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
-{
-	SK_Sketch *sketch = contextSketch(C, 0);
-	if (sketch != NULL) {
-		sk_convert(C, sketch);
-		ED_area_tag_redraw(CTX_wm_area(C));
-	}
-	return OPERATOR_FINISHED;
-}
-
-static int sketch_cancel_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
-{
-	SK_Sketch *sketch = contextSketch(C, 0);
-	if (sketch != NULL) {
-		sk_cancelStroke(sketch);
-		ED_area_tag_redraw(CTX_wm_area(C));
-		return OPERATOR_FINISHED;
-	}
-	return OPERATOR_PASS_THROUGH;
-}
-
-static int sketch_finish(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
-{
-	SK_Sketch *sketch = contextSketch(C, 0);
-	if (sketch != NULL) {
-		if (sk_finish_stroke(C, sketch)) {
-			ED_area_tag_redraw(CTX_wm_area(C));
-			return OPERATOR_FINISHED;
-		}
-	}
-	return OPERATOR_PASS_THROUGH;
-}
-
-static int sketch_select(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
-{
-	SK_Sketch *sketch = contextSketch(C, 0);
-	if (sketch) {
-		short extend = 0;
-		if (sk_selectStroke(C, sketch, event->mval, extend))
-			ED_area_tag_redraw(CTX_wm_area(C));
-	}
-
-	return OPERATOR_FINISHED;
-}
-
-static void sketch_draw_stroke_cancel(bContext *C, wmOperator *op)
-{
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	sk_cancelStroke(sketch);
-	MEM_freeN(op->customdata);
-}
-
-static int sketch_draw_stroke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	const bool snap = RNA_boolean_get(op->ptr, "snap");
-	SK_DrawData *dd;
-	SK_Sketch *sketch = contextSketch(C, 1);
-
-	op->customdata = dd = MEM_callocN(sizeof(SK_DrawData), "SketchDrawData");
-	sk_initDrawData(dd, event->mval);
-
-	sk_start_draw_stroke(sketch);
-
-	sk_draw_stroke(C, sketch, sketch->active_stroke, dd, snap);
-
-	WM_event_add_modal_handler(C, op);
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static void sketch_draw_gesture_cancel(bContext *C, wmOperator *op)
-{
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	sk_cancelStroke(sketch);
-	MEM_freeN(op->customdata);
-}
-
-static int sketch_draw_gesture(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	const bool snap = RNA_boolean_get(op->ptr, "snap");
-	SK_DrawData *dd;
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	sk_cancelStroke(sketch);
-
-	op->customdata = dd = MEM_callocN(sizeof(SK_DrawData), "SketchDrawData");
-	sk_initDrawData(dd, event->mval);
-
-	sk_start_draw_gesture(sketch);
-	sk_draw_stroke(C, sketch, sketch->gesture, dd, snap);
-
-	WM_event_add_modal_handler(C, op);
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static int sketch_draw_modal(bContext *C, wmOperator *op, const wmEvent *event, short gesture, SK_Stroke *stk)
-{
-	bool snap = RNA_boolean_get(op->ptr, "snap");
-	SK_DrawData *dd = op->customdata;
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	int retval = OPERATOR_RUNNING_MODAL;
-
-	switch (event->type) {
-		case LEFTCTRLKEY:
-		case RIGHTCTRLKEY:
-			snap = event->ctrl != 0;
-			RNA_boolean_set(op->ptr, "snap", snap);
-			break;
-		case MOUSEMOVE:
-		case INBETWEEN_MOUSEMOVE:
-			dd->mval[0] = event->mval[0];
-			dd->mval[1] = event->mval[1];
-			sk_draw_stroke(C, sketch, stk, dd, snap);
-			ED_area_tag_redraw(CTX_wm_area(C));
-			break;
-		case ESCKEY:
-			op->type->cancel(C, op);
-			ED_area_tag_redraw(CTX_wm_area(C));
-			retval = OPERATOR_CANCELLED;
-			break;
-		case LEFTMOUSE:
-			if (event->val == KM_RELEASE) {
-				if (gesture == 0) {
-					sk_endContinuousStroke(stk);
-					sk_filterLastContinuousStroke(stk);
-					sk_updateNextPoint(sketch, stk);
-					ED_area_tag_redraw(CTX_wm_area(C));
-					MEM_freeN(op->customdata);
-					retval = OPERATOR_FINISHED;
-				}
-				else {
-					sk_endContinuousStroke(stk);
-					sk_filterLastContinuousStroke(stk);
-
-					if (stk->nb_points > 1) {
-						/* apply gesture here */
-						sk_applyGesture(C, sketch);
-					}
-
-					sk_freeStroke(stk);
-					sketch->gesture = NULL;
-
-					ED_area_tag_redraw(CTX_wm_area(C));
-					MEM_freeN(op->customdata);
-					retval = OPERATOR_FINISHED;
-				}
-			}
-			break;
-	}
-
-	return retval;
-}
-
-static int sketch_draw_stroke_modal(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	return sketch_draw_modal(C, op, event, 0, sketch->active_stroke);
-}
-
-static int sketch_draw_gesture_modal(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */
-	return sketch_draw_modal(C, op, event, 1, sketch->gesture);
-}
-
-static int sketch_draw_preview(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	const bool snap = RNA_boolean_get(op->ptr, "snap");
-	SK_Sketch *sketch = contextSketch(C, 0);
-
-	if (sketch) {
-		SK_DrawData dd;
-
-		sk_initDrawData(&dd, event->mval);
-		sk_getStrokePoint(C, &sketch->next_point, sketch, sketch->active_stroke, &dd, snap);
-		ED_area_tag_redraw(CTX_wm_area(C));
-	}
-
-	return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
-}
-
-/* ============================================== Poll Functions ============================================= */
-
-int ED_operator_sketch_mode_active_stroke(bContext *C)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	SK_Sketch *sketch = contextSketch(C, 0);
-
-	if (ts->bone_sketching & BONE_SKETCHING &&
-	    sketch != NULL &&
-	    sketch->active_stroke != NULL)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-static int ED_operator_sketch_mode_gesture(bContext *C)
-{
-	ToolSettings *ts = CTX_data_tool_settings(C);
-	SK_Sketch *sketch = contextSketch(C, 0);
-
-	if (ts->bone_sketching & BONE_SKETCHING &&
-	    (ts->bone_sketching & BONE_SKETCHING_QUICK) == 0 &&
-	    sketch != NULL &&
-	    sketch->active_stroke == NULL)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-int ED_operator_sketch_full_mode(bContext *C)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
-
-	if (obedit &&
-	    obedit->type == OB_ARMATURE &&
-	    ts->bone_sketching & BONE_SKETCHING &&
-	    (ts->bone_sketching & BONE_SKETCHING_QUICK) == 0)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-int ED_operator_sketch_mode(const bContext *C)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
-
-	if (obedit &&
-	    obedit->type == OB_ARMATURE &&
-	    ts->bone_sketching & BONE_SKETCHING)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-/* ================================================ Operators ================================================ */
-
-void SKETCH_OT_delete(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Delete";
-	ot->idname = "SKETCH_OT_delete";
-	ot->description = "Delete a sketch stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_delete;
-
-	ot->poll = ED_operator_sketch_full_mode;
-
-	/* flags */
-//	ot->flag = OPTYPE_UNDO;
-}
-
-void SKETCH_OT_select(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Select";
-	ot->idname = "SKETCH_OT_select";
-	ot->description = "Select a sketch stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_select;
-
-	ot->poll = ED_operator_sketch_full_mode;
-
-	/* flags */
-//	ot->flag = OPTYPE_UNDO;
-}
-
-void SKETCH_OT_cancel_stroke(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Cancel Stroke";
-	ot->idname = "SKETCH_OT_cancel_stroke";
-	ot->description = "Cancel the current sketch stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_cancel_invoke;
-
-	ot->poll = ED_operator_sketch_mode_active_stroke;
-
-	/* flags */
-//	ot->flag = OPTYPE_UNDO;
-}
-
-void SKETCH_OT_convert(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Convert";
-	ot->idname = "SKETCH_OT_convert";
-	ot->description = "Convert the selected sketch strokes to bone chains";
-
-	/* api callbacks */
-	ot->invoke = sketch_convert;
-
-	ot->poll = ED_operator_sketch_full_mode;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-}
-
-void SKETCH_OT_finish_stroke(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "End Stroke";
-	ot->idname = "SKETCH_OT_finish_stroke";
-	ot->description = "End and keep the current sketch stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_finish;
-
-	ot->poll = ED_operator_sketch_mode_active_stroke;
-
-	/* flags */
-//	ot->flag = OPTYPE_UNDO;
-}
-
-void SKETCH_OT_draw_preview(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Draw Preview";
-	ot->idname = "SKETCH_OT_draw_preview";
-	ot->description = "Draw preview of current sketch stroke (internal use)";
-
-	/* api callbacks */
-	ot->invoke = sketch_draw_preview;
-
-	ot->poll = ED_operator_sketch_mode_active_stroke;
-
-	RNA_def_boolean(ot->srna, "snap", 0, "Snap", "");
-
-	/* flags */
-//	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-void SKETCH_OT_draw_stroke(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Draw Stroke";
-	ot->idname = "SKETCH_OT_draw_stroke";
-	ot->description = "Start to draw a sketch stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_draw_stroke;
-	ot->modal  = sketch_draw_stroke_modal;
-	ot->cancel = sketch_draw_stroke_cancel;
-
-	ot->poll = (int (*)(bContext *))ED_operator_sketch_mode;
-
-	RNA_def_boolean(ot->srna, "snap", 0, "Snap", "");
-
-	/* flags */
-	ot->flag = OPTYPE_BLOCKING; // OPTYPE_REGISTER|OPTYPE_UNDO
-}
-
-void SKETCH_OT_gesture(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Gesture";
-	ot->idname = "SKETCH_OT_gesture";
-	ot->description = "Start to draw a gesture stroke";
-
-	/* api callbacks */
-	ot->invoke = sketch_draw_gesture;
-	ot->modal  = sketch_draw_gesture_modal;
-	ot->cancel = sketch_draw_gesture_cancel;
-
-	ot->poll = ED_operator_sketch_mode_gesture;
-
-	RNA_def_boolean(ot->srna, "snap", 0, "Snap", "");
-
-	/* flags */
-	ot->flag = OPTYPE_BLOCKING; // OPTYPE_UNDO
-}
-
diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c
index f27d68d0634..f6f97af32b9 100644
--- a/source/blender/editors/armature/editarmature_undo.c
+++ b/source/blender/editors/armature/editarmature_undo.c
@@ -27,25 +27,34 @@
  *  \ingroup edarmature
  */
 
+#include "MEM_guardedalloc.h"
+
+
+#include "CLG_log.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math.h"
 #include "BLI_array_utils.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 #include "ED_object.h"
+#include "ED_undo.h"
 #include "ED_util.h"
 
 #include "WM_types.h"
 #include "WM_api.h"
 
+/** We only need this locally. */
+static CLG_LogRef LOG = {"ed.undo.armature"};
+
 /* -------------------------------------------------------------------- */
 /** \name Undo Conversion
  * \{ */
@@ -120,13 +129,20 @@ static Object *editarm_object_from_context(bContext *C)
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
+ *
+ * \note This is similar for all edit-mode types.
  * \{ */
 
-typedef struct ArmatureUndoStep {
-	UndoStep step;
-	/* note: will split out into list for multi-object-editmode. */
+typedef struct ArmatureUndoStep_Elem {
+	struct ArmatureUndoStep_Elem *next, *prev;
 	UndoRefID_Object obedit_ref;
 	UndoArmature data;
+} ArmatureUndoStep_Elem;
+
+typedef struct ArmatureUndoStep {
+	UndoStep step;
+	ArmatureUndoStep_Elem *elems;
+	uint                   elems_len;
 } ArmatureUndoStep;
 
 static bool armature_undosys_poll(bContext *C)
@@ -137,10 +153,24 @@ static bool armature_undosys_poll(bContext *C)
 static bool armature_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-	us->obedit_ref.ptr = editarm_object_from_context(C);
-	bArmature *arm = us->obedit_ref.ptr->data;
-	undoarm_from_editarm(&us->data, arm);
-	us->step.data_size = us->data.undo_size;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+	us->elems_len = objects_len;
+
+	for (uint i = 0; i < objects_len; i++) {
+		Object *ob = objects[i];
+		ArmatureUndoStep_Elem *elem = &us->elems[i];
+
+		elem->obedit_ref.ptr = ob;
+		bArmature *arm = elem->obedit_ref.ptr->data;
+		undoarm_from_editarm(&elem->data, arm);
+		us->step.data_size += elem->data.undo_size;
+	}
+	MEM_freeN(objects);
 	return true;
 }
 
@@ -151,24 +181,46 @@ static void armature_undosys_step_decode(struct bContext *C, UndoStep *us_p, int
 	BLI_assert(armature_undosys_poll(C));
 
 	ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-	Object *obedit = us->obedit_ref.ptr;
-	bArmature *arm = obedit->data;
-	undoarm_to_editarm(&us->data, arm);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		ArmatureUndoStep_Elem *elem = &us->elems[i];
+		Object *obedit = elem->obedit_ref.ptr;
+		bArmature *arm = obedit->data;
+		if (arm->edbo == NULL) {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid", us_p->name, obedit->id.name);
+			continue;
+		}
+		undoarm_to_editarm(&elem->data, arm);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	}
+
+	/* The first element is always active */
+	ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
 static void armature_undosys_step_free(UndoStep *us_p)
 {
 	ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-	undoarm_free_data(&us->data);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		ArmatureUndoStep_Elem *elem = &us->elems[i];
+		undoarm_free_data(&elem->data);
+	}
+	MEM_freeN(us->elems);
 }
 
 static void armature_undosys_foreach_ID_ref(
         UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
 {
 	ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-	foreach_ID_ref_fn(user_data, ((UndoRefID *)&us->obedit_ref));
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		ArmatureUndoStep_Elem *elem = &us->elems[i];
+		foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+	}
 }
 
 /* Export for ED_undo_sys. */
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 4e31fcc7a11..bc6d776911a 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -46,6 +46,8 @@
 #include "ED_mesh.h"
 #include "ED_armature.h"
 
+#include "DEG_depsgraph.h"
+
 #include "eigen_capi.h"
 
 #include "meshlaplacian.h"
@@ -600,9 +602,10 @@ static float heat_limit_weight(float weight)
 		return weight;
 }
 
-void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource,
-                         bDeformGroup **dgrouplist, bDeformGroup **dgroupflip,
-                         float (*root)[3], float (*tip)[3], int *selected, const char **err_str)
+void heat_bone_weighting(
+        Object *ob, Mesh *me, float (*verts)[3], int numsource,
+        bDeformGroup **dgrouplist, bDeformGroup **dgroupflip,
+        float (*root)[3], float (*tip)[3], int *selected, const char **err_str)
 {
 	LaplacianSystem *sys;
 	MLoopTri *mlooptri;
@@ -830,7 +833,7 @@ typedef struct MeshDeformBind {
 	int size, size3;
 
 	/* meshes */
-	DerivedMesh *cagedm;
+	Mesh *cagemesh;
 	float (*cagecos)[3];
 	float (*vertexcos)[3];
 	int totvert, totcagevert;
@@ -860,7 +863,7 @@ typedef struct MeshDeformBind {
 		const MLoop *mloop;
 		const MLoopTri *looptri;
 		const float (*poly_nors)[3];
-	} cagedm_cache;
+	} cagemesh_cache;
 } MeshDeformBind;
 
 typedef struct MeshDeformIsect {
@@ -885,9 +888,9 @@ static void harmonic_ray_callback(void *userdata, int index, const BVHTreeRay *r
 {
 	struct MeshRayCallbackData *data = userdata;
 	MeshDeformBind *mdb = data->mdb;
-	const MLoop *mloop = mdb->cagedm_cache.mloop;
-	const MLoopTri *looptri = mdb->cagedm_cache.looptri, *lt;
-	const float (*poly_nors)[3] = mdb->cagedm_cache.poly_nors;
+	const MLoop *mloop = mdb->cagemesh_cache.mloop;
+	const MLoopTri *looptri = mdb->cagemesh_cache.looptri, *lt;
+	const float (*poly_nors)[3] = mdb->cagemesh_cache.poly_nors;
 	MeshDeformIsect *isec = data->isec;
 	float no[3], co[3], dist;
 	float *face[3];
@@ -951,9 +954,9 @@ static MDefBoundIsect *meshdeform_ray_tree_intersect(MeshDeformBind *mdb, const
 	if (BLI_bvhtree_ray_cast_ex(mdb->bvhtree, isect_mdef.start, vec_normal,
 	                            0.0, &hit, harmonic_ray_callback, &data, BVH_RAYCAST_WATERTIGHT) != -1)
 	{
-		const MLoop *mloop = mdb->cagedm_cache.mloop;
-		const MLoopTri *lt = &mdb->cagedm_cache.looptri[hit.index];
-		const MPoly *mp = &mdb->cagedm_cache.mpoly[lt->poly];
+		const MLoop *mloop = mdb->cagemesh_cache.mloop;
+		const MLoopTri *lt = &mdb->cagemesh_cache.looptri[hit.index];
+		const MPoly *mp = &mdb->cagemesh_cache.mpoly[lt->poly];
 		const float (*cagecos)[3] = mdb->cagecos;
 		const float len = isect_mdef.lambda;
 		MDefBoundIsect *isect;
@@ -1128,8 +1131,8 @@ static void meshdeform_bind_floodfill(MeshDeformBind *mdb)
 
 static float meshdeform_boundary_phi(const MeshDeformBind *mdb, const MDefBoundIsect *isect, int cagevert)
 {
-	const MLoop *mloop = mdb->cagedm_cache.mloop;
-	const MPoly *mp = &mdb->cagedm_cache.mpoly[isect->poly_index];
+	const MLoop *mloop = mdb->cagemesh_cache.mloop;
+	const MPoly *mp = &mdb->cagemesh_cache.mpoly[isect->poly_index];
 	int i;
 
 	for (i = 0; i < mp->totloop; i++) {
@@ -1444,7 +1447,7 @@ static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierDa
 	mdb->totalphi = MEM_callocN(sizeof(float) * mdb->size3, "MeshDeformBindTotalPhi");
 	mdb->boundisect = MEM_callocN(sizeof(*mdb->boundisect) * mdb->size3, "MDefBoundIsect");
 	mdb->semibound = MEM_callocN(sizeof(int) * mdb->size3, "MDefSemiBound");
-	mdb->bvhtree = bvhtree_from_mesh_get(&mdb->bvhdata, mdb->cagedm, BVHTREE_FROM_LOOPTRI, 4);
+	mdb->bvhtree = BKE_bvhtree_from_mesh_get(&mdb->bvhdata, mdb->cagemesh, BVHTREE_FROM_LOOPTRI, 4);
 	mdb->inside = MEM_callocN(sizeof(int) * mdb->totvert, "MDefInside");
 
 	if (mmd->flag & MOD_MDEF_DYNAMIC_BIND)
@@ -1457,11 +1460,11 @@ static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierDa
 
 	/* initialize data from 'cagedm' for reuse */
 	{
-		DerivedMesh *dm = mdb->cagedm;
-		mdb->cagedm_cache.mpoly = dm->getPolyArray(dm);
-		mdb->cagedm_cache.mloop = dm->getLoopArray(dm);
-		mdb->cagedm_cache.looptri = dm->getLoopTriArray(dm);
-		mdb->cagedm_cache.poly_nors = dm->getPolyDataArray(dm, CD_NORMAL);  /* can be NULL */
+		Mesh *me = mdb->cagemesh;
+		mdb->cagemesh_cache.mpoly = me->mpoly;
+		mdb->cagemesh_cache.mloop = me->mloop;
+		mdb->cagemesh_cache.looptri = BKE_mesh_runtime_looptri_ensure(me);
+		mdb->cagemesh_cache.poly_nors = CustomData_get_layer(&me->pdata, CD_NORMAL);  /* can be NULL */
 	}
 
 	/* make bounding box equal size in all directions, add padding, and compute
@@ -1573,7 +1576,7 @@ static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierDa
 }
 
 void ED_mesh_deform_bind_callback(
-        Scene *scene, MeshDeformModifierData *mmd, DerivedMesh *cagedm,
+        Scene *scene, MeshDeformModifierData *mmd, Mesh *cagemesh,
         float *vertexcos, int totvert, float cagemat[4][4])
 {
 	MeshDeformBind mdb;
@@ -1589,12 +1592,12 @@ void ED_mesh_deform_bind_callback(
 	mdb.vertexcos = MEM_callocN(sizeof(float) * 3 * totvert, "MeshDeformCos");
 	mdb.totvert = totvert;
 
-	mdb.cagedm = cagedm;
-	mdb.totcagevert = mdb.cagedm->getNumVerts(mdb.cagedm);
+	mdb.cagemesh = cagemesh;
+	mdb.totcagevert = mdb.cagemesh->totvert;
 	mdb.cagecos = MEM_callocN(sizeof(*mdb.cagecos) * mdb.totcagevert, "MeshDeformBindCos");
 	copy_m4_m4(mdb.cagemat, cagemat);
 
-	mvert = mdb.cagedm->getVertArray(mdb.cagedm);
+	mvert = mdb.cagemesh->mvert;
 	for (a = 0; a < mdb.totcagevert; a++)
 		copy_v3_v3(mdb.cagecos[a], mvert[a].co);
 	for (a = 0; a < mdb.totvert; a++)
diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h
index 202ac8e9b70..9c4ceacbee6 100644
--- a/source/blender/editors/armature/meshlaplacian.h
+++ b/source/blender/editors/armature/meshlaplacian.h
@@ -52,10 +52,11 @@ float laplacian_system_get_solution(LaplacianSystem *sys, int v);
 
 /* Heat Weighting */
 
-void heat_bone_weighting(struct Object *ob, struct Mesh *me, float (*verts)[3],
-                         int numbones, struct bDeformGroup **dgrouplist,
-                         struct bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3],
-                         int *selected, const char **error);
+void heat_bone_weighting(
+        struct Object *ob, struct Mesh *me, float (*verts)[3],
+        int numbones, struct bDeformGroup **dgrouplist,
+        struct bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3],
+        int *selected, const char **error);
 
 #ifdef RIGID_DEFORM
 /* As-Rigid-As-Possible Deformation */
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index da328ee485f..fa9927419a0 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -31,6 +31,8 @@
  *  \ingroup edarmature
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
@@ -39,13 +41,16 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
+#include "BKE_action.h"
 #include "BKE_anim.h"
 #include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -58,6 +63,7 @@
 #include "ED_keyframing.h"
 #include "ED_screen.h"
 #include "ED_object.h"
+#include "ED_view3d.h"
 
 #include "UI_interface.h"
 
@@ -81,7 +87,7 @@ Object *ED_pose_object_from_context(bContext *C)
 }
 
 /* This function is used to process the necessary updates for */
-bool ED_object_posemode_enter_ex(Object *ob)
+bool ED_object_posemode_enter_ex(struct Main *bmain, Object *ob)
 {
 	BLI_assert(!ID_IS_LINKED(ob));
 	bool ok = false;
@@ -90,6 +96,8 @@ bool ED_object_posemode_enter_ex(Object *ob)
 		case OB_ARMATURE:
 			ob->restore_mode = ob->mode;
 			ob->mode |= OB_MODE_POSE;
+			/* Inform all CoW versions that we changed the mode. */
+			DEG_id_tag_update_ex(bmain, &ob->id, DEG_TAG_COPY_ON_WRITE);
 			ok = true;
 
 			break;
@@ -106,26 +114,31 @@ bool ED_object_posemode_enter(bContext *C, Object *ob)
 		BKE_report(reports, RPT_WARNING, "Cannot pose libdata");
 		return false;
 	}
-	bool ok = ED_object_posemode_enter_ex(ob);
+	struct Main *bmain = CTX_data_main(C);
+	bool ok = ED_object_posemode_enter_ex(bmain, ob);
 	if (ok) {
 		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_POSE, NULL);
 	}
 	return ok;
 }
 
-bool ED_object_posemode_exit_ex(Object *ob)
+bool ED_object_posemode_exit_ex(struct Main *bmain, Object *ob)
 {
 	bool ok = false;
 	if (ob) {
 		ob->restore_mode = ob->mode;
 		ob->mode &= ~OB_MODE_POSE;
+
+		/* Inform all CoW versions that we changed the mode. */
+		DEG_id_tag_update_ex(bmain, &ob->id, DEG_TAG_COPY_ON_WRITE);
 		ok = true;
 	}
 	return ok;
 }
 bool ED_object_posemode_exit(bContext *C, Object *ob)
 {
-	bool ok = ED_object_posemode_exit_ex(ob);
+	struct Main *bmain = CTX_data_main(C);
+	bool ok = ED_object_posemode_exit_ex(bmain, ob);
 	if (ok) {
 		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, NULL);
 	}
@@ -167,8 +180,10 @@ static bool pose_has_protected_selected(Object *ob, short warn)
  *
  * To be called from various tools that do incremental updates
  */
-void ED_pose_recalculate_paths(Scene *scene, Object *ob)
+void ED_pose_recalculate_paths(bContext *C, Scene *scene, Object *ob)
 {
+	struct Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ListBase targets = {NULL, NULL};
 
 	/* set flag to force recalc, then grab the relevant bones to target */
@@ -176,8 +191,11 @@ void ED_pose_recalculate_paths(Scene *scene, Object *ob)
 	animviz_get_object_motionpaths(ob, &targets);
 
 	/* recalculate paths, then free */
-	animviz_calc_motionpaths(scene, &targets);
+	animviz_calc_motionpaths(depsgraph, bmain, scene, &targets);
 	BLI_freelistN(&targets);
+
+	/* tag armature object for copy on write - so paths will draw/redraw */
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 }
 
 
@@ -239,7 +257,7 @@ static int pose_calculate_paths_exec(bContext *C, wmOperator *op)
 
 	/* calculate the bones that now have motionpaths... */
 	/* TODO: only make for the selected bones? */
-	ED_pose_recalculate_paths(scene, ob);
+	ED_pose_recalculate_paths(C, scene, ob);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -295,7 +313,7 @@ static int pose_update_paths_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* calculate the bones that now have motionpaths... */
 	/* TODO: only make for the selected bones? */
-	ED_pose_recalculate_paths(scene, ob);
+	ED_pose_recalculate_paths(C, scene, ob);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -593,7 +611,7 @@ static void pose_copy_menu(Scene *scene)
 			BKE_pose_tag_recalc(bmain, ob->pose);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA); // and all its relations
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA); // and all its relations
 
 	BIF_undo_push("Copy Pose Attributes");
 
@@ -604,34 +622,31 @@ static void pose_copy_menu(Scene *scene)
 
 static int pose_flip_names_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm;
-
-	/* paranoia checks */
-	if (ELEM(NULL, ob, ob->pose))
-		return OPERATOR_CANCELLED;
-
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const bool do_strip_numbers = RNA_boolean_get(op->ptr, "do_strip_numbers");
 
-	arm = ob->data;
-
-	ListBase bones_names = {NULL};
-
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob)
 	{
-		BLI_addtail(&bones_names, BLI_genericNodeN(pchan->name));
-	}
-	CTX_DATA_END;
+		bArmature *arm = ob->data;
+		ListBase bones_names = {NULL};
 
-	ED_armature_bones_flip_names(arm, &bones_names, do_strip_numbers);
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan)
+		{
+			BLI_addtail(&bones_names, BLI_genericNodeN(pchan->name));
+		}
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
-	BLI_freelistN(&bones_names);
+		ED_armature_bones_flip_names(arm, &bones_names, do_strip_numbers);
 
-	/* since we renamed stuff... */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		BLI_freelistN(&bones_names);
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+		/* since we renamed stuff... */
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+
+		/* note, notifier might evolve */
+		WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	}
+	FOREACH_OBJECT_IN_MODE_END;
 
 	return OPERATOR_FINISHED;
 }
@@ -679,7 +694,7 @@ static int pose_autoside_names_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 
 	/* since we renamed stuff... */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -728,7 +743,7 @@ static int pose_bone_rotmode_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 
 	/* notifiers and updates */
-	DAG_id_tag_update((ID *)ob, OB_RECALC_DATA);
+	DEG_id_tag_update((ID *)ob, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
 
 	return OPERATOR_FINISHED;
@@ -808,6 +823,7 @@ static int pose_armature_layers_showall_exec(bContext *C, wmOperator *op)
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 
 	/* done */
 	return OPERATOR_FINISHED;
@@ -875,6 +891,7 @@ static int armature_layers_exec(bContext *C, wmOperator *op)
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -903,7 +920,7 @@ void ARMATURE_OT_armature_layers(wmOperatorType *ot)
 /* Present a popup to get the layers that should be used */
 static int pose_bone_layers_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	int layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
+	int layers[32] = {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
 
 	/* get layers that are active already */
 	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
@@ -949,6 +966,7 @@ static int pose_bone_layers_exec(bContext *C, wmOperator *op)
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update((ID *)ob->data, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -1004,7 +1022,6 @@ static int armature_bone_layers_invoke(bContext *C, wmOperator *op, const wmEven
 static int armature_bone_layers_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = CTX_data_edit_object(C);
-	bArmature *arm = (ob) ? ob->data : NULL;
 	PointerRNA ptr;
 	int layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
 
@@ -1012,7 +1029,7 @@ static int armature_bone_layers_exec(bContext *C, wmOperator *op)
 	RNA_boolean_get_array(op->ptr, "layers", layers);
 
 	/* set layers of pchans based on the values set in the operator props */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN_WITH_ID (C, EditBone *, ebone, selected_editable_bones, bArmature *, arm)
 	{
 		/* get pointer for pchan, and write flags this way */
 		RNA_pointer_create((ID *)arm, &RNA_EditBone, ebone, &ptr);
@@ -1048,55 +1065,54 @@ void ARMATURE_OT_bone_layers(wmOperatorType *ot)
 /* ********************************************** */
 /* Show/Hide Bones */
 
-static int hide_selected_pose_bone_cb(Object *ob, Bone *bone, void *UNUSED(ptr))
+static int hide_pose_bone_fn(Object *ob, Bone *bone, void *ptr)
 {
 	bArmature *arm = ob->data;
-
+	const bool hide_select = (bool)GET_INT_FROM_POINTER(ptr);
+	int count = 0;
 	if (arm->layer & bone->layer) {
-		if (bone->flag & BONE_SELECTED) {
+		if (((bone->flag & BONE_SELECTED) != 0) == hide_select) {
 			bone->flag |= BONE_HIDDEN_P;
+			/* only needed when 'hide_select' is true, but harmless. */
 			bone->flag &= ~BONE_SELECTED;
-			if (arm->act_bone == bone)
-				arm->act_bone = NULL;
-		}
-	}
-	return 0;
-}
-
-static int hide_unselected_pose_bone_cb(Object *ob, Bone *bone, void *UNUSED(ptr))
-{
-	bArmature *arm = ob->data;
-
-	if (arm->layer & bone->layer) {
-		/* hrm... typo here? */
-		if ((bone->flag & BONE_SELECTED) == 0) {
-			bone->flag |= BONE_HIDDEN_P;
-			if (arm->act_bone == bone)
+			if (arm->act_bone == bone) {
 				arm->act_bone = NULL;
+			}
+			count += 1;
 		}
 	}
-	return 0;
+	return count;
 }
 
 /* active object is armature in posemode, poll checked */
 static int pose_hide_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm = ob->data;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len;
+	Object **objects = BKE_object_pose_array_get_unique(view_layer, &objects_len);
+	bool changed_multi = false;
 
-	if (ob->proxy != NULL) {
-		BKE_report(op->reports, RPT_INFO, "Undo of hiding can only be done with Reveal Selected");
-	}
+	const int hide_select = !RNA_boolean_get(op->ptr, "unselected");
+	void     *hide_select_p = SET_INT_IN_POINTER(hide_select);
 
-	if (RNA_boolean_get(op->ptr, "unselected"))
-		bone_looper(ob, arm->bonebase.first, NULL, hide_unselected_pose_bone_cb);
-	else
-		bone_looper(ob, arm->bonebase.first, NULL, hide_selected_pose_bone_cb);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob_iter = objects[ob_index];
+		bArmature *arm = ob_iter->data;
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+		if (ob_iter->proxy != NULL) {
+			BKE_report(op->reports, RPT_INFO, "Undo of hiding can only be done with Reveal Selected");
+		}
 
-	return OPERATOR_FINISHED;
+		bool changed = bone_looper(ob_iter, arm->bonebase.first, hide_select_p, hide_pose_bone_fn) != 0;
+		if (changed) {
+			changed_multi = true;
+			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob_iter);
+			DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+		}
+	}
+	MEM_freeN(objects);
+
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void POSE_OT_hide(wmOperatorType *ot)
@@ -1122,32 +1138,44 @@ static int show_pose_bone_cb(Object *ob, Bone *bone, void *data)
 	const bool select = GET_INT_FROM_POINTER(data);
 
 	bArmature *arm = ob->data;
-
+	int count = 0;
 	if (arm->layer & bone->layer) {
 		if (bone->flag & BONE_HIDDEN_P) {
 			if (!(bone->flag & BONE_UNSELECTABLE)) {
 				SET_FLAG_FROM_TEST(bone->flag, select, BONE_SELECTED);
 			}
 			bone->flag &= ~BONE_HIDDEN_P;
+			count += 1;
 		}
 	}
 
-	return 0;
+	return count;
 }
 
 /* active object is armature in posemode, poll checked */
 static int pose_reveal_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm = ob->data;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len;
+	Object **objects = BKE_object_pose_array_get_unique(view_layer, &objects_len);
+	bool changed_multi = false;
 	const bool select = RNA_boolean_get(op->ptr, "select");
+	void *select_p = SET_INT_IN_POINTER(select);
 
-	bone_looper(ob, arm->bonebase.first, SET_INT_IN_POINTER(select), show_pose_bone_cb);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob_iter = objects[ob_index];
+		bArmature *arm = ob_iter->data;
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+		bool changed = bone_looper(ob_iter, arm->bonebase.first, select_p, show_pose_bone_cb);
+		if (changed) {
+			changed_multi = true;
+			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob_iter);
+			DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+		}
+	}
+	MEM_freeN(objects);
 
-	return OPERATOR_FINISHED;
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void POSE_OT_reveal(wmOperatorType *ot)
@@ -1173,27 +1201,34 @@ void POSE_OT_reveal(wmOperatorType *ot)
 static int pose_flip_quats_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
 	KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
 
-	/* loop through all selected pchans, flipping and keying (as needed) */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
-	{
-		/* only if bone is using quaternion rotation */
-		if (pchan->rotmode == ROT_MODE_QUAT) {
-			/* quaternions have 720 degree range */
-			negate_v4(pchan->quat);
+	bool changed_multi = false;
 
-			ED_autokeyframe_pchan(C, scene, ob, pchan, ks);
-		}
-	}
-	CTX_DATA_END;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob_iter) {
+		bool changed = false;
+		/* loop through all selected pchans, flipping and keying (as needed) */
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob_iter, pchan) {
+			/* only if bone is using quaternion rotation */
+			if (pchan->rotmode == ROT_MODE_QUAT) {
+				changed = true;
+				/* quaternions have 720 degree range */
+				negate_v4(pchan->quat);
 
-	/* notifiers and updates */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
+				ED_autokeyframe_pchan(C, scene, ob_iter, pchan, ks);
+			}
+		} FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
-	return OPERATOR_FINISHED;
+		if (changed) {
+			changed_multi = true;
+			/* notifiers and updates */
+			DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+			WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob_iter);
+		}
+	} FOREACH_OBJECT_IN_MODE_END;
+
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void POSE_OT_quaternions_flip(wmOperatorType *ot)
@@ -1211,3 +1246,34 @@ void POSE_OT_quaternions_flip(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
+/* -------------------------------------------------------------------- */
+/** \name Toggle Bone selection Overlay Operator
+ * \{ */
+
+static int toggle_bone_selection_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	View3D *v3d = CTX_wm_view3d(C);
+	v3d->overlay.flag ^= V3D_OVERLAY_BONE_SELECTION;
+	ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C));
+	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+	return OPERATOR_FINISHED;
+}
+
+static int pose_select_linked_poll(bContext *C)
+{
+	return (ED_operator_view3d_active(C) && ED_operator_posemode(C));
+}
+
+void POSE_OT_toggle_bone_selection_overlay(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Toggle Bone Selection Overlay";
+	ot->description = "Toggle bone selection overlay of the viewport";
+	ot->idname = "POSE_OT_toggle_bone_selection_overlay";
+
+	/* api callbacks */
+	ot->exec = toggle_bone_selection_exec;
+	ot->poll = pose_select_linked_poll;
+}
+
+/** \} */
diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c
index 9648bb99c05..aefca13d66c 100644
--- a/source/blender/editors/armature/pose_group.c
+++ b/source/blender/editors/armature/pose_group.c
@@ -38,9 +38,12 @@
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 
+#include "BKE_armature.h"
 #include "BKE_action.h"
 #include "BKE_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -104,6 +107,7 @@ static int pose_group_remove_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -204,15 +208,16 @@ static int pose_group_assign_exec(bContext *C, wmOperator *op)
 		BKE_pose_add_group(ob->pose, NULL);
 
 	/* add selected bones to group then */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan)
 	{
 		pchan->agrp_index = pose->active_group;
 		done = true;
 	}
-	CTX_DATA_END;
+	FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 
 	/* report done status */
 	if (done)
@@ -251,17 +256,18 @@ static int pose_group_unassign_exec(bContext *C, wmOperator *UNUSED(op))
 		return OPERATOR_CANCELLED;
 
 	/* find selected bones to remove from all bone groups */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan)
 	{
 		if (pchan->agrp_index) {
 			pchan->agrp_index = 0;
 			done = true;
 		}
 	}
-	CTX_DATA_END;
+	FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 
 	/* report done status */
 	if (done)
@@ -413,6 +419,7 @@ static int group_sort_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -432,11 +439,11 @@ void POSE_OT_group_sort(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static void pose_group_select(bContext *C, Object *ob, bool select)
+static void pose_group_select(Object *ob, bool select)
 {
 	bPose *pose = ob->pose;
 
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones)
+	FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN (ob, pchan)
 	{
 		if ((pchan->bone->flag & BONE_UNSELECTABLE) == 0) {
 			if (select) {
@@ -449,7 +456,7 @@ static void pose_group_select(bContext *C, Object *ob, bool select)
 			}
 		}
 	}
-	CTX_DATA_END;
+	FOREACH_PCHAN_VISIBLE_IN_OBJECT_END;
 }
 
 static int pose_group_select_exec(bContext *C, wmOperator *UNUSED(op))
@@ -460,7 +467,7 @@ static int pose_group_select_exec(bContext *C, wmOperator *UNUSED(op))
 	if (ELEM(NULL, ob, ob->pose))
 		return OPERATOR_CANCELLED;
 
-	pose_group_select(C, ob, 1);
+	pose_group_select(ob, 1);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -491,7 +498,7 @@ static int pose_group_deselect_exec(bContext *C, wmOperator *UNUSED(op))
 	if (ELEM(NULL, ob, ob->pose))
 		return OPERATOR_CANCELLED;
 
-	pose_group_select(C, ob, 0);
+	pose_group_select(ob, 0);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index fd5db84873b..02a1e22dbba 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -46,7 +46,6 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
@@ -55,6 +54,8 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -500,6 +501,7 @@ static int poselib_add_exec(bContext *C, wmOperator *op)
 
 	/* store new 'active' pose number */
 	act->active_marker = BLI_listbase_count(&act->markers);
+	DEG_id_tag_update(&act->id, DEG_TAG_COPY_ON_WRITE);
 
 	/* done */
 	return OPERATOR_FINISHED;
@@ -614,6 +616,7 @@ static int poselib_remove_exec(bContext *C, wmOperator *op)
 	 * may be being shown in anim editors as active action
 	 */
 	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
+	DEG_id_tag_update(&act->id, DEG_TAG_COPY_ON_WRITE);
 
 	/* done */
 	return OPERATOR_FINISHED;
@@ -1101,9 +1104,9 @@ static void poselib_preview_apply(bContext *C, wmOperator *op)
 		 */
 		// FIXME: shouldn't this use the builtin stuff?
 		if ((pld->arm->flag & ARM_DELAYDEFORM) == 0)
-			DAG_id_tag_update(&pld->ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+			DEG_id_tag_update(&pld->ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 		else
-			BKE_pose_where_is(pld->scene, pld->ob);
+			BKE_pose_where_is(CTX_data_depsgraph(C), pld->scene, pld->ob);
 	}
 
 	/* do header print - if interactively previewing */
@@ -1609,9 +1612,9 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
 		 *	- note: code copied from transform_generics.c -> recalcData()
 		 */
 		if ((arm->flag & ARM_DELAYDEFORM) == 0)
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 		else
-			BKE_pose_where_is(scene, ob);
+			BKE_pose_where_is(CTX_data_depsgraph(C), scene, ob);
 	}
 	else if (pld->state == PL_PREVIEW_CONFIRM) {
 		/* tag poses as appropriate */
@@ -1622,14 +1625,14 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
 		action_set_activemarker(act, marker, NULL);
 
 		/* Update event for pose and deformation children */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 		/* updates */
 		if (IS_AUTOKEY_MODE(scene, NORMAL)) {
 			//remake_action_ipos(ob->action);
 		}
 		else
-			BKE_pose_where_is(scene, ob);
+			BKE_pose_where_is(CTX_data_depsgraph(C), scene, ob);
 	}
 
 	/* Request final redraw of the view. */
diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c
index 1389b26a1e1..75fd952b52a 100644
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -43,9 +43,11 @@
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -122,18 +124,21 @@ void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select)
 		 * (see rna_Bone_select_update() in rna_armature.c for details)
 		 */
 		if (arm->flag & ARM_HAS_VIZ_DEPS) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 
 		/* send necessary notifiers */
 		WM_main_add_notifier(NC_GEOM | ND_DATA, ob);
+
+		/* tag armature for copy-on-write update (since act_bone is in armature not object) */
+		DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 	}
 }
 
 /* called from editview.c, for mode-less pose selection */
 /* assumes scene obact and basact is still on old situation */
 bool ED_armature_pose_select_pick_with_buffer(
-        Scene *scene, Base *base, const unsigned int *buffer, short hits,
+        ViewLayer *view_layer, Base *base, const unsigned int *buffer, short hits,
         bool extend, bool deselect, bool toggle, bool do_nearest)
 {
 	Object *ob = base->object;
@@ -141,11 +146,15 @@ bool ED_armature_pose_select_pick_with_buffer(
 
 	if (!ob || !ob->pose) return 0;
 
-	nearBone = get_bone_from_selectbuffer(scene, base, buffer, hits, 1, do_nearest);
+	Object *ob_act = OBACT(view_layer);
+	Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
+
+	/* Callers happen to already get the active base */
+	Base *base_dummy = NULL;
+	nearBone = get_bone_from_selectbuffer(&base, 1, obedit != NULL, buffer, hits, 1, do_nearest, &base_dummy);
 
 	/* if the bone cannot be affected, don't do anything */
 	if ((nearBone) && !(nearBone->flag & BONE_UNSELECTABLE)) {
-		Object *ob_act = OBACT;
 		bArmature *arm = ob->data;
 
 		/* since we do unified select, we don't shift+select a bone if the
@@ -163,7 +172,12 @@ bool ED_armature_pose_select_pick_with_buffer(
 		}
 
 		if (!extend && !deselect && !toggle) {
-			ED_pose_deselect_all(ob, SEL_DESELECT, true);
+			{
+				uint objects_len = 0;
+				Object **objects = BKE_object_pose_array_get_unique(view_layer, &objects_len);
+				ED_pose_deselect_all_multi(objects, objects_len, SEL_DESELECT, true);
+				MEM_freeN(objects);
+			}
 			nearBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 			arm->act_bone = nearBone;
 		}
@@ -197,7 +211,7 @@ bool ED_armature_pose_select_pick_with_buffer(
 			if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
 				if (nearBone == arm->act_bone) {
 					ED_vgroup_select_by_name(ob_act, nearBone->name);
-					DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+					DEG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
 				}
 			}
 			/* if there are some dependencies for visualizing armature state
@@ -207,8 +221,11 @@ bool ED_armature_pose_select_pick_with_buffer(
 				/* NOTE: ob not ob_act here is intentional - it's the source of the
 				 *       bones being selected  [T37247]
 				 */
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			}
+
+			/* tag armature for copy-on-write update (since act_bone is in armature not object) */
+			DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 		}
 	}
 
@@ -249,6 +266,58 @@ void ED_pose_deselect_all(Object *ob, int select_mode, const bool ignore_visibil
 	}
 }
 
+static bool ed_pose_is_any_selected(Object *ob, bool ignore_visibility)
+{
+	bArmature *arm = ob->data;
+	for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+		if (ignore_visibility || PBONE_VISIBLE(arm, pchan->bone)) {
+			if (pchan->bone->flag & BONE_SELECTED) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+static bool ed_pose_is_any_selected_multi(Object **objects, uint objects_len, bool ignore_visibility)
+{
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob_iter = objects[ob_index];
+		if (ed_pose_is_any_selected(ob_iter, ignore_visibility)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void ED_pose_deselect_all_multi(Object **objects, uint objects_len, int select_mode, const bool ignore_visibility)
+{
+	if (select_mode == SEL_TOGGLE) {
+		select_mode = ed_pose_is_any_selected_multi(
+		        objects, objects_len, ignore_visibility) ? SEL_DESELECT : SEL_SELECT;
+	}
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob_iter = objects[ob_index];
+		bArmature *arm = ob_iter->data;
+
+		ED_pose_deselect_all(ob_iter, select_mode, ignore_visibility);
+
+		/* if there are some dependencies for visualizing armature state
+		 * (e.g. Mask Modifier in 'Armature' mode), force update
+		 */
+		if (arm->flag & ARM_HAS_VIZ_DEPS) {
+			/* NOTE: ob not ob_act here is intentional - it's the source of the
+			 *       bones being selected  [T37247]
+			 */
+			DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+		}
+
+		/* need to tag armature for cow updates, or else selection doesn't update */
+		DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+	}
+}
+
 /* ***************** Selections ********************** */
 
 static void selectconnected_posebonechildren(Object *ob, Bone *bone, int extend)
@@ -259,9 +328,6 @@ static void selectconnected_posebonechildren(Object *ob, Bone *bone, int extend)
 	if (!(bone->flag & BONE_CONNECTED) || (bone->flag & BONE_UNSELECTABLE))
 		return;
 
-	/* XXX old cruft! use notifiers instead */
-	//select_actionchannel_by_name (ob->action, bone->name, !(shift));
-
 	if (extend)
 		bone->flag &= ~BONE_SELECTED;
 	else
@@ -275,18 +341,19 @@ static void selectconnected_posebonechildren(Object *ob, Bone *bone, int extend)
 /* previously known as "selectconnected_posearmature" */
 static int pose_select_connected_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm = (bArmature *)ob->data;
 	Bone *bone, *curBone, *next = NULL;
 	const bool extend = RNA_boolean_get(op->ptr, "extend");
 
 	view3d_operator_needs_opengl(C);
 
-	bone = get_nearest_bone(C, event->mval, !extend);
+	Base *base = NULL;
+	bone = get_nearest_bone(C, event->mval, !extend, &base);
 
 	if (!bone)
 		return OPERATOR_CANCELLED;
 
+	bArmature *arm = base->object->data;
+
 	/* Select parents */
 	for (curBone = bone; curBone; curBone = next) {
 		/* ignore bone if cannot be selected */
@@ -307,16 +374,19 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, const wmEve
 
 	/* Select children */
 	for (curBone = bone->childbase.first; curBone; curBone = next)
-		selectconnected_posebonechildren(ob, curBone, extend);
+		selectconnected_posebonechildren(base->object, curBone, extend);
 
 	/* updates */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, base->object);
 
 	if (arm->flag & ARM_HAS_VIZ_DEPS) {
 		/* mask modifier ('armature' mode), etc. */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 	}
 
+	/* need to tag armature for cow updates, or else selection doesn't update */
+	DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -332,7 +402,7 @@ void POSE_OT_select_linked(wmOperatorType *ot)
 	ot->idname = "POSE_OT_select_linked";
 	ot->description = "Select bones related to selected ones by parent/child relationships";
 
-	/* api callbacks */
+	/* callbacks */
 	/* leave 'exec' unset */
 	ot->invoke = pose_select_connected_invoke;
 	ot->poll = pose_select_linked_poll;
@@ -351,28 +421,34 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
 	int action = RNA_enum_get(op->ptr, "action");
 
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = ED_object_context(C);
-	bArmature *arm = ob->data;
 	int multipaint = scene->toolsettings->multipaint;
 
 	if (action == SEL_TOGGLE) {
 		action = CTX_DATA_COUNT(C, selected_pose_bones) ? SEL_DESELECT : SEL_SELECT;
 	}
 
+	Object *ob_prev = NULL;
+
 	/*	Set the flags */
-	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, visible_pose_bones)
+	CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
 	{
+		bArmature *arm = ob->data;
 		pose_do_bone_select(pchan, action);
+
+		if (ob_prev != ob) {
+			/* weightpaint or mask modifiers need depsgraph updates */
+			if (multipaint || (arm->flag & ARM_HAS_VIZ_DEPS)) {
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+			/* need to tag armature for cow updates, or else selection doesn't update */
+			DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+			ob_prev = ob;
+		}
 	}
 	CTX_DATA_END;
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, NULL);
 
-	/* weightpaint or mask modifiers need depsgraph updates */
-	if (multipaint || (arm->flag & ARM_HAS_VIZ_DEPS)) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	}
-
 	return OPERATOR_FINISHED;
 }
 
@@ -397,33 +473,44 @@ void POSE_OT_select_all(wmOperatorType *ot)
 
 static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm = (bArmature *)ob->data;
-	bPoseChannel *pchan, *parent;
-
-	/* Determine if there is an active bone */
-	pchan = CTX_data_active_pose_bone(C);
-	if (pchan) {
-		parent = pchan->parent;
-		if ((parent) && !(parent->bone->flag & (BONE_HIDDEN_P | BONE_UNSELECTABLE))) {
-			parent->bone->flag |= BONE_SELECTED;
-			arm->act_bone = parent->bone;
-		}
-		else {
-			return OPERATOR_CANCELLED;
-		}
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+	/* only clear relevant transforms for selected bones */
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob_iter)
+	{
+		Object *ob = ob_iter;
+		bArmature *arm = (bArmature *)ob->data;
 
-	/* updates */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob_iter, pchan)
+		{
+			if (pchan) {
+				bPoseChannel *parent = pchan->parent;
+				if ((parent) && !(parent->bone->flag & (BONE_HIDDEN_P | BONE_UNSELECTABLE))) {
+					parent->bone->flag |= BONE_SELECTED;
+					arm->act_bone = parent->bone;
+				}
+				else {
+					continue;
+				}
+			}
+			else {
+				continue;
+			}
 
-	if (arm->flag & ARM_HAS_VIZ_DEPS) {
-		/* mask modifier ('armature' mode), etc. */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			/* updates */
+			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+
+			if (arm->flag & ARM_HAS_VIZ_DEPS) {
+				/* mask modifier ('armature' mode), etc. */
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+
+			/* tag armature for copy-on-write update (since act_bone is in armature not object) */
+			DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+
+		}
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 	}
+	FOREACH_OBJECT_IN_MODE_END;
 
 	return OPERATOR_FINISHED;
 }
@@ -447,13 +534,13 @@ void POSE_OT_select_parent(wmOperatorType *ot)
 
 static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	bArmature *arm = (bArmature *)ob->data;
 	bConstraint *con;
 	int found = 0;
+	Object *ob_prev = NULL;
 
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones)
+	CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
 	{
+		bArmature *arm = ob->data;
 		if (pchan->bone->flag & BONE_SELECTED) {
 			for (con = pchan->constraints.first; con; con = con->next) {
 				const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
@@ -469,6 +556,18 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op
 							if ((pchanc) && !(pchanc->bone->flag & BONE_UNSELECTABLE)) {
 								pchanc->bone->flag |= BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL;
 								found = 1;
+
+								if (ob != ob_prev) {
+									/* updates */
+									WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+									if (arm->flag & ARM_HAS_VIZ_DEPS) {
+										/* mask modifier ('armature' mode), etc. */
+										DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+									}
+									/* tag armature for copy on write, since selection status is armature data */
+									DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+									ob_prev = ob;
+								}
 							}
 						}
 					}
@@ -484,14 +583,6 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op
 	if (!found)
 		return OPERATOR_CANCELLED;
 
-	/* updates */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
-
-	if (arm->flag & ARM_HAS_VIZ_DEPS) {
-		/* mask modifier ('armature' mode), etc. */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	}
-
 	return OPERATOR_FINISHED;
 }
 
@@ -583,9 +674,12 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op)
 
 	if (arm->flag & ARM_HAS_VIZ_DEPS) {
 		/* mask modifier ('armature' mode), etc. */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
+	/* tag armature for copy-on-write update (since act_bone is in armature not object) */
+	DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -828,9 +922,12 @@ static int pose_select_grouped_exec(bContext *C, wmOperator *op)
 
 	if (arm->flag & ARM_HAS_VIZ_DEPS) {
 		/* mask modifier ('armature' mode), etc. */
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
+	/* need to tag armature for cow updates, or else selection doesn't update */
+	DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+
 	/* report done status */
 	if (changed)
 		return OPERATOR_FINISHED;
@@ -873,59 +970,63 @@ void POSE_OT_select_grouped(wmOperatorType *ot)
 static int pose_select_mirror_exec(bContext *C, wmOperator *op)
 {
 	Object *ob_act = CTX_data_active_object(C);
-	Object *ob = BKE_object_pose_armature_get(ob_act);
-	bArmature *arm;
-	bPoseChannel *pchan, *pchan_mirror_act = NULL;
-	const bool active_only = RNA_boolean_get(op->ptr, "only_active");
-	const bool extend = RNA_boolean_get(op->ptr, "extend");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if ((ob && (ob->mode & OB_MODE_POSE)) == 0) {
-		return OPERATOR_CANCELLED;
-	}
-
-	arm = ob->data;
+	FOREACH_OBJECT_IN_MODE_BEGIN(view_layer, OB_MODE_POSE, ob)
+	{
+		bArmature *arm;
+		bPoseChannel *pchan, *pchan_mirror_act = NULL;
+		const bool active_only = RNA_boolean_get(op->ptr, "only_active");
+		const bool extend = RNA_boolean_get(op->ptr, "extend");
 
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		const int flag = (pchan->bone->flag & BONE_SELECTED);
-		PBONE_PREV_FLAG_SET(pchan, flag);
-	}
+		arm = ob->data;
 
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		if (PBONE_SELECTABLE(arm, pchan->bone)) {
-			bPoseChannel *pchan_mirror;
-			int flag_new = extend ? PBONE_PREV_FLAG_GET(pchan) : 0;
+		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+			const int flag = (pchan->bone->flag & BONE_SELECTED);
+			PBONE_PREV_FLAG_SET(pchan, flag);
+		}
 
-			if ((pchan_mirror = BKE_pose_channel_get_mirrored(ob->pose, pchan->name)) &&
-			    (PBONE_VISIBLE(arm, pchan_mirror->bone)))
-			{
-				const int flag_mirror = PBONE_PREV_FLAG_GET(pchan_mirror);
-				flag_new |= flag_mirror;
+		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+			if (PBONE_SELECTABLE(arm, pchan->bone)) {
+				bPoseChannel *pchan_mirror;
+				int flag_new = extend ? PBONE_PREV_FLAG_GET(pchan) : 0;
+
+				if ((pchan_mirror = BKE_pose_channel_get_mirrored(ob->pose, pchan->name)) &&
+				    (PBONE_VISIBLE(arm, pchan_mirror->bone)))
+				{
+					const int flag_mirror = PBONE_PREV_FLAG_GET(pchan_mirror);
+					flag_new |= flag_mirror;
+
+					if (pchan->bone == arm->act_bone) {
+						pchan_mirror_act = pchan_mirror;
+					}
 
-				if (pchan->bone == arm->act_bone) {
-					pchan_mirror_act = pchan_mirror;
+					/* skip all but the active or its mirror */
+					if (active_only && !ELEM(arm->act_bone, pchan->bone, pchan_mirror->bone)) {
+						continue;
+					}
 				}
 
-				/* skip all but the active or its mirror */
-				if (active_only && !ELEM(arm->act_bone, pchan->bone, pchan_mirror->bone)) {
-					continue;
-				}
+				pchan->bone->flag = (pchan->bone->flag & ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL)) | flag_new;
 			}
-
-			pchan->bone->flag = (pchan->bone->flag & ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL)) | flag_new;
 		}
-	}
 
-	if (pchan_mirror_act) {
-		arm->act_bone = pchan_mirror_act->bone;
+		if (pchan_mirror_act) {
+			arm->act_bone = pchan_mirror_act->bone;
 
-		/* in weightpaint we select the associated vertex group too */
-		if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
-			ED_vgroup_select_by_name(ob_act, pchan_mirror_act->name);
-			DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+			/* in weightpaint we select the associated vertex group too */
+			if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
+				ED_vgroup_select_by_name(ob_act, pchan_mirror_act->name);
+				DEG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+			}
 		}
-	}
 
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+		WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+
+		/* need to tag armature for cow updates, or else selection doesn't update */
+		DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
+	}
+	FOREACH_OBJECT_IN_MODE_END;
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 1fc623eb6af..de0612d840d 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -45,13 +45,16 @@
 #include "BKE_blender_copybuffer.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
+#include "BKE_layer.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -70,12 +73,14 @@
 /* Pose Apply */
 
 /* helper for apply_armature_pose2bones - fixes parenting of objects that are bone-parented to armature */
-static void applyarmature_fix_boneparents(Scene *scene, Object *armob)
+static void applyarmature_fix_boneparents(const bContext *C, Scene *scene, Object *armob)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	Main *bmain = CTX_data_main(C);
 	Object workob, *ob;
 
 	/* go through all objects in database */
-	for (ob = G.main->object.first; ob; ob = ob->id.next) {
+	for (ob = bmain->object.first; ob; ob = ob->id.next) {
 		/* if parent is bone in this armature, apply corrections */
 		if ((ob->parent == armob) && (ob->partype == PARBONE)) {
 			/* apply current transform from parent (not yet destroyed),
@@ -83,7 +88,7 @@ static void applyarmature_fix_boneparents(Scene *scene, Object *armob)
 			 */
 			BKE_object_apply_mat4(ob, ob->obmat, false, false);
 
-			BKE_object_workob_calc_parent(scene, ob, &workob);
+			BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 			invert_m4_m4(ob->parentinv, workob.obmat);
 		}
 	}
@@ -92,8 +97,10 @@ static void applyarmature_fix_boneparents(Scene *scene, Object *armob)
 /* set the current pose as the restpose */
 static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); // must be active object, not edit-object
+	const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 	bArmature *arm = BKE_armature_from_object(ob);
 	bPose *pose;
 	bPoseChannel *pchan;
@@ -121,11 +128,12 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
 	pose = ob->pose;
 
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
+		const bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name);
 		curbone = ED_armature_ebone_find_name(arm->edbo, pchan->name);
 
 		/* simply copy the head/tail values from pchan over to curbone */
-		copy_v3_v3(curbone->head, pchan->pose_head);
-		copy_v3_v3(curbone->tail, pchan->pose_tail);
+		copy_v3_v3(curbone->head, pchan_eval->pose_head);
+		copy_v3_v3(curbone->tail, pchan_eval->pose_tail);
 
 		/* fix roll:
 		 *	1. find auto-calculated roll value for this bone now
@@ -141,7 +149,7 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
 			invert_m3_m3(imat, premat);
 
 			/* get pchan 'visual' matrix */
-			copy_m3_m4(pmat, pchan->pose_mat);
+			copy_m3_m4(pmat, pchan_eval->pose_mat);
 
 			/* remove auto from visual and get euler rotation */
 			mul_m3_m3m3(tmat, imat, pmat);
@@ -155,17 +163,19 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
 		 * then clear the pchan values (so we don't get a double-up)
 		 */
 		if (pchan->bone->segments > 1) {
-			curbone->curveInX += pchan->curveInX;
-			curbone->curveInY += pchan->curveInY;
-			curbone->curveOutX += pchan->curveOutX;
-			curbone->curveOutY += pchan->curveOutY;
-			curbone->roll1 += pchan->roll1;
-			curbone->roll2 += pchan->roll2;
-			curbone->ease1 += pchan->ease1;
-			curbone->ease2 += pchan->ease2;
-			curbone->scaleIn += pchan->scaleIn;
-			curbone->scaleOut += pchan->scaleOut;
-
+			/* combine rest/pose values  */
+			curbone->curveInX += pchan_eval->curveInX;
+			curbone->curveInY += pchan_eval->curveInY;
+			curbone->curveOutX += pchan_eval->curveOutX;
+			curbone->curveOutY += pchan_eval->curveOutY;
+			curbone->roll1 += pchan_eval->roll1;
+			curbone->roll2 += pchan_eval->roll2;
+			curbone->ease1 += pchan_eval->ease1;
+			curbone->ease2 += pchan_eval->ease2;
+			curbone->scaleIn += pchan_eval->scaleIn;
+			curbone->scaleOut += pchan_eval->scaleOut;
+
+			/* reset pose values */
 			pchan->curveInX = pchan->curveOutX = 0.0f;
 			pchan->curveInY = pchan->curveOutY = 0.0f;
 			pchan->roll1 = pchan->roll2 = 0.0f;
@@ -189,13 +199,14 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
 	ED_armature_edit_free(arm);
 
 	/* flush positions of posebones */
-	BKE_pose_where_is(scene, ob);
+	BKE_pose_where_is(depsgraph, scene, ob);
 
 	/* fix parenting of objects which are bone-parented */
-	applyarmature_fix_boneparents(scene, ob);
+	applyarmature_fix_boneparents(C, scene, ob);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -219,38 +230,41 @@ void POSE_OT_armature_apply(wmOperatorType *ot)
 /* set the current pose as the restpose */
 static int pose_visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); // must be active object, not edit-object
-
-	/* don't check if editmode (should be done by caller) */
-	if (ob->type != OB_ARMATURE)
-		return OPERATOR_CANCELLED;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
-	/* loop over all selected pchans
-	 *
-	 * TODO, loop over children before parents if multiple bones
-	 * at once are to be predictable*/
-	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
+	FOREACH_OBJECT_IN_MODE_BEGIN(view_layer, OB_MODE_POSE, ob)
 	{
-		float delta_mat[4][4];
-
-		/* chan_mat already contains the delta transform from rest pose to pose-mode pose
-		 * as that is baked into there so that B-Bones will work. Once we've set this as the
-		 * new raw-transform components, don't recalc the poses yet, otherwise IK result will
-		 * change, thus changing the result we may be trying to record.
-		 */
-		/* XXX For some reason, we can't use pchan->chan_mat here, gives odd rotation/offset (see T38251).
-		 *     Using pchan->pose_mat and bringing it back in bone space seems to work as expected!
-		 */
-		BKE_armature_mat_pose_to_bone(pchan, pchan->pose_mat, delta_mat);
+		/* loop over all selected pchans
+		 *
+		 * TODO, loop over children before parents if multiple bones
+		 * at once are to be predictable*/
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan)
+		{
+			const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+			bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name);
+			float delta_mat[4][4];
+
+			/* chan_mat already contains the delta transform from rest pose to pose-mode pose
+			 * as that is baked into there so that B-Bones will work. Once we've set this as the
+			 * new raw-transform components, don't recalc the poses yet, otherwise IK result will
+			 * change, thus changing the result we may be trying to record.
+			 */
+			/* XXX For some reason, we can't use pchan->chan_mat here, gives odd rotation/offset (see T38251).
+			 *     Using pchan->pose_mat and bringing it back in bone space seems to work as expected!
+			 */
+			BKE_armature_mat_pose_to_bone(pchan_eval, pchan_eval->pose_mat, delta_mat);
 
-		BKE_pchan_apply_mat4(pchan, delta_mat, true);
-	}
-	CTX_DATA_END;
+			BKE_pchan_apply_mat4(pchan, delta_mat, true);
+		}
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+		/* note, notifier might evolve */
+		WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+	}
+	FOREACH_OBJECT_IN_MODE_END;
 
 	return OPERATOR_FINISHED;
 }
@@ -565,11 +579,11 @@ static int pose_paste_exec(bContext *C, wmOperator *op)
 	BKE_main_free(tmp_bmain);
 
 	/* Update event for pose and deformation children. */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* Recalculate paths if any of the bones have paths... */
 	if ((ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) {
-		ED_pose_recalculate_paths(scene, ob);
+		ED_pose_recalculate_paths(C, scene, ob);
 	}
 
 	/* Notifiers for updates, */
@@ -754,8 +768,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
                                              void (*clear_func)(bPoseChannel *), const char default_ksName[])
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
-	short autokey = 0;
+	bool changed_multi = false;
 
 	/* sanity checks */
 	if (ELEM(NULL, clear_func, default_ksName)) {
@@ -764,47 +777,70 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
 	}
 
 	/* only clear relevant transforms for selected bones */
-	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob_iter)
 	{
-		/* run provided clearing function */
-		clear_func(pchan);
+		Object *ob_eval = DEG_get_evaluated_object(CTX_data_depsgraph(C), ob_iter); // XXX: UGLY HACK (for autokey + clear transforms)
+		ListBase dsources = {NULL, NULL};
+		bool changed = false;
 
-		/* do auto-keyframing as appropriate */
-		if (autokeyframe_cfra_can_key(scene, &ob->id)) {
-			/* clear any unkeyed tags */
-			if (pchan->bone)
-				pchan->bone->flag &= ~BONE_UNKEYED;
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob_iter, pchan)
+		{
+			/* run provided clearing function */
+			clear_func(pchan);
+			changed = true;
+
+			/* do auto-keyframing as appropriate */
+			if (autokeyframe_cfra_can_key(scene, &ob_iter->id)) {
+				/* clear any unkeyed tags */
+				if (pchan->bone) {
+					pchan->bone->flag &= ~BONE_UNKEYED;
+				}
+				/* tag for autokeying later */
+				ANIM_relative_keyingset_add_source(&dsources, &ob_iter->id, &RNA_PoseBone, pchan);
 
-			/* tag for autokeying later */
-			autokey = 1;
-		}
-		else {
-			/* add unkeyed tags */
-			if (pchan->bone)
-				pchan->bone->flag |= BONE_UNKEYED;
+#if 1			/* XXX: Ugly Hack - Run clearing function on evaluated copy of pchan */
+				bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name);
+				clear_func(pchan_eval);
+#endif
+			}
+			else {
+				/* add unkeyed tags */
+				if (pchan->bone) {
+					pchan->bone->flag |= BONE_UNKEYED;
+				}
+			}
 		}
-	}
-	CTX_DATA_END;
+		FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
 
-	/* perform autokeying on the bones if needed */
-	if (autokey) {
-		/* get KeyingSet to use */
-		KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, default_ksName);
+		if (changed) {
+			changed_multi = true;
 
-		/* insert keyframes */
-		ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
+			/* perform autokeying on the bones if needed */
+			if (!BLI_listbase_is_empty(&dsources)) {
+				/* get KeyingSet to use */
+				KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, default_ksName);
 
-		/* now recalculate paths */
-		if ((ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS))
-			ED_pose_recalculate_paths(scene, ob);
-	}
+				/* insert keyframes */
+				ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				/* now recalculate paths */
+				if ((ob_iter->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) {
+					ED_pose_recalculate_paths(C, scene, ob_iter);
+				}
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
+				BLI_freelistN(&dsources);
+			}
 
-	return OPERATOR_FINISHED;
+			DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+
+			/* note, notifier might evolve */
+			WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob_iter);
+		}
+	}
+	FOREACH_OBJECT_IN_MODE_END;
+
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 /* --------------- */
@@ -897,57 +933,61 @@ void POSE_OT_transforms_clear(wmOperatorType *ot)
 
 static int pose_clear_user_transforms_exec(bContext *C, wmOperator *op)
 {
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
 	float cframe = (float)CFRA;
 	const bool only_select = RNA_boolean_get(op->ptr, "only_selected");
 
-	if ((ob->adt) && (ob->adt->action)) {
-		/* XXX: this is just like this to avoid contaminating anything else;
-		 * just pose values should change, so this should be fine
-		 */
-		bPose *dummyPose = NULL;
-		Object workob = {{NULL}};
-		bPoseChannel *pchan;
+	FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob)
+	{
+		if ((ob->adt) && (ob->adt->action)) {
+			/* XXX: this is just like this to avoid contaminating anything else;
+			 * just pose values should change, so this should be fine
+			 */
+			bPose *dummyPose = NULL;
+			Object workob = {{NULL}};
+			bPoseChannel *pchan;
 
-		/* execute animation step for current frame using a dummy copy of the pose */
-		BKE_pose_copy_data(&dummyPose, ob->pose, 0);
+			/* execute animation step for current frame using a dummy copy of the pose */
+			BKE_pose_copy_data(&dummyPose, ob->pose, 0);
 
-		BLI_strncpy(workob.id.name, "OB<ClearTfmWorkOb>", sizeof(workob.id.name));
-		workob.type = OB_ARMATURE;
-		workob.data = ob->data;
-		workob.adt = ob->adt;
-		workob.pose = dummyPose;
+			BLI_strncpy(workob.id.name, "OB<ClearTfmWorkOb>", sizeof(workob.id.name));
+			workob.type = OB_ARMATURE;
+			workob.data = ob->data;
+			workob.adt = ob->adt;
+			workob.pose = dummyPose;
 
-		BKE_animsys_evaluate_animdata(scene, &workob.id, workob.adt, cframe, ADT_RECALC_ANIM);
+			BKE_animsys_evaluate_animdata(NULL, scene, &workob.id, workob.adt, cframe, ADT_RECALC_ANIM);
 
-		/* copy back values, but on selected bones only  */
-		for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
-			pose_bone_do_paste(ob, pchan, only_select, 0);
-		}
+			/* copy back values, but on selected bones only  */
+			for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
+				pose_bone_do_paste(ob, pchan, only_select, 0);
+			}
 
-		/* free temp data - free manually as was copied without constraints */
-		for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
-			if (pchan->prop) {
-				IDP_FreeProperty(pchan->prop);
-				MEM_freeN(pchan->prop);
+			/* free temp data - free manually as was copied without constraints */
+			for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
+				if (pchan->prop) {
+					IDP_FreeProperty(pchan->prop);
+					MEM_freeN(pchan->prop);
+				}
 			}
+
+			/* was copied without constraints */
+			BLI_freelistN(&dummyPose->chanbase);
+			MEM_freeN(dummyPose);
+		}
+		else {
+			/* no animation, so just reset whole pose to rest pose
+			 * (cannot just restore for selected though)
+			 */
+			BKE_pose_rest(ob->pose);
 		}
 
-		/* was copied without constraints */
-		BLI_freelistN(&dummyPose->chanbase);
-		MEM_freeN(dummyPose);
-	}
-	else {
-		/* no animation, so just reset whole pose to rest pose
-		 * (cannot just restore for selected though)
-		 */
-		BKE_pose_rest(ob->pose);
+		/* notifiers and updates */
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
 	}
-
-	/* notifiers and updates */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
+	FOREACH_OBJECT_IN_MODE_END;
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c
index 84eaa5b02bd..b64c8528010 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -39,11 +39,12 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
 
 #include "BKE_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "WM_api.h"
@@ -182,6 +183,7 @@ void poseAnim_mapping_free(ListBase *pfLinks)
 /* helper for apply() / reset() - refresh the data */
 void poseAnim_mapping_refresh(bContext *C, Scene *scene, Object *ob)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	bArmature *arm = (bArmature *)ob->data;
 
 	/* old optimize trick... this enforces to bypass the depgraph
@@ -189,11 +191,11 @@ void poseAnim_mapping_refresh(bContext *C, Scene *scene, Object *ob)
 	 */
 	/* FIXME: shouldn't this use the builtin stuff? */
 	if ((arm->flag & ARM_DELAYDEFORM) == 0)
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 	else
-		BKE_pose_where_is(scene, ob);
+		BKE_pose_where_is(depsgraph, scene, ob);
 
-	/* note, notifier might evolve */
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); /* otherwise animation doesn't get updated */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
 }
 
@@ -266,7 +268,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, Object *ob, ListBa
 		 */
 		if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) {
 			//ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
-			ED_pose_recalculate_paths(scene, ob);
+			ED_pose_recalculate_paths(C, scene, ob);
 		}
 	}
 }
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c
deleted file mode 100644
index d837c702cb7..00000000000
--- a/source/blender/editors/armature/reeb.c
+++ /dev/null
@@ -1,3435 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Martin Poirier
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/reeb.c
- *  \ingroup edarmature
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-#include "BLI_ghash.h"
-
-#include "BKE_context.h"
-
-#include "reeb.h"
-
-#if 0 /* UNUSED 2.5 */
-static ReebGraph *GLOBAL_RG = NULL;
-static ReebGraph *FILTERED_RG = NULL;
-#endif
-
-/*
- * Skeleton generation algorithm based on:
- * "Harmonic Skeleton for Realistic Character Animation"
- * Gregoire Aujay, Franck Hetroy, Francis Lazarus and Christine Depraz
- * SIGGRAPH 2007
- *
- * Reeb graph generation algorithm based on:
- * "Robust On-line Computation of Reeb Graphs: Simplicity and Speed"
- * Valerio Pascucci, Giorgio Scorzelli, Peer-Timo Bremer and Ajith Mascarenhas
- * SIGGRAPH 2007
- *
- * */
-
-#if 0
-#define DEBUG_REEB
-#define DEBUG_REEB_NODE
-#endif
-
-/* place-holders! */
-typedef struct EditEdge {
-	void *fake;
-} EditEdge;
-
-typedef struct EditFace {
-	void *fake;
-} EditFace;
-/* end place-holders! */
-
-typedef struct VertexData {
-	float w; /* weight */
-	int i; /* index */
-	ReebNode *n;
-} VertexData;
-
-typedef struct EdgeIndex {
-	EditEdge **edges;
-	int      *offset;
-} EdgeIndex;
-
-typedef enum {
-	MERGE_LOWER,
-	MERGE_HIGHER,
-	MERGE_APPEND
-} MergeDirection;
-
-int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
-void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction);
-int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
-EditEdge *NextEdgeForVert(EdgeIndex *indexed_edges, int index);
-void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
-void addFacetoArc(ReebArc *arc, EditFace *efa);
-
-void REEB_RadialSymmetry(BNode *root_node, RadialArc *ring, int count);
-void REEB_AxialSymmetry(BNode *root_node, BNode *node1, BNode *node2, struct BArc *barc1, BArc *barc2);
-
-void flipArcBuckets(ReebArc *arc);
-
-
-/***************************************** UTILS **********************************************/
-
-#if 0 /* UNUSED */
-static VertexData *allocVertexData(EditMesh *em)
-{
-	VertexData *data;
-	EditVert *eve;
-	int totvert, index;
-
-	totvert = BLI_listbase_count(&em->verts);
-
-	data = MEM_callocN(sizeof(VertexData) * totvert, "VertexData");
-
-	for (index = 0, eve = em->verts.first; eve; index++, eve = eve->next)
-	{
-		data[index].i = index;
-		data[index].w = 0;
-		eve->tmp.p = data + index;
-	}
-
-	return data;
-}
-
-static int indexData(EditVert *eve)
-{
-	return ((VertexData *)eve->tmp.p)->i;
-}
-
-static float weightData(EditVert *eve)
-{
-	return ((VertexData *)eve->tmp.p)->w;
-}
-
-static void weightSetData(EditVert *eve, float w)
-{
-	((VertexData *)eve->tmp.p)->w = w;
-}
-
-static ReebNode *nodeData(EditVert *eve)
-{
-	return ((VertexData *)eve->tmp.p)->n;
-}
-
-static void nodeSetData(EditVert *eve, ReebNode *n)
-{
-	((VertexData *)eve->tmp.p)->n = n;
-}
-
-#endif
-
-void REEB_freeArc(BArc *barc)
-{
-	ReebArc *arc = (ReebArc *)barc;
-	BLI_freelistN(&arc->edges);
-
-	if (arc->buckets)
-		MEM_freeN(arc->buckets);
-
-	if (arc->faces)
-		BLI_ghash_free(arc->faces, NULL, NULL);
-
-	MEM_freeN(arc);
-}
-
-void REEB_freeGraph(ReebGraph *rg)
-{
-	ReebArc *arc;
-	ReebNode *node;
-
-	// free nodes
-	for (node = rg->nodes.first; node; node = node->next) {
-		BLI_freeNode((BGraph *)rg, (BNode *)node);
-	}
-	BLI_freelistN(&rg->nodes);
-
-	// free arcs
-	arc = rg->arcs.first;
-	while (arc) {
-		ReebArc *next = arc->next;
-		REEB_freeArc((BArc *)arc);
-		arc = next;
-	}
-
-	// free edge map
-	BLI_edgehash_free(rg->emap, NULL);
-
-	/* free linked graph */
-	if (rg->link_up) {
-		REEB_freeGraph(rg->link_up);
-	}
-
-	MEM_freeN(rg);
-}
-
-ReebGraph *newReebGraph(void)
-{
-	ReebGraph *rg;
-	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
-
-	rg->totnodes = 0;
-	rg->emap = BLI_edgehash_new(__func__);
-
-
-	rg->free_arc = REEB_freeArc;
-	rg->free_node = NULL;
-	rg->radial_symmetry = REEB_RadialSymmetry;
-	rg->axial_symmetry = REEB_AxialSymmetry;
-
-	return rg;
-}
-
-void BIF_flagMultiArcs(ReebGraph *rg, int flag)
-{
-	for (; rg; rg = rg->link_up) {
-		BLI_flagArcs((BGraph *)rg, flag);
-	}
-}
-
-#if 0 /* UNUSED */
-static ReebNode *addNode(ReebGraph *rg, EditVert *eve)
-{
-	float weight;
-	ReebNode *node = NULL;
-
-	weight = weightData(eve);
-
-	node = MEM_callocN(sizeof(ReebNode), "reeb node");
-
-	node->flag = 0; // clear flag on init
-	node->symmetry_level = 0;
-	node->arcs = NULL;
-	node->degree = 0;
-	node->weight = weight;
-	node->index = rg->totnodes;
-	copy_v3_v3(node->p, eve->co);
-
-	BLI_addtail(&rg->nodes, node);
-	rg->totnodes++;
-
-	nodeSetData(eve, node);
-
-	return node;
-}
-
-static ReebNode *copyNode(ReebGraph *rg, ReebNode *node)
-{
-	ReebNode *cp_node = NULL;
-
-	cp_node = MEM_callocN(sizeof(ReebNode), "reeb node copy");
-
-	memcpy(cp_node, node, sizeof(ReebNode));
-
-	cp_node->prev = NULL;
-	cp_node->next = NULL;
-	cp_node->arcs = NULL;
-
-	cp_node->link_up = NULL;
-	cp_node->link_down = NULL;
-
-	BLI_addtail(&rg->nodes, cp_node);
-	rg->totnodes++;
-
-	return cp_node;
-}
-
-static void relinkNodes(ReebGraph *low_rg, ReebGraph *high_rg)
-{
-	ReebNode *low_node, *high_node;
-
-	if (low_rg == NULL || high_rg == NULL)
-	{
-		return;
-	}
-
-	for (low_node = low_rg->nodes.first; low_node; low_node = low_node->next)
-	{
-		for (high_node = high_rg->nodes.first; high_node; high_node = high_node->next)
-		{
-			if (low_node->index == high_node->index)
-			{
-				high_node->link_down = low_node;
-				low_node->link_up = high_node;
-				break;
-			}
-		}
-	}
-}
-#endif
-
-ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node)
-{
-	return (arc->head->index == node->index) ? arc->tail : arc->head;
-}
-
-ReebNode *BIF_NodeFromIndex(ReebArc *arc, ReebNode *node)
-{
-	return (arc->head->index == node->index) ? arc->head : arc->tail;
-}
-
-ReebNode *BIF_lowestLevelNode(ReebNode *node)
-{
-	while (node->link_down) {
-		node = node->link_down;
-	}
-
-	return node;
-}
-
-#if 0 /* UNUSED */
-static ReebArc *copyArc(ReebGraph *rg, ReebArc *arc)
-{
-	ReebArc *cp_arc;
-	ReebNode *node;
-
-	cp_arc = MEM_callocN(sizeof(ReebArc), "reeb arc copy");
-
-	memcpy(cp_arc, arc, sizeof(ReebArc));
-
-	cp_arc->link_up = arc;
-
-	cp_arc->head = NULL;
-	cp_arc->tail = NULL;
-
-	cp_arc->prev = NULL;
-	cp_arc->next = NULL;
-
-	cp_arc->edges.first = NULL;
-	cp_arc->edges.last = NULL;
-
-	/* copy buckets */
-	cp_arc->buckets = MEM_callocN(sizeof(EmbedBucket) * cp_arc->bcount, "embed bucket");
-	memcpy(cp_arc->buckets, arc->buckets, sizeof(EmbedBucket) * cp_arc->bcount);
-
-	/* copy faces map */
-	cp_arc->faces = BLI_ghash_ptr_new("copyArc gh");
-	mergeArcFaces(rg, cp_arc, arc);
-
-	/* find corresponding head and tail */
-	for (node = rg->nodes.first; node && (cp_arc->head == NULL || cp_arc->tail == NULL); node = node->next)
-	{
-		if (node->index == arc->head->index)
-		{
-			cp_arc->head = node;
-		}
-		else if (node->index == arc->tail->index)
-		{
-			cp_arc->tail = node;
-		}
-	}
-
-	BLI_addtail(&rg->arcs, cp_arc);
-
-	return cp_arc;
-}
-
-static ReebGraph *copyReebGraph(ReebGraph *rg, int level)
-{
-	ReebNode *node;
-	ReebArc *arc;
-	ReebGraph *cp_rg = newReebGraph();
-
-	cp_rg->resolution = rg->resolution;
-	cp_rg->length = rg->length;
-	cp_rg->link_up = rg;
-	cp_rg->multi_level = level;
-
-	/* Copy nodes */
-	for (node = rg->nodes.first; node; node = node->next)
-	{
-		ReebNode *cp_node = copyNode(cp_rg, node);
-		cp_node->multi_level = level;
-	}
-
-	/* Copy arcs */
-	for (arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		copyArc(cp_rg, arc);
-	}
-
-	BLI_buildAdjacencyList((BGraph *)cp_rg);
-
-	return cp_rg;
-}
-#endif
-
-ReebGraph *BIF_graphForMultiNode(ReebGraph *rg, ReebNode *node)
-{
-	ReebGraph *multi_rg = rg;
-
-	while (multi_rg && multi_rg->multi_level != node->multi_level) {
-		multi_rg = multi_rg->link_up;
-	}
-
-	return multi_rg;
-}
-
-#if 0 /* UNUSED */
-static ReebEdge *copyEdge(ReebEdge *edge)
-{
-	ReebEdge *newEdge = NULL;
-
-	newEdge = MEM_callocN(sizeof(ReebEdge), "reeb edge");
-	memcpy(newEdge, edge, sizeof(ReebEdge));
-
-	newEdge->next = NULL;
-	newEdge->prev = NULL;
-
-	return newEdge;
-}
-
-static void printArc(ReebArc *arc)
-{
-	ReebEdge *edge;
-	ReebNode *head = (ReebNode *)arc->head;
-	ReebNode *tail = (ReebNode *)arc->tail;
-	printf("arc: (%i) %f -> (%i) %f\n", head->index, head->weight, tail->index, tail->weight);
-
-	for (edge = arc->edges.first; edge; edge = edge->next)
-	{
-		printf("\tedge (%i, %i)\n", edge->v1->index, edge->v2->index);
-	}
-}
-
-static void flipArc(ReebArc *arc)
-{
-	ReebNode *tmp;
-	tmp = arc->head;
-	arc->head = arc->tail;
-	arc->tail = tmp;
-
-	flipArcBuckets(arc);
-}
-
-#ifdef DEBUG_REEB_NODE
-static void NodeDegreeDecrement(ReebGraph *UNUSED(rg), ReebNode *node)
-{
-	node->degree--;
-
-//	if (node->degree == 0)
-//	{
-//		printf("would remove node %i\n", node->index);
-//	}
-}
-
-static void NodeDegreeIncrement(ReebGraph *UNUSED(rg), ReebNode *node)
-{
-//	if (node->degree == 0)
-//	{
-//		printf("first connect node %i\n", node->index);
-//	}
-
-	node->degree++;
-}
-
-#else
-#  define NodeDegreeDecrement(rg, node) {node->degree--; } (void)0
-#  define NodeDegreeIncrement(rg, node) {node->degree++; } (void)0
-#endif
-
-void repositionNodes(ReebGraph *rg)
-{
-	BArc *arc = NULL;
-	BNode *node = NULL;
-
-	// Reset node positions
-	for (node = rg->nodes.first; node; node = node->next) {
-		node->p[0] = node->p[1] = node->p[2] = 0;
-	}
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		if (((ReebArc *)arc)->bcount > 0) {
-			float p[3];
-
-			copy_v3_v3(p, ((ReebArc *)arc)->buckets[0].p);
-			mul_v3_fl(p, 1.0f / arc->head->degree);
-			add_v3_v3(arc->head->p, p);
-
-			copy_v3_v3(p, ((ReebArc *)arc)->buckets[((ReebArc *)arc)->bcount - 1].p);
-			mul_v3_fl(p, 1.0f / arc->tail->degree);
-			add_v3_v3(arc->tail->p, p);
-		}
-	}
-}
-
-void verifyNodeDegree(ReebGraph *rg)
-{
-#ifdef DEBUG_REEB
-	ReebNode *node = NULL;
-	ReebArc *arc = NULL;
-
-	for (node = rg->nodes.first; node; node = node->next) {
-		int count = 0;
-		for (arc = rg->arcs.first; arc; arc = arc->next) {
-			if (arc->head == node || arc->tail == node) {
-				count++;
-			}
-		}
-		if (count != node->degree) {
-			printf("degree error in node %i: expected %i got %i\n", node->index, count, node->degree);
-		}
-		if (node->degree == 0) {
-			printf("zero degree node %i with weight %f\n", node->index, node->weight);
-		}
-	}
-#endif
-}
-
-static void verifyBucketsArc(ReebGraph *UNUSED(rg), ReebArc *arc)
-{
-	ReebNode *head = (ReebNode *)arc->head;
-	ReebNode *tail = (ReebNode *)arc->tail;
-
-	if (arc->bcount > 0) {
-		int i;
-		for (i = 0; i < arc->bcount; i++) {
-			if (arc->buckets[i].nv == 0) {
-				printArc(arc);
-				printf("count error in bucket %i/%i\n", i + 1, arc->bcount);
-			}
-		}
-
-		if (ceilf(head->weight) != arc->buckets[0].val) {
-			printArc(arc);
-			printf("alloc error in first bucket: %f should be %f\n", arc->buckets[0].val, ceil(head->weight));
-		}
-		if (floorf(tail->weight) != arc->buckets[arc->bcount - 1].val) {
-			printArc(arc);
-			printf("alloc error in last bucket: %f should be %f\n", arc->buckets[arc->bcount - 1].val, floor(tail->weight));
-		}
-	}
-}
-
-void verifyBuckets(ReebGraph *rg)
-{
-#ifdef DEBUG_REEB
-	ReebArc *arc = NULL;
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		verifyBucketsArc(rg, arc);
-	}
-#endif
-}
-
-void verifyFaces(ReebGraph *rg)
-{
-#ifdef DEBUG_REEB
-	int total = 0;
-	ReebArc *arc = NULL;
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		total += BLI_ghash_len(arc->faces);
-	}
-
-#endif
-}
-
-void verifyArcs(ReebGraph *rg)
-{
-	ReebArc *arc;
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		if (arc->head->weight > arc->tail->weight) {
-			printf("FLIPPED ARC!\n");
-		}
-	}
-}
-
-static void verifyMultiResolutionLinks(ReebGraph *rg, int level)
-{
-#ifdef DEBUG_REEB
-	ReebGraph *lower_rg = rg->link_up;
-
-	if (lower_rg) {
-		ReebArc *arc;
-
-		for (arc = rg->arcs.first; arc; arc = arc->next) {
-			if (BLI_findindex(&lower_rg->arcs, arc->link_up) == -1) {
-				printf("missing arc %p for level %i\n", (void *)arc->link_up, level);
-				printf("Source arc was ---\n");
-				printArc(arc);
-
-				arc->link_up = NULL;
-			}
-		}
-
-
-		verifyMultiResolutionLinks(lower_rg, level + 1);
-	}
-#endif
-}
-/***************************************** BUCKET UTILS **********************************************/
-
-static void addVertToBucket(EmbedBucket *b, float co[3])
-{
-	b->nv++;
-	interp_v3_v3v3(b->p, b->p, co, 1.0f / b->nv);
-}
-
-#if 0 /* UNUSED 2.5 */
-static void removeVertFromBucket(EmbedBucket *b, float co[3])
-{
-	mul_v3_fl(b->p, (float)b->nv);
-	sub_v3_v3(b->p, co);
-	b->nv--;
-	mul_v3_fl(b->p, 1.0f / (float)b->nv);
-}
-#endif
-
-static void mergeBuckets(EmbedBucket *bDst, EmbedBucket *bSrc)
-{
-	if (bDst->nv > 0 && bSrc->nv > 0) {
-		bDst->nv += bSrc->nv;
-		interp_v3_v3v3(bDst->p, bDst->p, bSrc->p, (float)bSrc->nv / (float)(bDst->nv));
-	}
-	else if (bSrc->nv > 0) {
-		bDst->nv = bSrc->nv;
-		copy_v3_v3(bDst->p, bSrc->p);
-	}
-}
-
-static void mergeArcBuckets(ReebArc *aDst, ReebArc *aSrc, float start, float end)
-{
-	if (aDst->bcount > 0 && aSrc->bcount > 0) {
-		int indexDst = 0, indexSrc = 0;
-
-		start = max_fff(start, aDst->buckets[0].val, aSrc->buckets[0].val);
-
-		while (indexDst < aDst->bcount && aDst->buckets[indexDst].val < start) {
-			indexDst++;
-		}
-
-		while (indexSrc < aSrc->bcount && aSrc->buckets[indexSrc].val < start) {
-			indexSrc++;
-		}
-
-		for (; indexDst < aDst->bcount &&
-		     indexSrc < aSrc->bcount &&
-		     aDst->buckets[indexDst].val <= end &&
-		     aSrc->buckets[indexSrc].val <= end
-
-		     ; indexDst++, indexSrc++)
-		{
-			mergeBuckets(aDst->buckets + indexDst, aSrc->buckets + indexSrc);
-		}
-	}
-}
-
-void flipArcBuckets(ReebArc *arc)
-{
-	int i, j;
-
-	for (i = 0, j = arc->bcount - 1; i < j; i++, j--) {
-		EmbedBucket tmp;
-
-		tmp = arc->buckets[i];
-		arc->buckets[i] = arc->buckets[j];
-		arc->buckets[j] = tmp;
-	}
-}
-
-static int countArcBuckets(ReebArc *arc)
-{
-	return (int)(floor(arc->tail->weight) - ceil(arc->head->weight)) + 1;
-}
-
-static void allocArcBuckets(ReebArc *arc)
-{
-	int i;
-	float start = ceil(arc->head->weight);
-	arc->bcount = countArcBuckets(arc);
-
-	if (arc->bcount > 0) {
-		arc->buckets = MEM_callocN(sizeof(EmbedBucket) * arc->bcount, "embed bucket");
-
-		for (i = 0; i < arc->bcount; i++) {
-			arc->buckets[i].val = start + i;
-		}
-	}
-	else {
-		arc->buckets = NULL;
-	}
-}
-
-static void resizeArcBuckets(ReebArc *arc)
-{
-	EmbedBucket *oldBuckets = arc->buckets;
-	int oldBCount = arc->bcount;
-
-	if (countArcBuckets(arc) == oldBCount) {
-		return;
-	}
-
-	allocArcBuckets(arc);
-
-	if (oldBCount != 0 && arc->bcount != 0) {
-		int oldStart = (int)oldBuckets[0].val;
-		int oldEnd = (int)oldBuckets[oldBCount - 1].val;
-		int newStart = (int)arc->buckets[0].val;
-		int newEnd = (int)arc->buckets[arc->bcount - 1].val;
-		int oldOffset = 0;
-		int newOffset = 0;
-		int len;
-
-		if (oldStart < newStart) {
-			oldOffset = newStart - oldStart;
-		}
-		else {
-			newOffset = oldStart - newStart;
-		}
-
-		len = MIN2(oldEnd - (oldStart + oldOffset) + 1, newEnd - (newStart - newOffset) + 1);
-
-		memcpy(arc->buckets + newOffset, oldBuckets + oldOffset, len * sizeof(EmbedBucket));
-	}
-
-	if (oldBuckets != NULL) {
-		MEM_freeN(oldBuckets);
-	}
-}
-
-static void reweightBuckets(ReebArc *arc)
-{
-	int i;
-	float start = ceil((arc->head)->weight);
-
-	if (arc->bcount > 0) {
-		for (i = 0; i < arc->bcount; i++) {
-			arc->buckets[i].val = start + i;
-		}
-	}
-}
-
-static void interpolateBuckets(ReebArc *arc, float *start_p, float *end_p, int start_index, int end_index)
-{
-	int total;
-	int j;
-
-	total = end_index - start_index + 2;
-
-	for (j = start_index; j <= end_index; j++) {
-		EmbedBucket *empty = arc->buckets + j;
-		empty->nv = 1;
-		interp_v3_v3v3(empty->p, start_p, end_p, (float)(j - start_index + 1) / total);
-	}
-}
-
-static void fillArcEmptyBuckets(ReebArc *arc)
-{
-	float *start_p, *end_p;
-	int start_index = 0, end_index = 0;
-	int missing = 0;
-	int i;
-
-	start_p = arc->head->p;
-
-	for (i = 0; i < arc->bcount; i++) {
-		EmbedBucket *bucket = arc->buckets + i;
-
-		if (missing) {
-			if (bucket->nv > 0) {
-				missing = 0;
-
-				end_p = bucket->p;
-				end_index = i - 1;
-
-				interpolateBuckets(arc, start_p, end_p, start_index, end_index);
-			}
-		}
-		else {
-			if (bucket->nv == 0) {
-				missing = 1;
-
-				if (i > 0) {
-					start_p = arc->buckets[i - 1].p;
-				}
-				start_index = i;
-			}
-		}
-	}
-
-	if (missing) {
-		end_p = arc->tail->p;
-		end_index = arc->bcount - 1;
-
-		interpolateBuckets(arc, start_p, end_p, start_index, end_index);
-	}
-}
-
-static void ExtendArcBuckets(ReebArc *arc)
-{
-	ReebArcIterator arc_iter;
-	BArcIterator *iter = (BArcIterator *)&arc_iter;
-	EmbedBucket *last_bucket, *first_bucket;
-	float *previous = NULL;
-	float average_length = 0, length;
-	int padding_head = 0, padding_tail = 0;
-
-	if (arc->bcount == 0) {
-		return; /* failsafe, shouldn't happen */
-	}
-
-	initArcIterator(iter, arc, arc->head);
-	IT_next(iter);
-	previous = iter->p;
-
-	for (IT_next(iter);
-	     IT_stopped(iter) == 0;
-	     previous = iter->p, IT_next(iter)
-	     )
-	{
-		average_length += len_v3v3(previous, iter->p);
-	}
-	average_length /= (arc->bcount - 1);
-
-	first_bucket = arc->buckets;
-	last_bucket = arc->buckets + (arc->bcount - 1);
-
-	length = len_v3v3(first_bucket->p, arc->head->p);
-	if (length > 2 * average_length) {
-		padding_head = (int)floor(length / average_length);
-	}
-
-	length = len_v3v3(last_bucket->p, arc->tail->p);
-	if (length > 2 * average_length) {
-		padding_tail = (int)floor(length / average_length);
-	}
-
-	if (padding_head + padding_tail > 0) {
-		EmbedBucket *old_buckets = arc->buckets;
-
-		arc->buckets = MEM_callocN(sizeof(EmbedBucket) * (padding_head + arc->bcount + padding_tail), "embed bucket");
-		memcpy(arc->buckets + padding_head, old_buckets, arc->bcount * sizeof(EmbedBucket));
-
-		arc->bcount = padding_head + arc->bcount + padding_tail;
-
-		MEM_freeN(old_buckets);
-	}
-
-	if (padding_head > 0) {
-		interpolateBuckets(arc, arc->head->p, first_bucket->p, 0, padding_head);
-	}
-
-	if (padding_tail > 0) {
-		interpolateBuckets(arc, last_bucket->p, arc->tail->p, arc->bcount - padding_tail, arc->bcount - 1);
-	}
-}
-
-/* CALL THIS ONLY AFTER FILTERING, SINCE IT MESSES UP WEIGHT DISTRIBUTION */
-static void extendGraphBuckets(ReebGraph *rg)
-{
-	ReebArc *arc;
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		ExtendArcBuckets(arc);
-	}
-}
-
-/**************************************** LENGTH CALCULATIONS ****************************************/
-
-static void calculateArcLength(ReebArc *arc)
-{
-	ReebArcIterator arc_iter;
-	BArcIterator *iter = (BArcIterator *)&arc_iter;
-	float *vec0, *vec1;
-
-	arc->length = 0;
-
-	initArcIterator(iter, arc, arc->head);
-
-	vec0 = arc->head->p;
-	vec1 = arc->head->p; /* in case there's no embedding */
-
-	while (IT_next(iter)) {
-		vec1 = iter->p;
-
-		arc->length += len_v3v3(vec0, vec1);
-
-		vec0 = vec1;
-	}
-
-	arc->length += len_v3v3(arc->tail->p, vec1);
-}
-
-static void calculateGraphLength(ReebGraph *rg)
-{
-	ReebArc *arc;
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		calculateArcLength(arc);
-	}
-}
-#endif
-
-/**************************************** SYMMETRY HANDLING ******************************************/
-
-void REEB_RadialSymmetry(BNode *root_node, RadialArc *ring, int count)
-{
-	ReebNode *node = (ReebNode *)root_node;
-	float axis[3];
-	int i;
-
-	copy_v3_v3(axis, root_node->symmetry_axis);
-
-	/* first pass, merge incrementally */
-	for (i = 0; i < count - 1; i++) {
-		ReebNode *node1, *node2;
-		ReebArc *arc1, *arc2;
-		float tangent[3];
-		float normal[3];
-		int j = i + 1;
-
-		add_v3_v3v3(tangent, ring[i].n, ring[j].n);
-		cross_v3_v3v3(normal, tangent, axis);
-
-		node1 = (ReebNode *)BLI_otherNode(ring[i].arc, root_node);
-		node2 = (ReebNode *)BLI_otherNode(ring[j].arc, root_node);
-
-		arc1 = (ReebArc *)ring[i].arc;
-		arc2 = (ReebArc *)ring[j].arc;
-
-		/* mirror first node and mix with the second */
-		BLI_mirrorAlongAxis(node1->p, root_node->p, normal);
-		interp_v3_v3v3(node2->p, node2->p, node1->p, 1.0f / (j + 1));
-
-		/* Merge buckets
-		 * there shouldn't be any null arcs here, but just to be safe
-		 * */
-		if (arc1->bcount > 0 && arc2->bcount > 0) {
-			ReebArcIterator arc_iter1, arc_iter2;
-			BArcIterator *iter1 = (BArcIterator *)&arc_iter1;
-			BArcIterator *iter2 = (BArcIterator *)&arc_iter2;
-			EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-
-			initArcIterator(iter1, arc1, (ReebNode *)root_node);
-			initArcIterator(iter2, arc2, (ReebNode *)root_node);
-
-			bucket1 = IT_next(iter1);
-			bucket2 = IT_next(iter2);
-
-			/* Make sure they both start at the same value */
-			while (bucket1 && bucket2 && bucket1->val < bucket2->val) {
-				bucket1 = IT_next(iter1);
-			}
-
-			while (bucket1 && bucket2 && bucket2->val < bucket1->val) {
-				bucket2 = IT_next(iter2);
-			}
-
-
-			for (; bucket1 && bucket2; bucket1 = IT_next(iter1), bucket2 = IT_next(iter2)) {
-				bucket2->nv += bucket1->nv; /* add counts */
-
-				/* mirror on axis */
-				BLI_mirrorAlongAxis(bucket1->p, root_node->p, normal);
-				/* add bucket2 in bucket1 */
-				interp_v3_v3v3(bucket2->p, bucket2->p, bucket1->p, (float)bucket1->nv / (float)(bucket2->nv));
-			}
-		}
-	}
-
-	/* second pass, mirror back on previous arcs */
-	for (i = count - 1; i > 0; i--) {
-		ReebNode *node1, *node2;
-		ReebArc *arc1, *arc2;
-		float tangent[3];
-		float normal[3];
-		int j = i - 1;
-
-		add_v3_v3v3(tangent, ring[i].n, ring[j].n);
-		cross_v3_v3v3(normal, tangent, axis);
-
-		node1 = (ReebNode *)BLI_otherNode(ring[i].arc, root_node);
-		node2 = (ReebNode *)BLI_otherNode(ring[j].arc, root_node);
-
-		arc1 = (ReebArc *)ring[i].arc;
-		arc2 = (ReebArc *)ring[j].arc;
-
-		/* copy first node than mirror */
-		copy_v3_v3(node2->p, node1->p);
-		BLI_mirrorAlongAxis(node2->p, root_node->p, normal);
-
-		/* Copy buckets
-		 * there shouldn't be any null arcs here, but just to be safe
-		 * */
-		if (arc1->bcount > 0 && arc2->bcount > 0) {
-			ReebArcIterator arc_iter1, arc_iter2;
-			BArcIterator *iter1 = (BArcIterator *)&arc_iter1;
-			BArcIterator *iter2 = (BArcIterator *)&arc_iter2;
-			EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-
-			initArcIterator(iter1, arc1, node);
-			initArcIterator(iter2, arc2, node);
-
-			bucket1 = IT_next(iter1);
-			bucket2 = IT_next(iter2);
-
-			/* Make sure they both start at the same value */
-			while (bucket1 && bucket1->val < bucket2->val) {
-				bucket1 = IT_next(iter1);
-			}
-
-			while (bucket2 && bucket2->val < bucket1->val) {
-				bucket2 = IT_next(iter2);
-			}
-
-
-			for (; bucket1 && bucket2; bucket1 = IT_next(iter1), bucket2 = IT_next(iter2)) {
-				/* copy and mirror back to bucket2 */
-				bucket2->nv = bucket1->nv;
-				copy_v3_v3(bucket2->p, bucket1->p);
-				BLI_mirrorAlongAxis(bucket2->p, node->p, normal);
-			}
-		}
-	}
-}
-
-void REEB_AxialSymmetry(BNode *root_node, BNode *node1, BNode *node2, struct BArc *barc1, BArc *barc2)
-{
-	ReebArc *arc1, *arc2;
-	float nor[3], p[3];
-
-	arc1 = (ReebArc *)barc1;
-	arc2 = (ReebArc *)barc2;
-
-	copy_v3_v3(nor, root_node->symmetry_axis);
-
-	/* mirror node2 along axis */
-	copy_v3_v3(p, node2->p);
-	BLI_mirrorAlongAxis(p, root_node->p, nor);
-
-	/* average with node1 */
-	add_v3_v3(node1->p, p);
-	mul_v3_fl(node1->p, 0.5f);
-
-	/* mirror back on node2 */
-	copy_v3_v3(node2->p, node1->p);
-	BLI_mirrorAlongAxis(node2->p, root_node->p, nor);
-
-	/* Merge buckets
-	 * there shouldn't be any null arcs here, but just to be safe
-	 * */
-	if (arc1->bcount > 0 && arc2->bcount > 0) {
-		ReebArcIterator arc_iter1, arc_iter2;
-		BArcIterator *iter1 = (BArcIterator *)&arc_iter1;
-		BArcIterator *iter2 = (BArcIterator *)&arc_iter2;
-		EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-
-		initArcIterator(iter1, arc1, (ReebNode *)root_node);
-		initArcIterator(iter2, arc2, (ReebNode *)root_node);
-
-		bucket1 = IT_next(iter1);
-		bucket2 = IT_next(iter2);
-
-		/* Make sure they both start at the same value */
-		while (bucket1 && bucket1->val < bucket2->val) {
-			bucket1 = IT_next(iter1);
-		}
-
-		while (bucket2 && bucket2->val < bucket1->val) {
-			bucket2 = IT_next(iter2);
-		}
-
-
-		for (; bucket1 && bucket2; bucket1 = IT_next(iter1), bucket2 = IT_next(iter2)) {
-			bucket1->nv += bucket2->nv; /* add counts */
-
-			/* mirror on axis */
-			BLI_mirrorAlongAxis(bucket2->p, root_node->p, nor);
-			/* add bucket2 in bucket1 */
-			interp_v3_v3v3(bucket1->p, bucket1->p, bucket2->p, (float)bucket2->nv / (float)(bucket1->nv));
-
-			/* copy and mirror back to bucket2 */
-			bucket2->nv = bucket1->nv;
-			copy_v3_v3(bucket2->p, bucket1->p);
-			BLI_mirrorAlongAxis(bucket2->p, root_node->p, nor);
-		}
-	}
-}
-
-/************************************** ADJACENCY LIST *************************************************/
-
-
-/****************************************** SMOOTHING **************************************************/
-
-#if 0 /* UNUSED */
-void postprocessGraph(ReebGraph *rg, char mode)
-{
-	ReebArc *arc;
-	float fac1 = 0, fac2 = 1, fac3 = 0;
-
-	switch (mode)
-	{
-		case SKGEN_AVERAGE:
-			fac1 = fac2 = fac3 = 1.0f / 3.0f;
-			break;
-		case SKGEN_SMOOTH:
-			fac1 = fac3 = 0.25f;
-			fac2 = 0.5f;
-			break;
-		case SKGEN_SHARPEN:
-			fac1 = fac3 = -0.25f;
-			fac2 = 1.5f;
-			break;
-		default:
-//		XXX
-//		error("Unknown post processing mode");
-			return;
-	}
-
-	for (arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		EmbedBucket *buckets = arc->buckets;
-		int bcount = arc->bcount;
-		int index;
-
-		for (index = 1; index < bcount - 1; index++)
-		{
-			interp_v3_v3v3(buckets[index].p, buckets[index].p, buckets[index - 1].p, fac1 / (fac1 + fac2));
-			interp_v3_v3v3(buckets[index].p, buckets[index].p, buckets[index + 1].p, fac3 / (fac1 + fac2 + fac3));
-		}
-	}
-}
-
-/********************************************SORTING****************************************************/
-
-static int compareNodesWeight(void *vnode1, void *vnode2)
-{
-	ReebNode *node1 = (ReebNode *)vnode1;
-	ReebNode *node2 = (ReebNode *)vnode2;
-
-	if (node1->weight < node2->weight)
-	{
-		return -1;
-	}
-	if (node1->weight > node2->weight)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-void sortNodes(ReebGraph *rg)
-{
-	BLI_listbase_sort(&rg->nodes, compareNodesWeight);
-}
-
-static int compareArcsWeight(void *varc1, void *varc2)
-{
-	ReebArc *arc1 = (ReebArc *)varc1;
-	ReebArc *arc2 = (ReebArc *)varc2;
-	ReebNode *node1 = (ReebNode *)arc1->head;
-	ReebNode *node2 = (ReebNode *)arc2->head;
-
-	if (node1->weight < node2->weight)
-	{
-		return -1;
-	}
-	if (node1->weight > node2->weight)
-	{
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-void sortArcs(ReebGraph *rg)
-{
-	BLI_listbase_sort(&rg->arcs, compareArcsWeight);
-}
-/******************************************* JOINING ***************************************************/
-
-static void reweightArc(ReebGraph *rg, ReebArc *arc, ReebNode *start_node, float start_weight)
-{
-	ReebNode *node;
-	float old_weight;
-	float end_weight = start_weight + ABS(arc->tail->weight - arc->head->weight);
-	int i;
-
-	node = (ReebNode *)BLI_otherNode((BArc *)arc, (BNode *)start_node);
-
-	/* prevent backtracking */
-	if (node->flag == 1)
-	{
-		return;
-	}
-
-	if (arc->tail == start_node)
-	{
-		flipArc(arc);
-	}
-
-	start_node->flag = 1;
-
-	for (i = 0; i < node->degree; i++)
-	{
-		ReebArc *next_arc = node->arcs[i];
-
-		reweightArc(rg, next_arc, node, end_weight);
-	}
-
-	/* update only if needed */
-	if (arc->head->weight != start_weight || arc->tail->weight != end_weight)
-	{
-		old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
-
-		arc->head->weight = start_weight;
-		arc->tail->weight = end_weight;
-
-		reweightBuckets(arc);
-		resizeArcBuckets(arc);
-		fillArcEmptyBuckets(arc);
-
-		arc->head->weight = old_weight;
-	}
-}
-
-static void reweightSubgraph(ReebGraph *rg, ReebNode *start_node, float start_weight)
-{
-	int i;
-
-	BLI_flagNodes((BGraph *)rg, 0);
-
-	for (i = 0; i < start_node->degree; i++)
-	{
-		ReebArc *next_arc = start_node->arcs[i];
-
-		reweightArc(rg, next_arc, start_node, start_weight);
-	}
-	start_node->weight = start_weight;
-}
-
-static int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
-{
-	int joined = 0;
-	int subgraph;
-
-	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
-	{
-		ReebNode *start_node, *end_node;
-		ReebNode *min_node_start = NULL, *min_node_end = NULL;
-		float min_distance = FLT_MAX;
-
-		for (start_node = rg->nodes.first; start_node; start_node = start_node->next)
-		{
-			if (start_node->subgraph_index == subgraph && start_node->degree == 1)
-			{
-
-				for (end_node = rg->nodes.first; end_node; end_node = end_node->next)
-				{
-					if (end_node->subgraph_index != subgraph)
-					{
-						float distance = len_v3v3(start_node->p, end_node->p);
-
-						if (distance < threshold && distance < min_distance)
-						{
-							min_distance = distance;
-							min_node_end = end_node;
-							min_node_start = start_node;
-						}
-					}
-				}
-			}
-		}
-
-		end_node = min_node_end;
-		start_node = min_node_start;
-
-		if (end_node && start_node)
-		{
-			ReebArc *start_arc /* , *end_arc */ /* UNUSED */;
-			int merging = 0;
-
-			start_arc = start_node->arcs[0];
-			/* end_arc = end_node->arcs[0]; */ /* UNUSED */
-
-			if (start_arc->tail == start_node)
-			{
-				reweightSubgraph(rg, end_node, start_node->weight);
-
-				start_arc->tail = end_node;
-
-				merging = 1;
-			}
-			else if (start_arc->head == start_node)
-			{
-				reweightSubgraph(rg, start_node, end_node->weight);
-
-				start_arc->head = end_node;
-
-				merging = 2;
-			}
-
-			if (merging)
-			{
-				BLI_ReflagSubgraph((BGraph *)rg, end_node->flag, subgraph);
-
-				resizeArcBuckets(start_arc);
-				fillArcEmptyBuckets(start_arc);
-
-				NodeDegreeIncrement(rg, end_node);
-				BLI_rebuildAdjacencyListForNode((BGraph *)rg, (BNode *)end_node);
-
-				BLI_removeNode((BGraph *)rg, (BNode *)start_node);
-			}
-
-			joined = 1;
-		}
-	}
-
-	return joined;
-}
-
-/* Reweight graph from smallest node, fix fliped arcs */
-static void fixSubgraphsOrientation(ReebGraph *rg, int nb_subgraphs)
-{
-	int subgraph;
-
-	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
-	{
-		ReebNode *node;
-		ReebNode *start_node = NULL;
-
-		for (node = rg->nodes.first; node; node = node->next)
-		{
-			if (node->subgraph_index == subgraph)
-			{
-				if (start_node == NULL || node->weight < start_node->weight)
-				{
-					start_node = node;
-				}
-			}
-		}
-
-		if (start_node)
-		{
-			reweightSubgraph(rg, start_node, start_node->weight);
-		}
-	}
-}
-
-static int joinSubgraphs(ReebGraph *rg, float threshold)
-{
-	int nb_subgraphs;
-	int joined = 0;
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	if (BLI_isGraphCyclic((BGraph *)rg)) {
-		/* don't deal with cyclic graphs YET */
-		return 0;
-	}
-
-	/* sort nodes before flagging subgraphs to make sure root node is subgraph 0 */
-	sortNodes(rg);
-
-	nb_subgraphs = BLI_FlagSubgraphs((BGraph *)rg);
-
-	/* Harmonic function can create flipped arcs, take the occasion to fix them */
-//	XXX
-//	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
-//	{
-	fixSubgraphsOrientation(rg, nb_subgraphs);
-//	}
-
-	if (nb_subgraphs > 1)
-	{
-		joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);
-
-		if (joined)
-		{
-			removeNormalNodes(rg);
-			BLI_buildAdjacencyList((BGraph *)rg);
-		}
-	}
-
-	return joined;
-}
-
-/****************************************** FILTERING **************************************************/
-
-static float lengthArc(ReebArc *arc)
-{
-#if 0
-	ReebNode *head = (ReebNode *)arc->head;
-	ReebNode *tail = (ReebNode *)arc->tail;
-
-	return tail->weight - head->weight;
-#else
-	return arc->length;
-#endif
-}
-
-static int compareArcs(void *varc1, void *varc2)
-{
-	ReebArc *arc1 = (ReebArc *)varc1;
-	ReebArc *arc2 = (ReebArc *)varc2;
-	float len1 = lengthArc(arc1);
-	float len2 = lengthArc(arc2);
-
-	if (len1 < len2) {
-		return -1;
-	}
-	if (len1 > len2) {
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-static void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc *srcArc, int merging)
-{
-	ReebArc *arc = NULL, *nextArc = NULL;
-
-	if (merging) {
-		/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
-		for (arc = rg->arcs.first; arc; arc = arc->next) {
-			if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc) {
-				ReebNode *head = srcArc->head;
-				ReebNode *tail = srcArc->tail;
-				mergeArcBuckets(srcArc, arc, head->weight, tail->weight);
-			}
-		}
-	}
-
-	/* second pass, replace removedNode by newNode, remove arcs that are collapsed in a loop */
-	arc = rg->arcs.first;
-	while (arc) {
-		nextArc = arc->next;
-
-		if (arc->head == removedNode || arc->tail == removedNode) {
-			if (arc->head == removedNode) {
-				arc->head = newNode;
-			}
-			else {
-				arc->tail = newNode;
-			}
-
-			// Remove looped arcs
-			if (arc->head == arc->tail) {
-				// v1 or v2 was already newNode, since we're removing an arc, decrement degree
-				NodeDegreeDecrement(rg, newNode);
-
-				// If it's srcArc, it'll be removed later, so keep it for now
-				if (arc != srcArc) {
-					BLI_remlink(&rg->arcs, arc);
-					REEB_freeArc((BArc *)arc);
-				}
-			}
-			else {
-				/* flip arcs that flipped, can happen on diamond shapes, mostly on null arcs */
-				if (arc->head->weight > arc->tail->weight) {
-					flipArc(arc);
-				}
-				//newNode->degree++; // incrementing degree since we're adding an arc
-				NodeDegreeIncrement(rg, newNode);
-				mergeArcFaces(rg, arc, srcArc);
-
-				if (merging) {
-					ReebNode *head = arc->head;
-					ReebNode *tail = arc->tail;
-
-					// resize bucket list
-					resizeArcBuckets(arc);
-					mergeArcBuckets(arc, srcArc, head->weight, tail->weight);
-
-					/* update length */
-					arc->length += srcArc->length;
-				}
-			}
-		}
-
-		arc = nextArc;
-	}
-}
-
-void filterNullReebGraph(ReebGraph *rg)
-{
-	ReebArc *arc = NULL, *nextArc = NULL;
-
-	arc = rg->arcs.first;
-	while (arc) {
-		nextArc = arc->next;
-		// Only collapse arcs too short to have any embed bucket
-		if (arc->bcount == 0) {
-			ReebNode *newNode = (ReebNode *)arc->head;
-			ReebNode *removedNode = (ReebNode *)arc->tail;
-			float blend;
-
-			blend = (float)newNode->degree / (float)(newNode->degree + removedNode->degree); // blending factors
-
-			interp_v3_v3v3(newNode->p, removedNode->p, newNode->p, blend);
-
-			filterArc(rg, newNode, removedNode, arc, 0);
-
-			// Reset nextArc, it might have changed
-			nextArc = arc->next;
-
-			BLI_remlink(&rg->arcs, arc);
-			REEB_freeArc((BArc *)arc);
-
-			BLI_removeNode((BGraph *)rg, (BNode *)removedNode);
-		}
-
-		arc = nextArc;
-	}
-}
-
-static int filterInternalExternalReebGraph(ReebGraph *rg, float threshold_internal, float threshold_external)
-{
-	ReebArc *arc = NULL, *nextArc = NULL;
-	int value = 0;
-
-	BLI_listbase_sort(&rg->arcs, compareArcs);
-
-	for (arc = rg->arcs.first; arc; arc = nextArc) {
-		nextArc = arc->next;
-
-		/* Only collapse non-terminal arcs that are shorter than threshold */
-		if ((threshold_internal > 0) &&
-		    (arc->head->degree > 1) &&
-		    (arc->tail->degree > 1) &&
-		    (lengthArc(arc) < threshold_internal))
-		{
-			ReebNode *newNode = NULL;
-			ReebNode *removedNode = NULL;
-
-			/* Always remove lower node, so arcs don't flip */
-			newNode = arc->head;
-			removedNode = arc->tail;
-
-			filterArc(rg, newNode, removedNode, arc, 1);
-
-			// Reset nextArc, it might have changed
-			nextArc = arc->next;
-
-			BLI_remlink(&rg->arcs, arc);
-			REEB_freeArc((BArc *)arc);
-
-			BLI_removeNode((BGraph *)rg, (BNode *)removedNode);
-			value = 1;
-		}
-
-		// Only collapse terminal arcs that are shorter than threshold
-		else if ((threshold_external > 0) &&
-		         (arc->head->degree == 1 || arc->tail->degree == 1) &&
-		         (lengthArc(arc) < threshold_external))
-		{
-			ReebNode *terminalNode = NULL;
-			ReebNode *middleNode = NULL;
-			ReebNode *removedNode = NULL;
-
-			// Assign terminal and middle nodes
-			if (arc->head->degree == 1) {
-				terminalNode = arc->head;
-				middleNode = arc->tail;
-			}
-			else {
-				terminalNode = arc->tail;
-				middleNode = arc->head;
-			}
-
-			if (middleNode->degree == 2 && middleNode != rg->nodes.first) {
-#if 1
-				// If middle node is a normal node, it will be removed later
-				// Only if middle node is not the root node
-				/* USE THIS IF YOU WANT TO PROLONG ARCS TO THEIR TERMINAL NODES
-				 * FOR HANDS, THIS IS NOT THE BEST RESULT
-				 * */
-				continue;
-#else
-				removedNode = terminalNode;
-
-				// removing arc, so we need to decrease the degree of the remaining node
-				NodeDegreeDecrement(rg, middleNode);
-#endif
-			}
-			// Otherwise, just plain remove of the arc
-			else {
-				removedNode = terminalNode;
-
-				// removing arc, so we need to decrease the degree of the remaining node
-				NodeDegreeDecrement(rg, middleNode);
-			}
-
-			// Reset nextArc, it might have changed
-			nextArc = arc->next;
-
-			BLI_remlink(&rg->arcs, arc);
-			REEB_freeArc((BArc *)arc);
-
-			BLI_removeNode((BGraph *)rg, (BNode *)removedNode);
-			value = 1;
-		}
-	}
-
-	return value;
-}
-
-static int filterCyclesReebGraph(ReebGraph *rg, float UNUSED(distance_threshold))
-{
-	ReebArc *arc1, *arc2;
-	ReebArc *next2;
-	int filtered = 0;
-
-	for (arc1 = rg->arcs.first; arc1; arc1 = arc1->next) {
-		for (arc2 = arc1->next; arc2; arc2 = next2) {
-			next2 = arc2->next;
-			if (arc1 != arc2 && arc1->head == arc2->head && arc1->tail == arc2->tail) {
-				mergeArcEdges(rg, arc1, arc2, MERGE_APPEND);
-				mergeArcFaces(rg, arc1, arc2);
-				mergeArcBuckets(arc1, arc2, arc1->head->weight, arc1->tail->weight);
-
-				NodeDegreeDecrement(rg, arc1->head);
-				NodeDegreeDecrement(rg, arc1->tail);
-
-				BLI_remlink(&rg->arcs, arc2);
-				REEB_freeArc((BArc *)arc2);
-
-				filtered = 1;
-			}
-		}
-	}
-
-	return filtered;
-}
-
-int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold))
-{
-	int value = 0;
-#if 0 //XXX
-	ReebArc *arc = NULL, *nextArc = NULL;
-
-	BLI_listbase_sort(&rg->arcs, compareArcs);
-
-#ifdef DEBUG_REEB
-	{
-		EditFace *efa;
-		for (efa = G.editMesh->faces.first; efa; efa = efa->next) {
-			efa->tmp.fp = -1;
-		}
-	}
-#endif
-
-	arc = rg->arcs.first;
-	while (arc)
-	{
-		nextArc = arc->next;
-
-		/* need correct normals and center */
-		recalc_editnormals();
-
-		// Only test terminal arcs
-		if (arc->head->degree == 1 || arc->tail->degree == 1)
-		{
-			GHashIterator ghi;
-			int merging = 0;
-			int total = BLI_ghash_len(arc->faces);
-			float avg_angle = 0;
-			float avg_vec[3] = {0, 0, 0};
-
-			for (BLI_ghashIterator_init(&ghi, arc->faces);
-			     BLI_ghashIterator_done(&ghi) == false;
-			     BLI_ghashIterator_step(&ghi))
-			{
-				EditFace *efa = BLI_ghashIterator_getValue(&ghi);
-
-#if 0
-				ReebArcIterator arc_iter;
-				BArcIterator *iter = (BArcIterator *)&arc_iter;
-				EmbedBucket *bucket = NULL;
-				EmbedBucket *previous = NULL;
-				float min_distance = -1;
-				float angle = 0;
-
-				initArcIterator(iter, arc, arc->head);
-
-				bucket = nextBucket(iter);
-
-				while (bucket != NULL)
-				{
-					float *vec0 = NULL;
-					float *vec1 = bucket->p;
-					float midpoint[3], tangent[3];
-					float distance;
-
-					/* first bucket. Previous is head */
-					if (previous == NULL)
-					{
-						vec0 = arc->head->p;
-					}
-					/* Previous is a valid bucket */
-					else {
-						vec0 = previous->p;
-					}
-
-					copy_v3_v3(midpoint, vec1);
-
-					distance = len_v3v3(midpoint, efa->cent);
-
-					if (min_distance == -1 || distance < min_distance)
-					{
-						min_distance = distance;
-
-						sub_v3_v3v3(tangent, vec1, vec0);
-						normalize_v3(tangent);
-
-						angle = dot_v3v3(tangent, efa->n);
-					}
-
-					previous = bucket;
-					bucket = nextBucket(iter);
-				}
-
-				avg_angle += saacos(fabs(angle));
-#ifdef DEBUG_REEB
-				efa->tmp.fp = saacos(fabs(angle));
-#endif
-#else
-				add_v3_v3(avg_vec, efa->n);
-#endif
-			}
-
-
-#if 0
-			avg_angle /= total;
-#else
-			mul_v3_fl(avg_vec, 1.0 / total);
-			avg_angle = dot_v3v3(avg_vec, avg_vec);
-#endif
-
-			arc->angle = avg_angle;
-
-			if (avg_angle > threshold)
-				merging = 1;
-
-			if (merging) {
-				ReebNode *terminalNode = NULL;
-				ReebNode *middleNode = NULL;
-				ReebNode *newNode = NULL;
-				ReebNode *removedNode = NULL;
-				int merging = 0;
-
-				/* Assign terminal and middle nodes */
-				if (arc->head->degree == 1) {
-					terminalNode = arc->head;
-					middleNode = arc->tail;
-				}
-				else {
-					terminalNode = arc->tail;
-					middleNode = arc->head;
-				}
-
-				/* If middle node is a normal node, merge to terminal node */
-				if (middleNode->degree == 2) {
-					merging = 1;
-					newNode = terminalNode;
-					removedNode = middleNode;
-				}
-				/* Otherwise, just plain remove of the arc */
-				else {
-					merging = 0;
-					newNode = middleNode;
-					removedNode = terminalNode;
-				}
-
-				/* Merging arc */
-				if (merging) {
-					filterArc(rg, newNode, removedNode, arc, 1);
-				}
-				else {
-					/* removing arc, so we need to decrease the degree of the remaining node
-					 *newNode->degree--; */
-					NodeDegreeDecrement(rg, newNode);
-				}
-
-				/* Reset nextArc, it might have changed */
-				nextArc = arc->next;
-
-				BLI_remlink(&rg->arcs, arc);
-				REEB_freeArc((BArc *)arc);
-
-				BLI_freelinkN(&rg->nodes, removedNode);
-				value = 1;
-			}
-		}
-
-		arc = nextArc;
-	}
-
-#endif
-
-	return value;
-}
-
-static void filterGraph(ReebGraph *rg, short options, float threshold_internal, float threshold_external)
-{
-	bool done = true;
-
-	calculateGraphLength(rg);
-
-	if ((options & SKGEN_FILTER_EXTERNAL) == 0) {
-		threshold_external = 0;
-	}
-
-	if ((options & SKGEN_FILTER_INTERNAL) == 0) {
-		threshold_internal = 0;
-	}
-
-	if (threshold_internal > 0 || threshold_external > 0) {
-		/* filter until there's nothing more to do */
-		while (done == true) {
-			done = false; /* no work done yet */
-
-			done = filterInternalExternalReebGraph(rg, threshold_internal, threshold_external);
-		}
-	}
-
-	if (options & SKGEN_FILTER_SMART) {
-		filterSmartReebGraph(rg, 0.5);
-		filterCyclesReebGraph(rg, 0.5);
-	}
-
-	repositionNodes(rg);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
-}
-
-static void finalizeGraph(ReebGraph *rg, char passes, char method)
-{
-	int i;
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	sortNodes(rg);
-
-	sortArcs(rg);
-
-	for (i = 0; i < passes; i++) {
-		postprocessGraph(rg, method);
-	}
-
-	extendGraphBuckets(rg);
-}
-
-/************************************** WEIGHT SPREADING ***********************************************/
-
-static int compareVerts(const void *a, const void *b)
-{
-	EditVert *va = *(EditVert **)a;
-	EditVert *vb = *(EditVert **)b;
-	int value = 0;
-
-	if (weightData(va) < weightData(vb)) {
-		value = -1;
-	}
-	else if (weightData(va) > weightData(vb)) {
-		value = 1;
-	}
-
-	return value;
-}
-
-static void spreadWeight(EditMesh *em)
-{
-	EditVert **verts, *eve;
-	float lastWeight = 0.0f;
-	int totvert = BLI_listbase_count(&em->verts);
-	int i;
-	int work_needed = 1;
-
-	verts = MEM_callocN(sizeof(EditVert *) * totvert, "verts array");
-
-	for (eve = em->verts.first, i = 0; eve; eve = eve->next, i++) {
-		verts[i] = eve;
-	}
-
-	while (work_needed == 1) {
-		work_needed = 0;
-		qsort(verts, totvert, sizeof(EditVert *), compareVerts);
-
-		for (i = 0; i < totvert; i++) {
-			eve = verts[i];
-
-			if (i == 0 || (weightData(eve) - lastWeight) > FLT_EPSILON) {
-				lastWeight = weightData(eve);
-			}
-			else {
-				work_needed = 1;
-				weightSetData(eve, lastWeight + FLT_EPSILON * 2);
-				lastWeight = weightData(eve);
-			}
-		}
-	}
-
-	MEM_freeN(verts);
-}
-
-/******************************************** EXPORT ***************************************************/
-
-static void exportNode(FILE *f, const char *text, ReebNode *node)
-{
-	fprintf(f, "%s i:%i w:%f d:%i %f %f %f\n", text, node->index, node->weight, node->degree, node->p[0], node->p[1], node->p[2]);
-}
-
-void REEB_exportGraph(ReebGraph *rg, int count)
-{
-	ReebArc *arc;
-	char filename[128];
-	FILE *f;
-
-	if (count == -1) {
-		strcpy(filename, "test.txt");
-	}
-	else {
-		sprintf(filename, "test%05i.txt", count);
-	}
-	f = BLI_fopen(filename, "w");
-
-	for (arc = rg->arcs.first; arc; arc = arc->next) {
-		int i;
-		float p[3];
-
-		exportNode(f, "v1", arc->head);
-
-		for (i = 0; i < arc->bcount; i++) {
-			fprintf(f, "b nv:%i %f %f %f\n", arc->buckets[i].nv, arc->buckets[i].p[0], arc->buckets[i].p[1], arc->buckets[i].p[2]);
-		}
-
-		add_v3_v3v3(p, arc->tail->p, arc->head->p);
-		mul_v3_fl(p, 0.5f);
-
-		fprintf(f, "angle %0.3f %0.3f %0.3f %0.3f %i\n", p[0], p[1], p[2], arc->angle, BLI_ghash_len(arc->faces));
-		exportNode(f, "v2", arc->tail);
-	}
-
-	fclose(f);
-}
-
-/***************************************** MAIN ALGORITHM **********************************************/
-
-/* edges alone will create zero degree nodes, use this function to remove them */
-static void removeZeroNodes(ReebGraph *rg)
-{
-	ReebNode *node, *next_node;
-
-	for (node = rg->nodes.first; node; node = next_node) {
-		next_node = node->next;
-
-		if (node->degree == 0) {
-			BLI_removeNode((BGraph *)rg, (BNode *)node);
-		}
-	}
-}
-
-void removeNormalNodes(ReebGraph *rg)
-{
-	ReebArc *arc, *nextArc;
-
-	// Merge degree 2 nodes
-	for (arc = rg->arcs.first; arc; arc = nextArc) {
-		nextArc = arc->next;
-
-		while (arc->head->degree == 2 || arc->tail->degree == 2) {
-			// merge at v1
-			if (arc->head->degree == 2) {
-				ReebArc *connectedArc = (ReebArc *)BLI_findConnectedArc((BGraph *)rg, (BArc *)arc, (BNode *)arc->head);
-
-				/* If arcs are one after the other */
-				if (arc->head == connectedArc->tail) {
-					/* remove furthest arc */
-					if (arc->tail->weight < connectedArc->head->weight) {
-						mergeConnectedArcs(rg, arc, connectedArc);
-						nextArc = arc->next;
-					}
-					else {
-						mergeConnectedArcs(rg, connectedArc, arc);
-						break; /* arc was removed, move to next */
-					}
-				}
-				/* Otherwise, arcs are side by side */
-				else {
-					/* Don't do anything, we need to keep the lowest node, even if degree 2 */
-					break;
-				}
-			}
-
-			/* merge at v2 */
-			if (arc->tail->degree == 2) {
-				ReebArc *connectedArc = (ReebArc *)BLI_findConnectedArc((BGraph *)rg, (BArc *)arc, (BNode *)arc->tail);
-
-				/* If arcs are one after the other */
-				if (arc->tail == connectedArc->head) {
-					/* remove furthest arc */
-					if (arc->head->weight < connectedArc->tail->weight) {
-						mergeConnectedArcs(rg, arc, connectedArc);
-						nextArc = arc->next;
-					}
-					else {
-						mergeConnectedArcs(rg, connectedArc, arc);
-						break; /* arc was removed, move to next */
-					}
-				}
-				/* Otherwise, arcs are side by side */
-				else {
-					/* Don't do anything, we need to keep the lowest node, even if degree 2 */
-					break;
-				}
-			}
-		}
-	}
-
-}
-
-static int edgeEquals(ReebEdge *e1, ReebEdge *e2)
-{
-	return (e1->v1 == e2->v1 && e1->v2 == e2->v2);
-}
-
-static ReebArc *nextArcMappedToEdge(ReebArc *arc, ReebEdge *e)
-{
-	ReebEdge *nextEdge = NULL;
-	ReebEdge *edge = NULL;
-	ReebArc *result = NULL;
-
-	/* Find the ReebEdge in the edge list */
-	for (edge = arc->edges.first; edge && !edgeEquals(edge, e); edge = edge->next) { }
-
-	nextEdge = edge->nextEdge;
-
-	if (nextEdge != NULL) {
-		result = nextEdge->arc;
-	}
-
-	return result;
-}
-
-void addFacetoArc(ReebArc *arc, EditFace *efa)
-{
-	BLI_ghash_insert(arc->faces, efa, efa);
-}
-
-void mergeArcFaces(ReebGraph *UNUSED(rg), ReebArc *aDst, ReebArc *aSrc)
-{
-	GHashIterator ghi;
-
-	for (BLI_ghashIterator_init(&ghi, aSrc->faces);
-	     BLI_ghashIterator_done(&ghi) == false;
-	     BLI_ghashIterator_step(&ghi))
-	{
-		EditFace *efa = BLI_ghashIterator_getValue(&ghi);
-		BLI_ghash_insert(aDst->faces, efa, efa);
-	}
-}
-
-void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
-{
-	ReebEdge *e = NULL;
-
-	if (direction == MERGE_APPEND) {
-		for (e = aSrc->edges.first; e; e = e->next) {
-			e->arc = aDst; // Edge is stolen by new arc
-		}
-
-		BLI_movelisttolist(&aDst->edges, &aSrc->edges);
-	}
-	else {
-		for (e = aSrc->edges.first; e; e = e->next) {
-			ReebEdge *newEdge = copyEdge(e);
-
-			newEdge->arc = aDst;
-
-			BLI_addtail(&aDst->edges, newEdge);
-
-			if (direction == MERGE_LOWER) {
-				void **p = BLI_edgehash_lookup_p(rg->emap, e->v1->index, e->v2->index);
-
-				newEdge->nextEdge = e;
-
-				// if edge was the first in the list, point the edit edge to the new reeb edge instead.
-				if (*p == e) {
-					*p = (void *)newEdge;
-				}
-				// otherwise, advance in the list until the predecessor is found then insert it there
-				else {
-					ReebEdge *previous = (ReebEdge *)*p;
-
-					while (previous->nextEdge != e) {
-						previous = previous->nextEdge;
-					}
-
-					previous->nextEdge = newEdge;
-				}
-			}
-			else {
-				newEdge->nextEdge = e->nextEdge;
-				e->nextEdge = newEdge;
-			}
-		}
-	}
-}
-
-// return 1 on full merge
-int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
-{
-	int result = 0;
-	ReebNode *removedNode = NULL;
-
-	a0->length += a1->length;
-
-	mergeArcEdges(rg, a0, a1, MERGE_APPEND);
-	mergeArcFaces(rg, a0, a1);
-
-	// Bring a0 to the combine length of both arcs
-	if (a0->tail == a1->head) {
-		removedNode = a0->tail;
-		a0->tail = a1->tail;
-	}
-	else if (a0->head == a1->tail) {
-		removedNode = a0->head;
-		a0->head = a1->head;
-	}
-
-	resizeArcBuckets(a0);
-	// Merge a1 in a0
-	mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
-
-	// remove a1 from graph
-	BLI_remlink(&rg->arcs, a1);
-	REEB_freeArc((BArc *)a1);
-
-	BLI_removeNode((BGraph *)rg, (BNode *)removedNode);
-	result = 1;
-
-	return result;
-}
-// return 1 on full merge
-int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
-{
-	int result = 0;
-	/* TRIANGLE POINTS DOWN */
-	if (a0->head->weight == a1->head->weight) { /* heads are the same */
-		if (a0->tail->weight == a1->tail->weight) { /* tails also the same, arcs can be totally merge together */
-			mergeArcEdges(rg, a0, a1, MERGE_APPEND);
-			mergeArcFaces(rg, a0, a1);
-
-			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
-
-			// Adjust node degree
-			//a1->head->degree--;
-			NodeDegreeDecrement(rg, a1->head);
-			//a1->tail->degree--;
-			NodeDegreeDecrement(rg, a1->tail);
-
-			// remove a1 from graph
-			BLI_remlink(&rg->arcs, a1);
-
-			REEB_freeArc((BArc *)a1);
-			result = 1;
-		}
-		else if (a0->tail->weight > a1->tail->weight) { /* a1->tail->weight is in the middle */
-			mergeArcEdges(rg, a1, a0, MERGE_LOWER);
-			mergeArcFaces(rg, a1, a0);
-
-			// Adjust node degree
-			//a0->head->degree--;
-			NodeDegreeDecrement(rg, a0->head);
-			//a1->tail->degree++;
-			NodeDegreeIncrement(rg, a1->tail);
-
-			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
-			a0->head = a1->tail;
-			resizeArcBuckets(a0);
-		}
-		else { /* a0>n2 is in the middle */
-			mergeArcEdges(rg, a0, a1, MERGE_LOWER);
-			mergeArcFaces(rg, a0, a1);
-
-			// Adjust node degree
-			//a1->head->degree--;
-			NodeDegreeDecrement(rg, a1->head);
-			//a0->tail->degree++;
-			NodeDegreeIncrement(rg, a0->tail);
-
-			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
-			a1->head = a0->tail;
-			resizeArcBuckets(a1);
-		}
-	}
-	/* TRIANGLE POINTS UP */
-	else if (a0->tail->weight == a1->tail->weight) { /* tails are the same */
-		if (a0->head->weight > a1->head->weight) { /* a0->head->weight is in the middle */
-			mergeArcEdges(rg, a0, a1, MERGE_HIGHER);
-			mergeArcFaces(rg, a0, a1);
-
-			// Adjust node degree
-			//a1->tail->degree--;
-			NodeDegreeDecrement(rg, a1->tail);
-			//a0->head->degree++;
-			NodeDegreeIncrement(rg, a0->head);
-
-			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
-			a1->tail = a0->head;
-			resizeArcBuckets(a1);
-		}
-		else { /* a1->head->weight is in the middle */
-			mergeArcEdges(rg, a1, a0, MERGE_HIGHER);
-			mergeArcFaces(rg, a1, a0);
-
-			// Adjust node degree
-			//a0->tail->degree--;
-			NodeDegreeDecrement(rg, a0->tail);
-			//a1->head->degree++;
-			NodeDegreeIncrement(rg, a1->head);
-
-			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
-			a0->tail = a1->head;
-			resizeArcBuckets(a0);
-		}
-	}
-	else {
-		/* Need something here (OR NOT) */
-	}
-
-	return result;
-}
-
-static void glueByMergeSort(ReebGraph *rg, ReebArc *a0, ReebArc *a1, ReebEdge *e0, ReebEdge *e1)
-{
-	int total = 0;
-	while (total == 0 && a0 != a1 && a0 != NULL && a1 != NULL) {
-		total = mergeArcs(rg, a0, a1);
-
-		if (total == 0) // if it wasn't a total merge, go forward {
-			if (a0->tail->weight < a1->tail->weight) {
-				a0 = nextArcMappedToEdge(a0, e0);
-			}
-			else {
-				a1 = nextArcMappedToEdge(a1, e1);
-			}
-		}
-	}
-}
-
-static void mergePaths(ReebGraph *rg, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
-{
-	ReebArc *a0, *a1, *a2;
-	a0 = e0->arc;
-	a1 = e1->arc;
-	a2 = e2->arc;
-
-	glueByMergeSort(rg, a0, a1, e0, e1);
-	glueByMergeSort(rg, a0, a2, e0, e2);
-}
-
-static ReebEdge *createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
-{
-	ReebEdge *edge;
-
-	edge = BLI_edgehash_lookup(rg->emap, node1->index, node2->index);
-
-	// Only add existing edges that haven't been added yet
-	if (edge == NULL) {
-		ReebArc *arc;
-		ReebNode *v1, *v2;
-		float len, offset;
-		int i;
-
-		arc = MEM_callocN(sizeof(ReebArc), "reeb arc");
-		edge = MEM_callocN(sizeof(ReebEdge), "reeb edge");
-
-		arc->flag = 0; // clear flag on init
-		arc->symmetry_level = 0;
-		arc->faces = BLI_ghash_ptr_new("createArc gh");
-
-		if (node1->weight <= node2->weight) {
-			v1 = node1;
-			v2 = node2;
-		}
-		else {
-			v1 = node2;
-			v2 = node1;
-		}
-
-		arc->head = v1;
-		arc->tail = v2;
-
-		// increase node degree
-		//v1->degree++;
-		NodeDegreeIncrement(rg, v1);
-		//v2->degree++;
-		NodeDegreeIncrement(rg, v2);
-
-		BLI_edgehash_insert(rg->emap, node1->index, node2->index, edge);
-
-		edge->arc = arc;
-		edge->nextEdge = NULL;
-		edge->v1 = v1;
-		edge->v2 = v2;
-
-		BLI_addtail(&rg->arcs, arc);
-		BLI_addtail(&arc->edges, edge);
-
-		/* adding buckets for embedding */
-		allocArcBuckets(arc);
-
-		offset = arc->head->weight;
-		len = arc->tail->weight - arc->head->weight;
-
-#if 0
-		/* This is the actual embedding filling described in the paper
-		 * the problem is that it only works with really dense meshes
-		 */
-		if (arc->bcount > 0)
-		{
-			addVertToBucket(&(arc->buckets[0]), arc->head->co);
-			addVertToBucket(&(arc->buckets[arc->bcount - 1]), arc->tail->co);
-		}
-#else
-		for (i = 0; i < arc->bcount; i++) {
-			float co[3];
-			float f = (arc->buckets[i].val - offset) / len;
-
-			interp_v3_v3v3(co, v1->p, v2->p, f);
-			addVertToBucket(&(arc->buckets[i]), co);
-		}
-#endif
-
-	}
-
-	return edge;
-}
-
-static void addTriangleToGraph(ReebGraph *rg, ReebNode *n1, ReebNode *n2, ReebNode *n3, EditFace *efa)
-{
-	ReebEdge *re1, *re2, *re3;
-	ReebEdge *e1, *e2, *e3;
-	float len1, len2, len3;
-
-	re1 = createArc(rg, n1, n2);
-	re2 = createArc(rg, n2, n3);
-	re3 = createArc(rg, n3, n1);
-
-	addFacetoArc(re1->arc, efa);
-	addFacetoArc(re2->arc, efa);
-	addFacetoArc(re3->arc, efa);
-
-	len1 = (float)fabs(n1->weight - n2->weight);
-	len2 = (float)fabs(n2->weight - n3->weight);
-	len3 = (float)fabs(n3->weight - n1->weight);
-
-	/* The rest of the algorithm assumes that e1 is the longest edge */
-
-	if (len1 >= len2 && len1 >= len3) {
-		e1 = re1;
-		e2 = re2;
-		e3 = re3;
-	}
-	else if (len2 >= len1 && len2 >= len3) {
-		e1 = re2;
-		e2 = re1;
-		e3 = re3;
-	}
-	else {
-		e1 = re3;
-		e2 = re2;
-		e3 = re1;
-	}
-
-	/* And e2 is the lowest edge
-	 * If e3 is lower than e2, swap them
-	 */
-	if (e3->v1->weight < e2->v1->weight) {
-		ReebEdge *etmp = e2;
-		e2 = e3;
-		e3 = etmp;
-	}
-
-
-	mergePaths(rg, e1, e2, e3);
-}
-
-ReebGraph *generateReebGraph(EditMesh *em, int subdivisions)
-{
-	ReebGraph *rg;
-	EditVert *eve;
-	EditFace *efa;
-	int index;
-	/*int totvert;*/
-
-#ifdef DEBUG_REEB
-	int totfaces;
-	int countfaces = 0;
-#endif
-
-	rg = newReebGraph();
-
-	rg->resolution = subdivisions;
-
-	/*totvert = BLI_listbase_count(&em->verts);*/ /*UNUSED*/
-#ifdef DEBUG_REEB
-	totfaces = BLI_listbase_count(&em->faces);
-#endif
-
-	renormalizeWeight(em, 1.0f);
-
-	/* Spread weight to minimize errors */
-	spreadWeight(em);
-
-	renormalizeWeight(em, (float)rg->resolution);
-
-	/* Adding vertice */
-	for (index = 0, eve = em->verts.first; eve; eve = eve->next) {
-		if (eve->h == 0) {
-			addNode(rg, eve);
-			eve->f2 = 0;
-			index++;
-		}
-	}
-
-	/* Adding face, edge per edge */
-	for (efa = em->faces.first; efa; efa = efa->next) {
-		if (efa->h == 0) {
-			ReebNode *n1, *n2, *n3;
-
-			n1 = nodeData(efa->v1);
-			n2 = nodeData(efa->v2);
-			n3 = nodeData(efa->v3);
-
-			addTriangleToGraph(rg, n1, n2, n3, efa);
-
-			if (efa->v4) {
-				ReebNode *n4 = nodeData(efa->v4);
-				addTriangleToGraph(rg, n1, n3, n4, efa);
-			}
-#ifdef DEBUG_REEB
-			countfaces++;
-			if (countfaces % 100 == 0) {
-				printf("\rface %i of %i", countfaces, totfaces);
-			}
-#endif
-		}
-	}
-
-	printf("\n");
-
-	removeZeroNodes(rg);
-
-	removeNormalNodes(rg);
-
-	return rg;
-}
-
-/***************************************** WEIGHT UTILS **********************************************/
-
-void renormalizeWeight(EditMesh *em, float newmax)
-{
-	EditVert *eve;
-	float minimum, maximum, range;
-
-	if (em == NULL || BLI_listbase_is_empty(&em->verts))
-		return;
-
-	/* First pass, determine maximum and minimum */
-	eve = em->verts.first;
-	minimum = weightData(eve);
-	maximum = minimum;
-	for (; eve; eve = eve->next) {
-		maximum = MAX2(maximum, weightData(eve));
-		minimum = MIN2(minimum, weightData(eve));
-	}
-
-	range = maximum - minimum;
-
-	/* Normalize weights */
-	for (eve = em->verts.first; eve; eve = eve->next) {
-		float weight = (weightData(eve) - minimum) / range * newmax;
-		weightSetData(eve, weight);
-	}
-}
-
-
-int weightFromLoc(EditMesh *em, int axis)
-{
-	EditVert *eve;
-
-	if (em == NULL || BLI_listbase_is_empty(&em->verts) || axis < 0 || axis > 2)
-		return 0;
-
-	/* Copy coordinate in weight */
-	for (eve = em->verts.first; eve; eve = eve->next) {
-		weightSetData(eve, eve->co[axis]);
-	}
-
-	return 1;
-}
-
-static void addTriangle(LinearSolver *context, EditVert *v1, EditVert *v2, EditVert *v3, int e1, int e2, int e3)
-{
-	/* Angle opposite e1 */
-	float t1 = cotangent_tri_weight_v3(v1->co, v2->co, v3->co) / e2;
-
-	/* Angle opposite e2 */
-	float t2 = cotangent_tri_weight_v3(v2->co, v3->co, v1->co) / e3;
-
-	/* Angle opposite e3 */
-	float t3 = cotangent_tri_weight_v3(v3->co, v1->co, v2->co) / e1;
-
-	int i1 = indexData(v1);
-	int i2 = indexData(v2);
-	int i3 = indexData(v3);
-
-	EIG_linear_solver_matrix_add(context, i1, i1, t2 + t3);
-	EIG_linear_solver_matrix_add(context, i2, i2, t1 + t3);
-	EIG_linear_solver_matrix_add(context, i3, i3, t1 + t2);
-
-	EIG_linear_solver_matrix_add(context, i1, i2, -t3);
-	EIG_linear_solver_matrix_add(context, i2, i1, -t3);
-
-	EIG_linear_solver_matrix_add(context, i2, i3, -t1);
-	EIG_linear_solver_matrix_add(context, i3, i2, -t1);
-
-	EIG_linear_solver_matrix_add(context, i3, i1, -t2);
-	EIG_linear_solver_matrix_add(context, i1, i3, -t2);
-}
-
-int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
-{
-	LinearSolver *context;
-	NLboolean success;
-	EditVert *eve;
-	EditEdge *eed;
-	EditFace *efa;
-	int totvert = 0;
-	int index;
-	int rval;
-
-	/* Find local extrema */
-	for (eve = em->verts.first; eve; eve = eve->next) {
-		totvert++;
-	}
-
-	/* Solve */
-
-	context = EIG_linear_solver_new(, 0, totvert, 1);
-
-	/* Find local extrema */
-	for (index = 0, eve = em->verts.first; eve; index++, eve = eve->next) {
-		if (eve->h == 0) {
-			EditEdge *eed;
-			int maximum = 1;
-			int minimum = 1;
-
-			NextEdgeForVert(indexed_edges, -1); /* Reset next edge */
-			for (eed = NextEdgeForVert(indexed_edges, index); eed && (maximum || minimum); eed = NextEdgeForVert(indexed_edges, index)) {
-				EditVert *eve2;
-
-				if (eed->v1 == eve) {
-					eve2 = eed->v2;
-				}
-				else {
-					eve2 = eed->v1;
-				}
-
-				if (eve2->h == 0) {
-					/* Adjacent vertex is bigger, not a local maximum */
-					if (weightData(eve2) > weightData(eve)) {
-						maximum = 0;
-					}
-					/* Adjacent vertex is smaller, not a local minimum */
-					else if (weightData(eve2) < weightData(eve)) {
-						minimum = 0;
-					}
-				}
-			}
-
-			if (maximum || minimum) {
-				float w = weightData(eve);
-				eve->f1 = 0;
-				EIG_linear_solver_variable_set(context, 0, index, w);
-				EIG_linear_solver_variable_lock(context, index);
-			}
-			else {
-				eve->f1 = 1;
-			}
-		}
-	}
-
-	/* Zero edge weight */
-	for (eed = em->edges.first; eed; eed = eed->next) {
-		eed->tmp.l = 0;
-	}
-
-	/* Add faces count to the edge weight */
-	for (efa = em->faces.first; efa; efa = efa->next) {
-		if (efa->h == 0) {
-			efa->e1->tmp.l++;
-			efa->e2->tmp.l++;
-			efa->e3->tmp.l++;
-
-			if (efa->e4) {
-				efa->e4->tmp.l++;
-			}
-		}
-	}
-
-	/* Add faces angle to the edge weight */
-	for (efa = em->faces.first; efa; efa = efa->next) {
-		if (efa->h == 0) {
-			if (efa->v4 == NULL) {
-				addTriangle(context, efa->v1, efa->v2, efa->v3, efa->e1->tmp.l, efa->e2->tmp.l, efa->e3->tmp.l);
-			}
-			else {
-				addTriangle(context, efa->v1, efa->v2, efa->v3, efa->e1->tmp.l, efa->e2->tmp.l, 2);
-				addTriangle(context, efa->v3, efa->v4, efa->v1, efa->e3->tmp.l, efa->e4->tmp.l, 2);
-			}
-		}
-	}
-
-	success = EIG_linear_solver_solve(context);
-
-	if (success) {
-		rval = 1;
-		for (index = 0, eve = em->verts.first; eve; index++, eve = eve->next) {
-			weightSetData(eve, EIG_linear_solver_variable_get(context, 0, index));
-		}
-	}
-	else {
-		rval = 0;
-	}
-
-	EIG_linear_solver_delete(context);
-
-	return rval;
-}
-
-
-EditEdge *NextEdgeForVert(EdgeIndex *indexed_edges, int index)
-{
-	static int offset = -1;
-
-	/* Reset method, call with NULL mesh pointer */
-	if (index == -1) {
-		offset = -1;
-		return NULL;
-	}
-
-	/* first pass, start at the head of the list */
-	if (offset == -1) {
-		offset = indexed_edges->offset[index];
-	}
-	/* subsequent passes, start on the next edge */
-	else {
-		offset++;
-	}
-
-	return indexed_edges->edges[offset];
-}
-
-static void shortestPathsFromVert(EditMesh *em, EditVert *starting_vert, EdgeIndex *indexed_edges)
-{
-	Heap     *edge_heap;
-	EditVert *current_eve = NULL;
-	EditEdge *eed = NULL;
-	EditEdge *select_eed = NULL;
-
-	edge_heap = BLI_heap_new();
-
-	current_eve = starting_vert;
-
-	/* insert guard in heap, when that is returned, no more edges */
-	BLI_heap_insert(edge_heap, FLT_MAX, NULL);
-
-	/* Initialize edge flag */
-	for (eed = em->edges.first; eed; eed = eed->next) {
-		eed->f1 = 0;
-	}
-
-	while (BLI_heap_len(edge_heap) > 0) {
-		float current_weight;
-
-		current_eve->f1 = 1; /* mark vertex as selected */
-
-		/* Add all new edges connected to current_eve to the list */
-		NextEdgeForVert(indexed_edges, -1); // Reset next edge
-		for (eed = NextEdgeForVert(indexed_edges, indexData(current_eve)); eed; eed = NextEdgeForVert(indexed_edges, indexData(current_eve))) {
-			if (eed->f1 == 0) {
-				BLI_heap_insert(edge_heap, weightData(current_eve) + eed->tmp.fp, eed);
-				eed->f1 = 1;
-			}
-		}
-
-		/* Find next shortest edge with unselected verts */
-		do {
-			current_weight = BLI_heap_node_value(BLI_heap_top(edge_heap));
-			select_eed = BLI_heap_pop_min(edge_heap);
-		} while (select_eed != NULL && select_eed->v1->f1 != 0 && select_eed->v2->f1);
-
-		if (select_eed != NULL) {
-			select_eed->f1 = 2;
-
-			if (select_eed->v1->f1 == 0) /* v1 is the new vertex */ {
-				current_eve = select_eed->v1;
-			}
-			else { /* otherwise, it's v2 */
-				current_eve = select_eed->v2;
-			}
-
-			weightSetData(current_eve, current_weight);
-		}
-	}
-
-	BLI_heap_free(edge_heap, NULL);
-}
-
-static void freeEdgeIndex(EdgeIndex *indexed_edges)
-{
-	MEM_freeN(indexed_edges->offset);
-	MEM_freeN(indexed_edges->edges);
-}
-
-static void buildIndexedEdges(EditMesh *em, EdgeIndex *indexed_edges)
-{
-	EditVert *eve;
-	EditEdge *eed;
-	int totvert = 0;
-	int tot_indexed = 0;
-	int offset = 0;
-
-	totvert = BLI_listbase_count(&em->verts);
-
-	indexed_edges->offset = MEM_callocN(totvert * sizeof(int), "EdgeIndex offset");
-
-	for (eed = em->edges.first; eed; eed = eed->next) {
-		if (eed->v1->h == 0 && eed->v2->h == 0) {
-			tot_indexed += 2;
-			indexed_edges->offset[indexData(eed->v1)]++;
-			indexed_edges->offset[indexData(eed->v2)]++;
-		}
-	}
-
-	tot_indexed += totvert;
-
-	indexed_edges->edges = MEM_callocN(tot_indexed * sizeof(EditEdge *), "EdgeIndex edges");
-
-	/* setting vert offsets */
-	for (eve = em->verts.first; eve; eve = eve->next) {
-		if (eve->h == 0) {
-			int d = indexed_edges->offset[indexData(eve)];
-			indexed_edges->offset[indexData(eve)] = offset;
-			offset += d + 1;
-		}
-	}
-
-	/* adding edges in array */
-	for (eed = em->edges.first; eed; eed = eed->next) {
-		if (eed->v1->h == 0 && eed->v2->h == 0) {
-			int i;
-			for (i = indexed_edges->offset[indexData(eed->v1)]; i < tot_indexed; i++) {
-				if (indexed_edges->edges[i] == NULL) {
-					indexed_edges->edges[i] = eed;
-					break;
-				}
-			}
-
-			for (i = indexed_edges->offset[indexData(eed->v2)]; i < tot_indexed; i++) {
-				if (indexed_edges->edges[i] == NULL) {
-					indexed_edges->edges[i] = eed;
-					break;
-				}
-			}
-		}
-	}
-}
-
-int weightFromDistance(EditMesh *em, EdgeIndex *indexed_edges)
-{
-	EditVert *eve;
-	int totedge = 0;
-	int totvert = 0;
-	int vCount = 0;
-
-	totvert = BLI_listbase_count(&em->verts);
-
-	if (em == NULL || totvert == 0) {
-		return 0;
-	}
-
-	totedge = BLI_listbase_count(&em->edges);
-
-	if (totedge == 0) {
-		return 0;
-	}
-
-	/* Initialize vertice flag and find at least one selected vertex */
-	for (eve = em->verts.first; eve; eve = eve->next) {
-		eve->f1 = 0;
-		if (eve->f & SELECT) {
-			vCount = 1;
-		}
-	}
-
-	if (vCount == 0) {
-		return 0; /* no selected vert, failure */
-	}
-	else {
-		EditEdge *eed;
-		int allDone = 0;
-
-		/* Calculate edge weight */
-		for (eed = em->edges.first; eed; eed = eed->next) {
-			if (eed->v1->h == 0 && eed->v2->h == 0) {
-				eed->tmp.fp = len_v3v3(eed->v1->co, eed->v2->co);
-			}
-		}
-
-		/* Apply dijkstra spf for each selected vert */
-		for (eve = em->verts.first; eve; eve = eve->next) {
-			if (eve->f & SELECT) {
-				shortestPathsFromVert(em, eve, indexed_edges);
-			}
-		}
-
-		/* connect unselected islands */
-		while (allDone == 0) {
-			EditVert *selected_eve = NULL;
-			float selected_weight = 0;
-			float min_distance = FLT_MAX;
-
-			allDone = 1;
-
-			for (eve = em->verts.first; eve; eve = eve->next) {
-				/* for every vertex visible that hasn't been processed yet */
-				if (eve->h == 0 && eve->f1 != 1) {
-					EditVert *closest_eve;
-
-					/* find the closest processed vertex */
-					for (closest_eve = em->verts.first; closest_eve; closest_eve = closest_eve->next) {
-						/* vertex is already processed and distance is smaller than current minimum */
-						if (closest_eve->f1 == 1) {
-							float distance = len_v3v3(closest_eve->co, eve->co);
-							if (distance < min_distance) {
-								min_distance = distance;
-								selected_eve = eve;
-								selected_weight = weightData(closest_eve);
-							}
-						}
-					}
-				}
-			}
-
-			if (selected_eve) {
-				allDone = 0;
-
-				weightSetData(selected_eve, selected_weight + min_distance);
-				shortestPathsFromVert(em, selected_eve, indexed_edges);
-			}
-		}
-	}
-
-	for (eve = em->verts.first; eve && vCount == 0; eve = eve->next) {
-		if (eve->f1 == 0) {
-			printf("vertex not reached\n");
-			break;
-		}
-	}
-
-	return 1;
-}
-#endif
-
-/****************************************** BUCKET ITERATOR **************************************************/
-
-static void *headNode(void *arg);
-static void *tailNode(void *arg);
-static void *nextBucket(void *arg);
-static void *nextNBucket(void *arg, int n);
-static void *peekBucket(void *arg, int n);
-static void *previousBucket(void *arg);
-static int   iteratorStopped(void *arg);
-
-static void initIteratorFct(ReebArcIterator *iter)
-{
-	iter->head = headNode;
-	iter->tail = tailNode;
-	iter->peek = peekBucket;
-	iter->next = nextBucket;
-	iter->nextN = nextNBucket;
-	iter->previous = previousBucket;
-	iter->stopped = iteratorStopped;
-}
-
-static void setIteratorValues(ReebArcIterator *iter, EmbedBucket *bucket)
-{
-	if (bucket) {
-		iter->p = bucket->p;
-		iter->no = bucket->no;
-	}
-	else {
-		iter->p = NULL;
-		iter->no = NULL;
-	}
-	iter->size = 0;
-}
-
-void initArcIterator(BArcIterator *arg, ReebArc *arc, ReebNode *head)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-
-	initIteratorFct(iter);
-	iter->arc = arc;
-
-	if (head == arc->head) {
-		iter->start = 0;
-		iter->end = arc->bcount - 1;
-		iter->stride = 1;
-	}
-	else {
-		iter->start = arc->bcount - 1;
-		iter->end = 0;
-		iter->stride = -1;
-	}
-
-	iter->length = arc->bcount;
-
-	iter->index = -1;
-}
-
-void initArcIteratorStart(BArcIterator *arg, struct ReebArc *arc, struct ReebNode *head, int start)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-
-	initIteratorFct(iter);
-	iter->arc = arc;
-
-	if (head == arc->head) {
-		iter->start = start;
-		iter->end = arc->bcount - 1;
-		iter->stride = 1;
-	}
-	else {
-		iter->start = arc->bcount - 1 - start;
-		iter->end = 0;
-		iter->stride = -1;
-	}
-
-	iter->index = -1;
-
-	iter->length = arc->bcount - start;
-
-	if (start >= arc->bcount) {
-		iter->start = iter->end; /* stop iterator since it's past its end */
-	}
-}
-
-void initArcIterator2(BArcIterator *arg, ReebArc *arc, int start, int end)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-
-	initIteratorFct(iter);
-	iter->arc = arc;
-
-	iter->start = start;
-	iter->end = end;
-
-	if (end > start) {
-		iter->stride = 1;
-	}
-	else {
-		iter->stride = -1;
-	}
-
-	iter->index = -1;
-
-	iter->length = abs(iter->end - iter->start) + 1;
-}
-
-static void *headNode(void *arg)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	ReebNode *node;
-
-	if (iter->start < iter->end) {
-		node = iter->arc->head;
-	}
-	else {
-		node = iter->arc->tail;
-	}
-
-	iter->p = node->p;
-	iter->no = node->no;
-	iter->size = 0;
-
-	return node;
-}
-
-static void *tailNode(void *arg)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	ReebNode *node;
-
-	if (iter->start < iter->end) {
-		node = iter->arc->tail;
-	}
-	else {
-		node = iter->arc->head;
-	}
-
-	iter->p = node->p;
-	iter->no = node->no;
-	iter->size = 0;
-
-	return node;
-}
-
-static void *nextBucket(void *arg)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	EmbedBucket *result = NULL;
-
-	iter->index++;
-
-	if (iter->index < iter->length) {
-		result = &(iter->arc->buckets[iter->start + (iter->stride * iter->index)]);
-	}
-
-	setIteratorValues(iter, result);
-	return result;
-}
-
-static void *nextNBucket(void *arg, int n)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	EmbedBucket *result = NULL;
-
-	iter->index += n;
-
-	/* check if passed end */
-	if (iter->index < iter->length) {
-		result = &(iter->arc->buckets[iter->start + (iter->stride * iter->index)]);
-	}
-
-	setIteratorValues(iter, result);
-	return result;
-}
-
-static void *peekBucket(void *arg, int n)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	EmbedBucket *result = NULL;
-	int index = iter->index + n;
-
-	/* check if passed end */
-	if (index < iter->length) {
-		result = &(iter->arc->buckets[iter->start + (iter->stride * index)]);
-	}
-
-	setIteratorValues(iter, result);
-	return result;
-}
-
-static void *previousBucket(void *arg)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-	EmbedBucket *result = NULL;
-
-	if (iter->index > 0) {
-		iter->index--;
-		result = &(iter->arc->buckets[iter->start + (iter->stride * iter->index)]);
-	}
-
-	setIteratorValues(iter, result);
-	return result;
-}
-
-static int iteratorStopped(void *arg)
-{
-	ReebArcIterator *iter = (ReebArcIterator *)arg;
-
-	if (iter->index >= iter->length) {
-		return 1;
-	}
-	else {
-		return 0;
-	}
-}
-
-/************************ PUBLIC FUNCTIONS *********************************************/
-
-ReebGraph *BIF_ReebGraphMultiFromEditMesh(bContext *C)
-{
-	(void)C;
-	return NULL;
-#if 0
-	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	EditMesh *em = BKE_mesh_get_editmesh(((Mesh *)obedit->data));
-	EdgeIndex indexed_edges;
-	VertexData *data;
-	ReebGraph *rg = NULL;
-	ReebGraph *rgi, *previous;
-	int i, nb_levels = REEB_MAX_MULTI_LEVEL;
-
-	if (em == NULL)
-		return NULL;
-
-	data = allocVertexData(em);
-
-	buildIndexedEdges(em, &indexed_edges);
-
-	if (weightFromDistance(em, &indexed_edges) == 0)
-	{
-		// XXX error("No selected vertex\n");
-		freeEdgeIndex(&indexed_edges);
-		return NULL;
-	}
-
-	renormalizeWeight(em, 1.0f);
-
-	if (scene->toolsettings->skgen_options & SKGEN_HARMONIC)
-	{
-		weightToHarmonic(em, &indexed_edges);
-	}
-
-	freeEdgeIndex(&indexed_edges);
-
-	rg = generateReebGraph(em, scene->toolsettings->skgen_resolution);
-
-	/* Remove arcs without embedding */
-	filterNullReebGraph(rg);
-
-	/* smart filter and loop filter on basic level */
-	filterGraph(rg, SKGEN_FILTER_SMART, 0, 0);
-
-	repositionNodes(rg);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
-
-	joinSubgraphs(rg, 1.0);
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	/* calc length before copy, so we have same length on all levels */
-	BLI_calcGraphLength((BGraph *)rg);
-
-	previous = NULL;
-	for (i = 0; i <= nb_levels; i++)
-	{
-		rgi = rg;
-
-		/* don't filter last level */
-		if (i > 0)
-		{
-			float internal_threshold;
-			float external_threshold;
-
-			/* filter internal progressively in second half only*/
-			if (i > nb_levels / 2)
-			{
-				internal_threshold = rg->length * scene->toolsettings->skgen_threshold_internal;
-			}
-			else {
-				internal_threshold = rg->length * scene->toolsettings->skgen_threshold_internal * (2 * i / (float)nb_levels);
-			}
-
-			external_threshold = rg->length * scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
-
-			filterGraph(rgi, scene->toolsettings->skgen_options, internal_threshold, external_threshold);
-		}
-
-		if (i < nb_levels)
-		{
-			rg = copyReebGraph(rgi, i + 1);
-		}
-
-		finalizeGraph(rgi, scene->toolsettings->skgen_postpro_passes, scene->toolsettings->skgen_postpro);
-
-		BLI_markdownSymmetry((BGraph *)rgi, rgi->nodes.first, scene->toolsettings->skgen_symmetry_limit);
-
-		if (previous != NULL)
-		{
-			relinkNodes(rgi, previous);
-		}
-		previous = rgi;
-	}
-
-	verifyMultiResolutionLinks(rg, 0);
-
-	MEM_freeN(data);
-
-	/* no need to load the editmesh back into the object, just
-	 * free it (avoids ngon conversion issues too going back the other way) */
-	free_editMesh(em);
-	MEM_freeN(em);
-
-	return rg;
-#endif
-}
-
-#if 0
-
-ReebGraph *BIF_ReebGraphFromEditMesh(void)
-{
-	EditMesh *em = G.editMesh;
-	EdgeIndex indexed_edges;
-	VertexData *data;
-	ReebGraph *rg = NULL;
-
-	if (em == NULL)
-		return NULL;
-
-	data = allocVertexData(em);
-
-	buildIndexedEdges(em, &indexed_edges);
-
-	if (weightFromDistance(em, &indexed_edges) == 0)
-	{
-		error("No selected vertex\n");
-		freeEdgeIndex(&indexed_edges);
-		freeEdgeIndex(&indexed_edges);
-		return NULL;
-	}
-
-	renormalizeWeight(em, 1.0f);
-
-	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
-	{
-		weightToHarmonic(em, &indexed_edges);
-	}
-
-	freeEdgeIndex(&indexed_edges);
-
-#ifdef DEBUG_REEB
-//	weightToVCol(em, 1);
-#endif
-
-	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
-
-
-	/* Remove arcs without embedding */
-	filterNullReebGraph(rg);
-
-	/* smart filter and loop filter on basic level */
-	filterGraph(rg, SKGEN_FILTER_SMART, 0, 0);
-
-	repositionNodes(rg);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
-
-	joinSubgraphs(rg, 1.0);
-
-	BLI_buildAdjacencyList((BGraph *)rg);
-
-	/* calc length before copy, so we have same length on all levels */
-	BLI_calcGraphLength((BGraph *)rg);
-
-	filterGraph(rg, G.scene->toolsettings->skgen_options, G.scene->toolsettings->skgen_threshold_internal, G.scene->toolsettings->skgen_threshold_external);
-
-	finalizeGraph(rg, G.scene->toolsettings->skgen_postpro_passes, G.scene->toolsettings->skgen_postpro);
-
-#ifdef DEBUG_REEB
-	REEB_exportGraph(rg, -1);
-
-	arcToVCol(rg, em, 0);
-	//angleToVCol(em, 1);
-#endif
-
-	printf("DONE\n");
-	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph *)rg));
-
-	MEM_freeN(data);
-
-	return rg;
-}
-
-void BIF_GlobalReebFree()
-{
-	if (GLOBAL_RG != NULL)
-	{
-		REEB_freeGraph(GLOBAL_RG);
-		GLOBAL_RG = NULL;
-	}
-}
-
-void BIF_GlobalReebGraphFromEditMesh(void)
-{
-	ReebGraph *rg;
-
-	BIF_GlobalReebFree();
-
-	rg = BIF_ReebGraphMultiFromEditMesh();
-
-	GLOBAL_RG = rg;
-}
-
-void REEB_draw()
-{
-	ReebGraph *rg;
-	ReebArc *arc;
-	int i = 0;
-
-	if (GLOBAL_RG == NULL)
-	{
-		return;
-	}
-
-	if (GLOBAL_RG->link_up && G.scene->toolsettings->skgen_options & SKGEN_DISP_ORIG)
-	{
-		for (rg = GLOBAL_RG; rg->link_up; rg = rg->link_up) ;
-	}
-	else {
-		i = G.scene->toolsettings->skgen_multi_level;
-
-		for (rg = GLOBAL_RG; rg->multi_level != i && rg->link_up; rg = rg->link_up) ;
-	}
-
-	glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));
-
-	glDisable(GL_DEPTH_TEST);
-	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
-	{
-		ReebArcIterator arc_iter;
-		BArcIterator *iter = (BArcIterator *)&arc_iter;
-		float vec[3];
-		char text[128];
-		char *s = text;
-
-		glLineWidth(BIF_GetThemeValuef(TH_VERTEX_SIZE) + 2);
-		glColor3f(0, 0, 0);
-		glBegin(GL_LINE_STRIP);
-		glVertex3fv(arc->head->p);
-
-		if (arc->bcount)
-		{
-			initArcIterator(iter, arc, arc->head);
-			for (IT_next(iter); IT_stopped(iter) == 0; IT_next(iter))
-			{
-				glVertex3fv(iter->p);
-			}
-		}
-
-		glVertex3fv(arc->tail->p);
-		glEnd();
-
-		glLineWidth(BIF_GetThemeValuef(TH_VERTEX_SIZE));
-
-		if (arc->symmetry_level == 1)
-		{
-			glColor3f(1, 0, 0);
-		}
-		else if (arc->symmetry_flag == SYM_SIDE_POSITIVE || arc->symmetry_flag == SYM_SIDE_NEGATIVE)
-		{
-			glColor3f(1, 0.5f, 0);
-		}
-		else if (arc->symmetry_flag >= SYM_SIDE_RADIAL)
-		{
-			glColor3f(0.5f, 1, 0);
-		}
-		else {
-			glColor3f(1, 1, 0);
-		}
-		glBegin(GL_LINE_STRIP);
-		glVertex3fv(arc->head->p);
-
-		if (arc->bcount)
-		{
-			initArcIterator(iter, arc, arc->head);
-			for (iter->next(iter); IT_stopped(iter) == 0; iter->next(iter))
-			{
-				glVertex3fv(iter->p);
-			}
-		}
-
-		glVertex3fv(arc->tail->p);
-		glEnd();
-
-
-		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_EMBED)
-		{
-			glColor3f(1, 1, 1);
-			glBegin(GL_POINTS);
-			glVertex3fv(arc->head->p);
-			glVertex3fv(arc->tail->p);
-
-			glColor3f(0.5f, 0.5f, 1);
-			if (arc->bcount)
-			{
-				initArcIterator(iter, arc, arc->head);
-				for (iter->next(iter); IT_stopped(iter) == 0; iter->next(iter))
-				{
-					glVertex3fv(iter->p);
-				}
-			}
-			glEnd();
-		}
-
-		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_INDEX)
-		{
-			mid_v3_v3v3(vec, arc->head->p, arc->tail->p);
-			s += sprintf(s, "%i (%i-%i-%i) ", i, arc->symmetry_level, arc->symmetry_flag, arc->symmetry_group);
-
-			if (G.scene->toolsettings->skgen_options & SKGEN_DISP_WEIGHT)
-			{
-				s += sprintf(s, "w:%0.3f ", arc->tail->weight - arc->head->weight);
-			}
-
-			if (G.scene->toolsettings->skgen_options & SKGEN_DISP_LENGTH)
-			{
-				s += sprintf(s, "l:%0.3f", arc->length);
-			}
-
-			glColor3f(0, 1, 0);
-			glRasterPos3fv(vec);
-			BMF_DrawString(G.fonts, text);
-		}
-
-		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_INDEX)
-		{
-			sprintf(text, "  %i", arc->head->index);
-			glRasterPos3fv(arc->head->p);
-			BMF_DrawString(G.fonts, text);
-
-			sprintf(text, "  %i", arc->tail->index);
-			glRasterPos3fv(arc->tail->p);
-			BMF_DrawString(G.fonts, text);
-		}
-	}
-	glEnable(GL_DEPTH_TEST);
-}
-
-#endif
diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h
deleted file mode 100644
index 9eed343f18a..00000000000
--- a/source/blender/editors/armature/reeb.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Martin Poirier
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/armature/reeb.h
- *  \ingroup edarmature
- */
-
-
-#ifndef __REEB_H__
-#define __REEB_H__
-
-#define WITH_BF_REEB
-
-#include "DNA_listBase.h"
-
-#include "BLI_graph.h"
-
-struct GHash;
-struct EdgeHash;
-struct ReebArc;
-struct ReebEdge;
-struct ReebNode;
-
-typedef struct ReebGraph {
-	ListBase arcs;
-	ListBase nodes;
-
-	float length;
-
-	FreeArc         free_arc;
-	FreeNode        free_node;
-	RadialSymmetry  radial_symmetry;
-	AxialSymmetry   axial_symmetry;
-	/*********************************/
-
-	int resolution;
-	int totnodes;
-	struct EdgeHash *emap;
-	int multi_level;
-	struct ReebGraph *link_up; /* for multi resolution filtering, points to higher levels */
-} ReebGraph;
-
-typedef struct EmbedBucket {
-	float val;
-	int nv;
-	float p[3];
-	float no[3]; /* if non-null, normal of the bucket */
-} EmbedBucket;
-
-typedef struct ReebNode {
-	void *next, *prev;
-	float p[3];
-	int flag;
-
-	int degree;
-	struct ReebArc **arcs;
-
-	int subgraph_index;
-
-	int symmetry_level;
-	int symmetry_flag;
-	float symmetry_axis[3];
-	/*********************************/
-
-	float no[3];
-
-	int index;
-	float weight;
-	int multi_level;
-	struct ReebNode *link_down; /* for multi resolution filtering, points to lower levels, if present */
-	struct ReebNode *link_up;
-} ReebNode;
-
-typedef struct ReebEdge {
-	struct ReebEdge *next, *prev;
-	struct ReebArc  *arc;
-	struct ReebNode *v1, *v2;
-	struct ReebEdge *nextEdge;
-	int flag;
-} ReebEdge;
-
-typedef struct ReebArc {
-	void *next, *prev;
-	struct ReebNode *head, *tail;
-	int flag;
-
-	float length;
-
-	int symmetry_level;
-	int symmetry_group;
-	int symmetry_flag;
-	/*********************************/
-
-	ListBase edges;
-	int bcount;
-	struct EmbedBucket *buckets;
-
-	struct GHash *faces;
-	float angle;
-	struct ReebArc *link_up; /* for multi resolution filtering, points to higher levels */
-} ReebArc;
-
-typedef struct ReebArcIterator {
-	HeadFct      head;
-	TailFct      tail;
-	PeekFct      peek;
-	NextFct      next;
-	NextNFct     nextN;
-	PreviousFct  previous;
-	StoppedFct   stopped;
-
-	float *p, *no;
-	float size;
-
-	int length;
-	int index;
-	/*********************************/
-	struct ReebArc *arc;
-	int start;
-	int end;
-	int stride;
-} ReebArcIterator;
-
-#if 0
-struct EditMesh;
-struct EdgeIndex;
-
-int weightToHarmonic(struct EditMesh *em, struct EdgeIndex *indexed_edges);
-int weightFromDistance(struct EditMesh *em, struct EdgeIndex *indexed_edges);
-int weightFromLoc(struct EditMesh *me, int axis);
-//void weightToVCol(struct EditMesh *em, int index);
-void arcToVCol(struct ReebGraph *rg, struct EditMesh *em, int index);
-//void angleToVCol(struct EditMesh *em, int index);
-void renormalizeWeight(struct EditMesh *em, float newmax);
-
-ReebGraph *generateReebGraph(struct EditMesh *me, int subdivisions);
-#endif
-
-ReebGraph *newReebGraph(void);
-
-void initArcIterator(BArcIterator *iter, struct ReebArc *arc, struct ReebNode *head);
-void initArcIterator2(BArcIterator *iter, struct ReebArc *arc, int start, int end);
-void initArcIteratorStart(BArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
-
-/* Filtering */
-void filterNullReebGraph(ReebGraph *rg);
-int filterSmartReebGraph(ReebGraph *rg, float threshold);
-
-/* Post-Build processing */
-void repositionNodes(ReebGraph *rg);
-void postprocessGraph(ReebGraph *rg, char mode);
-void removeNormalNodes(ReebGraph *rg);
-
-void sortNodes(ReebGraph *rg);
-void sortArcs(ReebGraph *rg);
-
-/*------------ Sanity check ------------*/
-void verifyBuckets(ReebGraph *rg);
-void verifyFaces(ReebGraph *rg);
-void verifyArcs(ReebGraph *rg);
-void verifyNodeDegree(ReebGraph *rg);
-
-/*********************** PUBLIC *********************************/
-
-#define REEB_MAX_MULTI_LEVEL  10
-
-struct bContext;
-
-ReebGraph *BIF_ReebGraphFromEditMesh(void);
-ReebGraph *BIF_ReebGraphMultiFromEditMesh(struct bContext *C);
-void BIF_flagMultiArcs(ReebGraph *rg, int flag);
-
-void BIF_GlobalReebGraphFromEditMesh(void);
-void BIF_GlobalReebFree(void);
-
-ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node);
-ReebNode *BIF_NodeFromIndex(ReebArc *arc, ReebNode *node);
-ReebNode *BIF_lowestLevelNode(ReebNode *node);
-
-ReebGraph *BIF_graphForMultiNode(ReebGraph *rg, ReebNode *node);
-
-void REEB_freeGraph(ReebGraph *rg);
-void REEB_freeArc(BArc *barc);
-void REEB_exportGraph(ReebGraph *rg, int count);
-void REEB_draw(void);
-
-
-#endif /*__REEB_H__*/
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 13f12f62d95..301d333ebdb 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -23,10 +23,12 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
 	../../windowmanager
+	../../../../intern/clog
 	../../../../intern/guardedalloc
 	../../../../intern/glew-mx
 	../../../../extern/curve_fit_nd
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 139034a22d5..ab6586d2ab6 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -45,11 +45,11 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_displist.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
@@ -57,6 +57,9 @@
 #include "BKE_action.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -1278,6 +1281,7 @@ static int separate_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *oldob, *newob;
 	Base *oldbase, *newbase;
 	Curve *oldcu, *newcu;
@@ -1305,8 +1309,8 @@ static int separate_exec(bContext *C, wmOperator *op)
 	}
 
 	/* 2. duplicate the object and data */
-	newbase = ED_object_add_duplicate(bmain, scene, oldbase, 0); /* 0 = fully linked */
-	DAG_relations_tag_update(bmain);
+	newbase = ED_object_add_duplicate(bmain, scene, view_layer, oldbase, 0); /* 0 = fully linked */
+	DEG_relations_tag_update(bmain);
 
 	newob = newbase->object;
 	newcu = newob->data = BKE_curve_copy(bmain, oldcu);
@@ -1325,8 +1329,8 @@ static int separate_exec(bContext *C, wmOperator *op)
 	ED_curve_editnurb_free(newob);
 	curve_delete_segments(oldob, true);
 
-	DAG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
-	DAG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
+	DEG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
+	DEG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, oldob->data);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, newob);
@@ -1374,7 +1378,7 @@ static int curve_split_exec(bContext *C, wmOperator *op)
 			WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 	else {
 		BKE_report(op->reports, RPT_ERROR, "Cannot split current selection");
@@ -2320,7 +2324,7 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
 	if (ED_curve_updateAnimPaths(obedit->data))
 		WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -2368,7 +2372,7 @@ static int set_goal_weight_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -2421,7 +2425,7 @@ static int set_radius_exec(bContext *C, wmOperator *op)
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -2573,7 +2577,7 @@ static int smooth_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -2764,7 +2768,7 @@ static int curve_smooth_weight_exec(bContext *C, wmOperator *UNUSED(op))
 	curve_smooth_value(editnurb, offsetof(BezTriple, weight), offsetof(BPoint, weight));
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -2792,7 +2796,7 @@ static int curve_smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
 	curve_smooth_value(editnurb, offsetof(BezTriple, radius), offsetof(BPoint, radius));
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -2820,7 +2824,7 @@ static int curve_smooth_tilt_exec(bContext *C, wmOperator *UNUSED(op))
 	curve_smooth_value(editnurb, offsetof(BezTriple, alfa), offsetof(BPoint, alfa));
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -2892,7 +2896,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	BKE_curve_nurb_vert_active_validate(obedit->data);
 
@@ -2955,7 +2959,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -3367,16 +3371,29 @@ static void subdividenurb(Object *obedit, int number_cuts)
 
 static int subdivide_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	int number_cuts = RNA_int_get(op->ptr, "number_cuts");
+	const int number_cuts = RNA_int_get(op->ptr, "number_cuts");
 
-	subdividenurb(obedit, number_cuts);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if (ED_curve_updateAnimPaths(obedit->data))
-		WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Curve *cu = obedit->data;
 
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+		if (!ED_curve_select_check(cu, cu->editnurb)) {
+			continue;
+		}
+
+		subdividenurb(obedit, number_cuts);
+
+		if (ED_curve_updateAnimPaths(cu))
+			WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, cu);
+		DEG_id_tag_update(obedit->data, 0);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -3571,7 +3588,7 @@ static int set_spline_type_exec(bContext *C, wmOperator *op)
 		if (ED_curve_updateAnimPaths(obedit->data))
 			WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 		if (changed_size) {
@@ -3625,7 +3642,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
 	BKE_nurbList_handles_set(editnurb, RNA_enum_get(op->ptr, "type"));
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -3670,7 +3687,7 @@ static int curve_normals_make_consistent_exec(bContext *C, wmOperator *op)
 	BKE_nurbList_handles_recalculate(editnurb, calc_length, SELECT);
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -4058,7 +4075,7 @@ static int merge_nurb(bContext *C, wmOperator *op)
 	BKE_curve_nurb_active_set(obedit->data, NULL);
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -4265,7 +4282,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 		WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -4509,7 +4526,7 @@ static int spin_exec(bContext *C, wmOperator *op)
 		WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -4524,7 +4541,7 @@ static int spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)
 	if (rv3d)
 		copy_v3_v3(axis, rv3d->viewinv[2]);
 
-	RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d));
+	RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d)->location);
 	RNA_float_set_array(op->ptr, "axis", axis);
 
 	return spin_exec(C, op);
@@ -4964,7 +4981,7 @@ static int add_vertex_exec(bContext *C, wmOperator *op)
 		}
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -5000,7 +5017,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 			mul_v3_m4v3(location, vc.obedit->obmat, bp->vec);
 		}
 		else {
-			copy_v3_v3(location, ED_view3d_cursor3d_get(vc.scene, vc.v3d));
+			copy_v3_v3(location, ED_view3d_cursor3d_get(vc.scene, vc.v3d)->location);
 		}
 
 		ED_view3d_win_to_3d_int(vc.v3d, vc.ar, location, event->mval, location);
@@ -5009,17 +5026,16 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 			const float mval[2] = {UNPACK2(event->mval)};
 
 			struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
-			        CTX_data_main(C), vc.scene, 0,
-			        vc.ar, vc.v3d);
+			        vc.scene, CTX_data_depsgraph(C), 0, vc.ar, vc.v3d);
 
-			ED_transform_snap_object_project_view3d_mixed(
+			ED_transform_snap_object_project_view3d(
 			        snap_context,
-			        SCE_SELECT_FACE,
+			        SCE_SNAP_MODE_FACE,
 			        &(const struct SnapObjectParams){
-			            .snap_select = (vc.scene->obedit != NULL) ? SNAP_NOT_ACTIVE : SNAP_ALL,
+			            .snap_select = (vc.obedit != NULL) ? SNAP_NOT_ACTIVE : SNAP_ALL,
 			            .use_object_edit_cage = false,
 			        },
-			        mval, NULL, true,
+			        mval, NULL,
 			        location, NULL);
 
 
@@ -5119,7 +5135,7 @@ static int curve_extrude_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -5218,7 +5234,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -5736,7 +5752,7 @@ static int curve_delete_exec(bContext *C, wmOperator *op)
 		if (ED_curve_updateAnimPaths(obedit->data)) WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 
 		return retval;
 	}
@@ -5880,7 +5896,7 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op))
 		if (ED_curve_updateAnimPaths(obedit->data)) WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -5956,7 +5972,7 @@ static int curve_decimate_exec(bContext *C, wmOperator *op)
 		}
 
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -6001,7 +6017,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -6115,7 +6131,7 @@ int join_curve_exec(bContext *C, wmOperator *op)
 					}
 				}
 
-				ED_base_object_free_and_unlink(bmain, scene, base);
+				ED_object_base_free_and_unlink(bmain, scene, base->object);
 			}
 		}
 	}
@@ -6129,9 +6145,9 @@ int join_curve_exec(bContext *C, wmOperator *op)
 		BKE_curve_curve_dimension_update(cu);
 	}
 
-	DAG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
+	DEG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
@@ -6171,7 +6187,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -6234,6 +6250,7 @@ static int match_texture_space_poll(bContext *C)
 
 static int match_texture_space_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *object = CTX_data_active_object(C);
 	Curve *curve = (Curve *) object->data;
@@ -6241,7 +6258,7 @@ static int match_texture_space_exec(bContext *C, wmOperator *UNUSED(op))
 	int a;
 
 	if (object->curve_cache == NULL) {
-		BKE_displist_make_curveTypes(scene, object, false);
+		BKE_displist_make_curveTypes(depsgraph, scene, object, false);
 	}
 
 	INIT_MINMAX(min, max);
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c
index a91b58f1e65..7f788b447f6 100644
--- a/source/blender/editors/curve/editcurve_add.c
+++ b/source/blender/editors/curve/editcurve_add.c
@@ -42,9 +42,10 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_library.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "WM_api.h"
@@ -502,7 +503,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
 				cu->flag |= CU_PATH | CU_3D;
 		}
 		else {
-			DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 		}
 	}
 	else { /* adding surface */
@@ -512,7 +513,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
 			newob = true;
 		}
 		else {
-			DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 		}
 	}
 
diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c
index 964296df205..e6f5f82f96a 100644
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@ -33,10 +33,11 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -46,7 +47,11 @@
 #include "ED_curve.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
+
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "curve_intern.h"
 
@@ -88,6 +93,8 @@ struct StrokeElem {
 };
 
 struct CurveDrawData {
+	Depsgraph *depsgraph;
+
 	short init_event_type;
 	short curve_type;
 
@@ -128,7 +135,6 @@ struct CurveDrawData {
 	} prev;
 
 	ViewContext vc;
-	bglMats mats;
 	enum {
 		CURVE_DRAW_IDLE = 0,
 		CURVE_DRAW_PAINTING = 1,
@@ -195,7 +201,7 @@ static bool stroke_elem_project(
 	if (cdd->project.use_plane) {
 		/* get the view vector to 'location' */
 		float ray_origin[3], ray_direction[3];
-		ED_view3d_win_to_ray(cdd->vc.ar, v3d, mval_fl, ray_origin, ray_direction, false);
+		ED_view3d_win_to_ray(cdd->depsgraph, cdd->vc.ar, v3d, mval_fl, ray_origin, ray_direction, false);
 
 		float lambda;
 		if (isect_ray_plane_v3(ray_origin, ray_direction, cdd->project.plane, &lambda, true)) {
@@ -214,7 +220,7 @@ static bool stroke_elem_project(
 		{
 			const double depth = (double)ED_view3d_depth_read_cached(&cdd->vc, mval_i);
 			if ((depth > depths->depth_range[0]) && (depth < depths->depth_range[1])) {
-				if (ED_view3d_depth_unproject(ar, &cdd->mats, mval_i, depth, r_location_world)) {
+				if (ED_view3d_depth_unproject(ar, mval_i, depth, r_location_world)) {
 					is_location_world_set = true;
 					if (r_normal_world) {
 						zero_v3(r_normal_world);
@@ -223,7 +229,7 @@ static bool stroke_elem_project(
 					if (surface_offset != 0.0f) {
 						const float offset = cdd->project.use_surface_offset_absolute ? 1.0f : radius;
 						float normal[3];
-						if (ED_view3d_depth_read_cached_normal(&cdd->vc, &cdd->mats, mval_i, normal)) {
+						if (ED_view3d_depth_read_cached_normal(&cdd->vc, mval_i, normal)) {
 							madd_v3_v3fl(r_location_world, normal, offset * surface_offset);
 							if (r_normal_world) {
 								copy_v3_v3(r_normal_world, normal);
@@ -369,39 +375,43 @@ static void curve_draw_stroke_3d(const struct bContext *UNUSED(C), ARegion *UNUS
 	Object *obedit = cdd->vc.obedit;
 	Curve *cu = obedit->data;
 
-	UI_ThemeColor(TH_WIRE);
-
 	if (cu->ext2 > 0.0f) {
-		GLUquadricObj *qobj = gluNewQuadric();
-
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-
 		BLI_mempool_iter iter;
 		const struct StrokeElem *selem;
 
 		const float  location_zero[3] = {0};
 		const float *location_prev = location_zero;
 
+		float color[3];
+		UI_GetThemeColor3fv(TH_WIRE, color);
+
+		Gwn_Batch *sphere = GPU_batch_preset_sphere(0);
+		GWN_batch_program_set_builtin(sphere, GPU_SHADER_3D_UNIFORM_COLOR);
+		GWN_batch_uniform_3fv(sphere, "color", color);
+
 		/* scale to edit-mode space */
-		glPushMatrix();
-		glMultMatrixf(obedit->obmat);
+		gpuPushMatrix();
+		gpuMultMatrix(obedit->obmat);
 
 		BLI_mempool_iternew(cdd->stroke_elem_pool, &iter);
 		for (selem = BLI_mempool_iterstep(&iter); selem; selem = BLI_mempool_iterstep(&iter)) {
-			glTranslatef(
+			gpuTranslate3f(
 			        selem->location_local[0] - location_prev[0],
 			        selem->location_local[1] - location_prev[1],
 			        selem->location_local[2] - location_prev[2]);
 			location_prev = selem->location_local;
+
 			const float radius = stroke_elem_radius(cdd, selem);
-			gluSphere(qobj, radius, 12, 8);
+
+			gpuPushMatrix();
+			gpuScaleUniform(radius);
+			GWN_batch_draw(sphere);
+			gpuPopMatrix();
 
 			location_prev = selem->location_local;
 		}
 
-		glPopMatrix();
-
-		gluDeleteQuadric(qobj);
+		gpuPopMatrix();
 	}
 
 	if (stroke_len > 1) {
@@ -418,30 +428,45 @@ static void curve_draw_stroke_3d(const struct bContext *UNUSED(C), ARegion *UNUS
 		}
 
 		{
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
 			glEnable(GL_BLEND);
 			glEnable(GL_LINE_SMOOTH);
 
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(3, GL_FLOAT, 0, coord_array);
-
-			cpack(0x0);
+			imm_cpack(0x0);
+			immBegin(GWN_PRIM_LINE_STRIP, stroke_len);
 			glLineWidth(3.0f);
-			glDrawArrays(GL_LINE_STRIP, 0, stroke_len);
 
-			if (v3d->zbuf)
+			if (v3d->zbuf) {
 				glDisable(GL_DEPTH_TEST);
+			}
+
+			for (int i = 0; i < stroke_len; i++) {
+				immVertex3fv(pos, coord_array[i]);
+			}
+
+			immEnd();
 
-			cpack(0xffffffff);
+			imm_cpack(0xffffffff);
+			immBegin(GWN_PRIM_LINE_STRIP, stroke_len);
 			glLineWidth(1.0f);
-			glDrawArrays(GL_LINE_STRIP, 0, stroke_len);
 
-			if (v3d->zbuf)
-				glEnable(GL_DEPTH_TEST);
+			for (int i = 0; i < stroke_len; i++) {
+				immVertex3fv(pos, coord_array[i]);
+			}
 
-			glDisableClientState(GL_VERTEX_ARRAY);
+			immEnd();
+
+			if (v3d->zbuf) {
+				glEnable(GL_DEPTH_TEST);
+			}
 
 			glDisable(GL_BLEND);
 			glDisable(GL_LINE_SMOOTH);
+
+			immUnbindProgram();
 		}
 
 		MEM_freeN(coord_array);
@@ -531,7 +556,7 @@ static void curve_draw_event_add_first(wmOperator *op, const wmEvent *event)
 		         CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW,
 		         CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE))
 		{
-			if (ED_view3d_depth_read_cached_normal(&cdd->vc, &cdd->mats, event->mval, normal)) {
+			if (ED_view3d_depth_read_cached_normal(&cdd->vc, event->mval, normal)) {
 				if (cps->surface_plane == CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW) {
 					float cross_a[3], cross_b[3];
 					cross_v3_v3v3(cross_a, rv3d->viewinv[2], normal);
@@ -580,6 +605,8 @@ static bool curve_draw_init(bContext *C, wmOperator *op, bool is_invoke)
 
 	struct CurveDrawData *cdd = MEM_callocN(sizeof(*cdd), __func__);
 
+	cdd->depsgraph = CTX_data_depsgraph(C);
+
 	if (is_invoke) {
 		ED_view3d_viewcontext_init(C, &cdd->vc);
 		if (ELEM(NULL, cdd->vc.ar, cdd->vc.rv3d, cdd->vc.v3d, cdd->vc.win, cdd->vc.scene)) {
@@ -589,7 +616,9 @@ static bool curve_draw_init(bContext *C, wmOperator *op, bool is_invoke)
 		}
 	}
 	else {
+		cdd->vc.depsgraph = CTX_data_depsgraph(C);
 		cdd->vc.scene = CTX_data_scene(C);
+		cdd->vc.view_layer = CTX_data_view_layer(C);
 		cdd->vc.obedit = CTX_data_edit_object(C);
 	}
 
@@ -682,7 +711,7 @@ static void curve_draw_exec_precalc(wmOperator *op)
 			const struct StrokeElem *selem, *selem_first, *selem_last;
 
 			BLI_mempool_iternew(cdd->stroke_elem_pool, &iter);
-			selem_first = BLI_mempool_iterstep(&iter);
+			selem_first = selem_last = BLI_mempool_iterstep(&iter);
 			for (selem = BLI_mempool_iterstep(&iter); selem; selem = BLI_mempool_iterstep(&iter)) {
 				selem_last = selem;
 			}
@@ -759,7 +788,7 @@ static int curve_draw_exec(bContext *C, wmOperator *op)
 	struct CurveDrawData *cdd = op->customdata;
 
 	const CurvePaintSettings *cps = &cdd->vc.scene->toolsettings->curve_paint_settings;
-	Object *obedit = cdd->vc.scene->obedit;
+	Object *obedit = cdd->vc.obedit;
 	Curve *cu = obedit->data;
 	ListBase *nurblist = object_editcurve_get(obedit);
 
@@ -1018,7 +1047,7 @@ static int curve_draw_exec(bContext *C, wmOperator *op)
 	cu->actvert = nu->pntsu - 1;
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	curve_draw_exit(op);
 
@@ -1073,12 +1102,10 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 			if ((cps->depth_mode == CURVE_PAINT_PROJECT_SURFACE) &&
 			    (v3d->drawtype > OB_WIRE))
 			{
-				view3d_get_transformation(cdd->vc.ar, cdd->vc.rv3d, NULL, &cdd->mats);
-
 				/* needed or else the draw matrix can be incorrect */
 				view3d_operator_needs_opengl(C);
 
-				ED_view3d_autodist_init(cdd->vc.scene, cdd->vc.ar, cdd->vc.v3d, 0);
+				ED_view3d_autodist_init(cdd->vc.depsgraph, cdd->vc.ar, cdd->vc.v3d, 0);
 
 				if (cdd->vc.rv3d->depths) {
 					cdd->vc.rv3d->depths->damaged = true;
@@ -1097,7 +1124,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 			/* use view plane (when set or as fallback when surface can't be found) */
 			if (cdd->project.use_depth == false) {
-				plane_co = ED_view3d_cursor3d_get(cdd->vc.scene, v3d);
+				plane_co = ED_view3d_cursor3d_get(cdd->vc.scene, v3d)->location;
 				plane_no = rv3d->viewinv[2];
 				cdd->project.use_plane = true;
 			}
diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index 673faa37f2a..58fb6d50575 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -42,6 +42,7 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_fcurve.h"
+#include "BKE_layer.h"
 #include "BKE_report.h"
 
 #include "WM_api.h"
@@ -452,32 +453,46 @@ void CURVE_OT_de_select_last(wmOperatorType *ot)
 
 static int de_select_all_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Curve *cu = obedit->data;
 	int action = RNA_enum_get(op->ptr, "action");
 
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
 	if (action == SEL_TOGGLE) {
 		action = SEL_SELECT;
-		if (ED_curve_select_check(cu, cu->editnurb)) {
-			action = SEL_DESELECT;
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *obedit = objects[ob_index];
+			Curve *cu = obedit->data;
+
+			if (ED_curve_select_check(cu, cu->editnurb)) {
+				action = SEL_DESELECT;
+				break;
+			}
 		}
 	}
 
-	switch (action) {
-		case SEL_SELECT:
-			ED_curve_select_all(cu->editnurb);
-			break;
-		case SEL_DESELECT:
-			ED_curve_deselect_all(cu->editnurb);
-			break;
-		case SEL_INVERT:
-			ED_curve_select_swap(cu->editnurb, (cu->drawflag & CU_HIDE_HANDLES) != 0);
-			break;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Curve *cu = obedit->data;
+
+		switch (action) {
+			case SEL_SELECT:
+				ED_curve_select_all(cu->editnurb);
+				break;
+			case SEL_DESELECT:
+				ED_curve_deselect_all(cu->editnurb);
+				break;
+			case SEL_INVERT:
+				ED_curve_select_swap(cu->editnurb, (cu->drawflag & CU_HIDE_HANDLES) != 0);
+				break;
+		}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
-	BKE_curve_nurb_vert_active_validate(cu);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		BKE_curve_nurb_vert_active_validate(cu);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -505,19 +520,30 @@ void CURVE_OT_select_all(wmOperatorType *ot)
 
 static int select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Curve *cu = (Curve *)obedit->data;
-	EditNurb *editnurb = cu->editnurb;
-	ListBase *nurbs = &editnurb->nurbs;
-	Nurb *nu;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Curve *cu = obedit->data;
+		EditNurb *editnurb = cu->editnurb;
+		ListBase *nurbs = &editnurb->nurbs;
+		Nurb *nu;
+		bool changed = false;
+
+		for (nu = nurbs->first; nu; nu = nu->next) {
+			if (ED_curve_nurb_select_check(cu, nu)) {
+				ED_curve_nurb_select_all(nu);
+				changed = true;
+			}
+		}
 
-	for (nu = nurbs->first; nu; nu = nu->next) {
-		if (ED_curve_nurb_select_check(cu, nu)) {
-			ED_curve_nurb_select_all(nu);
+		if (changed) {
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 		}
 	}
-
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -532,7 +558,7 @@ void CURVE_OT_select_linked(wmOperatorType *ot)
 	/* identifiers */
 	ot->name = "Select Linked All";
 	ot->idname = "CURVE_OT_select_linked";
-	ot->description = "Select all control points linked to active one";
+	ot->description = "Select all control points linked to the current selection";
 
 	/* api callbacks */
 	ot->exec = select_linked_exec;
@@ -1040,17 +1066,31 @@ static void curve_select_random(ListBase *editnurb, float randfac, int seed, boo
 
 static int curve_select_random_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	ListBase *editnurb = object_editcurve_get(obedit);
 	const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
 	const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f;
 	const int seed = WM_operator_properties_select_random_seed_increment_get(op);
 
-	curve_select_random(editnurb, randfac, seed, select);
-	BKE_curve_nurb_vert_active_validate(obedit->data);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		ListBase *editnurb = object_editcurve_get(obedit);
+		int seed_iter = seed;
+
+		/* This gives a consistent result regardless of object order. */
+		if (ob_index) {
+			seed_iter += BLI_ghashutil_strhash_p(obedit->id.name);
+		}
+
+		curve_select_random(editnurb, randfac, seed_iter, select);
+		BKE_curve_nurb_vert_active_validate(obedit->data);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -1599,6 +1639,7 @@ static void curve_select_shortest_path_surf(Nurb *nu, int vert_src, int vert_dst
 	/* init heap */
 	heap = BLI_heap_new();
 
+	vert_curr = data[vert_src].vert;
 	BLI_heap_insert(heap, 0.0f, &data[vert_src].vert);
 	data[vert_src].cost = 0.0f;
 	data[vert_src].vert_prev = vert_src;  /* nop */
diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c
index 4ced6ce506c..ad17331853b 100644
--- a/source/blender/editors/curve/editcurve_undo.c
+++ b/source/blender/editors/curve/editcurve_undo.c
@@ -22,12 +22,14 @@
  *  \ingroup edcurve
  */
 
+#include "MEM_guardedalloc.h"
+
+#include "CLG_log.h"
+
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_anim_types.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_array_utils.h"
@@ -35,12 +37,15 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_fcurve.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
+#include "ED_undo.h"
 #include "ED_util.h"
 #include "ED_curve.h"
 
@@ -49,6 +54,9 @@
 
 #include "curve_intern.h"
 
+/** We only need this locally. */
+static CLG_LogRef LOG = {"ed.undo.curve"};
+
 /* -------------------------------------------------------------------- */
 /** \name Undo Conversion
  * \{ */
@@ -186,13 +194,19 @@ static Object *editcurve_object_from_context(bContext *C)
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
+ *
+ * \note This is similar for all edit-mode types.
  * \{ */
 
-typedef struct CurveUndoStep {
-	UndoStep step;
-	/* note: will split out into list for multi-object-editmode. */
+typedef struct CurveUndoStep_Elem {
 	UndoRefID_Object obedit_ref;
 	UndoCurve data;
+} CurveUndoStep_Elem;
+
+typedef struct CurveUndoStep {
+	UndoStep step;
+	CurveUndoStep_Elem *elems;
+	uint                elems_len;
 } CurveUndoStep;
 
 static bool curve_undosys_poll(bContext *C)
@@ -204,9 +218,23 @@ static bool curve_undosys_poll(bContext *C)
 static bool curve_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	CurveUndoStep *us = (CurveUndoStep *)us_p;
-	us->obedit_ref.ptr = editcurve_object_from_context(C);
-	undocurve_from_editcurve(&us->data, us->obedit_ref.ptr->data, us->obedit_ref.ptr->shapenr);
-	us->step.data_size = us->data.undo_size;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+	us->elems_len = objects_len;
+
+	for (uint i = 0; i < objects_len; i++) {
+		Object *ob = objects[i];
+		CurveUndoStep_Elem *elem = &us->elems[i];
+
+		elem->obedit_ref.ptr = ob;
+		undocurve_from_editcurve(&elem->data, ob->data, ob->shapenr);
+		us->step.data_size += elem->data.undo_size;
+	}
+	MEM_freeN(objects);
 	return true;
 }
 
@@ -217,23 +245,47 @@ static void curve_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UN
 	BLI_assert(curve_undosys_poll(C));
 
 	CurveUndoStep *us = (CurveUndoStep *)us_p;
-	Object *obedit = us->obedit_ref.ptr;
-	undocurve_to_editcurve(&us->data, obedit->data, &obedit->shapenr);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		CurveUndoStep_Elem *elem = &us->elems[i];
+		Object *obedit = elem->obedit_ref.ptr;
+		Curve *cu = obedit->data;
+		if (cu->editnurb == NULL) {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid",
+			           us_p->name, obedit->id.name);
+			continue;
+		}
+		undocurve_to_editcurve(&elem->data, obedit->data, &obedit->shapenr);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	}
+
+	/* The first element is always active */
+	ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
 static void curve_undosys_step_free(UndoStep *us_p)
 {
 	CurveUndoStep *us = (CurveUndoStep *)us_p;
-	undocurve_free_data(&us->data);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		CurveUndoStep_Elem *elem = &us->elems[i];
+		undocurve_free_data(&elem->data);
+	}
+	MEM_freeN(us->elems);
 }
 
 static void curve_undosys_foreach_ID_ref(
         UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
 {
 	CurveUndoStep *us = (CurveUndoStep *)us_p;
-	foreach_ID_ref_fn(user_data, ((UndoRefID *)&us->obedit_ref));
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		CurveUndoStep_Elem *elem = &us->elems[i];
+		foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+	}
 }
 
 /* Export for ED_undo_sys. */
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index e4db0f1b3fc..7cdfafdad43 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -49,13 +49,14 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -254,7 +255,7 @@ static void text_update_edited(bContext *C, Object *obedit, int mode)
 	/* run update first since it can move the cursor */
 	if (mode == FO_EDIT) {
 		/* re-tesselllate */
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 	else {
 		/* depsgraph runs above, but since we're not tagging for update, call direct */
@@ -273,6 +274,8 @@ static void text_update_edited(bContext *C, Object *obedit, int mode)
 		}
 	}
 
+	BKE_curve_batch_cache_dirty(cu, BKE_CURVE_BATCH_DIRTY_SELECT);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 }
 
@@ -419,7 +422,9 @@ void FONT_OT_text_paste_from_file(wmOperatorType *ot)
 static void txt_add_object(bContext *C, TextLine *firstline, int totline, const float offset[3])
 {
 	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Curve *cu;
 	Object *obedit;
 	Base *base;
@@ -429,13 +434,13 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, const
 	int a;
 	float rot[3] = {0.f, 0.f, 0.f};
 
-	obedit = BKE_object_add(bmain, scene, OB_FONT, NULL);
-	base = scene->basact;
+	obedit = BKE_object_add(bmain, scene, view_layer, OB_FONT, NULL);
+	base = view_layer->basact;
 
 	/* seems to assume view align ? TODO - look into this, could be an operator option */
 	ED_object_base_init_transform(C, base, NULL, rot);
 
-	BKE_object_where_is_calc(scene, obedit);
+	BKE_object_where_is_calc(depsgraph, scene, obedit);
 
 	add_v3_v3(obedit->loc, offset);
 
@@ -582,7 +587,7 @@ static int set_style(bContext *C, const int style, const bool clear)
 			ef->textbufinfo[i].flag |= style;
 	}
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c
index 3a76d0333f9..d4d48e93f43 100644
--- a/source/blender/editors/curve/editfont_undo.c
+++ b/source/blender/editors/curve/editfont_undo.c
@@ -38,9 +38,10 @@
 
 #include "BKE_context.h"
 #include "BKE_font.h"
-#include "BKE_depsgraph.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
 #include "ED_curve.h"
 #include "ED_util.h"
@@ -358,7 +359,7 @@ static void font_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNU
 	Object *obedit = us->obedit_ref.ptr;
 	Curve *cu = obedit->data;
 	undofont_to_editfont(&us->data, cu);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 3f6de14180a..23b328aa8e0 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -152,6 +152,7 @@ set(ICON_NAMES
 	pose_hlt
 	particlemode
 	lightpaint
+	greasepencil_stroke_paint
 	scene_data
 	renderlayers
 	world_data
@@ -194,6 +195,7 @@ set(ICON_NAMES
 	library_data_indirect
 	greasepencil
 	line_data
+	library_data_override
 	group_bone
 	group_vertex
 	group_vcol
@@ -213,6 +215,7 @@ set(ICON_NAMES
 	outliner_ob_speaker
 	outliner_ob_force_field
 	outliner_ob_group_instance
+	outliner_ob_greasepencil
 	restrict_color_off
 	restrict_color_on
 	restrict_view_off
@@ -233,6 +236,7 @@ set(ICON_NAMES
 	outliner_data_surface
 	outliner_data_speaker
 	outliner_data_pose
+	outliner_data_greasepencil
 	mesh_plane
 	mesh_cube
 	mesh_circle
@@ -422,6 +426,7 @@ set(ICON_NAMES
 	clipuv_hlt
 	snap_peel_object
 	grid
+	object_origin
 	pastedown
 	copydown
 	pasteflipup
@@ -520,6 +525,94 @@ set(ICON_NAMES
 	imagefile
 )
 
+# This section is maintained by the updating script, keep BEGIN/END comments.
+set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
+	# BEGIN ICON_GEOM_NAMES
+	brush.paint_texture.airbrush
+	brush.paint_texture.clone
+	brush.paint_texture.draw
+	brush.paint_texture.fill
+	brush.paint_texture.mask
+	brush.paint_texture.multiply
+	brush.paint_texture.smear
+	brush.paint_texture.soften
+	brush.paint_vertex.alpha
+	brush.paint_vertex.blur
+	brush.paint_vertex.mix
+	brush.paint_vertex.smear
+	brush.paint_weight.blur
+	brush.paint_weight.darken
+	brush.paint_weight.draw
+	brush.paint_weight.lighten
+	brush.paint_weight.mix
+	brush.paint_weight.multiply
+	brush.sculpt.blob
+	brush.sculpt.clay
+	brush.sculpt.clay_strips
+	brush.sculpt.crease
+	brush.sculpt.draw
+	brush.sculpt.fill
+	brush.sculpt.flatten
+	brush.sculpt.grab
+	brush.sculpt.inflate
+	brush.sculpt.layer
+	brush.sculpt.mask
+	brush.sculpt.nudge
+	brush.sculpt.pinch
+	brush.sculpt.rotate
+	brush.sculpt.scrape
+	brush.sculpt.smooth
+	brush.sculpt.snake_hook
+	brush.sculpt.thumb
+	brush.vertex.average
+	brush.weight.add
+	brush.weight.subtract
+	none
+	ops.armature.bone.roll
+	ops.armature.extrude.cursor
+	ops.armature.extrude
+	ops.generic.cursor
+	ops.generic.select_border
+	ops.generic.select_circle
+	ops.generic.select_lasso
+	ops.mesh.bevel
+	ops.mesh.bisect
+	ops.mesh.dupli_extrude_cursor
+	ops.mesh.extrude_faces_move
+	ops.mesh.extrude_region_move
+	ops.mesh.inset
+	ops.mesh.knife_tool
+	ops.mesh.loopcut_slide
+	ops.mesh.offset_edge_loops_slide
+	ops.mesh.polybuild_hover
+	ops.mesh.primitive_cone_add_manipulator
+	ops.mesh.primitive_cube_add_manipulator
+	ops.mesh.primitive_cylinder_add_manipulator
+	ops.mesh.primitive_grid_add_manipulator
+	ops.mesh.primitive_sphere_add_manipulator
+	ops.mesh.primitive_torus_add_manipulator
+	ops.mesh.rip
+	ops.mesh.rip_edge
+	ops.mesh.spin
+	ops.mesh.spin.duplicate
+	ops.mesh.vertices_smooth
+	ops.paint.vertex_color_fill
+	ops.paint.weight_fill
+	ops.paint.weight_gradient
+	ops.transform.edge_slide
+	ops.transform.push_pull
+	ops.transform.resize.cage
+	ops.transform.resize
+	ops.transform.rotate
+	ops.transform.shrink_fatten
+	ops.transform.transform
+	ops.transform.translate
+	ops.transform.vert_slide
+	ops.transform.vertex_random
+	ops.view3d.ruler
+	# END ICON_GEOM_NAMES
+)
+
 data_to_c_simple(../../../../release/datafiles/bfont.pfb SRC)
 data_to_c_simple(../../../../release/datafiles/bfont.ttf SRC)
 data_to_c_simple(../../../../release/datafiles/bmonofont.ttf SRC)
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 3d5317b2ebd..587c25031ab 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 338fac03fef..a30cb578046 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -60,9 +60,11 @@
 
 #include "WM_api.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_draw.h"
+
 #include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
@@ -92,38 +94,105 @@ typedef enum eDrawStrokeFlags {
 
 
 /* thickness above which we should use special drawing */
+#if 0
 #define GP_DRAWTHICKNESS_SPECIAL    3
+#endif
+
+/* conversion utility (float --> normalized unsigned byte) */
+#define F2UB(x) (unsigned char)(255.0f * x)
 
 /* ----- Tool Buffer Drawing ------ */
-/* helper function to set color of buffer point */
-static void gp_set_tpoint_color(tGPspoint *pt, float ink[4])
+/* helper functions to set color of buffer point */
+
+static void gp_set_tpoint_varying_color(const tGPspoint *pt, const float ink[4], unsigned attrib_id)
 {
 	float alpha = ink[3] * pt->strength;
 	CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
-	glColor4f(ink[0], ink[1], ink[2], alpha);
+	immAttrib4ub(attrib_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha));
 }
 
-/* helper function to set color of point */
-static void gp_set_point_color(bGPDspoint *pt, float ink[4])
+static void gp_set_point_uniform_color(const bGPDspoint *pt, const float ink[4])
 {
 	float alpha = ink[3] * pt->strength;
 	CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
-	glColor4f(ink[0], ink[1], ink[2], alpha);
+	immUniformColor3fvAlpha(ink, alpha);
 }
 
-/* helper function to set color and point */
-static void gp_set_color_and_tpoint(tGPspoint *pt, float ink[4])
+static void gp_set_point_varying_color(const bGPDspoint *pt, const float ink[4], unsigned attrib_id)
 {
-	gp_set_tpoint_color(pt, ink);
-	glVertex2iv(&pt->x);
+	float alpha = ink[3] * pt->strength;
+	CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
+	immAttrib4ub(attrib_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha));
+}
+
+/* draw fills for buffer stroke */
+static void gp_draw_stroke_buffer_fill(const tGPspoint *points, int totpoints, float ink[4])
+{
+	if (totpoints < 3) {
+		return;
+	}
+	int tot_triangles = totpoints - 2;
+	/* allocate memory for temporary areas */
+	unsigned int(*tmp_triangles)[3] = MEM_mallocN(sizeof(*tmp_triangles) * tot_triangles, "GP Stroke buffer temp triangulation");
+	float(*points2d)[2] = MEM_mallocN(sizeof(*points2d) * totpoints, "GP Stroke buffer temp 2d points");
+
+	/* Convert points to array and triangulate
+	 * Here a cache is not used because while drawing the information changes all the time, so the cache
+	 * would be recalculated constantly, so it is better to do direct calculation for each function call
+	 */
+	for (int i = 0; i < totpoints; i++) {
+		const tGPspoint *pt = &points[i];
+		points2d[i][0] = pt->x;
+		points2d[i][1] = pt->y;
+	}
+	BLI_polyfill_calc((const float(*)[2])points2d, (unsigned int)totpoints, 0, (unsigned int(*)[3])tmp_triangles);
+
+	/* draw triangulation data */
+	if (tot_triangles > 0) {
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+		/* Draw all triangles for filling the polygon */
+		immBegin(GWN_PRIM_TRIS, tot_triangles * 3);
+		/* TODO: use batch instead of immediate mode, to share vertices */
+
+		const tGPspoint *pt;
+		for (int i = 0; i < tot_triangles; i++) {
+			/* vertex 1 */
+			pt = &points[tmp_triangles[i][0]];
+			gp_set_tpoint_varying_color(pt, ink, color);
+			immVertex2iv(pos, &pt->x);
+			/* vertex 2 */
+			pt = &points[tmp_triangles[i][1]];
+			gp_set_tpoint_varying_color(pt, ink, color);
+			immVertex2iv(pos, &pt->x);
+			/* vertex 3 */
+			pt = &points[tmp_triangles[i][2]];
+			gp_set_tpoint_varying_color(pt, ink, color);
+			immVertex2iv(pos, &pt->x);
+		}
+
+		immEnd();
+		immUnbindProgram();
+	}
+
+	/* clear memory */
+	if (tmp_triangles) {
+		MEM_freeN(tmp_triangles);
+	}
+	if (points2d) {
+		MEM_freeN(points2d);
+	}
 }
 
 /* draw stroke defined in buffer (simple ogl lines/points for now, as dotted lines) */
-static void gp_draw_stroke_buffer(tGPspoint *points, int totpoints, short thickness,
-                                  short dflag, short sflag, float ink[4])
+static void gp_draw_stroke_buffer(const tGPspoint *points, int totpoints, short thickness,
+                                  short dflag, short sflag, float ink[4], float fill_ink[4])
 {
-	tGPspoint *pt;
-	int i;
+	int draw_points = 0;
 
 	/* error checking */
 	if ((points == NULL) || (totpoints <= 0))
@@ -133,58 +202,86 @@ static void gp_draw_stroke_buffer(tGPspoint *points, int totpoints, short thickn
 	if (dflag & (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_ONLYV2D))
 		return;
 
+	if (sflag & GP_STROKE_ERASER) {
+		/* don't draw stroke at all! */
+		return;
+	}
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	const tGPspoint *pt = points;
+
 	if (totpoints == 1) {
 		/* if drawing a single point, draw it larger */
 		glPointSize((float)(thickness + 2) * points->pressure);
-		glBegin(GL_POINTS);
-
-		gp_set_color_and_tpoint(points, ink);
-		glEnd();
-	}
-	else if (sflag & GP_STROKE_ERASER) {
-		/* don't draw stroke at all! */
+		immBindBuiltinProgram(GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR);
+		immBegin(GWN_PRIM_POINTS, 1);
+		gp_set_tpoint_varying_color(pt, ink, color);
+		immVertex2iv(pos, &pt->x);
 	}
 	else {
 		float oldpressure = points[0].pressure;
 
 		/* draw stroke curve */
-		if (G.debug & G_DEBUG) setlinestyle(2);
-
 		glLineWidth(max_ff(oldpressure * thickness, 1.0));
-		glBegin(GL_LINE_STRIP);
+		immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+		immBeginAtMost(GWN_PRIM_LINE_STRIP, totpoints);
 
-		for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
+		/* TODO: implement this with a geometry shader to draw one continuous tapered stroke */
+
+		for (int i = 0; i < totpoints; i++, pt++) {
 			/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
 			 * and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
 			 */
 			if (fabsf(pt->pressure - oldpressure) > 0.2f) {
-				glEnd();
+				/* need to have 2 points to avoid immEnd assert error */
+				if (draw_points < 2) {
+					gp_set_tpoint_varying_color(pt - 1, ink, color);
+					immVertex2iv(pos, &(pt - 1)->x);
+				}
+
+				immEnd();
+				draw_points = 0;
+
 				glLineWidth(max_ff(pt->pressure * thickness, 1.0f));
-				glBegin(GL_LINE_STRIP);
+				immBeginAtMost(GWN_PRIM_LINE_STRIP, totpoints - i + 1);
 
 				/* need to roll-back one point to ensure that there are no gaps in the stroke */
 				if (i != 0) {
-					gp_set_color_and_tpoint((pt - 1), ink);
+					gp_set_tpoint_varying_color(pt - 1, ink, color);
+					immVertex2iv(pos, &(pt - 1)->x);
+					++draw_points;
 				}
 
-				/* now the point we want... */
-				gp_set_color_and_tpoint(pt, ink);
-
-				oldpressure = pt->pressure;
-			}
-			else {
-				gp_set_color_and_tpoint(pt, ink);
+				oldpressure = pt->pressure; /* reset our threshold */
 			}
+
+			/* now the point we want */
+			gp_set_tpoint_varying_color(pt, ink, color);
+			immVertex2iv(pos, &pt->x);
+			++draw_points;
+		}
+		/* need to have 2 points to avoid immEnd assert error */
+		if (draw_points < 2) {
+			gp_set_tpoint_varying_color(pt - 1, ink, color);
+			immVertex2iv(pos, &(pt - 1)->x);
 		}
-		glEnd();
+	}
+
+	immEnd();
+	immUnbindProgram();
 
-		if (G.debug & G_DEBUG) setlinestyle(0);
+	// draw fill
+	if (fill_ink[3] > GPENCIL_ALPHA_OPACITY_THRESH) {
+		gp_draw_stroke_buffer_fill(points, totpoints, fill_ink);
 	}
 }
 
 /* --------- 2D Stroke Drawing Helpers --------- */
 /* change in parameter list */
-static void gp_calc_2d_stroke_fxy(float pt[3], short sflag, int offsx, int offsy, int winx, int winy, float r_co[2])
+static void gp_calc_2d_stroke_fxy(const float pt[3], short sflag, int offsx, int offsy, int winx, int winy, float r_co[2])
 {
 	if (sflag & GP_STROKE_2DSPACE) {
 		r_co[0] = pt[0];
@@ -210,15 +307,9 @@ static void gp_calc_2d_stroke_fxy(float pt[3], short sflag, int offsx, int offsy
 /* draw a 2D buffer stroke in "volumetric" style
  * NOTE: the stroke buffer doesn't have any coordinate offsets/transforms
  */
-static void gp_draw_stroke_volumetric_buffer(tGPspoint *points, int totpoints, short thickness,
-                                             short dflag, short UNUSED(sflag), float ink[4])
+static void gp_draw_stroke_volumetric_buffer(const tGPspoint *points, int totpoints, short thickness,
+                                             short dflag, const float ink[4])
 {
-	GLUquadricObj *qobj = gluNewQuadric();
-	float modelview[4][4];
-
-	tGPspoint *pt;
-	int i;
-
 	/* error checking */
 	if ((points == NULL) || (totpoints <= 0))
 		return;
@@ -227,152 +318,96 @@ static void gp_draw_stroke_volumetric_buffer(tGPspoint *points, int totpoints, s
 	if (dflag & (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_ONLYV2D))
 		return;
 
-	/* get basic matrix - should be camera space (i.e "identity") */
-	glGetFloatv(GL_MODELVIEW_MATRIX, (float *)modelview);
-
-	/* draw points */
-	glPushMatrix();
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int size = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
 
-	for (i = 0, pt = points; i < totpoints; i++, pt++) {
-		/* set the transformed position */
-		// TODO: scale should change based on zoom level, which requires proper translation mult too!
-		modelview[3][0] = pt->x;
-		modelview[3][1] = pt->y;
+	immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
+	GPU_enable_program_point_size();
+	immBegin(GWN_PRIM_POINTS, totpoints);
 
-		glLoadMatrixf((float *)modelview);
-
-		/* draw the disk using the current state... */
-		gp_set_tpoint_color(pt, ink);
-		gluDisk(qobj, 0.0,  pt->pressure * thickness, 32, 1);
-
-
-		modelview[3][0] = modelview[3][1] = 0.0f;
+	const tGPspoint *pt = points;
+	for (int i = 0; i < totpoints; i++, pt++) {
+		gp_set_tpoint_varying_color(pt, ink, color);
+		immAttrib1f(size, pt->pressure * thickness); /* TODO: scale based on view transform (zoom level) */
+		immVertex2f(pos, pt->x, pt->y);
 	}
 
-	glPopMatrix();
-	gluDeleteQuadric(qobj);
+	immEnd();
+	immUnbindProgram();
+	GPU_disable_program_point_size();
 }
 
 /* draw a 2D strokes in "volumetric" style */
-static void gp_draw_stroke_volumetric_2d(bGPDspoint *points, int totpoints, short thickness,
-                                         short dflag, short sflag,
+static void gp_draw_stroke_volumetric_2d(const bGPDspoint *points, int totpoints, short thickness,
+                                         short UNUSED(dflag), short sflag,
                                          int offsx, int offsy, int winx, int winy,
-                                         float diff_mat[4][4], float ink[4])
+                                         const float diff_mat[4][4], const float ink[4])
 {
-	GLUquadricObj *qobj = gluNewQuadric();
-	float modelview[4][4];
-	float baseloc[3];
-	float scalefac = 1.0f;
-
-	bGPDspoint *pt;
-	int i;
-	float fpt[3];
-
-	/* HACK: We need a scale factor for the drawing in the image editor,
-	 * which seems to use 1 unit as it's maximum size, whereas everything
-	 * else assumes 1 unit = 1 pixel. Otherwise, we only get a massive blob.
-	 */
-	if ((dflag & GP_DRAWDATA_IEDITHACK) && (dflag & GP_DRAWDATA_ONLYV2D)) {
-		scalefac = 0.001f;
-	}
-
-	/* get basic matrix */
-	glGetFloatv(GL_MODELVIEW_MATRIX, (float *)modelview);
-	copy_v3_v3(baseloc, modelview[3]);
-
-	/* draw points */
-	glPushMatrix();
-
-	for (i = 0, pt = points; i < totpoints; i++, pt++) {
-		/* color of point */
-		gp_set_point_color(pt, ink);
-
-		/* set the transformed position */
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int size = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
+	GPU_enable_program_point_size();
+	immBegin(GWN_PRIM_POINTS, totpoints);
+
+	const bGPDspoint *pt = points;
+	for (int i = 0; i < totpoints; i++, pt++) {
+		/* transform position to 2D */
 		float co[2];
+		float fpt[3];
 
 		mul_v3_m4v3(fpt, diff_mat, &pt->x);
 		gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, co);
-		translate_m4(modelview, co[0], co[1], 0.0f);
-
-		glLoadMatrixf((float *)modelview);
-
-		/* draw the disk using the current state... */
-		gluDisk(qobj, 0.0,  pt->pressure * thickness * scalefac, 32, 1);
 
-		/* restore matrix */
-		copy_v3_v3(modelview[3], baseloc);
+		gp_set_point_varying_color(pt, ink, color);
+		immAttrib1f(size, pt->pressure * thickness); /* TODO: scale based on view transform */
+		immVertex2f(pos, co[0], co[1]);
 	}
 
-	glPopMatrix();
-	gluDeleteQuadric(qobj);
+	immEnd();
+	immUnbindProgram();
+	GPU_disable_program_point_size();
 }
 
 /* draw a 3D stroke in "volumetric" style */
 static void gp_draw_stroke_volumetric_3d(
-        bGPDspoint *points, int totpoints, short thickness,
-        short UNUSED(dflag), short UNUSED(sflag), float diff_mat[4][4], float ink[4])
+        const bGPDspoint *points, int totpoints, short thickness,
+        const float ink[4])
 {
-	GLUquadricObj *qobj = gluNewQuadric();
-
-	float base_modelview[4][4], modelview[4][4];
-	float base_loc[3];
-
-	bGPDspoint *pt;
-	int i;
-	float fpt[3];
-
-	/* Get the basic modelview matrix we use for performing calculations */
-	glGetFloatv(GL_MODELVIEW_MATRIX, (float *)base_modelview);
-	copy_v3_v3(base_loc, base_modelview[3]);
-
-	/* Create the basic view-aligned billboard matrix we're going to actually draw qobj with:
-	 * - We need to knock out the rotation so that we are
-	 *   simply left with a camera-facing billboard
-	 * - The scale factors here are chosen so that the thickness
-	 *   is relatively reasonable. Otherwise, it gets far too
-	 *   large!
-	 */
-	scale_m4_fl(modelview, 0.1f);
-
-	/* draw each point as a disk... */
-	glPushMatrix();
-
-	for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
-		/* color of point */
-		gp_set_point_color(pt, ink);
-
-		mul_v3_m4v3(fpt, diff_mat, &pt->x);
-
-		/* apply translation to base_modelview, so that the translated point is put in the right place */
-		translate_m4(base_modelview, fpt[0], fpt[1], fpt[2]);
-
-		/* copy the translation component to the billboard matrix we're going to use,
-		 * then reset the base matrix to the original values so that we can do the same
-		 * for the next point without accumulation/pollution effects
-		 */
-		copy_v3_v3(modelview[3], base_modelview[3]); /* copy offset value */
-		copy_v3_v3(base_modelview[3], base_loc);     /* restore */
-
-		/* apply our billboard matrix for drawing... */
-		glLoadMatrixf((float *)modelview);
-
-		/* draw the disk using the current state... */
-		gluDisk(qobj, 0.0,  pt->pressure * thickness, 32, 1);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	unsigned int size = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
+	GPU_enable_program_point_size();
+	immBegin(GWN_PRIM_POINTS, totpoints);
+
+	const bGPDspoint *pt = points;
+	for (int i = 0; i < totpoints && pt; i++, pt++) {
+		gp_set_point_varying_color(pt, ink, color);
+		immAttrib1f(size, pt->pressure * thickness); /* TODO: scale based on view transform */
+		immVertex3fv(pos, &pt->x);                   /* we can adjust size in vertex shader based on view/projection! */
 	}
 
-	glPopMatrix();
-	gluDeleteQuadric(qobj);
+	immEnd();
+	immUnbindProgram();
+	GPU_disable_program_point_size();
 }
 
 
 /* --------------- Stroke Fills ----------------- */
 
 /* Get points of stroke always flat to view not affected by camera view or view position */
-static void gp_stroke_2d_flat(bGPDspoint *points, int totpoints, float(*points2d)[2], int *r_direction)
+static void gp_stroke_2d_flat(const bGPDspoint *points, int totpoints, float(*points2d)[2], int *r_direction)
 {
-	bGPDspoint *pt0 = &points[0];
-	bGPDspoint *pt1 = &points[1];
-	bGPDspoint *pt3 = &points[(int)(totpoints * 0.75)];
+	const bGPDspoint *pt0 = &points[0];
+	const bGPDspoint *pt1 = &points[1];
+	const bGPDspoint *pt3 = &points[(int)(totpoints * 0.75)];
 
 	float locx[3];
 	float locy[3];
@@ -397,7 +432,7 @@ static void gp_stroke_2d_flat(bGPDspoint *points, int totpoints, float(*points2d
 
 	/* Get all points in local space */
 	for (int i = 0; i < totpoints; i++) {
-		bGPDspoint *pt = &points[i];
+		const bGPDspoint *pt = &points[i];
 		float loc[3];
 
 		/* Get local space using first point as origin */
@@ -440,8 +475,7 @@ static void gp_triangulate_stroke_fill(bGPDstroke *gps)
 		}
 
 		for (int i = 0; i < gps->tot_triangles; i++) {
-			bGPDtriangle *stroke_triangle = &gps->triangles[i];
-			memcpy(stroke_triangle->verts, tmp_triangles[i], sizeof(uint[3]));
+			memcpy(gps->triangles[i].verts, tmp_triangles[i], sizeof(uint[3]));
 		}
 	}
 	else {
@@ -466,78 +500,64 @@ static void gp_triangulate_stroke_fill(bGPDstroke *gps)
 /* draw fills for shapes */
 static void gp_draw_stroke_fill(
         bGPdata *gpd, bGPDstroke *gps,
-        int offsx, int offsy, int winx, int winy, float diff_mat[4][4])
+        int offsx, int offsy, int winx, int winy, const float diff_mat[4][4], const float color[4])
 {
-	bGPDpalettecolor *palcolor;
-	int i;
 	float fpt[3];
 
 	BLI_assert(gps->totpoints >= 3);
 
-	palcolor = ED_gpencil_stroke_getcolor(gpd, gps);
+	bGPDpalettecolor *palcolor = ED_gpencil_stroke_getcolor(gpd, gps);
 
 	/* Triangulation fill if high quality flag is enabled */
 	if (palcolor->flag & PC_COLOR_HQ_FILL) {
-		bGPDtriangle *stroke_triangle;
-		bGPDspoint *pt;
-
 		/* Calculate triangles cache for filling area (must be done only after changes) */
 		if ((gps->flag & GP_STROKE_RECALC_CACHES) || (gps->tot_triangles == 0) || (gps->triangles == NULL)) {
 			gp_triangulate_stroke_fill(gps);
 		}
-		/* Draw all triangles for filling the polygon (cache must be calculated before) */
 		BLI_assert(gps->tot_triangles >= 1);
-		glBegin(GL_TRIANGLES);
+
+		unsigned int pos;
+		if (gps->flag & GP_STROKE_3DSPACE) {
+			pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		}
+		else {
+			pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		}
+
+		immUniformColor4fv(color);
+
+		/* Draw all triangles for filling the polygon (cache must be calculated before) */
+		immBegin(GWN_PRIM_TRIS, gps->tot_triangles * 3);
+		/* TODO: use batch instead of immediate mode, to share vertices */
+
+		bGPDtriangle *stroke_triangle = gps->triangles;
+		bGPDspoint *pt;
+
 		if (gps->flag & GP_STROKE_3DSPACE) {
-			for (i = 0, stroke_triangle = gps->triangles; i < gps->tot_triangles; i++, stroke_triangle++) {
+			for (int i = 0; i < gps->tot_triangles; i++, stroke_triangle++) {
 				for (int j = 0; j < 3; j++) {
 					pt = &gps->points[stroke_triangle->verts[j]];
 					mul_v3_m4v3(fpt, diff_mat, &pt->x);
-					glVertex3fv(fpt);
+					immVertex3fv(pos, fpt);
 				}
 			}
 		}
 		else {
-			for (i = 0, stroke_triangle = gps->triangles; i < gps->tot_triangles; i++, stroke_triangle++) {
+			for (int i = 0; i < gps->tot_triangles; i++, stroke_triangle++) {
 				for (int j = 0; j < 3; j++) {
 					float co[2];
 					pt = &gps->points[stroke_triangle->verts[j]];
 					mul_v3_m4v3(fpt, diff_mat, &pt->x);
 					gp_calc_2d_stroke_fxy(fpt, gps->flag, offsx, offsy, winx, winy, co);
-					glVertex2fv(co);
+					immVertex3fv(pos, fpt);
 				}
 			}
 		}
-		glEnd();
-	}
-	else {
-		/* As an initial implementation, we use the OpenGL filled polygon drawing
-		 * here since it's the easiest option to implement for this case. It does
-		 * come with limitations (notably for concave shapes), though it shouldn't
-		 * be much of an issue in most cases.
-		 *
-		 * We keep this legacy implementation around despite now having the high quality
-		 * fills, as this is necessary for keeping everything working nicely for files
-		 * created using old versions of Blender which may have depended on the artifacts
-		 * the old fills created.
-		 */
-		bGPDspoint *pt;
-
-		glBegin(GL_POLYGON);
-		for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
-			if (gps->flag & GP_STROKE_3DSPACE) {
-				mul_v3_m4v3(fpt, diff_mat, &pt->x);
-				glVertex3fv(fpt);
-			}
-			else {
-				float co[2];
-				mul_v3_m4v3(fpt, diff_mat, &pt->x);
-				gp_calc_2d_stroke_fxy(fpt, gps->flag, offsx, offsy, winx, winy, co);
-				glVertex2fv(co);
-			}
-		}
 
-		glEnd();
+		immEnd();
+		immUnbindProgram();
 	}
 }
 
@@ -545,131 +565,134 @@ static void gp_draw_stroke_fill(
 
 /* draw a given stroke - just a single dot (only one point) */
 static void gp_draw_stroke_point(
-        bGPDspoint *points, short thickness, short dflag, short sflag,
-        int offsx, int offsy, int winx, int winy, float diff_mat[4][4], float ink[4])
+        const bGPDspoint *points, short thickness, short UNUSED(dflag), short sflag,
+        int offsx, int offsy, int winx, int winy, const float diff_mat[4][4], const float ink[4])
 {
-	float fpt[3];
-	bGPDspoint *pt = &points[0];
-
-	/* color of point */
-	gp_set_point_color(pt, ink);
-
-	/* set point thickness (since there's only one of these) */
-	glPointSize((float)(thickness + 2) * points->pressure);
+	const bGPDspoint *pt = points;
 
 	/* get final position using parent matrix */
+	float fpt[3];
 	mul_v3_m4v3(fpt, diff_mat, &pt->x);
 
-	/* draw point */
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
 	if (sflag & GP_STROKE_3DSPACE) {
-		glBegin(GL_POINTS);
-		glVertex3fv(fpt);
-		glEnd();
+		immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
 	}
 	else {
-		float co[2];
+		immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
 
-		/* get coordinates of point */
+		/* get 2D coordinates of point */
+		float co[3] = { 0.0f };
 		gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, co);
+		copy_v3_v3(fpt, co);
+	}
 
-		/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple dot looks ok
-		 *  - also mandatory in if Image Editor 'image-based' dot
-		 */
-		if ((thickness < GP_DRAWTHICKNESS_SPECIAL) ||
-		    ((dflag & GP_DRAWDATA_IEDITHACK) && (sflag & GP_STROKE_2DSPACE)))
-		{
-			glBegin(GL_POINTS);
-			glVertex2fv(co);
-			glEnd();
-		}
-		else {
-			/* draw filled circle as is done in circf (but without the matrix push/pops which screwed things up) */
-			GLUquadricObj *qobj = gluNewQuadric();
-
-			gluQuadricDrawStyle(qobj, GLU_FILL);
+	gp_set_point_uniform_color(pt, ink);
+	/* set point thickness (since there's only one of these) */
+	immUniform1f("size", (float)(thickness + 2) * pt->pressure);
 
-			/* need to translate drawing position, but must reset after too! */
-			glTranslate2fv(co);
-			gluDisk(qobj, 0.0,  thickness, 32, 1);
-			glTranslatef(-co[0], -co[1], 0.0);
+	immBegin(GWN_PRIM_POINTS, 1);
+	immVertex3fv(pos, fpt);
+	immEnd();
 
-			gluDeleteQuadric(qobj);
-		}
-	}
+	immUnbindProgram();
 }
 
 /* draw a given stroke in 3d (i.e. in 3d-space), using simple ogl lines */
-static void gp_draw_stroke_3d(bGPDspoint *points, int totpoints, short thickness, bool debug,
-                              short UNUSED(sflag), float diff_mat[4][4], float ink[4], bool cyclic)
+static void gp_draw_stroke_3d(const bGPDspoint *points, int totpoints, short thickness, bool UNUSED(debug),
+                              short UNUSED(sflag), const float diff_mat[4][4], const float ink[4], bool cyclic)
 {
-	bGPDspoint *pt, *pt2;
 	float curpressure = points[0].pressure;
-	int i;
 	float fpt[3];
 	float cyclic_fpt[3];
+	int draw_points = 0;
+
+	/* if cyclic needs one vertex more */
+	int cyclic_add = 0;
+	if (cyclic) {
+		++cyclic_add;
+	}
+
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_SMOOTH_COLOR);
+
+	/* TODO: implement this with a geometry shader to draw one continuous tapered stroke */
 
 	/* draw stroke curve */
 	glLineWidth(max_ff(curpressure * thickness, 1.0f));
-	glBegin(GL_LINE_STRIP);
-	for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
-		gp_set_point_color(pt, ink);
+	immBeginAtMost(GWN_PRIM_LINE_STRIP, totpoints + cyclic_add);
+	const bGPDspoint *pt = points;
+	for (int i = 0; i < totpoints; i++, pt++) {
+		gp_set_point_varying_color(pt, ink, color);
 
 		/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
 		 * and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
 		 * Note: we want more visible levels of pressures when thickness is bigger.
 		 */
 		if (fabsf(pt->pressure - curpressure) > 0.2f / (float)thickness) {
-			glEnd();
+			/* if the pressure changes before get at least 2 vertices, need to repeat last point to avoid assert in immEnd() */
+			if (draw_points < 2) {
+				const bGPDspoint *pt2 = pt - 1;
+				mul_v3_m4v3(fpt, diff_mat, &pt2->x);
+				immVertex3fv(pos, fpt);
+			}
+			immEnd();
+			draw_points = 0;
+
 			curpressure = pt->pressure;
 			glLineWidth(max_ff(curpressure * thickness, 1.0f));
-			glBegin(GL_LINE_STRIP);
+			immBeginAtMost(GWN_PRIM_LINE_STRIP, totpoints - i + 1 + cyclic_add);
 
 			/* need to roll-back one point to ensure that there are no gaps in the stroke */
 			if (i != 0) {
-				pt2 = pt - 1;
+				const bGPDspoint *pt2 = pt - 1;
 				mul_v3_m4v3(fpt, diff_mat, &pt2->x);
-				glVertex3fv(fpt);
+				gp_set_point_varying_color(pt2, ink, color);
+				immVertex3fv(pos, fpt);
+				++draw_points;
 			}
-
-			/* now the point we want... */
-			mul_v3_m4v3(fpt, diff_mat, &pt->x);
-			glVertex3fv(fpt);
-		}
-		else {
-			mul_v3_m4v3(fpt, diff_mat, &pt->x);
-			glVertex3fv(fpt);
 		}
-		/* saves first point to use in cyclic */
-		if (i == 0) {
+
+		/* now the point we want */
+		mul_v3_m4v3(fpt, diff_mat, &pt->x);
+		immVertex3fv(pos, fpt);
+		++draw_points;
+
+		if (cyclic && i == 0) {
+			/* save first point to use in cyclic */
 			copy_v3_v3(cyclic_fpt, fpt);
 		}
 	}
-	/* if cyclic draw line to first point */
+
 	if (cyclic) {
-		glVertex3fv(cyclic_fpt);
+		/* draw line to first point to complete the cycle */
+		immVertex3fv(pos, cyclic_fpt);
+		++draw_points;
 	}
-	glEnd();
-
-	/* draw debug points of curve on top? */
-	/* XXX: for now, we represent "selected" strokes in the same way as debug, which isn't used anymore */
-	if (debug) {
-		glPointSize((float)(thickness + 2));
-
-		glBegin(GL_POINTS);
-		for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
-			mul_v3_m4v3(fpt, diff_mat, &pt->x);
-			glVertex3fv(fpt);
-		}
-		glEnd();
 
+	/* if less of two points, need to repeat last point to avoid assert in immEnd() */
+	if (draw_points < 2) {
+		const bGPDspoint *pt2 = pt - 1;
+		mul_v3_m4v3(fpt, diff_mat, &pt2->x);
+		gp_set_point_varying_color(pt2, ink, color);
+		immVertex3fv(pos, fpt);
 	}
+
+	immEnd();
+	immUnbindProgram();
 }
 
 /* ----- Fancy 2D-Stroke Drawing ------ */
 
 /* draw a given stroke in 2d */
-static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness_s, short dflag, short sflag,
-                              bool debug, int offsx, int offsy, int winx, int winy, float diff_mat[4][4], float ink[4])
+static void gp_draw_stroke_2d(const bGPDspoint *points, int totpoints, short thickness_s, short dflag, short sflag,
+                              bool UNUSED(debug), int offsx, int offsy, int winx, int winy, const float diff_mat[4][4], const float ink[4])
 {
 	/* otherwise thickness is twice that of the 3D view */
 	float thickness = (float)thickness_s * 0.5f;
@@ -680,18 +703,24 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 		scalefac = 0.001f;
 	}
 
-	/* tessellation code - draw stroke as series of connected quads with connection
+	/* TODO: fancy++ with the magic of shaders */
+
+	/* tessellation code - draw stroke as series of connected quads (triangle strips in fact) with connection
 	 * edges rotated to minimize shrinking artifacts, and rounded endcaps
 	 */
 	{
-		bGPDspoint *pt1, *pt2;
+		const bGPDspoint *pt1, *pt2;
 		float s0[2], s1[2];     /* segment 'center' points */
 		float pm[2];  /* normal from previous segment. */
 		int i;
 		float fpt[3];
 
-		glShadeModel(GL_FLAT);
-		glBegin(GL_QUADS);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+		immBegin(GWN_PRIM_TRI_STRIP, totpoints * 2 + 4);
 
 		/* get x and y coordinates from first point */
 		mul_v3_m4v3(fpt, diff_mat, &points->x);
@@ -718,7 +747,7 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 			pthick = (pt1->pressure * thickness * scalefac);
 
 			/* color of point */
-			gp_set_point_color(pt1, ink);
+			gp_set_point_varying_color(pt1, ink, color);
 
 			/* if the first segment, start of segment is segment's normal */
 			if (i == 0) {
@@ -735,8 +764,9 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				t1[0] = sc[0] + mt[0];
 				t1[1] = sc[1] + mt[1];
 
-				glVertex2fv(t0);
-				glVertex2fv(t1);
+				/* First two points of cap. */
+				immVertex2fv(pos, t0);
+				immVertex2fv(pos, t1);
 
 				/* calculate points for start of segment */
 				mt[0] = m2[0] * pthick;
@@ -747,11 +777,9 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				t1[0] = s0[0] + mt[0];
 				t1[1] = s0[1] + mt[1];
 
-				/* draw this line twice (first to finish off start cap, then for stroke) */
-				glVertex2fv(t1);
-				glVertex2fv(t0);
-				glVertex2fv(t0);
-				glVertex2fv(t1);
+				/* Last two points of start cap (and first two points of first segment). */
+				immVertex2fv(pos, t0);
+				immVertex2fv(pos, t1);
 			}
 			/* if not the first segment, use bisector of angle between segments */
 			else {
@@ -783,11 +811,9 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				t1[0] = s0[0] + mt[0];
 				t1[1] = s0[1] + mt[1];
 
-				/* draw this line twice (once for end of current segment, and once for start of next) */
-				glVertex2fv(t1);
-				glVertex2fv(t0);
-				glVertex2fv(t0);
-				glVertex2fv(t1);
+				/* Last two points of previous segment, and first two points of current segment. */
+				immVertex2fv(pos, t0);
+				immVertex2fv(pos, t1);
 			}
 
 			/* if last segment, also draw end of segment (defined as segment's normal) */
@@ -796,7 +822,7 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				pthick = (pt2->pressure * thickness * scalefac);
 
 				/* color of point */
-				gp_set_point_color(pt2, ink);
+				gp_set_point_varying_color(pt2, ink, color);
 
 				/* calculate points for end of segment */
 				mt[0] = m2[0] * pthick;
@@ -807,12 +833,9 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				t1[0] = s1[0] + mt[0];
 				t1[1] = s1[1] + mt[1];
 
-				/* draw this line twice (once for end of stroke, and once for endcap)*/
-				glVertex2fv(t1);
-				glVertex2fv(t0);
-				glVertex2fv(t0);
-				glVertex2fv(t1);
-
+				/* Last two points of last segment (and first two points of end cap). */
+				immVertex2fv(pos, t0);
+				immVertex2fv(pos, t1);
 
 				/* draw end cap as last step
 				 *	- make points slightly closer to center (about halfway across)
@@ -827,8 +850,9 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 				t1[0] = sc[0] + mt[0];
 				t1[1] = sc[1] + mt[1];
 
-				glVertex2fv(t1);
-				glVertex2fv(t0);
+				/* Last two points of end cap. */
+				immVertex2fv(pos, t0);
+				immVertex2fv(pos, t1);
 			}
 
 			/* store computed point2 coordinates as point1 ones of next segment. */
@@ -837,26 +861,8 @@ static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness
 			copy_v2_v2(pm, m2);
 		}
 
-		glEnd();
-		glShadeModel(GL_SMOOTH);
-	}
-
-	/* draw debug points of curve on top? (original stroke points) */
-	if (debug) {
-		bGPDspoint *pt;
-		int i;
-		float fpt[3];
-
-		glPointSize((float)(thickness_s + 2));
-
-		glBegin(GL_POINTS);
-		for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
-			float co[2];
-			mul_v3_m4v3(fpt, diff_mat, &pt->x);
-			gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, co);
-			glVertex2fv(co);
-		}
-		glEnd();
+		immEnd();
+		immUnbindProgram();
 	}
 }
 
@@ -884,7 +890,6 @@ static bool gp_can_draw_stroke(const bGPDstroke *gps, const int dflag)
 	if (!(dflag & GP_DRAWDATA_ONLYI2D) && (gps->flag & GP_STROKE_2DIMAGE))
 		return false;
 
-
 	/* skip stroke if it doesn't have any valid data */
 	if ((gps->points == NULL) || (gps->totpoints < 1))
 		return false;
@@ -895,17 +900,18 @@ static bool gp_can_draw_stroke(const bGPDstroke *gps, const int dflag)
 
 /* draw a set of strokes */
 static void gp_draw_strokes(
-        bGPdata *gpd, bGPDframe *gpf, int offsx, int offsy, int winx, int winy, int dflag,
+        bGPdata *gpd, const bGPDframe *gpf, int offsx, int offsy, int winx, int winy, int dflag,
         bool debug, short lthick, const float opacity, const float tintcolor[4],
-        const bool onion, const bool custonion, float diff_mat[4][4])
+        const bool onion, const bool custonion, const float diff_mat[4][4])
 {
-	bGPDstroke *gps;
 	float tcolor[4];
 	float tfill[4];
 	short sthickness;
 	float ink[4];
 
-	for (gps = gpf->strokes.first; gps; gps = gps->next) {
+	GPU_enable_program_point_size();
+
+	for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 		/* check if stroke can be drawn */
 		if (gp_can_draw_stroke(gps, dflag) == false) {
 			continue;
@@ -923,6 +929,10 @@ static void gp_draw_strokes(
 		/* calculate thickness */
 		sthickness = gps->thickness + lthick;
 
+		if (sthickness <= 0) {
+			continue;
+		}
+
 		/* check which stroke-drawer to use */
 		if (dflag & GP_DRAWDATA_ONLY3D) {
 			const int no_xray = (dflag & GP_DRAWDATA_NO_XRAY);
@@ -936,10 +946,6 @@ static void gp_draw_strokes(
 				/* first arg is normally rv3d->dist, but this isn't
 				 * available here and seems to work quite well without */
 				bglPolygonOffset(1.0f, 1.0f);
-#if 0
-				glEnable(GL_POLYGON_OFFSET_LINE);
-				glPolygonOffset(-1.0f, -1.0f);
-#endif
 			}
 
 			/* 3D Fill */
@@ -949,19 +955,20 @@ static void gp_draw_strokes(
 				interp_v3_v3v3(tfill, palcolor->fill, tintcolor, tintcolor[3]);
 				tfill[3] = palcolor->fill[3] * opacity;
 				if (tfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) {
+					const float *color;
 					if (!onion) {
-						glColor4fv(tfill);
+						color = tfill;
 					}
 					else {
 						if (custonion) {
-							glColor4fv(tintcolor);
+							color = tintcolor;
 						}
 						else {
 							ARRAY_SET_ITEMS(tfill, UNPACK3(palcolor->fill), tintcolor[3]);
-							glColor4fv(tfill);
+							color = tfill;
 						}
 					}
-					gp_draw_stroke_fill(gpd, gps, offsx, offsy, winx, winy, diff_mat);
+					gp_draw_stroke_fill(gpd, gps, offsx, offsy, winx, winy, diff_mat, color);
 				}
 			}
 
@@ -983,7 +990,7 @@ static void gp_draw_strokes(
 			}
 			if (palcolor->flag & PC_COLOR_VOLUMETRIC) {
 				/* volumetric stroke drawing */
-				gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, sthickness, dflag, gps->flag, diff_mat, ink);
+				gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, sthickness, ink);
 			}
 			else {
 				/* 3D Lines - OpenGL primitives-based */
@@ -1001,10 +1008,6 @@ static void gp_draw_strokes(
 				glDisable(GL_DEPTH_TEST);
 
 				bglPolygonOffset(0.0, 0.0);
-#if 0
-				glDisable(GL_POLYGON_OFFSET_LINE);
-				glPolygonOffset(0, 0);
-#endif
 			}
 		}
 		else {
@@ -1014,20 +1017,21 @@ static void gp_draw_strokes(
 				interp_v3_v3v3(tfill, palcolor->fill, tintcolor, tintcolor[3]);
 				tfill[3] = palcolor->fill[3] * opacity;
 				if (tfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) {
+					const float *color;
 					if (!onion) {
-						glColor4fv(tfill);
+						color = tfill;
 					}
 					else {
 						if (custonion) {
-							glColor4fv(tintcolor);
+							color = tintcolor;
 						}
 						else {
 							ARRAY_SET_ITEMS(tfill, palcolor->fill[0], palcolor->fill[1], palcolor->fill[2],
 							                tintcolor[3]);
-							glColor4fv(tfill);
+							color = tfill;
 						}
 					}
-					gp_draw_stroke_fill(gpd, gps, offsx, offsy, winx, winy, diff_mat);
+					gp_draw_stroke_fill(gpd, gps, offsx, offsy, winx, winy, diff_mat, color);
 				}
 			}
 
@@ -1065,15 +1069,15 @@ static void gp_draw_strokes(
 			}
 		}
 	}
+
+	GPU_disable_program_point_size();
 }
 
 /* Draw selected verts for strokes being edited */
 static void gp_draw_strokes_edit(
-        bGPdata *gpd, bGPDframe *gpf, int offsx, int offsy, int winx, int winy, short dflag,
-        short lflag, float diff_mat[4][4], float alpha)
+        bGPdata *gpd, const bGPDframe *gpf, int offsx, int offsy, int winx, int winy, short dflag,
+        short lflag, const float diff_mat[4][4], float alpha)
 {
-	bGPDstroke *gps;
-
 	/* if alpha 0 do not draw */
 	if (alpha == 0.0f)
 		return;
@@ -1091,21 +1095,13 @@ static void gp_draw_strokes_edit(
 			/* first arg is normally rv3d->dist, but this isn't
 			 * available here and seems to work quite well without */
 			bglPolygonOffset(1.0f, 1.0f);
-#if 0
-			glEnable(GL_POLYGON_OFFSET_LINE);
-			glPolygonOffset(-1.0f, -1.0f);
-#endif
 		}
 	}
 
+	GPU_enable_program_point_size();
 
 	/* draw stroke verts */
-	for (gps = gpf->strokes.first; gps; gps = gps->next) {
-		bGPDspoint *pt;
-		float vsize, bsize;
-		int i;
-		float fpt[3];
-
+	for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 		/* check if stroke can be drawn */
 		if (gp_can_draw_stroke(gps, dflag) == false)
 			continue;
@@ -1135,7 +1131,8 @@ static void gp_draw_strokes_edit(
 		 *   they stand out more.
 		 * - We use the theme setting for size of the unselected verts
 		 */
-		bsize = UI_GetThemeValuef(TH_GP_VERTEX_SIZE);
+		float bsize = UI_GetThemeValuef(TH_GP_VERTEX_SIZE);
+		float vsize;
 		if ((int)bsize > 8) {
 			vsize = 10.0f;
 			bsize = 8.0f;
@@ -1144,81 +1141,75 @@ static void gp_draw_strokes_edit(
 			vsize = bsize + 2;
 		}
 
-		/* First Pass: Draw all the verts (i.e. these become the unselected state) */
 		/* for now, we assume that the base color of the points is not too close to the real color */
 		/* set color using palette */
 		bGPDpalettecolor *palcolor = ED_gpencil_stroke_getcolor(gpd, gps);
-		glColor3fv(palcolor->color);
 
-		glPointSize(bsize);
+		float selectColor[4];
+		UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, selectColor);
+		selectColor[3] = alpha;
+
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos; /* specified later */
+		unsigned int size = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+		unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		if (gps->flag & GP_STROKE_3DSPACE) {
+			pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
+		}
+		else {
+			pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR);
+		}
+
+		immBegin(GWN_PRIM_POINTS, gps->totpoints);
+
+		/* Draw start and end point differently if enabled stroke direction hint */
+		bool show_direction_hint = (gpd->flag & GP_DATA_SHOW_DIRECTION) && (gps->totpoints > 1);
+
+		/* Draw all the stroke points (selected or not) */
+		bGPDspoint *pt = gps->points;
+		float fpt[3];
+		for (int i = 0; i < gps->totpoints; i++, pt++) {
+			/* size and color first */
+			if (show_direction_hint && i == 0) {
+				/* start point in green bigger */
+				immAttrib3f(color, 0.0f, 1.0f, 0.0f);
+				immAttrib1f(size, vsize + 4);
+			}
+			else if (show_direction_hint && (i == gps->totpoints - 1)) {
+				/* end point in red smaller */
+				immAttrib3f(color, 1.0f, 0.0f, 0.0f);
+				immAttrib1f(size, vsize + 1);
+			}
+			else if (pt->flag & GP_SPOINT_SELECT) {
+				immAttrib3fv(color, selectColor);
+				immAttrib1f(size, vsize);
+			}
+			else {
+				immAttrib3fv(color, palcolor->color);
+				immAttrib1f(size, bsize);
+			}
 
-		glBegin(GL_POINTS);
-		for (i = 0, pt = gps->points; i < gps->totpoints && pt; i++, pt++) {
+			/* then position */
 			if (gps->flag & GP_STROKE_3DSPACE) {
 				mul_v3_m4v3(fpt, diff_mat, &pt->x);
-				glVertex3fv(fpt);
+				immVertex3fv(pos, fpt);
 			}
 			else {
 				float co[2];
 				mul_v3_m4v3(fpt, diff_mat, &pt->x);
 				gp_calc_2d_stroke_fxy(fpt, gps->flag, offsx, offsy, winx, winy, co);
-				glVertex2fv(co);
+				immVertex2fv(pos, co);
 			}
 		}
-		glEnd();
 
-
-		/* Second Pass: Draw only verts which are selected */
-		float curColor[4];
-		UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, curColor);
-		glColor4f(curColor[0], curColor[1], curColor[2], alpha);
-
-		glPointSize(vsize);
-
-		glBegin(GL_POINTS);
-		for (i = 0, pt = gps->points; i < gps->totpoints && pt; i++, pt++) {
-			if (pt->flag & GP_SPOINT_SELECT) {
-				if (gps->flag & GP_STROKE_3DSPACE) {
-					mul_v3_m4v3(fpt, diff_mat, &pt->x);
-					glVertex3fv(fpt);
-				}
-				else {
-					float co[2];
-
-					mul_v3_m4v3(fpt, diff_mat, &pt->x);
-					gp_calc_2d_stroke_fxy(fpt, gps->flag, offsx, offsy, winx, winy, co);
-					glVertex2fv(co);
-				}
-			}
-		}
-		glEnd();
-
-		/* Draw start and end point if enabled stroke direction hint */
-		if ((gpd->flag & GP_DATA_SHOW_DIRECTION) && (gps->totpoints > 1)) {
-			bGPDspoint *p;
-
-			glPointSize(vsize + 4);
-			glBegin(GL_POINTS);
-
-			/* start point in green bigger */
-			glColor3f(0.0f, 1.0f, 0.0f);
-			p = &gps->points[0];
-			mul_v3_m4v3(fpt, diff_mat, &p->x);
-			glVertex3fv(fpt);
-			glEnd();
-
-			/* end point in red smaller */
-			glPointSize(vsize + 1);
-			glBegin(GL_POINTS);
-
-			glColor3f(1.0f, 0.0f, 0.0f);
-			p = &gps->points[gps->totpoints - 1];
-			mul_v3_m4v3(fpt, diff_mat, &p->x);
-			glVertex3fv(fpt);
-			glEnd();
-		}
+		immEnd();
+		immUnbindProgram();
 	}
 
+	GPU_disable_program_point_size();
 
 	/* clear depth mask */
 	if (dflag & GP_DRAWDATA_ONLY3D) {
@@ -1239,8 +1230,8 @@ static void gp_draw_strokes_edit(
 
 /* draw onion-skinning for a layer */
 static void gp_draw_onionskins(
-        bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf, int offsx, int offsy, int winx, int winy,
-        int UNUSED(cfra), int dflag, bool debug, float diff_mat[4][4])
+        bGPdata *gpd, const bGPDlayer *gpl, const bGPDframe *gpf, int offsx, int offsy, int winx, int winy,
+        int UNUSED(cfra), int dflag, bool debug, const float diff_mat[4][4])
 {
 	const float default_color[3] = {UNPACK3(U.gpencil_new_layer_col)};
 	const float alpha = 1.0f;
@@ -1255,15 +1246,12 @@ static void gp_draw_onionskins(
 	}
 
 	if (gpl->gstep > 0) {
-		bGPDframe *gf;
-		float fac;
-
 		/* draw previous frames first */
-		for (gf = gpf->prev; gf; gf = gf->prev) {
+		for (bGPDframe *gf = gpf->prev; gf; gf = gf->prev) {
 			/* check if frame is drawable */
 			if ((gpf->framenum - gf->framenum) <= gpl->gstep) {
 				/* alpha decreases with distance from curframe index */
-				fac = 1.0f - ((float)(gpf->framenum - gf->framenum) / (float)(gpl->gstep + 1));
+				float fac = 1.0f - ((float)(gpf->framenum - gf->framenum) / (float)(gpl->gstep + 1));
 				color[3] = alpha * fac * 0.66f;
 				gp_draw_strokes(gpd, gf, offsx, offsy, winx, winy, dflag, debug, gpl->thickness, 1.0f, color,
 				                true, gpl->flag & GP_LAYER_GHOST_PREVCOL, diff_mat);
@@ -1284,7 +1272,6 @@ static void gp_draw_onionskins(
 		/* don't draw - disabled */
 	}
 
-
 	/* 2) Now draw next frames */
 	if (gpl->flag & GP_LAYER_GHOST_NEXTCOL) {
 		copy_v3_v3(color, gpl->gcolor_next);
@@ -1294,15 +1281,12 @@ static void gp_draw_onionskins(
 	}
 
 	if (gpl->gstep_next > 0) {
-		bGPDframe *gf;
-		float fac;
-
 		/* now draw next frames */
-		for (gf = gpf->next; gf; gf = gf->next) {
+		for (bGPDframe *gf = gpf->next; gf; gf = gf->next) {
 			/* check if frame is drawable */
 			if ((gf->framenum - gpf->framenum) <= gpl->gstep_next) {
 				/* alpha decreases with distance from curframe index */
-				fac = 1.0f - ((float)(gf->framenum - gpf->framenum) / (float)(gpl->gstep_next + 1));
+				float fac = 1.0f - ((float)(gf->framenum - gpf->framenum) / (float)(gpl->gstep_next + 1));
 				color[3] = alpha * fac * 0.66f;
 				gp_draw_strokes(gpd, gf, offsx, offsy, winx, winy, dflag, debug, gpl->thickness, 1.0f, color,
 				                true, gpl->flag & GP_LAYER_GHOST_NEXTCOL, diff_mat);
@@ -1322,7 +1306,6 @@ static void gp_draw_onionskins(
 	else {
 		/* don't draw - disabled */
 	}
-
 }
 
 /* draw interpolate strokes (used only while operator is running) */
@@ -1360,18 +1343,16 @@ void ED_gp_draw_interpolation(tGPDinterpolate *tgpi, const int type)
 
 /* loop over gpencil data layers, drawing them */
 static void gp_draw_data_layers(
-        bGPDbrush *brush, float alpha, bGPdata *gpd,
+        const bGPDbrush *brush, float alpha, bGPdata *gpd,
         int offsx, int offsy, int winx, int winy, int cfra, int dflag)
 {
-	bGPDlayer *gpl;
 	float diff_mat[4][4];
 
-	for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
-		bGPDframe *gpf;
+	for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 		/* calculate parent position */
 		ED_gpencil_parent_location(gpl, diff_mat);
 
-		bool debug = (gpl->flag & GP_LAYER_DRAWDEBUG) ? true : false;
+		bool debug = (gpl->flag & GP_LAYER_DRAWDEBUG);
 		short lthick = brush->thickness + gpl->thickness;
 
 		/* don't draw layer if hidden */
@@ -1379,7 +1360,7 @@ static void gp_draw_data_layers(
 			continue;
 
 		/* get frame to draw */
-		gpf = BKE_gpencil_layer_getframe(gpl, cfra, 0);
+		bGPDframe *gpf = BKE_gpencil_layer_getframe(gpl, cfra, 0);
 		if (gpf == NULL)
 			continue;
 
@@ -1447,9 +1428,6 @@ static void gp_draw_data_layers(
 		if (ED_gpencil_session_active() && (gpl->flag & GP_LAYER_ACTIVE) &&
 		    (gpf->flag & GP_FRAME_PAINT))
 		{
-			/* Set color for drawing buffer stroke - since this may not be set yet */
-			// glColor4fv(gpl->color);
-
 			/* Buffer stroke needs to be drawn with a different linestyle
 			 * to help differentiate them from normal strokes.
 			 *
@@ -1458,17 +1436,17 @@ static void gp_draw_data_layers(
 			 */
 			if (gpd->sflag & PC_COLOR_VOLUMETRIC) {
 				gp_draw_stroke_volumetric_buffer(gpd->sbuffer, gpd->sbuffer_size, lthick,
-				                                 dflag, gpd->sbuffer_sflag, gpd->scolor);
+				                                 dflag, gpd->scolor);
 			}
 			else {
-				gp_draw_stroke_buffer(gpd->sbuffer, gpd->sbuffer_size, lthick, dflag, gpd->sbuffer_sflag, gpd->scolor);
+				gp_draw_stroke_buffer(gpd->sbuffer, gpd->sbuffer_size, lthick, dflag, gpd->sbuffer_sflag, gpd->scolor, gpd->sfill);
 			}
 		}
 	}
 }
 
 /* draw a short status message in the top-right corner */
-static void gp_draw_status_text(bGPdata *gpd, ARegion *ar)
+static void gp_draw_status_text(const bGPdata *gpd, ARegion *ar)
 {
 	rcti rect;
 
@@ -1483,15 +1461,16 @@ static void gp_draw_status_text(bGPdata *gpd, ARegion *ar)
 	if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
 		const char *printable = IFACE_("GPencil Stroke Editing");
 		float       printable_size[2];
-		int xco, yco;
 
-		BLF_width_and_height_default(printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
+		int font_id = BLF_default();
+
+		BLF_width_and_height(font_id, printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
 
-		xco = (rect.xmax - U.widget_unit) - (int)printable_size[0];
-		yco = (rect.ymax - U.widget_unit);
+		int xco = (rect.xmax - U.widget_unit) - (int)printable_size[0];
+		int yco = (rect.ymax - U.widget_unit);
 
 		/* text label */
-		UI_ThemeColor(TH_TEXT_HI);
+		UI_FontThemeColor(font_id, TH_TEXT_HI);
 #ifdef WITH_INTERNATIONAL
 		BLF_draw_default(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
 #else
@@ -1500,7 +1479,7 @@ static void gp_draw_status_text(bGPdata *gpd, ARegion *ar)
 
 		/* grease pencil icon... */
 		// XXX: is this too intrusive?
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
 
 		xco -= U.widget_unit;
@@ -1514,12 +1493,9 @@ static void gp_draw_status_text(bGPdata *gpd, ARegion *ar)
 
 /* draw grease-pencil datablock */
 static void gp_draw_data(
-        bGPDbrush *brush, float alpha, bGPdata *gpd,
+        const bGPDbrush *brush, float alpha, bGPdata *gpd,
         int offsx, int offsy, int winx, int winy, int cfra, int dflag)
 {
-	/* reset line drawing style (in case previous user didn't reset) */
-	setlinestyle(0);
-
 	/* turn on smooth lines (i.e. anti-aliasing) */
 	glEnable(GL_LINE_SMOOTH);
 
@@ -1538,9 +1514,6 @@ static void gp_draw_data(
 	/* turn off alpha blending, then smooth lines */
 	glDisable(GL_BLEND); // alpha blending
 	glDisable(GL_LINE_SMOOTH); // smooth lines
-
-	/* restore initial gl conditions */
-	glColor4f(0, 0, 0, 1);
 }
 
 /* if we have strokes for scenes (3d view)/clips (movie clip editor)
@@ -1601,11 +1574,11 @@ void ED_gpencil_draw_2dimage(const bContext *C)
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
 	Scene *scene = CTX_data_scene(C);
-	bGPdata *gpd;
+
 	int offsx, offsy, sizex, sizey;
 	int dflag = GP_DRAWDATA_NOSTATUS;
 
-	gpd = ED_gpencil_data_get_active(C); // XXX
+	bGPdata *gpd = ED_gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 
 	/* calculate rect */
@@ -1613,7 +1586,6 @@ void ED_gpencil_draw_2dimage(const bContext *C)
 		case SPACE_IMAGE: /* image */
 		case SPACE_CLIP: /* clip */
 		{
-
 			/* just draw using standard scaling (settings here are currently ignored anyways) */
 			/* FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled */
 			offsx = 0;
@@ -1657,26 +1629,24 @@ void ED_gpencil_draw_2dimage(const bContext *C)
 		dflag |= GP_DRAWDATA_NO_ONIONS;
 	}
 
-
 	/* draw it! */
 	gp_draw_data_all(scene, gpd, offsx, offsy, sizex, sizey, CFRA, dflag, sa->spacetype);
 }
 
 /* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly
- * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes,
- * second time with onlyv2d=0 for screen-aligned strokes */
+ * Note: this gets called twice - first time with onlyv2d=true to draw 'canvas' strokes,
+ * second time with onlyv2d=false for screen-aligned strokes */
 void ED_gpencil_draw_view2d(const bContext *C, bool onlyv2d)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
 	Scene *scene = CTX_data_scene(C);
-	bGPdata *gpd;
 	int dflag = 0;
 
 	/* check that we have grease-pencil stuff to draw */
 	if (sa == NULL) return;
-	gpd = ED_gpencil_data_get_active(C); // XXX
+	bGPdata *gpd = ED_gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 
 	/* special hack for Image Editor */
@@ -1691,30 +1661,35 @@ void ED_gpencil_draw_view2d(const bContext *C, bool onlyv2d)
 	gp_draw_data_all(scene, gpd, 0, 0, ar->winx, ar->winy, CFRA, dflag, sa->spacetype);
 
 	/* draw status text (if in screen/pixel-space) */
-	if (onlyv2d == false) {
+	if (!onlyv2d) {
 		gp_draw_status_text(gpd, ar);
 	}
 }
 
 /* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly
- * Note: this gets called twice - first time with only3d=1 to draw 3d-strokes,
- * second time with only3d=0 for screen-aligned strokes */
-void ED_gpencil_draw_view3d(wmWindowManager *wm, Scene *scene, View3D *v3d, ARegion *ar, bool only3d)
+ * Note: this gets called twice - first time with only3d=true to draw 3d-strokes,
+ * second time with only3d=false for screen-aligned strokes */
+void ED_gpencil_draw_view3d(wmWindowManager *wm,
+                            Scene *scene,
+                            ViewLayer *view_layer,
+                            struct Depsgraph *depsgraph,
+                            View3D *v3d,
+                            ARegion *ar,
+                            bool only3d)
 {
-	bGPdata *gpd;
 	int dflag = 0;
 	RegionView3D *rv3d = ar->regiondata;
 	int offsx,  offsy,  winx,  winy;
 
 	/* check that we have grease-pencil stuff to draw */
-	gpd = ED_gpencil_data_get_active_v3d(scene, v3d);
+	bGPdata *gpd = ED_gpencil_data_get_active_v3d(scene, view_layer);
 	if (gpd == NULL) return;
 
 	/* when rendering to the offscreen buffer we don't want to
 	 * deal with the camera border, otherwise map the coords to the camera border. */
 	if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) {
 		rctf rectf;
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &rectf, true); /* no shift */
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &rectf, true); /* no shift */
 
 		offsx = round_fl_to_int(rectf.xmin);
 		offsy = round_fl_to_int(rectf.ymin);
@@ -1751,7 +1726,6 @@ void ED_gpencil_draw_view3d(wmWindowManager *wm, Scene *scene, View3D *v3d, AReg
 
 	/* draw it! */
 	gp_draw_data_all(scene, gpd, offsx, offsy, winx, winy, CFRA, dflag, v3d->spacetype);
-
 }
 
 void ED_gpencil_draw_ex(Scene *scene, bGPdata *gpd, int winx, int winy, const int cfra, const char spacetype)
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index c35b64de991..c2e532be0b3 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -74,8 +74,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
 
 #include "gpencil_intern.h"
 
@@ -404,7 +404,7 @@ static void gp_brush_grab_calc_dvec(tGP_BrushEditData *gso)
 	if (gso->sa->spacetype == SPACE_VIEW3D) {
 		View3D *v3d = gso->sa->spacedata.first;
 		RegionView3D *rv3d = gso->ar->regiondata;
-		float *rvec = ED_view3d_cursor3d_get(gso->scene, v3d);
+		float *rvec = ED_view3d_cursor3d_get(gso->scene, v3d)->location;
 		float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 
 		float mval_f[2];
@@ -504,7 +504,7 @@ static void gp_brush_calc_midpoint(tGP_BrushEditData *gso)
 		 */
 		View3D *v3d = gso->sa->spacedata.first;
 		RegionView3D *rv3d = gso->ar->regiondata;
-		float *rvec = ED_view3d_cursor3d_get(gso->scene, v3d);
+		float *rvec = ED_view3d_cursor3d_get(gso->scene, v3d)->location;
 		float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 
 		float mval_f[2] = {UNPACK2(gso->mval)};
@@ -980,26 +980,26 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customda
 	GP_EditBrush_Data *brush = gpsculpt_get_brush(CTX_data_scene(C));
 
 	if (brush) {
-		glPushMatrix();
-
-		glTranslatef((float)x, (float)y, 0.0f);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
 
 		/* Inner Ring: Light color for action of the brush */
 		/* TODO: toggle between add and remove? */
-		glColor4ub(255, 255, 255, 200);
-		glutil_draw_lined_arc(0.0, M_PI * 2.0, brush->size, 40);
+		immUniformColor4ub(255, 255, 255, 200);
+		imm_draw_circle_wire_2d(pos, x, y, brush->size, 40);
 
 		/* Outer Ring: Dark color for contrast on light backgrounds (e.g. gray on white) */
-		glColor3ub(30, 30, 30);
-		glutil_draw_lined_arc(0.0, M_PI * 2.0, brush->size + 1, 40);
+		immUniformColor3ub(30, 30, 30);
+		imm_draw_circle_wire_2d(pos, x, y, brush->size + 1, 40);
+
+		immUnbindProgram();
 
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
-
-		glPopMatrix();
 	}
 }
 
diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c
index f44c3ee4113..72331d9e588 100644
--- a/source/blender/editors/gpencil/gpencil_convert.c
+++ b/source/blender/editors/gpencil/gpencil_convert.c
@@ -48,6 +48,7 @@
 
 #include "DNA_anim_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_group_types.h"
 #include "DNA_object_types.h"
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
@@ -55,13 +56,15 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_workspace_types.h"
 
+#include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
@@ -69,6 +72,8 @@
 #include "BKE_screen.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 
 #include "WM_api.h"
@@ -172,7 +177,7 @@ static void gp_strokepoint_convertcoords(
 		copy_v3_v3(p3d, &pt->x);
 	}
 	else {
-		const float *fp = ED_view3d_cursor3d_get(scene, v3d);
+		const float *fp = ED_view3d_cursor3d_get(scene, v3d)->location;
 		float mvalf[2];
 
 		/* get screen coordinate */
@@ -368,7 +373,7 @@ static void gp_stroke_path_animation_preprocess_gaps(tGpTimingData *gtd, RNG *rn
 	}
 }
 
-static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu,
+static void gp_stroke_path_animation_add_keyframes(Depsgraph *depsgraph, ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu,
                                                    Curve *cu, tGpTimingData *gtd, RNG *rng, const float time_range,
                                                    const int nbr_gaps, const float tot_gaps_time)
 {
@@ -417,7 +422,7 @@ static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerR
 				if ((cfra - last_valid_time) < MIN_TIME_DELTA) {
 					cfra = last_valid_time + MIN_TIME_DELTA;
 				}
-				insert_keyframe_direct(reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
+				insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
 				last_valid_time = cfra;
 			}
 			else if (G.debug & G_DEBUG) {
@@ -429,7 +434,7 @@ static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerR
 			if ((cfra - last_valid_time) < MIN_TIME_DELTA) {
 				cfra = last_valid_time + MIN_TIME_DELTA;
 			}
-			insert_keyframe_direct(reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
+			insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
 			last_valid_time = cfra;
 		}
 		else {
@@ -437,7 +442,7 @@ static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerR
 			 * and also far enough from (not yet added!) end_stroke keyframe!
 			 */
 			if ((cfra - last_valid_time) > MIN_TIME_DELTA && (end_stroke_time - cfra) > MIN_TIME_DELTA) {
-				insert_keyframe_direct(reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_BREAKDOWN, INSERTKEY_FAST);
+				insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_BREAKDOWN, INSERTKEY_FAST);
 				last_valid_time = cfra;
 			}
 			else if (G.debug & G_DEBUG) {
@@ -450,6 +455,7 @@ static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerR
 
 static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu, tGpTimingData *gtd)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	bAction *act;
 	FCurve *fcu;
@@ -491,7 +497,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
 
 		cu->ctime = 0.0f;
 		cfra = (float)gtd->start_frame;
-		insert_keyframe_direct(reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
+		insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
 
 		cu->ctime = cu->pathlen;
 		if (gtd->realtime) {
@@ -500,7 +506,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
 		else {
 			cfra = (float)gtd->end_frame;
 		}
-		insert_keyframe_direct(reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
+		insert_keyframe_direct(depsgraph, reports, ptr, prop, fcu, cfra, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST);
 	}
 	else {
 		/* Use actual recorded timing! */
@@ -526,7 +532,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
 			printf("GP Stroke Path Conversion: Starting keying!\n");
 		}
 
-		gp_stroke_path_animation_add_keyframes(reports, ptr, prop, fcu, cu, gtd, rng, time_range,
+		gp_stroke_path_animation_add_keyframes(depsgraph, reports, ptr, prop, fcu, cu, gtd, rng, time_range,
 		                                       nbr_gaps, tot_gaps_time);
 
 		BLI_rng_free(rng);
@@ -546,7 +552,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
 	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 
 	/* send updates */
-	DAG_id_tag_update(&cu->id, 0);
+	DEG_id_tag_update(&cu->id, 0);
 }
 
 #undef MIN_TIME_DELTA
@@ -1108,7 +1114,8 @@ static int gp_camera_view_subrect(bContext *C, rctf *subrect)
 		/* for camera view set the subrect */
 		if (rv3d->persp == RV3D_CAMOB) {
 			Scene *scene = CTX_data_scene(C);
-			ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, subrect, true); /* no shift */
+			Depsgraph *depsgraph = CTX_data_depsgraph(C);
+			ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, subrect, true); /* no shift */
 			return 1;
 		}
 	}
@@ -1121,14 +1128,15 @@ static void gp_layer_to_curve(bContext *C, ReportList *reports, bGPdata *gpd, bG
                               const bool norm_weights, const float rad_fac, const bool link_strokes, tGpTimingData *gtd)
 {
 	struct Main *bmain = CTX_data_main(C);
-	View3D *v3d = CTX_wm_view3d(C);  /* may be NULL */
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Collection *collection = CTX_data_collection(C);
 	bGPDframe *gpf = BKE_gpencil_layer_getframe(gpl, CFRA, 0);
 	bGPDstroke *gps, *prev_gps = NULL;
 	Object *ob;
 	Curve *cu;
 	Nurb *nu = NULL;
-	Base *base_orig = BASACT, *base_new = NULL;
+	Base *base_new = NULL;
 	float minmax_weights[2] = {1.0f, 0.0f};
 
 	/* camera framing */
@@ -1152,7 +1160,8 @@ static void gp_layer_to_curve(bContext *C, ReportList *reports, bGPdata *gpd, bG
 	 */
 	ob = BKE_object_add_only_object(bmain, OB_CURVE, gpl->info);
 	cu = ob->data = BKE_curve_add(bmain, gpl->info, OB_CURVE);
-	base_new = BKE_scene_base_add(scene, ob);
+	BKE_collection_object_add(bmain, collection, ob);
+	base_new = BKE_view_layer_base_find(view_layer, ob);
 
 	cu->flag |= CU_3D;
 
@@ -1216,8 +1225,8 @@ static void gp_layer_to_curve(bContext *C, ReportList *reports, bGPdata *gpd, bG
 	}
 
 	/* set the layer and select */
-	base_new->lay  = ob->lay  = base_orig ? base_orig->lay : BKE_screen_view3d_layer_active(v3d, scene);
-	base_new->flag = ob->flag = base_new->flag | SELECT;
+	base_new->flag |= SELECT;
+	BKE_scene_object_base_flag_sync_from_base(base_new);
 }
 
 /* --- */
@@ -1287,6 +1296,7 @@ static int gp_convert_poll(bContext *C)
 	bGPDframe *gpf = NULL;
 	ScrArea *sa = CTX_wm_area(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	/* only if the current view is 3D View, if there's valid data (i.e. at least one stroke!),
 	 * and if we are not in edit mode!
@@ -1295,7 +1305,7 @@ static int gp_convert_poll(bContext *C)
 	        (gpl = BKE_gpencil_layer_getactive(gpd)) &&
 	        (gpf = BKE_gpencil_layer_getframe(gpl, CFRA, 0)) &&
 	        (gpf->strokes.first) &&
-	        (scene->obedit == NULL));
+	        (OBEDIT_FROM_VIEW_LAYER(view_layer) == NULL));
 }
 
 static int gp_convert_layer_exec(bContext *C, wmOperator *op)
@@ -1442,7 +1452,7 @@ static void gp_convert_ui(bContext *C, wmOperator *op)
 	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 	/* Main auto-draw call */
-	uiDefAutoButsRNA(layout, &ptr, gp_convert_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, gp_convert_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 
 void GPENCIL_OT_convert(wmOperatorType *ot)
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d48efd75746..9f01c1d0cd7 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -78,6 +78,8 @@
 #include "ED_view3d.h"
 #include "ED_space_api.h"
 
+#include "DEG_depsgraph.h"
+
 #include "gpencil_intern.h"
 
 /* ************************************************ */
@@ -1462,7 +1464,7 @@ static int gp_snap_to_cursor(bContext *C, wmOperator *op)
 	View3D *v3d = CTX_wm_view3d(C);
 
 	const bool use_offset = RNA_boolean_get(op->ptr, "use_offset");
-	const float *cursor_global = ED_view3d_cursor3d_get(scene, v3d);
+	const float *cursor_global = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 		/* only editable and visible layers are considered */
@@ -1549,7 +1551,7 @@ static int gp_snap_cursor_to_sel(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
-	float *cursor = ED_view3d_cursor3d_get(scene, v3d);
+	float *cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
 	float centroid[3] = {0.0f};
 	float min[3], max[3];
 	size_t count = 0;
@@ -1604,7 +1606,7 @@ static int gp_snap_cursor_to_sel(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 
-	if (v3d->around == V3D_AROUND_CENTER_MEAN && count) {
+	if (scene->toolsettings->transform_pivot_point == V3D_AROUND_CENTER_MEAN && count) {
 		mul_v3_fl(centroid, 1.0f / (float)count);
 		copy_v3_v3(cursor, centroid);
 	}
@@ -2107,8 +2109,9 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op)
 
 	/* init autodist for geometry projection */
 	if (mode == GP_REPROJECT_SURFACE) {
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		view3d_region_operator_needs_opengl(CTX_wm_window(C), gsc.ar);
-		ED_view3d_autodist_init(scene, gsc.ar, CTX_wm_view3d(C), 0);
+		ED_view3d_autodist_init(depsgraph, gsc.ar, CTX_wm_view3d(C), 0);
 	}
 
 	// TODO: For deforming geometry workflow, create new frames?
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 84a106856b3..cb6ccc8d8ef 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -290,28 +290,6 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
 	/* Move to Layer */
 	WM_keymap_add_item(keymap, "GPENCIL_OT_move_to_layer", MKEY, KM_PRESS, 0, 0);
 
-	/* Select drawing brush using index */
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", ONEKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 0);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", TWOKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 1);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", THREEKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 2);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", FOURKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 3);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", FIVEKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 4);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", SIXKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 5);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", SEVENKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 6);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", EIGHTKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 7);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", NINEKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 8);
-	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_brush_select", ZEROKEY, KM_PRESS, 0, 0);
-	RNA_int_set(kmi->ptr, "index", 9);
-
 	/* Transform Tools */
 	kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0);
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index af140501069..c28d80a801f 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -68,15 +68,19 @@
 #include "ED_view3d.h"
 #include "ED_clip.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "gpencil_intern.h"
 
 /* ******************************************* */
@@ -112,6 +116,7 @@ typedef enum eGPencil_PaintFlags {
  */
 typedef struct tGPsdata {
 	Scene *scene;       /* current scene from context */
+	struct Depsgraph *depsgraph;
 
 	wmWindow *win;      /* window where painting originated */
 	ScrArea *sa;        /* area where painting originated */
@@ -231,7 +236,7 @@ static bool gpencil_project_check(tGPsdata *p)
 static void gp_get_3d_reference(tGPsdata *p, float vec[3])
 {
 	View3D *v3d = p->sa->spacedata.first;
-	const float *fp = ED_view3d_cursor3d_get(p->scene, v3d);
+	const float *fp = ED_view3d_cursor3d_get(p->scene, v3d)->location;
 
 	/* the reference point used depends on the owner... */
 #if 0 /* XXX: disabled for now, since we can't draw relative to the owner yet */
@@ -480,7 +485,8 @@ static void gp_brush_angle(bGPdata *gpd, bGPDbrush *brush, tGPspoint *pt, const
 }
 
 /* add current stroke-point to buffer (returns whether point was successfully added) */
-static short gp_stroke_addpoint(tGPsdata *p, const int mval[2], float pressure, double curtime)
+static short gp_stroke_addpoint(
+        tGPsdata *p, const int mval[2], float pressure, double curtime)
 {
 	bGPdata *gpd = p->gpd;
 	bGPDbrush *brush = p->brush;
@@ -638,7 +644,8 @@ static short gp_stroke_addpoint(tGPsdata *p, const int mval[2], float pressure,
 				View3D *v3d = p->sa->spacedata.first;
 
 				view3d_region_operator_needs_opengl(p->win, p->ar);
-				ED_view3d_autodist_init(p->scene, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
+				ED_view3d_autodist_init(
+				        p->depsgraph, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
 			}
 
 			/* convert screen-coordinates to appropriate coordinates (and store them) */
@@ -672,7 +679,7 @@ static short gp_stroke_addpoint(tGPsdata *p, const int mval[2], float pressure,
 
 /* simplify a stroke (in buffer) before storing it
  *	- applies a reverse Chaikin filter
- *	- code adapted from etch-a-ton branch (editarmature_sketch.c)
+ *	- code adapted from etch-a-ton branch
  */
 static void gp_stroke_simplify(tGPsdata *p)
 {
@@ -1238,9 +1245,8 @@ static void gp_stroke_doeraser(tGPsdata *p)
 	if (p->sa->spacetype == SPACE_VIEW3D) {
 		if (p->flags & GP_PAINTFLAG_V3D_ERASER_DEPTH) {
 			View3D *v3d = p->sa->spacedata.first;
-
 			view3d_region_operator_needs_opengl(p->win, p->ar);
-			ED_view3d_autodist_init(p->scene, p->ar, v3d, 0);
+			ED_view3d_autodist_init(p->depsgraph, p->ar, v3d, 0);
 		}
 	}
 
@@ -1394,6 +1400,7 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
 
 	/* pass on current scene and window */
 	p->scene = CTX_data_scene(C);
+	p->depsgraph = CTX_data_depsgraph(C);
 	p->win = CTX_wm_window(C);
 
 	unit_m4(p->imat);
@@ -1548,6 +1555,7 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
 	bGPDpalettecolor *palcolor = p->palettecolor;
 	bGPdata *pdata = p->gpd;
 	copy_v4_v4(pdata->scolor, palcolor->color);
+	copy_v4_v4(pdata->sfill, palcolor->fill);
 	pdata->sflag = palcolor->flag;
 	/* lock axis */
 	p->lock_axis = ts->gp_sculpt.lock_axis;
@@ -1598,7 +1606,7 @@ static void gp_session_cleanup(tGPsdata *p)
 }
 
 /* init new stroke */
-static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode)
+static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Depsgraph *depsgraph)
 {
 	Scene *scene = p->scene;
 	ToolSettings *ts = scene->toolsettings;
@@ -1727,7 +1735,7 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode)
 
 			/* for camera view set the subrect */
 			if (rv3d->persp == RV3D_CAMOB) {
-				ED_view3d_calc_camera_border(p->scene, p->ar, v3d, rv3d, &p->subrect_data, true); /* no shift */
+				ED_view3d_calc_camera_border(p->scene, depsgraph, p->ar, v3d, rv3d, &p->subrect_data, true); /* no shift */
 				p->subrect = &p->subrect_data;
 			}
 		}
@@ -1805,7 +1813,7 @@ static void gp_paint_strokeend(tGPsdata *p)
 
 		/* need to restore the original projection settings before packing up */
 		view3d_region_operator_needs_opengl(p->win, p->ar);
-		ED_view3d_autodist_init(p->scene, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
+		ED_view3d_autodist_init(p->depsgraph, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
 	}
 
 	/* check if doing eraser or not */
@@ -1845,26 +1853,39 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
 	tGPsdata *p = (tGPsdata *)p_ptr;
 
 	if (p->paintmode == GP_PAINTMODE_ERASER) {
-		glPushMatrix();
-
-		glTranslatef((float)x, (float)y, 0.0f);
+		Gwn_VertFormat *format = immVertexFormat();
+		const uint shdr_pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+		immUniformColor4ub(255, 100, 100, 20);
+		imm_draw_circle_fill_2d(shdr_pos, x, y, p->radius, 40);
 
-		glColor4ub(255, 100, 100, 20);
-		glutil_draw_filled_arc(0.0, M_PI * 2.0, p->radius, 40);
+		immUnbindProgram();
 
-		setlinestyle(6);
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-		glColor4ub(255, 100, 100, 200);
-		glutil_draw_lined_arc(0.0, M_PI * 2.0, p->radius, 40);
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+		immUniformColor4f(1.0f, 0.39f, 0.39f, 0.78f);
+		immUniform1i("num_colors", 0);  /* "simple" mode */
+		immUniform1f("dash_width", 12.0f);
+		immUniform1f("dash_factor", 0.5f);
+
+		imm_draw_circle_wire_2d(shdr_pos, x, y, p->radius,
+		                     /* XXX Dashed shader gives bad results with sets of small segments currently,
+		                      *     temp hack around the issue. :( */
+		                     max_ii(8, p->radius / 2));  /* was fixed 40 */
+
+		immUnbindProgram();
 
-		setlinestyle(0);
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
-
-		glPopMatrix();
 	}
 }
 
@@ -1955,7 +1976,7 @@ static int gpencil_draw_init(bContext *C, wmOperator *op, const wmEvent *event)
 	}
 
 	/* init painting data */
-	gp_paint_initstroke(p, paintmode);
+	gp_paint_initstroke(p, paintmode, CTX_data_depsgraph(C));
 	if (p->status == GP_STATUS_ERROR) {
 		gpencil_draw_exit(C, op);
 		return 0;
@@ -2032,7 +2053,7 @@ static void gpencil_draw_status_indicators(tGPsdata *p)
 /* ------------------------------- */
 
 /* create a new stroke point at the point indicated by the painting context */
-static void gpencil_draw_apply(wmOperator *op, tGPsdata *p)
+static void gpencil_draw_apply(wmOperator *op, tGPsdata *p, Depsgraph *depsgraph)
 {
 	/* handle drawing/erasing -> test for erasing first */
 	if (p->paintmode == GP_PAINTMODE_ERASER) {
@@ -2054,7 +2075,7 @@ static void gpencil_draw_apply(wmOperator *op, tGPsdata *p)
 			/* finish off old stroke */
 			gp_paint_strokeend(p);
 			/* And start a new one!!! Else, projection errors! */
-			gp_paint_initstroke(p, p->paintmode);
+			gp_paint_initstroke(p, p->paintmode, depsgraph);
 
 			/* start a new stroke, starting from previous point */
 			/* XXX Must manually reset inittime... */
@@ -2087,7 +2108,7 @@ static void gpencil_draw_apply(wmOperator *op, tGPsdata *p)
 }
 
 /* handle draw event */
-static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event)
+static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event, Depsgraph *depsgraph)
 {
 	tGPsdata *p = op->customdata;
 	PointerRNA itemptr;
@@ -2192,7 +2213,7 @@ static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event)
 	RNA_float_set(&itemptr, "time", p->curtime - p->inittime);
 
 	/* apply the current latest drawing point */
-	gpencil_draw_apply(op, p);
+	gpencil_draw_apply(op, p, depsgraph);
 
 	/* force refresh */
 	ED_region_tag_redraw(p->ar); /* just active area for now, since doing whole screen is too slow */
@@ -2204,6 +2225,7 @@ static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event)
 static int gpencil_draw_exec(bContext *C, wmOperator *op)
 {
 	tGPsdata *p = NULL;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	/* printf("GPencil - Starting Re-Drawing\n"); */
 
@@ -2241,7 +2263,7 @@ static int gpencil_draw_exec(bContext *C, wmOperator *op)
 			if ((p->flags & GP_PAINTFLAG_FIRSTRUN) == 0) {
 				/* TODO: both of these ops can set error-status, but we probably don't need to worry */
 				gp_paint_strokeend(p);
-				gp_paint_initstroke(p, p->paintmode);
+				gp_paint_initstroke(p, p->paintmode, depsgraph);
 			}
 		}
 
@@ -2256,7 +2278,7 @@ static int gpencil_draw_exec(bContext *C, wmOperator *op)
 		}
 
 		/* apply this data as necessary now (as per usual) */
-		gpencil_draw_apply(op, p);
+		gpencil_draw_apply(op, p, depsgraph);
 	}
 	RNA_END;
 
@@ -2315,7 +2337,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
 		p->status = GP_STATUS_PAINTING;
 
 		/* handle the initial drawing - i.e. for just doing a simple dot */
-		gpencil_draw_apply_event(op, event);
+		gpencil_draw_apply_event(op, event, CTX_data_depsgraph(C));
 		op->flag |= OP_IS_MODAL_CURSOR_REGION;
 	}
 	else {
@@ -2356,7 +2378,7 @@ static tGPsdata *gpencil_stroke_begin(bContext *C, wmOperator *op)
 	 *      it'd be nice to allow changing paint-mode when in sketching-sessions */
 
 	if (gp_session_initdata(C, p))
-		gp_paint_initstroke(p, p->paintmode);
+		gp_paint_initstroke(p, p->paintmode, CTX_data_depsgraph(C));
 
 	if (p->status != GP_STATUS_ERROR) {
 		p->status = GP_STATUS_PAINTING;
@@ -2647,7 +2669,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
 		if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) || (p->flags & GP_PAINTFLAG_FIRSTRUN)) {
 			/* handle drawing event */
 			/* printf("\t\tGP - add point\n"); */
-			gpencil_draw_apply_event(op, event);
+			gpencil_draw_apply_event(op, event, CTX_data_depsgraph(C));
 
 			/* finish painting operation if anything went wrong just now */
 			if (p->status == GP_STATUS_ERROR) {
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 707afa72c6a..861fdcac080 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -65,6 +65,8 @@
 #include "ED_clip.h"
 #include "ED_view3d.h"
 
+#include "DEG_depsgraph.h"
+
 #include "gpencil_intern.h"
 
 /* ******************************************************** */
@@ -202,15 +204,15 @@ bGPdata *ED_gpencil_data_get_active(const bContext *C)
 /* -------------------------------------------------------- */
 
 // XXX: this should be removed... We really shouldn't duplicate logic like this!
-bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, View3D *v3d)
+bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, ViewLayer *view_layer)
 {
-	Base *base = scene->basact;
+	Base *base = view_layer->basact;
 	bGPdata *gpd = NULL;
 	/* We have to make sure active object is actually visible and selected, else we must use default scene gpd,
 	 * to be consistent with ED_gpencil_data_get_active's behavior.
 	 */
 
-	if (base && TESTBASE(v3d, base)) {
+	if (base && TESTBASE(base)) {
 		gpd = base->object->gpd;
 	}
 	return gpd ? gpd : scene->gpd;
@@ -536,6 +538,7 @@ void gp_point_conversion_init(bContext *C, GP_SpaceConversion *r_gsc)
 	if (sa->spacetype == SPACE_VIEW3D) {
 		wmWindow *win = CTX_wm_window(C);
 		Scene *scene = CTX_data_scene(C);
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		View3D *v3d = (View3D *)CTX_wm_space_data(C);
 		RegionView3D *rv3d = ar->regiondata;
 
@@ -543,11 +546,11 @@ void gp_point_conversion_init(bContext *C, GP_SpaceConversion *r_gsc)
 		view3d_operator_needs_opengl(C);
 
 		view3d_region_operator_needs_opengl(win, ar);
-		ED_view3d_autodist_init(scene, ar, v3d, 0);
+		ED_view3d_autodist_init(depsgraph, ar, v3d, 0);
 
 		/* for camera view set the subrect */
 		if (rv3d->persp == RV3D_CAMOB) {
-			ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &r_gsc->subrect_data, true); /* no shift */
+			ED_view3d_calc_camera_border(scene, CTX_data_depsgraph(C), ar, v3d, rv3d, &r_gsc->subrect_data, true); /* no shift */
 			r_gsc->subrect = &r_gsc->subrect_data;
 		}
 	}
@@ -742,7 +745,7 @@ bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, Scene *scene, const float screen
 {
 	View3D *v3d = gsc->sa->spacedata.first;
 	RegionView3D *rv3d = gsc->ar->regiondata;
-	float *rvec = ED_view3d_cursor3d_get(scene, v3d);
+	float *rvec = ED_view3d_cursor3d_get(scene, v3d)->location;
 	float ref[3] = {rvec[0], rvec[1], rvec[2]};
 	float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 
@@ -912,8 +915,8 @@ bool gp_smooth_stroke_thickness(bGPDstroke *gps, int i, float inf)
 	ptc = &gps->points[after];
 
 	/* the optimal value is the corresponding to the interpolation of the pressure
-	*  at the distance of point b
-	*/
+	 *  at the distance of point b
+	 */
 	float fac = line_point_factor_v3(&ptb->x, &pta->x, &ptc->x);
 	float optimal = (1.0f - fac) * pta->pressure + fac * ptc->pressure;
 
diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h
index 4ec1e791499..f91e7d42bca 100644
--- a/source/blender/editors/include/BIF_gl.h
+++ b/source/blender/editors/include/BIF_gl.h
@@ -36,45 +36,6 @@
 #include "GPU_glew.h"
 #include "BLI_utildefines.h"
 
-/*
- * these should be phased out. cpack should be replaced in
- * code with calls to glColor3ub. - zr
- */
-/*
- *
- * This define converts a numerical value to the equivalent 24-bit
- * color, while not being endian-sensitive. On little-endians, this
- * is the same as doing a 'naive' indexing, on big-endian, it is not!
- * */
-void cpack(unsigned int x);
-
-#ifdef WITH_GL_PROFILE_COMPAT
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-#  define glMultMatrixf(x)  \
-	glMultMatrixf(_Generic((x), \
-	        float *:      (float *)(x), \
-	        float [16]:   (float *)(x), \
-	        float (*)[4]: (float *)(x), \
-	        float [4][4]: (float *)(x), \
-	        const float *:      (float *)(x), \
-	        const float [16]:   (float *)(x), \
-	        const float (*)[4]: (float *)(x), \
-	        const float [4][4]: (float *)(x)) \
-)
-#  define glLoadMatrixf(x)  \
-	glLoadMatrixf(_Generic((x), \
-	        float *:      (float *)(x), \
-	        float [16]:   (float *)(x), \
-	        float (*)[4]: (float *)(x), \
-	        float [4][4]: (float *)(x)) \
-)
-#else
-#  define glMultMatrixf(x)  glMultMatrixf((float *)(x))
-#  define glLoadMatrixf(x)  glLoadMatrixf((float *)(x))
-#endif  /* C11 */
-#endif  /* WITH_GL_PROFILE_COMPAT */
-
-
 /* hacking pointsize and linewidth */
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #  define glPointSize(f)  glPointSize(U.pixelsize * _Generic((f), double: (float)(f), default: (f)))
@@ -86,19 +47,5 @@ void cpack(unsigned int x);
 
 #define GLA_PIXEL_OFS 0.375f
 
-
-BLI_INLINE void glTranslate3iv(const int vec[3])    { glTranslatef(UNPACK3_EX((const float), vec, ));       }
-BLI_INLINE void glTranslate2iv(const int vec[2])    { glTranslatef(UNPACK2_EX((const float), vec, ), 0.0f); }
-BLI_INLINE void glTranslate3fv(const float vec[3])  { glTranslatef(UNPACK3(vec));       }
-BLI_INLINE void glTranslate2fv(const float vec[2])  { glTranslatef(UNPACK2(vec), 0.0f); }
-
-BLI_INLINE void glScale3iv(const int vec[3])    { glTranslatef(UNPACK3_EX((const float), vec, ));       }
-BLI_INLINE void glScale2iv(const int vec[2])    { glTranslatef(UNPACK2_EX((const float), vec, ), 0.0f); }
-BLI_INLINE void glScale3fv(const float vec[3])  { glScalef(UNPACK3(vec));      }
-BLI_INLINE void glScale2fv(const float vec[2])  { glScalef(UNPACK2(vec), 0.0); }
-
-/* v2 versions don't make much sense for rotation */
-BLI_INLINE void glRotate3fv(const float angle, const float vec[3])   { glRotatef(angle, UNPACK3(vec)); }
-
 #endif /* #ifdef __BIF_GL_H__ */
 
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index d3d2c465d46..863d817d19a 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -38,56 +38,14 @@ struct bContext;
 struct ColorManagedViewSettings;
 struct ColorManagedDisplaySettings;
 
-void fdrawbezier(float vec[4][3]);
-void fdrawline(float x1, float y1, float x2, float y2);
-void fdrawbox(float x1, float y1, float x2, float y2);
-void sdrawline(int x1, int y1, int x2, int y2);
-#if 0
-void sdrawtri(int x1, int y1, int x2, int y2);
-void sdrawtrifill(int x1, int y1, int x2, int y2);
-#endif
-void sdrawbox(int x1, int y1, int x2, int y2);
-
-void sdrawXORline(int x0, int y0, int x1, int y1);
-void sdrawXORline4(int nr, int x0, int y0, int x1, int y1);
-
-void fdrawXORellipse(float xofs, float yofs, float hw, float hh);
-void fdrawXORcirc(float xofs, float yofs, float rad);
-
-void fdrawcheckerboard(float x1, float y1, float x2, float y2);
-
-/* OpenGL stipple defines */
-extern const unsigned char stipple_halftone[128];
-extern const unsigned char stipple_quarttone[128];
-extern const unsigned char stipple_diag_stripes_pos[128];
-extern const unsigned char stipple_diag_stripes_neg[128];
-extern const unsigned char stipple_checker_8px[128];
-
-/**
- * Draw a lined (non-looping) arc with the given
- * \a radius, starting at angle \a start and arcing
- * through \a angle. The arc is centered at the origin
- * and drawn in the XY plane.
+/* A few functions defined here are being DEPRECATED for Blender 2.8
  *
- * \param start The initial angle (in radians).
- * \param angle The length of the arc (in radians).
- * \param radius The arc radius.
- * \param nsegments The number of segments to use in drawing the arc.
- */
-void glutil_draw_lined_arc(float start, float angle, float radius, int nsegments);
-
-/**
- * Draw a filled arc with the given \a radius,
- * starting at angle \a start and arcing through
- * \a angle. The arc is centered at the origin
- * and drawn in the XY plane.
+ * Do not use them in new code, and you are encouraged to
+ * convert existing code to draw without these.
  *
- * \param start The initial angle (in radians).
- * \param angle The length of the arc (in radians).
- * \param radius The arc radius.
- * \param nsegments The number of segments to use in drawing the arc.
+ * These will be deleted before we ship 2.8!
+ * - merwin
  */
-void glutil_draw_filled_arc(float start, float angle, float radius, int nsegments);
 
 /**
  * Returns a float value as obtained by glGetFloatv.
@@ -109,88 +67,46 @@ int glaGetOneInt(int param);
  */
 void glaRasterPosSafe2f(float x, float y, float known_good_x, float known_good_y);
 
-/**
- * Functions like a limited glDrawPixels, except ensures that
- * the image is displayed onscreen even if the \a x and \a y
- * coordinates for would be clipped. The routine respects the
- * glPixelZoom values, pixel unpacking parameters are _not_
- * respected.
- *
- * \attention This routine makes many assumptions: the rect data
- * is expected to be in RGBA unsigned byte format, the coordinate
- * (GLA_PIXEL_OFS, GLA_PIXEL_OFS) is assumed to be within the view frustum,
- * and the modelview and projection matrices are assumed to define a
- * 1-to-1 mapping to screen space.
- * \attention Furthermore, in the case of zoomed or unpixel aligned
- * images extending outside the view frustum, but still within the
- * window, some portion of the image may be visible left and/or
- * below of the given \a x and \a y coordinates. It is recommended
- * to use the glScissor functionality if images are to be drawn
- * with an inset view matrix.
- */
-void glaDrawPixelsSafe(float x, float y, int img_w, int img_h, int row_w, int format, int type, void *rect);
+typedef struct IMMDrawPixelsTexState {
+	struct GPUShader *shader;
+	unsigned int pos;
+	unsigned int texco;
+	bool do_shader_unbind;
+} IMMDrawPixelsTexState;
+
+/* To be used before calling immDrawPixelsTex
+ * Default shader is GPU_SHADER_2D_IMAGE_COLOR
+ * Returns a shader to be able to set uniforms */
+IMMDrawPixelsTexState immDrawPixelsTexSetup(int builtin);
 
 /**
- * glaDrawPixelsTex - Functions like a limited glDrawPixels, but actually draws the
+ * immDrawPixelsTex - Functions like a limited glDrawPixels, but actually draws the
  * image using textures, which can be tremendously faster on low-end
  * cards, and also avoids problems with the raster position being
- * clipped when offscreen. The routine respects the glPixelZoom values,
- * pixel unpacking parameters are _not_ respected.
+ * clipped when offscreen. Pixel unpacking parameters and
+ * the glPixelZoom values are _not_ respected.
+ *
+ * \attention Use immDrawPixelsTexSetup before calling this function.
  *
  * \attention This routine makes many assumptions: the rect data
  * is expected to be in RGBA byte or float format, and the
  * modelview and projection matrices are assumed to define a
  * 1-to-1 mapping to screen space.
  */
-
-void glaDrawPixelsTex(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect);
-void glaDrawPixelsTex_clipping(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect,
-                               float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y);
-
-/**
- * glaDrawPixelsAuto - Switches between texture or pixel drawing using UserDef.
- * only RGBA
- * needs glaDefine2DArea to be set.
- */
-void glaDrawPixelsAuto(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect);
-void glaDrawPixelsAuto_clipping(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect,
-                                float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y);
-
-
-void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect, float scaleX, float scaleY);
-void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect, float scaleX, float scaleY,
-                                     float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y);
-
-/* 2D Drawing Assistance */
-
-/** Define a 2D area (viewport, scissor, matrices) for OpenGL rendering.
- *
- * glaDefine2DArea and glaBegin2DDraw set up an OpenGL state appropriate
- * for drawing using both vertex (Vertex, etc) and raster (RasterPos, Rect)
- * commands. All coordinates should be at integer positions. There is little
- * to no reason to use glVertex2f etc. functions during 2D rendering, and
- * thus no reason to +-0.5 the coordinates or perform other silly
- * tricks.
- *
- * \param screen_rect The screen rectangle to be defined for 2D drawing.
- */
-void glaDefine2DArea(struct rcti *screen_rect);
-
-typedef struct gla2DDrawInfo gla2DDrawInfo;
-
-/* UNUSED */
-#if 0
-
-gla2DDrawInfo  *glaBegin2DDraw(struct rcti *screen_rect, struct rctf *world_rect);
-void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *r_sc_x, int *r_sc_y);
-void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int r_screen[2]);
-
-void glaEnd2DDraw(gla2DDrawInfo *di);
-
-/** Adjust the transformation mapping of a 2d area */
-void gla2DGetMap(gla2DDrawInfo *di, struct rctf *rect);
-void gla2DSetMap(gla2DDrawInfo *di, struct rctf *rect);
-#endif
+void immDrawPixelsTex(IMMDrawPixelsTexState *state,
+                      float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect,
+                      float xzoom, float yzoom, float color[4]);
+void immDrawPixelsTex_clipping(IMMDrawPixelsTexState *state,
+                               float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect,
+                               float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y,
+                               float xzoom, float yzoom, float color[4]);
+void immDrawPixelsTexScaled(IMMDrawPixelsTexState *state,
+                            float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect, float scaleX, float scaleY,
+                            float xzoom, float yzoom, float color[4]);
+void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state,
+                                     float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect, float scaleX, float scaleY,
+                                     float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y,
+                                     float xzoom, float yzoom, float color[4]);
 
 void set_inverted_drawing(int enable);
 void setlinestyle(int nr);
@@ -198,37 +114,32 @@ void setlinestyle(int nr);
 /* own working polygon offset */
 void bglPolygonOffset(float viewdist, float dist);
 
-/* For caching opengl matrices (gluProject/gluUnProject) */
-typedef struct bglMats {
-	double modelview[16];
-	double projection[16];
-	int viewport[4];
-} bglMats;
-void bgl_get_mats(bglMats *mats);
-
 /* **** Color management helper functions for GLSL display/transform ***** */
 
 /* Draw imbuf on a screen, preferably using GLSL display transform */
 void glaDrawImBuf_glsl(struct ImBuf *ibuf, float x, float y, int zoomfilter,
                        struct ColorManagedViewSettings *view_settings,
-                       struct ColorManagedDisplaySettings *display_settings);
+                       struct ColorManagedDisplaySettings *display_settings,
+                       float zoom_x, float zoom_y);
 void glaDrawImBuf_glsl_clipping(struct ImBuf *ibuf, float x, float y, int zoomfilter,
                                 struct ColorManagedViewSettings *view_settings,
                                 struct ColorManagedDisplaySettings *display_settings,
                                 float clip_min_x, float clip_min_y,
-                                float clip_max_x, float clip_max_y);
+                                float clip_max_x, float clip_max_y,
+                                float zoom_x, float zoom_y);
 
 
 /* Draw imbuf on a screen, preferably using GLSL display transform */
-void glaDrawImBuf_glsl_ctx(const struct bContext *C, struct ImBuf *ibuf, float x, float y, int zoomfilter);
+void glaDrawImBuf_glsl_ctx(const struct bContext *C, struct ImBuf *ibuf, float x, float y, int zoomfilter,
+                           float zoom_x, float zoom_y);
 void glaDrawImBuf_glsl_ctx_clipping(const struct bContext *C,
                                     struct ImBuf *ibuf,
                                     float x, float y,
                                     int zoomfilter,
                                     float clip_min_x, float clip_min_y,
-                                    float clip_max_x, float clip_max_y);
+                                    float clip_max_x, float clip_max_y,
+                                    float zoom_x, float zoom_y);
 
-void glaDrawBorderCorners(const struct rcti *border, float zoomx, float zoomy);
+void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoomx, float zoomy);
 
 #endif /* __BIF_GLUTIL_H__ */
-
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index b84353f93f6..045d4281585 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -81,7 +81,9 @@ typedef struct bAnimContext {
 
 	struct bDopeSheet *ads; /* dopesheet data for editor (or which is being used) */
 
+	struct Depsgraph *depsgraph; /* active dependency graph */
 	struct Scene *scene;    /* active scene */
+	struct ViewLayer *view_layer; /* active scene layer */
 	struct Object *obact;   /* active object */
 	ListBase *markers;      /* active set of markers */
 
@@ -101,7 +103,8 @@ typedef enum eAnimCont_Types {
 	ANIMCONT_DRIVERS   = 6, /* drivers (bDopesheet) */
 	ANIMCONT_NLA       = 7, /* nla (bDopesheet) */
 	ANIMCONT_CHANNEL   = 8, /* animation channel (bAnimListElem) */
-	ANIMCONT_MASK      = 9  /* mask dopesheet */
+	ANIMCONT_MASK      = 9, /* mask dopesheet */
+	ANIMCONT_TIMELINE  = 10, /* "timeline" editor (bDopeSheet) */
 } eAnimCont_Types;
 
 /* --------------- Channels -------------------- */
@@ -533,22 +536,29 @@ void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, struct AnimData *adt, st
 enum eAnimEditDraw_CurrentFrame {
 	/* plain time indicator with no special indicators */
 	DRAWCFRA_PLAIN          = 0,
-	/* draw box indicating current frame number */
-	DRAWCFRA_SHOW_NUMBOX    = (1 << 0),
 	/* time indication in seconds or frames */
-	DRAWCFRA_UNIT_SECONDS   = (1 << 1),
+	DRAWCFRA_UNIT_SECONDS   = (1 << 0),
 	/* draw indicator extra wide (for timeline) */
-	DRAWCFRA_WIDE           = (1 << 2)
+	DRAWCFRA_WIDE           = (1 << 1)
 };
 
 /* main call to draw current-frame indicator in an Animation Editor */
 void ANIM_draw_cfra(const struct bContext *C, struct View2D *v2d, short flag);
 
+/* main call to draw "number box" in scrollbar for current frame indicator */
+void ANIM_draw_cfra_number(const struct bContext *C, struct View2D *v2d, short flag);
+
 /* ------------- Preview Range Drawing -------------- */
 
 /* main call to draw preview range curtains */
 void ANIM_draw_previewrange(const struct bContext *C, struct View2D *v2d, int end_frame_width);
 
+
+/* -------------- Frame Range Drawing --------------- */
+
+/* main call to draw normal frame range indicators */
+void ANIM_draw_framerange(struct Scene *scene, struct View2D *v2d);
+
 /* ************************************************* */
 /* F-MODIFIER TOOLS */
 
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 51fb5abedd2..60374f87955 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -39,16 +39,19 @@ struct Base;
 struct bContext;
 struct Bone;
 struct bPoseChannel;
+struct Depsgraph;
 struct IDProperty;
 struct ListBase;
 struct MeshDeformModifierData;
-struct DerivedMesh;
+struct Mesh;
 struct Object;
 struct ReportList;
 struct Scene;
+struct ViewLayer;
 struct ViewContext;
 struct wmKeyConfig;
 struct wmOperator;
+struct Main;
 struct UndoType;
 
 typedef struct EditBone {
@@ -86,6 +89,12 @@ typedef struct EditBone {
 
 	short segments;
 
+	/* Used for display */
+	float disp_mat[4][4];  /*  in Armature space, rest pos matrix */
+	float disp_tail_mat[4][4];  /*  in Armature space, rest pos matrix */
+	/* 32 == MAX_BBONE_SUBDIV */
+	float disp_bbone_mat[32][4][4]; /*  in Armature space, rest pos matrix */
+
 	/* Used to store temporary data */
 	union {
 		struct EditBone *ebone;
@@ -133,19 +142,29 @@ void ED_armature_edit_free(struct bArmature *arm);
 void ED_armature_edit_deselect_all(struct Object *obedit);
 void ED_armature_edit_deselect_all_visible(struct Object *obedit);
 
+void ED_armature_edit_deselect_all_multi(struct Object **objects, uint objects_len);
+void ED_armature_edit_deselect_all_visible_multi(struct Object **objects, uint objects_len);
+
 bool ED_armature_pose_select_pick_with_buffer(
-        struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits,
+        struct ViewLayer *view_layer, struct Base *base, const unsigned int *buffer, short hits,
         bool extend, bool deselect, bool toggle, bool do_nearest);
 bool ED_armature_edit_select_pick(
         struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
 int join_armature_exec(struct bContext *C, struct wmOperator *op);
-struct Bone *ED_armature_bone_find_index(struct Object *ob, int index);
 float ED_armature_ebone_roll_to_vector(const EditBone *bone, const float new_up_axis[3], const bool axis_only);
 EditBone *ED_armature_ebone_find_name(const struct ListBase *edbo, const char *name);
 EditBone *ED_armature_ebone_get_mirrored(const struct ListBase *edbo, EditBone *ebo);
 void ED_armature_edit_sync_selection(struct ListBase *edbo);
 void ED_armature_edit_validate_active(struct bArmature *arm);
 
+struct Base *ED_armature_base_and_ebone_from_select_buffer(
+        struct Base **bases, uint bases_len, int hit, struct EditBone **r_ebone);
+struct Object *ED_armature_object_and_ebone_from_select_buffer(
+        struct Object **objects, uint objects_len, int hit, struct EditBone **r_ebone);
+
+struct Base *ED_armature_base_and_bone_from_select_buffer(
+        struct Base **bases, uint bases_len, int hit, struct Bone **r_bone);
+
 EditBone *ED_armature_ebone_add_primitive(struct Object *obedit_arm, float length, bool view_aligned);
 EditBone *ED_armature_ebone_add(struct bArmature *arm, const char *name);
 
@@ -162,7 +181,7 @@ void ED_armature_ebone_from_mat3(EditBone *ebone, float mat[3][3]);
 void ED_armature_ebone_from_mat4(EditBone *ebone, float mat[4][4]);
 
 void ED_armature_edit_transform_mirror_update(struct Object *obedit);
-void ED_armature_origin_set(struct Scene *scene, struct Object *ob, float cursor[3], int centermode, int around);
+void ED_armature_origin_set(struct Object *ob, float cursor[3], int centermode, int around);
 
 void ED_armature_transform_bones(struct bArmature *arm, float mat[4][4], const bool do_props);
 void ED_armature_transform_apply(struct Object *ob, float mat[4][4], const bool do_props);
@@ -172,8 +191,9 @@ void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do
 #define ARM_GROUPS_ENVELOPE 2
 #define ARM_GROUPS_AUTO     3
 
-void ED_object_vgroup_calc_from_armature(struct ReportList *reports, struct Scene *scene, struct Object *ob,
-                                  struct Object *par, const int mode, const bool mirror);
+void ED_object_vgroup_calc_from_armature(
+        struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene,
+        struct Object *ob, struct Object *par, const int mode, const bool mirror);
 
 /* if bone is already in list, pass it as param to ignore it */
 void ED_armature_ebone_unique_name(struct ListBase *ebones, char *name, EditBone *bone);
@@ -196,40 +216,22 @@ void ED_armature_ebone_listbase_free(struct ListBase *lb);
 void ED_armature_ebone_listbase_copy(struct ListBase *lb_dst, struct ListBase *lb_src);
 
 /* poseobject.c */
-bool ED_object_posemode_exit_ex(struct Object *ob);
+bool ED_object_posemode_exit_ex(struct Main *bmain, struct Object *ob);
 bool ED_object_posemode_exit(struct bContext *C, struct Object *ob);
-bool ED_object_posemode_enter_ex(struct Object *ob);
+bool ED_object_posemode_enter_ex(struct Main *bmain, struct Object *ob);
 bool ED_object_posemode_enter(struct bContext *C, struct Object *ob);
 void ED_pose_deselect_all(struct Object *ob, int select_mode, const bool ignore_visibility);
+void ED_pose_deselect_all_multi(struct Object **objects, uint objects_len, int select_mode, const bool ignore_visibility);
 void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select);
-void ED_pose_recalculate_paths(struct Scene *scene, struct Object *ob);
+void ED_pose_recalculate_paths(struct bContext *C, struct Scene *scene, struct Object *ob);
 struct Object *ED_pose_object_from_context(struct bContext *C);
 
-/* sketch */
-
-int ED_operator_sketch_mode_active_stroke(struct bContext *C);
-int ED_operator_sketch_full_mode(struct bContext *C);
-int ED_operator_sketch_mode(const struct bContext *C);
-
-void BIF_convertSketch(struct bContext *C);
-void BIF_deleteSketch(struct bContext *C);
-void BIF_selectAllSketch(struct bContext *C, int mode); /* -1: deselect, 0: select, 1: toggle */
-
-void  BIF_makeListTemplates(const struct bContext *C);
-int   BIF_currentTemplate(const struct bContext *C);
-void  BIF_freeTemplates(struct bContext *C);
-void  BIF_setTemplate(struct bContext *C, int index);
-int   BIF_nbJointsTemplate(const struct bContext *C);
-const char *BIF_nameBoneTemplate(const struct bContext *C);
-
-void BDR_drawSketch(const struct bContext *vc);
-int BDR_drawSketchNames(struct ViewContext *vc);
-
 /* meshlaplacian.c */
-void ED_mesh_deform_bind_callback(struct Scene *scene,
-                      struct MeshDeformModifierData *mmd,
-                      struct DerivedMesh *cagedm,
-                      float *vertexcos, int totvert, float cagemat[4][4]);
+void ED_mesh_deform_bind_callback(
+        struct Scene *scene,
+        struct MeshDeformModifierData *mmd,
+        struct Mesh *cagemesh,
+        float *vertexcos, int totvert, float cagemat[4][4]);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h
index 64c16605dec..5cc695b6ce8 100644
--- a/source/blender/editors/include/ED_buttons.h
+++ b/source/blender/editors/include/ED_buttons.h
@@ -27,14 +27,4 @@
 #ifndef __ED_BUTTONS_H__
 #define __ED_BUTTONS_H__
 
-#include "BLI_utildefines.h"
-
-/* Used to check whether a given texture context is valid in current context. */
-bool ED_texture_context_check_world(const struct bContext *C);
-bool ED_texture_context_check_material(const struct bContext *C);
-bool ED_texture_context_check_lamp(const struct bContext *C);
-bool ED_texture_context_check_particles(const struct bContext *C);
-bool ED_texture_context_check_linestyle(const struct bContext *C);
-bool ED_texture_context_check_others(const struct bContext *C);
-
 #endif /*  __ED_BUTTONS_H__ */
diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index bbd27df46ce..f2b7d2cb4a1 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -113,6 +113,17 @@ void ED_file_change_dir(struct bContext *C);
 
 /* File menu stuff */
 
+/* FSMenuEntry's without paths indicate separators */
+typedef struct FSMenuEntry {
+	struct FSMenuEntry *next;
+
+	char *path;
+	char name[256];  /* FILE_MAXFILE */
+	short save;
+	short valid;
+	short pad[2];
+} FSMenuEntry;
+
 typedef enum FSMenuCategory {
 	FS_CATEGORY_SYSTEM,
 	FS_CATEGORY_SYSTEM_BOOKMARKS,
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 6b9cf23ce73..f1f2ce29e7f 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -35,6 +35,7 @@
 struct ID;
 struct ListBase;
 struct bContext;
+struct Depsgraph;
 struct ScrArea;
 struct ARegion;
 struct View3D;
@@ -48,6 +49,8 @@ struct bGPDpalettecolor;
 struct bAnimContext;
 struct KeyframeEditData;
 struct PointerRNA;
+struct Scene;
+struct ViewLayer;
 struct wmWindowManager;
 struct wmKeyConfig;
 
@@ -113,7 +116,7 @@ struct bGPdata *ED_gpencil_data_get_active_direct(struct ID *screen_id, struct S
                                                   struct ScrArea *sa, struct Object *ob);
 
 /* 3D View */
-struct bGPdata  *ED_gpencil_data_get_active_v3d(struct Scene *scene, struct View3D *v3d);
+struct bGPdata  *ED_gpencil_data_get_active_v3d(struct Scene *scene, struct ViewLayer *view_layer);
 
 bool ED_gpencil_has_keyframe_v3d(struct Scene *scene, struct Object *ob, int cfra);
 
@@ -147,7 +150,13 @@ void ED_gpencil_strokes_copybuf_free(void);
 
 void ED_gpencil_draw_2dimage(const struct bContext *C);
 void ED_gpencil_draw_view2d(const struct bContext *C, bool onlyv2d);
-void ED_gpencil_draw_view3d(struct wmWindowManager *wm, struct Scene *scene, struct View3D *v3d, struct ARegion *ar, bool only3d);
+void ED_gpencil_draw_view3d(struct wmWindowManager *wm,
+                            struct Scene *scene,
+                            struct ViewLayer *view_layer,
+                            struct Depsgraph *depsgraph,
+                            struct View3D *v3d,
+                            struct ARegion *ar,
+                            bool only3d);
 void ED_gpencil_draw_ex(struct Scene *scene, struct bGPdata *gpd, int winx, int winy,
                         const int cfra, const char spacetype);
 void ED_gp_draw_interpolation(struct tGPDinterpolate *tgpi, const int type);
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index aeace9d679a..ce12c2fcd7a 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -39,11 +39,11 @@ struct ToolSettings;
 struct wmWindowManager;
 struct ARegion;
 struct Scene;
+struct ViewLayer;
 
 /* image_edit.c, exported for transform */
 struct Image *ED_space_image(struct SpaceImage *sima);
-void          ED_space_image_set(
-        struct Main *bmain, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
+void          ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
 struct Mask  *ED_space_image_get_mask(struct SpaceImage *sima);
 void          ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct Mask *mask);
 
@@ -75,7 +75,7 @@ bool ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit);
 
 bool ED_space_image_paint_curve(const struct bContext *C);
 
-bool ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage *sima);
+bool ED_space_image_check_show_maskedit(struct SpaceImage *sima, struct ViewLayer *view_layer);
 int ED_space_image_maskedit_poll(struct bContext *C);
 int ED_space_image_maskedit_mask_poll(struct bContext *C);
 
diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h
index 6970abaa633..072b1a135a3 100644
--- a/source/blender/editors/include/ED_info.h
+++ b/source/blender/editors/include/ED_info.h
@@ -28,7 +28,7 @@
 #define __ED_INFO_H__
 
 /* info_stats.c */
-void ED_info_stats_clear(struct Scene *scene);
-const char *ED_info_stats_string(struct Scene *scene);
+void ED_info_stats_clear(struct ViewLayer *view_layer);
+const char *ED_info_stats_string(struct Scene *scene, struct ViewLayer *view_layer);
 
 #endif /*  __ED_INFO_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index a29057197ed..9b0b2c970b2 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -108,8 +108,10 @@ typedef enum eKeyframeShapeDrawOpts {
 	KEYFRAME_SHAPE_BOTH
 } eKeyframeShapeDrawOpts;
 
-/* draw simple diamond-shape keyframe (with OpenGL) */
-void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel, short key_type, short mode, float alpha);
+/* draw simple diamond-shape keyframe */
+/* caller should set up vertex format, bind GPU_SHADER_KEYFRAME_DIAMOND, immBegin(GWN_PRIM_POINTS, n), then call this n times */
+void draw_keyframe_shape(float x, float y, float size, bool sel, short key_type, short mode, float alpha,
+                         unsigned int pos_id, unsigned int size_id, unsigned int color_id, unsigned int outline_color_id);
 
 /* ******************************* Methods ****************************** */
 
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 6b842bcd132..9c33f835b74 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -50,6 +50,8 @@ struct bPoseChannel;
 struct bContext;
 struct ReportList;
 
+struct Depsgraph;
+
 struct PointerRNA;
 struct PropertyRNA;
 struct EnumPropertyItem;
@@ -107,7 +109,7 @@ int insert_vert_fcurve(struct FCurve *fcu, float x, float y, eBezTriple_Keyframe
  *	Use this to insert a keyframe using the current value being keyframed, in the
  *	nominated F-Curve (no creation of animation data performed). Returns success.
  */
-bool insert_keyframe_direct(struct ReportList *reports, struct PointerRNA ptr, struct PropertyRNA *prop, struct FCurve *fcu, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
+bool insert_keyframe_direct(struct Depsgraph *depsgraph, struct ReportList *reports, struct PointerRNA ptr, struct PropertyRNA *prop, struct FCurve *fcu, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
 
 /* -------- */
 
@@ -115,7 +117,7 @@ bool insert_keyframe_direct(struct ReportList *reports, struct PointerRNA ptr, s
  *	Use this to create any necessary animation data, and then insert a keyframe
  *	using the current value being keyframed, in the relevant place. Returns success.
  */
-short insert_keyframe(struct ReportList *reports, struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
+short insert_keyframe(struct Depsgraph *depsgraph, struct ReportList *reports, struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
 
 /* Main Keyframing API call:
  *  Use this to delete keyframe on current frame for relevant channel. Will perform checks just in case.
diff --git a/source/blender/editors/include/ED_manipulator_library.h b/source/blender/editors/include/ED_manipulator_library.h
new file mode 100644
index 00000000000..b67af4274a6
--- /dev/null
+++ b/source/blender/editors/include/ED_manipulator_library.h
@@ -0,0 +1,215 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ED_manipulator_library.h
+ *  \ingroup wm
+ *
+ * \name Generic Manipulators.
+ *
+ * This is exposes pre-defined manipulators for re-use.
+ */
+
+
+#ifndef __ED_MANIPULATOR_LIBRARY_H__
+#define __ED_MANIPULATOR_LIBRARY_H__
+
+/* initialize manipulators */
+void ED_manipulatortypes_arrow_2d(void);
+void ED_manipulatortypes_arrow_3d(void);
+void ED_manipulatortypes_button_2d(void);
+void ED_manipulatortypes_cage_2d(void);
+void ED_manipulatortypes_cage_3d(void);
+void ED_manipulatortypes_dial_3d(void);
+void ED_manipulatortypes_grab_3d(void);
+void ED_manipulatortypes_facemap_3d(void);
+void ED_manipulatortypes_primitive_3d(void);
+
+struct wmManipulator;
+struct wmManipulatorGroup;
+
+
+/* -------------------------------------------------------------------- */
+/* Shape Presets
+ *
+ * Intended to be called by custom draw functions.
+ */
+
+/* manipulator_library_presets.c */
+void ED_manipulator_draw_preset_box(
+        const struct wmManipulator *mpr, float mat[4][4], int select_id);
+void ED_manipulator_draw_preset_arrow(
+        const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id);
+void ED_manipulator_draw_preset_circle(
+        const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id);
+void ED_manipulator_draw_preset_facemap(
+        const struct bContext *C, const struct wmManipulator *mpr, struct Scene *scene,
+        struct Object *ob,  const int facemap, int select_id);
+
+
+/* -------------------------------------------------------------------- */
+/* 3D Arrow Manipulator */
+
+enum {
+	ED_MANIPULATOR_ARROW_STYLE_NORMAL        = 0,
+	ED_MANIPULATOR_ARROW_STYLE_CROSS         = 1,
+	ED_MANIPULATOR_ARROW_STYLE_BOX           = 2,
+	ED_MANIPULATOR_ARROW_STYLE_CONE          = 3,
+};
+
+enum {
+	/* inverted offset during interaction - if set it also sets constrained below */
+	ED_MANIPULATOR_ARROW_STYLE_INVERTED      = (1 << 3),
+	/* clamp arrow interaction to property width */
+	ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED   = (1 << 4),
+};
+
+void ED_manipulator_arrow3d_set_ui_range(struct wmManipulator *mpr, const float min, const float max);
+void ED_manipulator_arrow3d_set_range_fac(struct wmManipulator *mpr, const float range_fac);
+
+/* -------------------------------------------------------------------- */
+/* 2D Arrow Manipulator */
+
+/* none */
+
+/* -------------------------------------------------------------------- */
+/* Cage Manipulator */
+
+enum {
+	ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE        = (1 << 0), /* Translates */
+	ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE           = (1 << 1), /* Rotates */
+	ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE            = (1 << 2), /* Scales */
+	ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM    = (1 << 3), /* Scales uniformly */
+	ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_SIGNED     = (1 << 4), /* Negative scale allowed */
+};
+
+/* draw_style */
+enum {
+	ED_MANIPULATOR_CAGE2D_STYLE_BOX = 0,
+	ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE = 1,
+};
+
+/* draw_options */
+enum {
+	/** Draw a central handle (instead of having the entire area selectable)
+	 * Needed for large rectangles that we don't want to swallow all events. */
+	ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE = (1 << 0),
+};
+
+/** #wmManipulator.highlight_part */
+enum {
+	ED_MANIPULATOR_CAGE2D_PART_TRANSLATE     = 0,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X   = 1,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X   = 2,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y   = 3,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y   = 4,
+	/* Corners */
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y = 5,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y = 6,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y = 7,
+	ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y = 8,
+
+	ED_MANIPULATOR_CAGE2D_PART_ROTATE = 9,
+};
+
+/** #wmManipulator.highlight_part */
+enum {
+	/* ordered min/mid/max so we can loop over values (MIN/MID/MAX) on each axis. */
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z = 0,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MID_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MID_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MID_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MAX_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MAX_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MAX_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MIN_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MIN_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MIN_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MID_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MID_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MID_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MAX_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MAX_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MAX_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MIN_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MIN_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MIN_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MID_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MID_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MID_Y_MAX_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MIN_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MID_Z,
+	ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z,
+
+	ED_MANIPULATOR_CAGE3D_PART_TRANSLATE,
+
+	ED_MANIPULATOR_CAGE3D_PART_ROTATE,
+};
+
+/* -------------------------------------------------------------------- */
+/* Dial Manipulator */
+
+/* draw_options */
+enum {
+	ED_MANIPULATOR_DIAL_DRAW_FLAG_NOP               = 0,
+	ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP              = (1 << 0),
+	ED_MANIPULATOR_DIAL_DRAW_FLAG_FILL              = (1 << 1),
+	ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR      = (1 << 2),
+	ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y     = (1 << 3),
+};
+
+/* -------------------------------------------------------------------- */
+/* Grab Manipulator */
+
+/* draw_options */
+enum {
+	ED_MANIPULATOR_GRAB_DRAW_FLAG_NOP               = 0,
+	/* only for solid shapes */
+	ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL              = (1 << 0),
+	ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW        = (1 << 1),
+};
+
+enum {
+	ED_MANIPULATOR_GRAB_STYLE_RING_2D = 0,
+	ED_MANIPULATOR_GRAB_STYLE_CROSS_2D = 1,
+};
+
+/* -------------------------------------------------------------------- */
+/* Button Manipulator */
+
+enum {
+	ED_MANIPULATOR_BUTTON_SHOW_OUTLINE = (1 << 0),
+	/**
+	 * Draw a line from the origin to the offset (similar to an arrow)
+	 * sometimes needed to show what the button edits.
+	 */
+	ED_MANIPULATOR_BUTTON_SHOW_HELPLINE = (1 << 1),
+};
+
+
+/* -------------------------------------------------------------------- */
+/* Primitive Manipulator */
+
+enum {
+	ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE = 0,
+};
+
+#endif  /* __ED_MANIPULATOR_LIBRARY_H__ */
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 8edbcc5f56c..0d323258a19 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -39,6 +39,7 @@ struct ID;
 struct View3D;
 struct ARegion;
 struct bContext;
+struct Depsgraph;
 struct wmOperator;
 struct wmKeyConfig;
 struct ReportList;
@@ -47,7 +48,6 @@ struct bDeformGroup;
 struct MDeformVert;
 struct Scene;
 struct Mesh;
-struct MTexPoly;
 struct UvVertMap;
 struct UvMapVert;
 struct BMEditMesh;
@@ -114,8 +114,7 @@ struct UvElement    *BM_uv_element_get(struct UvElementMap *map, struct BMFace *
 
 bool           EDBM_uv_check(struct BMEditMesh *em);
 struct BMFace *EDBM_uv_active_face_get(
-        struct BMEditMesh *em, const bool sloppy, const bool selected,
-        struct MTexPoly **r_tf);
+        struct BMEditMesh *em, const bool sloppy, const bool selected);
 
 void              BM_uv_vert_map_free(struct UvVertMap *vmap);
 struct UvMapVert *BM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v);
@@ -127,6 +126,7 @@ void EDBM_flag_enable_all(struct BMEditMesh *em, const char hflag);
 void EDBM_flag_disable_all(struct BMEditMesh *em, const char hflag);
 
 bool BMBVH_EdgeVisible(struct BMBVHTree *tree, struct BMEdge *e,
+                       struct Depsgraph *depsgraph,
                        struct ARegion *ar, struct View3D *v3d, struct Object *obedit);
 
 /* editmesh_undo.c */
@@ -221,13 +221,18 @@ typedef struct MirrTopoStore_t {
 	intptr_t *index_lookup;
 	int prev_vert_tot;
 	int prev_edge_tot;
-	int prev_ob_mode;
+	bool prev_is_editmode;
 } MirrTopoStore_t;
 
 bool ED_mesh_mirrtopo_recalc_check(
-        struct Mesh *me, struct DerivedMesh *dm, const int ob_mode, MirrTopoStore_t *mesh_topo_store);
+        struct Mesh *me, struct DerivedMesh *dm, MirrTopoStore_t *mesh_topo_store);
+bool ED_mesh_mirrtopo_recalc_check__real_mesh(
+        struct Mesh *me, struct Mesh *dm, MirrTopoStore_t *mesh_topo_store);
 void ED_mesh_mirrtopo_init(
-        struct Mesh *me, struct DerivedMesh *dm, const int ob_mode, MirrTopoStore_t *mesh_topo_store,
+        struct Mesh *me, struct DerivedMesh *dm, MirrTopoStore_t *mesh_topo_store,
+        const bool skip_em_vert_array_init);
+void ED_mesh_mirrtopo_init__real_mesh(
+        struct Mesh *me, struct Mesh *dm, MirrTopoStore_t *mesh_topo_store,
         const bool skip_em_vert_array_init);
 void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store);
 
@@ -266,7 +271,6 @@ void                 ED_vgroup_vert_remove(struct Object *ob, struct bDeformGrou
 float                ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum);
 void                 ED_vgroup_vert_active_mirror(struct Object *ob, int def_nr);
 
-
 /* mesh_data.c */
 // void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces);
 void ED_mesh_polys_add(struct Mesh *mesh, struct ReportList *reports, int count);
@@ -319,16 +323,21 @@ int         join_mesh_shapes_exec(struct bContext *C, struct wmOperator *op);
 /* mirror lookup api */
 int ED_mesh_mirror_spatial_table(
         struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, const float co[3], char mode);
+int ED_mesh_mirror_spatial_table__real_mesh(
+        struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, const float co[3], char mode);
 int  ED_mesh_mirror_topo_table(struct Object *ob, struct DerivedMesh *dm, char mode);
+int ED_mesh_mirror_topo_table__real_mesh(struct Object *ob, struct Mesh *mesh, char mode);
 
 /* retrieves mirrored cache vert, or NULL if there isn't one.
  * note: calling this without ensuring the mirror cache state
  * is bad.*/
 int            mesh_get_x_mirror_vert(struct Object *ob, struct DerivedMesh *dm, int index, const bool use_topology);
+int mesh_get_x_mirror_vert__real_mesh(struct Object *ob, struct Mesh *mesh, int index, const bool use_topology);
 struct BMVert *editbmesh_get_x_mirror_vert(struct Object *ob, struct BMEditMesh *em,
                                            struct BMVert *eve, const float co[3],
                                            int index, const bool use_topology);
 int           *mesh_get_x_mirror_faces(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm);
+int *mesh_get_x_mirror_faces__real_mesh(struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh);
 
 int ED_mesh_mirror_get_vert(struct Object *ob, int index);
 
@@ -341,6 +350,9 @@ struct MDeformVert *ED_mesh_active_dvert_get_em(struct Object *ob, struct BMVert
 struct MDeformVert *ED_mesh_active_dvert_get_ob(struct Object *ob, int *r_index);
 struct MDeformVert *ED_mesh_active_dvert_get_only(struct Object *ob);
 
+void EDBM_mesh_stats_multi(struct Object **objects, const uint objects_len, int totelem[3], int totelem_sel[3]);
+void EDBM_mesh_elem_index_ensure_multi(struct Object **objects, const uint objects_len, const char htype);
+
 #define ED_MESH_PICK_DEFAULT_VERT_SIZE 50
 #define ED_MESH_PICK_DEFAULT_FACE_SIZE 3
 
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index b4d4ffe44dd..6828cedbd80 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -75,7 +75,7 @@ void ED_init_custom_node_socket_type(struct bNodeSocketType *stype);
 void ED_init_standard_node_socket_type(struct bNodeSocketType *stype);
 void ED_init_node_socket_type_virtual(struct bNodeSocketType *stype);
 void ED_node_sample_set(const float col[4]);
-void ED_node_draw_snap(struct View2D *v2d, const float cent[2], float size, NodeBorder border);
+void ED_node_draw_snap(struct View2D *v2d, const float cent[2], float size, NodeBorder border, unsigned pos);
 
 /* node_draw.c */
 void ED_node_tree_update(const struct bContext *C);
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 72cc245d772..c793c0aad2b 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -35,6 +35,7 @@
 extern "C" {
 #endif
 
+struct bFaceMap;
 struct Base;
 struct EnumPropertyItem;
 struct ID;
@@ -43,6 +44,7 @@ struct ModifierData;
 struct Object;
 struct ReportList;
 struct Scene;
+struct ViewLayer;
 struct bConstraint;
 struct bContext;
 struct bPoseChannel;
@@ -50,9 +52,12 @@ struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperator;
 struct wmOperatorType;
+struct wmWindow;
+struct wmWindowManager;
 struct PointerRNA;
 struct PropertyRNA;
 struct EnumPropertyItem;
+struct Depsgraph;
 
 #include "DNA_object_enums.h"
 
@@ -82,16 +87,21 @@ typedef enum eParentType {
 	PAR_VERTEX_TRI,
 } eParentType;
 
+typedef enum eObjectSelect_Mode {
+	BA_DESELECT = 0,
+	BA_SELECT = 1,
+	BA_INVERT = 2,
+} eObjectSelect_Mode;
+
 #ifdef __RNA_TYPES_H__
 extern struct EnumPropertyItem prop_clear_parent_types[];
 extern struct EnumPropertyItem prop_make_parent_types[];
 #endif
 
-bool ED_object_parent_set(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob,
+bool ED_object_parent_set(struct ReportList *reports, const struct bContext *C, struct Scene *scene, struct Object *ob,
                           struct Object *par, int partype, const bool xmirror, const bool keep_transform,
                           const int vert_par[3]);
 void ED_object_parent_clear(struct Object *ob, const int type);
-struct Base *ED_object_scene_link(struct Scene *scene, struct Object *ob);
 
 void ED_keymap_proportional_cycle(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
 void ED_keymap_proportional_obmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
@@ -99,15 +109,12 @@ void ED_keymap_proportional_maskmode(struct wmKeyConfig *keyconf, struct wmKeyMa
 void ED_keymap_proportional_editmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap,
                                      const bool do_connected);
 
-/* send your own notifier for select! */
-void ED_base_object_select(struct Base *base, short mode);
-/* includes notifier */
-void ED_base_object_activate(struct bContext *C, struct Base *base);
-
-void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Base *base);
+void ED_object_base_select(struct Base *base, eObjectSelect_Mode mode);
+void ED_object_base_activate(struct bContext *C, struct Base *base);
+void ED_object_base_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *ob);
 
 /* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */
-struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct Base *base, int dupflag);
+struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct Base *base, int dupflag);
 
 void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr);
 
@@ -116,9 +123,13 @@ enum {
 	EM_FREEDATA         = (1 << 0),
 	EM_WAITCURSOR       = (1 << 1),
 	EM_IGNORE_LAYER     = (1 << 3),
+	EM_NO_CONTEXT       = (1 << 4),
 };
-bool ED_object_editmode_exit_ex(struct Scene *scene, struct Object *obedit, int flag);
+bool ED_object_editmode_exit_ex(
+        struct Scene *scene, struct Object *obedit, int flag);
 bool ED_object_editmode_exit(struct bContext *C, int flag);
+
+bool ED_object_editmode_enter_ex(struct Main *bmain, struct Scene *scene, struct Object *ob, int flag);
 bool ED_object_editmode_enter(struct bContext *C, int flag);
 bool ED_object_editmode_load(struct Main *bmain, struct Object *obedit);
 
@@ -126,11 +137,11 @@ bool ED_object_editmode_calc_active_center(struct Object *obedit, const bool sel
 
 
 void ED_object_vpaintmode_enter_ex(
-        struct wmWindowManager *wm,
+        struct Depsgraph *depsgraph, struct wmWindowManager *wm,
         struct Scene *scene, struct Object *ob);
 void ED_object_vpaintmode_enter(struct bContext *C);
 void ED_object_wpaintmode_enter_ex(
-        struct wmWindowManager *wm,
+        struct Depsgraph *depsgraph, struct wmWindowManager *wm,
         struct Scene *scene, struct Object *ob);
 void ED_object_wpaintmode_enter(struct bContext *C);
 
@@ -140,10 +151,12 @@ void ED_object_wpaintmode_exit_ex(struct Object *ob);
 void ED_object_wpaintmode_exit(struct bContext *C);
 
 void ED_object_sculptmode_enter_ex(
+        struct Depsgraph *depsgraph,
         struct Scene *scene, struct Object *ob,
         struct ReportList *reports);
 void ED_object_sculptmode_enter(struct bContext *C, struct ReportList *reports);
 void ED_object_sculptmode_exit_ex(
+        struct Depsgraph *depsgraph,
         struct Scene *scene, struct Object *ob);
 void ED_object_sculptmode_exit(struct bContext *C);
 
@@ -199,6 +212,21 @@ bool ED_object_mode_compat_set(struct bContext *C, struct Object *ob, eObjectMod
 void ED_object_mode_toggle(struct bContext *C, eObjectMode mode);
 void ED_object_mode_set(struct bContext *C, eObjectMode mode);
 
+bool ED_object_mode_generic_enter(
+        struct bContext *C,
+        eObjectMode object_mode);
+void ED_object_mode_generic_exit(
+        struct Main *bmain,
+        struct Depsgraph *depsgraph,
+        struct Scene *scene, struct Object *ob);
+bool ED_object_mode_generic_has_data(
+        struct Depsgraph *depsgraph,
+        struct Object *ob);
+
+bool ED_object_mode_generic_exists(
+        struct wmWindowManager *wm, struct Object *ob,
+        eObjectMode object_mode);
+
 /* object_modifier.c */
 enum {
 	MODIFIER_APPLY_DATA = 1,
@@ -215,9 +243,10 @@ int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob,
 int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
 int ED_object_modifier_convert(
         struct ReportList *reports, struct Main *bmain, struct Scene *scene,
-        struct Object *ob, struct ModifierData *md);
-int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene,
-                             struct Object *ob, struct ModifierData *md, int mode);
+        struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md);
+int ED_object_modifier_apply(
+        struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene,
+        struct Object *ob, struct ModifierData *md, int mode);
 int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
 
 bool ED_object_iter_other(
@@ -240,8 +269,15 @@ const struct EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(
 void ED_object_check_force_modifiers(
         struct Main *bmain, struct Scene *scene, struct Object *object);
 
+/* object_facemap_ops.c */
+void ED_object_facemap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum);
+void ED_object_facemap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum);
+
 #ifdef __cplusplus
 }
 #endif
 
+/* Don't allow switching object-modes when selecting objects. */
+#define USE_OBJECT_MODE_STRICT
+
 #endif /* __ED_OBJECT_H__ */
diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h
index 73ee2542247..c1b3c3e9e1c 100644
--- a/source/blender/editors/include/ED_outliner.h
+++ b/source/blender/editors/include/ED_outliner.h
@@ -27,4 +27,11 @@
 #ifndef __ED_OUTLINER_H__
 #define __ED_OUTLINER_H__
 
+struct bContext;
+struct ListBase;
+
+int ED_outliner_collections_editor_poll(struct bContext *C);
+
+void ED_outliner_selected_objects_get(const struct bContext *C, struct ListBase *objects);
+
 #endif /*  __ED_OUTLINER_H__ */
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 4f6aa1cc702..8b522c91188 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -34,10 +34,12 @@
 
 struct bContext;
 struct Object;
+struct ParticleSystem;
 struct ParticleEditSettings;
 struct rcti;
 struct PTCacheEdit;
 struct Scene;
+struct ViewLayer;
 struct UndoType;
 
 /* particle edit mode */
@@ -45,15 +47,18 @@ void PE_free_ptcache_edit(struct PTCacheEdit *edit);
 int PE_start_edit(struct PTCacheEdit *edit);
 
 /* access */
+struct PTCacheEdit *PE_get_current_from_psys(struct ParticleSystem *psys);
 struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob);
-struct PTCacheEdit *PE_create_current(struct Scene *scene, struct Object *ob);
-void PE_current_changed(struct Scene *scene, struct Object *ob);
-int PE_minmax(struct Scene *scene, float min[3], float max[3]);
+struct PTCacheEdit *PE_create_current(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob);
+void PE_current_changed(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob);
+int PE_minmax(struct Scene *scene, struct ViewLayer *view_layer, float min[3], float max[3]);
 struct ParticleEditSettings *PE_settings(struct Scene *scene);
 
 /* update calls */
 void PE_hide_keys_time(struct Scene *scene, struct PTCacheEdit *edit, float cfra);
-void PE_update_object(struct Scene *scene, struct Object *ob, int useflag);
+void PE_update_object(
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        struct Object *ob, int useflag);
 
 /* selection tools */
 int PE_mouse_particles(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index 707d7c6c693..2615847e90a 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -31,6 +31,7 @@
 #include "DNA_vec_types.h"
 
 struct bContext;
+struct DEGEditorUpdateContext;
 struct ID;
 struct Main;
 struct MTex;
@@ -43,15 +44,16 @@ struct wmWindowManager;
 
 void ED_operatortypes_render(void);
 
-/* render_shading.c */
+/* render_update.c */
 
-void ED_render_id_flush_update(struct Main *bmain, struct ID *id);
 void ED_render_engine_changed(struct Main *bmain);
 void ED_render_engine_area_exit(struct Main *bmain, struct ScrArea *sa);
-void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated);
-void ED_render_scene_update_pre(struct Main *bmain, struct Scene *scene, bool time);
 
-void ED_viewport_render_kill_jobs(struct wmWindowManager *wm, struct Main *bmain, bool free_database);
+/* Callbacks handling data update events coming from depsgraph. */
+
+void ED_render_id_flush_update(const struct DEGEditorUpdateContext *update_ctx, struct ID *id);
+void ED_render_scene_update(const struct DEGEditorUpdateContext *update_ctx, int updated);
+
 struct Scene *ED_render_job_get_scene(const struct bContext *C);
 struct Scene *ED_render_job_get_current_scene(const struct bContext *C);
 
diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.h
new file mode 100644
index 00000000000..9b48187e541
--- /dev/null
+++ b/source/blender/editors/include/ED_scene.h
@@ -0,0 +1,44 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ED_scene.h
+ *  \ingroup editors
+ */
+
+#ifndef __ED_SCENE_H__
+#define __ED_SCENE_H__
+
+#include "BLI_compiler_attrs.h"
+
+enum eSceneCopyMethod;
+
+struct Scene *ED_scene_add(struct Main *bmain, struct bContext *C, struct wmWindow *win, enum eSceneCopyMethod method) ATTR_NONNULL();
+bool ED_scene_delete(struct bContext *C, struct Main *bmain, struct wmWindow *win, struct Scene *scene) ATTR_NONNULL();
+void ED_scene_change_update(
+        struct Main *bmain, struct bContext *C,
+        struct wmWindow *win, const struct bScreen *screen,
+        struct Scene *scene_old, struct Scene *scene_new) ATTR_NONNULL();
+bool ED_scene_view_layer_delete(
+        struct Main *bmain, struct Scene *scene, struct ViewLayer *layer,
+        struct ReportList *reports) ATTR_NONNULL(1, 2, 3);
+
+void ED_operatortypes_scene(void);
+
+#endif /* __ED_SCENE_H__ */
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index b80f69fd406..63485800a9b 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -35,47 +35,82 @@
 #include "DNA_space_types.h"
 #include "DNA_view2d_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_workspace_types.h"
 
+#include "DNA_object_enums.h"
+
+#include "BLI_compiler_attrs.h"
+
+struct Depsgraph;
 struct wmWindowManager;
 struct wmWindow;
 struct wmNotifier;
 struct wmEvent;
 struct wmKeyConfig;
+struct WorkSpace;
+struct WorkSpaceInstanceHook;
 struct bContext;
 struct Scene;
+struct ViewLayer;
 struct bScreen;
 struct ARegion;
 struct uiBlock;
 struct rcti;
 struct Main;
+struct wmMsgBus;
+struct wmMsgSubscribeKey;
+struct wmMsgSubscribeValue;
 
 /* regions */
-void    ED_region_do_listen(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar, struct wmNotifier *note);
+void    ED_region_do_listen(
+        struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar,
+        struct wmNotifier *note, const Scene *scene);
+void    ED_region_do_layout(struct bContext *C, struct ARegion *ar);
 void    ED_region_do_draw(struct bContext *C, struct ARegion *ar);
 void    ED_region_exit(struct bContext *C, struct ARegion *ar);
 void    ED_region_pixelspace(struct ARegion *ar);
-void    ED_region_set(const struct bContext *C, struct ARegion *ar);
 void    ED_region_update_rect(struct bContext *C, struct ARegion *ar);
 void    ED_region_init(struct bContext *C, struct ARegion *ar);
 void    ED_region_tag_redraw(struct ARegion *ar);
 void    ED_region_tag_redraw_partial(struct ARegion *ar, const struct rcti *rct);
 void    ED_region_tag_redraw_overlay(struct ARegion *ar);
+void    ED_region_tag_redraw_no_rebuild(struct ARegion *ar);
 void    ED_region_tag_refresh_ui(struct ARegion *ar);
 void    ED_region_panels_init(struct wmWindowManager *wm, struct ARegion *ar);
 void    ED_region_panels(
             const struct bContext *C, struct ARegion *ar,
-            const char *context, int contextnr,
+            const char *contexts[], int contextnr,
             const bool vertical);
 void    ED_region_header_init(struct ARegion *ar);
 void    ED_region_header(const struct bContext *C, struct ARegion *ar);
+void    ED_region_header_layout(const struct bContext *C, struct ARegion *ar);
+void    ED_region_header_draw(const struct bContext *C, struct ARegion *ar);
 void    ED_region_cursor_set(struct wmWindow *win, struct ScrArea *sa, struct ARegion *ar);
 void    ED_region_toggle_hidden(struct bContext *C, struct ARegion *ar);
+void    ED_region_visibility_change_update(struct bContext *C, struct ARegion *ar);
 void    ED_region_info_draw(struct ARegion *ar, const char *text, float fill_color[4], const bool full_redraw);
+void    ED_region_info_draw_multiline(ARegion *ar, const char *text_array[], float fill_color[4], const bool full_redraw);
 void    ED_region_image_metadata_draw(int x, int y, struct ImBuf *ibuf, const rctf *frame, float zoomx, float zoomy);
 void    ED_region_grid_draw(struct ARegion *ar, float zoomx, float zoomy);
-float	ED_region_blend_factor(struct ARegion *ar);
+float	ED_region_blend_alpha(struct ARegion *ar);
 void	ED_region_visible_rect(struct ARegion *ar, struct rcti *rect);
+bool    ED_region_is_overlap(int spacetype, int regiontype);
+
+int     ED_region_snap_size_test(const struct ARegion *ar);
+bool    ED_region_snap_size_apply(struct ARegion *ar, int snap_flag);
+
+/* message_bus callbacks */
+void ED_region_do_msg_notify_tag_redraw(
+        struct bContext *C, struct wmMsgSubscribeKey *msg_key, struct wmMsgSubscribeValue *msg_val);
+void ED_area_do_msg_notify_tag_refresh(
+        struct bContext *C, struct wmMsgSubscribeKey *msg_key, struct wmMsgSubscribeValue *msg_val);
 
+/* message bus */
+void ED_region_message_subscribe(
+        struct bContext *C,
+        struct WorkSpace *workspace, struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus);
 
 /* spaces */
 void    ED_spacetypes_keymap(struct wmKeyConfig *keyconf);
@@ -85,8 +120,12 @@ int     ED_area_header_switchbutton(const struct bContext *C, struct uiBlock *bl
 void    ED_area_initialize(struct wmWindowManager *wm, struct wmWindow *win, struct ScrArea *sa);
 void    ED_area_exit(struct bContext *C, struct ScrArea *sa);
 int     ED_screen_area_active(const struct bContext *C);
-void    ED_area_do_listen(struct bScreen *sc, ScrArea *sa, struct wmNotifier *note);
+void    ED_screen_global_areas_create(
+            struct wmWindow *win);
+void    ED_area_do_listen(struct bScreen *sc, ScrArea *sa, struct wmNotifier *note, Scene *scene,
+                          struct WorkSpace *workspace);
 void    ED_area_tag_redraw(ScrArea *sa);
+void    ED_area_tag_redraw_no_rebuild(ScrArea *sa);
 void    ED_area_tag_redraw_regiontype(ScrArea *sa, int type);
 void    ED_area_tag_refresh(ScrArea *sa);
 void    ED_area_do_refresh(struct bContext *C, ScrArea *sa);
@@ -96,6 +135,29 @@ void    ED_area_newspace(struct bContext *C, ScrArea *sa, int type, const bool s
 void    ED_area_prevspace(struct bContext *C, ScrArea *sa);
 void    ED_area_swapspace(struct bContext *C, ScrArea *sa1, ScrArea *sa2);
 int     ED_area_headersize(void);
+int     ED_area_header_alignment(const ScrArea *area);
+int     ED_area_global_size_y(const ScrArea *area);
+bool    ED_area_is_global(const ScrArea *area);
+int     ED_region_global_size_y(void);
+void    ED_area_update_region_sizes(struct wmWindowManager *wm, struct wmWindow *win, struct ScrArea *area);
+
+ScrArea *ED_screen_areas_iter_first(const struct wmWindow *win, const bScreen *screen);
+ScrArea *ED_screen_areas_iter_next(const bScreen *screen, const ScrArea *area);
+/**
+ * Iterate over all areas visible in the screen (screen as in everything
+ * visible in the window, not just bScreen).
+ * \note Skips global areas with flag GLOBAL_AREA_IS_HIDDEN.
+ */
+#define ED_screen_areas_iter(win, screen, area_name)                       \
+	for (ScrArea *area_name = ED_screen_areas_iter_first(win, screen);     \
+	     area_name != NULL;                                                \
+	     area_name = ED_screen_areas_iter_next(screen, area_name))
+#define ED_screen_verts_iter(win, screen, vert_name)                       \
+	for (ScrVert *vert_name = (win)->global_areas.vertbase.first ?         \
+	                                  (win)->global_areas.vertbase.first : \
+	                                  screen->vertbase.first;              \
+	     vert_name != NULL;                                                \
+	     vert_name = (vert_name == (win)->global_areas.vertbase.last) ? (screen)->vertbase.first : vert_name->next)
 
 /* screens */
 void    ED_screens_initialize(struct wmWindowManager *wm);
@@ -103,14 +165,14 @@ void    ED_screen_draw_edges(struct wmWindow *win);
 void    ED_screen_draw_join_shape(struct ScrArea *sa1, struct ScrArea *sa2);
 void    ED_screen_draw_split_preview(struct ScrArea *sa, const int dir, const float fac);
 void    ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win);
+void    ED_screen_ensure_updated(struct wmWindowManager *wm, struct wmWindow *win, struct bScreen *screen);
 void    ED_screen_do_listen(struct bContext *C, struct wmNotifier *note);
-bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);
-bScreen *ED_screen_add(struct wmWindow *win, struct Scene *scene, const char *name);
-bool    ED_screen_set(struct bContext *C, struct bScreen *sc);
-bool    ED_screen_delete(struct bContext *C, struct bScreen *sc);
-void    ED_screen_set_scene(struct bContext *C, struct bScreen *screen, struct Scene *scene);
-bool    ED_screen_delete_scene(struct bContext *C, struct Scene *scene);
-void    ED_screen_set_subwinactive(struct bContext *C, const struct wmEvent *event);
+bool    ED_screen_change(struct bContext *C, struct bScreen *sc);
+void    ED_screen_update_after_scene_change(
+        const struct bScreen *screen,
+        struct Scene *scene_new,
+        struct ViewLayer *view_layer);
+void    ED_screen_set_active_region(struct bContext *C, struct wmWindow *win, const int xy[2]);
 void    ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen);
 void    ED_screen_animation_timer(struct bContext *C, int redraws, int refresh, int sync, int enable);
 void    ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh);
@@ -120,10 +182,55 @@ void    ED_screen_full_prevspace(struct bContext *C, ScrArea *sa);
 void    ED_screen_full_restore(struct bContext *C, ScrArea *sa);
 struct ScrArea *ED_screen_state_toggle(struct bContext *C, struct wmWindow *win, struct ScrArea *sa, const short state);
 void    ED_screens_header_tools_menu_create(struct bContext *C, struct uiLayout *layout, void *arg);
-bool    ED_screen_stereo3d_required(struct bScreen *screen);
+bool    ED_screen_stereo3d_required(const struct bScreen *screen, const struct Scene *scene);
+Scene   *ED_screen_scene_find(const struct bScreen *screen, const struct wmWindowManager *wm);
+Scene   *ED_screen_scene_find_with_window(const struct bScreen *screen, const struct wmWindowManager *wm, struct wmWindow **r_window);
+struct wmWindow *ED_screen_window_find(const struct bScreen *screen, const struct wmWindowManager *wm);
+void    ED_screen_preview_render(const struct bScreen *screen, int size_x, int size_y, unsigned int *r_rect) ATTR_NONNULL();
+
+/* workspaces */
+struct WorkSpace *ED_workspace_add(
+        struct Main *bmain,
+        const char *name,
+        Scene *scene,
+        ViewLayer *act_render_layer) ATTR_NONNULL();
+bool ED_workspace_change(
+        struct WorkSpace *workspace_new,
+        struct bContext *C,
+        struct wmWindowManager *wm, struct wmWindow *win) ATTR_NONNULL();
+struct WorkSpace *ED_workspace_duplicate(
+        struct WorkSpace *workspace_old,
+        struct Main *bmain, struct wmWindow *win);
+bool ED_workspace_delete(
+        struct WorkSpace *workspace,
+        struct Main *bmain, struct bContext *C,
+        struct wmWindowManager *wm) ATTR_NONNULL();
+void ED_workspace_scene_data_sync(
+        struct WorkSpaceInstanceHook *hook, Scene *scene) ATTR_NONNULL();
+void ED_workspace_view_layer_unset(
+        const struct Main *bmain, struct Scene *scene,
+        const ViewLayer *layer_unset, ViewLayer *layer_new) ATTR_NONNULL(1, 2);
+struct WorkSpaceLayout *ED_workspace_layout_add(
+        struct WorkSpace *workspace,
+        struct wmWindow *win,
+        const char *name) ATTR_NONNULL();
+struct WorkSpaceLayout *ED_workspace_layout_duplicate(
+        struct WorkSpace *workspace, const struct WorkSpaceLayout *layout_old,
+        struct wmWindow *win) ATTR_NONNULL();
+bool ED_workspace_layout_delete(
+        struct WorkSpace *workspace, struct WorkSpaceLayout *layout_old,
+        struct bContext *C) ATTR_NONNULL();
+bool ED_workspace_layout_cycle(
+        struct WorkSpace *workspace, const short direction,
+        struct bContext *C) ATTR_NONNULL();
+
+void ED_workspace_object_mode_sync_from_object(
+        struct wmWindowManager *wm, WorkSpace *workspace, struct Object *obact);
+void ED_workspace_object_mode_sync_from_scene(
+        struct wmWindowManager *wm, WorkSpace *workspace, struct Scene *scene);
 
 /* anim */
-void    ED_update_for_newframe(struct Main *bmain, struct Scene *scene, int mute);
+void    ED_update_for_newframe(struct Main *bmain, struct Depsgraph *depsgraph);
 
 void    ED_refresh_viewport_fps(struct bContext *C);
 int		ED_screen_animation_play(struct bContext *C, int sync, int mode);
@@ -133,6 +240,8 @@ bScreen *ED_screen_animation_no_scrub(const struct wmWindowManager *wm);
 /* screen keymaps */
 void    ED_operatortypes_screen(void);
 void    ED_keymap_screen(struct wmKeyConfig *keyconf);
+/* workspace keymaps */
+void    ED_operatortypes_workspace(void);
 
 /* operators; context poll callbacks */
 int     ED_operator_screenactive(struct bContext *C);
@@ -147,7 +256,6 @@ int     ED_operator_objectmode(struct bContext *C);
 int     ED_operator_view3d_active(struct bContext *C);
 int     ED_operator_region_view3d_active(struct bContext *C);
 int     ED_operator_animview_active(struct bContext *C);
-int     ED_operator_timeline_active(struct bContext *C);
 int     ED_operator_outliner_active(struct bContext *C);
 int     ED_operator_outliner_active_no_editobject(struct bContext *C);
 int     ED_operator_file_active(struct bContext *C);
@@ -160,7 +268,6 @@ int     ED_operator_sequencer_active(struct bContext *C);
 int     ED_operator_sequencer_active_editable(struct bContext *C);
 int     ED_operator_image_active(struct bContext *C);
 int     ED_operator_nla_active(struct bContext *C);
-int     ED_operator_logic_active(struct bContext *C);
 int     ED_operator_info_active(struct bContext *C);
 int     ED_operator_console_active(struct bContext *C);
 
@@ -189,6 +296,7 @@ int     ED_operator_posemode_context(struct bContext *C);
 int     ED_operator_posemode(struct bContext *C);
 int     ED_operator_posemode_local(struct bContext *C);
 int     ED_operator_mask(struct bContext *C);
+int     ED_operator_camera(struct bContext *C);
 
 
 /* Cache display helpers */
diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h
index 2b1ce461b0e..8ef7fee0f32 100644
--- a/source/blender/editors/include/ED_screen_types.h
+++ b/source/blender/editors/include/ED_screen_types.h
@@ -83,13 +83,22 @@ typedef enum {
 	AE_BOTTOM_TO_TOPLEFT    /* Region located at the top, _bottom_ edge is action zone. Region minimized to the top left */
 } AZEdge;
 
+typedef enum {
+	AZ_SCROLL_VERT,
+	AZ_SCROLL_HOR,
+} AZScrollDirection;
+
 /* for editing areas/regions */
 typedef struct AZone {
 	struct AZone *next, *prev;
 	ARegion *ar;
 	int type;
-	/* region-azone, which of the edges (only for AZONE_REGION) */
-	AZEdge edge;
+
+	union {
+		/* region-azone, which of the edges (only for AZONE_REGION) */
+		AZEdge edge;
+		AZScrollDirection direction;
+	};
 	/* for draw */
 	short x1, y1, x2, y2;
 	/* for clip */
@@ -99,8 +108,15 @@ typedef struct AZone {
 } AZone;
 
 /* actionzone type */
-#define AZONE_AREA      1  /* corner widgets for splitting areas */
-#define AZONE_REGION    2  /* when a region is collapsed, draw a handle to expose */
-#define AZONE_FULLSCREEN 3 /* when in editor fullscreen draw a corner to go to normal mode */
+enum {
+	/* corner widgets for splitting areas */
+	AZONE_AREA = 1,
+	/* when a region is collapsed, draw a handle to expose */
+	AZONE_REGION,
+	/* when in editor fullscreen draw a corner to go to normal mode */
+	AZONE_FULLSCREEN,
+	/* Hotspot azone around scrollbars to show/hide them. */
+	AZONE_REGION_SCROLL,
+};
 
 #endif /* __ED_SCREEN_TYPES_H__ */
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index ee2eff3ebba..c624405cd0c 100644
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@ -42,8 +42,7 @@ struct ListBase;
 
 /* sculpt.c */
 void ED_operatortypes_sculpt(void);
-void ED_sculpt_redraw_planes_get(float planes[4][4], struct ARegion *ar,
-                                 struct RegionView3D *rv3d, struct Object *ob);
+void ED_sculpt_redraw_planes_get(float planes[4][4], struct ARegion *ar, struct Object *ob);
 int  ED_sculpt_mask_box_select(struct bContext *C, struct ViewContext *vc, const struct rcti *rect, bool select, bool extend);
 
 /* sculpt_undo.c */
diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index ff9e66ea151..ddd8b59c264 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -41,7 +41,6 @@ void ED_spacemacros_init(void);
 
 /* calls for registering default spaces */
 void ED_spacetype_outliner(void);
-void ED_spacetype_time(void);
 void ED_spacetype_view3d(void);
 void ED_spacetype_ipo(void);
 void ED_spacetype_image(void);
@@ -58,6 +57,8 @@ void ED_spacetype_logic(void);
 void ED_spacetype_console(void);
 void ED_spacetype_userpref(void);
 void ED_spacetype_clip(void);
+void ED_spacetype_statusbar(void);
+void ED_spacetype_topbar(void);
 
 /* calls for instancing and freeing spacetype static data
  * called in WM_init_exit */
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 9a0a7f8f1bb..1e3c8995314 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -43,6 +43,7 @@ struct wmEvent;
 struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperatorType;
+struct WorkSpace;
 struct Main;
 struct SnapObjectContext;
 struct SnapObjectParams;
@@ -101,6 +102,7 @@ enum TfmMode {
 #define CTX_MASK            (1 << 7)
 #define CTX_PAINT_CURVE     (1 << 8)
 #define CTX_GPENCIL_STROKES (1 << 9)
+#define CTX_CURSOR          (1 << 10)
 
 /* Standalone call to get the transformation center corresponding to the current situation
  * returns 1 if successful, 0 otherwise (usually means there's no selection)
@@ -109,9 +111,10 @@ enum TfmMode {
 bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
 
 struct TransInfo;
-struct Base;
 struct Scene;
 struct Object;
+struct wmManipulatorGroup;
+struct wmManipulatorGroupType;
 struct wmOperator;
 
 /* UNUSED */
@@ -128,7 +131,7 @@ void BIF_createTransformOrientation(struct bContext *C, struct ReportList *repor
                                     const char *name, const bool use_view,
                                     const bool activate, const bool overwrite);
 void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
-void BIF_selectTransformOrientationValue(struct bContext *C, int orientation);
+void BIF_selectTransformOrientationValue(struct Scene *scene, int orientation);
 
 void ED_getTransformOrientationMatrix(const struct bContext *C, float orientation_mat[3][3], const short around);
 
@@ -150,13 +153,20 @@ int BIF_countTransformOrientation(const struct bContext *C);
 #define P_NO_TEXSPACE   (1 << 11)
 #define P_CENTER        (1 << 12)
 #define P_GPENCIL_EDIT  (1 << 13)
+#define P_CURSOR_EDIT   (1 << 14)
 
 void Transform_Properties(struct wmOperatorType *ot, int flags);
 
-/* view3d manipulators */
+/* transform manipulators */
+
+void TRANSFORM_WGT_manipulator(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_xform_cage(struct wmManipulatorGroupType *wgt);
+
+bool ED_widgetgroup_manipulator2d_poll(const struct bContext *C, struct wmManipulatorGroupType *wgt);
+void ED_widgetgroup_manipulator2d_setup(const struct bContext *C, struct wmManipulatorGroup *mgroup);
+void ED_widgetgroup_manipulator2d_refresh(const struct bContext *C, struct wmManipulatorGroup *mgroup);
+void ED_widgetgroup_manipulator2d_draw_prepare(const struct bContext *C, struct wmManipulatorGroup *mgroup);
 
-int BIF_do_manipulator(struct bContext *C, const struct wmEvent *event, struct wmOperator *op);
-void BIF_draw_manipulator(const struct bContext *C);
 
 /* Snapping */
 
@@ -186,4 +196,24 @@ bool snapNodesTransform(
         /* return args */
         float r_loc[2], float *r_dist_px, char *r_node_border);
 
+struct TransformBounds {
+	float center[3];		/* Center for transform widget. */
+	float min[3], max[3];	/* Boundbox of selection for transform widget. */
+
+	/* Normalized axis */
+	float axis[3][3];
+	float axis_min[3], axis_max[3];
+};
+
+struct TransformCalcParams {
+	uint use_only_center : 1;
+	uint use_local_axis : 1;
+	/* Use 'Scene.orientation_type' when zero, otherwise subtract one and use. */
+	ushort orientation_type;
+};
+int ED_transform_calc_manipulator_stats(
+        const struct bContext *C,
+        const struct TransformCalcParams *params,
+        struct TransformBounds *tbounds);
+
 #endif  /* __ED_TRANSFORM_H__ */
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index c20d92963a9..18d5101ebf7 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -29,12 +29,15 @@ struct BMVert;
 struct BMEdge;
 struct BMFace;
 
+struct Depsgraph;
 struct ListBase;
 struct Scene;
+struct ViewLayer;
 struct Main;
 struct Object;
 struct ARegion;
 struct View3D;
+struct bContext;
 
 /* transform_snap_object.c */
 
@@ -69,13 +72,16 @@ struct SnapObjectParams {
 	char snap_select;
 	/* use editmode cage */
 	unsigned int use_object_edit_cage : 1;
+	/* snap to the closest element, use when using more than one snap type */
+	unsigned int use_occlusion_test   : 1;
+
 };
 
 typedef struct SnapObjectContext SnapObjectContext;
 SnapObjectContext *ED_transform_snap_object_context_create(
-        struct Main *bmain, struct Scene *scene, int flag);
+        struct Scene *scene, struct Depsgraph *depsgraph, int flag);
 SnapObjectContext *ED_transform_snap_object_context_create_view3d(
-        struct Main *bmain, struct Scene *scene, int flag,
+        struct Scene *scene, struct Depsgraph *depsgraph, int flag,
         /* extra args for view3d */
         const struct ARegion *ar, const struct View3D *v3d);
 void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx);
@@ -113,7 +119,6 @@ bool ED_transform_snap_object_project_view3d_ex(
         const unsigned short snap_to,
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
-        float *ray_depth,
         float r_loc[3], float r_no[3], int *r_index,
         struct Object **r_ob, float r_obmat[4][4]);
 bool ED_transform_snap_object_project_view3d(
@@ -121,16 +126,8 @@ bool ED_transform_snap_object_project_view3d(
         const unsigned short snap_to,
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
-        float *ray_depth,
         /* return args */
         float r_loc[3], float r_no[3]);
-bool ED_transform_snap_object_project_view3d_mixed(
-        SnapObjectContext *sctx,
-        const unsigned short snap_to_flag,
-        const struct SnapObjectParams *params,
-        const float mval_fl[2], float *dist_px,
-        bool use_depth,
-        float r_co[3], float r_no[3]);
 
 bool ED_transform_snap_object_project_all_view3d_ex(
         SnapObjectContext *sctx,
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h
index 084c97dba2a..5103ac97361 100644
--- a/source/blender/editors/include/ED_undo.h
+++ b/source/blender/editors/include/ED_undo.h
@@ -25,7 +25,10 @@
 #ifndef __ED_UNDO_H__
 #define __ED_UNDO_H__
 
+#include "BLI_compiler_attrs.h"
+
 struct bContext;
+struct CLG_LogRef;
 struct wmOperator;
 struct wmOperatorType;
 struct UndoStack;
@@ -49,10 +52,22 @@ int     ED_undo_operator_repeat(struct bContext *C, struct wmOperator *op);
 void    ED_undo_operator_repeat_cb(struct bContext *C, void *arg_op, void *arg_unused);
 void    ED_undo_operator_repeat_cb_evt(struct bContext *C, void *arg_op, int arg_unused);
 
+/* Context sanity helpers for operator repeat. */
+typedef struct OperatorRepeatContextHandle OperatorRepeatContextHandle;
+
+const OperatorRepeatContextHandle *ED_operator_repeat_prepare_context(
+        struct bContext *C, struct wmOperator *op) ATTR_WARN_UNUSED_RESULT;
+void ED_operator_repeat_reset_context(
+        struct bContext *C, const OperatorRepeatContextHandle *context_info);
+
 bool    ED_undo_is_valid(const struct bContext *C, const char *undoname);
 
 struct UndoStack *ED_undo_stack_get(void);
 
+/* helpers */
+void ED_undo_object_set_active_or_warn(
+        struct ViewLayer *view_layer, struct Object *ob, const char *info, struct CLG_LogRef *log);
+
 /* undo_system_types.c */
 void ED_undosys_type_init(void);
 void ED_undosys_type_free(void);
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 5a051271926..3a35bddeb77 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -31,11 +31,10 @@
 #ifndef __ED_UTIL_H__
 #define __ED_UTIL_H__
 
+#include "BLI_compiler_attrs.h"
+
 struct bContext;
 struct wmOperatorType;
-struct ScrArea;
-struct SpaceLink;
-struct PackedFile;
 
 /* ed_util.c */
 
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index e84106aec20..e6cd276e5c7 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -35,12 +35,13 @@ struct BMesh;
 struct BMEditMesh;
 struct BMFace;
 struct BMLoop;
+struct Depsgraph;
 struct Image;
 struct ImageUser;
-struct MTexPoly;
 struct Main;
 struct Object;
 struct Scene;
+struct ViewLayer;
 struct SpaceImage;
 struct bNode;
 struct wmKeyConfig;
@@ -49,11 +50,15 @@ struct wmKeyConfig;
 void ED_operatortypes_uvedit(void);
 void ED_keymap_uvedit(struct wmKeyConfig *keyconf);
 
-void ED_uvedit_assign_image(
-        struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma);
 bool ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float min[2], float max[2]);
+bool ED_uvedit_center(Scene *scene, Image *ima, struct Object *obedit, float cent[2], char mode);
 void ED_uvedit_select_all(struct BMesh *bm);
 
+bool ED_uvedit_minmax_multi(
+        struct Scene *scene, struct Image *ima, struct Object **objects_edit, uint objects_len, float r_min[2], float r_max[2]);
+bool ED_uvedit_center_multi(
+        Scene *scene, Image *ima, struct Object **objects_edit, uint objects_len, float r_cent[2], char mode);
+
 bool ED_object_get_active_image(
         struct Object *ob, int mat_nr,
         struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree);
@@ -62,7 +67,8 @@ void ED_object_assign_active_image(struct Main *bmain, struct Object *ob, int ma
 bool ED_uvedit_test(struct Object *obedit);
 
 /* visibility and selection */
-bool uvedit_face_visible_test(struct Scene *scene, struct Image *ima, struct BMFace *efa, struct MTexPoly *tf);
+bool uvedit_face_visible_test(
+        struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa);
 bool uvedit_face_select_test(
         struct Scene *scene, struct BMFace *efa,
         const int cd_loop_uv_offset);
@@ -116,21 +122,24 @@ void ED_uvedit_live_unwrap_end(short cancel);
 
 void ED_uvedit_live_unwrap(struct Scene *scene, struct Object *obedit);
 void ED_uvedit_pack_islands(
-        struct Scene *scene, struct Object *ob, struct BMesh *bm,
+        struct Scene *scene, struct Object *ob, struct BMesh *bm, bool selected, bool correct_aspect, bool do_rotate);
+void ED_uvedit_pack_islands_multi(
+        struct Scene *scene, struct Object **objects, const uint objects_len,
         bool selected, bool correct_aspect, bool do_rotate);
 void ED_uvedit_unwrap_cube_project(
         struct BMesh *bm, float cube_size, bool use_select, const float center[3]);
 
 /* single call up unwrap using scene settings, used for edge tag unwrapping */
-void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel);
+void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel, const bool pack);
 
 
 /* uvedit_draw.c */
 void ED_image_draw_cursor(
-        struct ARegion *ar, const float cursor[2]);
+       struct ARegion *ar, const float cursor[2]);
 void ED_uvedit_draw_main(
-        struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene,
-        struct Object *obedit, struct Object *obact);
+        struct SpaceImage *sima,
+        struct ARegion *ar, struct Scene *scene, struct ViewLayer *view_layer,
+        struct Object *obedit, struct Object *obact, struct Depsgraph *depsgraph);
 
 /* uvedit_buttons.c */
 void ED_uvedit_buttons_register(struct ARegionType *art);
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 5110dd1a3f6..f00982d4102 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -40,6 +40,8 @@ struct BPoint;
 struct Base;
 struct BezTriple;
 struct BoundBox;
+struct Camera;
+struct Depsgraph;
 struct EditBone;
 struct ImBuf;
 struct MVert;
@@ -49,14 +51,15 @@ struct Nurb;
 struct Object;
 struct RV3DMatrixStore;
 struct RegionView3D;
+struct RenderEngineType;
 struct Scene;
+struct ViewLayer;
 struct ScrArea;
 struct View3D;
 struct ViewContext;
 struct bContext;
 struct bPoseChannel;
 struct bScreen;
-struct bglMats;
 struct rctf;
 struct rcti;
 struct wmOperator;
@@ -66,11 +69,15 @@ struct wmWindowManager;
 struct GPUFX;
 struct GPUOffScreen;
 struct GPUFXSettings;
+struct GPUViewport;
+struct WorkSpace;
 enum eGPUFXFlags;
 
 /* for derivedmesh drawing callbacks, for view3d_select, .... */
 typedef struct ViewContext {
+	struct Depsgraph *depsgraph;
 	struct Scene *scene;
+	struct ViewLayer *view_layer;
 	struct Object *obact;
 	struct Object *obedit;
 	struct ARegion *ar;
@@ -90,17 +97,23 @@ typedef struct ViewDepths {
 	bool damaged;
 } ViewDepths;
 
-float *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d);
+struct View3DCursor *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d);
+void   ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, const struct View3D *v3d, float mat[3][3]);
+void   ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, const struct View3D *v3d, float mat[4][4]);
 void   ED_view3d_cursor3d_position(struct bContext *C, float fp[3], const int mval[2]);
 void   ED_view3d_cursor3d_update(struct bContext *C, const int mval[2]);
 
 struct Camera *ED_view3d_camera_data_get(struct View3D *v3d, struct RegionView3D *rv3d);
 
 void ED_view3d_to_m4(float mat[4][4], const float ofs[3], const float quat[4], const float dist);
-void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist);
+void ED_view3d_from_m4(const float mat[4][4], float ofs[3], float quat[4], float *dist);
 
-void ED_view3d_from_object(struct Object *ob, float ofs[3], float quat[4], float *dist, float *lens);
-void ED_view3d_to_object(struct Object *ob, const float ofs[3], const float quat[4], const float dist);
+void ED_view3d_from_object(
+        const struct Object *ob,
+        float ofs[3], float quat[4], float *dist, float *lens);
+void ED_view3d_to_object(
+        const struct Depsgraph *depsgraph, struct Object *ob,
+        const float ofs[3], const float quat[4], const float dist);
 
 void ED_view3d_lastview_store(struct RegionView3D *rv3d);
 
@@ -108,10 +121,10 @@ void ED_view3d_lastview_store(struct RegionView3D *rv3d);
 void  ED_view3d_depth_update(struct ARegion *ar);
 float ED_view3d_depth_read_cached(const struct ViewContext *vc, const int mval[2]);
 bool  ED_view3d_depth_read_cached_normal(
-        const ViewContext *vc, const struct bglMats *mats, const int mval[2],
+        const ViewContext *vc, const int mval[2],
         float r_normal[3]);
 bool ED_view3d_depth_unproject(
-        const struct ARegion *ar, const struct bglMats *mats,
+        const struct ARegion *ar,
         const int mval[2], const double depth,
         float r_location_world[3]);
 void  ED_view3d_depth_tag_update(struct RegionView3D *rv3d);
@@ -221,9 +234,11 @@ float ED_view3d_pixel_size_no_ui_scale(const struct RegionView3D *rv3d, const fl
 float ED_view3d_calc_zfac(const struct RegionView3D *rv3d, const float co[3], bool *r_flip);
 bool ED_view3d_clip_segment(const struct RegionView3D *rv3d, float ray_start[3], float ray_end[3]);
 bool ED_view3d_win_to_ray(
+        struct Depsgraph *depsgraph,
         const struct ARegion *ar, const struct View3D *v3d, const float mval[2],
         float ray_start[3], float ray_normal[3], const bool do_clip);
 bool ED_view3d_win_to_ray_ex(
+        struct Depsgraph *depsgraph,
         const struct ARegion *ar, const struct View3D *v3d, const float mval[2],
         float r_ray_co[3], float r_ray_normal[3], float r_ray_start[3], bool do_clip);
 void ED_view3d_global_to_vector(const struct RegionView3D *rv3d, const float coord[3], float vec[3]);
@@ -238,11 +253,14 @@ void ED_view3d_win_to_3d_int(
 void ED_view3d_win_to_delta(const struct ARegion *ar, const float mval[2], float out[3], const float zfac);
 void ED_view3d_win_to_origin(const struct ARegion *ar, const float mval[2], float out[3]);
 void ED_view3d_win_to_vector(const struct ARegion *ar, const float mval[2], float out[3]);
-bool ED_view3d_win_to_segment(const struct ARegion *ar, struct View3D *v3d, const float mval[2],
+bool ED_view3d_win_to_segment(struct Depsgraph *depsgraph,
+                              const struct ARegion *ar, struct View3D *v3d, const float mval[2],
                               float r_ray_start[3], float r_ray_end[3], const bool do_clip);
 void ED_view3d_ob_project_mat_get(const struct RegionView3D *v3d, struct Object *ob, float pmat[4][4]);
 void ED_view3d_ob_project_mat_get_from_obmat(const struct RegionView3D *rv3d, float obmat[4][4], float pmat[4][4]);
-void ED_view3d_unproject(struct bglMats *mats, float out[3], const float x, const float y, const float z);
+
+void ED_view3d_project(const struct ARegion *ar, const float world[3], float region[3]);
+bool ED_view3d_unproject(const struct ARegion *ar, float regionx, float regiony, float regionz, float world[3]);
 
 /* end */
 
@@ -251,28 +269,34 @@ void ED_view3d_dist_range_get(
         const struct View3D *v3d,
         float r_dist_range[2]);
 bool ED_view3d_clip_range_get(
+        struct Depsgraph *depsgraph,
         const struct View3D *v3d, const struct RegionView3D *rv3d,
         float *r_clipsta, float *r_clipend, const bool use_ortho_factor);
 bool ED_view3d_viewplane_get(
+        struct Depsgraph *depsgraph,
         const struct View3D *v3d, const struct RegionView3D *rv3d, int winxi, int winyi,
         struct rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize);
 
 void ED_view3d_polygon_offset(const struct RegionView3D *rv3d, const float dist);
 
 void ED_view3d_calc_camera_border(
-        const struct Scene *scene, const struct ARegion *ar,
+        const struct Scene *scene, struct Depsgraph *depsgraph,
+        const struct ARegion *ar,
         const struct View3D *v3d, const struct RegionView3D *rv3d,
         struct rctf *r_viewborder, const bool no_shift);
 void ED_view3d_calc_camera_border_size(
-        const struct Scene *scene, const struct ARegion *ar,
+        const struct Scene *scene, struct Depsgraph *depsgraph,
+        const struct ARegion *ar,
         const struct View3D *v3d, const struct RegionView3D *rv3d,
         float r_size[2]);
 bool ED_view3d_calc_render_border(
-        const struct Scene *scene, const struct View3D *v3d,
-        const struct ARegion *ar, struct rcti *rect);
+        const struct Scene *scene, struct Depsgraph *depsgraph,
+        struct View3D *v3d,
+        struct ARegion *ar, struct rcti *rect);
 
 void ED_view3d_clipping_calc_from_boundbox(float clip[6][4], const struct BoundBox *clipbb, const bool is_flip);
-void ED_view3d_clipping_calc(struct BoundBox *bb, float planes[4][4], struct bglMats *mats, const struct rcti *rect);
+void ED_view3d_clipping_calc(struct BoundBox *bb, float planes[4][4],
+        const struct ARegion *ar, const struct Object *ob, const struct rcti *rect);
 void ED_view3d_clipping_local(struct RegionView3D *rv3d, float mat[4][4]);
 bool ED_view3d_clipping_test(const struct RegionView3D *rv3d, const float co[3], const bool is_local);
 void ED_view3d_clipping_set(struct RegionView3D *rv3d);
@@ -283,27 +307,31 @@ float ED_view3d_radius_to_dist_persp(const float angle, const float radius);
 float ED_view3d_radius_to_dist_ortho(const float lens, const float radius);
 float ED_view3d_radius_to_dist(
         const struct View3D *v3d, const struct ARegion *ar,
+        const struct Depsgraph *depsgraph,
         const char persp, const bool use_aspect,
         const float radius);
 
-void drawcircball(int mode, const float cent[3], float rad, const float tmat[4][4]);
+void imm_drawcircball(const float cent[3], float rad, const float tmat[4][4], unsigned pos);
 
 /* backbuffer select and draw support */
+void          ED_view3d_backbuf_validate_with_select_mode(struct ViewContext *vc, short select_mode);
 void          ED_view3d_backbuf_validate(struct ViewContext *vc);
-struct ImBuf *ED_view3d_backbuf_read(struct ViewContext *vc, int xmin, int ymin, int xmax, int ymax);
+struct ImBuf *ED_view3d_backbuf_read(
+        struct ViewContext *vc, int xmin, int ymin, int xmax, int ymax);
 unsigned int  ED_view3d_backbuf_sample_rect(
         struct ViewContext *vc, const int mval[2], int size,
         unsigned int min, unsigned int max, float *r_dist);
 int          ED_view3d_backbuf_sample_size_clamp(struct ARegion *ar, const float dist);
-unsigned int ED_view3d_backbuf_sample(struct ViewContext *vc, int x, int y);
+unsigned int ED_view3d_backbuf_sample(
+        struct ViewContext *vc, int x, int y);
 
 bool ED_view3d_autodist(
-        struct Scene *scene, struct ARegion *ar, struct View3D *v3d,
+        struct Depsgraph *depsgraph, struct ARegion *ar, struct View3D *v3d,
         const int mval[2], float mouse_worldloc[3],
         const bool alphaoverride, const float fallback_depth_pt[3]);
 
 /* only draw so ED_view3d_autodist_simple can be called many times after */
-void ED_view3d_autodist_init(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, int mode);
+void ED_view3d_autodist_init(struct Depsgraph *depsgraph, struct ARegion *ar, struct View3D *v3d, int mode);
 bool ED_view3d_autodist_simple(struct ARegion *ar, const int mval[2], float mouse_worldloc[3], int margin, float *force_depth);
 bool ED_view3d_autodist_depth(struct ARegion *ar, const int mval[2], int margin, float *depth);
 bool ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], const int mval_end[2], int margin, float *depth);
@@ -331,10 +359,10 @@ int view3d_opengl_select(
 /* view3d_select.c */
 float ED_view3d_select_dist_px(void);
 void ED_view3d_viewcontext_init(struct bContext *C, struct ViewContext *vc);
+void ED_view3d_viewcontext_init_object(struct ViewContext *vc, struct Object *obact);
 void view3d_operator_needs_opengl(const struct bContext *C);
 void view3d_region_operator_needs_opengl(struct wmWindow *win, struct ARegion *ar);
 void view3d_opengl_read_pixels(struct ARegion *ar, int x, int y, int w, int h, int format, int type, void *data);
-void view3d_get_transformation(const struct ARegion *ar, struct RegionView3D *rv3d, struct Object *ob, struct bglMats *mats);
 
 /* XXX should move to BLI_math */
 bool edge_inside_circle(const float cent[2], float radius, const float screen_co_a[2], const float screen_co_b[2]);
@@ -353,49 +381,58 @@ void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d);
 #  define ED_view3d_clear_mats_rv3d(rv3d) (void)(rv3d)
 #  define ED_view3d_check_mats_rv3d(rv3d) (void)(rv3d)
 #endif
-int ED_view3d_scene_layer_set(int lay, const int *values, int *active);
+int ED_view3d_view_layer_set(int lay, const int *values, int *active);
 
 struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d);
 void                    ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat);
 
+void  ED_draw_object_facemap(
+        struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, const float col[4], const int facemap);
+
+struct RenderEngineType *ED_view3d_engine_type(struct Scene *scene, int drawtype);
+
 bool ED_view3d_context_activate(struct bContext *C);
-void ED_view3d_draw_offscreen_init(struct Scene *scene, struct View3D *v3d);
 void ED_view3d_draw_offscreen(
-        struct Scene *scene, struct View3D *v3d, struct ARegion *ar, int winx, int winy, float viewmat[4][4],
-        float winmat[4][4], bool do_bgpic, bool do_sky, bool is_persp, const char *viewname,
-        struct GPUFX *fx, struct GPUFXSettings *fx_settings,
-        struct GPUOffScreen *ofs);
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        int drawtype,
+        struct View3D *v3d, struct ARegion *ar, int winx, int winy, float viewmat[4][4],
+        float winmat[4][4], bool do_sky, bool is_persp, const char *viewname,
+        struct GPUFXSettings *fx_settings,
+        struct GPUOffScreen *ofs, struct GPUViewport *viewport);
 void ED_view3d_draw_setup_view(
-        struct wmWindow *win, struct Scene *scene, struct ARegion *ar, struct View3D *v3d,
+        struct wmWindow *win, struct Depsgraph *depsgraph, struct Scene *scene, struct ARegion *ar, struct View3D *v3d,
         float viewmat[4][4], float winmat[4][4], const struct rcti *rect);
 
 enum {
 	V3D_OFSDRAW_NONE             = (0),
 
-	V3D_OFSDRAW_USE_BACKGROUND   = (1 << 0),
-	V3D_OFSDRAW_USE_FULL_SAMPLE  = (1 << 1),
+	V3D_OFSDRAW_USE_FULL_SAMPLE  = (1 << 0),
 
 	/* Only works with ED_view3d_draw_offscreen_imbuf_simple(). */
-	V3D_OFSDRAW_USE_GPENCIL      = (1 << 2),
+	V3D_OFSDRAW_USE_GPENCIL      = (1 << 1),
 	V3D_OFSDRAW_USE_SOLID_TEX    = (1 << 2),
 	V3D_OFSDRAW_USE_CAMERA_DOF   = (1 << 3),
 };
 
 struct ImBuf *ED_view3d_draw_offscreen_imbuf(
-        struct Scene *scene, struct View3D *v3d, struct ARegion *ar, int sizex, int sizey,
-        unsigned int flag, unsigned int draw_flags,
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        int drawtype,
+        struct View3D *v3d, struct ARegion *ar,
+        int sizex, int sizey, unsigned int flag, unsigned int draw_flags,
         int alpha_mode, int samples, const char *viewname,
-        struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]);
+        struct GPUOffScreen *ofs, char err_out[256]);
 struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
-        struct Scene *scene, struct Object *camera, int width, int height,
-        unsigned int flag, unsigned int draw_flags, int drawtype, int alpha_mode,
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        int drawtype,
+        struct Object *camera, int width, int height,
+        unsigned int flag, unsigned int draw_flags, int alpha_mode,
         int samples, const char *viewname,
-        struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]);
+        struct GPUOffScreen *ofs, char err_out[256]);
 
 struct Base *ED_view3d_give_base_under_cursor(struct bContext *C, const int mval[2]);
 void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, bool do_clip);
 void ED_view3d_update_viewmat(
-        struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
+        struct Depsgraph *depsgraph, struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
         float viewmat[4][4], float winmat[4][4], const struct rcti *rect);
 bool ED_view3d_quat_from_axis_view(const char view, float quat[4]);
 char ED_view3d_quat_to_axis_view(const float quat[4], const float epsilon);
@@ -404,20 +441,28 @@ char ED_view3d_axis_view_opposite(char view);
 bool ED_view3d_lock(struct RegionView3D *rv3d);
 
 uint64_t ED_view3d_datamask(const struct Scene *scene, const struct View3D *v3d);
-uint64_t ED_view3d_screen_datamask(const struct bScreen *screen);
+uint64_t ED_view3d_screen_datamask(const struct Scene *scene, const struct bScreen *screen);
 
 bool ED_view3d_offset_lock_check(const struct View3D *v3d, const struct RegionView3D *rv3d);
-void ED_view3d_persp_switch_from_camera(struct View3D *v3d, struct RegionView3D *rv3d, const char persp);
-bool ED_view3d_persp_ensure(struct View3D *v3d, struct ARegion *ar);
+void ED_view3d_persp_switch_from_camera(
+        const struct Depsgraph *depsgraph,
+        struct View3D *v3d, struct RegionView3D *rv3d, const char persp);
+bool ED_view3d_persp_ensure(
+        const struct Depsgraph *depsgraph,
+        struct View3D *v3d, struct ARegion *ar);
 
 
 /* camera lock functions */
 bool ED_view3d_camera_lock_check(const struct View3D *v3d, const struct RegionView3D *rv3d);
 /* copy the camera to the view before starting a view transformation */
-void ED_view3d_camera_lock_init_ex(struct View3D *v3d, struct RegionView3D *rv3d, const bool calc_dist);
-void ED_view3d_camera_lock_init(struct View3D *v3d, struct RegionView3D *rv3d);
+void ED_view3d_camera_lock_init_ex(
+        const struct Depsgraph *depsgraph,
+        struct View3D *v3d, struct RegionView3D *rv3d, const bool calc_dist);
+void ED_view3d_camera_lock_init(const struct Depsgraph *depsgraph, struct View3D *v3d, struct RegionView3D *rv3d);
 /* copy the view to the camera, return true if */
-bool ED_view3d_camera_lock_sync(struct View3D *v3d, struct RegionView3D *rv3d);
+bool ED_view3d_camera_lock_sync(
+        const struct Depsgraph *depsgraph,
+        struct View3D *v3d, struct RegionView3D *rv3d);
 
 bool ED_view3d_camera_autokey(
         struct Scene *scene, struct ID *id_key,
@@ -428,10 +473,6 @@ bool ED_view3d_camera_lock_autokey(
 
 void ED_view3d_lock_clear(struct View3D *v3d);
 
-struct BGpic *ED_view3d_background_image_new(struct View3D *v3d);
-void ED_view3d_background_image_remove(struct View3D *v3d, struct BGpic *bgpic);
-void ED_view3d_background_image_clear(struct View3D *v3d);
-
 #define VIEW3D_MARGIN 1.4f
 #define VIEW3D_DIST_FALLBACK 1.0f
 
@@ -460,4 +501,11 @@ void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrAr
 
 void ED_view3d_id_remap(struct View3D *v3d, const struct ID *old_id, struct ID *new_id);
 
+/* view3d_draw_legacy.c */
+/* Try avoid using these more move out of legacy. */
+void ED_view3d_draw_bgpic_test(
+        struct Scene *scene, struct Depsgraph *depsgraph,
+        struct ARegion *ar, struct View3D *v3d,
+        const bool do_foreground, const bool do_camera_frame);
+
 #endif /* __ED_VIEW3D_H__ */
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 0c5631abe3b..3bc1255d23f 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -190,8 +190,8 @@ DEF_ICON(SCULPTMODE_HLT)
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
 DEF_ICON(LIGHTPAINT)
+DEF_ICON(GREASEPENCIL_STROKE_PAINT)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK063)
 	DEF_ICON(BLANK064)
 	DEF_ICON(BLANK065)
 	DEF_ICON(BLANK066)
@@ -257,9 +257,7 @@ DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
 DEF_ICON(LINE_DATA)
-#ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK084)
-#endif
+DEF_ICON(LIBRARY_DATA_OVERRIDE)
 DEF_ICON(GROUP_BONE)
 DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
@@ -315,9 +313,9 @@ DEF_ICON(OUTLINER_OB_SURFACE)
 DEF_ICON(OUTLINER_OB_SPEAKER)
 DEF_ICON(OUTLINER_OB_FORCE_FIELD)
 DEF_ICON(OUTLINER_OB_GROUP_INSTANCE)
+DEF_ICON(OUTLINER_OB_GREASEPENCIL)
+DEF_ICON(OUTLINER_OB_LIGHTPROBE)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK122)
-	DEF_ICON(BLANK123)
 	DEF_ICON(BLANK124)
 	DEF_ICON(BLANK125)
 #endif
@@ -346,8 +344,8 @@ DEF_ICON(OUTLINER_DATA_FONT)
 DEF_ICON(OUTLINER_DATA_SURFACE)
 DEF_ICON(OUTLINER_DATA_SPEAKER)
 DEF_ICON(OUTLINER_DATA_POSE)
+DEF_ICON(OUTLINER_DATA_GREASEPENCIL)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK130)
 	DEF_ICON(BLANK131)
 	DEF_ICON(BLANK132)
 	DEF_ICON(BLANK133)
@@ -414,10 +412,10 @@ DEF_ICON(CURVE_BEZCIRCLE)
 DEF_ICON(CURVE_NCURVE)
 DEF_ICON(CURVE_NCIRCLE)
 DEF_ICON(CURVE_PATH)
+DEF_ICON(LIGHTPROBE_CUBEMAP)
+DEF_ICON(LIGHTPROBE_PLANAR)
+DEF_ICON(LIGHTPROBE_GRID)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK644)
-	DEF_ICON(BLANK645)
-	DEF_ICON(BLANK646)
 	DEF_ICON(BLANK647)
 	DEF_ICON(BLANK648)
 #endif
@@ -715,8 +713,8 @@ DEF_ICON(CLIPUV_DEHLT)
 DEF_ICON(CLIPUV_HLT)
 DEF_ICON(SNAP_PEEL_OBJECT)
 DEF_ICON(GRID)
+DEF_ICON(OBJECT_ORIGIN)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK221)
 	DEF_ICON(BLANK222)
 	DEF_ICON(BLANK224)
 	DEF_ICON(BLANK225)
@@ -1033,4 +1031,3 @@ DEF_VICO(COLORSET_17_VEC)
 DEF_VICO(COLORSET_18_VEC)
 DEF_VICO(COLORSET_19_VEC)
 DEF_VICO(COLORSET_20_VEC)
-
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index b6e75893431..4d1f1350047 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -42,6 +42,7 @@ struct ID;
 struct IDProperty;
 struct ListBase;
 struct ARegion;
+struct ARegionType;
 struct ScrArea;
 struct bScreen;
 struct wmEvent;
@@ -64,7 +65,6 @@ struct Image;
 struct ImageUser;
 struct wmKeyConfig;
 struct wmOperatorType;
-struct uiWidgetColors;
 struct MTex;
 struct ImBuf;
 struct bNodeTree;
@@ -73,6 +73,9 @@ struct bNodeSocket;
 struct wmDropBox;
 struct wmDrag;
 struct wmEvent;
+struct wmManipulator;
+struct wmMsgBus;
+struct wmKeyMap;
 
 typedef struct uiBut uiBut;
 typedef struct uiBlock uiBlock;
@@ -99,6 +102,8 @@ enum {
 	UI_EMBOSS_NONE          = 1,  /* Nothing, only icon and/or text */
 	UI_EMBOSS_PULLDOWN      = 2,  /* Pulldown menu style */
 	UI_EMBOSS_RADIAL        = 3,  /* Pie Menu */
+
+	UI_EMBOSS_UNDEFINED     = 255, /* For layout engine, use emboss from block. */
 };
 
 /* uiBlock->direction */
@@ -107,7 +112,8 @@ enum {
 	UI_DIR_DOWN         = (1 << 1),
 	UI_DIR_LEFT         = (1 << 2),
 	UI_DIR_RIGHT        = (1 << 3),
-	UI_DIR_CENTER_Y     = (1 << 4),
+	UI_DIR_CENTER_X     = (1 << 4),
+	UI_DIR_CENTER_Y     = (1 << 5),
 
 	UI_DIR_ALL          = (UI_DIR_UP | UI_DIR_DOWN | UI_DIR_LEFT | UI_DIR_RIGHT),
 };
@@ -139,6 +145,10 @@ enum {
 #define UI_BLOCK_POPUP_HOLD  (1 << 18)
 #define UI_BLOCK_LIST_ITEM   (1 << 19)
 #define UI_BLOCK_RADIAL      (1 << 20)
+#define UI_BLOCK_POPOVER     (1 << 21)
+#define UI_BLOCK_POPOVER_ONCE (1 << 22)
+/** Always show keymaps, even for non-menus. */
+#define UI_BLOCK_SHOW_SHORTCUT_ALWAYS (1 << 23)
 
 /* uiPopupBlockHandle->menuretval */
 #define UI_RETURN_CANCEL     (1 << 0)   /* cancel all menus cascading */
@@ -178,11 +188,13 @@ enum {
 	UI_BUT_COLOR_CUBIC     = (1 << 23),  /* cubic saturation for the color wheel */
 	UI_BUT_LIST_ITEM       = (1 << 24),  /* This but is "inside" a list item (currently used to change theme colors). */
 	UI_BUT_DRAG_MULTI      = (1 << 25),  /* edit this button as well as the active button (not just dragging) */
-	UI_BUT_SCA_LINK_GREY   = (1 << 26),  /* used to flag if sca links shoud be gray out */
+
 	UI_BUT_HAS_SEP_CHAR    = (1 << 27),  /* but->str contains UI_SEP_CHAR, used for key shortcuts */
 	UI_BUT_UPDATE_DELAY    = (1 << 28),  /* don't run updates while dragging (needed in rare cases). */
 	UI_BUT_TEXTEDIT_UPDATE = (1 << 29),  /* when widget is in textedit mode, update value on each char stroke */
 	UI_BUT_VALUE_CLEAR     = (1 << 30),  /* show 'x' icon to clear/unlink value of text or search button */
+
+	UI_BUT_OVERRIDEN       = (1 << 31),  /* RNA property of the button is overriden from linked reference data. */
 };
 
 #define UI_PANEL_WIDTH          340
@@ -218,11 +230,14 @@ enum {
 	UI_BUT_ALIGN_ALL         = (UI_BUT_ALIGN | UI_BUT_ALIGN_STITCH_TOP | UI_BUT_ALIGN_STITCH_LEFT),
 
 	UI_BUT_BOX_ITEM          = (1 << 20), /* This but is "inside" a box item (currently used to change theme colors). */
+
+	UI_BUT_ACTIVE_LEFT       = (1 << 21), /* Active left part of number button */
+	UI_BUT_ACTIVE_RIGHT      = (1 << 22), /* Active right part of number button */
 };
 
 /* scale fixed button widths by this to account for DPI */
 
-#define UI_DPI_FAC ((U.pixelsize * (float)U.dpi) / 72.0f)
+#define UI_DPI_FAC (U.dpi_fac)
 /* 16 to copy ICON_DEFAULT_HEIGHT */
 #define UI_DPI_ICON_SIZE ((float)16 * UI_DPI_FAC)
 
@@ -261,11 +276,11 @@ typedef enum {
 	UI_BTYPE_CHECKBOX               = (13 << 9),  /* similar to toggle, display a 'tick' */
 	UI_BTYPE_CHECKBOX_N             = (14 << 9),
 	UI_BTYPE_COLOR                  = (15 << 9),
+	UI_BTYPE_TAB                    = (16 << 9),
+	UI_BTYPE_POPOVER                = (17 << 9),
 	UI_BTYPE_SCROLL                 = (18 << 9),
 	UI_BTYPE_BLOCK                  = (19 << 9),
 	UI_BTYPE_LABEL                  = (20 << 9),
-	UI_BTYPE_LINK                   = (22 << 9),
-	UI_BTYPE_INLINK                 = (23 << 9),
 	UI_BTYPE_KEY_EVENT              = (24 << 9),
 	UI_BTYPE_HSVCUBE                = (26 << 9),
 	UI_BTYPE_PULLDOWN               = (27 << 9),  /* menu (often used in headers), **_MENU /w different draw-type */
@@ -313,18 +328,25 @@ typedef enum {
  * Functions to draw various shapes, taking theme settings into account.
  * Used for code that draws its own UI style elements. */
 
-void UI_draw_roundbox(float minx, float miny, float maxx, float maxy, float rad);
+void UI_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3, const float color[4]);
+void UI_draw_anti_fan(float tri_array[][2], unsigned int length, const float color[4]);
+
 void UI_draw_roundbox_corner_set(int type);
+void UI_draw_roundbox_aa(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float color[4]);
+void UI_draw_roundbox_4fv(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float col[4]);
+void UI_draw_roundbox_3ubAlpha(bool filled, float minx, float miny, float maxx, float maxy, float rad, const unsigned char col[3], unsigned char alpha);
+void UI_draw_roundbox_3fvAlpha(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float col[3], float alpha);
+void UI_draw_roundbox_shade_x(bool filled, float minx, float miny, float maxx, float maxy, float rad, float shadetop, float shadedown, const float col[4]);
+
+#if 0 /* unused */
 int  UI_draw_roundbox_corner_get(void);
-void UI_draw_roundbox_unfilled(float minx, float miny, float maxx, float maxy, float rad);
+void UI_draw_roundbox_shade_y(bool filled, float minx, float miny, float maxx, float maxy, float rad, float shadeleft, float shaderight, const float col[4]);
+#endif
+
 void UI_draw_box_shadow(unsigned char alpha, float minx, float miny, float maxx, float maxy);
-void UI_draw_roundbox_gl_mode(int mode, float minx, float miny, float maxx, float maxy, float rad);
-void UI_draw_roundbox_shade_x(int mode, float minx, float miny, float maxx, float maxy, float rad, float shadetop, float shadedown);
-void UI_draw_roundbox_shade_y(int mode, float minx, float miny, float maxx, float maxy, float rad, float shadeLeft, float shadeRight);
-void UI_draw_text_underline(int pos_x, int pos_y, int len, int height);
+void UI_draw_text_underline(int pos_x, int pos_y, int len, int height, const float color[4]);
 
-void UI_draw_safe_areas(
-        float x1, float x2, float y1, float y2,
+void UI_draw_safe_areas(uint pos, float x1, float x2, float y1, float y2,
         const float title_aspect[2], const float action_aspect[2]);
 
 /* state for scrolldrawing */
@@ -403,6 +425,19 @@ int UI_popup_menu_invoke(struct bContext *C, const char *idname, struct ReportLi
 void UI_popup_menu_retval_set(const uiBlock *block, const int retval, const bool enable);
 void UI_popup_menu_but_set(uiPopupMenu *pup, struct ARegion *butregion, uiBut *but);
 
+/* interface_region_popover.c */
+
+typedef struct uiPopover uiPopover;
+
+int UI_popover_panel_invoke(
+        struct bContext *C, int space_id, int region_id, const char *idname,
+        bool keep_open, struct ReportList *reports);
+
+uiPopover *UI_popover_begin(struct bContext *C) ATTR_NONNULL(1);
+void UI_popover_end(struct bContext *C, struct uiPopover *head, struct wmKeyMap *keymap);
+struct uiLayout *UI_popover_layout(uiPopover *head);
+void UI_popover_once_clear(uiPopover *pup);
+
 /* interface_region_menu_pie.c */
 /* Pie menus */
 typedef struct uiPieMenu uiPieMenu;
@@ -452,10 +487,10 @@ uiBlock *UI_block_begin(const struct bContext *C, struct ARegion *region, const
 void UI_block_end_ex(const struct bContext *C, uiBlock *block, const int xy[2], int r_xy[2]);
 void UI_block_end(const struct bContext *C, uiBlock *block);
 void UI_block_draw(const struct bContext *C, struct uiBlock *block);
+void UI_blocklist_update_window_matrix(const struct bContext *C, const struct ListBase *lb);
+void UI_blocklist_draw(const struct bContext *C, const struct ListBase *lb);
 void UI_block_update_from_old(const struct bContext *C, struct uiBlock *block);
 
-uiBlock *UI_block_find_in_region(const char *name, struct ARegion *ar);
-
 void UI_block_emboss_set(uiBlock *block, char dt);
 
 void UI_block_free(const struct bContext *C, uiBlock *block);
@@ -496,6 +531,7 @@ void    UI_block_direction_set(uiBlock *block, char direction);
 void    UI_block_order_flip(uiBlock *block);
 void    UI_block_flag_enable(uiBlock *block, int flag);
 void    UI_block_flag_disable(uiBlock *block, int flag);
+void    UI_block_translate(uiBlock *block, int x, int y);
 
 int     UI_but_return_value_get(uiBut *but);
 
@@ -659,6 +695,7 @@ void UI_but_string_info_get(struct bContext *C, uiBut *but, ...) ATTR_SENTINEL(0
 #define UI_ID_FAKE_USER     (1 << 8)
 #define UI_ID_PIN           (1 << 9)
 #define UI_ID_PREVIEWS      (1 << 10)
+#define UI_ID_OVERRIDE      (1 << 11)
 #define UI_ID_FULL          (UI_ID_RENAME | UI_ID_BROWSE | UI_ID_ADD_NEW | UI_ID_OPEN | UI_ID_ALONE | UI_ID_DELETE | UI_ID_LOCAL)
 
 /**
@@ -692,18 +729,30 @@ uiBut *uiDefSearchButO_ptr(uiBlock *block, struct wmOperatorType *ot, struct IDP
                            void *arg, int retval, int icon, int maxlen, int x, int y,
                            short width, short height, float a1, float a2, const char *tip);
 
-uiBut *uiDefAutoButR(uiBlock *block, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, const char *name, int icon, int x1, int y1, int x2, int y2);
-int uiDefAutoButsRNA(uiLayout *layout, struct PointerRNA *ptr, bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *), const char label_align);
-
-/* Links
- *
- * Game engine logic brick links. Non-functional currently in 2.5,
- * code to handle and draw these is disabled internally. */
 
-void UI_but_link_set(struct uiBut *but,  void **poin,  void ***ppoin,  short *tot,  int from, int to);
+/* For uiDefAutoButsRNA */
+typedef enum {
+	/* Keep current layout for aligning label with property button. */
+	UI_BUT_LABEL_ALIGN_NONE,
+	/* Align label and property button vertically. */
+	UI_BUT_LABEL_ALIGN_COLUMN,
+	/* Split layout into a column for the label and one for property button. */
+	UI_BUT_LABEL_ALIGN_SPLIT_COLUMN,
+} eButLabelAlign;
+
+/* Return info for uiDefAutoButsRNA */
+typedef enum {
+	/* Returns when no buttons were added */
+	UI_PROP_BUTS_NONE_ADDED       = (1 << 0),
+	/* Returned when any property failed the custom check callback (check_prop) */
+	UI_PROP_BUTS_ANY_FAILED_CHECK = (1 << 1),
+} eAutoPropButsReturn;
 
-void UI_block_links_compose(uiBlock *block);
-uiBut *UI_block_links_find_inlink(uiBlock *block, void *poin);
+uiBut *uiDefAutoButR(uiBlock *block, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, const char *name, int icon, int x1, int y1, int x2, int y2);
+eAutoPropButsReturn uiDefAutoButsRNA(
+        uiLayout *layout, struct PointerRNA *ptr,
+        bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
+        eButLabelAlign label_align, const bool compact);
 
 /* use inside searchfunc to add items */
 bool    UI_search_item_add(uiSearchItems *items, const char *name, void *poin, int iconid);
@@ -773,9 +822,10 @@ void UI_panels_begin(const struct bContext *C, struct ARegion *ar);
 void UI_panels_end(const struct bContext *C, struct ARegion *ar, int *x, int *y);
 void UI_panels_draw(const struct bContext *C, struct ARegion *ar);
 
-struct Panel *UI_panel_find_by_type(struct ARegion *ar, struct PanelType *pt);
-struct Panel *UI_panel_begin(struct ScrArea *sa, struct ARegion *ar, uiBlock *block,
-                             struct PanelType *pt, struct Panel *pa, bool *r_open);
+struct Panel *UI_panel_find_by_type(struct ListBase *lb, struct PanelType *pt);
+struct Panel *UI_panel_begin(struct ScrArea *sa, struct ARegion *ar, struct ListBase *lb,
+                             uiBlock *block, struct PanelType *pt, struct Panel *pa,
+                             bool *r_open);
 void UI_panel_end(uiBlock *block, int width, int height);
 void UI_panels_scale(struct ARegion *ar, float new_width);
 
@@ -790,6 +840,8 @@ struct PanelCategoryDyn   *UI_panel_category_find_mouse_over(struct ARegion *ar,
 void                       UI_panel_category_clear_all(struct ARegion *ar);
 void                       UI_panel_category_draw_all(struct ARegion *ar, const char *category_id_active);
 
+struct PanelType *UI_paneltype_find(int space_id, int region_id, const char *idname);
+
 /* Handlers
  *
  * Handlers that can be registered in regions, areas and windows for
@@ -809,7 +861,6 @@ void UI_popup_handlers_remove_all(struct bContext *C, struct ListBase *handlers)
 void UI_init(void);
 void UI_init_userdef(void);
 void UI_reinit_font(void);
-void UI_reinit_gl_state(void);
 void UI_exit(void);
 
 /* Layout
@@ -840,6 +891,7 @@ void UI_exit(void);
 #define UI_LAYOUT_ALIGN_CENTER  2
 #define UI_LAYOUT_ALIGN_RIGHT   3
 
+#define UI_ITEM_O_RETURN_PROPS  (1 << 0)
 #define UI_ITEM_R_EXPAND        (1 << 1)
 #define UI_ITEM_R_SLIDER        (1 << 2)
 #define UI_ITEM_R_TOGGLE        (1 << 3)
@@ -849,10 +901,15 @@ void UI_exit(void);
 #define UI_ITEM_R_NO_BG         (1 << 7)
 #define UI_ITEM_R_IMMEDIATE     (1 << 8)
 #define UI_ITEM_O_DEPRESS       (1 << 9)
+#define UI_ITEM_R_COMPACT       (1 << 10)
 
-/* uiTemplateOperatorPropertyButs flags */
-#define UI_TEMPLATE_OP_PROPS_SHOW_TITLE 1
-#define UI_TEMPLATE_OP_PROPS_SHOW_EMPTY 2
+
+/* uiLayoutOperatorButs flags */
+enum {
+	UI_TEMPLATE_OP_PROPS_SHOW_TITLE       = (1 << 0),
+	UI_TEMPLATE_OP_PROPS_SHOW_EMPTY       = (1 << 1),
+	UI_TEMPLATE_OP_PROPS_COMPACT          = (1 << 2),
+};
 
 /* used for transp checkers */
 #define UI_ALPHA_CHECKER_DARK 100
@@ -874,13 +931,12 @@ enum {
 	UI_CNR_ALL          = (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)
 };
 
-/* not apart of the corner flags but mixed in some functions  */
-#define UI_RB_ALPHA (UI_CNR_ALL + 1)
-
 uiLayout *UI_block_layout(uiBlock *block, int dir, int type, int x, int y, int size, int em, int padding, struct uiStyle *style);
 void UI_block_layout_set_current(uiBlock *block, uiLayout *layout);
 void UI_block_layout_resolve(uiBlock *block, int *x, int *y);
 
+void UI_region_message_subscribe(struct ARegion *ar, struct wmMsgBus *mbus);
+
 uiBlock *uiLayoutGetBlock(uiLayout *layout);
 
 void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv);
@@ -888,7 +944,9 @@ void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct Pointe
 void uiLayoutContextCopy(uiLayout *layout, struct bContextStore *context);
 const char *uiLayoutIntrospect(uiLayout *layout); // XXX - testing
 struct MenuType *UI_but_menutype_get(uiBut *but);
+struct PanelType *UI_but_paneltype_get(uiBut *but);
 void UI_menutype_draw(struct bContext *C, struct MenuType *mt, struct uiLayout *layout);
+void UI_paneltype_draw(struct bContext *C, struct PanelType *pt, struct uiLayout *layout);
 
 /* Only for convenience. */
 void uiLayoutSetContextFromBut(uiLayout *layout, uiBut *but);
@@ -901,6 +959,8 @@ void uiLayoutSetAlignment(uiLayout *layout, char alignment);
 void uiLayoutSetKeepAspect(uiLayout *layout, bool keepaspect);
 void uiLayoutSetScaleX(uiLayout *layout, float scale);
 void uiLayoutSetScaleY(uiLayout *layout, float scale);
+void uiLayoutSetEmboss(uiLayout *layout, char emboss);
+void uiLayoutSetPropSep(uiLayout *layout, bool is_sep);
 
 int uiLayoutGetOperatorContext(uiLayout *layout);
 bool uiLayoutGetActive(uiLayout *layout);
@@ -911,6 +971,8 @@ bool uiLayoutGetKeepAspect(uiLayout *layout);
 int uiLayoutGetWidth(uiLayout *layout);
 float uiLayoutGetScaleX(uiLayout *layout);
 float uiLayoutGetScaleY(uiLayout *layout);
+int uiLayoutGetEmboss(uiLayout *layout);
+bool uiLayoutGetPropSep(uiLayout *layout);
 
 /* layout specifiers */
 uiLayout *uiLayoutRow(uiLayout *layout, int align);
@@ -936,11 +998,30 @@ void uiTemplateIDBrowse(
 void uiTemplateIDPreview(
         uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname,
         const char *newop, const char *openop, const char *unlinkop, int rows, int cols, int filter);
+void uiTemplateIDTabs(
+        uiLayout *layout, struct bContext *C,
+        PointerRNA *ptr, const char *propname,
+        const char *newop, const char *openop, const char *unlinkop,
+        int filter);
 void uiTemplateAnyID(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
                      const char *proptypename, const char *text);
+void uiTemplateSearch(
+        uiLayout *layout, struct bContext *C,
+        struct PointerRNA *ptr, const char *propname,
+        struct PointerRNA *searchptr, const char *searchpropname,
+        const char *newop, const char *unlinkop);
+void uiTemplateSearchPreview(
+        uiLayout *layout, struct bContext *C,
+        struct PointerRNA *ptr, const char *propname,
+        struct PointerRNA *searchptr, const char *searchpropname,
+        const char *newop, const char *unlinkop,
+        const int rows, const int cols);
 void uiTemplatePathBuilder(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
                            struct PointerRNA *root_ptr, const char *text);
 uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
+
+void uiTemplateOperatorRedoProperties(uiLayout *layout, const struct bContext *C);
+
 uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr);
 void uiTemplatePreview(uiLayout *layout, struct bContext *C, struct ID *id, int show_buttons, struct ID *parent,
                        struct MTex *slot, const char *preview_id);
@@ -955,8 +1036,6 @@ void uiTemplateColorPicker(uiLayout *layout, struct PointerRNA *ptr, const char
 void uiTemplatePalette(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int color);
 void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
                       PointerRNA *used_ptr, const char *used_propname, int active_layer);
-void uiTemplateGameStates(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
-                      PointerRNA *used_ptr, const char *used_propname, int active_state);
 void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *userptr, int compact, int multiview);
 void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, int color_management);
 void uiTemplateImageStereo3d(uiLayout *layout, struct PointerRNA *stereo3d_format_ptr);
@@ -967,9 +1046,11 @@ void uiTemplateImageInfo(uiLayout *layout, struct bContext *C, struct Image *ima
 void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
 void UI_but_func_operator_search(uiBut *but);
 void uiTemplateOperatorSearch(uiLayout *layout);
-void uiTemplateOperatorPropertyButs(const struct bContext *C, uiLayout *layout, struct wmOperator *op,
-                                    bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
-                                    const char label_align, const short flag);
+eAutoPropButsReturn uiTemplateOperatorPropertyButs(
+        const struct bContext *C, uiLayout *layout, struct wmOperator *op,
+        bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
+        const eButLabelAlign label_align, const short flag);
+void uiTemplateHeader3D_mode(uiLayout *layout, struct bContext *C);
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
 void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C);
 void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
@@ -1044,6 +1125,19 @@ void uiItemM(uiLayout *layout, struct bContext *C, const char *menuname, const c
 void uiItemV(uiLayout *layout, const char *name, int icon, int argval); /* value */
 void uiItemS(uiLayout *layout); /* separator */
 
+void uiItemPopoverPanel_ptr(
+        uiLayout *layout, struct bContext *C,
+        struct PanelType *pt,
+        const char *name, int icon);
+void uiItemPopoverPanel(
+        uiLayout *layout, struct bContext *C,
+        int space_id, int region_id, const char *panelname,
+        const char *name, int icon);
+void uiItemPopoverPanelFromGroup(
+        uiLayout *layout, struct bContext *C,
+        int space_id, int region_id,
+        const char *context, const char *category);
+
 void uiItemMenuF(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg);
 void uiItemMenuEnumO_ptr(uiLayout *layout, struct bContext *C, struct wmOperatorType *ot, const char *propname, const char *name, int icon);
 void uiItemMenuEnumO(uiLayout *layout, struct bContext *C, const char *opname, const char *propname, const char *name, int icon);
@@ -1085,20 +1179,22 @@ uiBut *UI_region_active_but_get(struct ARegion *ar);
 
 /* Styled text draw */
 void UI_fontstyle_set(const struct uiFontStyle *fs);
-void UI_fontstyle_draw_ex(
-        const struct uiFontStyle *fs, const struct rcti *rect, const char *str,
-        size_t len, float *r_xofs, float *r_yofs);
-void UI_fontstyle_draw(const struct uiFontStyle *fs, const struct rcti *rect, const char *str);
-void UI_fontstyle_draw_rotated(const struct uiFontStyle *fs, const struct rcti *rect, const char *str);
-void UI_fontstyle_draw_simple(const struct uiFontStyle *fs, float x, float y, const char *str);
+void UI_fontstyle_draw_ex(const struct uiFontStyle *fs, const struct rcti *rect, const char *str,
+                          const unsigned char col[4], size_t len, float *r_xofs, float *r_yofs);
+void UI_fontstyle_draw(const struct uiFontStyle *fs, const struct rcti *rect, const char *str,
+                       const unsigned char col[4]);
+void UI_fontstyle_draw_rotated(const struct uiFontStyle *fs, const struct rcti *rect, const char *str,
+                               const unsigned char col[4]);
+void UI_fontstyle_draw_simple(const struct uiFontStyle *fs, float x, float y, const char *str,
+                              const unsigned char col[4]);
 void UI_fontstyle_draw_simple_backdrop(
         const struct uiFontStyle *fs, float x, float y, const char *str,
-        const unsigned char fg[4], const unsigned char bg[4]);
+        const float col_fg[4], const float col_bg[4]);
 
 int UI_fontstyle_string_width(const struct uiFontStyle *fs, const char *str);
 int UI_fontstyle_height_max(const struct uiFontStyle *fs);
 
-void UI_draw_icon_tri(float x, float y, char dir);
+void UI_draw_icon_tri(float x, float y, char dir, const float[4]);
 
 struct uiStyle *UI_style_get(void);		/* use for fonts etc */
 struct uiStyle *UI_style_get_dpi(void);	/* DPI scaled settings for drawing */
@@ -1126,6 +1222,7 @@ void UI_butstore_unregister(uiButStore *bs_handle, uiBut **but_p);
 
 /* ui_interface_region_tooltip.c */
 struct ARegion *UI_tooltip_create_from_button(struct bContext *C, struct ARegion *butregion, uiBut *but);
+struct ARegion *UI_tooltip_create_from_manipulator(struct bContext *C, struct wmManipulator *mpr);
 void UI_tooltip_free(struct bContext *C, struct bScreen *sc, struct ARegion *ar);
 
 /* How long before a tool-tip shows. */
@@ -1141,4 +1238,17 @@ void UI_tooltip_free(struct bContext *C, struct bScreen *sc, struct ARegion *ar)
 
 int UI_calc_float_precision(int prec, double value);
 
+/* widget batched drawing */
+void UI_widgetbase_draw_cache_begin(void);
+void UI_widgetbase_draw_cache_flush(void);
+void UI_widgetbase_draw_cache_end(void);
+
+/* Special drawing for toolbar, mainly workarounds for inflexible icon sizing. */
+#define USE_TOOLBAR_HACK
+
+/* Support click-drag motion which presses the button and closes a popover (like a menu). */
+#define USE_POPOVER_ONCE
+
+bool UI_but_is_tool(const uiBut *but);
+
 #endif  /* __UI_INTERFACE_H__ */
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 308504ef4c4..ee43b987a49 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -49,6 +49,8 @@ typedef struct IconFile {
 #define ICON_DEFAULT_HEIGHT 16
 #define ICON_DEFAULT_WIDTH  16
 
+#define ICON_DEFAULT_HEIGHT_TOOLBAR 38
+
 #define ICON_DEFAULT_HEIGHT_SCALE ((int)(UI_UNIT_Y * 0.8f))
 #define ICON_DEFAULT_WIDTH_SCALE  ((int)(UI_UNIT_X * 0.8f))
 
@@ -66,6 +68,7 @@ void UI_id_icon_render(
 int UI_preview_render_size(enum eIconSizes size);
 
 void UI_icon_draw(float x, float y, int icon_id);
+void UI_icon_draw_alpha(float x, float y, int icon_id, float alpha);
 void UI_icon_draw_preview(float x, float y, int icon_id);
 void UI_icon_draw_preview_aspect(float x, float y, int icon_id, float aspect);
 void UI_icon_draw_preview_aspect_size(float x, float y, int icon_id, float aspect, float alpha, int size);
@@ -73,9 +76,13 @@ void UI_icon_draw_preview_aspect_size(float x, float y, int icon_id, float aspec
 void UI_icon_draw_aspect(float x, float y, int icon_id, float aspect, float alpha);
 void UI_icon_draw_aspect_color(float x, float y, int icon_id, float aspect, const float rgb[3]);
 void UI_icon_draw_size(float x, float y, int size, int icon_id, float alpha);
+void UI_icon_draw_desaturate(float x, float y, int icon_id, float aspect, float alpha, float desaturate);
 void UI_icons_free(void);
 void UI_icons_free_drawinfo(void *drawinfo);
 
+void UI_icon_draw_cache_begin(void);
+void UI_icon_draw_cache_end(void);
+
 struct ListBase *UI_iconfile_list(void);
 int UI_iconfile_get_index(const char *filename);
 
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index b0cb2418e6f..cab0fa8645d 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -51,7 +51,7 @@ typedef enum {
 /* use to denote intentionally unset theme color */
 #define TH_UNDEFINED -1
 
-enum {
+typedef enum ThemeColorID {
 	TH_REDALERT,
 
 	TH_THEMEUI,
@@ -74,6 +74,7 @@ enum {
 	/* panels */
 	TH_PANEL_HEADER,
 	TH_PANEL_BACK,
+	TH_PANEL_SUB_BACK,
 	TH_PANEL_SHOW_HEADER,
 	TH_PANEL_SHOW_BACK,
 
@@ -275,10 +276,18 @@ enum {
 
 	TH_WIDGET_EMBOSS,
 
+	TH_EDITOR_OUTLINE,
+
 	TH_AXIS_X,		/* X/Y/Z Axis */
 	TH_AXIS_Y,
 	TH_AXIS_Z,
 
+	TH_MANIPULATOR_HI,
+	TH_MANIPULATOR_PRIMARY,
+	TH_MANIPULATOR_SECONDARY,
+	TH_MANIPULATOR_A,
+	TH_MANIPULATOR_B,
+
 	TH_LOW_GRAD,
 	TH_HIGH_GRAD,
 	TH_SHOW_BACK_GRAD,
@@ -302,7 +311,7 @@ enum {
 
 	TH_EDGE_BEVEL,
 	TH_VERTEX_BEVEL
-};
+} ThemeColorID;
 
 /* specific defines per space should have higher define values */
 
@@ -319,13 +328,13 @@ struct bThemeState {
 void    UI_ThemeColor(int colorid);
 
 // sets the color plus alpha
-void    UI_ThemeColor4(int colorid);
+void	UI_ThemeColor4(int colorid);
 
 // sets color plus offset for shade
-void    UI_ThemeColorShade(int colorid, int offset);
+void	UI_ThemeColorShade(int colorid, int offset);
 
 // sets color plus offset for alpha
-void    UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset);
+void	UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset);
 
 // sets color, which is blend between two theme colors
 void    UI_ThemeColorBlend(int colorid1, int colorid2, float fac);
@@ -343,14 +352,27 @@ int     UI_GetThemeValueType(int colorid, int spacetype);
 // get three color values, scaled to 0.0-1.0 range
 void    UI_GetThemeColor3fv(int colorid, float col[3]);
 void    UI_GetThemeColorBlend3ubv(int colorid1, int colorid2, float fac, unsigned char col[3]);
+void    UI_GetThemeColorBlend3f(int colorid1, int colorid2, float fac, float r_col[3]);
 // get the color, range 0.0-1.0, complete with shading offset
 void    UI_GetThemeColorShade3fv(int colorid, int offset, float col[3]);
 void    UI_GetThemeColorShade3ubv(int colorid, int offset, unsigned char col[3]);
+void    UI_GetThemeColorShade4ubv(int colorid, int offset, unsigned char col[4]);
+
+// get three color values, range 0-255, complete with shading offset for the RGB components and blending
+void	UI_GetThemeColorBlendShade3ubv(int colorid1, int colorid2, float fac, int offset, unsigned char col[3]);
 
 // get four color values, scaled to 0.0-1.0 range
 void    UI_GetThemeColor4fv(int colorid, float col[4]);
 // get four color values, range 0.0-1.0, complete with shading offset for the RGB components
 void    UI_GetThemeColorShade4fv(int colorid, int offset, float col[4]);
+void	UI_GetThemeColorShadeAlpha4fv(int colorid, int coloffset, int alphaoffset, float col[4]);
+
+// get four colour values ranged between 0 and 255; includes the alpha channel
+void    UI_GetThemeColorShadeAlpha4ubv(int colorid, int coloffset, int alphaoffset, unsigned char col[4]);
+
+// get four color values, range 0.0-1.0, complete with shading offset for the RGB components and blending
+void    UI_GetThemeColorBlendShade3fv(int colorid1, int colorid2, float fac, int offset, float col[3]);
+void    UI_GetThemeColorBlendShade4fv(int colorid1, int colorid2, float fac, int offset, float col[4]);
 
 // get the 3 or 4 byte values
 void UI_GetThemeColor3ubv(int colorid, unsigned char col[3]);
@@ -368,6 +390,10 @@ void    UI_GetColorPtrShade3ubv(const unsigned char cp1[3], unsigned char col[3]
 // get a 3 byte color, blended and shaded between two other char color pointers
 void    UI_GetColorPtrBlendShade3ubv(const unsigned char cp1[3], const unsigned char cp2[3], unsigned char col[3], float fac, int offset);
 
+// sets the font color
+// (for anything fancy use UI_GetThemeColor[Fancy] then BLF_color)
+void UI_FontThemeColor(int fontid, int colorid);
+
 // clear the openGL ClearColor using the input colorid
 void    UI_ThemeClearColor(int colorid);
 
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index 99cee0cb673..d407878d063 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -103,8 +103,13 @@ enum eView2D_Gridlines {
 /* ------ Defines for Scrollers ----- */
 
 /* scroller area */
-#define V2D_SCROLL_HEIGHT   (0.85f * U.widget_unit)
-#define V2D_SCROLL_WIDTH    (0.85f * U.widget_unit)
+#define V2D_SCROLL_HEIGHT_MIN  (0.25f * U.widget_unit)
+#define V2D_SCROLL_WIDTH_MIN   (0.25f * U.widget_unit)
+#define V2D_SCROLL_HEIGHT      (0.45f * U.widget_unit)
+#define V2D_SCROLL_WIDTH       (0.45f * U.widget_unit)
+/* For scrollers with scale markings (text written onto them) */
+#define V2D_SCROLL_HEIGHT_TEXT (0.79f * U.widget_unit)
+#define V2D_SCROLL_WIDTH_TEXT  (0.79f * U.widget_unit)
 
 /* scroller 'handles' hotspot radius for mouse */
 #define V2D_SCROLLER_HANDLE_SIZE    (0.6f * U.widget_unit)
@@ -219,7 +224,7 @@ void UI_view2d_center_set(struct View2D *v2d, float x, float y);
 
 void UI_view2d_offset(struct View2D *v2d, float xfac, float yfac);
 
-short UI_view2d_mouse_in_scrollers(const struct bContext *C, struct View2D *v2d, int x, int y);
+short UI_view2d_mouse_in_scrollers(const struct ARegion *ar, struct View2D *v2d, int x, int y);
 
 /* cached text drawing in v2d, to allow pixel-aligned draw as post process */
 void UI_view2d_text_cache_add(struct View2D *v2d, float x, float y,
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 0adc315fd69..49fe6bfb2dc 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -24,6 +24,8 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
+	../../draw
 	../../gpu
 	../../imbuf
 	../../makesdna
@@ -58,6 +60,7 @@ set(SRC
 	interface_region_color_picker.c
 	interface_region_menu_pie.c
 	interface_region_menu_popup.c
+	interface_region_popover.c
 	interface_region_popup.c
 	interface_region_search.c
 	interface_region_tooltip.c
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 20ad6f00c5b..6cb667cb9a8 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -41,6 +41,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
@@ -50,31 +51,38 @@
 
 #include "BLI_utildefines.h"
 
+#include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_unit.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_idprop.h"
 
-#include "BIF_gl.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
 
 #include "BLF_api.h"
 #include "BLT_translation.h"
 
 #include "UI_interface.h"
+#include "UI_interface_icons.h"
 
 #include "IMB_imbuf.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
-#include "wm_subwindow.h"
+#include "WM_message.h"
 
 #include "RNA_access.h"
 
 #include "BPY_extern.h"
 
+#include "ED_screen.h"
+
 #include "IMB_colormanagement.h"
 
+#include "DEG_depsgraph_query.h"
+
 #include "interface_intern.h"
 
 /* avoid unneeded calls to ui_but_value_get */
@@ -216,6 +224,26 @@ void ui_region_to_window(const ARegion *ar, int *x, int *y)
 	*y += ar->winrct.ymin;
 }
 
+static void ui_update_window_matrix(const wmWindow *window, const ARegion *region, uiBlock *block)
+{
+	/* window matrix and aspect */
+	if (region && region->visible) {
+		/* Get projection matrix which includes View2D translation and zoom. */
+		gpuGetProjectionMatrix(block->winmat);
+		block->aspect = 2.0f / fabsf(region->winx * block->winmat[0][0]);
+	}
+	else {
+		/* No subwindow created yet, for menus for example, so we use the main
+		 * window instead, since buttons are created there anyway. */
+		int width = WM_window_pixels_x(window);
+		int height = WM_window_pixels_y(window);
+		rcti winrct = {0, width - 1, 0, height - 1};
+
+		wmGetProjectionMatrix(block->winmat, &winrct);
+		block->aspect = 2.0f / fabsf(width * block->winmat[0][0]);
+	}
+}
+
 /**
  * Popups will add a margin to #ARegion.winrct for shadow,
  * for interactivity (point-inside tests for eg), we want the winrct without the margin added.
@@ -234,7 +262,7 @@ void ui_region_winrct_get_no_margin(const struct ARegion *ar, struct rcti *r_rec
 
 /* ******************* block calc ************************* */
 
-void ui_block_translate(uiBlock *block, int x, int y)
+void UI_block_translate(uiBlock *block, int x, int y)
 {
 	uiBut *but;
 
@@ -344,7 +372,7 @@ static void ui_block_bounds_calc_centered(wmWindow *window, uiBlock *block)
 	startx = (xmax * 0.5f) - (width * 0.5f);
 	starty = (ymax * 0.5f) - (height * 0.5f);
 
-	ui_block_translate(block, startx - block->rect.xmin, starty - block->rect.ymin);
+	UI_block_translate(block, startx - block->rect.xmin, starty - block->rect.ymin);
 
 	/* now recompute bounds and safety */
 	ui_block_bounds_calc(block);
@@ -358,7 +386,7 @@ static void ui_block_bounds_calc_centered_pie(uiBlock *block)
 	    block->pie_data.pie_center_spawned[1]
 	};
 
-	ui_block_translate(block, xy[0], xy[1]);
+	UI_block_translate(block, xy[0], xy[1]);
 
 	/* now recompute bounds and safety */
 	ui_block_bounds_calc(block);
@@ -418,7 +446,7 @@ static void ui_block_bounds_calc_popup(
 	rect_bounds.ymax = ymax - UI_POPUP_MENU_TOP;
 
 	BLI_rcti_clamp(&rect, &rect_bounds, ofs_dummy);
-	ui_block_translate(block, rect.xmin - block->rect.xmin, rect.ymin - block->rect.ymin);
+	UI_block_translate(block, rect.xmin - block->rect.xmin, rect.ymin - block->rect.ymin);
 
 	/* now recompute bounds and safety */
 	ui_block_bounds_calc(block);
@@ -502,86 +530,6 @@ static int ui_but_calc_float_precision(uiBut *but, double value)
 	return UI_calc_float_precision(prec, value);
 }
 
-/* ************** LINK LINE DRAWING  ************* */
-
-/* link line drawing is not part of buttons or theme.. so we stick with it here */
-
-static void ui_draw_linkline(uiLinkLine *line, int highlightActiveLines, int dashInactiveLines)
-{
-	rcti rect;
-
-	if (line->from == NULL || line->to == NULL) return;
-
-	rect.xmin = BLI_rctf_cent_x(&line->from->rect);
-	rect.ymin = BLI_rctf_cent_y(&line->from->rect);
-	rect.xmax = BLI_rctf_cent_x(&line->to->rect);
-	rect.ymax = BLI_rctf_cent_y(&line->to->rect);
-
-	if (dashInactiveLines)
-		UI_ThemeColor(TH_GRID);
-	else if (line->flag & UI_SELECT)
-		glColor3ub(100, 100, 100);
-	else if (highlightActiveLines && ((line->from->flag & UI_ACTIVE) || (line->to->flag & UI_ACTIVE)))
-		UI_ThemeColor(TH_TEXT_HI);
-	else
-		glColor3ub(0, 0, 0);
-
-	ui_draw_link_bezier(&rect);
-}
-
-static void ui_draw_links(uiBlock *block)
-{
-	uiBut *but;
-	uiLinkLine *line;
-
-	/* Draw the gray out lines. Do this first so they appear at the
-	 * bottom of inactive or active lines.
-	 * As we go, remember if we see any active or selected lines. */
-	bool found_selectline = false;
-	bool found_activeline = false;
-
-	for (but = block->buttons.first; but; but = but->next) {
-		if (but->type == UI_BTYPE_LINK && but->link) {
-			for (line = but->link->lines.first; line; line = line->next) {
-				if (!(line->from->flag & UI_ACTIVE) && !(line->to->flag & UI_ACTIVE)) {
-					if (line->deactive)
-						ui_draw_linkline(line, 0, true);
-				}
-				else
-					found_activeline = true;
-
-				if ((line->from->flag & UI_SELECT) || (line->to->flag & UI_SELECT))
-					found_selectline = true;
-			}
-		}
-	}
-
-	/* Draw the inactive lines (lines with neither button being hovered over) */
-	for (but = block->buttons.first; but; but = but->next) {
-		if (but->type == UI_BTYPE_LINK && but->link) {
-			for (line = but->link->lines.first; line; line = line->next) {
-				if (!(line->from->flag & UI_ACTIVE) && !(line->to->flag & UI_ACTIVE)) {
-					if (!line->deactive)
-						ui_draw_linkline(line, 0, false);
-				}
-			}
-		}
-	}
-
-	/* Draw any active lines (lines with either button being hovered over).
-	 * Do this last so they appear on top of inactive and gray out lines. */
-	if (found_activeline) {
-		for (but = block->buttons.first; but; but = but->next) {
-			if (but->type == UI_BTYPE_LINK && but->link) {
-				for (line = but->link->lines.first; line; line = line->next) {
-					if ((line->from->flag & UI_ACTIVE) || (line->to->flag & UI_ACTIVE))
-						ui_draw_linkline(line, !found_selectline, false);
-				}
-			}
-		}
-	}
-}
-
 /* ************** BLOCK ENDING FUNCTION ************* */
 
 /* NOTE: if but->poin is allocated memory for every defbut, things fail... */
@@ -624,38 +572,6 @@ uiBut *ui_but_find_new(uiBlock *block_new, const uiBut *but_old)
 	return but_new;
 }
 
-/* oldbut is being inserted in new block, so we use the lines from new button, and replace button pointers */
-static void ui_but_update_linklines(uiBlock *block, uiBut *oldbut, uiBut *newbut)
-{
-	uiLinkLine *line;
-	uiBut *but;
-
-	/* if active button is UI_BTYPE_LINK */
-	if (newbut->type == UI_BTYPE_LINK && newbut->link) {
-
-		SWAP(uiLink *, oldbut->link, newbut->link);
-
-		for (line = oldbut->link->lines.first; line; line = line->next) {
-			if (line->to == newbut)
-				line->to = oldbut;
-			if (line->from == newbut)
-				line->from = oldbut;
-		}
-	}
-
-	/* check all other button links */
-	for (but = block->buttons.first; but; but = but->next) {
-		if (but != newbut && but->type == UI_BTYPE_LINK && but->link) {
-			for (line = but->link->lines.first; line; line = line->next) {
-				if (line->to == newbut)
-					line->to = oldbut;
-				if (line->from == newbut)
-					line->from = oldbut;
-			}
-		}
-	}
-}
-
 /**
  * \return true when \a but_p is set (only done for active buttons).
  */
@@ -712,8 +628,6 @@ static bool ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBu
 		but->selend = oldbut->selend;
 		but->softmin = oldbut->softmin;
 		but->softmax = oldbut->softmax;
-		but->linkto[0] = oldbut->linkto[0];
-		but->linkto[1] = oldbut->linkto[1];
 		oldbut->active = NULL;
 #endif
 
@@ -755,8 +669,6 @@ static bool ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBu
 			oldbut->a1 = but->a1;
 		}
 
-		ui_but_update_linklines(block, oldbut, but);
-
 		if (!BLI_listbase_is_empty(&block->butstore)) {
 			UI_butstore_register_update(block, oldbut, but);
 		}
@@ -1184,7 +1096,7 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
 	uiBut *but;
 	char buf[128];
 
-	BLI_assert(block->flag & UI_BLOCK_LOOP);
+	BLI_assert(block->flag & (UI_BLOCK_LOOP | UI_BLOCK_SHOW_SHORTCUT_ALWAYS));
 
 	/* only do it before bounding */
 	if (block->rect.xmin != block->rect.xmax)
@@ -1200,7 +1112,13 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
 	}
 	else {
 		for (but = block->buttons.first; but; but = but->next) {
-			if (but->dt != UI_EMBOSS_PULLDOWN) {
+			if (block->flag & UI_BLOCK_SHOW_SHORTCUT_ALWAYS) {
+				/* Skip icon-only buttons (as used in the toolbar). */
+				if (but->drawstr[0] == '\0') {
+					continue;
+				}
+			}
+			else if (but->dt != UI_EMBOSS_PULLDOWN) {
 				continue;
 			}
 
@@ -1214,6 +1132,18 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
 	}
 }
 
+void ui_but_override_flag(uiBut *but)
+{
+	const int override_status = RNA_property_static_override_status(&but->rnapoin, but->rnaprop, but->rnaindex);
+
+	if (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN) {
+		but->flag |= UI_BUT_OVERRIDEN;
+	}
+	else {
+		but->flag &= ~UI_BUT_OVERRIDEN;
+	}
+}
+
 void UI_block_update_from_old(const bContext *C, uiBlock *block)
 {
 	uiBut *but_old;
@@ -1278,6 +1208,7 @@ void UI_block_end_ex(const bContext *C, uiBlock *block, const int xy[2], int r_x
 		}
 
 		ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
+		ui_but_override_flag(but);
 	}
 
 
@@ -1286,12 +1217,12 @@ void UI_block_end_ex(const bContext *C, uiBlock *block, const int xy[2], int r_x
 	if (block->layouts.first) {
 		UI_block_layout_resolve(block, NULL, NULL);
 	}
-	ui_block_align_calc(block);
+	ui_block_align_calc(block, CTX_wm_region(C));
 	if ((block->flag & UI_BLOCK_LOOP) && (block->flag & UI_BLOCK_NUMSELECT)) {
 		ui_menu_block_set_keyaccels(block); /* could use a different flag to check */
 	}
 
-	if (block->flag & UI_BLOCK_LOOP) {
+	if (block->flag & (UI_BLOCK_LOOP | UI_BLOCK_SHOW_SHORTCUT_ALWAYS)) {
 		ui_menu_block_set_keymaps(C, block);
 	}
 
@@ -1372,7 +1303,6 @@ void UI_block_draw(const bContext *C, uiBlock *block)
 	ARegion *ar;
 	uiBut *but;
 	rcti rect;
-	int multisample_enabled;
 
 	/* get menu region or area region */
 	ar = CTX_wm_menu(C);
@@ -1382,13 +1312,8 @@ void UI_block_draw(const bContext *C, uiBlock *block)
 	if (!block->endblock)
 		UI_block_end(C, block);
 
-	/* disable AA, makes widgets too blurry */
-	multisample_enabled = glIsEnabled(GL_MULTISAMPLE);
-	if (multisample_enabled)
-		glDisable(GL_MULTISAMPLE);
-
 	/* we set this only once */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* scale fonts */
 	ui_fontscale(&style.paneltitle.points, block->aspect);
@@ -1400,22 +1325,26 @@ void UI_block_draw(const bContext *C, uiBlock *block)
 	ui_but_to_pixelrect(&rect, ar, block, NULL);
 
 	/* pixel space for AA widgets */
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-	glLoadIdentity();
+	gpuPushProjectionMatrix();
+	gpuPushMatrix();
+	gpuLoadIdentity();
 
 	wmOrtho2_region_pixelspace(ar);
 
 	/* back */
 	if (block->flag & UI_BLOCK_RADIAL)
 		ui_draw_pie_center(block);
+	else if (block->flag & UI_BLOCK_POPOVER)
+		ui_draw_popover_back(ar, &style, block, &rect);
 	else if (block->flag & UI_BLOCK_LOOP)
 		ui_draw_menu_back(&style, block, &rect);
 	else if (block->panel)
 		ui_draw_aligned_panel(&style, block, &rect, UI_panel_category_is_visible(ar));
 
+	BLF_batch_draw_begin();
+	UI_icon_draw_cache_begin();
+	UI_widgetbase_draw_cache_begin();
+
 	/* widgets */
 	for (but = block->buttons.first; but; but = but->next) {
 		if (!(but->flag & (UI_HIDDEN | UI_SCROLLED))) {
@@ -1428,16 +1357,47 @@ void UI_block_draw(const bContext *C, uiBlock *block)
 		}
 	}
 
-	/* restore matrix */
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
+	UI_widgetbase_draw_cache_end();
+	UI_icon_draw_cache_end();
+	BLF_batch_draw_end();
 
-	if (multisample_enabled)
-		glEnable(GL_MULTISAMPLE);
+	/* restore matrix */
+	gpuPopProjectionMatrix();
+	gpuPopMatrix();
+}
+
+static void ui_block_message_subscribe(ARegion *ar, struct wmMsgBus *mbus, uiBlock *block)
+{
+	uiBut *but_prev = NULL;
+	/* possibly we should keep the region this block is contained in? */
+	for (uiBut *but = block->buttons.first; but; but = but->next) {
+		if (but->rnapoin.type && but->rnaprop) {
+			/* quick check to avoid adding buttons representing a vector, multiple times. */
+			if ((but_prev &&
+			    (but_prev->rnaprop == but->rnaprop) &&
+			    (but_prev->rnapoin.type == but->rnapoin.type) &&
+			    (but_prev->rnapoin.data == but->rnapoin.data) &&
+			    (but_prev->rnapoin.id.data == but->rnapoin.id.data)) == false)
+			{
+				/* TODO: could make this into utility function. */
+				WM_msg_subscribe_rna(
+				        mbus, &but->rnapoin, but->rnaprop,
+				        &(const wmMsgSubscribeValue){
+				            .owner = ar,
+				            .user_data = ar,
+				            .notify = ED_region_do_msg_notify_tag_redraw,
+				        }, __func__);
+				but_prev = but;
+			}
+		}
+	}
+}
 
-	ui_draw_links(block);
+void UI_region_message_subscribe(ARegion *ar, struct wmMsgBus *mbus)
+{
+	for (uiBlock *block = ar->uiblocks.first; block; block = block->next) {
+		ui_block_message_subscribe(ar, mbus, block);
+	}
 }
 
 /* ************* EVENTS ************* */
@@ -1495,6 +1455,18 @@ int ui_but_is_pushed_ex(uiBut *but, double *value)
 					if (*value == (double)but->hardmax) is_push = true;
 				}
 				break;
+			case UI_BTYPE_TAB:
+				if (but->rnaprop && but->custom_data) {
+					/* uiBut.custom_data points to data this tab represents (e.g. workspace).
+					 * uiBut.rnapoin/prop store an active value (e.g. active workspace). */
+					if (RNA_property_type(but->rnaprop) == PROP_POINTER) {
+						PointerRNA active_ptr = RNA_property_pointer_get(&but->rnapoin, but->rnaprop);
+						if (active_ptr.data == but->custom_data) {
+							is_push = true;
+						}
+					}
+				}
+				break;
 			default:
 				is_push = -1;
 				break;
@@ -1521,83 +1493,6 @@ static void ui_but_update_select_flag(uiBut *but, double *value)
 	}
 }
 
-static uiBut *ui_linkline_find_inlink(uiBlock *block, void *poin)
-{
-	uiBut *but;
-
-	but = block->buttons.first;
-	while (but) {
-		if (but->type == UI_BTYPE_INLINK) {
-			if (but->poin == poin) return but;
-		}
-		but = but->next;
-	}
-	return NULL;
-}
-
-static void ui_linkline_add(ListBase *listb, uiBut *but, uiBut *bt, short deactive)
-{
-	uiLinkLine *line;
-
-	line = MEM_callocN(sizeof(uiLinkLine), "linkline");
-	BLI_addtail(listb, line);
-	line->from = but;
-	line->to = bt;
-	line->deactive = deactive;
-}
-
-uiBut *UI_block_links_find_inlink(uiBlock *block, void *poin)
-{
-	return ui_linkline_find_inlink(block, poin);
-}
-
-void UI_block_links_compose(uiBlock *block)
-{
-	uiBut *but, *bt;
-	uiLink *link;
-	void ***ppoin;
-	int a;
-
-	but = block->buttons.first;
-	while (but) {
-		if (but->type == UI_BTYPE_LINK) {
-			link = but->link;
-
-			/* for all pointers in the array */
-			if (link) {
-				if (link->ppoin) {
-					ppoin = link->ppoin;
-					for (a = 0; a < *(link->totlink); a++) {
-						bt = ui_linkline_find_inlink(block, (*ppoin)[a]);
-						if (bt) {
-							if ((but->flag & UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)) {
-								ui_linkline_add(&link->lines, but, bt, true);
-							}
-							else {
-								ui_linkline_add(&link->lines, but, bt, false);
-							}
-
-						}
-					}
-				}
-				else if (link->poin) {
-					bt = ui_linkline_find_inlink(block, *link->poin);
-					if (bt) {
-						if ((but->flag & UI_BUT_SCA_LINK_GREY) || (bt->flag & UI_BUT_SCA_LINK_GREY)) {
-							ui_linkline_add(&link->lines, but, bt, true);
-						}
-						else {
-							ui_linkline_add(&link->lines, but, bt, false);
-						}
-					}
-				}
-			}
-		}
-		but = but->next;
-	}
-}
-
-
 /* ************************************************ */
 
 void UI_block_lock_set(uiBlock *block, bool val, const char *lockstr)
@@ -1614,48 +1509,78 @@ void UI_block_lock_clear(uiBlock *block)
 	block->lockstr = NULL;
 }
 
-/* *************************************************************** */
-
-void ui_linkline_remove(uiLinkLine *line, uiBut *but)
-{
-	uiLink *link;
-	int a, b;
-
-	BLI_remlink(&but->link->lines, line);
-
-	link = line->from->link;
-
-	/* are there more pointers allowed? */
-	if (link->ppoin) {
+/* *********************** data get/set ***********************
+ * this either works with the pointed to data, or can work with
+ * an edit override pointer while dragging for example */
 
-		if (*(link->totlink) == 1) {
-			*(link->totlink) = 0;
-			MEM_freeN(*(link->ppoin));
-			*(link->ppoin) = NULL;
-		}
-		else {
-			b = 0;
-			for (a = 0; a < (*(link->totlink)); a++) {
-				if ((*(link->ppoin))[a] != line->to->poin) {
-					(*(link->ppoin))[b] = (*(link->ppoin))[a];
-					b++;
-				}
-			}
-			(*(link->totlink))--;
+/* Get PointerRNA which will point to a data inside of an evaluated
+ * ID datablock.
+ */
+static PointerRNA ui_but_evaluated_rnapoin_get(uiBut *but)
+{
+	BLI_assert(but->rnaprop != NULL);
+	/* TODO(sergey): evil_C sounds.. EVIL! Any clear way to avoid this? */
+	PointerRNA rnapoin_eval = but->rnapoin;
+	/* If there is no animation or drivers, it doesn't matter if we read value
+	 * from evaluated datablock or from original one.
+	 *
+	 * Reading from original one is much faster, since we don't need to do any
+	 * PointerRNA remapping or hash lookup.
+	 */
+	if (BKE_animdata_from_id(but->rnapoin.id.data) == NULL) {
+		return rnapoin_eval;
+	}
+	/* Same goes for the properties which can not be animated. */
+	if (!RNA_property_animateable(&but->rnapoin, but->rnaprop)) {
+		return rnapoin_eval;
+	}
+	Depsgraph *depsgraph = CTX_data_depsgraph(but->block->evil_C);
+	/* ID pointer we can always remap, they are inside of depsgraph. */
+	rnapoin_eval.id.data =
+	        DEG_get_evaluated_id(depsgraph, rnapoin_eval.id.data);
+	/* Some of ID datablocks do not have their evaluated copy inside
+	 * of dependency graph. If it's such datablock, no need to worry about
+	 * data pointer.
+	 */
+	if (rnapoin_eval.id.data == but->rnapoin.id.data) {
+		return rnapoin_eval;
+	}
+	/* For the data pointer it's getting a bit more involved, since it can
+	 * whether be and ID, or can be a property deep inside of ID.
+	 *
+	 * We start from checking if it's an ID, since that is the less involved
+	 * code path, and probably is executed in most of the cases.
+	 */
+	if (but->rnapoin.data == but->rnapoin.id.data) {
+		rnapoin_eval.data = DEG_get_evaluated_id(depsgraph, rnapoin_eval.data);
+		return rnapoin_eval;
+	}
+	/* We aren't as lucky as we thought we are :(
+	 *
+	 * Since we don't know what the property is, we get it's RNA path
+	 * relative to the original ID, and then we decent down from evaluated
+	 * ID to the same property.
+	 *
+	 * This seems to be most straightforward way to get sub-data pointers
+	 * which can be buried deep inside of ID block.
+	 */
+	const char *rna_path =
+	       RNA_path_from_ID_to_property(&but->rnapoin, but->rnaprop);
+	if (rna_path != NULL) {
+		PointerRNA id_ptr;
+		RNA_id_pointer_create(rnapoin_eval.id.data, &id_ptr);
+		if (!RNA_path_resolve_full(&id_ptr,
+		                           rna_path,
+		                           &rnapoin_eval,
+		                           NULL, NULL))
+		{
+			/* TODO(sergey): Anything to do here to recover? */
 		}
+		MEM_freeN((void *)rna_path);
 	}
-	else {
-		*(link->poin) = NULL;
-	}
-
-	MEM_freeN(line);
-	//REDRAW
+	return rnapoin_eval;
 }
 
-/* *********************** data get/set ***********************
- * this either works with the pointed to data, or can work with
- * an edit override pointer while dragging for example */
-
 /* for buttons pointing to color for example */
 void ui_but_v3_get(uiBut *but, float vec[3])
 {
@@ -1671,16 +1596,18 @@ void ui_but_v3_get(uiBut *but, float vec[3])
 
 		zero_v3(vec);
 
+		PointerRNA rnapoin_eval = ui_but_evaluated_rnapoin_get(but);
+
 		if (RNA_property_type(prop) == PROP_FLOAT) {
-			int tot = RNA_property_array_length(&but->rnapoin, prop);
+			int tot = RNA_property_array_length(&rnapoin_eval, prop);
 			BLI_assert(tot > 0);
 			if (tot == 3) {
-				RNA_property_float_get_array(&but->rnapoin, prop, vec);
+				RNA_property_float_get_array(&rnapoin_eval, prop, vec);
 			}
 			else {
 				tot = min_ii(tot, 3);
 				for (a = 0; a < tot; a++) {
-					vec[a] = RNA_property_float_get_index(&but->rnapoin, prop, a);
+					vec[a] = RNA_property_float_get_index(&rnapoin_eval, prop, a);
 				}
 			}
 		}
@@ -1860,27 +1787,29 @@ double ui_but_value_get(uiBut *but)
 
 		BLI_assert(but->rnaindex != -1);
 
+		PointerRNA rnapoin_eval = ui_but_evaluated_rnapoin_get(but);
+
 		switch (RNA_property_type(prop)) {
 			case PROP_BOOLEAN:
 				if (RNA_property_array_check(prop))
-					value = RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex);
+					value = RNA_property_boolean_get_index(&rnapoin_eval, prop, but->rnaindex);
 				else
-					value = RNA_property_boolean_get(&but->rnapoin, prop);
+					value = RNA_property_boolean_get(&rnapoin_eval, prop);
 				break;
 			case PROP_INT:
 				if (RNA_property_array_check(prop))
-					value = RNA_property_int_get_index(&but->rnapoin, prop, but->rnaindex);
+					value = RNA_property_int_get_index(&rnapoin_eval, prop, but->rnaindex);
 				else
-					value = RNA_property_int_get(&but->rnapoin, prop);
+					value = RNA_property_int_get(&rnapoin_eval, prop);
 				break;
 			case PROP_FLOAT:
 				if (RNA_property_array_check(prop))
-					value = RNA_property_float_get_index(&but->rnapoin, prop, but->rnaindex);
+					value = RNA_property_float_get_index(&rnapoin_eval, prop, but->rnaindex);
 				else
-					value = RNA_property_float_get(&but->rnapoin, prop);
+					value = RNA_property_float_get(&rnapoin_eval, prop);
 				break;
 			case PROP_ENUM:
-				value = RNA_property_enum_get(&but->rnapoin, prop);
+				value = RNA_property_enum_get(&rnapoin_eval, prop);
 				break;
 			default:
 				value = 0.0;
@@ -2023,7 +1952,7 @@ static bool ui_but_icon_extra_is_visible_text_clear(const uiBut *but)
 
 static bool ui_but_icon_extra_is_visible_search_unlink(const uiBut *but)
 {
-	BLI_assert(but->type == UI_BTYPE_SEARCH_MENU);
+	BLI_assert(ELEM(but->type, UI_BTYPE_SEARCH_MENU, UI_BTYPE_TAB));
 	return ((but->editstr == NULL) &&
 	        (but->drawstr[0] != '\0') &&
 	        (but->flag & UI_BUT_VALUE_CLEAR));
@@ -2066,6 +1995,11 @@ uiButExtraIconType ui_but_icon_extra_get(uiBut *but)
 				return UI_BUT_ICONEXTRA_EYEDROPPER;
 			}
 			break;
+		case UI_BTYPE_TAB:
+			if (ui_but_icon_extra_is_visible_search_unlink(but)) {
+				return UI_BUT_ICONEXTRA_CLEAR;
+			}
+			break;
 		default:
 			break;
 	}
@@ -2179,14 +2113,23 @@ void ui_but_string_get_ex(uiBut *but, char *str, const size_t maxlen, const int
 		*r_use_exp_float = false;
 	}
 
-	if (but->rnaprop && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
+	if (but->rnaprop && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU, UI_BTYPE_TAB)) {
 		PropertyType type;
 		const char *buf = NULL;
 		int buf_len;
 
 		type = RNA_property_type(but->rnaprop);
 
-		if (type == PROP_STRING) {
+		if ((but->type == UI_BTYPE_TAB) && (but->custom_data)) {
+			StructRNA *ptr_type = RNA_property_pointer_type(&but->rnapoin, but->rnaprop);
+			PointerRNA ptr;
+
+			/* uiBut.custom_data points to data this tab represents (e.g. workspace).
+			 * uiBut.rnapoin/prop store an active value (e.g. active workspace). */
+			RNA_pointer_create(but->rnapoin.id.data, ptr_type, but->custom_data, &ptr);
+			buf = RNA_struct_name_get_alloc(&ptr, str, maxlen, &buf_len);
+		}
+		else if (type == PROP_STRING) {
 			/* RNA string */
 			buf = RNA_property_string_get_alloc(&but->rnapoin, but->rnaprop, str, maxlen, &buf_len);
 		}
@@ -2222,12 +2165,7 @@ void ui_but_string_get_ex(uiBut *but, char *str, const size_t maxlen, const int
 			MEM_freeN((void *)buf);
 		}
 	}
-	else if (but->type == UI_BTYPE_TEXT) {
-		/* string */
-		BLI_strncpy(str, but->poin, maxlen);
-		return;
-	}
-	else if (but->type == UI_BTYPE_SEARCH_MENU) {
+	else if (ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
 		/* string */
 		BLI_strncpy(str, but->poin, maxlen);
 		return;
@@ -2425,7 +2363,7 @@ static void ui_but_string_free_internal(uiBut *but)
 
 bool ui_but_string_set(bContext *C, uiBut *but, const char *str)
 {
-	if (but->rnaprop && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
+	if (but->rnaprop && but->rnapoin.data && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
 		if (RNA_property_editable(&but->rnapoin, but->rnaprop)) {
 			PropertyType type;
 
@@ -2437,17 +2375,15 @@ bool ui_but_string_set(bContext *C, uiBut *but, const char *str)
 				return true;
 			}
 			else if (type == PROP_POINTER) {
-				/* RNA pointer */
-				PointerRNA ptr, rptr;
-				PropertyRNA *prop;
-
 				if (str[0] == '\0') {
 					RNA_property_pointer_set(&but->rnapoin, but->rnaprop, PointerRNA_NULL);
 					return true;
 				}
 				else {
-					ptr = but->rnasearchpoin;
-					prop = but->rnasearchprop;
+					/* RNA pointer */
+					PointerRNA rptr;
+					PointerRNA ptr = but->rnasearchpoin;
+					PropertyRNA *prop = but->rnasearchprop;
 
 					if (prop && RNA_property_collection_lookup_string(&ptr, prop, str, &rptr))
 						RNA_property_pointer_set(&but->rnapoin, but->rnaprop, rptr);
@@ -2470,10 +2406,32 @@ bool ui_but_string_set(bContext *C, uiBut *but, const char *str)
 			}
 		}
 	}
+	else if (but->type == UI_BTYPE_TAB) {
+		if (but->rnaprop && but->custom_data) {
+			StructRNA *ptr_type = RNA_property_pointer_type(&but->rnapoin, but->rnaprop);
+			PointerRNA ptr;
+			PropertyRNA *prop;
+
+			/* uiBut.custom_data points to data this tab represents (e.g. workspace).
+			 * uiBut.rnapoin/prop store an active value (e.g. active workspace). */
+			RNA_pointer_create(but->rnapoin.id.data, ptr_type, but->custom_data, &ptr);
+			prop = RNA_struct_name_property(ptr_type);
+			if (RNA_property_editable(&ptr, prop)) {
+				RNA_property_string_set(&ptr, prop, str);
+			}
+		}
+	}
 	else if (but->type == UI_BTYPE_TEXT) {
 		/* string */
-		if (ui_but_is_utf8(but)) BLI_strncpy_utf8(but->poin, str, but->hardmax);
-		else BLI_strncpy(but->poin, str, but->hardmax);
+		if (!but->poin || (str[0] == '\0')) {
+			str = "";
+		}
+		else if (ui_but_is_utf8(but)) {
+			BLI_strncpy_utf8(but->poin, str, but->hardmax);
+		}
+		else {
+			BLI_strncpy(but->poin, str, but->hardmax);
+		}
 
 		return true;
 	}
@@ -2657,14 +2615,6 @@ static void ui_set_but_soft_range(uiBut *but)
 
 /* ******************* Free ********************/
 
-static void ui_free_link(uiLink *link)
-{
-	if (link) {
-		BLI_freelistN(&link->lines);
-		MEM_freeN(link);
-	}
-}
-
 /* can be called with C==NULL */
 static void ui_but_free(const bContext *C, uiBut *but)
 {
@@ -2685,6 +2635,10 @@ static void ui_but_free(const bContext *C, uiBut *but)
 		MEM_freeN(but->hold_argN);
 	}
 
+	if (!but->editstr && but->free_search_arg) {
+		MEM_SAFE_FREE(but->search_arg);
+	}
+
 	if (but->active) {
 		/* XXX solve later, buttons should be free-able without context ideally,
 		 * however they may have open tooltips or popup windows, which need to
@@ -2701,7 +2655,6 @@ static void ui_but_free(const bContext *C, uiBut *but)
 	if (but->str && but->str != but->strdata) {
 		MEM_freeN(but->str);
 	}
-	ui_free_link(but->link);
 
 	if ((but->type == UI_BTYPE_IMAGE) && but->poin) {
 		IMB_freeImBuf((struct ImBuf *)but->poin);
@@ -2743,6 +2696,27 @@ void UI_block_free(const bContext *C, uiBlock *block)
 	MEM_freeN(block);
 }
 
+void UI_blocklist_update_window_matrix(const bContext *C, const ListBase *lb)
+{
+	ARegion *region = CTX_wm_region(C);
+	wmWindow *window = CTX_wm_window(C);
+
+	for (uiBlock *block = lb->first; block; block = block->next) {
+		if (block->active) {
+			ui_update_window_matrix(window, region, block);
+		}
+	}
+}
+
+void UI_blocklist_draw(const bContext *C, const ListBase *lb)
+{
+	for (uiBlock *block = lb->first; block; block = block->next) {
+		if (block->active) {
+			UI_block_draw(C, block);
+		}
+	}
+}
+
 /* can be called with C==NULL */
 void UI_blocklist_free(const bContext *C, ListBase *lb)
 {
@@ -2799,7 +2773,6 @@ uiBlock *UI_block_begin(const bContext *C, ARegion *region, const char *name, sh
 	uiBlock *block;
 	wmWindow *window;
 	Scene *scn;
-	int getsizex, getsizey;
 
 	window = CTX_wm_window(C);
 	scn = CTX_data_scene(C);
@@ -2829,33 +2802,18 @@ uiBlock *UI_block_begin(const bContext *C, ARegion *region, const char *name, sh
 	if (region)
 		UI_block_region_set(block, region);
 
-	/* window matrix and aspect */
-	if (region && region->swinid) {
-		wm_subwindow_matrix_get(window, region->swinid, block->winmat);
-		wm_subwindow_size_get(window, region->swinid, &getsizex, &getsizey);
+	/* Set window matrix and aspect for region and OpenGL state. */
+	ui_update_window_matrix(window, region, block);
 
-		block->aspect = 2.0f / fabsf(getsizex * block->winmat[0][0]);
-	}
-	else {
-		/* no subwindow created yet, for menus for example, so we
-		 * use the main window instead, since buttons are created
-		 * there anyway */
-		wm_subwindow_matrix_get(window, window->screen->mainwin, block->winmat);
-		wm_subwindow_size_get(window, window->screen->mainwin, &getsizex, &getsizey);
-
-		block->aspect = 2.0f / fabsf(getsizex * block->winmat[0][0]);
+	/* Tag as popup menu if not created within a region. */
+	if (!(region && region->visible)) {
 		block->auto_open = true;
-		block->flag |= UI_BLOCK_LOOP; /* tag as menu */
+		block->flag |= UI_BLOCK_LOOP;
 	}
 
 	return block;
 }
 
-uiBlock *UI_block_find_in_region(const char *name, ARegion *ar)
-{
-	return BLI_findstring(&ar->uiblocks, name, offsetof(uiBlock, name));
-}
-
 void UI_block_emboss_set(uiBlock *block, char dt)
 {
 	block->dt = dt;
@@ -3012,6 +2970,7 @@ void ui_but_update_ex(uiBut *but, const bool validate)
 
 		case UI_BTYPE_TEXT:
 		case UI_BTYPE_SEARCH_MENU:
+		case UI_BTYPE_TAB:
 			if (!but->editstr) {
 				char str[UI_MAX_DRAW_STR];
 
@@ -3135,6 +3094,16 @@ void ui_block_cm_to_display_space_range(uiBlock *block, float *min, float *max)
 	*max = max_fff(UNPACK3(pixel));
 }
 
+static uiBut *ui_but_alloc(const eButType type)
+{
+	switch (type) {
+		case UI_BTYPE_TAB:
+			return MEM_callocN(sizeof(uiButTab), "uiButTab");
+		default:
+			return MEM_callocN(sizeof(uiBut), "uiBut");
+	}
+}
+
 /**
  * \brief ui_def_but is the function that draws many button types
  *
@@ -3168,7 +3137,7 @@ static uiBut *ui_def_but(
 		}
 	}
 
-	but = MEM_callocN(sizeof(uiBut), "uiBut");
+	but = ui_but_alloc(type & BUTTYPE);
 
 	but->type = type & BUTTYPE;
 	but->pointype = type & UI_BUT_POIN_TYPES;
@@ -3232,7 +3201,7 @@ static uiBut *ui_def_but(
 	         ELEM(but->type,
 	              UI_BTYPE_MENU, UI_BTYPE_TEXT, UI_BTYPE_LABEL,
 	              UI_BTYPE_BLOCK, UI_BTYPE_BUT_MENU, UI_BTYPE_SEARCH_MENU,
-	              UI_BTYPE_PROGRESS_BAR))
+	              UI_BTYPE_PROGRESS_BAR, UI_BTYPE_POPOVER))
 	{
 		but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT);
 	}
@@ -3560,7 +3529,7 @@ static uiBut *ui_def_but_rna(
 	}
 
 	const char *info;
-	if (!RNA_property_editable_info(&but->rnapoin, prop, &info)) {
+	if (but->rnapoin.data && !RNA_property_editable_info(&but->rnapoin, prop, &info)) {
 		ui_def_but_rna__disable(but, info);
 	}
 
@@ -3979,19 +3948,6 @@ uiBut *uiDefIconTextButO(uiBlock *block, int type, const char *opname, int opcon
 
 /* END Button containing both string label and icon */
 
-void UI_but_link_set(uiBut *but, void **poin, void ***ppoin, short *tot, int from, int to)
-{
-	uiLink *link;
-
-	link = but->link = MEM_callocN(sizeof(uiLink), "new uilink");
-
-	link->poin = poin;
-	link->ppoin = ppoin;
-	link->totlink = tot;
-	link->fromcode = from;
-	link->tocode = to;
-}
-
 /* cruft to make uiBlock and uiBut private */
 
 int UI_blocklist_min_y_get(ListBase *lb)
@@ -4459,7 +4415,7 @@ static void operator_enum_search_cb(const struct bContext *C, void *but, const c
 		for (item = item_array; item->identifier; item++) {
 			/* note: need to give the index rather than the identifier because the enum can be freed */
 			if (BLI_strcasestr(item->name, str)) {
-				if (false == UI_search_item_add(items, item->name, SET_INT_IN_POINTER(item->value), 0))
+				if (false == UI_search_item_add(items, item->name, SET_INT_IN_POINTER(item->value), item->icon))
 					break;
 			}
 		}
@@ -4590,7 +4546,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
 				tmp = BLI_strdup(RNA_property_identifier(but->rnaprop));
 		}
 		else if (type == BUT_GET_RNASTRUCT_IDENTIFIER) {
-			if (but->rnaprop)
+			if (but->rnaprop && but->rnapoin.data)
 				tmp = BLI_strdup(RNA_struct_identifier(but->rnapoin.type));
 			else if (but->optype)
 				tmp = BLI_strdup(but->optype->idname);
@@ -4667,6 +4623,9 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
 				PointerRNA *opptr = UI_but_operator_ptr_get(but);
 				wmOperatorType *ot = but->optype;
 
+				/* so the context is passed to itemf functions */
+				WM_operator_properties_sanitize(opptr, false);
+
 				/* if the default property of the operator is enum and it is set,
 				 * fetch the tooltip of the selected value so that "Snap" and "Mirror"
 				 * operator menus in the Anim Editors will show tooltips for the different
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index 36b0b938b5a..619dce1b9d9 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -110,9 +110,9 @@ enum {
 
 bool ui_but_can_align(const uiBut *but)
 {
-	return (
-	    !ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_CHECKBOX, UI_BTYPE_CHECKBOX_N, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE) &&
-	    (BLI_rctf_size_x(&but->rect) > 0.0f) && (BLI_rctf_size_y(&but->rect) > 0.0f));
+	const bool btype_can_align = !ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_CHECKBOX, UI_BTYPE_CHECKBOX_N,
+	                                   UI_BTYPE_TAB, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE);
+	return (btype_can_align && (BLI_rctf_size_x(&but->rect) > 0.0f) && (BLI_rctf_size_y(&but->rect) > 0.0f));
 }
 
 /**
@@ -320,13 +320,43 @@ static int ui_block_align_butal_cmp(const void *a, const void *b)
 	return 0;
 }
 
+static void ui_block_align_but_to_region(uiBut *but, const ARegion *region)
+{
+	rctf *rect = &but->rect;
+	const float but_width = BLI_rctf_size_x(rect);
+	const float but_height = BLI_rctf_size_y(rect);
+	const float px = U.pixelsize;
+
+	switch (but->drawflag & UI_BUT_ALIGN) {
+		case UI_BUT_ALIGN_TOP:
+			rect->ymax = region->winy + px;
+			rect->ymin = but->rect.ymax - but_height;
+			break;
+		case UI_BUT_ALIGN_DOWN:
+			rect->ymin = -px;
+			rect->ymax = rect->ymin + but_height;
+			break;
+		case UI_BUT_ALIGN_LEFT:
+			rect->xmin = -px;
+			rect->xmax = rect->xmin + but_width;
+			break;
+		case UI_BUT_ALIGN_RIGHT:
+			rect->xmax = region->winx + px;
+			rect->xmin = rect->xmax - but_width;
+			break;
+		default:
+			BLI_assert(0);
+			break;
+	}
+}
+
 /**
  * Compute the alignment of all 'align groups' of buttons in given block.
  *
  * This is using an order-independent algorithm, i.e. alignment of buttons should be OK regardless of order in which
  * they are added to the block.
  */
-void ui_block_align_calc(uiBlock *block)
+void ui_block_align_calc(uiBlock *block, const ARegion *region)
 {
 	uiBut *but;
 	int num_buttons = 0;
@@ -338,10 +368,17 @@ void ui_block_align_calc(uiBlock *block)
 	int side;
 	int i, j;
 
-	/* First loop: we count number of buttons belonging to an align group, and clear their align flag. */
+	/* First loop: we count number of buttons belonging to an align group, and clear their align flag.
+	 * Tabs get some special treatment here, they get aligned to region border. */
 	for (but = block->buttons.first; but; but = but->next) {
-		/* Clear old align flags. */
-		but->drawflag &= ~UI_BUT_ALIGN_ALL;
+		/* special case: tabs need to be aligned to a region border, drawflag tells which one */
+		if (but->type == UI_BTYPE_TAB) {
+			ui_block_align_but_to_region(but, region);
+		}
+		else {
+			/* Clear old align flags. */
+			but->drawflag &= ~UI_BUT_ALIGN_ALL;
+		}
 
 		if (but->alignnr != 0) {
 			num_buttons++;
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 5ed2713e5a7..ea1b58107bd 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -39,11 +39,13 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_nla.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
@@ -211,7 +213,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str)
 
 			/* updates */
 			driver->flag |= DRIVER_FLAG_RECOMPILE;
-			DAG_relations_tag_update(CTX_data_main(C));
+			DEG_relations_tag_update(CTX_data_main(C));
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME, NULL);
 			ok = true;
 		}
@@ -238,10 +240,11 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
 	if (special) {
 		/* NLA Strip property */
 		if (IS_AUTOKEY_ON(scene)) {
+			Depsgraph *depsgraph = CTX_data_depsgraph(C);
 			ReportList *reports = CTX_wm_reports(C);
 			ToolSettings *ts = scene->toolsettings;
 
-			insert_keyframe_direct(reports, but->rnapoin, but->rnaprop, fcu, cfra, ts->keyframe_type, 0);
+			insert_keyframe_direct(depsgraph, reports, but->rnapoin, but->rnaprop, fcu, cfra, ts->keyframe_type, 0);
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 		}
 	}
@@ -250,10 +253,11 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
 		 * making it easier to set up corrective drivers
 		 */
 		if (IS_AUTOKEY_ON(scene)) {
+			Depsgraph *depsgraph = CTX_data_depsgraph(C);
 			ReportList *reports = CTX_wm_reports(C);
 			ToolSettings *ts = scene->toolsettings;
 
-			insert_keyframe_direct(reports, but->rnapoin, but->rnaprop, fcu, cfra, ts->keyframe_type, INSERTKEY_DRIVER);
+			insert_keyframe_direct(depsgraph, reports, but->rnapoin, but->rnaprop, fcu, cfra, ts->keyframe_type, INSERTKEY_DRIVER);
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 		}
 	}
@@ -262,6 +266,7 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
 
 		/* TODO: this should probably respect the keyingset only option for anim */
 		if (autokeyframe_cfra_can_key(scene, id)) {
+			Depsgraph *depsgraph = CTX_data_depsgraph(C);
 			ReportList *reports = CTX_wm_reports(C);
 			ToolSettings *ts = scene->toolsettings;
 			short flag = ANIM_get_keyframing_flags(scene, 1);
@@ -272,7 +277,8 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
 			 *       because a button may control all items of an array at once.
 			 *       E.g., color wheels (see T42567). */
 			BLI_assert((fcu->array_index == but->rnaindex) || (but->rnaindex == -1));
-			insert_keyframe(reports, id, action, ((fcu->grp) ? (fcu->grp->name) : (NULL)),
+			insert_keyframe(depsgraph, reports, id, action,
+			                ((fcu->grp) ? (fcu->grp->name) : (NULL)),
 			                fcu->rna_path, but->rnaindex, cfra, ts->keyframe_type, flag);
 
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 17dc9710756..f093f47519c 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -50,19 +50,21 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_colormanagement.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
 #include "BLF_api.h"
 
-#include "GPU_draw.h"
-#include "GPU_basic_shader.h"
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "UI_interface.h"
 
 /* own include */
 #include "interface_intern.h"
 
+
 static int roundboxtype = UI_CNR_ALL;
 
 void UI_draw_roundbox_corner_set(int type)
@@ -71,336 +73,558 @@ void UI_draw_roundbox_corner_set(int type)
 	 * if this is undone, it's not that big a deal, only makes curves edges
 	 * square for the  */
 	roundboxtype = type;
-
 }
 
+#if 0 /* unused */
 int UI_draw_roundbox_corner_get(void)
 {
 	return roundboxtype;
 }
+#endif
+
+void UI_draw_roundbox_3ubAlpha(bool filled, float minx, float miny, float maxx, float maxy, float rad, const unsigned char col[3], unsigned char alpha)
+{
+	float colv[4];
+	colv[0] = ((float)col[0]) / 255;
+	colv[1] = ((float)col[1]) / 255;
+	colv[2] = ((float)col[2]) / 255;
+	colv[3] = ((float)alpha) / 255;
+	UI_draw_roundbox_4fv(filled, minx, miny, maxx, maxy, rad, colv);
+}
+
+void UI_draw_roundbox_3fvAlpha(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float col[3], float alpha)
+{
+	float colv[4];
+	colv[0] = col[0];
+	colv[1] = col[1];
+	colv[2] = col[2];
+	colv[3] = alpha;
+	UI_draw_roundbox_4fv(filled, minx, miny, maxx, maxy, rad, colv);
+}
 
-void UI_draw_roundbox_gl_mode(int mode, float minx, float miny, float maxx, float maxy, float rad)
+void UI_draw_roundbox_aa(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float color[4])
 {
+	uiWidgetBaseParameters widget_params = {
+		.recti.xmin = minx, .recti.ymin = miny,
+		.recti.xmax = maxx, .recti.ymax = maxy,
+		.radi = rad,
+		.round_corners[0] = (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f,
+		.round_corners[1] = (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[2] = (roundboxtype & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[3] = (roundboxtype & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f,
+		.color_inner1[0] = color[0], .color_inner2[0] = color[0],
+		.color_inner1[1] = color[1], .color_inner2[1] = color[1],
+		.color_inner1[2] = color[2], .color_inner2[2] = color[2],
+		.color_inner1[3] = color[3], .color_inner2[3] = color[3],
+		.alpha_discard = 1.0f,
+	};
+
+	glEnable(GL_BLEND);
+
+	if (filled) {
+		/* plain antialiased filled box */
+		widget_params.color_inner1[3] *= 0.125f;
+		widget_params.color_inner2[3] *= 0.125f;
+
+		/* WATCH: This is assuming the ModelViewProjectionMatrix is area pixel space.
+		 * If it has been scaled, then it's no longer valid. */
+		Gwn_Batch *batch = ui_batch_roundbox_get(filled, true);
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+		GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)&widget_params);
+		GWN_batch_draw(batch);
+	}
+	else {
+		/* plain antialiased unfilled box */
+		glEnable(GL_LINE_SMOOTH);
+
+		Gwn_Batch *batch = ui_batch_roundbox_get(filled, false);
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+		GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)&widget_params);
+		GWN_batch_draw(batch);
+
+		glDisable(GL_LINE_SMOOTH);
+	}
+
+	glDisable(GL_BLEND);
+}
+
+void UI_draw_roundbox_4fv(bool filled, float minx, float miny, float maxx, float maxy, float rad, const float col[4])
+{
+#if 0
 	float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293},
 	                   {0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}};
 	int a;
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
 	/* mult */
 	for (a = 0; a < 7; a++) {
 		mul_v2_fl(vec[a], rad);
 	}
 
-	glBegin(mode);
+	unsigned int vert_ct = 0;
+	vert_ct += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 9 : 1;
+	vert_ct += (roundboxtype & UI_CNR_TOP_RIGHT) ? 9 : 1;
+	vert_ct += (roundboxtype & UI_CNR_TOP_LEFT) ? 9 : 1;
+	vert_ct += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 9 : 1;
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4fv(col);
 
+	immBegin(filled ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_LOOP, vert_ct);
 	/* start with corner right-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
-		glVertex2f(maxx - rad, miny);
+		immVertex2f(pos, maxx - rad, miny);
 		for (a = 0; a < 7; a++) {
-			glVertex2f(maxx - rad + vec[a][0], miny + vec[a][1]);
+			immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
 		}
-		glVertex2f(maxx, miny + rad);
+		immVertex2f(pos, maxx, miny + rad);
 	}
 	else {
-		glVertex2f(maxx, miny);
+		immVertex2f(pos, maxx, miny);
 	}
 
 	/* corner right-top */
 	if (roundboxtype & UI_CNR_TOP_RIGHT) {
-		glVertex2f(maxx, maxy - rad);
+		immVertex2f(pos, maxx, maxy - rad);
 		for (a = 0; a < 7; a++) {
-			glVertex2f(maxx - vec[a][1], maxy - rad + vec[a][0]);
+			immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
 		}
-		glVertex2f(maxx - rad, maxy);
+		immVertex2f(pos, maxx - rad, maxy);
 	}
 	else {
-		glVertex2f(maxx, maxy);
+		immVertex2f(pos, maxx, maxy);
 	}
 
 	/* corner left-top */
 	if (roundboxtype & UI_CNR_TOP_LEFT) {
-		glVertex2f(minx + rad, maxy);
+		immVertex2f(pos, minx + rad, maxy);
 		for (a = 0; a < 7; a++) {
-			glVertex2f(minx + rad - vec[a][0], maxy - vec[a][1]);
+			immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
 		}
-		glVertex2f(minx, maxy - rad);
+		immVertex2f(pos, minx, maxy - rad);
 	}
 	else {
-		glVertex2f(minx, maxy);
+		immVertex2f(pos, minx, maxy);
 	}
 
 	/* corner left-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
-		glVertex2f(minx, miny + rad);
+		immVertex2f(pos, minx, miny + rad);
 		for (a = 0; a < 7; a++) {
-			glVertex2f(minx + vec[a][1], miny + rad - vec[a][0]);
+			immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
 		}
-		glVertex2f(minx + rad, miny);
+		immVertex2f(pos, minx + rad, miny);
 	}
 	else {
-		glVertex2f(minx, miny);
+		immVertex2f(pos, minx, miny);
 	}
 
-	glEnd();
+	immEnd();
+	immUnbindProgram();
+#endif
+
+	uiWidgetBaseParameters widget_params = {
+		.recti.xmin = minx, .recti.ymin = miny,
+		.recti.xmax = maxx, .recti.ymax = maxy,
+		.radi = rad,
+		.round_corners[0] = (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f,
+		.round_corners[1] = (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[2] = (roundboxtype & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[3] = (roundboxtype & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f,
+		.color_inner1[0] = col[0], .color_inner2[0] = col[0],
+		.color_inner1[1] = col[1], .color_inner2[1] = col[1],
+		.color_inner1[2] = col[2], .color_inner2[2] = col[2],
+		.color_inner1[3] = col[3], .color_inner2[3] = col[3],
+		.alpha_discard = 1.0f,
+	};
+
+	Gwn_Batch *batch = ui_batch_roundbox_get(filled, false);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+	GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)&widget_params);
+	GWN_batch_draw(batch);
 }
 
-static void round_box_shade_col(const float col1[3], float const col2[3], const float fac)
+#if 0
+static void round_box_shade_col(unsigned attrib, const float col1[3], float const col2[3], const float fac)
 {
-	float col[3] = {
+	float col[4] = {
 		fac * col1[0] + (1.0f - fac) * col2[0],
 		fac * col1[1] + (1.0f - fac) * col2[1],
-		fac * col1[2] + (1.0f - fac) * col2[2]
+		fac * col1[2] + (1.0f - fac) * col2[2],
+		1.0f
 	};
-	glColor3fv(col);
+	immAttrib4fv(attrib, col);
 }
+#endif
 
 /* linear horizontal shade within button or in outline */
 /* view2d scrollers use it */
 void UI_draw_roundbox_shade_x(
-        int mode, float minx, float miny, float maxx, float maxy,
-        float rad, float shadetop, float shadedown)
+        bool filled, float minx, float miny, float maxx, float maxy,
+        float rad, float shadetop, float shadedown, const float col[4])
 {
+#if 0
 	float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293},
 	                   {0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}};
 	const float div = maxy - miny;
 	const float idiv = 1.0f / div;
-	float coltop[3], coldown[3], color[4];
+	float coltop[3], coldown[3];
+	int vert_count = 0;
 	int a;
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
 	/* mult */
 	for (a = 0; a < 7; a++) {
 		mul_v2_fl(vec[a], rad);
 	}
-	/* get current color, needs to be outside of glBegin/End */
-	glGetFloatv(GL_CURRENT_COLOR, color);
 
 	/* 'shade' defines strength of shading */
-	coltop[0]  = min_ff(1.0f, color[0] + shadetop);
-	coltop[1]  = min_ff(1.0f, color[1] + shadetop);
-	coltop[2]  = min_ff(1.0f, color[2] + shadetop);
-	coldown[0] = max_ff(0.0f, color[0] + shadedown);
-	coldown[1] = max_ff(0.0f, color[1] + shadedown);
-	coldown[2] = max_ff(0.0f, color[2] + shadedown);
+	coltop[0]  = min_ff(1.0f, col[0] + shadetop);
+	coltop[1]  = min_ff(1.0f, col[1] + shadetop);
+	coltop[2]  = min_ff(1.0f, col[2] + shadetop);
+	coldown[0] = max_ff(0.0f, col[0] + shadedown);
+	coldown[1] = max_ff(0.0f, col[1] + shadedown);
+	coldown[2] = max_ff(0.0f, col[2] + shadedown);
+
+	vert_count += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_TOP_RIGHT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_TOP_LEFT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 9 : 1;
 
-	glBegin(mode);
+	immBegin(filled ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_LOOP, vert_count);
 
 	/* start with corner right-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
 
-		round_box_shade_col(coltop, coldown, 0.0);
-		glVertex2f(maxx - rad, miny);
+		round_box_shade_col(color, coltop, coldown, 0.0);
+		immVertex2f(pos, maxx - rad, miny);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(coltop, coldown, vec[a][1] * idiv);
-			glVertex2f(maxx - rad + vec[a][0], miny + vec[a][1]);
+			round_box_shade_col(color, coltop, coldown, vec[a][1] * idiv);
+			immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
 		}
 
-		round_box_shade_col(coltop, coldown, rad * idiv);
-		glVertex2f(maxx, miny + rad);
+		round_box_shade_col(color, coltop, coldown, rad * idiv);
+		immVertex2f(pos, maxx, miny + rad);
 	}
 	else {
-		round_box_shade_col(coltop, coldown, 0.0);
-		glVertex2f(maxx, miny);
+		round_box_shade_col(color, coltop, coldown, 0.0);
+		immVertex2f(pos, maxx, miny);
 	}
 
 	/* corner right-top */
 	if (roundboxtype & UI_CNR_TOP_RIGHT) {
 
-		round_box_shade_col(coltop, coldown, (div - rad) * idiv);
-		glVertex2f(maxx, maxy - rad);
+		round_box_shade_col(color, coltop, coldown, (div - rad) * idiv);
+		immVertex2f(pos, maxx, maxy - rad);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(coltop, coldown, (div - rad + vec[a][1]) * idiv);
-			glVertex2f(maxx - vec[a][1], maxy - rad + vec[a][0]);
+			round_box_shade_col(color, coltop, coldown, (div - rad + vec[a][1]) * idiv);
+			immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
 		}
-		round_box_shade_col(coltop, coldown, 1.0);
-		glVertex2f(maxx - rad, maxy);
+		round_box_shade_col(color, coltop, coldown, 1.0);
+		immVertex2f(pos, maxx - rad, maxy);
 	}
 	else {
-		round_box_shade_col(coltop, coldown, 1.0);
-		glVertex2f(maxx, maxy);
+		round_box_shade_col(color, coltop, coldown, 1.0);
+		immVertex2f(pos, maxx, maxy);
 	}
 
 	/* corner left-top */
 	if (roundboxtype & UI_CNR_TOP_LEFT) {
 
-		round_box_shade_col(coltop, coldown, 1.0);
-		glVertex2f(minx + rad, maxy);
+		round_box_shade_col(color, coltop, coldown, 1.0);
+		immVertex2f(pos, minx + rad, maxy);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(coltop, coldown, (div - vec[a][1]) * idiv);
-			glVertex2f(minx + rad - vec[a][0], maxy - vec[a][1]);
+			round_box_shade_col(color, coltop, coldown, (div - vec[a][1]) * idiv);
+			immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
 		}
 
-		round_box_shade_col(coltop, coldown, (div - rad) * idiv);
-		glVertex2f(minx, maxy - rad);
+		round_box_shade_col(color, coltop, coldown, (div - rad) * idiv);
+		immVertex2f(pos, minx, maxy - rad);
 	}
 	else {
-		round_box_shade_col(coltop, coldown, 1.0);
-		glVertex2f(minx, maxy);
+		round_box_shade_col(color, coltop, coldown, 1.0);
+		immVertex2f(pos, minx, maxy);
 	}
 
 	/* corner left-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
 
-		round_box_shade_col(coltop, coldown, rad * idiv);
-		glVertex2f(minx, miny + rad);
+		round_box_shade_col(color, coltop, coldown, rad * idiv);
+		immVertex2f(pos, minx, miny + rad);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(coltop, coldown, (rad - vec[a][1]) * idiv);
-			glVertex2f(minx + vec[a][1], miny + rad - vec[a][0]);
+			round_box_shade_col(color, coltop, coldown, (rad - vec[a][1]) * idiv);
+			immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
 		}
 
-		round_box_shade_col(coltop, coldown, 0.0);
-		glVertex2f(minx + rad, miny);
+		round_box_shade_col(color, coltop, coldown, 0.0);
+		immVertex2f(pos, minx + rad, miny);
 	}
 	else {
-		round_box_shade_col(coltop, coldown, 0.0);
-		glVertex2f(minx, miny);
+		round_box_shade_col(color, coltop, coldown, 0.0);
+		immVertex2f(pos, minx, miny);
 	}
 
-	glEnd();
+	immEnd();
+	immUnbindProgram();
+#endif
+
+	uiWidgetBaseParameters widget_params = {
+		.recti.xmin = minx, .recti.ymin = miny,
+		.recti.xmax = maxx, .recti.ymax = maxy,
+		.radi = rad,
+		.round_corners[0] = (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f,
+		.round_corners[1] = (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[2] = (roundboxtype & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[3] = (roundboxtype & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f,
+		.color_inner1[0] = min_ff(1.0f, col[0] + shadetop),
+		.color_inner2[0] = max_ff(0.0f, col[0] + shadedown),
+		.color_inner1[1] = min_ff(1.0f, col[1] + shadetop),
+		.color_inner2[1] = max_ff(0.0f, col[1] + shadedown),
+		.color_inner1[2] = min_ff(1.0f, col[2] + shadetop),
+		.color_inner2[2] = max_ff(0.0f, col[2] + shadedown),
+		.color_inner1[3] = 1.0f,
+		.color_inner2[3] = 1.0f,
+		.alpha_discard = 1.0f,
+	};
+
+	Gwn_Batch *batch = ui_batch_roundbox_get(filled, false);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+	GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)&widget_params);
+	GWN_batch_draw(batch);
 }
 
+#if 0 /* unused */
 /* linear vertical shade within button or in outline */
 /* view2d scrollers use it */
 void UI_draw_roundbox_shade_y(
-        int mode, float minx, float miny, float maxx, float maxy,
-        float rad, float shadeLeft, float shadeRight)
+        bool filled, float minx, float miny, float maxx, float maxy,
+        float rad, float shadeleft, float shaderight, const float col[4])
 {
 	float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293},
 	                   {0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}};
 	const float div = maxx - minx;
 	const float idiv = 1.0f / div;
-	float colLeft[3], colRight[3], color[4];
+	float colLeft[3], colRight[3];
+	int vert_count = 0;
 	int a;
 
 	/* mult */
 	for (a = 0; a < 7; a++) {
 		mul_v2_fl(vec[a], rad);
 	}
-	/* get current color, needs to be outside of glBegin/End */
-	glGetFloatv(GL_CURRENT_COLOR, color);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
 
 	/* 'shade' defines strength of shading */
-	colLeft[0]  = min_ff(1.0f, color[0] + shadeLeft);
-	colLeft[1]  = min_ff(1.0f, color[1] + shadeLeft);
-	colLeft[2]  = min_ff(1.0f, color[2] + shadeLeft);
-	colRight[0] = max_ff(0.0f, color[0] + shadeRight);
-	colRight[1] = max_ff(0.0f, color[1] + shadeRight);
-	colRight[2] = max_ff(0.0f, color[2] + shadeRight);
+	colLeft[0]  = min_ff(1.0f, col[0] + shadeleft);
+	colLeft[1]  = min_ff(1.0f, col[1] + shadeleft);
+	colLeft[2]  = min_ff(1.0f, col[2] + shadeleft);
+	colRight[0] = max_ff(0.0f, col[0] + shaderight);
+	colRight[1] = max_ff(0.0f, col[1] + shaderight);
+	colRight[2] = max_ff(0.0f, col[2] + shaderight);
+
+
+	vert_count += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_TOP_RIGHT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_TOP_LEFT) ? 9 : 1;
+	vert_count += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 9 : 1;
 
-	glBegin(mode);
+	immBegin(filled ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_LOOP, vert_count);
 
 	/* start with corner right-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
-		round_box_shade_col(colLeft, colRight, 0.0);
-		glVertex2f(maxx - rad, miny);
+		round_box_shade_col(color, colLeft, colRight, 0.0);
+		immVertex2f(pos, maxx - rad, miny);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(colLeft, colRight, vec[a][0] * idiv);
-			glVertex2f(maxx - rad + vec[a][0], miny + vec[a][1]);
+			round_box_shade_col(color, colLeft, colRight, vec[a][0] * idiv);
+			immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
 		}
 
-		round_box_shade_col(colLeft, colRight, rad * idiv);
-		glVertex2f(maxx, miny + rad);
+		round_box_shade_col(color, colLeft, colRight, rad * idiv);
+		immVertex2f(pos, maxx, miny + rad);
 	}
 	else {
-		round_box_shade_col(colLeft, colRight, 0.0);
-		glVertex2f(maxx, miny);
+		round_box_shade_col(color, colLeft, colRight, 0.0);
+		immVertex2f(pos, maxx, miny);
 	}
 
 	/* corner right-top */
 	if (roundboxtype & UI_CNR_TOP_RIGHT) {
-		round_box_shade_col(colLeft, colRight, 0.0);
-		glVertex2f(maxx, maxy - rad);
+		round_box_shade_col(color, colLeft, colRight, 0.0);
+		immVertex2f(pos, maxx, maxy - rad);
 
 		for (a = 0; a < 7; a++) {
 
-			round_box_shade_col(colLeft, colRight, (div - rad - vec[a][0]) * idiv);
-			glVertex2f(maxx - vec[a][1], maxy - rad + vec[a][0]);
+			round_box_shade_col(color, colLeft, colRight, (div - rad - vec[a][0]) * idiv);
+			immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
 		}
-		round_box_shade_col(colLeft, colRight, (div - rad) * idiv);
-		glVertex2f(maxx - rad, maxy);
+		round_box_shade_col(color, colLeft, colRight, (div - rad) * idiv);
+		immVertex2f(pos, maxx - rad, maxy);
 	}
 	else {
-		round_box_shade_col(colLeft, colRight, 0.0);
-		glVertex2f(maxx, maxy);
+		round_box_shade_col(color, colLeft, colRight, 0.0);
+		immVertex2f(pos, maxx, maxy);
 	}
 
 	/* corner left-top */
 	if (roundboxtype & UI_CNR_TOP_LEFT) {
-		round_box_shade_col(colLeft, colRight, (div - rad) * idiv);
-		glVertex2f(minx + rad, maxy);
+		round_box_shade_col(color, colLeft, colRight, (div - rad) * idiv);
+		immVertex2f(pos, minx + rad, maxy);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(colLeft, colRight, (div - rad + vec[a][0]) * idiv);
-			glVertex2f(minx + rad - vec[a][0], maxy - vec[a][1]);
+			round_box_shade_col(color, colLeft, colRight, (div - rad + vec[a][0]) * idiv);
+			immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
 		}
 
-		round_box_shade_col(colLeft, colRight, 1.0);
-		glVertex2f(minx, maxy - rad);
+		round_box_shade_col(color, colLeft, colRight, 1.0);
+		immVertex2f(pos, minx, maxy - rad);
 	}
 	else {
-		round_box_shade_col(colLeft, colRight, 1.0);
-		glVertex2f(minx, maxy);
+		round_box_shade_col(color, colLeft, colRight, 1.0);
+		immVertex2f(pos, minx, maxy);
 	}
 
 	/* corner left-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
-		round_box_shade_col(colLeft, colRight, 1.0);
-		glVertex2f(minx, miny + rad);
+		round_box_shade_col(color, colLeft, colRight, 1.0);
+		immVertex2f(pos, minx, miny + rad);
 
 		for (a = 0; a < 7; a++) {
-			round_box_shade_col(colLeft, colRight, (vec[a][0]) * idiv);
-			glVertex2f(minx + vec[a][1], miny + rad - vec[a][0]);
+			round_box_shade_col(color, colLeft, colRight, (vec[a][0]) * idiv);
+			immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
 		}
 
-		round_box_shade_col(colLeft, colRight, 1.0);
-		glVertex2f(minx + rad, miny);
+		round_box_shade_col(color, colLeft, colRight, 1.0);
+		immVertex2f(pos, minx + rad, miny);
 	}
 	else {
-		round_box_shade_col(colLeft, colRight, 1.0);
-		glVertex2f(minx, miny);
+		round_box_shade_col(color, colLeft, colRight, 1.0);
+		immVertex2f(pos, minx, miny);
 	}
 
-	glEnd();
+	immEnd();
+	immUnbindProgram();
 }
+#endif /* unused */
 
-/* plain antialiased unfilled rectangle */
-void UI_draw_roundbox_unfilled(float minx, float miny, float maxx, float maxy, float rad)
+void UI_draw_text_underline(int pos_x, int pos_y, int len, int height, const float color[4])
 {
-	float color[4];
-
-	if (roundboxtype & UI_RB_ALPHA) {
-		glGetFloatv(GL_CURRENT_COLOR, color);
-		color[3] = 0.5;
-		glColor4fv(color);
-		glEnable(GL_BLEND);
-	}
+	int ofs_y = 4 * U.pixelsize;
 
-	/* set antialias line */
-	glEnable(GL_LINE_SMOOTH);
-	glEnable(GL_BLEND);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
 
-	UI_draw_roundbox_gl_mode(GL_LINE_LOOP, minx, miny, maxx, maxy, rad);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4fv(color);
 
-	glDisable(GL_BLEND);
-	glDisable(GL_LINE_SMOOTH);
+	immRecti(pos, pos_x, pos_y - ofs_y, pos_x + len, pos_y - ofs_y + (height * U.pixelsize));
+	immUnbindProgram();
 }
 
-/* (old, used in outliner) plain antialiased filled box */
-void UI_draw_roundbox(float minx, float miny, float maxx, float maxy, float rad)
-{
-	ui_draw_anti_roundbox(GL_POLYGON, minx, miny, maxx, maxy, rad, roundboxtype & UI_RB_ALPHA);
-}
+/* ************** SPECIAL BUTTON DRAWING FUNCTIONS ************* */
 
-void UI_draw_text_underline(int pos_x, int pos_y, int len, int height)
+/* based on UI_draw_roundbox_gl_mode, check on making a version which allows us to skip some sides */
+void ui_draw_but_TAB_outline(const rcti *rect, float rad, unsigned char highlight[3], unsigned char highlight_fade[3])
 {
-	int ofs_y = 4 * U.pixelsize;
-	glRecti(pos_x, pos_y - ofs_y, pos_x + len, pos_y - ofs_y + (height * U.pixelsize));
-}
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
+	/* add a 1px offset, looks nicer */
+	const int minx = rect->xmin + U.pixelsize, maxx = rect->xmax - U.pixelsize;
+	const int miny = rect->ymin + U.pixelsize, maxy = rect->ymax - U.pixelsize;
+	int a;
+	float vec[4][2] = {
+	    {0.195, 0.02},
+	    {0.55, 0.169},
+	    {0.831, 0.45},
+	    {0.98, 0.805},
+	};
 
-/* ************** SPECIAL BUTTON DRAWING FUNCTIONS ************* */
+
+	/* mult */
+	for (a = 0; a < 4; a++) {
+		mul_v2_fl(vec[a], rad);
+	}
+
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+	immBeginAtMost(GWN_PRIM_LINE_STRIP, 25);
+
+	immAttrib3ubv(col, highlight);
+
+	/* start with corner left-top */
+	if (roundboxtype & UI_CNR_TOP_LEFT) {
+		immVertex2f(pos, minx, maxy - rad);
+		for (a = 0; a < 4; a++) {
+			immVertex2f(pos, minx + vec[a][1], maxy - rad + vec[a][0]);
+		}
+		immVertex2f(pos, minx + rad, maxy);
+	}
+	else {
+		immVertex2f(pos, minx, maxy);
+	}
+
+	/* corner right-top */
+	if (roundboxtype & UI_CNR_TOP_RIGHT) {
+		immVertex2f(pos, maxx - rad, maxy);
+		for (a = 0; a < 4; a++) {
+			immVertex2f(pos, maxx - rad + vec[a][0], maxy - vec[a][1]);
+		}
+		immVertex2f(pos, maxx, maxy - rad);
+	}
+	else {
+		immVertex2f(pos, maxx, maxy);
+	}
+
+	immAttrib3ubv(col, highlight_fade);
+
+	/* corner right-bottom */
+	if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
+		immVertex2f(pos, maxx, miny + rad);
+		for (a = 0; a < 4; a++) {
+			immVertex2f(pos, maxx - vec[a][1], miny + rad - vec[a][0]);
+		}
+		immVertex2f(pos, maxx - rad, miny);
+	}
+	else {
+		immVertex2f(pos, maxx, miny);
+	}
+
+	/* corner left-bottom */
+	if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
+		immVertex2f(pos, minx + rad, miny);
+		for (a = 0; a < 4; a++) {
+			immVertex2f(pos, minx + rad - vec[a][0], miny + vec[a][1]);
+		}
+		immVertex2f(pos, minx, miny + rad);
+	}
+	else {
+		immVertex2f(pos, minx, miny);
+	}
+
+	immAttrib3ubv(col, highlight);
+
+	/* back to corner left-top */
+	immVertex2f(pos, minx, roundboxtype & UI_CNR_TOP_LEFT ? maxy - rad : maxy);
+
+	immEnd();
+	immUnbindProgram();
+}
 
 void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *rect)
 {
@@ -412,31 +636,30 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(w
 
 	if (!ibuf) return;
 
+	float facx = 1.0f;
+	float facy = 1.0f;
+
 	int w = BLI_rcti_size_x(rect);
 	int h = BLI_rcti_size_y(rect);
 
 	/* scissor doesn't seem to be doing the right thing...? */
 #if 0
-	//glColor4f(1.0, 0.f, 0.f, 1.f);
-	//fdrawbox(rect->xmin, rect->ymin, rect->xmax, rect->ymax)
-
 	/* prevent drawing outside widget area */
 	GLint scissor[4];
 	glGetIntegerv(GL_SCISSOR_BOX, scissor);
-	glScissor(ar->winrct.xmin + rect->xmin, ar->winrct.ymin + rect->ymin, w, h);
+	glScissor(rect->xmin, rect->ymin, w, h);
 #endif
 
 	glEnable(GL_BLEND);
-	glColor4f(0.0, 0.0, 0.0, 0.0);
 
 	if (w != ibuf->x || h != ibuf->y) {
-		float facx = (float)w / (float)ibuf->x;
-		float facy = (float)h / (float)ibuf->y;
-		glPixelZoom(facx, facy);
+		facx = (float)w / (float)ibuf->x;
+		facy = (float)h / (float)ibuf->y;
 	}
-	glaDrawPixelsAuto((float)rect->xmin, (float)rect->ymin, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, ibuf->rect);
 
-	glPixelZoom(1.0f, 1.0f);
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+	immDrawPixelsTex(&state, (float)rect->xmin, (float)rect->ymin, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, ibuf->rect,
+	                 facx, facy, NULL);
 
 	glDisable(GL_BLEND);
 
@@ -451,43 +674,34 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(w
 /**
  * Draw title and text safe areas.
  *
- * The first 4 parameters are the offsets for the view, not the zones.
+ * \Note This functionn is to be used with the 2D dashed shader enabled.
+ *
+ * \param pos is a PRIM_FLOAT, 2, GWN_FETCH_FLOAT vertex attrib
+ * \param line_origin is a PRIM_FLOAT, 2, GWN_FETCH_FLOAT vertex attrib
+ *
+ * The next 4 parameters are the offsets for the view, not the zones.
  */
 void UI_draw_safe_areas(
-        float x1, float x2, float y1, float y2,
+        uint pos, float x1, float x2, float y1, float y2,
         const float title_aspect[2], const float action_aspect[2])
 {
 	const float size_x_half = (x2 - x1) * 0.5f;
 	const float size_y_half = (y2 - y1) * 0.5f;
 
 	const float *safe_areas[] = {title_aspect, action_aspect};
-	int safe_len = ARRAY_SIZE(safe_areas);
-	bool is_first = true;
+	const int safe_len = ARRAY_SIZE(safe_areas);
 
 	for (int i = 0; i < safe_len; i++) {
 		if (safe_areas[i][0] || safe_areas[i][1]) {
-			float margin_x, margin_y;
-			float minx, miny, maxx, maxy;
-
-			if (is_first) {
-				UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25f, 0);
-				is_first = false;
-			}
+			float margin_x = safe_areas[i][0] * size_x_half;
+			float margin_y = safe_areas[i][1] * size_y_half;
 
-			margin_x = safe_areas[i][0] * size_x_half;
-			margin_y = safe_areas[i][1] * size_y_half;
+			float minx = x1 + margin_x;
+			float miny = y1 + margin_y;
+			float maxx = x2 - margin_x;
+			float maxy = y2 - margin_y;
 
-			minx = x1 + margin_x;
-			miny = y1 + margin_y;
-			maxx = x2 - margin_x;
-			maxy = y2 - margin_y;
-
-			glBegin(GL_LINE_LOOP);
-			glVertex2f(maxx, miny);
-			glVertex2f(maxx, maxy);
-			glVertex2f(minx, maxy);
-			glVertex2f(minx, miny);
-			glEnd();
+			imm_draw_box_wire_2d(pos, minx, miny, maxx, maxy);
 		}
 	}
 }
@@ -498,55 +712,63 @@ static void draw_scope_end(const rctf *rect, GLint *scissor)
 	/* restore scissortest */
 	glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
 
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* outline */
-	glColor4f(0.f, 0.f, 0.f, 0.5f);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rect->xmin - 1, rect->ymin, rect->xmax + 1, rect->ymax + 1, 3.0f);
+	float color[4] = {0.0f, 0.0f, 0.0f, 0.5f};
+	UI_draw_roundbox_4fv(false, rect->xmin - 1, rect->ymin, rect->xmax + 1, rect->ymax + 1, 3.0f, color);
 }
 
 static void histogram_draw_one(
         float r, float g, float b, float alpha,
-        float x, float y, float w, float h, const float *data, int res, const bool is_line)
+        float x, float y, float w, float h, const float *data, int res, const bool is_line,
+        unsigned int pos_attrib)
 {
+	float color[4] = {r, g, b, alpha};
+
+	/* that can happen */
+	if (res == 0)
+		return;
+
 	glEnable(GL_LINE_SMOOTH);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-	glColor4f(r, g, b, alpha);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE);
+
+	immUniformColor4fv(color);
 
 	if (is_line) {
 		/* curve outline */
 		glLineWidth(1.5);
 
-		glBegin(GL_LINE_STRIP);
+		immBegin(GWN_PRIM_LINE_STRIP, res);
 		for (int i = 0; i < res; i++) {
 			float x2 = x + i * (w / (float)res);
-			glVertex2f(x2, y + (data[i] * h));
+			immVertex2f(pos_attrib, x2, y + (data[i] * h));
 		}
-		glEnd();
+		immEnd();
 	}
 	else {
 		/* under the curve */
-		glBegin(GL_TRIANGLE_STRIP);
-		glVertex2f(x, y);
-		glVertex2f(x, y + (data[0] * h));
+		immBegin(GWN_PRIM_TRI_STRIP, res * 2);
+		immVertex2f(pos_attrib, x, y);
+		immVertex2f(pos_attrib, x, y + (data[0] * h));
 		for (int i = 1; i < res; i++) {
 			float x2 = x + i * (w / (float)res);
-			glVertex2f(x2, y + (data[i] * h));
-			glVertex2f(x2, y);
+			immVertex2f(pos_attrib, x2, y + (data[i] * h));
+			immVertex2f(pos_attrib, x2, y);
 		}
-		glEnd();
+		immEnd();
 
 		/* curve outline */
-		glColor4f(0.f, 0.f, 0.f, 0.25f);
+		immUniformColor4f(0.0f, 0.0f, 0.0f, 0.25f);
 
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glBegin(GL_LINE_STRIP);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		immBegin(GWN_PRIM_LINE_STRIP, res);
 		for (int i = 0; i < res; i++) {
 			float x2 = x + i * (w / (float)res);
-			glVertex2f(x2, y + (data[i] * h));
+			immVertex2f(pos_attrib, x2, y + (data[i] * h));
 		}
-		glEnd();
+		immEnd();
 	}
 
 	glDisable(GL_LINE_SMOOTH);
@@ -554,7 +776,7 @@ static void histogram_draw_one(
 
 #define HISTOGRAM_TOT_GRID_LINES 4
 
-void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
+void ui_draw_but_HISTOGRAM(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
 {
 	Histogram *hist = (Histogram *)but->poin;
 	int res = hist->x_resolution;
@@ -571,56 +793,90 @@ void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol)
 	float h = BLI_rctf_size_y(&rect) * hist->ymax;
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-	UI_ThemeColor4(TH_PREVIEW_BACK);
+	float color[4];
+	UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f);
+	UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 
 	/* need scissor test, histogram can draw outside of boundary */
 	GLint scissor[4];
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin - 1),
-	          ar->winrct.ymin + (rect.ymin - 1),
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
+	glScissor((rect.xmin - 1),
+	          (rect.ymin - 1),
 	          (rect.xmax + 1) - (rect.xmin - 1),
 	          (rect.ymax + 1) - (rect.ymin - 1));
 
-	glColor4f(1.f, 1.f, 1.f, 0.08f);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.08f);
 	/* draw grid lines here */
 	for (int i = 1; i <= HISTOGRAM_TOT_GRID_LINES; i++) {
 		const float fac = (float)i / (float)HISTOGRAM_TOT_GRID_LINES;
 
 		/* so we can tell the 1.0 color point */
 		if (i == HISTOGRAM_TOT_GRID_LINES) {
-			glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+			immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
 		}
 
-		fdrawline(rect.xmin, rect.ymin + fac * h, rect.xmax, rect.ymin + fac * h);
-		fdrawline(rect.xmin + fac * w, rect.ymin, rect.xmin + fac * w, rect.ymax);
+		immBegin(GWN_PRIM_LINES, 4);
+
+		immVertex2f(pos, rect.xmin, rect.ymin + fac * h);
+		immVertex2f(pos, rect.xmax, rect.ymin + fac * h);
+
+		immVertex2f(pos, rect.xmin + fac * w, rect.ymin);
+		immVertex2f(pos, rect.xmin + fac * w, rect.ymax);
+
+		immEnd();
 	}
 
 	if (hist->mode == HISTO_MODE_LUMA) {
-		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res, is_line);
+		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res, is_line, pos);
 	}
 	else if (hist->mode == HISTO_MODE_ALPHA) {
-		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_a, res, is_line);
+		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_a, res, is_line, pos);
 	}
 	else {
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_R)
-			histogram_draw_one(1.0, 0.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_r, res, is_line);
+			histogram_draw_one(1.0, 0.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_r, res, is_line, pos);
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_G)
-			histogram_draw_one(0.0, 1.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_g, res, is_line);
+			histogram_draw_one(0.0, 1.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_g, res, is_line, pos);
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_B)
-			histogram_draw_one(0.0, 0.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_b, res, is_line);
+			histogram_draw_one(0.0, 0.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_b, res, is_line, pos);
 	}
 
+	immUnbindProgram();
+
 	/* outline */
 	draw_scope_end(&rect, scissor);
 }
 
 #undef HISTOGRAM_TOT_GRID_LINES
 
-void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
+static void waveform_draw_one(float *waveform, int nbr, const float col[3])
+{
+	Gwn_VertFormat format = {0};
+	unsigned int pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
+	GWN_vertbuf_data_alloc(vbo, nbr);
+
+	GWN_vertbuf_attr_fill(vbo, pos_id, waveform);
+
+	/* TODO store the Gwn_Batch inside the scope */
+	Gwn_Batch *batch = GWN_batch_create_ex(GWN_PRIM_POINTS, vbo, NULL, GWN_BATCH_OWNS_VBO);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_UNIFORM_COLOR);
+	GWN_batch_uniform_4f(batch, "color", col[0], col[1], col[2], 1.0f);
+	GWN_batch_draw(batch);
+
+	GWN_batch_discard(batch);
+}
+
+void ui_draw_but_WAVEFORM(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
 {
 	Scopes *scopes = (Scopes *)but->poin;
 	GLint scissor[4];
@@ -642,7 +898,7 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
 		scopes->wavefrm_yfac = 0.98f;
 	float w = BLI_rctf_size_x(&rect) - 7;
 	float h = BLI_rctf_size_y(&rect) * scopes->wavefrm_yfac;
-	float yofs = rect.ymin + (BLI_rctf_size_y(&rect) - h) / 2.0f;
+	float yofs = rect.ymin + (BLI_rctf_size_y(&rect) - h) * 0.5f;
 	float w3 = w / 3.0f;
 
 	/* log scale for alpha */
@@ -657,108 +913,140 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
 		}
 	}
 
+	/* Flush text cache before changing scissors. */
+	BLF_batch_draw_flush();
+
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-	UI_ThemeColor4(TH_PREVIEW_BACK);
+	float color[4];
+	UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f);
+	UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 
 	/* need scissor test, waveform can draw outside of boundary */
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin - 1),
-	          ar->winrct.ymin + (rect.ymin - 1),
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
+	glScissor((rect.xmin - 1),
+	          (rect.ymin - 1),
 	          (rect.xmax + 1) - (rect.xmin - 1),
 	          (rect.ymax + 1) - (rect.ymin - 1));
 
-	glColor4f(1.f, 1.f, 1.f, 0.08f);
-	/* draw grid lines here */
+	/* draw scale numbers first before binding any shader */
 	for (int i = 0; i < 6; i++) {
 		char str[4];
 		BLI_snprintf(str, sizeof(str), "%-3d", i * 20);
 		str[3] = '\0';
-		fdrawline(rect.xmin + 22, yofs + (i / 5.f) * h, rect.xmax + 1, yofs + (i / 5.f) * h);
-		BLF_draw_default(rect.xmin + 1, yofs - 5 + (i / 5.f) * h, 0, str, sizeof(str) - 1);
-		/* in the loop because blf_draw reset it */
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		BLF_color4f(BLF_default(), 1.0f, 1.0f, 1.0f, 0.08f);
+		BLF_draw_default(rect.xmin + 1, yofs - 5 + (i * 0.2f) * h, 0, str, sizeof(str) - 1);
 	}
+
+	/* Flush text cache before drawing things on top. */
+	BLF_batch_draw_flush();
+
+	glEnable(GL_BLEND);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.08f);
+
+	/* draw grid lines here */
+	immBegin(GWN_PRIM_LINES, 12);
+
+	for (int i = 0; i < 6; i++) {
+		immVertex2f(pos, rect.xmin + 22, yofs + (i * 0.2f) * h);
+		immVertex2f(pos, rect.xmax + 1, yofs + (i * 0.2f) * h);
+	}
+
+	immEnd();
+
 	/* 3 vertical separation */
 	if (scopes->wavefrm_mode != SCOPES_WAVEFRM_LUMA) {
+		immBegin(GWN_PRIM_LINES, 4);
+
 		for (int i = 1; i < 3; i++) {
-			fdrawline(rect.xmin + i * w3, rect.ymin, rect.xmin + i * w3, rect.ymax);
+			immVertex2f(pos, rect.xmin + i * w3, rect.ymin);
+			immVertex2f(pos, rect.xmin + i * w3, rect.ymax);
 		}
+
+		immEnd();
 	}
 
 	/* separate min max zone on the right */
-	fdrawline(rect.xmin + w, rect.ymin, rect.xmin + w, rect.ymax);
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(pos, rect.xmin + w, rect.ymin);
+	immVertex2f(pos, rect.xmin + w, rect.ymax);
+	immEnd();
+
 	/* 16-235-240 level in case of ITU-R BT601/709 */
-	glColor4f(1.f, 0.4f, 0.f, 0.2f);
+	immUniformColor4f(1.0f, 0.4f, 0.0f, 0.2f);
 	if (ELEM(scopes->wavefrm_mode, SCOPES_WAVEFRM_YCC_601, SCOPES_WAVEFRM_YCC_709)) {
-		fdrawline(rect.xmin + 22, yofs + h * 16.0f / 255.0f, rect.xmax + 1, yofs + h * 16.0f / 255.0f);
-		fdrawline(rect.xmin + 22, yofs + h * 235.0f / 255.0f, rect.xmin + w3, yofs + h * 235.0f / 255.0f);
-		fdrawline(rect.xmin + 3 * w3, yofs + h * 235.0f / 255.0f, rect.xmax + 1, yofs + h * 235.0f / 255.0f);
-		fdrawline(rect.xmin + w3, yofs + h * 240.0f / 255.0f, rect.xmax + 1, yofs + h * 240.0f / 255.0f);
+		immBegin(GWN_PRIM_LINES, 8);
+
+		immVertex2f(pos, rect.xmin + 22, yofs + h * 16.0f / 255.0f);
+		immVertex2f(pos, rect.xmax + 1, yofs + h * 16.0f / 255.0f);
+
+		immVertex2f(pos, rect.xmin + 22, yofs + h * 235.0f / 255.0f);
+		immVertex2f(pos, rect.xmin + w3, yofs + h * 235.0f / 255.0f);
+
+		immVertex2f(pos, rect.xmin + 3 * w3, yofs + h * 235.0f / 255.0f);
+		immVertex2f(pos, rect.xmax + 1, yofs + h * 235.0f / 255.0f);
+
+		immVertex2f(pos, rect.xmin + w3, yofs + h * 240.0f / 255.0f);
+		immVertex2f(pos, rect.xmax + 1, yofs + h * 240.0f / 255.0f);
+
+		immEnd();
 	}
 	/* 7.5 IRE black point level for NTSC */
-	if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUMA)
-		fdrawline(rect.xmin, yofs + h * 0.075f, rect.xmax + 1, yofs + h * 0.075f);
+	if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUMA) {
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, rect.xmin, yofs + h * 0.075f);
+		immVertex2f(pos, rect.xmax + 1, yofs + h * 0.075f);
+		immEnd();
+	}
 
 	if (scopes->ok && scopes->waveform_1 != NULL) {
-
-		/* LUMA (1 channel) */
 		glBlendFunc(GL_ONE, GL_ONE);
-		glColor3f(alpha, alpha, alpha);
 		glPointSize(1.0);
 
+		/* LUMA (1 channel) */
 		if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUMA) {
+			float col[3] = {alpha, alpha, alpha};
 
-			glBlendFunc(GL_ONE, GL_ONE);
+			gpuPushMatrix();
+			gpuTranslate2f(rect.xmin, yofs);
+			gpuScale2f(w, h);
 
-			glPushMatrix();
-			glEnableClientState(GL_VERTEX_ARRAY);
+			waveform_draw_one(scopes->waveform_1, scopes->waveform_tot, col);
 
-			glTranslatef(rect.xmin, yofs, 0.f);
-			glScalef(w, h, 0.f);
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_1);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
-
-			glDisableClientState(GL_VERTEX_ARRAY);
-			glPopMatrix();
+			gpuPopMatrix();
 
 			/* min max */
-			glColor3f(0.5f, 0.5f, 0.5f);
+			immUniformColor3f(0.5f, 0.5f, 0.5f);
 			min = yofs + scopes->minmax[0][0] * h;
 			max = yofs + scopes->minmax[0][1] * h;
 			CLAMP(min, rect.ymin, rect.ymax);
 			CLAMP(max, rect.ymin, rect.ymax);
-			fdrawline(rect.xmax - 3, min, rect.xmax - 3, max);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, rect.xmax - 3, min);
+			immVertex2f(pos, rect.xmax - 3, max);
+			immEnd();
 		}
 		/* RGB (3 channel) */
 		else if (scopes->wavefrm_mode == SCOPES_WAVEFRM_RGB) {
-			glBlendFunc(GL_ONE, GL_ONE);
-
-			glEnableClientState(GL_VERTEX_ARRAY);
-
-			glPushMatrix();
+			gpuPushMatrix();
+			gpuTranslate2f(rect.xmin, yofs);
+			gpuScale2f(w, h);
 
-			glTranslatef(rect.xmin, yofs, 0.f);
-			glScalef(w, h, 0.f);
+			waveform_draw_one(scopes->waveform_1, scopes->waveform_tot, colors_alpha[0]);
+			waveform_draw_one(scopes->waveform_2, scopes->waveform_tot, colors_alpha[1]);
+			waveform_draw_one(scopes->waveform_3, scopes->waveform_tot, colors_alpha[2]);
 
-			glColor3fv( colors_alpha[0] );
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_1);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
-
-			glColor3fv( colors_alpha[1] );
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_2);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
-
-			glColor3fv( colors_alpha[2] );
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_3);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
-
-			glDisableClientState(GL_VERTEX_ARRAY);
-			glPopMatrix();
+			gpuPopMatrix();
 		}
 		/* PARADE / YCC (3 channels) */
 		else if (ELEM(scopes->wavefrm_mode,
@@ -770,49 +1058,47 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
 		{
 			int rgb = (scopes->wavefrm_mode == SCOPES_WAVEFRM_RGB_PARADE);
 
-			glBlendFunc(GL_ONE, GL_ONE);
-
-			glPushMatrix();
-			glEnableClientState(GL_VERTEX_ARRAY);
+			gpuPushMatrix();
+			gpuTranslate2f(rect.xmin, yofs);
+			gpuScale2f(w3, h);
 
-			glTranslatef(rect.xmin, yofs, 0.f);
-			glScalef(w3, h, 0.f);
+			waveform_draw_one(scopes->waveform_1, scopes->waveform_tot, (rgb) ? colors_alpha[0] : colorsycc_alpha[0]);
 
-			glColor3fv((rgb) ? colors_alpha[0] : colorsycc_alpha[0]);
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_1);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
+			gpuTranslate2f(1.0f, 0.0f);
+			waveform_draw_one(scopes->waveform_2, scopes->waveform_tot, (rgb) ? colors_alpha[1] : colorsycc_alpha[1]);
 
-			glTranslatef(1.f, 0.f, 0.f);
-			glColor3fv((rgb) ? colors_alpha[1] : colorsycc_alpha[1]);
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_2);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
+			gpuTranslate2f(1.0f, 0.0f);
+			waveform_draw_one(scopes->waveform_3, scopes->waveform_tot, (rgb) ? colors_alpha[2] : colorsycc_alpha[2]);
 
-			glTranslatef(1.f, 0.f, 0.f);
-			glColor3fv((rgb) ? colors_alpha[2] : colorsycc_alpha[2]);
-			glVertexPointer(2, GL_FLOAT, 0, scopes->waveform_3);
-			glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
-
-			glDisableClientState(GL_VERTEX_ARRAY);
-			glPopMatrix();
+			gpuPopMatrix();
 		}
+
 		/* min max */
 		if (scopes->wavefrm_mode != SCOPES_WAVEFRM_LUMA ) {
 			for (int c = 0; c < 3; c++) {
 				if (ELEM(scopes->wavefrm_mode, SCOPES_WAVEFRM_RGB_PARADE, SCOPES_WAVEFRM_RGB))
-					glColor3f(colors[c][0] * 0.75f, colors[c][1] * 0.75f, colors[c][2] * 0.75f);
+					immUniformColor3f(colors[c][0] * 0.75f, colors[c][1] * 0.75f, colors[c][2] * 0.75f);
 				else
-					glColor3f(colorsycc[c][0] * 0.75f, colorsycc[c][1] * 0.75f, colorsycc[c][2] * 0.75f);
+					immUniformColor3f(colorsycc[c][0] * 0.75f, colorsycc[c][1] * 0.75f, colorsycc[c][2] * 0.75f);
 				min = yofs + scopes->minmax[c][0] * h;
 				max = yofs + scopes->minmax[c][1] * h;
 				CLAMP(min, rect.ymin, rect.ymax);
 				CLAMP(max, rect.ymin, rect.ymax);
-				fdrawline(rect.xmin + w + 2 + c * 2, min, rect.xmin + w + 2 + c * 2, max);
+
+				immBegin(GWN_PRIM_LINES, 2);
+				immVertex2f(pos, rect.xmin + w + 2 + c * 2, min);
+				immVertex2f(pos, rect.xmin + w + 2 + c * 2, max);
+				immEnd();
 			}
 		}
 	}
 
+	immUnbindProgram();
+
 	/* outline */
 	draw_scope_end(&rect, scissor);
+
+	glDisable(GL_BLEND);
 }
 
 static float polar_to_x(float center, float diam, float ampli, float angle)
@@ -825,10 +1111,10 @@ static float polar_to_y(float center, float diam, float ampli, float angle)
 	return center + diam * ampli * sinf(angle);
 }
 
-static void vectorscope_draw_target(float centerx, float centery, float diam, const float colf[3])
+static void vectorscope_draw_target(unsigned int pos, float centerx, float centery, float diam, const float colf[3])
 {
 	float y, u, v;
-	float tangle = 0.f, tampli;
+	float tangle = 0.0f, tampli;
 	float dangle, dampli, dangle2, dampli2;
 
 	rgb_to_yuv(colf[0], colf[1], colf[2], &y, &u, &v, BLI_YUV_ITU_BT709);
@@ -840,44 +1126,44 @@ static void vectorscope_draw_target(float centerx, float centery, float diam, co
 	tampli = sqrtf(u * u + v * v);
 
 	/* small target vary by 2.5 degree and 2.5 IRE unit */
-	glColor4f(1.0f, 1.0f, 1.0, 0.12f);
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.12f);
 	dangle = DEG2RADF(2.5f);
 	dampli = 2.5f / 200.0f;
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle + dangle), polar_to_y(centery, diam, tampli + dampli, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle + dangle), polar_to_y(centery, diam, tampli - dampli, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle - dangle), polar_to_y(centery, diam, tampli - dampli, tangle - dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle - dangle), polar_to_y(centery, diam, tampli + dampli, tangle - dangle));
-	glEnd();
+	immBegin(GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle + dangle), polar_to_y(centery, diam, tampli + dampli, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle + dangle), polar_to_y(centery, diam, tampli - dampli, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle - dangle), polar_to_y(centery, diam, tampli - dampli, tangle - dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle - dangle), polar_to_y(centery, diam, tampli + dampli, tangle - dangle));
+	immEnd();
 	/* big target vary by 10 degree and 20% amplitude */
-	glColor4f(1.0f, 1.0f, 1.0, 0.12f);
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.12f);
 	dangle = DEG2RADF(10.0f);
 	dampli = 0.2f * tampli;
 	dangle2 = DEG2RADF(5.0f);
 	dampli2 = 0.5f * dampli;
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli - dampli2, tangle + dangle), polar_to_y(centery, diam, tampli + dampli - dampli2, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle + dangle), polar_to_y(centery, diam, tampli + dampli, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle + dangle - dangle2), polar_to_y(centery, diam, tampli + dampli, tangle + dangle - dangle2));
-	glEnd();
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli + dampli2, tangle + dangle), polar_to_y(centery, diam, tampli - dampli + dampli2, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle + dangle), polar_to_y(centery, diam, tampli - dampli, tangle + dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle + dangle - dangle2), polar_to_y(centery, diam, tampli - dampli, tangle + dangle - dangle2));
-	glEnd();
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli + dampli2, tangle - dangle), polar_to_y(centery, diam, tampli - dampli + dampli2, tangle - dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle - dangle), polar_to_y(centery, diam, tampli - dampli, tangle - dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli - dampli, tangle - dangle + dangle2), polar_to_y(centery, diam, tampli - dampli, tangle - dangle + dangle2));
-	glEnd();
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli - dampli2, tangle - dangle), polar_to_y(centery, diam, tampli + dampli - dampli2, tangle - dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle - dangle), polar_to_y(centery, diam, tampli + dampli, tangle - dangle));
-	glVertex2f(polar_to_x(centerx, diam, tampli + dampli, tangle - dangle + dangle2), polar_to_y(centery, diam, tampli + dampli, tangle - dangle + dangle2));
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli - dampli2, tangle + dangle), polar_to_y(centery, diam, tampli + dampli - dampli2, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle + dangle), polar_to_y(centery, diam, tampli + dampli, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle + dangle - dangle2), polar_to_y(centery, diam, tampli + dampli, tangle + dangle - dangle2));
+	immEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli + dampli2, tangle + dangle), polar_to_y(centery, diam, tampli - dampli + dampli2, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle + dangle), polar_to_y(centery, diam, tampli - dampli, tangle + dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle + dangle - dangle2), polar_to_y(centery, diam, tampli - dampli, tangle + dangle - dangle2));
+	immEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli + dampli2, tangle - dangle), polar_to_y(centery, diam, tampli - dampli + dampli2, tangle - dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle - dangle), polar_to_y(centery, diam, tampli - dampli, tangle - dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli - dampli, tangle - dangle + dangle2), polar_to_y(centery, diam, tampli - dampli, tangle - dangle + dangle2));
+	immEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli - dampli2, tangle - dangle), polar_to_y(centery, diam, tampli + dampli - dampli2, tangle - dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle - dangle), polar_to_y(centery, diam, tampli + dampli, tangle - dangle));
+	immVertex2f(pos, polar_to_x(centerx, diam, tampli + dampli, tangle - dangle + dangle2), polar_to_y(centery, diam, tampli + dampli, tangle - dangle + dangle2));
+	immEnd();
 }
 
-void ui_draw_but_VECTORSCOPE(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
+void ui_draw_but_VECTORSCOPE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
 {
 	const float skin_rad = DEG2RADF(123.0f); /* angle in radians of the skin tone line */
 	Scopes *scopes = (Scopes *)but->poin;
@@ -895,114 +1181,131 @@ void ui_draw_but_VECTORSCOPE(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wco
 
 	float w = BLI_rctf_size_x(&rect);
 	float h = BLI_rctf_size_y(&rect);
-	float centerx = rect.xmin + w / 2;
-	float centery = rect.ymin + h / 2;
+	float centerx = rect.xmin + w * 0.5f;
+	float centery = rect.ymin + h * 0.5f;
 	float diam = (w < h) ? w : h;
 
 	float alpha = scopes->vecscope_alpha * scopes->vecscope_alpha * scopes->vecscope_alpha;
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-	UI_ThemeColor4(TH_PREVIEW_BACK);
+	float color[4];
+	UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f);
+	UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 
 	/* need scissor test, hvectorscope can draw outside of boundary */
 	GLint scissor[4];
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin - 1),
-	          ar->winrct.ymin + (rect.ymin - 1),
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
+	glScissor((rect.xmin - 1),
+	          (rect.ymin - 1),
 	          (rect.xmax + 1) - (rect.xmin - 1),
 	          (rect.ymax + 1) - (rect.ymin - 1));
 
-	glColor4f(1.f, 1.f, 1.f, 0.08f);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.08f);
 	/* draw grid elements */
 	/* cross */
-	fdrawline(centerx - (diam / 2) - 5, centery, centerx + (diam / 2) + 5, centery);
-	fdrawline(centerx, centery - (diam / 2) - 5, centerx, centery + (diam / 2) + 5);
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, centerx - (diam * 0.5f) - 5, centery);
+	immVertex2f(pos, centerx + (diam * 0.5f) + 5, centery);
+
+	immVertex2f(pos, centerx, centery - (diam * 0.5f) - 5);
+	immVertex2f(pos, centerx, centery + (diam * 0.5f) + 5);
+
+	immEnd();
+
 	/* circles */
 	for (int j = 0; j < 5; j++) {
-		glBegin(GL_LINE_LOOP);
 		const int increment = 15;
+		immBegin(GWN_PRIM_LINE_LOOP, (int)(360 / increment));
 		for (int i = 0; i <= 360 - increment; i += increment) {
 			const float a = DEG2RADF((float)i);
-			const float r = (j + 1) / 10.0f;
-			glVertex2f(polar_to_x(centerx, diam, r, a), polar_to_y(centery, diam, r, a));
+			const float r = (j + 1) * 0.1f;
+			immVertex2f(pos, polar_to_x(centerx, diam, r, a), polar_to_y(centery, diam, r, a));
 		}
-		glEnd();
+		immEnd();
 	}
 	/* skin tone line */
-	glColor4f(1.f, 0.4f, 0.f, 0.2f);
-	fdrawline(polar_to_x(centerx, diam, 0.5f, skin_rad), polar_to_y(centery, diam, 0.5, skin_rad),
-	          polar_to_x(centerx, diam, 0.1f, skin_rad), polar_to_y(centery, diam, 0.1, skin_rad));
+	immUniformColor4f(1.0f, 0.4f, 0.0f, 0.2f);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(pos, polar_to_x(centerx, diam, 0.5f, skin_rad), polar_to_y(centery, diam, 0.5f, skin_rad));
+	immVertex2f(pos, polar_to_x(centerx, diam, 0.1f, skin_rad), polar_to_y(centery, diam, 0.1f, skin_rad));
+	immEnd();
+
 	/* saturation points */
 	for (int i = 0; i < 6; i++)
-		vectorscope_draw_target(centerx, centery, diam, colors[i]);
+		vectorscope_draw_target(pos, centerx, centery, diam, colors[i]);
 
 	if (scopes->ok && scopes->vecscope != NULL) {
 		/* pixel point cloud */
-		glBlendFunc(GL_ONE, GL_ONE);
-		glColor3f(alpha, alpha, alpha);
+		float col[3] = {alpha, alpha, alpha};
 
-		glPushMatrix();
-		glEnableClientState(GL_VERTEX_ARRAY);
+		glBlendFunc(GL_ONE, GL_ONE);
+		glPointSize(1.0);
 
-		glTranslatef(centerx, centery, 0.f);
-		glScalef(diam, diam, 0.f);
+		gpuPushMatrix();
+		gpuTranslate2f(centerx, centery);
+		gpuScaleUniform(diam);
 
-		glVertexPointer(2, GL_FLOAT, 0, scopes->vecscope);
-		glPointSize(1.0);
-		glDrawArrays(GL_POINTS, 0, scopes->waveform_tot);
+		waveform_draw_one(scopes->vecscope, scopes->waveform_tot, col);
 
-		glDisableClientState(GL_VERTEX_ARRAY);
-		glPopMatrix();
+		gpuPopMatrix();
 	}
 
+	immUnbindProgram();
+
 	/* outline */
 	draw_scope_end(&rect, scissor);
 
 	glDisable(GL_BLEND);
 }
 
-static void ui_draw_colorband_handle_tri_hlight(float x1, float y1, float halfwidth, float height)
+static void ui_draw_colorband_handle_tri_hlight(unsigned int pos, float x1, float y1, float halfwidth, float height)
 {
 	glEnable(GL_LINE_SMOOTH);
 
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(x1 + halfwidth, y1);
-	glVertex2f(x1, y1 + height);
-	glVertex2f(x1 - halfwidth, y1);
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, x1 + halfwidth, y1);
+	immVertex2f(pos, x1, y1 + height);
+	immVertex2f(pos, x1 - halfwidth, y1);
+	immEnd();
 
 	glDisable(GL_LINE_SMOOTH);
 }
 
-static void ui_draw_colorband_handle_tri(float x1, float y1, float halfwidth, float height, bool fill)
+static void ui_draw_colorband_handle_tri(unsigned int pos, float x1, float y1, float halfwidth, float height, bool fill)
 {
 	glEnable(fill ? GL_POLYGON_SMOOTH : GL_LINE_SMOOTH);
 
-	glBegin(fill ? GL_TRIANGLES : GL_LINE_LOOP);
-	glVertex2f(x1 + halfwidth, y1);
-	glVertex2f(x1, y1 + height);
-	glVertex2f(x1 - halfwidth, y1);
-	glEnd();
+	immBegin(fill ? GWN_PRIM_TRIS : GWN_PRIM_LINE_LOOP, 3);
+	immVertex2f(pos, x1 + halfwidth, y1);
+	immVertex2f(pos, x1, y1 + height);
+	immVertex2f(pos, x1 - halfwidth, y1);
+	immEnd();
 
 	glDisable(fill ? GL_POLYGON_SMOOTH : GL_LINE_SMOOTH);
 }
 
-static void ui_draw_colorband_handle_box(float x1, float y1, float x2, float y2, bool fill)
+static void ui_draw_colorband_handle_box(unsigned int pos, float x1, float y1, float x2, float y2, bool fill)
 {
-	glBegin(fill ? GL_QUADS : GL_LINE_LOOP);
-	glVertex2f(x1, y1);
-	glVertex2f(x1, y2);
-	glVertex2f(x2, y2);
-	glVertex2f(x2, y1);
-	glEnd();
+	immBegin(fill ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x1, y2);
+	immVertex2f(pos, x2, y2);
+	immVertex2f(pos, x2, y1);
+	immEnd();
 }
 
 static void ui_draw_colorband_handle(
-        const rcti *rect, float x,
+        uint shdr_pos, const rcti *rect, float x,
         const float rgb[3], struct ColorManagedDisplay *display,
         bool active)
 {
@@ -1021,18 +1324,26 @@ static void ui_draw_colorband_handle(
 	y1 = floorf(y1 + 0.5f);
 
 	if (active || half_width < min_width) {
-		glBegin(GL_LINES);
-		glColor3ub(0, 0, 0);
-		glVertex2f(x, y1);
-		glVertex2f(x, y2);
-		glEnd();
-		setlinestyle(active ? 2 : 1);
-		glBegin(GL_LINES);
-		glColor3ub(200, 200, 200);
-		glVertex2f(x, y1);
-		glVertex2f(x, y2);
-		glEnd();
-		setlinestyle(0);
+		immUnbindProgram();
+
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+		immUniform1i("num_colors", 2);  /* "advanced" mode */
+		immUniformArray4fv("colors", (float *)(float[][4]){{0.8f, 0.8f, 0.8f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, 2);
+		immUniform1f("dash_width", active ? 4.0f : 2.0f);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(shdr_pos, x, y1);
+		immVertex2f(shdr_pos, x, y2);
+		immEnd();
+
+		immUnbindProgram();
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 		/* hide handles when zoomed out too far */
 		if (half_width < min_width) {
@@ -1043,45 +1354,46 @@ static void ui_draw_colorband_handle(
 	/* shift handle down */
 	y1 -= half_width;
 
-	glColor3ub(0, 0, 0);
-	ui_draw_colorband_handle_box(x - half_width, y1 - 1, x + half_width, y1 + height, false);
+	immUniformColor3ub(0, 0, 0);
+	ui_draw_colorband_handle_box(shdr_pos, x - half_width, y1 - 1, x + half_width, y1 + height, false);
 
 	/* draw all triangles blended */
 	glEnable(GL_BLEND);
 
-	ui_draw_colorband_handle_tri(x, y1 + height, half_width, half_width, true);
+	ui_draw_colorband_handle_tri(shdr_pos, x, y1 + height, half_width, half_width, true);
 
 	if (active)
-		glColor3ub(196, 196, 196);
+		immUniformColor3ub(196, 196, 196);
 	else
-		glColor3ub(96, 96, 96);
-	ui_draw_colorband_handle_tri(x, y1 + height, half_width, half_width, true);
+		immUniformColor3ub(96, 96, 96);
+	ui_draw_colorband_handle_tri(shdr_pos, x, y1 + height, half_width, half_width, true);
 
 	if (active)
-		glColor3ub(255, 255, 255);
+		immUniformColor3ub(255, 255, 255);
 	else
-		glColor3ub(128, 128, 128);
-	ui_draw_colorband_handle_tri_hlight(x, y1 + height - 1, (half_width - 1), (half_width - 1));
+		immUniformColor3ub(128, 128, 128);
+	ui_draw_colorband_handle_tri_hlight(shdr_pos, x, y1 + height - 1, (half_width - 1), (half_width - 1));
 
-	glColor3ub(0, 0, 0);
-	ui_draw_colorband_handle_tri_hlight(x, y1 + height, half_width, half_width);
+	immUniformColor3ub(0, 0, 0);
+	ui_draw_colorband_handle_tri_hlight(shdr_pos, x, y1 + height, half_width, half_width);
 
 	glDisable(GL_BLEND);
 
-	glColor3ub(128, 128, 128);
-	ui_draw_colorband_handle_box(x - (half_width - 1), y1, x + (half_width - 1), y1 + height, true);
+	immUniformColor3ub(128, 128, 128);
+	ui_draw_colorband_handle_box(shdr_pos, x - (half_width - 1), y1, x + (half_width - 1), y1 + height, true);
 
 	if (display) {
 		IMB_colormanagement_scene_linear_to_display_v3(colf, display);
 	}
 
-	glColor3fv(colf);
-	ui_draw_colorband_handle_box(x - (half_width - 2), y1 + 1, x + (half_width - 2), y1 + height - 2, true);
+	immUniformColor3fv(colf);
+	ui_draw_colorband_handle_box(shdr_pos, x - (half_width - 2), y1 + 1, x + (half_width - 2), y1 + height - 2, true);
 }
 
 void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *rect)
 {
 	struct ColorManagedDisplay *display = NULL;
+	unsigned int position, color;
 
 	ColorBand *coba = (ColorBand *)(but->editcoba ? but->editcoba : but->poin);
 	if (coba == NULL) return;
@@ -1092,20 +1404,25 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 	float x1 = rect->xmin;
 	float sizex = rect->xmax - x1;
 	float sizey = BLI_rcti_size_y(rect);
-	float sizey_solid = sizey / 4;
+	float sizey_solid = sizey * 0.25f;
 	float y1 = rect->ymin;
 
-	/* Drawing the checkerboard.
-	 * This could be optimized with a single checkerboard shader,
-	 * instead of drawing twice and using stippling the second time. */
-	/* layer: background, to show tranparency */
-	glColor4ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, 255);
-	glRectf(x1, y1, x1 + sizex, rect->ymax);
-	GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-	glColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
-	GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_CHECKER_8PX);
-	glRectf(x1, y1, x1 + sizex, rect->ymax);
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+	Gwn_VertFormat *format = immVertexFormat();
+	position = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_CHECKER);
+
+	/* Drawing the checkerboard. */
+	immUniform4f("color1", UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_DARK / 255.0f, 1.0f);
+	immUniform4f("color2", UI_ALPHA_CHECKER_LIGHT / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 1.0f);
+	immUniform1i("size", 8);
+	immRectf(position, x1, y1, x1 + sizex, rect->ymax);
+	immUnbindProgram();
+
+	/* New format */
+	format = immVertexFormat();
+	position = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
 
 	/* layer: color ramp */
 	glEnable(GL_BLEND);
@@ -1118,7 +1435,7 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 	v1[1] = y1 + sizey_solid;
 	v2[1] = rect->ymax;
 
-	glBegin(GL_TRIANGLE_STRIP);
+	immBegin(GWN_PRIM_TRI_STRIP, (sizex + 1) * 2);
 	for (int a = 0; a <= sizex; a++) {
 		float pos = ((float)a) / sizex;
 		BKE_colorband_evaluate(coba, pos, colf);
@@ -1127,17 +1444,17 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 
 		v1[0] = v2[0] = x1 + a;
 
-		glColor4fv(colf);
-		glVertex2fv(v1);
-		glVertex2fv(v2);
+		immAttrib4fv(color, colf);
+		immVertex2fv(position, v1);
+		immVertex2fv(position, v2);
 	}
-	glEnd();
+	immEnd();
 
 	/* layer: color ramp without alpha for reference when manipulating ramp properties */
 	v1[1] = y1;
 	v2[1] = y1 + sizey_solid;
 
-	glBegin(GL_TRIANGLE_STRIP);
+	immBegin(GWN_PRIM_TRI_STRIP, (sizex + 1) * 2);
 	for (int a = 0; a <= sizex; a++) {
 		float pos = ((float)a) / sizex;
 		BKE_colorband_evaluate(coba, pos, colf);
@@ -1146,31 +1463,48 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 
 		v1[0] = v2[0] = x1 + a;
 
-		glColor4f(colf[0], colf[1], colf[2], 1.0f);
-		glVertex2fv(v1);
-		glVertex2fv(v2);
+		immAttrib4f(color, colf[0], colf[1], colf[2], 1.0f);
+		immVertex2fv(position, v1);
+		immVertex2fv(position, v2);
 	}
-	glEnd();
+	immEnd();
+
+	immUnbindProgram();
 
 	glDisable(GL_BLEND);
 
+	/* New format */
+	format = immVertexFormat();
+	position = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* layer: box outline */
-	glColor4f(0.0, 0.0, 0.0, 1.0);
-	fdrawbox(x1, y1, x1 + sizex, rect->ymax);
+	immUniformColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+	imm_draw_box_wire_2d(position, x1, y1, x1 + sizex, rect->ymax);
 
 	/* layer: box outline */
 	glEnable(GL_BLEND);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
-	fdrawline(x1, y1, x1 + sizex, y1);
-	glColor4f(1.0f, 1.0f, 1.0f, 0.25f);
-	fdrawline(x1, y1 - 1, x1 + sizex, y1 - 1);
+	immUniformColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(position, x1, y1);
+	immVertex2f(position, x1 + sizex, y1);
+	immEnd();
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.25f);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(position, x1, y1 - 1);
+	immVertex2f(position, x1 + sizex, y1 - 1);
+	immEnd();
+
 	glDisable(GL_BLEND);
 
 	/* layer: draw handles */
 	for (int a = 0; a < coba->tot; a++, cbd++) {
 		if (a != coba->cur) {
 			float pos = x1 + cbd->pos * (sizex - 1) + 1;
-			ui_draw_colorband_handle(rect, pos, &cbd->r, display, false);
+			ui_draw_colorband_handle(position, rect, pos, &cbd->r, display, false);
 		}
 	}
 
@@ -1178,117 +1512,100 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti
 	if (coba->tot != 0) {
 		cbd = &coba->data[coba->cur];
 		float pos = x1 + cbd->pos * (sizex - 1) + 1;
-		ui_draw_colorband_handle(rect, pos, &cbd->r, display, true);
+		ui_draw_colorband_handle(position, rect, pos, &cbd->r, display, true);
 	}
+
+	immUnbindProgram();
 }
 
 void ui_draw_but_UNITVEC(uiBut *but, uiWidgetColors *wcol, const rcti *rect)
 {
-	static GLuint displist = 0;
+	/* sphere color */
 	float diffuse[3] = {1.0f, 1.0f, 1.0f};
+	float light[3];
 	float size;
 
 	/* backdrop */
-	glColor3ubv((unsigned char *)wcol->inner);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f);
+	UI_draw_roundbox_3ubAlpha(true, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f, (unsigned char *)wcol->inner, 255);
 
-	/* sphere color */
 	glCullFace(GL_BACK);
 	glEnable(GL_CULL_FACE);
 
 	/* setup lights */
-	GPULightData light = {0};
-	light.type = GPU_LIGHT_SUN;
-	copy_v3_v3(light.diffuse, diffuse);
-	zero_v3(light.specular);
-	ui_but_v3_get(but, light.direction);
-
-	GPU_basic_shader_light_set(0, &light);
-	for (int a = 1; a < 8; a++)
-		GPU_basic_shader_light_set(a, NULL);
-
-	/* setup shader */
-	GPU_basic_shader_colors(diffuse, NULL, 0, 1.0f);
-	GPU_basic_shader_bind(GPU_SHADER_LIGHTING);
+	ui_but_v3_get(but, light);
 
 	/* transform to button */
-	glPushMatrix();
-	glTranslatef(rect->xmin + 0.5f * BLI_rcti_size_x(rect), rect->ymin + 0.5f * BLI_rcti_size_y(rect), 0.0f);
+	gpuPushMatrix();
 
 	if (BLI_rcti_size_x(rect) < BLI_rcti_size_y(rect))
-		size = BLI_rcti_size_x(rect) / 200.f;
+		size = 0.5f * BLI_rcti_size_x(rect);
 	else
-		size = BLI_rcti_size_y(rect) / 200.f;
+		size = 0.5f * BLI_rcti_size_y(rect);
 
-	glScalef(size, size, MIN2(size, 1.0f));
+	gpuTranslate2f(rect->xmin + 0.5f * BLI_rcti_size_x(rect), rect->ymin + 0.5f * BLI_rcti_size_y(rect));
+	gpuScaleUniform(size);
 
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-		GPU_basic_shader_bind(GPU_basic_shader_bound_options());
-		gluSphere(qobj, 100.0, 32, 24);
-		gluDeleteQuadric(qobj);
-
-		glEndList();
-	}
-
-	glCallList(displist);
+	Gwn_Batch *sphere = GPU_batch_preset_sphere(2);
+	GWN_batch_program_set_builtin(sphere, GPU_SHADER_SIMPLE_LIGHTING);
+	GWN_batch_uniform_4f(sphere, "color", diffuse[0], diffuse[1], diffuse[2], 1.0f);
+	GWN_batch_uniform_3fv(sphere, "light", light);
+	GWN_batch_draw(sphere);
 
 	/* restore */
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	GPU_default_lights();
 	glDisable(GL_CULL_FACE);
 
 	/* AA circle */
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3ubv((unsigned char *)wcol->inner);
+
 	glEnable(GL_BLEND);
 	glEnable(GL_LINE_SMOOTH);
-	glColor3ubv((unsigned char *)wcol->inner);
-	glutil_draw_lined_arc(0.0f, M_PI * 2.0, 100.0f, 32);
+	imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, 1.0f, 32);
 	glDisable(GL_BLEND);
 	glDisable(GL_LINE_SMOOTH);
 
 	/* matrix after circle */
-	glPopMatrix();
+	gpuPopMatrix();
 
-	/* We disabled all blender lights above, so restore them here. */
-	GPU_default_lights();
+	immUnbindProgram();
 }
 
-static void ui_draw_but_curve_grid(const rcti *rect, float zoomx, float zoomy, float offsx, float offsy, float step)
+static void ui_draw_but_curve_grid(unsigned int pos, const rcti *rect, float zoomx, float zoomy, float offsx, float offsy, float step)
 {
-	glBegin(GL_LINES);
 	float dx = step * zoomx;
 	float fx = rect->xmin + zoomx * (-offsx);
 	if (fx > rect->xmin) fx -= dx * (floorf(fx - rect->xmin));
-	while (fx < rect->xmax) {
-		glVertex2f(fx, rect->ymin);
-		glVertex2f(fx, rect->ymax);
-		fx += dx;
-	}
 
 	float dy = step * zoomy;
 	float fy = rect->ymin + zoomy * (-offsy);
 	if (fy > rect->ymin) fy -= dy * (floorf(fy - rect->ymin));
+
+	float line_count = floorf((rect->xmax - fx) / dx) + 1.0f +
+	                   floorf((rect->ymax - fy) / dy) + 1.0f;
+
+	immBegin(GWN_PRIM_LINES, (int)line_count * 2);
+	while (fx < rect->xmax) {
+		immVertex2f(pos, fx, rect->ymin);
+		immVertex2f(pos, fx, rect->ymax);
+		fx += dx;
+	}
 	while (fy < rect->ymax) {
-		glVertex2f(rect->xmin, fy);
-		glVertex2f(rect->xmax, fy);
+		immVertex2f(pos, rect->xmin, fy);
+		immVertex2f(pos, rect->xmax, fy);
 		fy += dy;
 	}
-	glEnd();
+	immEnd();
 
 }
 
 static void gl_shaded_color(unsigned char *col, int shade)
 {
-	glColor3ub(col[0] - shade > 0 ? col[0] - shade : 0,
-	           col[1] - shade > 0 ? col[1] - shade : 0,
-	           col[2] - shade > 0 ? col[2] - shade : 0);
+	immUniformColor3ub(col[0] - shade > 0 ? col[0] - shade : 0,
+	                   col[1] - shade > 0 ? col[1] - shade : 0,
+	                   col[2] - shade > 0 ? col[2] - shade : 0);
 }
 
 void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti *rect)
@@ -1306,14 +1623,15 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 
 	/* need scissor test, curve can draw outside of boundary */
 	GLint scissor[4];
-	glGetIntegerv(GL_VIEWPORT, scissor);
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
 	rcti scissor_new = {
-		.xmin = ar->winrct.xmin + rect->xmin,
-		.ymin = ar->winrct.ymin + rect->ymin,
-		.xmax = ar->winrct.xmin + rect->xmax,
-		.ymax = ar->winrct.ymin + rect->ymax
+		.xmin = rect->xmin,
+		.ymin = rect->ymin,
+		.xmax = rect->xmax,
+		.ymax = rect->ymax
 	};
-	BLI_rcti_isect(&scissor_new, &ar->winrct, &scissor_new);
+	rcti scissor_region = {0, ar->winx, 0, ar->winy};
+	BLI_rcti_isect(&scissor_new, &scissor_region, &scissor_new);
 	glScissor(scissor_new.xmin,
 	          scissor_new.ymin,
 	          BLI_rcti_size_x(&scissor_new),
@@ -1325,9 +1643,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 	float offsx = cumap->curr.xmin - (1.0f / zoomx);
 	float offsy = cumap->curr.ymin - (1.0f / zoomy);
 
-	glLineWidth(1.0f);
-
-	/* backdrop */
+	/* Do this first to not mess imm context */
 	if (but->a1 == UI_GRAD_H) {
 		/* magic trigger for curve backgrounds */
 		float col[3] = {0.0f, 0.0f, 0.0f}; /* dummy arg */
@@ -1340,96 +1656,105 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 		};
 
 		ui_draw_gradient(&grid, col, UI_GRAD_H, 1.0f);
+	}
+
+	glLineWidth(1.0f);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
+	/* backdrop */
+	if (but->a1 == UI_GRAD_H) {
 		/* grid, hsv uses different grid */
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glColor4ub(0, 0, 0, 48);
-		ui_draw_but_curve_grid(rect, zoomx, zoomy, offsx, offsy, 0.1666666f);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		immUniformColor4ub(0, 0, 0, 48);
+		ui_draw_but_curve_grid(pos, rect, zoomx, zoomy, offsx, offsy, 0.1666666f);
 		glDisable(GL_BLEND);
 	}
 	else {
 		if (cumap->flag & CUMA_DO_CLIP) {
 			gl_shaded_color((unsigned char *)wcol->inner, -20);
-			glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
-			glColor3ubv((unsigned char *)wcol->inner);
-			glRectf(rect->xmin + zoomx * (cumap->clipr.xmin - offsx),
-			        rect->ymin + zoomy * (cumap->clipr.ymin - offsy),
-			        rect->xmin + zoomx * (cumap->clipr.xmax - offsx),
-			        rect->ymin + zoomy * (cumap->clipr.ymax - offsy));
+			immRectf(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+			immUniformColor3ubv((unsigned char *)wcol->inner);
+			immRectf(pos, rect->xmin + zoomx * (cumap->clipr.xmin - offsx),
+			              rect->ymin + zoomy * (cumap->clipr.ymin - offsy),
+			              rect->xmin + zoomx * (cumap->clipr.xmax - offsx),
+			              rect->ymin + zoomy * (cumap->clipr.ymax - offsy));
 		}
 		else {
-			glColor3ubv((unsigned char *)wcol->inner);
-			glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+			immUniformColor3ubv((unsigned char *)wcol->inner);
+			immRectf(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 		}
 
 		/* grid, every 0.25 step */
 		gl_shaded_color((unsigned char *)wcol->inner, -16);
-		ui_draw_but_curve_grid(rect, zoomx, zoomy, offsx, offsy, 0.25f);
+		ui_draw_but_curve_grid(pos, rect, zoomx, zoomy, offsx, offsy, 0.25f);
 		/* grid, every 1.0 step */
 		gl_shaded_color((unsigned char *)wcol->inner, -24);
-		ui_draw_but_curve_grid(rect, zoomx, zoomy, offsx, offsy, 1.0f);
+		ui_draw_but_curve_grid(pos, rect, zoomx, zoomy, offsx, offsy, 1.0f);
 		/* axes */
 		gl_shaded_color((unsigned char *)wcol->inner, -50);
-		glBegin(GL_LINES);
-		glVertex2f(rect->xmin, rect->ymin + zoomy * (-offsy));
-		glVertex2f(rect->xmax, rect->ymin + zoomy * (-offsy));
-		glVertex2f(rect->xmin + zoomx * (-offsx), rect->ymin);
-		glVertex2f(rect->xmin + zoomx * (-offsx), rect->ymax);
-		glEnd();
+		immBegin(GWN_PRIM_LINES, 4);
+		immVertex2f(pos, rect->xmin, rect->ymin + zoomy * (-offsy));
+		immVertex2f(pos, rect->xmax, rect->ymin + zoomy * (-offsy));
+		immVertex2f(pos, rect->xmin + zoomx * (-offsx), rect->ymin);
+		immVertex2f(pos, rect->xmin + zoomx * (-offsx), rect->ymax);
+		immEnd();
 	}
 
 	/* cfra option */
 	/* XXX 2.48 */
 #if 0
 	if (cumap->flag & CUMA_DRAW_CFRA) {
-		glColor3ub(0x60, 0xc0, 0x40);
-		glBegin(GL_LINES);
-		glVertex2f(rect->xmin + zoomx * (cumap->sample[0] - offsx), rect->ymin);
-		glVertex2f(rect->xmin + zoomx * (cumap->sample[0] - offsx), rect->ymax);
-		glEnd();
+		immUniformColor3ub(0x60, 0xc0, 0x40);
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, rect->xmin + zoomx * (cumap->sample[0] - offsx), rect->ymin);
+		immVertex2f(pos, rect->xmin + zoomx * (cumap->sample[0] - offsx), rect->ymax);
+		immEnd();
 	}
 #endif
 	/* sample option */
 
 	if (cumap->flag & CUMA_DRAW_SAMPLE) {
-		glBegin(GL_LINES); /* will draw one of the following 3 lines */
+		immBegin(GWN_PRIM_LINES, 2); /* will draw one of the following 3 lines */
 		if (but->a1 == UI_GRAD_H) {
 			float tsample[3];
 			float hsv[3];
 			linearrgb_to_srgb_v3_v3(tsample, cumap->sample);
 			rgb_to_hsv_v(tsample, hsv);
-			glColor3ub(240, 240, 240);
+			immUniformColor3ub(240, 240, 240);
 
-			glVertex2f(rect->xmin + zoomx * (hsv[0] - offsx), rect->ymin);
-			glVertex2f(rect->xmin + zoomx * (hsv[0] - offsx), rect->ymax);
+			immVertex2f(pos, rect->xmin + zoomx * (hsv[0] - offsx), rect->ymin);
+			immVertex2f(pos, rect->xmin + zoomx * (hsv[0] - offsx), rect->ymax);
 		}
 		else if (cumap->cur == 3) {
 			float lum = IMB_colormanagement_get_luminance(cumap->sample);
-			glColor3ub(240, 240, 240);
+			immUniformColor3ub(240, 240, 240);
 
-			glVertex2f(rect->xmin + zoomx * (lum - offsx), rect->ymin);
-			glVertex2f(rect->xmin + zoomx * (lum - offsx), rect->ymax);
+			immVertex2f(pos, rect->xmin + zoomx * (lum - offsx), rect->ymin);
+			immVertex2f(pos, rect->xmin + zoomx * (lum - offsx), rect->ymax);
 		}
 		else {
 			if (cumap->cur == 0)
-				glColor3ub(240, 100, 100);
+				immUniformColor3ub(240, 100, 100);
 			else if (cumap->cur == 1)
-				glColor3ub(100, 240, 100);
+				immUniformColor3ub(100, 240, 100);
 			else
-				glColor3ub(100, 100, 240);
+				immUniformColor3ub(100, 100, 240);
 
-			glVertex2f(rect->xmin + zoomx * (cumap->sample[cumap->cur] - offsx), rect->ymin);
-			glVertex2f(rect->xmin + zoomx * (cumap->sample[cumap->cur] - offsx), rect->ymax);
+			immVertex2f(pos, rect->xmin + zoomx * (cumap->sample[cumap->cur] - offsx), rect->ymin);
+			immVertex2f(pos, rect->xmin + zoomx * (cumap->sample[cumap->cur] - offsx), rect->ymax);
 		}
-		glEnd();
+		immEnd();
 	}
 
 	/* the curve */
-	glColor3ubv((unsigned char *)wcol->item);
+	immUniformColor3ubv((unsigned char *)wcol->item);
 	glEnable(GL_LINE_SMOOTH);
 	glEnable(GL_BLEND);
-	glBegin(GL_LINE_STRIP);
+	immBegin(GWN_PRIM_LINE_STRIP, (CM_TABLE + 1) + 2);
 
 	if (cuma->table == NULL)
 		curvemapping_changed(cumap, false);
@@ -1438,55 +1763,70 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 
 	/* first point */
 	if ((cuma->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) {
-		glVertex2f(rect->xmin, rect->ymin + zoomy * (cmp[0].y - offsy));
+		immVertex2f(pos, rect->xmin, rect->ymin + zoomy * (cmp[0].y - offsy));
 	}
 	else {
 		float fx = rect->xmin + zoomx * (cmp[0].x - offsx + cuma->ext_in[0]);
 		float fy = rect->ymin + zoomy * (cmp[0].y - offsy + cuma->ext_in[1]);
-		glVertex2f(fx, fy);
+		immVertex2f(pos, fx, fy);
 	}
 	for (int a = 0; a <= CM_TABLE; a++) {
 		float fx = rect->xmin + zoomx * (cmp[a].x - offsx);
 		float fy = rect->ymin + zoomy * (cmp[a].y - offsy);
-		glVertex2f(fx, fy);
+		immVertex2f(pos, fx, fy);
 	}
 	/* last point */
 	if ((cuma->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) {
-		glVertex2f(rect->xmax, rect->ymin + zoomy * (cmp[CM_TABLE].y - offsy));
+		immVertex2f(pos, rect->xmax, rect->ymin + zoomy * (cmp[CM_TABLE].y - offsy));
 	}
 	else {
 		float fx = rect->xmin + zoomx * (cmp[CM_TABLE].x - offsx - cuma->ext_out[0]);
 		float fy = rect->ymin + zoomy * (cmp[CM_TABLE].y - offsy - cuma->ext_out[1]);
-		glVertex2f(fx, fy);
+		immVertex2f(pos, fx, fy);
 	}
-	glEnd();
+	immEnd();
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
+	immUnbindProgram();
 
 	/* the points, use aspect to make them visible on edges */
+	format = immVertexFormat();
+	pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
 	cmp = cuma->curve;
 	glPointSize(3.0f);
-	glBegin(GL_POINTS);
+	immBegin(GWN_PRIM_POINTS, cuma->totpoint);
 	for (int a = 0; a < cuma->totpoint; a++) {
+		float color[4];
 		if (cmp[a].flag & CUMA_SELECT)
-			UI_ThemeColor(TH_TEXT_HI);
+			UI_GetThemeColor4fv(TH_TEXT_HI, color);
 		else
-			UI_ThemeColor(TH_TEXT);
+			UI_GetThemeColor4fv(TH_TEXT, color);
 		float fx = rect->xmin + zoomx * (cmp[a].x - offsx);
 		float fy = rect->ymin + zoomy * (cmp[a].y - offsy);
-		glVertex2f(fx, fy);
+		immAttrib4fv(col, color);
+		immVertex2f(pos, fx, fy);
 	}
-	glEnd();
+	immEnd();
+	immUnbindProgram();
 
 	/* restore scissortest */
 	glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
 
 	/* outline */
-	glColor3ubv((unsigned char *)wcol->outline);
-	fdrawbox(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+	format = immVertexFormat();
+	pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor3ubv((unsigned char *)wcol->outline);
+	imm_draw_box_wire_2d(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+
+	immUnbindProgram();
 }
 
-void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
+void ui_draw_but_TRACKPREVIEW(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti *recti)
 {
 	bool ok = false;
 	MovieClipScopes *scopes = (MovieClipScopes *)but->poin;
@@ -1502,20 +1842,20 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 	int height = BLI_rctf_size_y(&rect);
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* need scissor test, preview image can draw outside of boundary */
 	GLint scissor[4];
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin - 1),
-	          ar->winrct.ymin + (rect.ymin - 1),
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
+	glScissor((rect.xmin - 1),
+	          (rect.ymin - 1),
 	          (rect.xmax + 1) - (rect.xmin - 1),
 	          (rect.ymax + 1) - (rect.ymin - 1));
 
 	if (scopes->track_disabled) {
-		glColor4f(0.7f, 0.3f, 0.3f, 0.3f);
+		float color[4] = {0.7f, 0.3f, 0.3f, 0.3f};
 		UI_draw_roundbox_corner_set(UI_CNR_ALL);
-		UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
+		UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 
 		ok = true;
 	}
@@ -1542,62 +1882,72 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 	}
 
 	if (!ok && scopes->track_preview) {
-		glPushMatrix();
+		gpuPushMatrix();
 
 		/* draw content of pattern area */
-		glScissor(ar->winrct.xmin + rect.xmin, ar->winrct.ymin + rect.ymin, scissor[2], scissor[3]);
+		glScissor(rect.xmin, rect.ymin, scissor[2], scissor[3]);
 
 		if (width > 0 && height > 0) {
 			ImBuf *drawibuf = scopes->track_preview;
+			float col_sel[4], col_outline[4];
 
 			if (scopes->use_track_mask) {
-				glColor4f(0.0f, 0.0f, 0.0f, 0.3f);
+				float color[4] = {0.0f, 0.0f, 0.0f, 0.3f};
 				UI_draw_roundbox_corner_set(UI_CNR_ALL);
-				UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
+				UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 			}
 
-			glaDrawPixelsSafe(rect.xmin, rect.ymin + 1, drawibuf->x, drawibuf->y,
-			                  drawibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, drawibuf->rect);
+			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+			immDrawPixelsTex(&state, rect.xmin, rect.ymin + 1, drawibuf->x, drawibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, drawibuf->rect, 1.0f, 1.0f, NULL);
 
 			/* draw cross for pixel position */
-			glTranslatef(rect.xmin + scopes->track_pos[0], rect.ymin + scopes->track_pos[1], 0.f);
-			glScissor(ar->winrct.xmin + rect.xmin,
-			          ar->winrct.ymin + rect.ymin,
+			gpuTranslate2f(rect.xmin + scopes->track_pos[0], rect.ymin + scopes->track_pos[1]);
+			glScissor(rect.xmin,
+			          rect.ymin,
 			          BLI_rctf_size_x(&rect),
 			          BLI_rctf_size_y(&rect));
 
-			GPU_basic_shader_bind_enable(GPU_SHADER_LINE);
-
-			for (int a = 0; a < 2; a++) {
-				if (a == 1) {
-					GPU_basic_shader_bind_enable(GPU_SHADER_STIPPLE);
-					GPU_basic_shader_line_stipple(3, 0xAAAA);
-					UI_ThemeColor(TH_SEL_MARKER);
-				}
-				else {
-					UI_ThemeColor(TH_MARKER_OUTLINE);
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+			UI_GetThemeColor4fv(TH_SEL_MARKER, col_sel);
+			UI_GetThemeColor4fv(TH_MARKER_OUTLINE, col_outline);
+
+			/* Do stipple cross with geometry */
+			immBegin(GWN_PRIM_LINES, 7 * 2 * 2);
+			float pos_sel[8] = {-10.0f, -7.0f, -4.0f, -1.0f, 2.0f, 5.0f, 8.0f, 11.0f};
+			for (int axe = 0; axe < 2; ++axe) {
+				for (int i = 0; i < 7; ++i) {
+					float x1 = pos_sel[i] * (1 - axe);
+					float y1 = pos_sel[i] * axe;
+					float x2 = pos_sel[i + 1] * (1 - axe);
+					float y2 = pos_sel[i + 1] * axe;
+
+					if (i % 2 == 1)
+						immAttrib4fv(col, col_sel);
+					else
+						immAttrib4fv(col, col_outline);
+
+					immVertex2f(pos, x1, y1);
+					immVertex2f(pos, x2, y2);
 				}
-
-				glBegin(GL_LINES);
-				glVertex2f(-10.0f, 0.0f);
-				glVertex2f(10.0f, 0.0f);
-				glVertex2f(0.0f, -10.0f);
-				glVertex2f(0.0f, 10.0f);
-				glEnd();
 			}
+			immEnd();
 
-			GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+			immUnbindProgram();
 		}
 
-		glPopMatrix();
+		gpuPopMatrix();
 
 		ok = true;
 	}
 
 	if (!ok) {
-		glColor4f(0.f, 0.f, 0.f, 0.3f);
+		float color[4] = {0.0f, 0.0f, 0.0f, 0.3f};
 		UI_draw_roundbox_corner_set(UI_CNR_ALL);
-		UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
+		UI_draw_roundbox_4fv(true, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
 	}
 
 	/* outline */
@@ -1628,88 +1978,139 @@ void ui_draw_but_NODESOCKET(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol
 	GLint scissor[4];
 
 	/* need scissor test, can draw outside of boundary */
-	glGetIntegerv(GL_VIEWPORT, scissor);
+	glGetIntegerv(GL_SCISSOR_BOX, scissor);
 
 	rcti scissor_new = {
-		.xmin = ar->winrct.xmin + recti->xmin,
-		.ymin = ar->winrct.ymin + recti->ymin,
-		.xmax = ar->winrct.xmin + recti->xmax,
-		.ymax = ar->winrct.ymin + recti->ymax
+		.xmin = recti->xmin,
+		.ymin = recti->ymin,
+		.xmax = recti->xmax,
+		.ymax = recti->ymax
 	};
 
-	BLI_rcti_isect(&scissor_new, &ar->winrct, &scissor_new);
+	rcti scissor_region = {0, ar->winx, 0, ar->winy};
+
+	BLI_rcti_isect(&scissor_new, &scissor_region, &scissor_new);
 	glScissor(scissor_new.xmin,
 	          scissor_new.ymin,
 	          BLI_rcti_size_x(&scissor_new),
 	          BLI_rcti_size_y(&scissor_new));
 
-	glColor4ubv(but->col);
-
 	float x = 0.5f * (recti->xmin + recti->xmax);
 	float y = 0.5f * (recti->ymin + recti->ymax);
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4ubv(but->col);
+
 	glEnable(GL_BLEND);
-	glBegin(GL_POLYGON);
+	immBegin(GWN_PRIM_TRI_FAN, 16);
 	for (int a = 0; a < 16; a++)
-		glVertex2f(x + size * si[a], y + size * co[a]);
-	glEnd();
+		immVertex2f(pos, x + size * si[a], y + size * co[a]);
+	immEnd();
 
-	glColor4ub(0, 0, 0, 150);
+	immUniformColor4ub(0, 0, 0, 150);
 	glLineWidth(1);
 	glEnable(GL_LINE_SMOOTH);
-	glBegin(GL_LINE_LOOP);
+	immBegin(GWN_PRIM_LINE_LOOP, 16);
 	for (int a = 0; a < 16; a++)
-		glVertex2f(x + size * si[a], y + size * co[a]);
-	glEnd();
+		immVertex2f(pos, x + size * si[a], y + size * co[a]);
+	immEnd();
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
 
+	immUnbindProgram();
+
 	/* restore scissortest */
 	glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
 }
 
 /* ****************************************************** */
 
+/* TODO: high quality UI drop shadows using GLSL shader and single draw call
+ * would replace / modify the following 3 functions  - merwin
+ */
 
-static void ui_shadowbox(float minx, float miny, float maxx, float maxy, float shadsize, unsigned char alpha)
+static void ui_shadowbox(unsigned pos, unsigned color, float minx, float miny, float maxx, float maxy, float shadsize, unsigned char alpha)
 {
+	/*          v1-_
+	 *          |   -_v2
+	 *          |     |
+	 *          |     |
+	 *          |     |
+	 * v7_______v3____v4
+	 * \        |     /
+	 *  \       |   _v5
+	 *  v8______v6_-
+	 */
+	const float v1[2] = {maxx,                   maxy - 0.3f * shadsize};
+	const float v2[2] = {maxx + shadsize,        maxy - 0.75f * shadsize};
+	const float v3[2] = {maxx,                   miny};
+	const float v4[2] = {maxx + shadsize,        miny};
+
+	const float v5[2] = {maxx + 0.7f * shadsize, miny - 0.7f * shadsize};
+
+	const float v6[2] = {maxx,                   miny - shadsize};
+	const float v7[2] = {minx + 0.3f * shadsize, miny};
+	const float v8[2] = {minx + 0.5f * shadsize, miny - shadsize};
+
 	/* right quad */
-	glColor4ub(0, 0, 0, alpha);
-	glVertex2f(maxx, miny);
-	glVertex2f(maxx, maxy - 0.3f * shadsize);
-	glColor4ub(0, 0, 0, 0);
-	glVertex2f(maxx + shadsize, maxy - 0.75f * shadsize);
-	glVertex2f(maxx + shadsize, miny);
+	immAttrib4ub(color, 0, 0, 0, alpha);
+	immVertex2fv(pos, v3);
+	immVertex2fv(pos, v1);
+	immAttrib4ub(color, 0, 0, 0, 0);
+	immVertex2fv(pos, v2);
+
+	immVertex2fv(pos, v2);
+	immVertex2fv(pos, v4);
+	immAttrib4ub(color, 0, 0, 0, alpha);
+	immVertex2fv(pos, v3);
 
 	/* corner shape */
-	glColor4ub(0, 0, 0, alpha);
-	glVertex2f(maxx, miny);
-	glColor4ub(0, 0, 0, 0);
-	glVertex2f(maxx + shadsize, miny);
-	glVertex2f(maxx + 0.7f * shadsize, miny - 0.7f * shadsize);
-	glVertex2f(maxx, miny - shadsize);
+	/* immAttrib4ub(color, 0, 0, 0, alpha); */  /* Not needed, done above in previous tri */
+	immVertex2fv(pos, v3);
+	immAttrib4ub(color, 0, 0, 0, 0);
+	immVertex2fv(pos, v4);
+	immVertex2fv(pos, v5);
+
+	immVertex2fv(pos, v5);
+	immVertex2fv(pos, v6);
+	immAttrib4ub(color, 0, 0, 0, alpha);
+	immVertex2fv(pos, v3);
 
 	/* bottom quad */
-	glColor4ub(0, 0, 0, alpha);
-	glVertex2f(minx + 0.3f * shadsize, miny);
-	glVertex2f(maxx, miny);
-	glColor4ub(0, 0, 0, 0);
-	glVertex2f(maxx, miny - shadsize);
-	glVertex2f(minx + 0.5f * shadsize, miny - shadsize);
+	/* immAttrib4ub(color, 0, 0, 0, alpha); */  /* Not needed, done above in previous tri */
+	immVertex2fv(pos, v3);
+	immAttrib4ub(color, 0, 0, 0, 0);
+	immVertex2fv(pos, v6);
+	immVertex2fv(pos, v8);
+
+	immVertex2fv(pos, v8);
+	immAttrib4ub(color, 0, 0, 0, alpha);
+	immVertex2fv(pos, v7);
+	immVertex2fv(pos, v3);
 }
 
 void UI_draw_box_shadow(unsigned char alpha, float minx, float miny, float maxx, float maxy)
 {
 	glEnable(GL_BLEND);
 
-	glBegin(GL_QUADS);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+	immBegin(GWN_PRIM_TRIS, 54);
 
 	/* accumulated outline boxes to make shade not linear, is more pleasant */
-	ui_shadowbox(minx, miny, maxx, maxy, 11.0, (20 * alpha) >> 8);
-	ui_shadowbox(minx, miny, maxx, maxy, 7.0, (40 * alpha) >> 8);
-	ui_shadowbox(minx, miny, maxx, maxy, 5.0, (80 * alpha) >> 8);
+	ui_shadowbox(pos, color, minx, miny, maxx, maxy, 11.0, (20 * alpha) >> 8);
+	ui_shadowbox(pos, color, minx, miny, maxx, maxy, 7.0, (40 * alpha) >> 8);
+	ui_shadowbox(pos, color, minx, miny, maxx, maxy, 5.0, (80 * alpha) >> 8);
 
-	glEnd();
+	immEnd();
+
+	immUnbindProgram();
 
 	glDisable(GL_BLEND);
 }
@@ -1719,8 +2120,8 @@ void ui_draw_dropshadow(const rctf *rct, float radius, float aspect, float alpha
 {
 	float rad;
 
-	if (radius > (BLI_rctf_size_y(rct) - 10.0f) / 2.0f)
-		rad = (BLI_rctf_size_y(rct) - 10.0f) / 2.0f;
+	if (radius > (BLI_rctf_size_y(rct) - 10.0f) * 0.5f)
+		rad = (BLI_rctf_size_y(rct) - 10.0f) * 0.5f;
 	else
 		rad = radius;
 
@@ -1736,34 +2137,46 @@ void ui_draw_dropshadow(const rctf *rct, float radius, float aspect, float alpha
 	}
 
 	glEnable(GL_BLEND);
-
 	const float dalpha = alpha * 2.0f / 255.0f;
 	float calpha = dalpha;
-	for (; i--; a -= aspect) {
+	float visibility = 1.0f;
+	for (; i--;) {
 		/* alpha ranges from 2 to 20 or so */
-		glColor4f(0.0f, 0.0f, 0.0f, calpha);
+#if 0 /* Old Method (pre 2.8) */
+		float color[4] = {0.0f, 0.0f, 0.0f, calpha};
+		UI_draw_roundbox_4fv(true, rct->xmin - a, rct->ymin - a, rct->xmax + a, rct->ymax - 10.0f + a, rad + a, color);
+#endif
+		/* Compute final visibility to match old method result. */
+		/* TODO we could just find a better fit function inside the shader instead of this. */
+		visibility = visibility * (1.0f - calpha);
 		calpha += dalpha;
-
-		UI_draw_roundbox_gl_mode(GL_POLYGON, rct->xmin - a, rct->ymin - a, rct->xmax + a, rct->ymax - 10.0f + a, rad + a);
 	}
 
+	uiWidgetBaseParameters widget_params = {
+		.recti.xmin = rct->xmin, .recti.ymin = rct->ymin,
+		.recti.xmax = rct->xmax, .recti.ymax = rct->ymax - 10.0f,
+		.rect.xmin = rct->xmin - a, .rect.ymin = rct->ymin - a,
+		.rect.xmax = rct->xmax + a, .rect.ymax = rct->ymax - 10.0f + a,
+		.radi = rad,
+		.rad = rad + a,
+		.round_corners[0] = (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f,
+		.round_corners[1] = (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[2] = (roundboxtype & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f,
+		.round_corners[3] = (roundboxtype & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f,
+		.alpha_discard = 1.0f,
+	};
+
+	Gwn_Batch *batch = ui_batch_roundbox_shadow_get();
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_SHADOW);
+	GWN_batch_uniform_4fv_array(batch, "parameters", 4, (float *)&widget_params);
+	GWN_batch_uniform_1f(batch, "alpha", 1.0f - visibility);
+	GWN_batch_draw(batch);
+
 	/* outline emphasis */
 	glEnable(GL_LINE_SMOOTH);
-	glColor4ub(0, 0, 0, 100);
-	UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin - 0.5f, rct->ymin - 0.5f, rct->xmax + 0.5f, rct->ymax + 0.5f, radius + 0.5f);
+	float color[4] = {0.0f, 0.0f, 0.0f, 0.4f};
+	UI_draw_roundbox_4fv(false, rct->xmin - 0.5f, rct->ymin - 0.5f, rct->xmax + 0.5f, rct->ymax + 0.5f, radius + 0.5f, color);
 	glDisable(GL_LINE_SMOOTH);
 
 	glDisable(GL_BLEND);
 }
-
-/**
- * Reset GL state (keep minimal).
- *
- * \note Blender's internal code doesn't assume these are reset,
- * but external callbacks may depend on their state.
- */
-void UI_reinit_gl_state(void)
-{
-	glLineWidth(1.0f);
-	glPointSize(1.0f);
-}
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 381d9f3cc42..8cb55b724fb 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -135,8 +135,8 @@ void eyedropper_draw_cursor_text(const struct bContext *C, const ARegion *ar, co
 	wmWindow *win = CTX_wm_window(C);
 	int x = win->eventstate->x;
 	int y = win->eventstate->y;
-	const unsigned char fg[4] = {255, 255, 255, 255};
-	const unsigned char bg[4] = {0, 0, 0, 50};
+	const float col_fg[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	const float col_bg[4] = {0.0f, 0.0f, 0.0f, 0.2f};
 
 
 	if ((name[0] == '\0') ||
@@ -150,7 +150,7 @@ void eyedropper_draw_cursor_text(const struct bContext *C, const ARegion *ar, co
 
 	y += U.widget_unit;
 
-	UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, fg, bg);
+	UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, col_fg, col_bg);
 }
 
 
@@ -165,8 +165,8 @@ void eyedropper_draw_cursor_text(const struct bContext *C, const ARegion *ar, co
  */
 uiBut *eyedropper_get_property_button_under_mouse(bContext *C, const wmEvent *event)
 {
-	wmWindow *win = CTX_wm_window(C);
-	ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, event->x, event->y);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, event->x, event->y);
 	ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_ANY, event->x, event->y);
 
 	uiBut *but = ui_but_find_mouse_over(ar, event);
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c
index 052da74623f..f3301d55284 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@ -131,8 +131,8 @@ static void eyedropper_exit(bContext *C, wmOperator *op)
 void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3])
 {
 	/* we could use some clever */
-	wmWindow *win = CTX_wm_window(C);
-	ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, mx, my);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my);
 	const char *display_device = CTX_data_scene(C)->display_settings.display_device;
 	struct ColorManagedDisplay *display = IMB_colormanagement_display_get_named(display_device);
 
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index 416022a9dd0..f814048c0c0 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -150,8 +150,8 @@ static void datadropper_exit(bContext *C, wmOperator *op)
 static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int my, ID **r_id)
 {
 	/* we could use some clever */
-	wmWindow *win = CTX_wm_window(C);
-	ScrArea *sa = BKE_screen_find_area_xy(win->screen, -1, mx, my);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = BKE_screen_find_area_xy(screen, -1, mx, my);
 
 	ScrArea *area_prev = CTX_wm_area(C);
 	ARegion *ar_prev = CTX_wm_region(C);
diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index b2ba7594fcb..bd23fbb961d 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -44,6 +44,8 @@
 #include "BKE_screen.h"
 #include "BKE_unit.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "UI_interface.h"
@@ -151,9 +153,10 @@ static void depthdropper_exit(bContext *C, wmOperator *op)
 static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx, int my, float *r_depth)
 {
 	/* we could use some clever */
-	wmWindow *win = CTX_wm_window(C);
-	ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, mx, my);
-	Scene *scene = win->screen->scene;
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my);
+	Scene *scene = CTX_data_scene(C);
+
 	UnitSettings *unit = &scene->unit;
 	const bool do_split = (unit->flag & USER_UNIT_OPT_SPLIT) != 0;
 
@@ -166,6 +169,7 @@ static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx,
 		if (sa->spacetype == SPACE_VIEW3D) {
 			ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
 			if (ar) {
+				struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 				View3D *v3d = sa->spacedata.first;
 				RegionView3D *rv3d = ar->regiondata;
 				/* weak, we could pass in some reference point */
@@ -183,7 +187,7 @@ static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx,
 
 				view3d_operator_needs_opengl(C);
 
-				if (ED_view3d_autodist(scene, ar, v3d, mval, co, true, NULL)) {
+				if (ED_view3d_autodist(depsgraph, ar, v3d, mval, co, true, NULL)) {
 					const float mval_center_fl[2] = {
 					    (float)ar->winx / 2,
 					    (float)ar->winy / 2};
diff --git a/source/blender/editors/interface/interface_eyedropper_driver.c b/source/blender/editors/interface/interface_eyedropper_driver.c
index 1b7407c87dd..50a8473135a 100644
--- a/source/blender/editors/interface/interface_eyedropper_driver.c
+++ b/source/blender/editors/interface/interface_eyedropper_driver.c
@@ -42,7 +42,9 @@
 
 #include "BKE_context.h"
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -130,8 +132,8 @@ static void driverdropper_sample(bContext *C, wmOperator *op, const wmEvent *eve
 			if (success) {
 				/* send updates */
 				UI_context_update_anim_flag(C);
-				DAG_relations_tag_update(CTX_data_main(C));
-				DAG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
+				DEG_relations_tag_update(CTX_data_main(C));
+				DEG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
 				WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
 			}
 		}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 590b34dfc21..0ebe079703b 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -39,9 +39,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_actuator_types.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -78,6 +75,7 @@
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
+#include "UI_view2d.h"
 
 #include "BLF_api.h"
 
@@ -117,8 +115,6 @@
 #define USE_KEYMAP_ADD_HACK
 
 /* proto */
-static void ui_but_smart_controller_add(bContext *C, uiBut *from, uiBut *to);
-static void ui_but_link_add(bContext *C, uiBut *from, uiBut *to);
 static int ui_do_but_EXIT(bContext *C, uiBut *but, struct uiHandleButtonData *data, const wmEvent *event);
 static bool ui_but_find_select_in_enum__cmp(const uiBut *but_a, const uiBut *but_b);
 static void ui_textedit_string_set(uiBut *but, struct uiHandleButtonData *data, const char *str);
@@ -133,7 +129,7 @@ static bool ui_mouse_motion_keynav_test(struct uiKeyNavLock *keynav, const wmEve
 #define BUTTON_FLASH_DELAY          0.020
 #define MENU_SCROLL_INTERVAL        0.1
 #define PIE_MENU_INTERVAL           0.01
-#define BUTTON_AUTO_OPEN_THRESH     0.3
+#define BUTTON_AUTO_OPEN_THRESH     0.2
 #define BUTTON_MOUSE_TOWARDS_THRESH 1.0
 /* pixels to move the cursor to get out of keyboard navigation */
 #define BUTTON_KEYNAV_PX_LIMIT      8
@@ -252,6 +248,9 @@ typedef struct uiHandleButtonMulti {
 
 	bool is_proportional;
 
+	/* In some cases we directly apply the changes to multiple buttons, so we don't want to do it twice. */
+	bool skip;
+
 	/* before activating, we need to check gesture direction
 	 * accumulate signed cursor movement here so we can tell if this is a vertical motion or not. */
 	float drag_dir[2];
@@ -281,6 +280,7 @@ typedef struct uiHandleButtonData {
 	/* booleans (could be made into flags) */
 	bool cancel, escapecancel;
 	bool applied, applied_interactive;
+	bool changed_cursor;
 	wmTimer *flashtimer;
 
 	/* edited value */
@@ -491,6 +491,31 @@ bool ui_but_is_editable_as_text(const uiBut *but)
 
 }
 
+bool ui_but_is_toggle(const uiBut *but)
+{
+	return ELEM(
+	        but->type,
+	        UI_BTYPE_BUT_TOGGLE,
+	        UI_BTYPE_TOGGLE,
+	        UI_BTYPE_ICON_TOGGLE,
+	        UI_BTYPE_ICON_TOGGLE_N,
+	        UI_BTYPE_TOGGLE_N,
+	        UI_BTYPE_CHECKBOX,
+	        UI_BTYPE_CHECKBOX_N,
+	        UI_BTYPE_ROW
+	);
+}
+
+#ifdef USE_POPOVER_ONCE
+bool ui_but_is_popover_once_compat(const uiBut *but)
+{
+	return (
+	        (but->type == UI_BTYPE_BUT) ||
+	        ui_but_is_toggle(but)
+	);
+}
+#endif
+
 static uiBut *ui_but_prev(uiBut *but)
 {
 	while (but->prev) {
@@ -639,11 +664,8 @@ PointerRNA *ui_handle_afterfunc_add_operator(wmOperatorType *ot, int opcontext,
 
 static void popup_check(bContext *C, wmOperator *op)
 {
-	if (op && op->type->check && op->type->check(C, op)) {
-		/* check for popup and re-layout buttons */
-		ARegion *ar_menu = CTX_wm_menu(C);
-		if (ar_menu)
-			ED_region_tag_refresh_ui(ar_menu);
+	if (op && op->type->check) {
+		op->type->check(C, op);
 	}
 }
 
@@ -724,8 +746,7 @@ static void ui_apply_but_undo(uiBut *but)
 		const char *str = NULL;
 
 		/* define which string to use for undo */
-		if (ELEM(but->type, UI_BTYPE_LINK, UI_BTYPE_INLINK)) str = "Add button link";
-		else if (but->type == UI_BTYPE_MENU) str = but->drawstr;
+		if (but->type == UI_BTYPE_MENU) str = but->drawstr;
 		else if (but->drawstr[0]) str = but->drawstr;
 		else str = but->tip;
 
@@ -937,6 +958,20 @@ static void ui_apply_but_TEX(bContext *C, uiBut *but, uiHandleButtonData *data)
 	data->applied = true;
 }
 
+static void ui_apply_but_TAB(bContext *C, uiBut *but, uiHandleButtonData *data)
+{
+	if (data->str) {
+		ui_but_string_set(C, but, data->str);
+		ui_but_update_edited(but);
+	}
+	else {
+		ui_apply_but_func(C, but);
+	}
+
+	data->retval = but->retval;
+	data->applied = true;
+}
+
 static void ui_apply_but_NUM(bContext *C, uiBut *but, uiHandleButtonData *data)
 {
 	if (data->str) {
@@ -1167,6 +1202,7 @@ static void ui_multibut_states_apply(bContext *C, uiHandleButtonData *data, uiBl
 	uiBut *but;
 
 	BLI_assert(data->multi_data.init == BUTTON_MULTI_INIT_ENABLE);
+	BLI_assert(data->multi_data.skip == false);
 
 	for (but = block->buttons.first; but; but = but->next) {
 		if (but->flag & UI_BUT_DRAG_MULTI) {
@@ -1744,23 +1780,20 @@ static bool ui_but_drag_init(
 
 			/* TODO support more button pointer types */
 			if (but->rnaprop && RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA) {
-				RNA_property_float_get_array(&but->rnapoin, but->rnaprop, drag_info->color);
+				ui_but_v3_get(but, drag_info->color);
 				drag_info->gamma_corrected = true;
 				valid = true;
 			}
 			else if (but->rnaprop && RNA_property_subtype(but->rnaprop) == PROP_COLOR) {
-				RNA_property_float_get_array(&but->rnapoin, but->rnaprop, drag_info->color);
+				ui_but_v3_get(but, drag_info->color);
 				drag_info->gamma_corrected = false;
 				valid = true;
 			}
-			else if (but->pointype == UI_BUT_POIN_FLOAT) {
+			else if (ELEM(but->pointype, UI_BUT_POIN_FLOAT, UI_BUT_POIN_CHAR)) {
+				ui_but_v3_get(but, drag_info->color);
 				copy_v3_v3(drag_info->color, (float *)but->poin);
 				valid = true;
 			}
-			else if (but->pointype == UI_BUT_POIN_CHAR) {
-				rgb_uchar_to_float(drag_info->color, (unsigned char *)but->poin);
-				valid = true;
-			}
 
 			if (valid) {
 				WM_event_start_drag(C, ICON_COLOR, WM_DRAG_COLOR, drag_info, 0.0, WM_DRAG_FREE_DATA);
@@ -1790,223 +1823,6 @@ static bool ui_but_drag_init(
 
 /* ********************** linklines *********************** */
 
-static void ui_linkline_remove_active(uiBlock *block)
-{
-	uiBut *but;
-	uiLink *link;
-	uiLinkLine *line, *nline;
-	int a, b;
-
-	for (but = block->buttons.first; but; but = but->next) {
-		if (but->type == UI_BTYPE_LINK && but->link) {
-			for (line = but->link->lines.first; line; line = nline) {
-				nline = line->next;
-
-				if (line->flag & UI_SELECT) {
-					BLI_remlink(&but->link->lines, line);
-
-					link = line->from->link;
-
-					/* are there more pointers allowed? */
-					if (link->ppoin) {
-
-						if (*(link->totlink) == 1) {
-							*(link->totlink) = 0;
-							MEM_freeN(*(link->ppoin));
-							*(link->ppoin) = NULL;
-						}
-						else {
-							b = 0;
-							for (a = 0; a < (*(link->totlink)); a++) {
-
-								if ((*(link->ppoin))[a] != line->to->poin) {
-									(*(link->ppoin))[b] = (*(link->ppoin))[a];
-									b++;
-								}
-							}
-							(*(link->totlink))--;
-						}
-					}
-					else {
-						*(link->poin) = NULL;
-					}
-
-					MEM_freeN(line);
-				}
-			}
-		}
-	}
-}
-
-
-static uiLinkLine *ui_but_find_link(uiBut *from, uiBut *to)
-{
-	uiLinkLine *line;
-	uiLink *link;
-
-	link = from->link;
-	if (link) {
-		for (line = link->lines.first; line; line = line->next) {
-			if (line->from == from && line->to == to) {
-				return line;
-			}
-		}
-	}
-	return NULL;
-}
-
-/* XXX BAD BAD HACK, fixme later **************** */
-/* Try to add an AND Controller between the sensor and the actuator logic bricks and to connect them all */
-static void ui_but_smart_controller_add(bContext *C, uiBut *from, uiBut *to)
-{
-	Object *ob = NULL;
-	bSensor *sens_iter;
-	bActuator *act_to, *act_iter;
-	bController *cont;
-	bController ***sens_from_links;
-	uiBut *tmp_but;
-
-	uiLink *link = from->link;
-
-	PointerRNA props_ptr, object_ptr;
-
-	if (link->ppoin)
-		sens_from_links = (bController ***)(link->ppoin);
-	else return;
-
-	act_to = (bActuator *)(to->poin);
-
-	/* (1) get the object */
-	CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
-	{
-		for (sens_iter = ob_iter->sensors.first; sens_iter; sens_iter = sens_iter->next) {
-			if (&(sens_iter->links) == sens_from_links) {
-				ob = ob_iter;
-				break;
-			}
-		}
-		if (ob) break;
-	} CTX_DATA_END;
-
-	if (!ob) return;
-
-	/* (2) check if the sensor and the actuator are from the same object */
-	for (act_iter = ob->actuators.first; act_iter; act_iter = (bActuator *)act_iter->next) {
-		if (act_iter == act_to)
-			break;
-	}
-
-	/* only works if the sensor and the actuator are from the same object */
-	if (!act_iter) return;
-
-	/* in case the linked controller is not the active one */
-	RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
-
-	WM_operator_properties_create(&props_ptr, "LOGIC_OT_controller_add");
-	RNA_string_set(&props_ptr, "object", ob->id.name + 2);
-
-	/* (3) add a new controller */
-	if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, &props_ptr) & OPERATOR_FINISHED) {
-		cont = (bController *)ob->controllers.last;
-		/* Quick fix to make sure we always have an AND controller.
-		 * It might be nicer to make sure the operator gives us the right one though... */
-		cont->type = CONT_LOGIC_AND;
-
-		/* (4) link the sensor->controller->actuator */
-		tmp_but = MEM_callocN(sizeof(uiBut), "uiBut");
-		UI_but_link_set(
-		        tmp_but, (void **)&cont, (void ***)&(cont->links),
-		        &cont->totlinks, from->link->tocode, (int)to->hardmin);
-		tmp_but->hardmin = from->link->tocode;
-		tmp_but->poin = (char *)cont;
-
-		tmp_but->type = UI_BTYPE_INLINK;
-		ui_but_link_add(C, from, tmp_but);
-
-		tmp_but->type = UI_BTYPE_LINK;
-		ui_but_link_add(C, tmp_but, to);
-
-		/* (5) garbage collection */
-		MEM_freeN(tmp_but->link);
-		MEM_freeN(tmp_but);
-	}
-	WM_operator_properties_free(&props_ptr);
-}
-
-static void ui_but_link_add(bContext *C, uiBut *from, uiBut *to)
-{
-	/* in 'from' we have to add a link to 'to' */
-	uiLink *link;
-	uiLinkLine *line;
-	void **oldppoin;
-	int a;
-
-	if ((line = ui_but_find_link(from, to))) {
-		line->flag |= UI_SELECT;
-		ui_linkline_remove_active(from->block);
-		return;
-	}
-
-	if (from->type == UI_BTYPE_INLINK && to->type == UI_BTYPE_INLINK) {
-		return;
-	}
-	else if (from->type == UI_BTYPE_LINK && to->type == UI_BTYPE_INLINK) {
-		if (from->link->tocode != (int)to->hardmin) {
-			ui_but_smart_controller_add(C, from, to);
-			return;
-		}
-	}
-	else if (from->type == UI_BTYPE_INLINK && to->type == UI_BTYPE_LINK) {
-		if (to->link->tocode == (int)from->hardmin) {
-			return;
-		}
-	}
-
-	link = from->link;
-
-	/* are there more pointers allowed? */
-	if (link->ppoin) {
-		oldppoin = *(link->ppoin);
-
-		(*(link->totlink))++;
-		*(link->ppoin) = MEM_callocN(*(link->totlink) * sizeof(void *), "new link");
-
-		for (a = 0; a < (*(link->totlink)) - 1; a++) {
-			(*(link->ppoin))[a] = oldppoin[a];
-		}
-		(*(link->ppoin))[a] = to->poin;
-
-		if (oldppoin) MEM_freeN(oldppoin);
-	}
-	else {
-		*(link->poin) = to->poin;
-	}
-
-}
-
-
-static void ui_apply_but_LINK(bContext *C, uiBut *but, uiHandleButtonData *data)
-{
-	ARegion *ar = CTX_wm_region(C);
-	uiBut *bt;
-
-	for (bt = but->block->buttons.first; bt; bt = bt->next) {
-		if (ui_but_contains_point_px(ar, bt, but->linkto[0] + ar->winrct.xmin, but->linkto[1] + ar->winrct.ymin) )
-			break;
-	}
-	if (bt && bt != but) {
-		if (!ELEM(bt->type, UI_BTYPE_LINK, UI_BTYPE_INLINK) || !ELEM(but->type, UI_BTYPE_LINK, UI_BTYPE_INLINK))
-			return;
-
-		if (but->type == UI_BTYPE_LINK) ui_but_link_add(C, but, bt);
-		else ui_but_link_add(C, bt, but);
-
-		ui_apply_but_func(C, but);
-		data->retval = but->retval;
-	}
-	data->applied = true;
-}
-
 static void ui_apply_but_IMAGE(bContext *C, uiBut *but, uiHandleButtonData *data)
 {
 	ui_apply_but_func(C, but);
@@ -2125,6 +1941,9 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
 		case UI_BTYPE_LISTROW:
 			ui_apply_but_ROW(C, block, but, data);
 			break;
+		case UI_BTYPE_TAB:
+			ui_apply_but_TAB(C, but, data);
+			break;
 		case UI_BTYPE_SCROLL:
 		case UI_BTYPE_GRIP:
 		case UI_BTYPE_NUM:
@@ -2160,10 +1979,6 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
 		case UI_BTYPE_HOTKEY_EVENT:
 			ui_apply_but_BUT(C, but, data);
 			break;
-		case UI_BTYPE_LINK:
-		case UI_BTYPE_INLINK:
-			ui_apply_but_LINK(C, but, data);
-			break;
 		case UI_BTYPE_IMAGE:
 			ui_apply_but_IMAGE(C, but, data);
 			break;
@@ -2182,7 +1997,9 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
 
 #ifdef USE_DRAG_MULTINUM
 	if (data->multi_data.has_mbuts) {
-		if (data->multi_data.init == BUTTON_MULTI_INIT_ENABLE) {
+		if ((data->multi_data.init == BUTTON_MULTI_INIT_ENABLE) &&
+		    (data->multi_data.skip == false))
+		{
 			if (data->cancel) {
 				ui_multibut_restore(C, data, block);
 			}
@@ -3175,6 +2992,9 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
 
 			ui_searchbox_free(C, data->searchbox);
 			data->searchbox = NULL;
+			if (but->free_search_arg) {
+				MEM_SAFE_FREE(but->search_arg);
+			}
 		}
 
 		but->editstr = NULL;
@@ -3646,6 +3466,7 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 	uiBlockCreateFunc func = NULL;
 	uiBlockHandleCreateFunc handlefunc = NULL;
 	uiMenuCreateFunc menufunc = NULL;
+	uiMenuCreateFunc popoverfunc = NULL;
 	void *arg = NULL;
 
 	switch (but->type) {
@@ -3665,6 +3486,11 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 			menufunc = but->menu_create_func;
 			arg = but->poin;
 			break;
+		case UI_BTYPE_POPOVER:
+			BLI_assert(but->menu_create_func);
+			popoverfunc = but->menu_create_func;
+			arg = but->poin;
+			break;
 		case UI_BTYPE_COLOR:
 			ui_but_v3_get(but, data->origvec);
 			copy_v3_v3(data->vec, data->origvec);
@@ -3689,6 +3515,11 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 		if (but->block->handle)
 			data->menu->popup = but->block->handle->popup;
 	}
+	else if (popoverfunc) {
+		data->menu = ui_popover_panel_create(C, data->region, but, popoverfunc, arg);
+		if (but->block->handle)
+			data->menu->popup = but->block->handle->popup;
+	}
 
 #ifdef USE_ALLSELECT
 	{
@@ -3895,6 +3726,43 @@ static bool ui_but_is_mouse_over_icon_extra(const ARegion *region, uiBut *but, c
 	return BLI_rcti_isect_pt(&icon_rect, x, y);
 }
 
+static int ui_do_but_TAB(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, const wmEvent *event)
+{
+	if (data->state == BUTTON_STATE_HIGHLIGHT) {
+		if ((event->type == LEFTMOUSE) &&
+		    ((event->val == KM_DBL_CLICK) || event->ctrl))
+		{
+			button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
+			return WM_UI_HANDLER_BREAK;
+		}
+		else if (ELEM(event->type, LEFTMOUSE, PADENTER, RETKEY) && (event->val == KM_CLICK)) {
+			const bool has_icon_extra = ui_but_icon_extra_get(but) == UI_BUT_ICONEXTRA_CLEAR;
+
+			if (has_icon_extra && ui_but_is_mouse_over_icon_extra(data->region, but, &event->x)) {
+				uiButTab *tab = (uiButTab *)but;
+				wmOperatorType *ot_backup = but->optype;
+
+				but->optype = tab->unlink_ot;
+				/* Force calling unlink/delete operator. */
+				ui_apply_but(C, block, but, data, true);
+				but->optype = ot_backup;
+			}
+			button_activate_state(C, but, BUTTON_STATE_EXIT);
+			return WM_UI_HANDLER_BREAK;
+		}
+	}
+	else if (data->state == BUTTON_STATE_TEXT_EDITING) {
+		ui_do_but_textedit(C, block, but, data, event);
+		return WM_UI_HANDLER_BREAK;
+	}
+	else if (data->state == BUTTON_STATE_TEXT_SELECTING) {
+		ui_do_but_textedit_select(C, block, but, data, event);
+		return WM_UI_HANDLER_BREAK;
+	}
+
+	return WM_UI_HANDLER_CONTINUE;
+}
+
 static int ui_do_but_TEX(
         bContext *C, uiBlock *block, uiBut *but,
         uiHandleButtonData *data, const wmEvent *event)
@@ -4334,6 +4202,54 @@ static bool ui_numedit_but_NUM(
 	return changed;
 }
 
+static void ui_numedit_set_active(uiBut *but)
+{
+	int oldflag = but->drawflag;
+	but->drawflag &= ~(UI_BUT_ACTIVE_LEFT | UI_BUT_ACTIVE_RIGHT);
+
+	uiHandleButtonData *data = but->active;
+	if (!data) {
+		return;
+	}
+
+	/* Ignore once we start dragging. */
+	if (data->dragchange == false) {
+		const  float handle_width = min_ff(BLI_rctf_size_x(&but->rect) / 3, BLI_rctf_size_y(&but->rect) * 0.7f);
+		/* we can click on the side arrows to increment/decrement,
+		 * or click inside to edit the value directly */
+		int mx = data->window->eventstate->x;
+		int my = data->window->eventstate->x;
+		ui_window_to_block(data->region, but->block, &mx, &my);
+
+		if (mx < (but->rect.xmin + handle_width)) {
+			but->drawflag |= UI_BUT_ACTIVE_LEFT;
+		}
+		else if (mx > (but->rect.xmax - handle_width)) {
+			but->drawflag |= UI_BUT_ACTIVE_RIGHT;
+		}
+	}
+
+	/* Don't change the cursor once pressed. */
+	if ((but->flag & UI_SELECT) == 0) {
+		if ((but->drawflag & (UI_BUT_ACTIVE_LEFT)) || (but->drawflag & (UI_BUT_ACTIVE_RIGHT))) {
+			if (data->changed_cursor) {
+				WM_cursor_modal_restore(data->window);
+				data->changed_cursor = false;
+			}
+		}
+		else {
+			if (data->changed_cursor == false) {
+				WM_cursor_modal_set(data->window, CURSOR_X_MOVE);
+				data->changed_cursor = true;
+			}
+		}
+	}
+
+	if (but->drawflag != oldflag) {
+		ED_region_tag_redraw(data->region);
+	}
+}
+
 static int ui_do_but_NUM(
         bContext *C, uiBlock *block, uiBut *but,
         uiHandleButtonData *data, const wmEvent *event)
@@ -4347,6 +4263,7 @@ static int ui_do_but_NUM(
 	my = screen_my = event->y;
 
 	ui_window_to_block(data->region, block, &mx, &my);
+	ui_numedit_set_active(but);
 
 	if (data->state == BUTTON_STATE_HIGHLIGHT) {
 		int type = event->type, val = event->val;
@@ -4456,16 +4373,13 @@ static int ui_do_but_NUM(
 		/* we can click on the side arrows to increment/decrement,
 		 * or click inside to edit the value directly */
 		float tempf, softmin, softmax;
-		float handlewidth;
 		int temp;
 
 		softmin = but->softmin;
 		softmax = but->softmax;
 
-		handlewidth = min_ff(BLI_rctf_size_x(&but->rect) / 3, BLI_rctf_size_y(&but->rect));
-
 		if (!ui_but_is_float(but)) {
-			if (mx < (but->rect.xmin + handlewidth)) {
+			if (but->drawflag & UI_BUT_ACTIVE_LEFT) {
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 
 				temp = (int)data->value - 1;
@@ -4476,7 +4390,7 @@ static int ui_do_but_NUM(
 
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
 			}
-			else if (mx > (but->rect.xmax - handlewidth)) {
+			else if (but->drawflag & UI_BUT_ACTIVE_RIGHT) {
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 
 				temp = (int)data->value + 1;
@@ -4492,7 +4406,7 @@ static int ui_do_but_NUM(
 			}
 		}
 		else {
-			if (mx < (but->rect.xmin + handlewidth)) {
+			if (but->drawflag & UI_BUT_ACTIVE_LEFT) {
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 
 				tempf = (float)data->value - (UI_PRECISION_FLOAT_SCALE * but->a1);
@@ -4501,7 +4415,7 @@ static int ui_do_but_NUM(
 
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
 			}
-			else if (mx > but->rect.xmax - handlewidth) {
+			else if (but->drawflag & UI_BUT_ACTIVE_RIGHT) {
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 
 				tempf = (float)data->value + (UI_PRECISION_FLOAT_SCALE * but->a1);
@@ -5224,7 +5138,8 @@ static int ui_do_but_COLOR(
 				if (!event->ctrl) {
 					float color[3];
 					Scene *scene = CTX_data_scene(C);
-					Paint *paint = BKE_paint_get_active(scene);
+					ViewLayer *view_layer = CTX_data_view_layer(C);
+					Paint *paint = BKE_paint_get_active(scene, view_layer);
 					Brush *brush = BKE_paint_brush(paint);
 
 					if (brush->flag & BRUSH_USE_GRADIENT) {
@@ -6141,6 +6056,7 @@ static int ui_do_but_CURVE(
 	int mx, my, a;
 	bool changed = false;
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	mx = event->x;
 	my = event->y;
@@ -6269,7 +6185,7 @@ static int ui_do_but_CURVE(
 				}
 				else {
 					curvemapping_changed(cumap, true);  /* remove doubles */
-					BKE_paint_invalidate_cursor_overlay(scene, cumap);
+					BKE_paint_invalidate_cursor_overlay(scene, view_layer, cumap);
 				}
 			}
 
@@ -6435,35 +6351,6 @@ static int ui_do_but_WAVEFORM(
 	return WM_UI_HANDLER_CONTINUE;
 }
 
-static int ui_do_but_LINK(
-        bContext *C, uiBut *but,
-        uiHandleButtonData *data, const wmEvent *event)
-{
-	VECCOPY2D(but->linkto, event->mval);
-
-	if (data->state == BUTTON_STATE_HIGHLIGHT) {
-		if (event->type == LEFTMOUSE && event->val == KM_PRESS) {
-			button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE);
-			return WM_UI_HANDLER_BREAK;
-		}
-		else if (event->type == LEFTMOUSE && but->block->handle) {
-			button_activate_state(C, but, BUTTON_STATE_EXIT);
-			return WM_UI_HANDLER_BREAK;
-		}
-	}
-	else if (data->state == BUTTON_STATE_WAIT_RELEASE) {
-
-		if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
-			if (!(but->flag & UI_SELECT))
-				data->cancel = true;
-			button_activate_state(C, but, BUTTON_STATE_EXIT);
-			return WM_UI_HANDLER_BREAK;
-		}
-	}
-
-	return WM_UI_HANDLER_CONTINUE;
-}
-
 static bool ui_numedit_but_TRACKPREVIEW(
         bContext *C, uiBut *but, uiHandleButtonData *data,
         int mx, int my,
@@ -6775,6 +6662,8 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 	MenuType *mt = WM_menutype_find("WM_MT_button_context", true);
 	bool is_array, is_array_component;
 	uiStringInfo label = {BUT_GET_LABEL, NULL};
+	wmOperatorType *ot;
+	PointerRNA op_ptr;
 
 /*	if ((but->rnapoin.data && but->rnaprop) == 0 && but->optype == NULL)*/
 /*		return 0;*/
@@ -6804,8 +6693,8 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 		/*bool is_idprop = RNA_property_is_idprop(prop);*/ /* XXX does not work as expected, not strictly needed */
 		bool is_set = RNA_property_is_set(ptr, prop);
 
-		/* Set the (button_pointer, button_prop) and pointer data for Python access to the hovered ui element. */
-		uiLayoutSetContextFromBut(layout, but);
+		const int override_status = RNA_property_static_override_status(ptr, prop, -1);
+		const bool is_overridable = (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE) != 0;
 
 		/* second slower test, saved people finding keyframe items in menus when its not possible */
 		if (is_anim)
@@ -6890,6 +6779,12 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 				uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Paste Driver"),
 				        ICON_NONE, "ANIM_OT_paste_driver_button");
 			}
+
+			uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Edit Driver"),
+			        ICON_DRIVER, "ANIM_OT_driver_button_edit");
+
+			uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Open Drivers Editor"),
+			        ICON_NONE, "SCREEN_OT_drivers_editor_show");
 		}
 		else if (but->flag & (UI_BUT_ANIMATED_KEY | UI_BUT_ANIMATED)) {
 			/* pass */
@@ -6912,6 +6807,9 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 				uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Paste Driver"),
 				        ICON_NONE, "ANIM_OT_paste_driver_button");
 			}
+
+			uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Open Drivers Editor"),
+			        ICON_NONE, "SCREEN_OT_drivers_editor_show");
 		}
 
 		/* Keying Sets */
@@ -6935,6 +6833,54 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 			}
 		}
 
+		if (is_overridable) {
+			/* Override Operators */
+			uiItemS(layout);
+
+			if (but->flag & UI_BUT_OVERRIDEN) {
+				if (is_array_component) {
+#if 0  /* Disabled for now. */
+					ot = WM_operatortype_find("UI_OT_override_type_set_button", false);
+					uiItemFullO_ptr(layout, ot, "Overrides Type", ICON_NONE,
+					                NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", true);
+					uiItemFullO_ptr(layout, ot, "Single Override Type", ICON_NONE,
+					                NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", false);
+#endif
+					uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Overrides"),
+					               ICON_X, "UI_OT_override_remove_button", "all", true);
+					uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Single Override"),
+					               ICON_X, "UI_OT_override_remove_button", "all", false);
+				}
+				else {
+#if 0  /* Disabled for now. */
+					uiItemFullO(layout, "UI_OT_override_type_set_button", "Override Type", ICON_NONE,
+					            NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", false);
+#endif
+					uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Override"),
+					               ICON_X, "UI_OT_override_remove_button", "all", true);
+				}
+			}
+			else {
+				if (is_array_component) {
+					ot = WM_operatortype_find("UI_OT_override_type_set_button", false);
+					uiItemFullO_ptr(layout, ot, "Define Overrides", ICON_NONE,
+					                NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", true);
+					uiItemFullO_ptr(layout, ot, "Define Single Override", ICON_NONE,
+					                NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", false);
+				}
+				else {
+					uiItemFullO(layout, "UI_OT_override_type_set_button", "Define Override", ICON_NONE,
+					            NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+					RNA_boolean_set(&op_ptr, "all", false);
+				}
+			}
+		}
+
 		uiItemS(layout);
 
 		/* Property Operators */
@@ -7143,6 +7089,9 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
 		case UI_BTYPE_HOTKEY_EVENT:
 			retval = ui_do_but_HOTKEYEVT(C, but, data, event);
 			break;
+		case UI_BTYPE_TAB:
+			retval = ui_do_but_TAB(C, block, but, data, event);
+			break;
 		case UI_BTYPE_BUT_TOGGLE:
 		case UI_BTYPE_TOGGLE:
 		case UI_BTYPE_ICON_TOGGLE:
@@ -7200,6 +7149,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
 			retval = ui_do_but_TEX(C, block, but, data, event);
 			break;
 		case UI_BTYPE_MENU:
+		case UI_BTYPE_POPOVER:
 		case UI_BTYPE_BLOCK:
 		case UI_BTYPE_PULLDOWN:
 			retval = ui_do_but_BLOCK(C, but, data, event);
@@ -7228,10 +7178,6 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
 		case UI_BTYPE_HSVCIRCLE:
 			retval = ui_do_but_HSVCIRCLE(C, block, but, data, event);
 			break;
-		case UI_BTYPE_LINK:
-		case UI_BTYPE_INLINK:
-			retval = ui_do_but_LINK(C, but, data, event);
-			break;
 		case UI_BTYPE_TRACK_PREVIEW:
 			retval = ui_do_but_TRACKPREVIEW(C, block, but, data, event);
 			break;
@@ -7415,12 +7361,11 @@ bool ui_but_is_active(ARegion *ar)
 /* is called by notifier */
 void UI_screen_free_active_but(const bContext *C, bScreen *screen)
 {
-	ScrArea *sa = screen->areabase.first;
+	wmWindow *win = CTX_wm_window(C);
 
-	for (; sa; sa = sa->next) {
-		ARegion *ar = sa->regionbase.first;
-		for (; ar; ar = ar->next) {
-			uiBut *but = ui_but_find_active_in_region(ar);
+	ED_screen_areas_iter(win, screen, area) {
+		for (ARegion *region = area->regionbase.first; region; region = region->next) {
+			uiBut *but = ui_but_find_active_in_region(region);
 			if (but) {
 				uiHandleButtonData *data = but->active;
 
@@ -7506,8 +7451,9 @@ static bool ui_region_contains_point_px(ARegion *ar, int x, int y)
 		ui_window_to_region(ar, &mx, &my);
 
 		/* check if in the rect */
-		if (!BLI_rcti_isect_pt(&v2d->mask, mx, my))
+		if (!BLI_rcti_isect_pt(&v2d->mask, mx, my) || UI_view2d_mouse_in_scrollers(ar, &ar->v2d, x, y)) {
 			return false;
+		}
 	}
 
 	return true;
@@ -7660,7 +7606,7 @@ void UI_but_tooltip_refresh(bContext *C, uiBut *but)
 {
 	uiHandleButtonData *data = but->active;
 	if (data) {
-		bScreen *sc = data->window->screen;
+		bScreen *sc = WM_window_get_active_screen(data->window);
 		if (sc->tool_tip && sc->tool_tip->region) {
 			WM_tooltip_refresh(C, data->window);
 		}
@@ -7729,7 +7675,7 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
 		button_tooltip_timer_reset(C, but);
 
 		/* automatic open pulldown block timer */
-		if (ELEM(but->type, UI_BTYPE_BLOCK, UI_BTYPE_PULLDOWN)) {
+		if (ELEM(but->type, UI_BTYPE_BLOCK, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER)) {
 			if (data->used_mouse && !data->autoopentimer) {
 				int time;
 
@@ -7939,6 +7885,9 @@ static void button_activate_init(bContext *C, ARegion *ar, uiBut *but, uiButtonA
 		const bool horizontal = (BLI_rctf_size_x(&but->rect) < BLI_rctf_size_y(&but->rect));
 		WM_cursor_modal_set(data->window, horizontal ? CURSOR_X_MOVE : CURSOR_Y_MOVE);
 	}
+	else if (but->type == UI_BTYPE_NUM) {
+		ui_numedit_set_active(but);
+	}
 }
 
 static void button_activate_exit(
@@ -8032,8 +7981,13 @@ static void button_activate_exit(
 	ui_selectcontext_end(but, &data->select_others);
 #endif
 
-	/* redraw (data is but->active!) */
+	if (data->changed_cursor) {
+		WM_cursor_modal_restore(data->window);
+	}
+
+	/* redraw and refresh (for popups) */
 	ED_region_tag_redraw(data->region);
+	ED_region_tag_refresh_ui(data->region);
 
 	/* clean up button */
 	if (but->active) {
@@ -8219,6 +8173,7 @@ void UI_context_update_anim_flag(const bContext *C)
 		for (block = ar->uiblocks.first; block; block = block->next) {
 			for (but = block->buttons.first; but; but = but->next) {
 				ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
+				ui_but_override_flag(but);
 				ED_region_tag_redraw(ar);
 
 				if (but->active) {
@@ -8356,6 +8311,37 @@ static void ui_handle_button_activate(bContext *C, ARegion *ar, uiBut *but, uiBu
 
 /************ handle events for an activated button ***********/
 
+static bool ui_button_value_default(uiBut *but, double *r_value)
+{
+	if (but->rnaprop != NULL && ui_but_is_rna_valid(but)) {
+		int type = RNA_property_type(but->rnaprop);
+		if (ELEM(type, PROP_FLOAT, PROP_INT)) {
+			double default_value;
+			switch (type) {
+				case PROP_INT:
+					if (RNA_property_array_check(but->rnaprop)) {
+						default_value = (double)RNA_property_int_get_default_index(&but->rnapoin, but->rnaprop, but->rnaindex);
+					}
+					else {
+						default_value = (double)RNA_property_int_get_default(&but->rnapoin, but->rnaprop);
+					}
+					break;
+				case PROP_FLOAT:
+					if (RNA_property_array_check(but->rnaprop)) {
+						default_value = (double)RNA_property_float_get_default_index(&but->rnapoin, but->rnaprop, but->rnaindex);
+					}
+					else {
+						default_value = (double)RNA_property_float_get_default(&but->rnapoin, but->rnaprop);
+					}
+					break;
+			}
+			*r_value = default_value;
+			return true;
+		}
+	}
+	return false;
+}
+
 static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 {
 	uiHandleButtonData *data = but->active;
@@ -8375,8 +8361,29 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 			case EVT_BUT_CANCEL:
 				data->cancel = true;
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
-				retval = WM_UI_HANDLER_CONTINUE;
 				break;
+#ifdef USE_POPOVER_ONCE
+			case LEFTMOUSE:
+			{
+				if (event->val == KM_RELEASE) {
+					if (block->flag & UI_BLOCK_POPOVER_ONCE) {
+						if (!(but->flag & UI_BUT_DISABLED)) {
+							if (ui_but_is_popover_once_compat(but)) {
+								data->cancel = false;
+								button_activate_state(C, but, BUTTON_STATE_EXIT);
+								retval = WM_UI_HANDLER_BREAK;
+								block->handle->menuretval = UI_RETURN_OK;
+							}
+							else if (ui_but_is_editable_as_text(but)) {
+								ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE_TEXT_EDITING);
+								retval = WM_UI_HANDLER_BREAK;
+							}
+						}
+					}
+				}
+				break;
+			}
+#endif
 			case MOUSEMOVE:
 			{
 				uiBut *but_other = ui_but_find_mouse_over(ar, event);
@@ -8415,7 +8422,6 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 						button_activate_state(C, but, BUTTON_STATE_MENU_OPEN);
 				}
 
-				retval = WM_UI_HANDLER_CONTINUE;
 				break;
 			}
 			/* XXX hardcoded keymap check... but anyway, while view changes, tooltips should be removed */
@@ -8426,10 +8432,11 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 				UI_but_tooltip_timer_remove(C, but);
 				ATTR_FALLTHROUGH;
 			default:
-				/* handle button type specific events */
-				retval = ui_do_button(C, block, but, event);
 				break;
 		}
+
+		/* handle button type specific events */
+		retval = ui_do_button(C, block, but, event);
 	}
 	else if (data->state == BUTTON_STATE_WAIT_RELEASE) {
 		switch (event->type) {
@@ -8458,15 +8465,23 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 				break;
 			}
 			case MOUSEMOVE:
-				if (ELEM(but->type, UI_BTYPE_LINK, UI_BTYPE_INLINK)) {
-					but->flag |= UI_SELECT;
-					ui_do_button(C, block, but, event);
-					ED_region_tag_redraw(ar);
-				}
-				else {
+				{
 					/* deselect the button when moving the mouse away */
 					/* also de-activate for buttons that only show higlights */
 					if (ui_but_contains_point_px(ar, but, event->x, event->y)) {
+
+						/* Drag on a hold button (used in the toolbar) now opens it immediately. */
+						if (data->hold_action_timer) {
+							if (but->flag & UI_SELECT) {
+								if ((abs(event->x - event->prevx)) > 2 ||
+								    (abs(event->y - event->prevy)) > 2)
+								{
+									WM_event_remove_timer(data->wm, data->window, data->hold_action_timer);
+									data->hold_action_timer = WM_event_add_timer(data->wm, data->window, TIMER, 0.0f);
+								}
+							}
+						}
+
 						if (!(but->flag & UI_SELECT)) {
 							but->flag |= (UI_SELECT | UI_ACTIVE);
 							data->cancel = false;
@@ -8542,6 +8557,29 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 		uiBut *post_but = data->postbut;
 		uiButtonActivateType post_type = data->posttype;
 
+		/* Reset the button value when empty text is typed. */
+		if ((data->cancel == false) && (data->str != NULL) && (data->str[0] == '\0') &&
+		    (but->rnaprop && ELEM(RNA_property_type(but->rnaprop), PROP_FLOAT, PROP_INT)))
+		{
+			MEM_SAFE_FREE(data->str);
+			ui_button_value_default(but, &data->value);
+
+#ifdef USE_DRAG_MULTINUM
+			if (data->multi_data.mbuts) {
+				for (LinkNode *l = data->multi_data.mbuts; l; l = l->next) {
+					uiButMultiState *state = l->link;
+					uiBut *but_iter = state->but;
+					double default_value;
+
+					if (ui_button_value_default(but_iter, &default_value)) {
+						ui_but_value_set(but_iter, default_value);
+					}
+				}
+			}
+			data->multi_data.skip = true;
+#endif
+		}
+
 		button_activate_exit(C, but, data, (post_but == NULL), false);
 
 		/* for jumping to the next button with tab while text editing */
@@ -8690,13 +8728,8 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar,
 	}
 
 	if (redraw) {
-		if (listbox->block->flag & UI_BLOCK_POPUP) {
-			/* popups need special refreshing */
-			ED_region_tag_refresh_ui(ar);
-		}
-		else {
-			ED_region_tag_redraw(ar);
-		}
+		ED_region_tag_redraw(ar);
+		ED_region_tag_refresh_ui(ar);
 	}
 
 	return retval;
@@ -8955,6 +8988,9 @@ static int ui_menu_scroll(ARegion *ar, uiBlock *block, int my, uiBut *to_bt)
 				dy = block->rect.ymin - ymin + UI_MENU_SCROLL_PAD;
 		}
 
+		/* remember scroll offset for refreshes */
+		block->handle->scrolloffset += dy;
+
 		/* apply scroll offset */
 		for (bt = block->buttons.first; bt; bt = bt->next) {
 			bt->rect.ymin += dy;
@@ -9491,6 +9527,15 @@ static int ui_handle_menu_event(
 		retval = ui_handle_menu_button(C, event, menu);
 	}
 
+#ifdef USE_POPOVER_ONCE
+	if (block->flag & UI_BLOCK_POPOVER_ONCE) {
+		if ((event->type == LEFTMOUSE) && (event->val == KM_RELEASE)) {
+			UI_popover_once_clear(menu->popup_create_vars.arg);
+			block->flag &= ~UI_BLOCK_POPOVER_ONCE;
+		}
+	}
+#endif
+
 	/* if we set a menu return value, ensure we continue passing this on to
 	 * lower menus and buttons, so always set continue then, and if we are
 	 * inside the region otherwise, ensure we swallow the event */
@@ -10104,15 +10149,17 @@ static int ui_handler_region_menu(bContext *C, const wmEvent *event, void *UNUSE
 
 		if ((data->state == BUTTON_STATE_MENU_OPEN) &&
 		    (is_inside_menu == false) && /* make sure mouse isn't inside another menu (see T43247) */
-		    (but->type == UI_BTYPE_PULLDOWN) &&
+		    (ELEM(but->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER)) &&
 		    (but_other = ui_but_find_mouse_over(ar, event)) &&
 		    (but != but_other) &&
-		    (but->type == but_other->type))
+		    (ELEM(but_other->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER)))
 		{
 			/* if mouse moves to a different root-level menu button,
 			 * open it to replace the current menu */
-			ui_handle_button_activate(C, ar, but_other, BUTTON_ACTIVATE_OVER);
-			button_activate_state(C, but_other, BUTTON_STATE_MENU_OPEN);
+			if ((but_other->flag & UI_BUT_DISABLED) == 0) {
+				ui_handle_button_activate(C, ar, but_other, BUTTON_ACTIVATE_OVER);
+				button_activate_state(C, but_other, BUTTON_STATE_MENU_OPEN);
+			}
 		}
 		else if (data->state == BUTTON_STATE_MENU_OPEN) {
 			int retval;
@@ -10351,3 +10398,18 @@ void ui_but_clipboard_free(void)
 {
 	curvemapping_free_data(&but_copypaste_curve);
 }
+
+bool UI_but_is_tool(const uiBut *but)
+{
+	/* very evil! */
+	if (but->optype != NULL) {
+		static wmOperatorType *ot = NULL;
+		if (ot == NULL) {
+			ot = WM_operatortype_find("WM_OT_tool_set_by_name", false);
+		}
+		if (but->optype == ot) {
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 0315bf736f0..2c813d152e9 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -33,12 +33,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "GPU_extensions.h"
-#include "GPU_basic_shader.h"
+#include "GPU_draw.h"
+#include "GPU_matrix.h"
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_fileops_types.h"
+#include "BLI_math_vector.h"
 
 #include "DNA_brush_types.h"
 #include "DNA_curve_types.h"
@@ -46,6 +49,7 @@
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+#include "DNA_workspace_types.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -54,14 +58,18 @@
 #include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_appdir.h"
+#include "BKE_studiolight.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_thumbs.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "DEG_depsgraph.h"
+
+#include "DRW_engine.h"
+
 #include "ED_datafiles.h"
 #include "ED_keyframes_draw.h"
 #include "ED_render.h"
@@ -94,6 +102,7 @@ typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha);
 #define ICON_TYPE_TEXTURE   1
 #define ICON_TYPE_BUFFER    2
 #define ICON_TYPE_VECTOR    3
+#define ICON_TYPE_GEOM      4
 
 typedef struct DrawInfo {
 	int type;
@@ -104,6 +113,9 @@ typedef struct DrawInfo {
 			VectorDrawFunc func;
 		} vector;
 		struct {
+			ImBuf *image_cache;
+		} geom;
+		struct {
 			IconImage *image;
 		} buffer;
 		struct {
@@ -224,13 +236,17 @@ static void vicon_small_tri_right_draw(int x, int y, int w, int UNUSED(h), float
 	viconutil_set_point(pts[1], cx - d2, cy - d);
 	viconutil_set_point(pts[2], cx + d2, cy);
 
-	glColor4f(0.2f, 0.2f, 0.2f, alpha);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4f(0.2f, 0.2f, 0.2f, alpha);
 
-	glBegin(GL_TRIANGLES);
-	glVertex2iv(pts[0]);
-	glVertex2iv(pts[1]);
-	glVertex2iv(pts[2]);
-	glEnd();
+	immBegin(GWN_PRIM_TRIS, 3);
+	immVertex2iv(pos, pts[0]);
+	immVertex2iv(pos, pts[1]);
+	immVertex2iv(pos, pts[2]);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 static void vicon_keytype_draw_wrapper(int x, int y, int w, int h, float alpha, short key_type)
@@ -239,7 +255,6 @@ static void vicon_keytype_draw_wrapper(int x, int y, int w, int h, float alpha,
 	 * (since we're doing this offscreen, free from any particular space_id)
 	 */
 	struct bThemeState theme_state;
-	int xco, yco;
 
 	UI_Theme_Store(&theme_state);
 	UI_SetTheme(SPACE_ACTION, RGN_TYPE_WINDOW);
@@ -248,15 +263,29 @@ static void vicon_keytype_draw_wrapper(int x, int y, int w, int h, float alpha,
 	 * while the draw_keyframe_shape() function needs the midpoint for
 	 * the keyframe
 	 */
-	xco = x + w / 2;
-	yco = y + h / 2;
+	int xco = x + w / 2;
+	int yco = y + h / 2;
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int size_id = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+	unsigned int color_id = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+	unsigned int outline_color_id = GWN_vertformat_attr_add(format, "outlineColor", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND);
+	GPU_enable_program_point_size();
+	immBegin(GWN_PRIM_POINTS, 1);
 
 	/* draw keyframe
-	 * - xscale: 1.0 (since there's no timeline scaling to compensate for)
-	 * - yscale: 0.3 * h (found out experimentally... dunno why!)
+	 * - size: 0.6 * h (found out experimentally... dunno why!)
 	 * - sel: true (so that "keyframe" state shows the iconic yellow icon)
 	 */
-	draw_keyframe_shape(xco, yco, 1.0f, 0.3f * h, true, key_type, KEYFRAME_SHAPE_BOTH, alpha);
+	draw_keyframe_shape(xco, yco, 0.6f * h, true, key_type, KEYFRAME_SHAPE_BOTH, alpha,
+	                    pos_id, size_id, color_id, outline_color_id);
+
+	immEnd();
+	GPU_disable_program_point_size();
+	immUnbindProgram();
 
 	UI_Theme_Restore(&theme_state);
 }
@@ -300,18 +329,23 @@ static void vicon_colorset_draw(int index, int x, int y, int w, int h, float UNU
 	const int b = x + w / 3 * 2;
 	const int c = x + w;
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* XXX: Include alpha into this... */
 	/* normal */
-	glColor3ubv((unsigned char *)cs->solid);
-	glRecti(x, y, a, y + h);
+	immUniformColor3ubv((unsigned char *)cs->solid);
+	immRecti(pos, x, y, a, y + h);
 
 	/* selected */
-	glColor3ubv((unsigned char *)cs->select);
-	glRecti(a, y, b, y + h);
+	immUniformColor3ubv((unsigned char *)cs->select);
+	immRecti(pos, a, y, b, y + h);
 
 	/* active */
-	glColor3ubv((unsigned char *)cs->active);
-	glRecti(b, y, c, y + h);
+	immUniformColor3ubv((unsigned char *)cs->active);
+	immRecti(pos, b, y, c, y + h);
+
+	immUnbindProgram();
 }
 
 #define DEF_VICON_COLORSET_DRAW_NTH(prefix, index)                                    \
@@ -504,8 +538,12 @@ static void init_internal_icons(void)
 			icongltex.id = 0;
 		}
 
+#if 0 /* should be a compile-time check (if needed at all) */
 		/* we only use a texture for cards with non-power of two */
 		if (GPU_full_non_power_of_two_support()) {
+#else
+		{
+#endif
 			glGenTextures(1, &icongltex.id);
 
 			if (icongltex.id) {
@@ -533,11 +571,6 @@ static void init_internal_icons(void)
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 				glBindTexture(GL_TEXTURE_2D, 0);
-
-				if (glGetError() == GL_OUT_OF_MEMORY) {
-					glDeleteTextures(1, &icongltex.id);
-					icongltex.id = 0;
-				}
 			}
 		}
 	}
@@ -717,18 +750,57 @@ void UI_icons_free_drawinfo(void *drawinfo)
 				MEM_freeN(di->data.buffer.image);
 			}
 		}
+		else if (di->type == ICON_TYPE_GEOM) {
+			if (di->data.geom.image_cache) {
+				IMB_freeImBuf(di->data.geom.image_cache);
+			}
+		}
 
 		MEM_freeN(di);
 	}
 }
 
-static DrawInfo *icon_create_drawinfo(void)
+/**
+ * #Icon.data_type and #Icon.obj
+ */
+static DrawInfo *icon_create_drawinfo(Icon *icon)
 {
+	int  icon_data_type = icon->obj_type;
 	DrawInfo *di = NULL;
 
 	di = MEM_callocN(sizeof(DrawInfo), "di_icon");
-	di->type = ICON_TYPE_PREVIEW;
 
+	if (ELEM(icon_data_type, ICON_DATA_ID, ICON_DATA_PREVIEW)) {
+		di->type = ICON_TYPE_PREVIEW;
+	}
+	else if (icon_data_type == ICON_DATA_GEOM) {
+		di->type = ICON_TYPE_GEOM;
+	}
+	else if (icon_data_type == ICON_DATA_STUDIOLIGHT) {
+		const int STUDIOLIGHT_SIZE = 96;
+		StudioLight *sl = icon->obj;
+		di->type = ICON_TYPE_BUFFER;
+		IconImage *img = MEM_mallocN(sizeof(IconImage), __func__);
+		img->w = STUDIOLIGHT_SIZE;
+		img->h = STUDIOLIGHT_SIZE;
+		img->rect = BKE_studiolight_preview(sl, STUDIOLIGHT_SIZE, icon->id_type);
+		di->data.buffer.image = img;
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	return di;
+}
+
+static DrawInfo *icon_ensure_drawinfo(Icon *icon)
+{
+	if (icon->drawinfo) {
+		return icon->drawinfo;
+	}
+	DrawInfo *di = icon_create_drawinfo(icon);
+	icon->drawinfo = di;
+	icon->drawinfo_free = UI_icons_free_drawinfo;
 	return di;
 }
 
@@ -746,40 +818,27 @@ int UI_icon_get_width(int icon_id)
 		return 0;
 	}
 
-	di = (DrawInfo *)icon->drawinfo;
-	if (!di) {
-		di = icon_create_drawinfo();
-		icon->drawinfo = di;
-	}
-
-	if (di)
+	di = icon_ensure_drawinfo(icon);
+	if (di) {
 		return ICON_DEFAULT_WIDTH;
+	}
 
 	return 0;
 }
 
 int UI_icon_get_height(int icon_id)
 {
-	Icon *icon = NULL;
-	DrawInfo *di = NULL;
-
-	icon = BKE_icon_get(icon_id);
-
+	Icon *icon = BKE_icon_get(icon_id);
 	if (icon == NULL) {
 		if (G.debug & G_DEBUG)
 			printf("%s: Internal error, no icon for icon ID: %d\n", __func__, icon_id);
 		return 0;
 	}
 
-	di = (DrawInfo *)icon->drawinfo;
-
-	if (!di) {
-		di = icon_create_drawinfo();
-		icon->drawinfo = di;
-	}
-
-	if (di)
+	DrawInfo *di = icon_ensure_drawinfo(icon);
+	if (di) {
 		return ICON_DEFAULT_HEIGHT;
+	}
 
 	return 0;
 }
@@ -836,14 +895,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
 	Icon *icon = BKE_icon_get(icon_id);
 
 	if (icon) {
-		DrawInfo *di = (DrawInfo *)icon->drawinfo;
-
-		if (!di) {
-			di = icon_create_drawinfo();
-
-			icon->drawinfo = di;
-			icon->drawinfo_free = UI_icons_free_drawinfo;
-		}
+		DrawInfo *di = icon_ensure_drawinfo(icon);
 
 		if (di) {
 			switch (di->type) {
@@ -851,12 +903,15 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
 				{
 					ID *id = (icon->id_type != 0) ? icon->obj : NULL;
 					PreviewImage *prv = id ? BKE_previewimg_id_ensure(id) : icon->obj;
+					/* Using jobs for screen previews crashes due to offscreen rendering.
+					 * XXX would be nicer if PreviewImage could store if it supports jobs */
+					const bool use_jobs = !id || (GS(id->name) != ID_SCR);
 
 					if (prv) {
 						const int size = big ? ICON_SIZE_PREVIEW : ICON_SIZE_ICON;
 
 						if (id || (prv->tag & PRV_TAG_DEFFERED) != 0) {
-							ui_id_preview_image_render_size(C, NULL, id, prv, size, true);
+							ui_id_preview_image_render_size(C, NULL, id, prv, size, use_jobs);
 						}
 					}
 					break;
@@ -936,7 +991,7 @@ PreviewImage *UI_icon_to_preview(int icon_id)
 }
 
 static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect), int rw, int rh,
-                           unsigned int *rect, float alpha, const float rgb[3], const bool is_preview)
+                           unsigned int *rect, float alpha, const float rgb[3], const float desaturate)
 {
 	ImBuf *ima = NULL;
 	int draw_w = w;
@@ -950,15 +1005,13 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
 		BLI_assert(!"invalid icon size");
 		return;
 	}
-
 	/* modulate color */
-	if (alpha != 1.0f)
-		glPixelTransferf(GL_ALPHA_SCALE, alpha);
+	float col[4] = {1.0f, 1.0f, 1.0f, alpha};
 
 	if (rgb) {
-		glPixelTransferf(GL_RED_SCALE, rgb[0]);
-		glPixelTransferf(GL_GREEN_SCALE, rgb[1]);
-		glPixelTransferf(GL_BLUE_SCALE, rgb[2]);
+		col[0] = rgb[0];
+		col[1] = rgb[1];
+		col[2] = rgb[2];
 	}
 
 	/* rect contains image in 'rendersize', we only scale if needed */
@@ -983,72 +1036,169 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
 		rect = ima->rect;
 	}
 
+	/* We need to flush widget base first to ensure correct ordering. */
+	UI_widgetbase_draw_cache_flush();
+
 	/* draw */
-	if (is_preview) {
-		glaDrawPixelsSafe(draw_x, draw_y, draw_w, draw_h, draw_w, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+	GPUBuiltinShader shader;
+	if (desaturate != 0.0f) {
+		shader = GPU_SHADER_2D_IMAGE_DESATURATE_COLOR;
 	}
 	else {
-		int bound_options;
-		GPU_BASIC_SHADER_DISABLE_AND_STORE(bound_options);
-
-		glRasterPos2f(draw_x, draw_y);
-		glDrawPixels(draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		shader = GPU_SHADER_2D_IMAGE_COLOR;
+	}
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(shader);
 
-		GPU_BASIC_SHADER_ENABLE_AND_RESTORE(bound_options);
+	if (shader == GPU_SHADER_2D_IMAGE_DESATURATE_COLOR) {
+		immUniform1f("factor", desaturate);
 	}
 
+	immDrawPixelsTex(&state, draw_x, draw_y, draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect,
+	                 1.0f, 1.0f, col);
+
 	if (ima)
 		IMB_freeImBuf(ima);
+}
+
+/* High enough to make a difference, low enough so that
+ * small draws are still efficient with the use of glUniform.
+ * NOTE TODO: We could use UBO but we would need some triple
+ * buffer system + persistent mapping for this to be more
+ * efficient than simple glUniform calls. */
+#define ICON_DRAW_CACHE_SIZE 16
+
+typedef struct IconDrawCall {
+	rctf pos;
+	rctf tex;
+	float color[4];
+} IconDrawCall;
+
+static struct {
+	IconDrawCall drawcall_cache[ICON_DRAW_CACHE_SIZE];
+	int calls; /* Number of calls batched together */
+	bool enabled;
+	float mat[4][4];
+} g_icon_draw_cache = {{{{0}}}};
+
+void UI_icon_draw_cache_begin(void)
+{
+	BLI_assert(g_icon_draw_cache.enabled == false);
+	g_icon_draw_cache.enabled = true;
+}
 
-	/* restore color */
-	if (alpha != 0.0f)
-		glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
+static void icon_draw_cache_flush_ex(void)
+{
+	if (g_icon_draw_cache.calls == 0)
+		return;
 
-	if (rgb) {
-		glPixelTransferf(GL_RED_SCALE, 1.0f);
-		glPixelTransferf(GL_GREEN_SCALE, 1.0f);
-		glPixelTransferf(GL_BLUE_SCALE, 1.0f);
+	/* We need to flush widget base first to ensure correct ordering. */
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	UI_widgetbase_draw_cache_flush();
+
+	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, icongltex.id);
+
+	GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR);
+	GPU_shader_bind(shader);
+
+	int img_loc = GPU_shader_get_uniform(shader, "image");
+	int data_loc = GPU_shader_get_uniform(shader, "calls_data[0]");
+
+	glUniform1i(img_loc, 0);
+	glUniform4fv(data_loc, ICON_DRAW_CACHE_SIZE * 3, (float *)g_icon_draw_cache.drawcall_cache);
+
+	GWN_draw_primitive(GWN_PRIM_TRIS, 6 * g_icon_draw_cache.calls);
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	g_icon_draw_cache.calls = 0;
+}
+
+void UI_icon_draw_cache_end(void)
+{
+	BLI_assert(g_icon_draw_cache.enabled == true);
+	g_icon_draw_cache.enabled = false;
+
+	/* Don't change blend state if it's not needed. */
+	if (g_icon_draw_cache.calls == 0)
+		return;
+
+	glEnable(GL_BLEND);
+
+	icon_draw_cache_flush_ex();
+
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_BLEND);
+}
+
+static void icon_draw_texture_cached(
+        float x, float y, float w, float h, int ix, int iy,
+        int UNUSED(iw), int ih, float alpha, const float rgb[3])
+{
+
+	float mvp[4][4];
+	gpuGetModelViewProjectionMatrix(mvp);
+
+	IconDrawCall *call = &g_icon_draw_cache.drawcall_cache[g_icon_draw_cache.calls];
+	g_icon_draw_cache.calls++;
+
+	/* Manual mat4*vec2 */
+	call->pos.xmin = x * mvp[0][0] + y * mvp[1][0] + mvp[3][0];
+	call->pos.ymin = x * mvp[0][1] + y * mvp[1][1] + mvp[3][1];
+	call->pos.xmax = call->pos.xmin + w * mvp[0][0] + h * mvp[1][0];
+	call->pos.ymax = call->pos.ymin + w * mvp[0][1] + h * mvp[1][1];
+
+	call->tex.xmin = ix * icongltex.invw;
+	call->tex.xmax = (ix + ih) * icongltex.invw;
+	call->tex.ymin = iy * icongltex.invh;
+	call->tex.ymax = (iy + ih) * icongltex.invh;
+
+	if (rgb) copy_v4_fl4(call->color, rgb[0], rgb[1], rgb[2], alpha);
+	else     copy_v4_fl(call->color, alpha);
+
+	if (g_icon_draw_cache.calls == ICON_DRAW_CACHE_SIZE) {
+		icon_draw_cache_flush_ex();
 	}
 }
 
 static void icon_draw_texture(
         float x, float y, float w, float h, int ix, int iy,
-        int UNUSED(iw), int ih, float alpha, const float rgb[3])
+        int iw, int ih, float alpha, const float rgb[3])
 {
-	float x1, x2, y1, y2;
+	if (g_icon_draw_cache.enabled) {
+		icon_draw_texture_cached(x, y, w, h, ix, iy, iw, ih, alpha, rgb);
+		return;
+	}
 
-	if (rgb) glColor4f(rgb[0], rgb[1], rgb[2], alpha);
-	else     glColor4f(alpha, alpha, alpha, alpha);
+	/* We need to flush widget base first to ensure correct ordering. */
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	UI_widgetbase_draw_cache_flush();
+
+	float x1, x2, y1, y2;
 
 	x1 = ix * icongltex.invw;
 	x2 = (ix + ih) * icongltex.invw;
 	y1 = iy * icongltex.invh;
 	y2 = (iy + ih) * icongltex.invh;
 
-	GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, icongltex.id);
 
-	/* sharper downscaling, has no effect when scale matches with a mip level */
-	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -0.5f);
-
-	glBegin(GL_QUADS);
-	glTexCoord2f(x1, y1);
-	glVertex2f(x, y);
-
-	glTexCoord2f(x2, y1);
-	glVertex2f(x + w, y);
+	GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE_RECT_COLOR);
+	GPU_shader_bind(shader);
 
-	glTexCoord2f(x2, y2);
-	glVertex2f(x + w, y + h);
+	if (rgb) glUniform4f(GPU_shader_get_builtin_uniform(shader, GWN_UNIFORM_COLOR), rgb[0], rgb[1], rgb[2], alpha);
+	else     glUniform4f(GPU_shader_get_builtin_uniform(shader, GWN_UNIFORM_COLOR), alpha, alpha, alpha, alpha);
 
-	glTexCoord2f(x1, y2);
-	glVertex2f(x, y + h);
-	glEnd();
+	glUniform1i(GPU_shader_get_uniform(shader, "image"), 0);
+	glUniform4f(GPU_shader_get_uniform(shader, "rect_icon"), x1, y1, x2, y2);
+	glUniform4f(GPU_shader_get_uniform(shader, "rect_geom"), x, y, x + w, y + h);
 
-	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.0f);
+	GWN_draw_primitive(GWN_PRIM_TRI_STRIP, 4);
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
 }
 
 /* Drawing size for preview images */
@@ -1068,11 +1218,10 @@ static int get_draw_size(enum eIconSizes size)
 
 static void icon_draw_size(
         float x, float y, int icon_id, float aspect, float alpha, const float rgb[3],
-        enum eIconSizes size, int draw_size, const bool UNUSED(nocreate), const bool is_preview)
+        enum eIconSizes size, int draw_size, const float desaturate)
 {
 	bTheme *btheme = UI_GetTheme();
 	Icon *icon = NULL;
-	DrawInfo *di = NULL;
 	IconImage *iimg;
 	const float fdraw_size = (float)draw_size;
 	int w, h;
@@ -1086,30 +1235,56 @@ static void icon_draw_size(
 		return;
 	}
 
-	di = (DrawInfo *)icon->drawinfo;
-
-	if (!di) {
-		di = icon_create_drawinfo();
-
-		icon->drawinfo = di;
-		icon->drawinfo_free = UI_icons_free_drawinfo;
-	}
-
 	/* scale width and height according to aspect */
 	w = (int)(fdraw_size / aspect + 0.5f);
 	h = (int)(fdraw_size / aspect + 0.5f);
 
+	DrawInfo *di = icon_ensure_drawinfo(icon);
+
 	if (di->type == ICON_TYPE_VECTOR) {
+		/* We need to flush widget base first to ensure correct ordering. */
+		UI_widgetbase_draw_cache_flush();
 		/* vector icons use the uiBlock transformation, they are not drawn
 		 * with untransformed coordinates like the other icons */
 		di->data.vector.func((int)x, (int)y, w, h, 1.0f);
 	}
+	else if (di->type == ICON_TYPE_GEOM) {
+		/* We need to flush widget base first to ensure correct ordering. */
+		UI_widgetbase_draw_cache_flush();
+
+#ifdef USE_TOOLBAR_HACK
+		/* TODO(campbell): scale icons up for toolbar, we need a way to detect larger buttons and do this automatic. */
+		{
+			float scale = (float)ICON_DEFAULT_HEIGHT_TOOLBAR / (float)ICON_DEFAULT_HEIGHT;
+			y = (y + (h / 2)) - ((h * scale) / 2);
+			w *= scale;
+			h *= scale;
+		}
+#endif
+
+		/* This could re-generate often if rendered at different sizes in the one interface.
+		 * TODO(campbell): support caching multiple sizes. */
+		ImBuf *ibuf = di->data.geom.image_cache;
+		if ((ibuf == NULL) ||
+		    (ibuf->x != w) ||
+		    (ibuf->y != h))
+		{
+			if (ibuf) {
+				IMB_freeImBuf(ibuf);
+			}
+			ibuf = BKE_icon_geom_rasterize(icon->obj, w, h);
+			di->data.geom.image_cache = ibuf;
+		}
+		glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		icon_draw_rect(x, y, w, h, aspect, w, h, ibuf->rect, alpha, rgb, desaturate);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	}
 	else if (di->type == ICON_TYPE_TEXTURE) {
 		/* texture image use premul alpha for correct scaling */
 		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y,
 		                  di->data.texture.w, di->data.texture.h, alpha, rgb);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	}
 	else if (di->type == ICON_TYPE_BUFFER) {
 		/* it is a builtin icon */
@@ -1119,9 +1294,9 @@ static void icon_draw_size(
 #endif
 		if (!iimg->rect) return;  /* something has gone wrong! */
 
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, is_preview);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, desaturate);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	}
 	else if (di->type == ICON_TYPE_PREVIEW) {
 		PreviewImage *pi = (icon->id_type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj;
@@ -1133,8 +1308,8 @@ static void icon_draw_size(
 			/* preview images use premul alpha ... */
 			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-			icon_draw_rect(x, y, w, h, aspect, pi->w[size], pi->h[size], pi->rect[size], alpha, rgb, is_preview);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			icon_draw_rect(x, y, w, h, aspect, pi->w[size], pi->h[size], pi->rect[size], alpha, rgb, desaturate);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		}
 	}
 }
@@ -1162,7 +1337,7 @@ void UI_id_icon_render(const bContext *C, Scene *scene, ID *id, const bool big,
 	}
 }
 
-static void ui_id_brush_render(const bContext *C, ID *id)
+static void ui_id_icon_render(const bContext *C, ID *id, bool use_jobs)
 {
 	PreviewImage *pi = BKE_previewimg_id_ensure(id);
 	enum eIconSizes i;
@@ -1174,7 +1349,7 @@ static void ui_id_brush_render(const bContext *C, ID *id)
 		/* check if rect needs to be created; changed
 		 * only set by dynamic icons */
 		if (((pi->flag[i] & PRV_CHANGED) || !pi->rect[i])) {
-			icon_set_image(C, NULL, id, pi, i, true);
+			icon_set_image(C, NULL, id, pi, i, use_jobs);
 			pi->flag[i] &= ~PRV_CHANGED;
 		}
 	}
@@ -1187,19 +1362,25 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
 
 	if (br->flag & BRUSH_CUSTOM_ICON) {
 		BKE_icon_id_ensure(id);
-		ui_id_brush_render(C, id);
+		ui_id_icon_render(C, id, true);
 	}
 	else {
+		WorkSpace *workspace = CTX_wm_workspace(C);
 		Object *ob = CTX_data_active_object(C);
-		SpaceImage *sima;
 		const EnumPropertyItem *items = NULL;
 		int tool = PAINT_TOOL_DRAW, mode = 0;
+		ScrArea *sa = CTX_wm_area(C);
+		char space_type = sa->spacetype;
+		/* When in an unsupported space. */
+		if (!ELEM(space_type, SPACE_VIEW3D, SPACE_IMAGE)) {
+			space_type = workspace->tools_space_type;
+		}
 
 		/* XXX: this is not nice, should probably make brushes
 		 * be strictly in one paint mode only to avoid
 		 * checking various context stuff here */
 
-		if (CTX_wm_view3d(C) && ob) {
+		if ((space_type == SPACE_VIEW3D) && ob) {
 			if (ob->mode & OB_MODE_SCULPT)
 				mode = OB_MODE_SCULPT;
 			else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT))
@@ -1207,10 +1388,19 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
 			else if (ob->mode & OB_MODE_TEXTURE_PAINT)
 				mode = OB_MODE_TEXTURE_PAINT;
 		}
-		else if ((sima = CTX_wm_space_image(C)) &&
-		         (sima->mode == SI_MODE_PAINT))
-		{
-			mode = OB_MODE_TEXTURE_PAINT;
+		else if (space_type == SPACE_IMAGE) {
+			int sima_mode;
+			if (sa->spacetype == space_type) {
+				SpaceImage *sima = sa->spacedata.first;
+				sima_mode = sima->mode;
+			}
+			else {
+				sima_mode = workspace->tools_mode;
+			}
+
+			if (sima_mode == SI_MODE_PAINT) {
+				mode = OB_MODE_TEXTURE_PAINT;
+			}
 		}
 
 		/* reset the icon */
@@ -1234,6 +1424,15 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
 	return id->icon_id;
 }
 
+static int ui_id_screen_get_icon(const bContext *C, ID *id)
+{
+	BKE_icon_id_ensure(id);
+	/* Don't use jobs here, offscreen rendering doesn't like this and crashes. */
+	ui_id_icon_render(C, id, false);
+
+	return id->icon_id;
+}
+
 int ui_id_icon_get(const bContext *C, ID *id, const bool big)
 {
 	int iconid = 0;
@@ -1252,6 +1451,9 @@ int ui_id_icon_get(const bContext *C, ID *id, const bool big)
 			/* checks if not exists, or changed */
 			UI_id_icon_render(C, NULL, id, big, true);
 			break;
+		case ID_SCR:
+			iconid = ui_id_screen_get_icon(C, id);
+			break;
 		default:
 			break;
 	}
@@ -1344,6 +1546,8 @@ int UI_idcode_icon_get(const int idcode)
 			return ICON_COLOR;  /* TODO! this would need its own icon! */
 		case ID_PC:
 			return ICON_CURVE_BEZCURVE;  /* TODO! this would need its own icon! */
+		case ID_LP:
+			return ICON_LIGHTPROBE_CUBEMAP;
 		case ID_SCE:
 			return ICON_SCENE_DATA;
 		case ID_SPK:
@@ -1365,21 +1569,26 @@ int UI_idcode_icon_get(const int idcode)
 
 static void icon_draw_at_size(
         float x, float y, int icon_id, float aspect, float alpha,
-        enum eIconSizes size, const bool nocreate)
+        enum eIconSizes size, const float desaturate)
 {
 	int draw_size = get_draw_size(size);
-	icon_draw_size(x, y, icon_id, aspect, alpha, NULL, size, draw_size, nocreate, false);
+	icon_draw_size(x, y, icon_id, aspect, alpha, NULL, size, draw_size, desaturate);
 }
 
 void UI_icon_draw_aspect(float x, float y, int icon_id, float aspect, float alpha)
 {
-	icon_draw_at_size(x, y, icon_id, aspect, alpha, ICON_SIZE_ICON, 0);
+	icon_draw_at_size(x, y, icon_id, aspect, alpha, ICON_SIZE_ICON, 0.0f);
 }
 
 void UI_icon_draw_aspect_color(float x, float y, int icon_id, float aspect, const float rgb[3])
 {
 	int draw_size = get_draw_size(ICON_SIZE_ICON);
-	icon_draw_size(x, y, icon_id, aspect, 1.0f, rgb, ICON_SIZE_ICON, draw_size, false, false);
+	icon_draw_size(x, y, icon_id, aspect, 1.0f, rgb, ICON_SIZE_ICON, draw_size, false);
+}
+
+void UI_icon_draw_desaturate(float x, float y, int icon_id, float aspect, float alpha, float desaturate)
+{
+	icon_draw_at_size(x, y, icon_id, aspect, alpha, ICON_SIZE_ICON, desaturate);
 }
 
 /* draws icon with dpi scale factor */
@@ -1388,23 +1597,28 @@ void UI_icon_draw(float x, float y, int icon_id)
 	UI_icon_draw_aspect(x, y, icon_id, 1.0f / UI_DPI_FAC, 1.0f);
 }
 
+void UI_icon_draw_alpha(float x, float y, int icon_id, float alpha)
+{
+	UI_icon_draw_aspect(x, y, icon_id, 1.0f / UI_DPI_FAC, alpha);
+}
+
 void UI_icon_draw_size(float x, float y, int size, int icon_id, float alpha)
 {
-	icon_draw_size(x, y, icon_id, 1.0f, alpha, NULL, ICON_SIZE_ICON, size, true, false);
+	icon_draw_size(x, y, icon_id, 1.0f, alpha, NULL, ICON_SIZE_ICON, size, false);
 }
 
 void UI_icon_draw_preview(float x, float y, int icon_id)
 {
-	icon_draw_at_size(x, y, icon_id, 1.0f, 1.0f, ICON_SIZE_PREVIEW, 0);
+	icon_draw_at_size(x, y, icon_id, 1.0f, 1.0f, ICON_SIZE_PREVIEW, false);
 }
 
 void UI_icon_draw_preview_aspect(float x, float y, int icon_id, float aspect)
 {
-	icon_draw_at_size(x, y, icon_id, aspect, 1.0f, ICON_SIZE_PREVIEW, 0);
+	icon_draw_at_size(x, y, icon_id, aspect, 1.0f, ICON_SIZE_PREVIEW, false);
 }
 
 void UI_icon_draw_preview_aspect_size(float x, float y, int icon_id, float aspect, float alpha, int size)
 {
-	icon_draw_size(x, y, icon_id, aspect, alpha, NULL, ICON_SIZE_PREVIEW, size, false, true);
+	icon_draw_size(x, y, icon_id, aspect, alpha, NULL, ICON_SIZE_PREVIEW, size, false);
 }
 
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 9ae245fee21..c7cf03a44dd 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -72,6 +72,8 @@ typedef enum {
 	UI_WTYPE_NUMBER,
 	UI_WTYPE_SLIDER,
 	UI_WTYPE_EXEC,
+	UI_WTYPE_TOOLBAR_ITEM,
+	UI_WTYPE_TAB,
 	UI_WTYPE_TOOLTIP,
 
 	/* strings */
@@ -103,6 +105,8 @@ typedef enum {
 	UI_WTYPE_PROGRESSBAR,
 } uiWidgetTypeEnum;
 
+#define UI_MENU_WIDTH_MIN (UI_UNIT_Y * 9)
+
 /* menu scrolling */
 #define UI_MENU_SCROLL_ARROW	12
 #define UI_MENU_SCROLL_MOUSE	(UI_MENU_SCROLL_ARROW + 2)
@@ -112,6 +116,9 @@ typedef enum {
 #define UI_PANEL_MINX   100
 #define UI_PANEL_MINY   70
 
+/* popover width (multiplied by 'U.widget_unit') */
+#define UI_POPOVER_WIDTH_UNITS 10
+
 /* uiBut->flag */
 enum {
 	UI_SELECT       = (1 << 0),  /* use when the button is pressed */
@@ -187,23 +194,6 @@ enum {
 /* max amount of items a radial menu (pie menu) can contain */
 #define PIE_MAX_ITEMS 8
 
-typedef struct uiLinkLine {  /* only for draw/edit */
-	struct uiLinkLine *next, *prev;
-	struct uiBut *from, *to;
-	short flag, deactive;
-} uiLinkLine;
-
-typedef struct {
-	void **poin;        /* pointer to original pointer */
-	void ***ppoin;      /* pointer to original pointer-array */
-	short *totlink;     /* if pointer-array, here is the total */
-
-	short maxlink, pad;
-	short fromcode, tocode;
-
-	ListBase lines;
-} uiLink;
-
 struct uiBut {
 	struct uiBut *next, *prev;
 	int flag, drawflag;
@@ -258,6 +248,7 @@ struct uiBut {
 
 	uiButSearchCreateFunc search_create_func;
 	uiButSearchFunc search_func;
+	bool free_search_arg;
 	void *search_arg;
 
 	uiButHandleRenameFunc rename_func;
@@ -268,9 +259,6 @@ struct uiBut {
 	uiButHandleHoldFunc hold_func;
 	void *hold_argN;
 
-	uiLink *link;
-	short linkto[2];  /* region relative coords */
-
 	const char *tip;
 	uiButToolTipFunc tip_func;
 	void *tip_argN;
@@ -281,7 +269,7 @@ struct uiBut {
 	BIFIconID icon;
 	char dt; /* drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied from the block */
 	signed char pie_dir; /* direction in a pie menu, used for collision detection (RadialDirection) */
-	char changed; /* could be made into a single flag */
+	bool changed; /* could be made into a single flag */
 	unsigned char unit_type; /* so buttons can support unit systems which are not RNA */
 	short modifier_key;
 	short iconadd;
@@ -331,6 +319,11 @@ struct uiBut {
 	uiBlock *block;
 };
 
+typedef struct uiButTab {
+	uiBut but;
+	struct wmOperatorType *unlink_ot;
+} uiButTab;
+
 typedef struct ColorPicker {
 	struct ColorPicker *next, *prev;
 	float color_data[3]; /* colr data may be HSV or HSL for now */
@@ -449,8 +442,6 @@ typedef struct uiSafetyRct {
 
 /* interface.c */
 
-extern void ui_linkline_remove(uiLinkLine *line, uiBut *but);
-
 void ui_fontscale(short *points, float aspect);
 
 extern bool ui_block_is_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT;
@@ -507,9 +498,9 @@ extern bool ui_but_supports_cycling(const uiBut *but) ATTR_WARN_UNUSED_RESULT;
 extern int  ui_but_is_pushed_ex(uiBut *but, double *value) ATTR_WARN_UNUSED_RESULT;
 extern int  ui_but_is_pushed(uiBut *but) ATTR_WARN_UNUSED_RESULT;
 
+void ui_but_override_flag(uiBut *but);
 
 extern void ui_block_bounds_calc(uiBlock *block);
-extern void ui_block_translate(uiBlock *block, int x, int y);
 
 extern struct ColorManagedDisplay *ui_block_cm_display_get(uiBlock *block);
 void ui_block_cm_to_display_space_v3(uiBlock *block, float pixel[3]);
@@ -526,16 +517,19 @@ struct uiKeyNavLock {
 };
 
 typedef uiBlock * (*uiBlockHandleCreateFunc)(struct bContext *C, struct uiPopupBlockHandle *handle, void *arg1);
+typedef void (*uiBlockHandleFreeFunc)(struct uiPopupBlockHandle *handle, void *arg1);
 
 struct uiPopupBlockCreate {
-	uiBlockCreateFunc              create_func;
+	uiBlockCreateFunc       create_func;
 	uiBlockHandleCreateFunc handle_create_func;
+	uiBlockHandleFreeFunc   free_func;
 	void *arg;
 
 	int event_xy[2];
 
 	/* when popup is initialized from a button */
 	ARegion *butregion;
+	uiBut *but;
 };
 
 struct uiPopupBlockHandle {
@@ -556,8 +550,10 @@ struct uiPopupBlockHandle {
 	struct uiPopupBlockCreate popup_create_vars;
 	/* true if we can re-create the popup using 'popup_create_vars' */
 	bool can_refresh;
+	bool refresh;
 
 	struct wmTimer *scrolltimer;
+	float scrolloffset;
 
 	struct uiKeyNavLock keynav_state;
 
@@ -577,6 +573,15 @@ struct uiPopupBlockHandle {
 	/* menu direction */
 	int direction;
 
+	/* Previous values so we don't resize or reposition on refresh. */
+	rctf prev_block_rect;
+	rctf prev_butrct;
+	short prev_dir1, prev_dir2;
+	int prev_mx, prev_my;
+
+	/* Maximum estimated size to avoid having to reposition on refresh. */
+	float max_size_x, max_size_y;
+
 /* #ifdef USE_DRAG_POPUP */
 	bool is_grab;
 	int     grab_xy_prev[2];
@@ -629,6 +634,18 @@ uiPopupBlockHandle *ui_popup_menu_create(
         struct bContext *C, struct ARegion *butregion, uiBut *but,
         uiMenuCreateFunc create_func, void *arg);
 
+/* interface_region_popover.c */
+uiBlock *ui_popover_block_refresh(
+        struct bContext *C, uiPopupBlockHandle *handle,
+        ARegion *butregion, uiBut *but);
+uiPopupBlockHandle *ui_popover_block_create(
+        struct bContext *C, struct ARegion *butregion, uiBut *but,
+        uiBlockCreateFunc create_func, uiBlockHandleCreateFunc handle_create_func,
+        void *arg);
+uiPopupBlockHandle *ui_popover_panel_create(
+        struct bContext *C, struct ARegion *butregion, uiBut *but,
+        uiMenuCreateFunc create_func, void *arg);
+
 /* interface_region_menu_pie.c */
 void ui_pie_menu_level_create(
         uiBlock *block, struct wmOperatorType *ot, const char *propname, IDProperty *properties,
@@ -653,6 +670,8 @@ extern void ui_draw_dropshadow(const rctf *rct, float radius, float aspect, floa
 
 void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, const float alpha);
 
+
+void ui_draw_but_TAB_outline(const rcti *rect, float rad, unsigned char highlight[3], unsigned char highlight_fade[3]);
 void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, const rcti *rect);
 void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, const rcti *rect);
 void ui_draw_but_VECTORSCOPE(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, const rcti *rect);
@@ -679,6 +698,8 @@ extern uiBut *ui_but_find_active_in_region(struct ARegion *ar);
 extern uiBut *ui_but_find_mouse_over(struct ARegion *ar, const struct wmEvent *event);
 bool ui_but_is_editable(const uiBut *but);
 bool ui_but_is_editable_as_text(const uiBut *but);
+bool ui_but_is_toggle(const uiBut *but);
+bool ui_but_is_popover_once_compat(const uiBut *but);
 void ui_but_pie_dir_visual(RadialDirection dir, float vec[2]);
 void ui_but_pie_dir(RadialDirection dir, float vec[2]);
 float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]);
@@ -695,15 +716,49 @@ struct wmIMEData *ui_but_ime_data_get(uiBut *but);
 #endif
 
 /* interface_widgets.c */
-void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3);
-void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float maxy, float rad, bool use_alpha);
+
+/* Widget shader parameters, must match the shader layout. */
+typedef struct uiWidgetBaseParameters {
+	rctf recti, rect;
+	float radi, rad;
+	float facxi, facyi;
+	float round_corners[4];
+	float color_inner1[4], color_inner2[4];
+	float color_outline[4], color_emboss[4];
+	float color_tria[4];
+	float tria1_center[2], tria2_center[2];
+	float tria1_size, tria2_size;
+	float shade_dir;
+	/* We pack alpha check and discard factor in alpha_discard.
+	 * If the value is negative then we do alpha check.
+	 * The absolute value itself is the discard factor.
+	 * Initialize value to 1.0.f if you don't want discard */
+	float alpha_discard;
+} uiWidgetBaseParameters;
+
+enum {
+	ROUNDBOX_TRIA_NONE = 0,
+	ROUNDBOX_TRIA_ARROWS,
+	ROUNDBOX_TRIA_SCROLL,
+	ROUNDBOX_TRIA_MENU,
+	ROUNDBOX_TRIA_CHECK,
+	ROUNDBOX_TRIA_HOLD_ACTION_ARROW,
+
+	ROUNDBOX_TRIA_MAX, /* don't use */
+};
+
+struct Gwn_Batch *ui_batch_roundbox_get(bool filled, bool antialiased);
+struct Gwn_Batch *ui_batch_roundbox_widget_get(int tria);
+struct Gwn_Batch *ui_batch_roundbox_shadow_get(void);
+
+void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float maxy,
+                           float rad, bool use_alpha, const float color[4]);
 void ui_draw_menu_back(struct uiStyle *style, uiBlock *block, rcti *rect);
+void ui_draw_popover_back(ARegion *ar, struct uiStyle *style, uiBlock *block, rcti *rect);
 void ui_draw_pie_center(uiBlock *block);
 uiWidgetColors *ui_tooltip_get_theme(void);
 void ui_draw_tooltip_background(uiStyle *UNUSED(style), uiBlock *block, rcti *rect);
 void ui_draw_search_back(struct uiStyle *style, uiBlock *block, rcti *rect);
-bool ui_link_bezier_points(const rcti *rect, float coord_array[][2], int resol);
-void ui_draw_link_bezier(const rcti *rect);
 
 extern void ui_draw_but(const struct bContext *C, ARegion *ar, struct uiStyle *style, uiBut *but, rcti *rect);
 /* theme color init */
@@ -718,6 +773,9 @@ void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, const char *na
 /* margin at top of screen for popups */
 #define UI_POPUP_MENU_TOP (int)(8 * UI_DPI_FAC)
 
+#define UI_PIXEL_AA_JITTER 8
+const float ui_pixel_jitter[UI_PIXEL_AA_JITTER][2];
+
 /* interface_style.c */
 void uiStyleInit(void);
 
@@ -736,10 +794,12 @@ void ui_resources_free(void);
 void ui_layout_add_but(uiLayout *layout, uiBut *but);
 void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *searchptr, PropertyRNA *searchprop);
 void ui_layout_list_set_labels_active(uiLayout *layout);
+/* menu callback */
+void ui_item_paneltype_func(struct bContext *C, struct uiLayout *layout, void *arg_pt);
 
 /* interface_align.c */
 bool ui_but_can_align(const uiBut *but) ATTR_WARN_UNUSED_RESULT;
-void ui_block_align_calc(uiBlock *block);
+void ui_block_align_calc(uiBlock *block, const ARegion *region);
 
 /* interface_anim.c */
 void ui_but_anim_flag(uiBut *but, float cfra);
@@ -770,4 +830,20 @@ void UI_OT_eyedropper_depth(struct wmOperatorType *ot);
 /* interface_eyedropper_driver.c */
 void UI_OT_eyedropper_driver(struct wmOperatorType *ot);
 
+/* interface_util.c */
+
+/**
+ * For use with #ui_rna_collection_search_cb.
+ */
+typedef struct uiRNACollectionSearch {
+	PointerRNA target_ptr;
+	PropertyRNA *target_prop;
+
+	PointerRNA search_ptr;
+	PropertyRNA *search_prop;
+
+	bool *but_changed; /* pointer to uiBut.changed */
+} uiRNACollectionSearch;
+void ui_rna_collection_search_cb(const struct bContext *C, void *arg, const char *str, uiSearchItems *items);
+
 #endif  /* __INTERFACE_INTERN_H__ */
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index e267661ec21..ea40c8e8fd8 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -71,6 +71,7 @@
 		return_statement;                                                     \
 	} (void)0                                                                 \
 
+#define UI_ITEM_PROP_SEP_DIVIDE 0.5f
 
 /* uiLayoutRoot */
 
@@ -128,6 +129,7 @@ enum {
 	UI_ITEM_MIN       = 1 << 1,
 
 	UI_ITEM_BOX_ITEM  = 1 << 2, /* The item is "inside" a box item */
+	UI_ITEM_PROP_SEP  = 1 << 3,
 };
 
 typedef struct uiButtonItem {
@@ -151,6 +153,7 @@ struct uiLayout {
 	bool redalert;
 	bool keepaspect;
 	char alignment;
+	char emboss;
 };
 
 typedef struct uiLayoutItemFlow {
@@ -238,9 +241,10 @@ static int ui_layout_vary_direction(uiLayout *layout)
 static int ui_text_icon_width(uiLayout *layout, const char *name, int icon, bool compact)
 {
 	bool variable;
+	const int unit_x = UI_UNIT_X * (layout->scale[0] ? layout->scale[0] : 1.0f);
 
 	if (icon && !name[0])
-		return UI_UNIT_X;  /* icon only */
+		return unit_x;  /* icon only */
 
 	variable = (ui_layout_vary_direction(layout) == UI_ITEM_VARY_X);
 
@@ -249,14 +253,14 @@ static int ui_text_icon_width(uiLayout *layout, const char *name, int icon, bool
 			layout->item.flag |= UI_ITEM_MIN;
 		}
 		const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
-		/* it may seem odd that the icon only adds (UI_UNIT_X / 4)
+		/* it may seem odd that the icon only adds (unit_x / 4)
 		 * but taking margins into account its fine */
 		return (UI_fontstyle_string_width(fstyle, name) +
-		        (UI_UNIT_X * ((compact ? 1.25f : 1.50f) +
-		                      (icon    ? 0.25f : 0.0f))));
+		        (unit_x * ((compact ? 1.25f : 1.50f) +
+		                   (icon    ? 0.25f : 0.0f))));
 	}
 	else {
-		return UI_UNIT_X * 10;
+		return unit_x * 10;
 	}
 }
 
@@ -392,7 +396,7 @@ static void ui_layer_but_cb(bContext *C, void *arg_but, void *arg_index)
 static void ui_item_array(
         uiLayout *layout, uiBlock *block, const char *name, int icon,
         PointerRNA *ptr, PropertyRNA *prop, int len, int x, int y, int w, int UNUSED(h),
-        bool expand, bool slider, bool toggle, bool icon_only)
+        bool expand, bool slider, bool toggle, bool icon_only, bool compact, bool show_text)
 {
 	uiStyle *style = layout->root->style;
 	uiBut *but;
@@ -409,8 +413,9 @@ static void ui_item_array(
 	UI_block_layout_set_current(block, sub);
 
 	/* create label */
-	if (name[0])
+	if (name[0] && show_text) {
 		uiDefBut(block, UI_BTYPE_LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+	}
 
 	/* create buttons */
 	if (type == PROP_BOOLEAN && ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER)) {
@@ -528,7 +533,7 @@ static void ui_item_array(
 			/* layout for known array subtypes */
 			char str[3] = {'\0'};
 
-			if (!icon_only) {
+			if (!icon_only && show_text) {
 				if (type != PROP_BOOLEAN) {
 					str[1] = ':';
 				}
@@ -540,10 +545,21 @@ static void ui_item_array(
 				RNA_property_boolean_get_array(ptr, prop, boolarr);
 			}
 
+			const char *str_buf = show_text ? str: "";
 			for (a = 0; a < len; a++) {
-				if (!icon_only) str[0] = RNA_property_array_item_char(prop, a);
-				if (boolarr) icon = boolarr[a] ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT;
-				but = uiDefAutoButR(block, ptr, prop, a, str, icon, 0, 0, w, UI_UNIT_Y);
+				int width_item;
+
+				if (!icon_only && show_text) {
+					str[0] = RNA_property_array_item_char(prop, a);
+				}
+				if (boolarr) {
+					icon = boolarr[a] ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT;
+				}
+
+				width_item = (compact && type == PROP_BOOLEAN) ?
+				                 min_ii(w, ui_text_icon_width(layout, str_buf, icon, false)) : w;
+
+				but = uiDefAutoButR(block, ptr, prop, a, str_buf, icon, 0, 0, width_item, UI_UNIT_Y);
 				if (slider && but->type == UI_BTYPE_NUM)
 					but->type = UI_BTYPE_NUM_SLIDER;
 				if (toggle && but->type == UI_BTYPE_CHECKBOX)
@@ -669,27 +685,38 @@ static void ui_keymap_but_cb(bContext *UNUSED(C), void *but_v, void *UNUSED(key_
 	RNA_boolean_set(&but->rnapoin, "oskey", (but->modifier_key & KM_OSKEY) != 0);
 }
 
-/* create label + button for RNA property */
-static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int x, int y, int w, int h, int flag)
+/**
+ * Create label + button for RNA property
+ *
+ * \param w_hint: For varying width layout, this becomes the label width.
+ *                Otherwise it's used to fit both items into it.
+ **/
+static uiBut *ui_item_with_label(
+        uiLayout *layout, uiBlock *block, const char *name, int icon,
+        PointerRNA *ptr, PropertyRNA *prop, int index,
+        int x, int y, int w_hint, int h, int flag)
 {
 	uiLayout *sub;
 	uiBut *but = NULL;
 	PropertyType type;
 	PropertySubType subtype;
-	int labelw;
+	int prop_but_width = w_hint;
 
 	sub = uiLayoutRow(layout, layout->align);
 	UI_block_layout_set_current(block, sub);
 
 	if (name[0]) {
-		/* XXX UI_fontstyle_string_width is not accurate */
-#if 0
-		labelw = UI_fontstyle_string_width(fstyle, name);
-		CLAMP(labelw, w / 4, 3 * w / 4);
-#endif
-		labelw = w / 3;
-		uiDefBut(block, UI_BTYPE_LABEL, 0, name, x, y, labelw, h, NULL, 0.0, 0.0, 0, 0, "");
-		w = w - labelw;
+		int w_label;
+
+		if (ui_layout_vary_direction(layout) == UI_ITEM_VARY_X) {
+			/* w_hint is width for label in this case. Use a default width for property button(s) */
+			prop_but_width = UI_UNIT_X * 5;
+			w_label = w_hint;
+		}
+		else {
+			w_label = w_hint / 3;
+		}
+		uiDefBut(block, UI_BTYPE_LABEL, 0, name, x, y, w_label, h, NULL, 0.0, 0.0, 0, 0, "");
 	}
 
 	type = RNA_property_type(prop);
@@ -697,14 +724,14 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *n
 
 	if (subtype == PROP_FILEPATH || subtype == PROP_DIRPATH) {
 		UI_block_layout_set_current(block, uiLayoutRow(sub, true));
-		but = uiDefAutoButR(block, ptr, prop, index, "", icon, x, y, w - UI_UNIT_X, h);
+		but = uiDefAutoButR(block, ptr, prop, index, "", icon, x, y, prop_but_width - UI_UNIT_X, h);
 
 		/* BUTTONS_OT_file_browse calls UI_context_active_but_prop_get_filebrowser */
 		uiDefIconButO(block, UI_BTYPE_BUT, subtype == PROP_DIRPATH ? "BUTTONS_OT_directory_browse" : "BUTTONS_OT_file_browse",
 		              WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL);
 	}
 	else if (flag & UI_ITEM_R_EVENT) {
-		but = uiDefButR_prop(block, UI_BTYPE_KEY_EVENT, 0, name, x, y, w, h, ptr, prop, index, 0, 0, -1, -1, NULL);
+		but = uiDefButR_prop(block, UI_BTYPE_KEY_EVENT, 0, name, x, y, prop_but_width, h, ptr, prop, index, 0, 0, -1, -1, NULL);
 	}
 	else if (flag & UI_ITEM_R_FULL_EVENT) {
 		if (RNA_struct_is_a(ptr->type, &RNA_KeyMapItem)) {
@@ -712,14 +739,17 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *n
 
 			WM_keymap_item_to_string(ptr->data, false, buf, sizeof(buf));
 
-			but = uiDefButR_prop(block, UI_BTYPE_HOTKEY_EVENT, 0, buf, x, y, w, h, ptr, prop, 0, 0, 0, -1, -1, NULL);
+			but = uiDefButR_prop(block, UI_BTYPE_HOTKEY_EVENT, 0, buf, x, y, prop_but_width, h, ptr, prop, 0, 0, 0, -1, -1, NULL);
 			UI_but_func_set(but, ui_keymap_but_cb, but, NULL);
 			if (flag & UI_ITEM_R_IMMEDIATE)
 				UI_but_flag_enable(but, UI_BUT_IMMEDIATE);
 		}
 	}
-	else
-		but = uiDefAutoButR(block, ptr, prop, index, (type == PROP_ENUM && !(flag & UI_ITEM_R_ICON_ONLY)) ? NULL : "", icon, x, y, w, h);
+	else {
+		const char *str = (type == PROP_ENUM && !(flag & UI_ITEM_R_ICON_ONLY)) ? NULL : "";
+		but = uiDefAutoButR(block, ptr, prop, index, str, icon,
+		                    x, y, prop_but_width, h);
+	}
 
 	UI_block_layout_set_current(block, layout);
 	return but;
@@ -820,8 +850,10 @@ static uiBut *uiItemFullO_ptr_ex(
 
 	w = ui_text_icon_width(layout, name, icon, 0);
 
-	if (flag & UI_ITEM_R_NO_BG)
-		UI_block_emboss_set(block, UI_EMBOSS_NONE);
+	int prev_emboss = layout->emboss;
+	if (flag & UI_ITEM_R_NO_BG) {
+		layout->emboss = UI_EMBOSS_NONE;
+	}
 
 	/* create the button */
 	if (icon) {
@@ -842,8 +874,9 @@ static uiBut *uiItemFullO_ptr_ex(
 	if ((layout->root->type == UI_LAYOUT_TOOLBAR) && !icon)
 		but->drawflag |= UI_BUT_TEXT_LEFT;
 
-	if (flag & UI_ITEM_R_NO_BG)
-		UI_block_emboss_set(block, UI_EMBOSS);
+	if (flag & UI_ITEM_R_NO_BG) {
+		layout->emboss = prev_emboss;
+	}
 
 	if (flag & UI_ITEM_O_DEPRESS) {
 		but->flag |= UI_SELECT_DRAW;
@@ -870,7 +903,7 @@ static uiBut *uiItemFullO_ptr_ex(
 	return but;
 }
 
-static void ui_item_hold_menu(struct bContext *C, ARegion *butregion, uiBut *but)
+static void ui_item_menu_hold(struct bContext *C, ARegion *butregion, uiBut *but)
 {
 	uiPopupMenu *pup = UI_popup_menu_begin(C, "", ICON_NONE);
 	uiLayout *layout = UI_popup_menu_layout(pup);
@@ -878,6 +911,24 @@ static void ui_item_hold_menu(struct bContext *C, ARegion *butregion, uiBut *but
 	UI_popup_menu_but_set(pup, butregion, but);
 
 	block->flag |= UI_BLOCK_POPUP_HOLD;
+	block->flag |= UI_BLOCK_IS_FLIP;
+
+	char direction = UI_DIR_DOWN;
+	if (!but->drawstr[0]) {
+		if (butregion->alignment == RGN_ALIGN_LEFT) {
+			direction = UI_DIR_RIGHT;
+		}
+		else if (butregion->alignment == RGN_ALIGN_RIGHT) {
+			direction = UI_DIR_LEFT;
+		}
+		else if (butregion->alignment == RGN_ALIGN_BOTTOM) {
+			direction = UI_DIR_UP;
+		}
+		else {
+			direction = UI_DIR_DOWN;
+		}
+	}
+	UI_block_direction_set(block, direction);
 
 	const char *menu_id = but->hold_argN;
 	MenuType *mt = WM_menutype_find(menu_id, true);
@@ -907,7 +958,7 @@ void uiItemFullOMenuHold_ptr(
         PointerRNA *r_opptr)
 {
 	uiBut *but = uiItemFullO_ptr_ex(layout, ot, name, icon, properties, context, flag, r_opptr);
-	UI_but_func_hold_set(but, ui_item_hold_menu, BLI_strdup(menu_id));
+	UI_but_func_hold_set(but, ui_item_menu_hold, BLI_strdup(menu_id));
 }
 
 void uiItemFullO(
@@ -1300,8 +1351,10 @@ void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname)
 /* RNA property items */
 
 static void ui_item_rna_size(
-        uiLayout *layout, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop,
-        int index, bool icon_only, int *r_w, int *r_h)
+        uiLayout *layout, const char *name, int icon,
+        PointerRNA *ptr, PropertyRNA *prop,
+        int index, bool icon_only, bool compact,
+        int *r_w, int *r_h)
 {
 	PropertyType type;
 	PropertySubType subtype;
@@ -1327,7 +1380,7 @@ static void ui_item_rna_size(
 			RNA_property_enum_items_gettexted(layout->root->block->evil_C, ptr, prop, &item_array, NULL, &free);
 			for (item = item_array; item->identifier; item++) {
 				if (item->identifier[0]) {
-					w = max_ii(w, ui_text_icon_width(layout, item->name, item->icon, 0));
+					w = max_ii(w, ui_text_icon_width(layout, item->name, item->icon, compact));
 				}
 			}
 			if (free) {
@@ -1338,12 +1391,13 @@ static void ui_item_rna_size(
 
 	if (!w) {
 		if (type == PROP_ENUM && icon_only) {
-			w = ui_text_icon_width(layout, "", ICON_BLANK1, 0);
+			w = ui_text_icon_width(layout, "", ICON_BLANK1, compact);
 			if (index != RNA_ENUM_VALUE)
 				w += 0.6f * UI_UNIT_X;
 		}
 		else {
-			w = ui_text_icon_width(layout, name, icon, 0);
+			/* not compact for float/int buttons, looks too squashed */
+			w = ui_text_icon_width(layout, name, icon, ELEM(type, PROP_FLOAT, PROP_INT) ? false : compact);
 		}
 	}
 	h = UI_UNIT_Y;
@@ -1352,7 +1406,8 @@ static void ui_item_rna_size(
 	if (index == RNA_NO_INDEX && len > 0) {
 		if (!name[0] && icon == ICON_NONE)
 			h = 0;
-
+		if (layout->item.flag & UI_ITEM_PROP_SEP)
+			h = 0;
 		if (ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER))
 			h += 2 * UI_UNIT_Y;
 		else if (subtype == PROP_MATRIX)
@@ -1380,8 +1435,9 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	PropertyType type;
 	char namestr[UI_MAX_NAME_STR];
 	int len, w, h;
-	bool slider, toggle, expand, icon_only, no_bg;
+	bool slider, toggle, expand, icon_only, no_bg, compact;
 	bool is_array;
+	const bool use_prop_sep = ((layout->item.flag & UI_ITEM_PROP_SEP) != 0);
 
 	UI_block_layout_set_current(block, layout);
 
@@ -1407,13 +1463,24 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 		/* pass */
 	}
 	else if (ELEM(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_POINTER)) {
-		name = ui_item_name_add_colon(name, namestr);
+		if (use_prop_sep == false) {
+			name = ui_item_name_add_colon(name, namestr);
+		}
 	}
 	else if (type == PROP_BOOLEAN && is_array && index == RNA_NO_INDEX) {
-		name = ui_item_name_add_colon(name, namestr);
+		if (use_prop_sep == false) {
+			name = ui_item_name_add_colon(name, namestr);
+		}
 	}
 	else if (type == PROP_ENUM && index != RNA_ENUM_VALUE) {
-		name = ui_item_name_add_colon(name, namestr);
+		if (flag & UI_ITEM_R_COMPACT) {
+			name = "";
+		}
+		else {
+			if (use_prop_sep == false) {
+				name = ui_item_name_add_colon(name, namestr);
+			}
+		}
 	}
 
 	/* menus and pie-menus don't show checkbox without this */
@@ -1441,16 +1508,76 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	expand = (flag & UI_ITEM_R_EXPAND) != 0;
 	icon_only = (flag & UI_ITEM_R_ICON_ONLY) != 0;
 	no_bg = (flag & UI_ITEM_R_NO_BG) != 0;
+	compact = (flag & UI_ITEM_R_COMPACT) != 0;
 
 	/* get size */
-	ui_item_rna_size(layout, name, icon, ptr, prop, index, icon_only, &w, &h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, index, icon_only, compact, &w, &h);
 
-	if (no_bg)
-		UI_block_emboss_set(block, UI_EMBOSS_NONE);
+	int prev_emboss = layout->emboss;
+	if (no_bg) {
+		layout->emboss = UI_EMBOSS_NONE;
+	}
+
+	/* Split the label / property. */
+	if (use_prop_sep) {
+		if (name[0] == '\0') {
+			/* Ensure we get a column when text is not set. */
+			layout = uiLayoutColumn(layout, true);
+			layout->space = 0;
+		}
+		else {
+			const PropertySubType subtype = RNA_property_subtype(prop);
+			uiLayout *layout_split = uiLayoutSplit(layout, UI_ITEM_PROP_SEP_DIVIDE, true);
+			layout_split->space = 0;
+			uiLayout *layout_sub = uiLayoutColumn(layout_split, true);
+			layout_sub->space = 0;
+
+			if ((index == RNA_NO_INDEX && is_array) &&
+			    ((!expand && ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA, PROP_DIRECTION)) == 0))
+			{
+				char name_with_suffix[UI_MAX_DRAW_STR + 2];
+				char str[2] = {'\0'};
+				for (int a = 0; a < len; a++) {
+					str[0] = RNA_property_array_item_char(prop, a);
+					const bool use_prefix = (a == 0 && name && name[0]);
+					if (use_prefix) {
+						char *s = name_with_suffix;
+						s += STRNCPY_RLEN(name_with_suffix, name);
+						*s++ = ' ';
+						*s++ = str[0];
+						*s++ = '\0';
+					}
+					but = uiDefBut(
+					        block, UI_BTYPE_LABEL, 0, use_prefix ? name_with_suffix : str,
+					        0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+					but->drawflag |= UI_BUT_TEXT_RIGHT;
+					but->drawflag &= ~UI_BUT_TEXT_LEFT;
+				}
+			}
+			else {
+				if (name) {
+					but = uiDefBut(
+					        block, UI_BTYPE_LABEL, 0, name,
+					        0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+					but->drawflag |= UI_BUT_TEXT_RIGHT;
+					but->drawflag &= ~UI_BUT_TEXT_LEFT;
+				}
+			}
+
+			/* Watch out! We can only write into the new column now. */
+			layout = uiLayoutColumn(layout_split, true);
+			layout->space = 0;
+			name = "";
+		}
+	}
+	/* End split. */
 
 	/* array property */
-	if (index == RNA_NO_INDEX && is_array)
-		ui_item_array(layout, block, name, icon, ptr, prop, len, 0, 0, w, h, expand, slider, toggle, icon_only);
+	if (index == RNA_NO_INDEX && is_array) {
+		ui_item_array(
+		        layout, block, name, icon, ptr, prop, len, 0, 0, w, h,
+		        expand, slider, toggle, icon_only, compact, !use_prop_sep);
+	}
 	/* enum item */
 	else if (type == PROP_ENUM && index == RNA_ENUM_VALUE) {
 		if (icon && name[0] && !icon_only)
@@ -1490,8 +1617,9 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 		UI_but_flag_enable(but, UI_BUT_LIST_ITEM);
 	}
 
-	if (no_bg)
-		UI_block_emboss_set(block, UI_EMBOSS);
+	if (no_bg) {
+		layout->emboss = prev_emboss;
+	}
 
 	/* ensure text isn't added to icon_only buttons */
 	if (but && icon_only) {
@@ -1639,94 +1767,6 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname
 
 /* Pointer RNA button with search */
 
-typedef struct CollItemSearch {
-	struct CollItemSearch *next, *prev;
-	char *name;
-	int index;
-	int iconid;
-} CollItemSearch;
-
-static int sort_search_items_list(const void *a, const void *b)
-{
-	const CollItemSearch *cis1 = a;
-	const CollItemSearch *cis2 = b;
-
-	if (BLI_strcasecmp(cis1->name, cis2->name) > 0)
-		return 1;
-	else
-		return 0;
-}
-
-static void rna_search_cb(const struct bContext *C, void *arg_but, const char *str, uiSearchItems *items)
-{
-	uiBut *but = arg_but;
-	char *name;
-	int i = 0, iconid = 0, flag = RNA_property_flag(but->rnaprop);
-	ListBase *items_list = MEM_callocN(sizeof(ListBase), "items_list");
-	CollItemSearch *cis;
-	const bool skip_filter = !but->changed;
-
-	/* build a temporary list of relevant items first */
-	RNA_PROP_BEGIN (&but->rnasearchpoin, itemptr, but->rnasearchprop)
-	{
-		if (flag & PROP_ID_SELF_CHECK)
-			if (itemptr.data == but->rnapoin.id.data)
-				continue;
-
-		/* use filter */
-		if (RNA_property_type(but->rnaprop) == PROP_POINTER) {
-			if (RNA_property_pointer_poll(&but->rnapoin, but->rnaprop, &itemptr) == 0)
-				continue;
-		}
-
-		if (itemptr.type && RNA_struct_is_ID(itemptr.type)) {
-			ID *id = itemptr.data;
-			char name_ui[MAX_ID_NAME];
-
-#if 0       /* this name is used for a string comparison and can't be modified, TODO */
-			/* if ever enabled, make name_ui be MAX_ID_NAME+1 */
-			BKE_id_ui_prefix(name_ui, id);
-#else
-			BLI_strncpy(name_ui, id->name + 2, sizeof(name_ui));
-#endif
-			name = BLI_strdup(name_ui);
-			iconid = ui_id_icon_get(C, id, false);
-		}
-		else {
-			name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */
-			iconid = 0;
-		}
-
-		if (name) {
-			if (skip_filter || BLI_strcasestr(name, str)) {
-				cis = MEM_callocN(sizeof(CollItemSearch), "CollectionItemSearch");
-				cis->name = MEM_dupallocN(name);
-				cis->index = i;
-				cis->iconid = iconid;
-				BLI_addtail(items_list, cis);
-			}
-			MEM_freeN(name);
-		}
-
-		i++;
-	}
-	RNA_PROP_END;
-
-	BLI_listbase_sort(items_list, sort_search_items_list);
-
-	/* add search items from temporary list */
-	for (cis = items_list->first; cis; cis = cis->next) {
-		if (false == UI_search_item_add(items, cis->name, SET_INT_IN_POINTER(cis->index), cis->iconid)) {
-			break;
-		}
-	}
-
-	for (cis = items_list->first; cis; cis = cis->next) {
-		MEM_freeN(cis->name);
-	}
-	BLI_freelistN(items_list);
-	MEM_freeN(items_list);
-}
 
 static void search_id_collection(StructRNA *ptype, PointerRNA *ptr, PropertyRNA **prop)
 {
@@ -1768,6 +1808,8 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
 
 	/* turn button into search button */
 	if (searchprop) {
+		uiRNACollectionSearch *coll_search = MEM_mallocN(sizeof(*coll_search), __func__);
+
 		but->type = UI_BTYPE_SEARCH_MENU;
 		but->hardmax = MAX2(but->hardmax, 256.0f);
 		but->rnasearchpoin = *searchptr;
@@ -1777,13 +1819,22 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
 			but->flag |= UI_BUT_VALUE_CLEAR;
 		}
 
+		coll_search->target_ptr = *ptr;
+		coll_search->target_prop = prop;
+		coll_search->search_ptr = *searchptr;
+		coll_search->search_prop = searchprop;
+		coll_search->but_changed = &but->changed;
+
 		if (RNA_property_type(prop) == PROP_ENUM) {
 			/* XXX, this will have a menu string,
 			 * but in this case we just want the text */
 			but->str[0] = 0;
 		}
 
-		UI_but_func_search_set(but, ui_searchbox_create_generic, rna_search_cb, but, NULL, NULL);
+		UI_but_func_search_set(
+		            but, ui_searchbox_create_generic, ui_rna_collection_search_cb,
+		            coll_search, NULL, NULL);
+		but->free_search_arg = true;
 	}
 	else if (but->type == UI_BTYPE_SEARCH_MENU) {
 		/* In case we fail to find proper searchprop, so other code might have already set but->type to search menu... */
@@ -1847,7 +1898,7 @@ void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, const char *propna
 	/* create button */
 	block = uiLayoutGetBlock(layout);
 
-	ui_item_rna_size(layout, name, icon, ptr, prop, 0, 0, &w, &h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, 0, 0, false, &w, &h);
 	w += UI_UNIT_X; /* X icon needs more space */
 	but = ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h, 0);
 
@@ -1865,6 +1916,15 @@ static void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt)
 	layout->root->block->flag ^= UI_BLOCK_IS_FLIP;
 }
 
+void ui_item_paneltype_func(bContext *C, uiLayout *layout, void *arg_pt)
+{
+	PanelType *pt = (PanelType *)arg_pt;
+	UI_paneltype_draw(C, pt, layout);
+
+	/* panels are created flipped (from event handling pov) */
+	layout->root->block->flag ^= UI_BLOCK_IS_FLIP;
+}
+
 static uiBut *ui_item_menu(
         uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN,
         const char *tip, bool force_menu)
@@ -1875,9 +1935,6 @@ static uiBut *ui_item_menu(
 
 	UI_block_layout_set_current(block, layout);
 
-	if (layout->root->type == UI_LAYOUT_HEADER)
-		UI_block_emboss_set(block, UI_EMBOSS);
-
 	if (!name)
 		name = "";
 	if (layout->root->type == UI_LAYOUT_MENU && !icon)
@@ -1909,9 +1966,6 @@ static uiBut *ui_item_menu(
 		but->func_argN = argN;
 	}
 
-	if (layout->root->type == UI_LAYOUT_HEADER) {
-		UI_block_emboss_set(block, UI_EMBOSS);
-	}
 	if (ELEM(layout->root->type, UI_LAYOUT_PANEL, UI_LAYOUT_TOOLBAR) ||
 	    (force_menu && layout->root->type != UI_LAYOUT_MENU))  /* We never want a dropdown in menu! */
 	{
@@ -1942,6 +1996,82 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const
 	ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL, TIP_(mt->description), false);
 }
 
+/* popover */
+void uiItemPopoverPanel_ptr(uiLayout *layout, bContext *C, PanelType *pt, const char *name, int icon)
+{
+	if (!name) {
+		name = CTX_IFACE_(pt->translation_context, pt->label);
+	}
+
+	if (layout->root->type == UI_LAYOUT_MENU && !icon)
+		icon = ICON_BLANK1;
+
+	uiBut *but = ui_item_menu(layout, name, icon, ui_item_paneltype_func, pt, NULL, NULL, true);
+	but->type = UI_BTYPE_POPOVER;
+	if (pt->poll && (pt->poll(C, pt) == false)) {
+		but->flag |= UI_BUT_DISABLED;
+	}
+}
+
+void uiItemPopoverPanel(
+        uiLayout *layout, bContext *C,
+        int space_id, int region_id, const char *panel_type,
+        const char *name, int icon)
+{
+	SpaceType *st = BKE_spacetype_from_id(space_id);
+	if (st == NULL) {
+		RNA_warning("space type not found %d", space_id);
+		return;
+	}
+	ARegionType *art = BKE_regiontype_from_id(st, region_id);
+	if (art == NULL) {
+		RNA_warning("region type not found %d", region_id);
+		return;
+	}
+
+	PanelType *pt;
+	for (pt = art->paneltypes.first; pt; pt = pt->next) {
+		if (STREQ(pt->idname, panel_type)) {
+			break;
+		}
+	}
+
+	if (pt == NULL) {
+		RNA_warning("area type not found %s", panel_type);
+		return;
+	}
+
+	uiItemPopoverPanel_ptr(layout, C, pt, name, icon);
+}
+
+void uiItemPopoverPanelFromGroup(
+        uiLayout *layout, bContext *C,
+        int space_id, int region_id, const char *context, const char *category)
+{
+	SpaceType *st = BKE_spacetype_from_id(space_id);
+	if (st == NULL) {
+		RNA_warning("space type not found %d", space_id);
+		return;
+	}
+	ARegionType *art = BKE_regiontype_from_id(st, region_id);
+	if (art == NULL) {
+		RNA_warning("region type not found %d", region_id);
+		return;
+	}
+
+	for (PanelType *pt = art->paneltypes.first; pt; pt = pt->next) {
+		/* Causes too many panels, check context. */
+		if (/* (*context == '\0') || */ STREQ(pt->context, context)) {
+			if ((*category == '\0') || STREQ(pt->category, category)) {
+				if (pt->poll == NULL || pt->poll(C, pt)) {
+					uiItemPopoverPanel_ptr(layout, C, pt, NULL, ICON_NONE);
+				}
+			}
+		}
+	}
+}
+
+
 /* label item */
 static uiBut *uiItemL_(uiLayout *layout, const char *name, int icon)
 {
@@ -2857,22 +2987,30 @@ static void ui_litem_layout_overlap(uiLayout *litem)
 	litem->y = y - litem->h;
 }
 
-/* layout create functions */
-uiLayout *uiLayoutRow(uiLayout *layout, int align)
+static void ui_litem_init_from_parent(uiLayout *litem, uiLayout *layout, int align)
 {
-	uiLayout *litem;
-
-	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutRow");
-	litem->item.type = ITEM_LAYOUT_ROW;
 	litem->root = layout->root;
 	litem->align = align;
 	litem->active = true;
 	litem->enabled = true;
 	litem->context = layout->context;
-	litem->space = (align) ? 0 : layout->root->style->buttonspacex;
 	litem->redalert = layout->redalert;
 	litem->w = layout->w;
+	litem->emboss = layout->emboss;
+	litem->item.flag = (layout->item.flag & UI_ITEM_PROP_SEP);
 	BLI_addtail(&layout->items, litem);
+}
+
+/* layout create functions */
+uiLayout *uiLayoutRow(uiLayout *layout, int align)
+{
+	uiLayout *litem;
+
+	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutRow");
+	ui_litem_init_from_parent(litem, layout, align);
+
+	litem->item.type = ITEM_LAYOUT_ROW;
+	litem->space = (align) ? 0 : layout->root->style->buttonspacex;
 
 	UI_block_layout_set_current(layout->root->block, litem);
 
@@ -2884,16 +3022,10 @@ uiLayout *uiLayoutColumn(uiLayout *layout, int align)
 	uiLayout *litem;
 
 	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutColumn");
+	ui_litem_init_from_parent(litem, layout, align);
+
 	litem->item.type = ITEM_LAYOUT_COLUMN;
-	litem->root = layout->root;
-	litem->align = align;
-	litem->active = true;
-	litem->enabled = true;
-	litem->context = layout->context;
-	litem->space = (litem->align) ? 0 : layout->root->style->buttonspacey;
-	litem->redalert = layout->redalert;
-	litem->w = layout->w;
-	BLI_addtail(&layout->items, litem);
+	litem->space = (align) ? 0 : layout->root->style->buttonspacey;
 
 	UI_block_layout_set_current(layout->root->block, litem);
 
@@ -2905,17 +3037,11 @@ uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align)
 	uiLayoutItemFlow *flow;
 
 	flow = MEM_callocN(sizeof(uiLayoutItemFlow), "uiLayoutItemFlow");
+	ui_litem_init_from_parent(&flow->litem, layout, align);
+
 	flow->litem.item.type = ITEM_LAYOUT_COLUMN_FLOW;
-	flow->litem.root = layout->root;
-	flow->litem.align = align;
-	flow->litem.active = true;
-	flow->litem.enabled = true;
-	flow->litem.context = layout->context;
 	flow->litem.space = (flow->litem.align) ? 0 : layout->root->style->columnspace;
-	flow->litem.redalert = layout->redalert;
-	flow->litem.w = layout->w;
 	flow->number = number;
-	BLI_addtail(&layout->items, flow);
 
 	UI_block_layout_set_current(layout->root->block, &flow->litem);
 
@@ -2927,15 +3053,10 @@ static uiLayoutItemBx *ui_layout_box(uiLayout *layout, int type)
 	uiLayoutItemBx *box;
 
 	box = MEM_callocN(sizeof(uiLayoutItemBx), "uiLayoutItemBx");
+	ui_litem_init_from_parent(&box->litem, layout, false);
+
 	box->litem.item.type = ITEM_LAYOUT_BOX;
-	box->litem.root = layout->root;
-	box->litem.active = 1;
-	box->litem.enabled = 1;
-	box->litem.context = layout->context;
 	box->litem.space = layout->root->style->columnspace;
-	box->litem.redalert = layout->redalert;
-	box->litem.w = layout->w;
-	BLI_addtail(&layout->items, box);
 
 	UI_block_layout_set_current(layout->root->block, &box->litem);
 
@@ -2963,14 +3084,9 @@ uiLayout *uiLayoutRadial(uiLayout *layout)
 	}
 
 	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutRadial");
+	ui_litem_init_from_parent(litem, layout, false);
+
 	litem->item.type = ITEM_LAYOUT_RADIAL;
-	litem->root = layout->root;
-	litem->active = true;
-	litem->enabled = true;
-	litem->context = layout->context;
-	litem->redalert = layout->redalert;
-	litem->w = layout->w;
-	BLI_addtail(&layout->root->layout->items, litem);
 
 	UI_block_layout_set_current(layout->root->block, litem);
 
@@ -3027,14 +3143,9 @@ uiLayout *uiLayoutAbsolute(uiLayout *layout, int align)
 	uiLayout *litem;
 
 	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutAbsolute");
+	ui_litem_init_from_parent(litem, layout, align);
+
 	litem->item.type = ITEM_LAYOUT_ABSOLUTE;
-	litem->root = layout->root;
-	litem->align = align;
-	litem->active = 1;
-	litem->enabled = 1;
-	litem->context = layout->context;
-	litem->redalert = layout->redalert;
-	BLI_addtail(&layout->items, litem);
 
 	UI_block_layout_set_current(layout->root->block, litem);
 
@@ -3056,13 +3167,9 @@ uiLayout *uiLayoutOverlap(uiLayout *layout)
 	uiLayout *litem;
 
 	litem = MEM_callocN(sizeof(uiLayout), "uiLayoutOverlap");
+	ui_litem_init_from_parent(litem, layout, false);
+
 	litem->item.type = ITEM_LAYOUT_OVERLAP;
-	litem->root = layout->root;
-	litem->active = true;
-	litem->enabled = true;
-	litem->context = layout->context;
-	litem->redalert = layout->redalert;
-	BLI_addtail(&layout->items, litem);
 
 	UI_block_layout_set_current(layout->root->block, litem);
 
@@ -3074,17 +3181,11 @@ uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align)
 	uiLayoutItemSplit *split;
 
 	split = MEM_callocN(sizeof(uiLayoutItemSplit), "uiLayoutItemSplit");
+	ui_litem_init_from_parent(&split->litem, layout, align);
+
 	split->litem.item.type = ITEM_LAYOUT_SPLIT;
-	split->litem.root = layout->root;
-	split->litem.align = align;
-	split->litem.active = true;
-	split->litem.enabled = true;
-	split->litem.context = layout->context;
 	split->litem.space = layout->root->style->columnspace;
-	split->litem.redalert = layout->redalert;
-	split->litem.w = layout->w;
 	split->percentage = percentage;
-	BLI_addtail(&layout->items, split);
 
 	UI_block_layout_set_current(layout->root->block, &split->litem);
 
@@ -3126,6 +3227,21 @@ void uiLayoutSetScaleY(uiLayout *layout, float scale)
 	layout->scale[1] = scale;
 }
 
+void uiLayoutSetEmboss(uiLayout *layout, char emboss)
+{
+	layout->emboss = emboss;
+}
+
+bool uiLayoutGetPropSep(uiLayout *layout)
+{
+	return (layout->item.flag & UI_ITEM_PROP_SEP) != 0;
+}
+
+void uiLayoutSetPropSep(uiLayout *layout, bool is_sep)
+{
+	SET_FLAG_FROM_TEST(layout->item.flag, is_sep, UI_ITEM_PROP_SEP);
+}
+
 bool uiLayoutGetActive(uiLayout *layout)
 {
 	return layout->active;
@@ -3166,6 +3282,16 @@ float uiLayoutGetScaleY(uiLayout *layout)
 	return layout->scale[1];
 }
 
+int uiLayoutGetEmboss(uiLayout *layout)
+{
+	if (layout->emboss == UI_EMBOSS_UNDEFINED) {
+		return layout->root->block->dt;
+	}
+	else {
+		return layout->emboss;
+	}
+}
+
 /********************** Layout *******************/
 
 static void ui_item_scale(uiLayout *litem, const float scale[2])
@@ -3419,10 +3545,15 @@ uiLayout *UI_block_layout(uiBlock *block, int dir, int type, int x, int y, int s
 	layout->active = 1;
 	layout->enabled = 1;
 	layout->context = NULL;
+	layout->emboss = UI_EMBOSS_UNDEFINED;
 
 	if (type == UI_LAYOUT_MENU || type == UI_LAYOUT_PIEMENU)
 		layout->space = 0;
 
+	if (type == UI_LAYOUT_TOOLBAR) {
+		block->flag |= UI_BLOCK_SHOW_SHORTCUT_ALWAYS;
+	}
+
 	if (dir == UI_LAYOUT_HORIZONTAL) {
 		layout->h = size;
 		layout->root->emh = em * UI_UNIT_Y;
@@ -3479,6 +3610,10 @@ void ui_layout_add_but(uiLayout *layout, uiBut *but)
 		but->context = layout->context;
 		but->context->used = true;
 	}
+
+	if (layout->emboss != UI_EMBOSS_UNDEFINED) {
+		but->dt = layout->emboss;
+	}
 }
 
 void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext)
@@ -3645,6 +3780,18 @@ MenuType *UI_but_menutype_get(uiBut *but)
 	}
 }
 
+/* this is a bit of a hack but best keep it in one place at least */
+PanelType *UI_but_paneltype_get(uiBut *but)
+{
+	if (but->menu_create_func == ui_item_paneltype_func) {
+		return (PanelType *)but->poin;
+	}
+	else {
+		return NULL;
+	}
+}
+
+
 void UI_menutype_draw(bContext *C, MenuType *mt, struct uiLayout *layout)
 {
 	Menu menu = {
@@ -3666,3 +3813,32 @@ void UI_menutype_draw(bContext *C, MenuType *mt, struct uiLayout *layout)
 		CTX_store_set(C, NULL);
 	}
 }
+
+/**
+ * Used for popup panels only.
+ */
+void UI_paneltype_draw(bContext *C, PanelType *pt, uiLayout *layout)
+{
+	Panel *panel = MEM_callocN(sizeof(Panel), "popover panel");
+	panel->type = pt;
+
+	if (layout->context) {
+		CTX_store_set(C, layout->context);
+	}
+
+	if (pt->draw_header) {
+		panel->layout = uiLayoutRow(layout, false);
+		pt->draw_header(C, panel);
+		panel->layout = NULL;
+	}
+
+	panel->layout = layout;
+	pt->draw(C, panel);
+	panel->layout = NULL;
+
+	if (layout->context) {
+		CTX_store_set(C, NULL);
+	}
+
+	MEM_freeN(panel);
+}
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index a8531fad477..5c2fb0e7aaa 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -42,14 +42,20 @@
 #include "BLT_lang.h"
 
 #include "BKE_context.h"
+#include "BKE_idprop.h"
+#include "BKE_layer.h"
 #include "BKE_screen.h"
 #include "BKE_global.h"
+#include "BKE_library_override.h"
 #include "BKE_node.h"
 #include "BKE_text.h" /* for UI_OT_reports_to_text */
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
+#include "RNA_types.h"
 
 #include "UI_interface.h"
 
@@ -328,6 +334,215 @@ static void UI_OT_unset_property_button(wmOperatorType *ot)
 	ot->flag = OPTYPE_UNDO;
 }
 
+
+/* Note that we use different values for UI/UX than 'real' override operations, user does not care
+ * whether it's added or removed for the differential operation e.g. */
+enum {
+	UIOverride_Type_NOOP = 0,
+	UIOverride_Type_Replace = 1,
+	UIOverride_Type_Difference = 2,  /* Add/subtract */
+	UIOverride_Type_Factor = 3,  /* Multiply */
+	/* TODO: should/can we expose insert/remove ones for collections? Doubt it... */
+};
+
+static EnumPropertyItem override_type_items[] = {
+	{UIOverride_Type_NOOP, "NOOP", 0, "NoOp",
+	                      "'No-Operation', place holder preventing automatic override to ever affect the property"},
+	{UIOverride_Type_Replace, "REPLACE", 0, "Replace", "Completely replace value from linked data by local one"},
+	{UIOverride_Type_Difference, "DIFFERENCE", 0, "Difference", "Store difference to linked data value"},
+	{UIOverride_Type_Factor, "FACTOR", 0, "Factor", "Store factor to linked data value (useful e.g. for scale)"},
+	{0, NULL, 0, NULL, NULL}
+};
+
+
+static int override_type_set_button_poll(bContext *C)
+{
+	PointerRNA ptr;
+	PropertyRNA *prop;
+	int index;
+
+	UI_context_active_but_prop_get(C, &ptr, &prop, &index);
+
+	const int override_status = RNA_property_static_override_status(&ptr, prop, index);
+
+	return (ptr.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE));
+}
+
+static int override_type_set_button_exec(bContext *C, wmOperator *op)
+{
+	PointerRNA ptr;
+	PropertyRNA *prop;
+	int index;
+	bool created;
+	const bool all = RNA_boolean_get(op->ptr, "all");
+	const int op_type = RNA_enum_get(op->ptr, "type");
+
+	short operation;
+
+	switch (op_type) {
+		case UIOverride_Type_NOOP:
+			operation = IDOVERRIDESTATIC_OP_NOOP;
+			break;
+		case UIOverride_Type_Replace:
+			operation = IDOVERRIDESTATIC_OP_REPLACE;
+			break;
+		case UIOverride_Type_Difference:
+			operation = IDOVERRIDESTATIC_OP_ADD;  /* override code will automatically switch to subtract if needed. */
+			break;
+		case UIOverride_Type_Factor:
+			operation = IDOVERRIDESTATIC_OP_MULTIPLY;
+			break;
+		default:
+			operation = IDOVERRIDESTATIC_OP_REPLACE;
+			BLI_assert(0);
+			break;
+	}
+
+	/* try to reset the nominated setting to its default value */
+	UI_context_active_but_prop_get(C, &ptr, &prop, &index);
+
+	BLI_assert(ptr.id.data != NULL);
+
+	if (all) {
+		index = -1;
+	}
+
+	IDOverrideStaticPropertyOperation *opop = RNA_property_override_property_operation_get(
+	                                        &ptr, prop, operation, index, true, NULL, &created);
+	if (!created) {
+		opop->operation = operation;
+	}
+
+	return operator_button_property_finish(C, &ptr, prop);
+}
+
+static int override_type_set_button_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+{
+#if 0  /* Disabled for now */
+	return WM_menu_invoke_ex(C, op, WM_OP_INVOKE_DEFAULT);
+#else
+	RNA_enum_set(op->ptr, "type", IDOVERRIDESTATIC_OP_REPLACE);
+	return override_type_set_button_exec(C, op);
+#endif
+}
+
+static void UI_OT_override_type_set_button(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Define Override Type";
+	ot->idname = "UI_OT_override_type_set_button";
+	ot->description = "Create an override operation, or set the type of an existing one";
+
+	/* callbacks */
+	ot->poll = override_type_set_button_poll;
+	ot->exec = override_type_set_button_exec;
+	ot->invoke = override_type_set_button_invoke;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array");
+	ot->prop = RNA_def_enum(ot->srna, "type", override_type_items, UIOverride_Type_Replace,
+	                        "Type", "Type of override operation");
+	/* TODO: add itemf callback, not all options are available for all data types... */
+}
+
+
+static int override_remove_button_poll(bContext *C)
+{
+	PointerRNA ptr;
+	PropertyRNA *prop;
+	int index;
+
+	UI_context_active_but_prop_get(C, &ptr, &prop, &index);
+
+	const int override_status = RNA_property_static_override_status(&ptr, prop, index);
+
+	return (ptr.data && ptr.id.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN));
+}
+
+static int override_remove_button_exec(bContext *C, wmOperator *op)
+{
+	PointerRNA ptr, id_refptr, src;
+	PropertyRNA *prop;
+	int index;
+	const bool all = RNA_boolean_get(op->ptr, "all");
+
+	/* try to reset the nominated setting to its default value */
+	UI_context_active_but_prop_get(C, &ptr, &prop, &index);
+
+	ID *id = ptr.id.data;
+	IDOverrideStaticProperty *oprop = RNA_property_override_property_find(&ptr, prop);
+	BLI_assert(oprop != NULL);
+	BLI_assert(id != NULL && id->override_static != NULL);
+
+	const bool is_template = (id->override_static->reference == NULL);
+
+	/* We need source (i.e. linked data) to restore values of deleted overrides...
+	 * If this is an override template, we obviously do not need to restore anything. */
+	if (!is_template) {
+		RNA_id_pointer_create(id->override_static->reference, &id_refptr);
+		if (!RNA_path_resolve(&id_refptr, oprop->rna_path, &src, NULL)) {
+			BLI_assert(0 && "Failed to create matching source (linked data) RNA pointer");
+		}
+	}
+
+	if (!all && index != -1) {
+		bool is_strict_find;
+		/* Remove override operation for given item, add singular operations for the other items as needed. */
+		IDOverrideStaticPropertyOperation *opop = BKE_override_static_property_operation_find(
+		                                        oprop, NULL, NULL, index, index, false, &is_strict_find);
+		BLI_assert(opop != NULL);
+		if (!is_strict_find) {
+			/* No specific override operation, we have to get generic one,
+			 * and create item-specific override operations for all but given index, before removing generic one. */
+			for (int idx = RNA_property_array_length(&ptr, prop); idx--; ) {
+				if (idx != index) {
+					BKE_override_static_property_operation_get(oprop, opop->operation, NULL, NULL, idx, idx, true, NULL, NULL);
+				}
+			}
+		}
+		BKE_override_static_property_operation_delete(oprop, opop);
+		if (!is_template) {
+			RNA_property_copy(&ptr, &src, prop, index);
+		}
+		if (BLI_listbase_is_empty(&oprop->operations)) {
+			BKE_override_static_property_delete(id->override_static, oprop);
+		}
+	}
+	else {
+		/* Just remove whole generic override operation of this property. */
+		BKE_override_static_property_delete(id->override_static, oprop);
+		if (!is_template) {
+			RNA_property_copy(&ptr, &src, prop, -1);
+		}
+	}
+
+	return operator_button_property_finish(C, &ptr, prop);
+}
+
+static void UI_OT_override_remove_button(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Remove Override";
+	ot->idname = "UI_OT_override_remove_button";
+	ot->description = "Remove an override operation";
+
+	/* callbacks */
+	ot->poll = override_remove_button_poll;
+	ot->exec = override_remove_button_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array");
+}
+
+
+
+
 /* Copy To Selected Operator ------------------------ */
 
 bool UI_context_copy_to_selected_list(
@@ -1118,6 +1333,8 @@ void ED_operatortypes_ui(void)
 	WM_operatortype_append(UI_OT_copy_python_command_button);
 	WM_operatortype_append(UI_OT_reset_default_button);
 	WM_operatortype_append(UI_OT_unset_property_button);
+	WM_operatortype_append(UI_OT_override_type_set_button);
+	WM_operatortype_append(UI_OT_override_remove_button);
 	WM_operatortype_append(UI_OT_copy_to_selected_button);
 	WM_operatortype_append(UI_OT_reports_to_textblock);  /* XXX: temp? */
 	WM_operatortype_append(UI_OT_drop_color);
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 2bb1fc9b144..3847aa72519 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -50,9 +50,6 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
 #include "BLF_api.h"
 
 #include "WM_api.h"
@@ -65,6 +62,8 @@
 #include "UI_interface_icons.h"
 #include "UI_resources.h"
 
+#include "GPU_immediate.h"
+
 #include "interface_intern.h"
 
 /*********************** defines and structs ************************/
@@ -111,6 +110,7 @@ typedef struct uiHandlePanelData {
 	int startsizex, startsizey;
 } uiHandlePanelData;
 
+static int get_panel_real_size_y(Panel *pa);
 static void panel_activate_state(const bContext *C, Panel *pa, uiHandlePanelState state);
 
 /*********************** space specific code ************************/
@@ -134,45 +134,80 @@ static int panel_aligned(ScrArea *sa, ARegion *ar)
 	return 0;
 }
 
-static int panels_re_align(ScrArea *sa, ARegion *ar, Panel **r_pa)
+static bool panel_active_animation_changed(ListBase *lb, Panel **pa_animation, bool *no_animation)
 {
-	Panel *pa;
-	int active = 0;
+	for (Panel *pa = lb->first; pa; pa = pa->next) {
+		/* Detect panel active flag changes. */
+		if (!(pa->type && pa->type->parent)) {
+			if ((pa->runtime_flag & PNL_WAS_ACTIVE) && !(pa->runtime_flag & PNL_ACTIVE)) {
+				return true;
+			}
+			if (!(pa->runtime_flag & PNL_WAS_ACTIVE) && (pa->runtime_flag & PNL_ACTIVE)) {
+				return true;
+			}
+		}
 
-	*r_pa = NULL;
+		if ((pa->runtime_flag & PNL_ACTIVE) && !(pa->flag & PNL_CLOSED)) {
+			if (panel_active_animation_changed(&pa->children, pa_animation, no_animation)) {
+				return true;
+			}
+		}
+
+		/* Detect animation. */
+		if (pa->activedata) {
+			uiHandlePanelData *data = pa->activedata;
+			if (data->state == PANEL_STATE_ANIMATION) {
+				*pa_animation = pa;
+			}
+			else {
+				/* Don't animate while handling other interaction. */
+				*no_animation = true;
+			}
+		}
+		if ((pa->runtime_flag & PNL_ANIM_ALIGN) && !(*pa_animation)) {
+			*pa_animation = pa;
+		}
+	}
+
+	return false;
+}
+
+static bool panels_need_realign(ScrArea *sa, ARegion *ar, Panel **pa_animate)
+{
+	*pa_animate = NULL;
 
 	if (sa->spacetype == SPACE_BUTS && ar->regiontype == RGN_TYPE_WINDOW) {
 		SpaceButs *sbuts = sa->spacedata.first;
 
-		if (sbuts->align)
-			if (sbuts->re_align || sbuts->mainbo != sbuts->mainb)
-				return 1;
+		if (sbuts->align) {
+			if (sbuts->re_align || sbuts->mainbo != sbuts->mainb) {
+				return true;
+			}
+		}
+	}
+	else if (sa->spacetype == SPACE_IMAGE && ar->regiontype == RGN_TYPE_PREVIEW) {
+		return true;
+	}
+	else if (sa->spacetype == SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS) {
+		return true;
 	}
-	else if (sa->spacetype == SPACE_IMAGE && ar->regiontype == RGN_TYPE_PREVIEW)
-		return 1;
-	else if (sa->spacetype == SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS)
-		return 1;
 
-	/* in case panel is added or disappears */
-	for (pa = ar->panels.first; pa; pa = pa->next) {
-		if ((pa->runtime_flag & PNL_WAS_ACTIVE) && !(pa->runtime_flag & PNL_ACTIVE))
-			return 1;
-		if (!(pa->runtime_flag & PNL_WAS_ACTIVE) && (pa->runtime_flag & PNL_ACTIVE))
-			return 1;
-		if (pa->activedata)
-			active = 1;
+	/* Detect if a panel was added or removed. */
+	Panel *pa_animation = NULL;
+	bool no_animation = false;
+	if (panel_active_animation_changed(&ar->panels, &pa_animation, &no_animation)) {
+		return true;
 	}
 
-	/* in case we need to do an animation (size changes) */
-	for (pa = ar->panels.first; pa; pa = pa->next) {
-		if (pa->runtime_flag & PNL_ANIM_ALIGN) {
-			if (!active)
-				*r_pa = pa;
-			return 1;
+	/* Detect panel marked for animation, if we're not already animating. */
+	if (pa_animation) {
+		if (!no_animation) {
+			*pa_animate = pa_animation;
 		}
+		return true;
 	}
 
-	return 0;
+	return false;
 }
 
 /****************************** panels ******************************/
@@ -216,14 +251,14 @@ static void ui_panel_copy_offset(Panel *pa, Panel *papar)
  */
 /* #define UI_USE_PANELTAB */
 
-Panel *UI_panel_find_by_type(ARegion *ar, PanelType *pt)
+Panel *UI_panel_find_by_type(ListBase *lb, PanelType *pt)
 {
 	Panel *pa;
 	const char *idname = pt->idname;
 
 #ifdef UI_USE_PANELTAB
 	const char *tabname = pt->idname;
-	for (pa = ar->panels.first; pa; pa = pa->next) {
+	for (pa = lb->first; pa; pa = pa->next) {
 		if (STREQLEN(pa->panelname, idname, sizeof(pa->panelname))) {
 			if (STREQLEN(pa->tabname, tabname, sizeof(pa->tabname))) {
 				return pa;
@@ -231,7 +266,7 @@ Panel *UI_panel_find_by_type(ARegion *ar, PanelType *pt)
 		}
 	}
 #else
-	for (pa = ar->panels.first; pa; pa = pa->next) {
+	for (pa = lb->first; pa; pa = pa->next) {
 		if (STREQLEN(pa->panelname, idname, sizeof(pa->panelname))) {
 			return pa;
 		}
@@ -244,7 +279,7 @@ Panel *UI_panel_find_by_type(ARegion *ar, PanelType *pt)
 /**
  * \note \a pa should be return value from #UI_panel_find_by_type and can be NULL.
  */
-Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, Panel *pa, bool *r_open)
+Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, ListBase *lb, uiBlock *block, PanelType *pt, Panel *pa, bool *r_open)
 {
 	Panel *palast, *panext;
 	const char *drawname = CTX_IFACE_(pt->translation_context, pt->label);
@@ -276,9 +311,11 @@ Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, P
 		pa->ofsy = 0;
 		pa->sizex = 0;
 		pa->sizey = 0;
+		pa->blocksizex = 0;
+		pa->blocksizey = 0;
 		pa->runtime_flag |= PNL_NEW_ADDED;
 
-		BLI_addtail(&ar->panels, pa);
+		BLI_addtail(lb, pa);
 
 #ifdef UI_USE_PANELTAB
 		BLI_strncpy(pa->tabname, tabname, sizeof(pa->tabname));
@@ -286,7 +323,7 @@ Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, P
 		/* make new Panel tabbed? */
 		if (hookname) {
 			Panel *patab;
-			for (patab = ar->panels.first; patab; patab = patab->next) {
+			for (patab = lb->first; patab; patab = patab->next) {
 				if ((patab->runtime_flag & PNL_ACTIVE) && patab->paneltab == NULL) {
 					if (STREQLEN(hookname, patab->panelname, sizeof(patab->panelname))) {
 						if (STREQLEN(tabname, patab->tabname, sizeof(patab->tabname))) {
@@ -309,6 +346,8 @@ Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, P
 		/* Force update of panels' positions! */
 		pa->sizex = 0;
 		pa->sizey = 0;
+		pa->blocksizex = 0;
+		pa->blocksizey = 0;
 	}
 
 	BLI_strncpy(pa->drawname, drawname, sizeof(pa->drawname));
@@ -316,14 +355,18 @@ Panel *UI_panel_begin(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, P
 	/* if a new panel is added, we insert it right after the panel
 	 * that was last added. this way new panels are inserted in the
 	 * right place between versions */
-	for (palast = ar->panels.first; palast; palast = palast->next)
-		if (palast->runtime_flag & PNL_LAST_ADDED)
+	for (palast = lb->first; palast; palast = palast->next) {
+		if (palast->runtime_flag & PNL_LAST_ADDED) {
+			BLI_remlink(lb, pa);
+			BLI_insertlinkafter(lb, palast, pa);
 			break;
+		}
+	}
 
 	if (newpanel) {
 		pa->sortorder = (palast) ? palast->sortorder + 1 : 0;
 
-		for (panext = ar->panels.first; panext; panext = panext->next)
+		for (panext = lb->first; panext; panext = panext->next)
 			if (panext != pa && panext->sortorder >= pa->sortorder)
 				panext->sortorder++;
 	}
@@ -349,6 +392,19 @@ void UI_panel_end(uiBlock *block, int width, int height)
 {
 	Panel *pa = block->panel;
 
+	/* Set panel size excluding children. */
+	pa->blocksizex = width;
+	pa->blocksizey = height;
+
+	/* Compute total panel size including children. */
+	for (Panel *pachild = pa->children.first; pachild; pachild = pachild->next) {
+		if (pachild->runtime_flag & PNL_ACTIVE) {
+			width = max_ii(width, pachild->sizex);
+			height += get_panel_real_size_y(pachild);
+		}
+	}
+
+	/* Update total panel size. */
 	if (pa->runtime_flag & PNL_NEW_ADDED) {
 		pa->runtime_flag &= ~PNL_NEW_ADDED;
 		pa->sizex = width;
@@ -373,15 +429,13 @@ void UI_panel_end(uiBlock *block, int width, int height)
 static void ui_offset_panel_block(uiBlock *block)
 {
 	uiStyle *style = UI_style_get_dpi();
-	uiBut *but;
-	int ofsy;
 
 	/* compute bounds and offset */
 	ui_block_bounds_calc(block);
 
-	ofsy = block->panel->sizey - style->panelspace;
+	int ofsy = block->panel->sizey - style->panelspace;
 
-	for (but = block->buttons.first; but; but = but->next) {
+	for (uiBut *but = block->buttons.first; but; but = but->next) {
 		but->rect.ymin += ofsy;
 		but->rect.ymax += ofsy;
 	}
@@ -393,54 +447,42 @@ static void ui_offset_panel_block(uiBlock *block)
 
 /**************************** drawing *******************************/
 
-/* extern used by previewrender */
-#if 0 /*UNUSED 2.5*/
-static void uiPanelPush(uiBlock *block)
-{
-	glPushMatrix();
-
-	if (block->panel)
-		glTranslatef((float)block->panel->ofsx, (float)block->panel->ofsy, 0.0);
-}
-
-static void uiPanelPop(uiBlock *UNUSED(block))
-{
-	glPopMatrix();
-}
-#endif
-
 /* triangle 'icon' for panel header */
-void UI_draw_icon_tri(float x, float y, char dir)
+void UI_draw_icon_tri(float x, float y, char dir, const float color[4])
 {
 	float f3 = 0.15 * U.widget_unit;
 	float f5 = 0.25 * U.widget_unit;
 	float f7 = 0.35 * U.widget_unit;
 
 	if (dir == 'h') {
-		ui_draw_anti_tria(x - f3, y - f5, x - f3, y + f5, x + f7, y);
+		UI_draw_anti_tria(x - f3, y - f5, x - f3, y + f5, x + f7, y, color);
 	}
 	else if (dir == 't') {
-		ui_draw_anti_tria(x - f5, y - f7, x + f5, y - f7, x, y + f3);
+		UI_draw_anti_tria(x - f5, y - f7, x + f5, y - f7, x, y + f3, color);
 	}
 	else { /* 'v' = vertical, down */
-		ui_draw_anti_tria(x - f5, y + f3, x + f5, y + f3, x, y - f7);
+		UI_draw_anti_tria(x - f5, y + f3, x + f5, y + f3, x, y - f7, color);
 	}
 }
 
 /* triangle 'icon' inside rect */
 static void ui_draw_tria_rect(const rctf *rect, char dir)
 {
+	float color[4];
+	UI_GetThemeColor3fv(TH_TITLE, color);
+	color[3] = 1.0f;
+
 	if (dir == 'h') {
 		float half = 0.5f * BLI_rctf_size_y(rect);
-		ui_draw_anti_tria(rect->xmin, rect->ymin, rect->xmin, rect->ymax, rect->xmax, rect->ymin + half);
+		UI_draw_anti_tria(rect->xmin, rect->ymin, rect->xmin, rect->ymax, rect->xmax, rect->ymin + half, color);
 	}
 	else {
 		float half = 0.5f * BLI_rctf_size_x(rect);
-		ui_draw_anti_tria(rect->xmin, rect->ymax, rect->xmax, rect->ymax, rect->xmin + half, rect->ymin);
+		UI_draw_anti_tria(rect->xmin, rect->ymax, rect->xmax, rect->ymax, rect->xmin + half, rect->ymin, color);
 	}
 }
 
-static void ui_draw_anti_x(float x1, float y1, float x2, float y2)
+static void ui_draw_anti_x(unsigned int pos, float x1, float y1, float x2, float y2)
 {
 
 	/* set antialias line */
@@ -449,8 +491,15 @@ static void ui_draw_anti_x(float x1, float y1, float x2, float y2)
 
 	glLineWidth(2.0);
 
-	fdrawline(x1, y1, x2, y2);
-	fdrawline(x1, y2, x2, y1);
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x2, y2);
+
+	immVertex2f(pos, x1, y2);
+	immVertex2f(pos, x2, y1);
+
+	immEnd();
 
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
@@ -458,16 +507,16 @@ static void ui_draw_anti_x(float x1, float y1, float x2, float y2)
 }
 
 /* x 'icon' for panel header */
-static void ui_draw_x_icon(float x, float y)
+static void ui_draw_x_icon(unsigned int pos, float x, float y)
 {
 
-	ui_draw_anti_x(x, y, x + 9.375f, y + 9.375f);
+	ui_draw_anti_x(pos, x, y, x + 9.375f, y + 9.375f);
 
 }
 
 #define PNL_ICON    UI_UNIT_X  /* could be UI_UNIT_Y too */
 
-static void ui_draw_panel_scalewidget(const rcti *rect)
+static void ui_draw_panel_scalewidget(unsigned int pos, const rcti *rect)
 {
 	float xmin, xmax, dx;
 	float ymin, ymax, dy;
@@ -481,18 +530,54 @@ static void ui_draw_panel_scalewidget(const rcti *rect)
 	dy = 0.5f * (ymax - ymin);
 
 	glEnable(GL_BLEND);
-	glColor4ub(255, 255, 255, 50);
-	fdrawline(xmin, ymin, xmax, ymax);
-	fdrawline(xmin + dx, ymin, xmax, ymax - dy);
+	immUniformColor4ub(255, 255, 255, 50);
+
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, xmin, ymin);
+	immVertex2f(pos, xmax, ymax);
+
+	immVertex2f(pos, xmin + dx, ymin);
+	immVertex2f(pos, xmax, ymax - dy);
+
+	immEnd();
+
+	immUniformColor4ub(0, 0, 0, 50);
+
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, xmin, ymin + 1);
+	immVertex2f(pos, xmax, ymax + 1);
+
+	immVertex2f(pos, xmin + dx, ymin + 1);
+	immVertex2f(pos, xmax, ymax - dy + 1);
+
+	immEnd();
 
-	glColor4ub(0, 0, 0, 50);
-	fdrawline(xmin, ymin + 1, xmax, ymax + 1);
-	fdrawline(xmin + dx, ymin + 1, xmax, ymax - dy + 1);
 	glDisable(GL_BLEND);
 }
-static void ui_draw_panel_dragwidget(const rctf *rect)
+
+static void immRectf_tris_color_ex(unsigned int pos, float x1, float y1, float x2, float y2,
+                              unsigned int col, const float color[3])
 {
-	unsigned char col_back[3], col_high[3], col_dark[3];
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x1, y1);
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x2, y1);
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x2, y2);
+
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x1, y1);
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x2, y2);
+	immAttrib4fv(col, color);
+	immVertex2f(pos, x1, y2);
+}
+
+static void ui_draw_panel_dragwidget(unsigned int pos, unsigned int col, const rctf *rect)
+{
+	float col_high[4], col_dark[4];
 	const int col_tint = 84;
 
 	const int px = (int)U.pixelsize;
@@ -507,24 +592,24 @@ static void ui_draw_panel_dragwidget(const rctf *rect)
 	const int x_ofs = y_ofs;
 	int i_x, i_y;
 
-
-	UI_GetThemeColor3ubv(UI_GetThemeValue(TH_PANEL_SHOW_HEADER) ? TH_PANEL_HEADER : TH_PANEL_BACK, col_back);
-	UI_GetColorPtrShade3ubv(col_back, col_high,  col_tint);
-	UI_GetColorPtrShade3ubv(col_back, col_dark, -col_tint);
-
+	int col_id = UI_GetThemeValue(TH_PANEL_SHOW_HEADER) ? TH_PANEL_HEADER : TH_PANEL_BACK;
+	UI_GetThemeColorShade4fv(col_id,  col_tint, col_high);
+	UI_GetThemeColorShade4fv(col_id, -col_tint, col_dark);
 
 	/* draw multiple boxes */
+	immBegin(GWN_PRIM_TRIS, 4 * 2 * (6 * 2));
 	for (i_x = 0; i_x < 4; i_x++) {
 		for (i_y = 0; i_y < 2; i_y++) {
 			const int x_co = (x_min + x_ofs) + (i_x * (box_size + box_margin));
 			const int y_co = (y_min + y_ofs) + (i_y * (box_size + box_margin));
 
-			glColor3ubv(col_dark);
-			glRectf(x_co - box_size, y_co - px_zoom, x_co, (y_co + box_size) - px_zoom);
-			glColor3ubv(col_high);
-			glRectf(x_co - box_size, y_co, x_co, y_co + box_size);
+			immRectf_tris_color_ex(pos, x_co - box_size, y_co - px_zoom, x_co, (y_co + box_size) - px_zoom,
+			                       col, col_dark);
+			immRectf_tris_color_ex(pos, x_co - box_size, y_co, x_co, y_co + box_size,
+			                       col, col_high);
 		}
 	}
+	immEnd();
 }
 
 
@@ -534,6 +619,7 @@ static void ui_draw_aligned_panel_header(uiStyle *style, uiBlock *block, const r
 	rcti hrect;
 	int pnl_icons;
 	const char *activename = panel->drawname[0] ? panel->drawname : panel->panelname;
+	unsigned char col_title[4];
 
 	/* + 0.001f to avoid flirting with float inaccuracy */
 	if (panel->control & UI_PNL_CLOSE)
@@ -541,22 +627,22 @@ static void ui_draw_aligned_panel_header(uiStyle *style, uiBlock *block, const r
 	else
 		pnl_icons = (panel->labelofs + PNL_ICON + 5) / block->aspect + 0.001f;
 
-	/* active tab */
 	/* draw text label */
-	UI_ThemeColor(TH_TITLE);
+	UI_GetThemeColor3ubv(TH_TITLE, col_title);
+	col_title[3] = 255;
 
 	hrect = *rect;
 	if (dir == 'h') {
 		hrect.xmin = rect->xmin + pnl_icons;
 		hrect.ymin += 2.0f / block->aspect;
-		UI_fontstyle_draw(&style->paneltitle, &hrect, activename);
+		UI_fontstyle_draw(&style->paneltitle, &hrect, activename, col_title);
 	}
 	else {
 		/* ignore 'pnl_icons', otherwise the text gets offset horizontally
 		 * + 0.001f to avoid flirting with float inaccuracy
 		 */
 		hrect.xmin = rect->xmin + (PNL_ICON + 5) / block->aspect + 0.001f;
-		UI_fontstyle_draw_rotated(&style->paneltitle, &hrect, activename);
+		UI_fontstyle_draw_rotated(&style->paneltitle, &hrect, activename, col_title);
 	}
 }
 
@@ -566,9 +652,11 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 	Panel *panel = block->panel;
 	rcti headrect;
 	rctf itemrect;
-	int ofsx;
+	float color[4];
 	const bool is_closed_x = (panel->flag & PNL_CLOSEDX) ? true : false;
 	const bool is_closed_y = (panel->flag & PNL_CLOSEDY) ? true : false;
+	const bool is_subpanel = (panel->type && panel->type->parent);
+	const bool show_drag = !is_subpanel;
 
 	if (panel->paneltab) return;
 	if (panel->type && (panel->type->flag & PNL_NO_HEADER)) return;
@@ -579,7 +667,10 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 	headrect.ymin = headrect.ymax;
 	headrect.ymax = headrect.ymin + floor(PNL_HEADER / block->aspect + 0.001f);
 
-	{
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	if (!is_subpanel) {
 		float minx = rect->xmin;
 		float maxx = is_closed_x ? (minx + PNL_HEADER / block->aspect) : rect->xmax;
 		float y = headrect.ymax;
@@ -588,11 +679,18 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 
 		if (UI_GetThemeValue(TH_PANEL_SHOW_HEADER)) {
 			/* draw with background color */
-			UI_ThemeColor4(TH_PANEL_HEADER);
-			glRectf(minx, headrect.ymin + 1, maxx, y);
+			immUniformThemeColor(TH_PANEL_HEADER);
+			immRectf(pos, minx, headrect.ymin + 1, maxx, y);
+
+			immBegin(GWN_PRIM_LINES, 4);
+
+			immVertex2f(pos, minx, y);
+			immVertex2f(pos, maxx, y);
+
+			immVertex2f(pos, minx, y);
+			immVertex2f(pos, maxx, y);
 
-			fdrawline(minx, y, maxx, y);
-			fdrawline(minx, y, maxx, y);
+			immEnd();
 		}
 		else if (!(panel->runtime_flag & PNL_FIRST)) {
 			/* draw embossed separator */
@@ -602,15 +700,26 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 				maxx -= 5.0f / block->aspect;
 			}
 
-			glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
-			fdrawline(minx, y, maxx, y);
-			glColor4f(1.0f, 1.0f, 1.0f, 0.25f);
-			fdrawline(minx, y - 1, maxx, y - 1);
+			immUniformColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, minx, y);
+			immVertex2f(pos, maxx, y);
+			immEnd();
+
+			immUniformColor4f(1.0f, 1.0f, 1.0f, 0.25f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, minx, y - 1);
+			immVertex2f(pos, maxx, y - 1);
+			immEnd();
 		}
 
 		glDisable(GL_BLEND);
 	}
 
+	immUnbindProgram();
+
 	/* draw optional pin icon */
 
 #ifdef USE_PIN_HIDDEN
@@ -626,18 +735,31 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 		glDisable(GL_BLEND);
 	}
 
+
 	/* horizontal title */
 	if (is_closed_x == false) {
 		ui_draw_aligned_panel_header(style, block, &headrect, 'h');
 
-		/* itemrect smaller */
-		itemrect.xmax = headrect.xmax - 5.0f / block->aspect;
-		itemrect.xmin = itemrect.xmax - BLI_rcti_size_y(&headrect);
-		itemrect.ymin = headrect.ymin;
-		itemrect.ymax = headrect.ymax;
-
-		BLI_rctf_scale(&itemrect, 0.7f);
-		ui_draw_panel_dragwidget(&itemrect);
+		if (show_drag) {
+			unsigned int col;
+			Gwn_VertFormat *format = immVertexFormat();
+			pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+			/* itemrect smaller */
+			itemrect.xmax = headrect.xmax - 5.0f / block->aspect;
+			itemrect.xmin = itemrect.xmax - BLI_rcti_size_y(&headrect);
+			itemrect.ymin = headrect.ymin;
+			itemrect.ymax = headrect.ymax;
+
+			BLI_rctf_scale(&itemrect, 0.7f);
+			immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+			ui_draw_panel_dragwidget(pos, col, &itemrect);
+			immUnbindProgram();
+
+			/* Restore format for the following draws. */
+			pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		}
 	}
 
 	/* if the panel is minimized vertically:
@@ -649,6 +771,7 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 	else if (is_closed_x) {
 		/* draw vertical title */
 		ui_draw_aligned_panel_header(style, block, &headrect, 'v');
+		pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 	}
 	/* an open panel */
 	else {
@@ -657,41 +780,49 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 			if (panel->control & UI_PNL_SOLID) UI_draw_roundbox_corner_set(UI_CNR_ALL);
 			else UI_draw_roundbox_corner_set(UI_CNR_NONE);
 
-			UI_ThemeColorShade(TH_BACK, -120);
-			UI_draw_roundbox_unfilled(0.5f + rect->xmin, 0.5f + rect->ymin, 0.5f + rect->xmax, 0.5f + headrect.ymax + 1, 8);
+			UI_GetThemeColorShade4fv(TH_BACK, -120, color);
+			UI_draw_roundbox_aa(false, 0.5f + rect->xmin, 0.5f + rect->ymin, 0.5f + rect->xmax, 0.5f + headrect.ymax + 1, 8, color);
 		}
 
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		/* panel backdrop */
-		if (UI_GetThemeValue(TH_PANEL_SHOW_BACK)) {
-			/* draw with background color */
+		if (is_subpanel) {
 			glEnable(GL_BLEND);
-			UI_ThemeColor4(TH_PANEL_BACK);
-			glRecti(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+			immUniformThemeColor(TH_PANEL_SUB_BACK);
+			immRectf(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+		}
+		else if (UI_GetThemeValue(TH_PANEL_SHOW_BACK)) {
+			glEnable(GL_BLEND);
+			immUniformThemeColor(TH_PANEL_BACK);
+			immRectf(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 		}
 
 		if (panel->control & UI_PNL_SCALE)
-			ui_draw_panel_scalewidget(rect);
+			ui_draw_panel_scalewidget(pos, rect);
+
+		immUnbindProgram();
 	}
 
 	/* draw optional close icon */
 
-	ofsx = 6;
 	if (panel->control & UI_PNL_CLOSE) {
-		UI_ThemeColor(TH_TITLE);
-		ui_draw_x_icon(rect->xmin + 2 + ofsx, rect->ymax + 2);
-		ofsx = 22;
+		const int ofsx = 6;
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor3(TH_TITLE);
+		ui_draw_x_icon(pos, rect->xmin + 2 + ofsx, rect->ymax + 2);
+		immUnbindProgram();
 	}
 
 	/* draw collapse icon */
-	UI_ThemeColor(TH_TITLE);
 
 	/* itemrect smaller */
-	itemrect.xmin = headrect.xmin + 5.0f / block->aspect;
+	itemrect.xmin = headrect.xmin + 3.0f / block->aspect;
 	itemrect.xmax = itemrect.xmin + BLI_rcti_size_y(&headrect);
 	itemrect.ymin = headrect.ymin;
 	itemrect.ymax = headrect.ymax;
 
-	BLI_rctf_scale(&itemrect, 0.35f);
+	BLI_rctf_scale(&itemrect, 0.25f);
 
 	if (is_closed_y)
 		ui_draw_tria_rect(&itemrect, 'h');
@@ -699,8 +830,6 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, const rcti *rect, con
 		ui_draw_tria_rect(&itemrect, 'h');
 	else
 		ui_draw_tria_rect(&itemrect, 'v');
-
-	(void)ofsx;
 }
 
 /************************** panel alignment *************************/
@@ -721,6 +850,16 @@ static int get_panel_size_y(Panel *pa)
 	return PNL_HEADER + pa->sizey;
 }
 
+static int get_panel_real_size_y(Panel *pa)
+{
+	int sizey = (pa->flag & PNL_CLOSED) ? 0 : pa->sizey;
+
+	if (pa->type && (pa->type->flag & PNL_NO_HEADER))
+		return sizey;
+
+	return PNL_HEADER + sizey;
+}
+
 /* this function is needed because uiBlock and Panel itself don't
  * change sizey or location when closed */
 static int get_panel_real_ofsy(Panel *pa)
@@ -793,6 +932,24 @@ static int compare_panel(const void *a1, const void *a2)
 	return 0;
 }
 
+static void align_sub_panels(Panel *pa)
+{
+	/* Position sub panels. */
+	int ofsy = get_panel_real_ofsy(pa) + pa->sizey - pa->blocksizey;
+
+	for (Panel *pachild = pa->children.first; pachild; pachild = pachild->next) {
+		if (pachild->runtime_flag & PNL_ACTIVE) {
+			pachild->ofsx = pa->ofsx;
+			pachild->ofsy = ofsy - get_panel_size_y(pachild);
+			ofsy -= get_panel_real_size_y(pachild);
+
+			if (pachild->children.first) {
+				align_sub_panels(pachild);
+			}
+		}
+	}
+}
+
 /* this doesnt draw */
 /* returns 1 when it did something */
 static bool uiAlignPanelStep(ScrArea *sa, ARegion *ar, const float fac, const bool drag)
@@ -884,10 +1041,17 @@ static bool uiAlignPanelStep(ScrArea *sa, ARegion *ar, const float fac, const bo
 		}
 	}
 
-	/* copy locations to tabs */
-	for (pa = ar->panels.first; pa; pa = pa->next)
-		if (pa->paneltab && (pa->runtime_flag & PNL_ACTIVE))
-			ui_panel_copy_offset(pa, pa->paneltab);
+	/* set locations for tabbed and sub panels */
+	for (pa = ar->panels.first; pa; pa = pa->next) {
+		if (pa->runtime_flag & PNL_ACTIVE) {
+			if (pa->paneltab) {
+				ui_panel_copy_offset(pa, pa->paneltab);
+			}
+			if (pa->children.first) {
+				align_sub_panels(pa);
+			}
+		}
+	}
 
 	/* free panelsort array */
 	for (ps = panelsort, a = 0; a < tot; a++, ps++) {
@@ -957,20 +1121,27 @@ static void ui_do_animate(const bContext *C, Panel *panel)
 	}
 }
 
-void UI_panels_begin(const bContext *UNUSED(C), ARegion *ar)
+static void panel_list_clear_active(ListBase *lb)
 {
-	Panel *pa;
-
 	/* set all panels as inactive, so that at the end we know
 	 * which ones were used */
-	for (pa = ar->panels.first; pa; pa = pa->next) {
-		if (pa->runtime_flag & PNL_ACTIVE)
+	for (Panel *pa = lb->first; pa; pa = pa->next) {
+		if (pa->runtime_flag & PNL_ACTIVE) {
 			pa->runtime_flag = PNL_WAS_ACTIVE;
-		else
+		}
+		else {
 			pa->runtime_flag = 0;
+		}
+
+		panel_list_clear_active(&pa->children);
 	}
 }
 
+void UI_panels_begin(const bContext *UNUSED(C), ARegion *ar)
+{
+	panel_list_clear_active(&ar->panels);
+}
+
 /* only draws blocks with panels */
 void UI_panels_end(const bContext *C, ARegion *ar, int *x, int *y)
 {
@@ -1009,8 +1180,7 @@ void UI_panels_end(const bContext *C, ARegion *ar, int *x, int *y)
 	}
 
 	/* re-align, possibly with animation */
-	if (panels_re_align(sa, ar, &pa)) {
-		/* XXX code never gets here... PNL_ANIM_ALIGN flag is never set */
+	if (panels_need_realign(sa, ar, &pa)) {
 		if (pa)
 			panel_activate_state(C, pa, PANEL_STATE_ANIMATION);
 		else
@@ -1037,14 +1207,16 @@ void UI_panels_draw(const bContext *C, ARegion *ar)
 
 	UI_ThemeClearColor(TH_BACK);
 
-	/* draw panels, selected on top */
-	for (block = ar->uiblocks.first; block; block = block->next) {
+	/* Draw panels, selected on top. Also in reverse order, because
+	 * UI blocks are added in reverse order and we need child panels
+	 * to draw on top. */
+	for (block = ar->uiblocks.last; block; block = block->prev) {
 		if (block->active && block->panel && !(block->panel->flag & PNL_SELECT)) {
 			UI_block_draw(C, block);
 		}
 	}
 
-	for (block = ar->uiblocks.first; block; block = block->next) {
+	for (block = ar->uiblocks.last; block; block = block->prev) {
 		if (block->active && block->panel && (block->panel->flag & PNL_SELECT)) {
 			UI_block_draw(C, block);
 		}
@@ -1306,6 +1478,8 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in
 #else
 	const bool show_pin = UI_panel_category_is_visible(ar);
 #endif
+	const bool is_subpanel = (block->panel->type && block->panel->type->parent);
+	const bool show_drag = !is_subpanel;
 
 	int align = panel_aligned(sa, ar), button = 0;
 
@@ -1400,7 +1574,7 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in
 		else
 			ED_region_tag_redraw(ar);
 	}
-	else if (BLI_rctf_isect_x(&rect_drag, mx)) {
+	else if (show_drag && BLI_rctf_isect_x(&rect_drag, mx)) {
 		panel_activate_state(C, block->panel, PANEL_STATE_DRAG);
 	}
 	else if (show_pin && BLI_rctf_isect_x(&rect_pin, mx)) {
@@ -1513,12 +1687,13 @@ void UI_panel_category_clear_all(ARegion *ar)
 	BLI_freelistN(&ar->panels_category);
 }
 
-/* based on UI_draw_roundbox_gl_mode, check on making a version which allows us to skip some sides */
+/* based on UI_draw_roundbox, check on making a version which allows us to skip some sides */
 static void ui_panel_category_draw_tab(
-        int mode, float minx, float miny, float maxx, float maxy, float rad,
+        bool filled, float minx, float miny, float maxx, float maxy, float rad,
         int roundboxtype,
-        const bool use_highlight, const bool use_shadow,
-        const unsigned char highlight_fade[3])
+        bool use_highlight, bool use_shadow,
+        const unsigned char highlight_fade[3],
+        const unsigned char col[3])
 {
 	float vec[4][2] = {
 	    {0.195, 0.02},
@@ -1527,74 +1702,113 @@ static void ui_panel_category_draw_tab(
 	    {0.98, 0.805}};
 	int a;
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
 	/* mult */
 	for (a = 0; a < 4; a++) {
 		mul_v2_fl(vec[a], rad);
 	}
 
-	glBegin(mode);
+	unsigned int vert_ct = 0;
+	if (use_highlight) {
+		vert_ct += (roundboxtype & UI_CNR_TOP_RIGHT) ? 6 : 1;
+		vert_ct += (roundboxtype & UI_CNR_TOP_LEFT) ? 6 : 1;
+	}
+	if (use_highlight && !use_shadow) {
+		vert_ct++;
+	}
+	else {
+		vert_ct += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 6 : 1;
+		vert_ct += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 6 : 1;
+	}
+
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+	immBegin(filled ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_STRIP, vert_ct);
 
 	/* start with corner right-top */
 	if (use_highlight) {
 		if (roundboxtype & UI_CNR_TOP_RIGHT) {
-			glVertex2f(maxx, maxy - rad);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, maxx, maxy - rad);
 			for (a = 0; a < 4; a++) {
-				glVertex2f(maxx - vec[a][1], maxy - rad + vec[a][0]);
+				immAttrib3ubv(color, col);
+				immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
 			}
-			glVertex2f(maxx - rad, maxy);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, maxx - rad, maxy);
 		}
 		else {
-			glVertex2f(maxx, maxy);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, maxx, maxy);
 		}
 
 		/* corner left-top */
 		if (roundboxtype & UI_CNR_TOP_LEFT) {
-			glVertex2f(minx + rad, maxy);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, minx + rad, maxy);
 			for (a = 0; a < 4; a++) {
-				glVertex2f(minx + rad - vec[a][0], maxy - vec[a][1]);
+				immAttrib3ubv(color, col);
+				immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
 			}
-			glVertex2f(minx, maxy - rad);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, minx, maxy - rad);
 		}
 		else {
-			glVertex2f(minx, maxy);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, minx, maxy);
 		}
 	}
 
 	if (use_highlight && !use_shadow) {
 		if (highlight_fade) {
-			glColor3ubv(highlight_fade);
+			immAttrib3ubv(color, highlight_fade);
 		}
-		glVertex2f(minx, miny + rad);
-		glEnd();
+		else {
+			immAttrib3ubv(color, col);
+		}
+		immVertex2f(pos, minx, miny + rad);
+		immEnd();
+		immUnbindProgram();
 		return;
 	}
 
 	/* corner left-bottom */
 	if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
-		glVertex2f(minx, miny + rad);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, minx, miny + rad);
 		for (a = 0; a < 4; a++) {
-			glVertex2f(minx + vec[a][1], miny + rad - vec[a][0]);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
 		}
-		glVertex2f(minx + rad, miny);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, minx + rad, miny);
 	}
 	else {
-		glVertex2f(minx, miny);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, minx, miny);
 	}
 
 	/* corner right-bottom */
-
 	if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
-		glVertex2f(maxx - rad, miny);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, maxx - rad, miny);
 		for (a = 0; a < 4; a++) {
-			glVertex2f(maxx - rad + vec[a][0], miny + vec[a][1]);
+			immAttrib3ubv(color, col);
+			immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
 		}
-		glVertex2f(maxx, miny + rad);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, maxx, miny + rad);
 	}
 	else {
-		glVertex2f(maxx, miny);
+		immAttrib3ubv(color, col);
+		immVertex2f(pos, maxx, miny);
 	}
 
-	glEnd();
+	immEnd();
+	immUnbindProgram();
 }
 
 
@@ -1717,21 +1931,26 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 	/* begin drawing */
 	glEnable(GL_LINE_SMOOTH);
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* draw the background */
 	if (is_alpha) {
 		glEnable(GL_BLEND);
-		glColor4ubv(theme_col_tab_bg);
+		immUniformColor4ubv(theme_col_tab_bg);
 	}
 	else {
-		glColor3ubv(theme_col_tab_bg);
+		immUniformColor3ubv(theme_col_tab_bg);
 	}
 
-	glRecti(v2d->mask.xmin, v2d->mask.ymin, v2d->mask.xmin + category_tabs_width, v2d->mask.ymax);
+	immRecti(pos, v2d->mask.xmin, v2d->mask.ymin, v2d->mask.xmin + category_tabs_width, v2d->mask.ymax);
 
 	if (is_alpha) {
 		glDisable(GL_BLEND);
 	}
 
+	immUnbindProgram();
+
 	for (pc_dyn = ar->panels_category.first; pc_dyn; pc_dyn = pc_dyn->next) {
 		const rcti *rct = &pc_dyn->rect;
 		const char *category_id = pc_dyn->idname;
@@ -1754,28 +1973,33 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 		if (is_active)
 #endif
 		{
-			glColor3ubv(is_active ? theme_col_tab_active : theme_col_tab_inactive);
-			ui_panel_category_draw_tab(GL_POLYGON, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
-			                           tab_curve_radius - px, roundboxtype, true, true, NULL);
+			ui_panel_category_draw_tab(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
+			                           tab_curve_radius - px, roundboxtype, true, true, NULL,
+			                           is_active ? theme_col_tab_active : theme_col_tab_inactive);
 
 			/* tab outline */
-			glColor3ubv(theme_col_tab_outline);
-			ui_panel_category_draw_tab(GL_LINE_STRIP, rct->xmin - px, rct->ymin - px, rct->xmax - px, rct->ymax + px,
-			                           tab_curve_radius, roundboxtype, true, true, NULL);
+			ui_panel_category_draw_tab(false, rct->xmin - px, rct->ymin - px, rct->xmax - px, rct->ymax + px,
+			                           tab_curve_radius, roundboxtype, true, true, NULL, theme_col_tab_outline);
+
 			/* tab highlight (3d look) */
-			glColor3ubv(is_active ? theme_col_tab_highlight : theme_col_tab_highlight_inactive);
-			ui_panel_category_draw_tab(GL_LINE_STRIP, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
+			ui_panel_category_draw_tab(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
 			                           tab_curve_radius, roundboxtype, true, false,
-			                           is_active ? theme_col_back : theme_col_tab_inactive);
+			                           is_active ? theme_col_back : theme_col_tab_inactive,
+			                           is_active ? theme_col_tab_highlight : theme_col_tab_highlight_inactive);
 		}
 
 		/* tab blackline */
 		if (!is_active) {
-			glColor3ubv(theme_col_tab_divider);
-			glRecti(v2d->mask.xmin + category_tabs_width - px,
-			        rct->ymin - tab_v_pad,
-			        v2d->mask.xmin + category_tabs_width,
-			        rct->ymax + tab_v_pad);
+			pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+			immUniformColor3ubv(theme_col_tab_divider);
+			immRecti(pos, v2d->mask.xmin + category_tabs_width - px,
+			         rct->ymin - tab_v_pad,
+			         v2d->mask.xmin + category_tabs_width,
+			         rct->ymax + tab_v_pad);
+
+			immUnbindProgram();
 		}
 
 		if (do_scaletabs) {
@@ -1788,7 +2012,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 		/* tab titles */
 
 		/* draw white shadow to give text more depth */
-		glColor3ubv(theme_col_text);
+		BLF_color3ubv(fontid, theme_col_text);
 
 		/* main tab title */
 		BLF_draw(fontid, category_id_draw, category_draw_len);
@@ -1796,33 +2020,36 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 		glDisable(GL_BLEND);
 
 		/* tab blackline remaining (last tab) */
+		pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 		if (pc_dyn->prev == NULL) {
-			glColor3ubv(theme_col_tab_divider);
-			glRecti(v2d->mask.xmin + category_tabs_width - px,
-			        rct->ymax + px,
-			        v2d->mask.xmin + category_tabs_width,
-			        v2d->mask.ymax);
+			immUniformColor3ubv(theme_col_tab_divider);
+			immRecti(pos, v2d->mask.xmin + category_tabs_width - px,
+			         rct->ymax + px,
+			         v2d->mask.xmin + category_tabs_width,
+			         v2d->mask.ymax);
 		}
 		if (pc_dyn->next == NULL) {
-			glColor3ubv(theme_col_tab_divider);
-			glRecti(v2d->mask.xmin + category_tabs_width - px,
-			        0,
-			        v2d->mask.xmin + category_tabs_width,
-			        rct->ymin);
+			immUniformColor3ubv(theme_col_tab_divider);
+			immRecti(pos, v2d->mask.xmin + category_tabs_width - px,
+			         0,
+			         v2d->mask.xmin + category_tabs_width,
+			         rct->ymin);
 		}
 
 #ifdef USE_FLAT_INACTIVE
 		/* draw line between inactive tabs */
 		if (is_active == false && is_active_prev == false && pc_dyn->prev) {
-			glColor3ubv(theme_col_tab_divider);
-			glRecti(v2d->mask.xmin + (category_tabs_width / 5),
-			        rct->ymax + px,
-			        (v2d->mask.xmin + category_tabs_width) - (category_tabs_width / 5),
-			        rct->ymax + (px * 3));
+			immUniformColor3ubv(theme_col_tab_divider);
+			immRecti(pos, v2d->mask.xmin + (category_tabs_width / 5),
+			         rct->ymax + px,
+			         (v2d->mask.xmin + category_tabs_width) - (category_tabs_width / 5),
+			         rct->ymax + (px * 3));
 		}
 
 		is_active_prev = is_active;
 #endif
+		immUnbindProgram();
 
 		/* not essential, but allows events to be handled right up until the region edge [#38171] */
 		pc_dyn->rect.xmin = v2d->mask.xmin;
@@ -1899,6 +2126,11 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar, cons
 
 	retval = WM_UI_HANDLER_CONTINUE;
 
+	/* Scrollbars can overlap panels now, they have handling priority. */
+	if (UI_view2d_mouse_in_scrollers(ar, &ar->v2d, event->x, event->y)) {
+		return retval;
+	}
+
 	/* handle category tabs */
 	if (has_category_tabs) {
 		if (event->val == KM_PRESS) {
@@ -2149,3 +2381,14 @@ static void panel_activate_state(const bContext *C, Panel *pa, uiHandlePanelStat
 	ED_region_tag_redraw(ar);
 }
 
+PanelType *UI_paneltype_find(int space_id, int region_id, const char *idname)
+{
+	SpaceType *st = BKE_spacetype_from_id(space_id);
+	if (st) {
+		ARegionType *art = BKE_regiontype_from_id(st, region_id);
+		if (art) {
+			return BLI_findstring(&art->paneltypes, idname, offsetof(PanelType, idname));
+		}
+	}
+	return NULL;
+}
diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c
index 37a603d967f..0c43b787a84 100644
--- a/source/blender/editors/interface/interface_region_menu_pie.c
+++ b/source/blender/editors/interface/interface_region_menu_pie.c
@@ -76,7 +76,7 @@ static uiBlock *ui_block_func_PIE(bContext *UNUSED(C), uiPopupBlockHandle *handl
 	uiPieMenu *pie = arg_pie;
 	int minwidth, width, height;
 
-	minwidth = 50;
+	minwidth = UI_MENU_WIDTH_MIN;
 	block = pie->block_radial;
 
 	/* in some cases we create the block before the region,
@@ -194,7 +194,6 @@ void UI_pie_menu_end(bContext *C, uiPieMenu *pie)
 	        menu, WM_HANDLER_ACCEPT_DBL_CLICK);
 	WM_event_add_mousemove(C);
 
-	menu->can_refresh = false;
 	MEM_freeN(pie);
 }
 
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index 9aec955413f..a6046e551c6 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -191,7 +191,13 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
 
 	if (pup->but) {
 		/* minimum width to enforece */
-		minwidth = BLI_rctf_size_x(&pup->but->rect);
+		if (pup->but->drawstr[0]) {
+			minwidth = BLI_rctf_size_x(&pup->but->rect);
+		}
+		else {
+			/* For buttons with no text, use the minimum (typically icon only). */
+			minwidth = UI_MENU_WIDTH_MIN;
+		}
 
 		/* settings (typically rna-enum-popups) show above the button,
 		 * menu's like file-menu, show below */
@@ -209,7 +215,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
 		}
 	}
 	else {
-		minwidth = 50;
+		minwidth = UI_MENU_WIDTH_MIN;
 		direction = UI_DIR_DOWN;
 	}
 
@@ -284,7 +290,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
 		/* for a header menu we set the direction automatic */
 		if (!pup->slideout && flip) {
 			ScrArea *sa = CTX_wm_area(C);
-			if (sa && sa->headertype == HEADERDOWN) {
+			if (sa && ED_area_header_alignment(sa) == RGN_ALIGN_BOTTOM) {
 				ARegion *ar = CTX_wm_region(C);
 				if (ar && ar->regiontype == RGN_TYPE_HEADER) {
 					UI_block_direction_set(block, UI_DIR_UP);
@@ -359,7 +365,6 @@ uiPopupBlockHandle *ui_popup_menu_create(
 		WM_event_add_mousemove(C);
 	}
 
-	handle->can_refresh = false;
 	MEM_freeN(pup);
 
 	return handle;
@@ -450,7 +455,6 @@ void UI_popup_menu_end(bContext *C, uiPopupMenu *pup)
 	UI_popup_handlers_add(C, &window->modalhandlers, menu, 0);
 	WM_event_add_mousemove(C);
 
-	menu->can_refresh = false;
 	MEM_freeN(pup);
 }
 
@@ -554,6 +558,7 @@ void UI_popup_block_invoke_ex(bContext *C, uiBlockCreateFunc func, void *arg, co
 
 	handle = ui_popup_block_create(C, NULL, NULL, func, NULL, arg);
 	handle->popup = true;
+	handle->can_refresh = true;
 	handle->optype = (opname) ? WM_operatortype_find(opname, 0) : NULL;
 	handle->opcontext = opcontext;
 
@@ -576,6 +581,7 @@ void UI_popup_block_ex(
 	handle = ui_popup_block_create(C, NULL, NULL, func, NULL, arg);
 	handle->popup = true;
 	handle->retvalue = 1;
+	handle->can_refresh = true;
 
 	handle->popup_op = op;
 	handle->popup_arg = arg;
@@ -596,6 +602,7 @@ void uiPupBlockOperator(bContext *C, uiBlockCreateFunc func, wmOperator *op, int
 	handle = ui_popup_block_create(C, NULL, NULL, func, NULL, op);
 	handle->popup = 1;
 	handle->retvalue = 1;
+	handle->can_refresh = true;
 
 	handle->popup_arg = op;
 	handle->popup_func = operator_cb;
@@ -612,11 +619,13 @@ void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block)
 	/* if loading new .blend while popup is open, window will be NULL */
 	if (block->handle) {
 		if (win) {
+			const bScreen *screen = WM_window_get_active_screen(win);
+
 			UI_popup_handlers_remove(&win->modalhandlers, block->handle);
 			ui_popup_block_free(C, block->handle);
 
 			/* In the case we have nested popups, closing one may need to redraw another, see: T48874 */
-			for (ARegion *ar = win->screen->regionbase.first; ar; ar = ar->next) {
+			for (ARegion *ar = screen->regionbase.first; ar; ar = ar->next) {
 				ED_region_tag_refresh_ui(ar);
 			}
 		}
diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c
new file mode 100644
index 00000000000..9d10713c868
--- /dev/null
+++ b/source/blender/editors/interface/interface_region_popover.c
@@ -0,0 +1,375 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/interface/interface_region_popover.c
+ *  \ingroup edinterface
+ *
+ * Pop-Over Region
+ *
+ * \note This is very close to 'interface_region_menu_popup.c'
+ *
+ * We could even merge them, however menu logic is already over-loaded.
+ * PopOver's have the following differences.
+ *
+ * - UI is not constrained to a list.
+ * - Pressing a button won't close the pop-over.
+ * - Different draw style (to show this is has different behavior from a menu).
+ * - #PanelType are used instead of #MenuType.
+ * - No menu flipping support.
+ * - No moving the menu to fit the mouse cursor.
+ * - No key accelerators to access menu items
+ *   (if we add support they would work differently).
+ * - No arrow key navigation.
+ * - No menu memory.
+ * - No title.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_userdef_types.h"
+
+#include "BLI_listbase.h"
+
+#include "BLI_rect.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_screen.h"
+#include "BKE_report.h"
+
+#include "ED_screen.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+
+#include "UI_interface.h"
+
+#include "interface_intern.h"
+#include "interface_regions_intern.h"
+
+/* -------------------------------------------------------------------- */
+/** \name Popup Menu with Callback or String
+ * \{ */
+
+struct uiPopover {
+	uiBlock *block;
+	uiLayout *layout;
+	uiBut *but;
+
+	/* Needed for keymap removal. */
+	wmWindow *window;
+	wmKeyMap *keymap;
+	struct wmEventHandler *keymap_handler;
+
+	uiMenuCreateFunc menu_func;
+	void *menu_arg;
+
+#ifdef USE_POPOVER_ONCE
+	bool is_once;
+#endif
+};
+
+static void ui_popover_create_block(bContext *C, uiPopover *pup, int opcontext)
+{
+	uiStyle *style = UI_style_get_dpi();
+
+	pup->block = UI_block_begin(C, NULL, __func__, UI_EMBOSS);
+	pup->layout = UI_block_layout(
+	        pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0,
+	        U.widget_unit * UI_POPOVER_WIDTH_UNITS, 0, MENU_PADDING, style);
+
+	uiLayoutSetOperatorContext(pup->layout, opcontext);
+
+	if (pup->but) {
+		if (pup->but->context) {
+			uiLayoutContextCopy(pup->layout, pup->but->context);
+		}
+	}
+
+	pup->block->flag |= UI_BLOCK_NO_FLIP;
+}
+
+static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, void *arg_pup)
+{
+	uiPopover *pup = arg_pup;
+
+	/* Create UI block and layout now if it wasn't done between begin/end. */
+	if (!pup->layout) {
+		ui_popover_create_block(C, pup, WM_OP_INVOKE_REGION_WIN);
+
+		if (pup->menu_func) {
+			pup->block->handle = handle;
+			pup->menu_func(C, pup->layout, pup->menu_arg);
+			pup->block->handle = NULL;
+		}
+
+		pup->layout = NULL;
+	}
+
+	/* Setup and resolve UI layout for block. */
+	uiBlock *block = pup->block;
+	int width, height;
+
+	UI_block_region_set(block, handle->region);
+	UI_block_layout_resolve(block, &width, &height);
+	UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_KEEP_OPEN | UI_BLOCK_POPOVER);
+#ifdef USE_POPOVER_ONCE
+	if (pup->is_once) {
+		UI_block_flag_enable(block, UI_BLOCK_POPOVER_ONCE);
+	}
+#endif
+	UI_block_direction_set(block, UI_DIR_DOWN | UI_DIR_CENTER_X);
+
+	const int block_margin = U.widget_unit / 2;
+
+	if (pup->but) {
+		/* For a header menu we set the direction automatic. */
+		block->minbounds = BLI_rctf_size_x(&pup->but->rect);
+		UI_block_bounds_set_normal(block, block_margin);
+
+		/* If menu slides out of other menu, override direction. */
+		bool slideout = false; //ui_block_is_menu(pup->but->block);
+		if (slideout)
+			UI_block_direction_set(block, UI_DIR_RIGHT);
+
+		/* Store the button location for positioning the popover arrow hint. */
+		if (!handle->refresh) {
+			float center[2] = {BLI_rctf_cent_x(&pup->but->rect), BLI_rctf_cent_y(&pup->but->rect)};
+			ui_block_to_window_fl(handle->ctx_region, pup->but->block, &center[0], &center[1]);
+			/* These variables aren't used for popovers, we could add new variables if there is a conflict. */
+			handle->prev_mx = block->mx = (int)center[0];
+			handle->prev_my = block->my = (int)center[1];
+		}
+		else {
+			block->mx = handle->prev_mx;
+			block->my = handle->prev_my;
+		}
+
+		/* Prefer popover from header to be positioned into the editor. */
+		if (!slideout) {
+			ScrArea *sa = CTX_wm_area(C);
+			if (sa && ED_area_header_alignment(sa) == RGN_ALIGN_BOTTOM) {
+				ARegion *ar = CTX_wm_region(C);
+				if (ar && ar->regiontype == RGN_TYPE_HEADER) {
+					UI_block_direction_set(block, UI_DIR_UP | UI_DIR_CENTER_X);
+				}
+			}
+		}
+
+		/* Estimated a maximum size so we don't go offscreen for low height
+		 * areas near the bottom of the window on refreshes. */
+		handle->max_size_y = UI_UNIT_Y * 16.0f;
+	}
+	else {
+		/* Not attached to a button. */
+		int offset[2] = {0, 0};
+		UI_block_flag_enable(block, UI_BLOCK_LOOP);
+		UI_block_direction_set(block, block->direction);
+		block->minbounds = UI_MENU_WIDTH_MIN;
+		bool use_place_under_active = !handle->refresh;
+
+		if (use_place_under_active) {
+			uiBut *but = NULL;
+			for (but = block->buttons.first; but; but = but->next) {
+				if (but->flag & (UI_SELECT | UI_SELECT_DRAW)) {
+					break;
+				}
+			}
+
+			if (but) {
+				offset[0] = -(but->rect.xmin + 0.8f * BLI_rctf_size_x(&but->rect));
+				offset[1] = -(but->rect.ymin + 0.5f * BLI_rctf_size_y(&but->rect));
+			}
+		}
+
+		UI_block_bounds_set_popup(block, block_margin, offset[0], offset[1]);
+	}
+
+	return block;
+}
+
+static void ui_block_free_func_POPOVER(uiPopupBlockHandle *UNUSED(handle), void *arg_pup)
+{
+	uiPopover *pup = arg_pup;
+	if (pup->keymap != NULL) {
+		wmWindow *window = pup->window;
+		WM_event_remove_keymap_handler(&window->modalhandlers, pup->keymap);
+	}
+	MEM_freeN(pup);
+}
+
+uiPopupBlockHandle *ui_popover_panel_create(
+        bContext *C, ARegion *butregion, uiBut *but,
+        uiMenuCreateFunc menu_func, void *arg)
+{
+	/* Create popover, buttons are created from callback. */
+	uiPopover *pup = MEM_callocN(sizeof(uiPopover), __func__);
+	pup->but = but;
+	pup->menu_func = menu_func;
+	pup->menu_arg = arg;
+
+#ifdef USE_POPOVER_ONCE
+	pup->is_once = true;
+#endif
+
+	/* Create popup block. */
+	uiPopupBlockHandle *handle;
+	handle = ui_popup_block_create(C, butregion, but, NULL, ui_block_func_POPOVER, pup);
+	handle->popup_create_vars.free_func = ui_block_free_func_POPOVER;
+	handle->can_refresh = true;
+
+	/* Add handlers. If attached to a button, the button will already
+	 * add a modal handler and pass on events. */
+	if (!but) {
+		wmWindow *window = CTX_wm_window(C);
+		UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
+		WM_event_add_mousemove(C);
+		handle->popup = true;
+	}
+
+	return handle;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Standard Popover Panels
+ * \{ */
+
+int UI_popover_panel_invoke(
+        bContext *C, int space_id, int region_id, const char *idname,
+        bool keep_open, ReportList *reports)
+{
+	uiLayout *layout;
+	PanelType *pt = UI_paneltype_find(space_id, region_id, idname);
+	if (pt == NULL) {
+		BKE_reportf(
+		        reports, RPT_ERROR,
+		        "Panel \"%s\" not found (space %d, region %d)",
+		        idname, space_id, region_id);
+		return OPERATOR_CANCELLED;
+	}
+
+	if (pt->poll && (pt->poll(C, pt) == false)) {
+		/* cancel but allow event to pass through, just like operators do */
+		return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH);
+	}
+
+	if (keep_open) {
+		ui_popover_panel_create(C, NULL, NULL, ui_item_paneltype_func, pt);
+	}
+	else {
+		uiPopover *pup = UI_popover_begin(C);
+		layout = UI_popover_layout(pup);
+		UI_paneltype_draw(C, pt, layout);
+		UI_popover_end(C, pup, NULL);
+	}
+
+	return OPERATOR_INTERFACE;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Popup Menu API with begin & end
+ * \{ */
+
+/**
+ * Only return handler, and set optional title.
+ */
+uiPopover *UI_popover_begin(bContext *C)
+{
+	uiPopover *pup = MEM_callocN(sizeof(uiPopover), "popover menu");
+
+	/* Opertor context default same as menus, change if needed. */
+	ui_popover_create_block(C, pup, WM_OP_EXEC_REGION_WIN);
+
+	/* create in advance so we can let buttons point to retval already */
+	pup->block->handle = MEM_callocN(sizeof(uiPopupBlockHandle), "uiPopupBlockHandle");
+
+	return pup;
+}
+
+static void popover_keymap_fn(wmKeyMap *UNUSED(keymap), wmKeyMapItem *UNUSED(kmi), void *user_data)
+{
+	uiPopover *pup = user_data;
+	pup->block->handle->menuretval = UI_RETURN_OK;
+}
+
+/* set the whole structure to work */
+void UI_popover_end(bContext *C, uiPopover *pup, wmKeyMap *keymap)
+{
+	wmWindow *window = CTX_wm_window(C);
+	/* Create popup block. No refresh support since the buttons were created
+	 * between begin/end and we have no callback to recreate them. */
+	uiPopupBlockHandle *handle;
+
+	if (keymap) {
+		/* Add so we get keymaps shown in the buttons. */
+		UI_block_flag_enable(pup->block, UI_BLOCK_SHOW_SHORTCUT_ALWAYS);
+		pup->keymap = keymap;
+		pup->keymap_handler = WM_event_add_keymap_handler_priority(&window->modalhandlers, keymap, 0);
+		WM_event_set_keymap_handler_callback(pup->keymap_handler, popover_keymap_fn, pup);
+	}
+
+	handle = ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_POPOVER, pup);
+	handle->popup_create_vars.free_func = ui_block_free_func_POPOVER;
+
+	/* Add handlers. */
+	UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
+	WM_event_add_mousemove(C);
+	handle->popup = true;
+
+	/* Re-add so it gets priority. */
+	if (keymap) {
+		BLI_remlink(&window->modalhandlers, pup->keymap_handler);
+		BLI_addhead(&window->modalhandlers, pup->keymap_handler);
+	}
+
+	pup->window = window;
+
+	/* TODO(campbell): we may want to make this configurable.
+	 * The begin/end stype of calling popups doesn't allow to 'can_refresh' to be set.
+	 * For now close this style of popvers when accessed. */
+	UI_block_flag_disable(pup->block, UI_BLOCK_KEEP_OPEN);
+
+	/* panels are created flipped (from event handling pov) */
+	pup->block->flag ^= UI_BLOCK_IS_FLIP;
+}
+
+uiLayout *UI_popover_layout(uiPopover *pup)
+{
+	return pup->layout;
+}
+
+#ifdef USE_POPOVER_ONCE
+void UI_popover_once_clear(uiPopover *pup)
+{
+	pup->is_once = false;
+}
+#endif
+
+/** \} */
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c
index 656c59055af..654dc5e4d30 100644
--- a/source/blender/editors/interface/interface_region_popup.c
+++ b/source/blender/editors/interface/interface_region_popup.c
@@ -48,7 +48,6 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
-#include "wm_subwindow.h"
 
 #include "UI_interface.h"
 
@@ -85,32 +84,38 @@ void ui_popup_translate(bContext *C, ARegion *ar, const int mdiff[2])
 }
 
 /* position block relative to but, result is in window space */
-static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, uiBlock *block)
+static void ui_popup_block_position(wmWindow *window, ARegion *butregion, uiBut *but, uiBlock *block)
 {
-	uiBut *bt;
-	uiSafetyRct *saferct;
+	uiPopupBlockHandle *handle = block->handle;
+
+	/* Compute button position in window coordinates using the source
+	 * button region/block, to position the popup attached to it. */
 	rctf butrct;
-	/*float aspect;*/ /*UNUSED*/
-	int size_x, size_y, offset_x = 0, offset_y = 0;
-	short dir1 = 0, dir2 = 0;
 
-	/* transform to window coordinates, using the source button region/block */
-	ui_block_to_window_rctf(butregion, but->block, &butrct, &but->rect);
+	if (!handle->refresh) {
+		ui_block_to_window_rctf(butregion, but->block, &butrct, &but->rect);
+
+		/* widget_roundbox_set has this correction too, keep in sync */
+		if (but->type != UI_BTYPE_PULLDOWN) {
+			if (but->drawflag & UI_BUT_ALIGN_TOP)
+				butrct.ymax += U.pixelsize;
+			if (but->drawflag & UI_BUT_ALIGN_LEFT)
+				butrct.xmin -= U.pixelsize;
+		}
 
-	/* widget_roundbox_set has this correction too, keep in sync */
-	if (but->type != UI_BTYPE_PULLDOWN) {
-		if (but->drawflag & UI_BUT_ALIGN_TOP)
-			butrct.ymax += U.pixelsize;
-		if (but->drawflag & UI_BUT_ALIGN_LEFT)
-			butrct.xmin -= U.pixelsize;
+		handle->prev_butrct = butrct;
+	}
+	else {
+		/* For refreshes, keep same button position so popup doesn't move. */
+		butrct = handle->prev_butrct;
 	}
 
-	/* calc block rect */
+	/* Compute block size in window space, based on buttons contained in it. */
 	if (block->rect.xmin == 0.0f && block->rect.xmax == 0.0f) {
 		if (block->buttons.first) {
 			BLI_rctf_init_minmax(&block->rect);
 
-			for (bt = block->buttons.first; bt; bt = bt->next) {
+			for (uiBut *bt = block->buttons.first; bt; bt = bt->next) {
 				BLI_rctf_union(&block->rect, &bt->rect);
 			}
 		}
@@ -121,34 +126,34 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 		}
 	}
 
-	/* aspect = (float)(BLI_rcti_size_x(&block->rect) + 4);*/ /*UNUSED*/
 	ui_block_to_window_rctf(butregion, but->block, &block->rect, &block->rect);
 
-	//block->rect.xmin -= 2.0; block->rect.ymin -= 2.0;
-	//block->rect.xmax += 2.0; block->rect.ymax += 2.0;
+	/* Compute direction relative to button, based on available space. */
+	const int size_x = BLI_rctf_size_x(&block->rect) + 0.2f * UI_UNIT_X;  /* 4 for shadow */
+	const int size_y = BLI_rctf_size_y(&block->rect) + 0.2f * UI_UNIT_Y;
+	const int center_x = (block->direction & UI_DIR_CENTER_X) ? size_x / 2 : 0;
+	const int center_y = (block->direction & UI_DIR_CENTER_Y) ? size_y / 2 : 0;
 
-	size_x = BLI_rctf_size_x(&block->rect) + 0.2f * UI_UNIT_X;  /* 4 for shadow */
-	size_y = BLI_rctf_size_y(&block->rect) + 0.2f * UI_UNIT_Y;
-	/* aspect /= (float)size_x;*/ /*UNUSED*/
+	short dir1 = 0, dir2 = 0;
 
-	{
+	if (!handle->refresh) {
 		bool left = 0, right = 0, top = 0, down = 0;
-		// int offscreen;
 
 		const int win_x = WM_window_pixels_x(window);
 		const int win_y = WM_window_pixels_y(window);
-		// wm_window_get_size(window, &win_x, &win_y);
 
-		const int center_y = (block->direction & UI_DIR_CENTER_Y) ? size_y / 2 : 0;
+		/* Take into account maximum size so we don't have to flip on refresh. */
+		const float max_size_x = max_ff(size_x, handle->max_size_x);
+		const float max_size_y = max_ff(size_y, handle->max_size_y);
 
 		/* check if there's space at all */
-		if (butrct.xmin - size_x > 0.0f) left = 1;
-		if (butrct.xmax + size_x < win_x) right = 1;
-		if (butrct.ymin - size_y + center_y > 0.0f) down = 1;
-		if (butrct.ymax + size_y - center_y < win_y) top = 1;
+		if (butrct.xmin - max_size_x + center_x > 0.0f) left = 1;
+		if (butrct.xmax + max_size_x - center_x < win_x) right = 1;
+		if (butrct.ymin - max_size_y + center_y > 0.0f) down = 1;
+		if (butrct.ymax + max_size_y - center_y < win_y) top = 1;
 
 		if (top == 0 && down == 0) {
-			if (butrct.ymin - size_y < win_y - butrct.ymax - size_y)
+			if (butrct.ymin - max_size_y < win_y - butrct.ymax - max_size_y)
 				top = 1;
 			else
 				down = 1;
@@ -182,65 +187,57 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 			if (dir2 == UI_DIR_DOWN && down == 0) dir2 = UI_DIR_UP;
 		}
 
-		if (dir1 == UI_DIR_LEFT) {
-			offset_x = butrct.xmin - block->rect.xmax;
-			if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING;
-			else                   offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING;
-		}
-		else if (dir1 == UI_DIR_RIGHT) {
-			offset_x = butrct.xmax - block->rect.xmin;
-			if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING;
-			else                   offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING;
-		}
-		else if (dir1 == UI_DIR_UP) {
-			offset_y = butrct.ymax - block->rect.ymin;
-			if (dir2 == UI_DIR_RIGHT) offset_x = butrct.xmax - block->rect.xmax;
-			else                      offset_x = butrct.xmin - block->rect.xmin;
-			/* changed direction? */
-			if ((dir1 & block->direction) == 0) {
-				UI_block_order_flip(block);
-			}
-		}
-		else if (dir1 == UI_DIR_DOWN) {
-			offset_y = butrct.ymin - block->rect.ymax;
-			if (dir2 == UI_DIR_RIGHT) offset_x = butrct.xmax - block->rect.xmax;
-			else                      offset_x = butrct.xmin - block->rect.xmin;
-			/* changed direction? */
-			if ((dir1 & block->direction) == 0) {
-				UI_block_order_flip(block);
-			}
-		}
+		handle->prev_dir1 = dir1;
+		handle->prev_dir2 = dir2;
+	}
+	else {
+		/* For refreshes, keep same popup direct so popup doesn't move
+		 * to a totally different position while editing in it. */
+		dir1 = handle->prev_dir1;
+		dir2 = handle->prev_dir2;
+	}
 
-		/* and now we handle the exception; no space below or to top */
-		if (top == 0 && down == 0) {
-			if (dir1 == UI_DIR_LEFT || dir1 == UI_DIR_RIGHT) {
-				/* align with bottom of screen */
-				// offset_y = size_y; (not with menu scrolls)
-			}
-		}
+	/* Compute offset based on direction. */
+	int offset_x = 0, offset_y = 0;
 
-#if 0 /* seems redundant and causes issues with blocks inside big regions */
-		/* or no space left or right */
-		if (left == 0 && right == 0) {
-			if (dir1 == UI_DIR_UP || dir1 == UI_DIR_DOWN) {
-				/* align with left size of screen */
-				offset_x = -block->rect.xmin + 5;
-			}
+	if (dir1 == UI_DIR_LEFT) {
+		offset_x = butrct.xmin - block->rect.xmax;
+		if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING;
+		else                   offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING;
+	}
+	else if (dir1 == UI_DIR_RIGHT) {
+		offset_x = butrct.xmax - block->rect.xmin;
+		if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING;
+		else                   offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING;
+	}
+	else if (dir1 == UI_DIR_UP) {
+		offset_y = butrct.ymax - block->rect.ymin;
+		if (dir2 == UI_DIR_RIGHT) offset_x = butrct.xmax - block->rect.xmax + center_x;
+		else                      offset_x = butrct.xmin - block->rect.xmin - center_x;
+		/* changed direction? */
+		if ((dir1 & block->direction) == 0) {
+			/* TODO: still do */
+			UI_block_order_flip(block);
+		}
+	}
+	else if (dir1 == UI_DIR_DOWN) {
+		offset_y = butrct.ymin - block->rect.ymax;
+		if (dir2 == UI_DIR_RIGHT) offset_x = butrct.xmax - block->rect.xmax + center_x;
+		else                      offset_x = butrct.xmin - block->rect.xmin - center_x;
+		/* changed direction? */
+		if ((dir1 & block->direction) == 0) {
+			/* TODO: still do */
+			UI_block_order_flip(block);
 		}
-#endif
-
-#if 0
-		/* clamp to window bounds, could be made into an option if its ever annoying */
-		if (     (offscreen = (block->rect.ymin + offset_y)) < 0) offset_y -= offscreen;   /* bottom */
-		else if ((offscreen = (block->rect.ymax + offset_y) - winy) > 0) offset_y -= offscreen;  /* top */
-		if (     (offscreen = (block->rect.xmin + offset_x)) < 0) offset_x -= offscreen;   /* left */
-		else if ((offscreen = (block->rect.xmax + offset_x) - winx) > 0) offset_x -= offscreen;  /* right */
-#endif
 	}
 
-	/* apply offset, buttons in window coords */
+	/* Center over popovers for eg. */
+	if (block->direction & UI_DIR_CENTER_X) {
+		offset_x += BLI_rctf_size_x(&butrct) / ((dir2 == UI_DIR_LEFT) ? 2 : - 2);
+	}
 
-	for (bt = block->buttons.first; bt; bt = bt->next) {
+	/* Apply offset, buttons in window coords. */
+	for (uiBut *bt = block->buttons.first; bt; bt = bt->next) {
 		ui_block_to_window_rctf(butregion, but->block, &bt->rect, &bt->rect);
 
 		BLI_rctf_translate(&bt->rect, offset_x, offset_y);
@@ -251,7 +248,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 
 	BLI_rctf_translate(&block->rect, offset_x, offset_y);
 
-	/* safety calculus */
+	/* Safety calculus. */
 	{
 		const float midx = BLI_rctf_cent_x(&butrct);
 		const float midy = BLI_rctf_cent_y(&butrct);
@@ -281,7 +278,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 	}
 
 	/* keep a list of these, needed for pulldown menus */
-	saferct = MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
+	uiSafetyRct *saferct = MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
 	saferct->parent = butrct;
 	saferct->safety = block->safety;
 	BLI_freelistN(&block->saferct);
@@ -295,7 +292,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 /** \name Menu Block Creation
  * \{ */
 
-static void ui_block_region_draw(const bContext *C, ARegion *ar)
+static void ui_block_region_refresh(const bContext *C, ARegion *ar)
 {
 	ScrArea *ctx_area = CTX_wm_area(C);
 	ARegion *ctx_region = CTX_wm_region(C);
@@ -309,9 +306,11 @@ static void ui_block_region_draw(const bContext *C, ARegion *ar)
 		ar->do_draw &= ~RGN_DRAW_REFRESH_UI;
 		for (block = ar->uiblocks.first; block; block = block_next) {
 			block_next = block->next;
-			if (block->handle->can_refresh) {
-				handle_ctx_area = block->handle->ctx_area;
-				handle_ctx_region = block->handle->ctx_region;
+			uiPopupBlockHandle *handle = block->handle;
+
+			if (handle->can_refresh) {
+				handle_ctx_area = handle->ctx_area;
+				handle_ctx_region = handle->ctx_region;
 
 				if (handle_ctx_area) {
 					CTX_wm_area_set((bContext *)C, handle_ctx_area);
@@ -319,13 +318,21 @@ static void ui_block_region_draw(const bContext *C, ARegion *ar)
 				if (handle_ctx_region) {
 					CTX_wm_region_set((bContext *)C, handle_ctx_region);
 				}
-				ui_popup_block_refresh((bContext *)C, block->handle, NULL, NULL);
+
+				uiBut *but = handle->popup_create_vars.but;
+				ARegion *butregion = handle->popup_create_vars.butregion;
+				ui_popup_block_refresh((bContext *)C, handle, butregion, but);
 			}
 		}
 	}
 
 	CTX_wm_area_set((bContext *)C, ctx_area);
 	CTX_wm_region_set((bContext *)C, ctx_region);
+}
+
+static void ui_block_region_draw(const bContext *C, ARegion *ar)
+{
+	uiBlock *block;
 
 	for (block = ar->uiblocks.first; block; block = block->next)
 		UI_block_draw(C, block);
@@ -335,7 +342,7 @@ static void ui_block_region_draw(const bContext *C, ARegion *ar)
  * Use to refresh centered popups on screen resizing (for splash).
  */
 static void ui_block_region_popup_window_listener(
-        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	switch (wmn->category) {
 		case NC_WINDOW:
@@ -455,8 +462,6 @@ uiBlock *ui_popup_block_refresh(
         bContext *C, uiPopupBlockHandle *handle,
         ARegion *butregion, uiBut *but)
 {
-	BLI_assert(handle->can_refresh == true);
-
 	const int margin = UI_POPUP_MARGIN;
 	wmWindow *window = CTX_wm_window(C);
 	ARegion *ar = handle->region;
@@ -468,6 +473,10 @@ uiBlock *ui_popup_block_refresh(
 	uiBlock *block_old = ar->uiblocks.first;
 	uiBlock *block;
 
+	handle->refresh = (block_old != NULL);
+
+	BLI_assert(!handle->refresh || handle->can_refresh);
+
 #ifdef DEBUG
 	wmEvent *event_back = window->eventstate;
 #endif
@@ -513,7 +522,7 @@ uiBlock *ui_popup_block_refresh(
 	/* if this is being created from a button */
 	if (but) {
 		block->aspect = but->block->aspect;
-		ui_block_position(window, butregion, but, block);
+		ui_popup_block_position(window, butregion, but, block);
 		handle->direction = block->direction;
 	}
 	else {
@@ -551,7 +560,7 @@ uiBlock *ui_popup_block_refresh(
 			block->pie_data.pie_center_spawned[0] += x_offset;
 			block->pie_data.pie_center_spawned[1] += y_offset;
 
-			ui_block_translate(block, x_offset, y_offset);
+			UI_block_translate(block, x_offset, y_offset);
 
 			if (U.pie_initial_timeout > 0)
 				block->pie_data.flags |= UI_PIE_INITIAL_DIRECTION;
@@ -576,6 +585,17 @@ uiBlock *ui_popup_block_refresh(
 	else {
 		/* clip block with window boundary */
 		ui_popup_block_clip(window, block);
+
+		/* Avoid menu moving down and losing cursor focus by keeping it at
+		 * the same height. */
+		if (handle->refresh && handle->prev_block_rect.ymax > block->rect.ymax) {
+			float offset = handle->prev_block_rect.ymax - block->rect.ymax;
+			UI_block_translate(block, 0, offset);
+			block->rect.ymin = handle->prev_block_rect.ymin;
+		}
+
+		handle->prev_block_rect = block->rect;
+
 		/* the block and buttons were positioned in window space as in 2.4x, now
 		 * these menu blocks are regions so we bring it back to region space.
 		 * additionally we add some padding for the menu shadow or rounded menus */
@@ -584,7 +604,15 @@ uiBlock *ui_popup_block_refresh(
 		ar->winrct.ymin = block->rect.ymin - margin;
 		ar->winrct.ymax = block->rect.ymax + UI_POPUP_MENU_TOP;
 
-		ui_block_translate(block, -ar->winrct.xmin, -ar->winrct.ymin);
+		UI_block_translate(block, -ar->winrct.xmin, -ar->winrct.ymin);
+
+		/* apply scroll offset */
+		if (handle->scrolloffset != 0.0f) {
+			for (uiBut *bt = block->buttons.first; bt; bt = bt->next) {
+				bt->rect.ymin += handle->scrolloffset;
+				bt->rect.ymax += handle->scrolloffset;
+			}
+		}
 	}
 
 	if (block_old) {
@@ -600,9 +628,7 @@ uiBlock *ui_popup_block_refresh(
 	ED_region_init(C, ar);
 
 	/* get winmat now that we actually have the subwindow */
-	wmSubWindowSet(window, ar->swinid);
-
-	wm_subwindow_matrix_get(window, ar->swinid, block->winmat);
+	wmGetProjectionMatrix(block->winmat, &ar->winrct);
 
 	/* notify change and redraw */
 	ED_region_tag_redraw(ar);
@@ -646,10 +672,12 @@ uiPopupBlockHandle *ui_popup_block_create(
 	handle->popup_create_vars.create_func = create_func;
 	handle->popup_create_vars.handle_create_func = handle_create_func;
 	handle->popup_create_vars.arg = arg;
+	handle->popup_create_vars.but = but;
 	handle->popup_create_vars.butregion = but ? butregion : NULL;
 	copy_v2_v2_int(handle->popup_create_vars.event_xy, &window->eventstate->x);
-	/* caller may free vars used to create this popup, in that case this variable should be disabled. */
-	handle->can_refresh = true;
+
+	/* don't allow by default, only if popup type explicitly supports it */
+	handle->can_refresh = false;
 
 	/* create area region */
 	ar = ui_region_temp_add(CTX_wm_screen(C));
@@ -657,6 +685,7 @@ uiPopupBlockHandle *ui_popup_block_create(
 
 	memset(&type, 0, sizeof(ARegionType));
 	type.draw = ui_block_region_draw;
+	type.layout = ui_block_region_refresh;
 	type.regionid = RGN_TYPE_TEMPORARY;
 	ar->type = &type;
 
@@ -666,7 +695,7 @@ uiPopupBlockHandle *ui_popup_block_create(
 	handle = block->handle;
 
 	/* keep centered on window resizing */
-	if ((block->bounds_type == UI_BLOCK_BOUNDS_POPUP_CENTER) && handle->can_refresh) {
+	if (block->bounds_type == UI_BLOCK_BOUNDS_POPUP_CENTER) {
 		type.listener = ui_block_region_popup_window_listener;
 	}
 
@@ -675,6 +704,25 @@ uiPopupBlockHandle *ui_popup_block_create(
 
 void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle)
 {
+	/* If this popup is created from a popover which does NOT have keep-open flag set,
+	 * then close the popover too. We could extend this to other popup types too. */
+	ARegion *ar = handle->popup_create_vars.butregion;
+	if (ar != NULL) {
+		for (uiBlock *block = ar->uiblocks.first; block; block = block->next) {
+			if (block->handle &&
+			    (block->flag & UI_BLOCK_POPOVER) &&
+			    (block->flag & UI_BLOCK_KEEP_OPEN) == 0)
+			{
+				uiPopupBlockHandle *menu = block->handle;
+				menu->menuretval = UI_RETURN_OK;
+			}
+		}
+	}
+
+	if (handle->popup_create_vars.free_func) {
+		handle->popup_create_vars.free_func(handle, handle->popup_create_vars.arg);
+	}
+
 	ui_popup_block_remove(C, handle);
 
 	MEM_freeN(handle);
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c
index c9d313a4bab..f14f9af8785 100644
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@ -397,7 +397,7 @@ int ui_searchbox_autocomplete(bContext *C, ARegion *ar, uiBut *but, char *str)
 	return match;
 }
 
-static void ui_searchbox_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
+static void ui_searchbox_region_draw_cb(const bContext *C, ARegion *ar)
 {
 	uiSearchboxData *data = ar->regiondata;
 
@@ -415,6 +415,9 @@ static void ui_searchbox_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 		if (data->preview) {
 			/* draw items */
 			for (a = 0; a < data->items.totitem; a++) {
+				/* ensure icon is up-to-date */
+				ui_icon_ensure_deferred(C, data->items.icons[a], data->preview);
+
 				ui_searchbox_butrect(&rect, data, a);
 
 				/* widget itself */
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 1eec3737215..aa8fe173638 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -164,6 +164,7 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 	uiWidgetColors *theme = ui_tooltip_get_theme();
 	rcti bbox = data->bbox;
 	float tip_colors[UI_TIP_LC_MAX][3];
+	unsigned char drawcol[4] = {0, 0, 0, 255}; /* to store color in while drawing (alpha is always 255) */
 
 	float *main_color    = tip_colors[UI_TIP_LC_MAIN]; /* the color from the theme */
 	float *value_color   = tip_colors[UI_TIP_LC_VALUE];
@@ -174,12 +175,7 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 
 	float background_color[3];
 	float tone_bg;
-	int i, multisample_enabled;
-
-	/* disable AA, makes widgets too blurry */
-	multisample_enabled = glIsEnabled(GL_MULTISAMPLE);
-	if (multisample_enabled)
-		glDisable(GL_MULTISAMPLE);
+	int i;
 
 	wmOrtho2_region_pixelspace(ar);
 
@@ -232,9 +228,9 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 			fstyle_header.shadowalpha = 1.0f;
 			fstyle_header.word_wrap = true;
 
+			rgb_float_to_uchar(drawcol, tip_colors[UI_TIP_LC_MAIN]);
 			UI_fontstyle_set(&fstyle_header);
-			glColor3fv(tip_colors[UI_TIP_LC_MAIN]);
-			UI_fontstyle_draw(&fstyle_header, &bbox, field->text);
+			UI_fontstyle_draw(&fstyle_header, &bbox, field->text, drawcol);
 
 			fstyle_header.shadow = 0;
 
@@ -245,8 +241,8 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 				bbox.xmin += xofs;
 				bbox.ymax -= yofs;
 
-				glColor3fv(tip_colors[UI_TIP_LC_ACTIVE]);
-				UI_fontstyle_draw(&fstyle_header, &bbox, field->text_suffix);
+				rgb_float_to_uchar(drawcol, tip_colors[UI_TIP_LC_ACTIVE]);
+				UI_fontstyle_draw(&fstyle_header, &bbox, field->text_suffix, drawcol);
 
 				/* undo offset */
 				bbox.xmin -= xofs;
@@ -261,8 +257,8 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 			UI_fontstyle_set(&fstyle_mono);
 			/* XXX, needed because we dont have mono in 'U.uifonts' */
 			BLF_size(fstyle_mono.uifont_id, fstyle_mono.points * U.pixelsize, U.dpi);
-			glColor3fv(tip_colors[field->format.color_id]);
-			UI_fontstyle_draw(&fstyle_mono, &bbox, field->text);
+			rgb_float_to_uchar(drawcol, tip_colors[field->format.color_id]);
+			UI_fontstyle_draw(&fstyle_mono, &bbox, field->text, drawcol);
 		}
 		else {
 			uiFontStyle fstyle_normal = data->fstyle;
@@ -270,9 +266,9 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 			fstyle_normal.word_wrap = true;
 
 			/* draw remaining data */
+			rgb_float_to_uchar(drawcol, tip_colors[field->format.color_id]);
 			UI_fontstyle_set(&fstyle_normal);
-			glColor3fv(tip_colors[field->format.color_id]);
-			UI_fontstyle_draw(&fstyle_normal, &bbox, field->text);
+			UI_fontstyle_draw(&fstyle_normal, &bbox, field->text, drawcol);
 		}
 
 		bbox.ymax -= data->lineh * field->geom.lines;
@@ -284,9 +280,6 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 
 	BLF_disable(data->fstyle.uifont_id, BLF_WORD_WRAP);
 	BLF_disable(blf_mono_font, BLF_WORD_WRAP);
-
-	if (multisample_enabled)
-		glEnable(GL_MULTISAMPLE);
 }
 
 static void ui_tooltip_region_free_cb(ARegion *ar)
@@ -313,6 +306,63 @@ static void ui_tooltip_region_free_cb(ARegion *ar)
 /** \name ToolTip Creation
  * \{ */
 
+static uiTooltipData *ui_tooltip_data_from_keymap(bContext *C, wmKeyMap *keymap)
+{
+	char buf[512];
+
+	/* create tooltip data */
+	uiTooltipData *data = MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
+
+	for (wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
+		wmOperatorType *ot = WM_operatortype_find(kmi->idname, true);
+		if (ot != NULL) {
+			/* Tip */
+			{
+				uiTooltipField *field = text_field_add(
+				        data, &(uiTooltipFormat){
+				            .style = UI_TIP_STYLE_NORMAL,
+				            .color_id = UI_TIP_LC_MAIN,
+				            .is_pad = true,
+				        });
+				field->text = BLI_strdup(ot->description[0] ? ot->description : ot->name);
+			}
+			/* Shortcut */
+			{
+				uiTooltipField *field = text_field_add(
+				        data, &(uiTooltipFormat){
+				            .style = UI_TIP_STYLE_NORMAL,
+				            .color_id = UI_TIP_LC_NORMAL,
+				        });
+				bool found = false;
+				if (WM_keymap_item_to_string(kmi, false, buf, sizeof(buf))) {
+					found = true;
+				}
+				field->text = BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None");
+			}
+
+			/* Python */
+			{
+				uiTooltipField *field = text_field_add(
+				        data, &(uiTooltipFormat){
+				            .style = UI_TIP_STYLE_NORMAL,
+				            .color_id = UI_TIP_LC_PYTHON,
+				        });
+				char *str = WM_operator_pystring_ex(C, NULL, false, false, ot, kmi->ptr);
+				WM_operator_pystring_abbreviate(str, 32);
+				field->text = BLI_sprintfN(TIP_("Python: %s"), str);
+				MEM_freeN(str);
+			}
+		}
+	}
+	if (data->fields_len == 0) {
+		MEM_freeN(data);
+		return NULL;
+	}
+	else {
+		return data;
+	}
+}
+
 static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 {
 	uiStringInfo but_tip = {BUT_GET_TIP, NULL};
@@ -463,7 +513,7 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 		WM_operator_pystring_abbreviate(str, 32);
 
 		/* operator info */
-		if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
+		if (U.flag & USER_TOOLTIPS_PYTHON) {
 			uiTooltipField *field = text_field_add(
 			        data, &(uiTooltipFormat){
 			            .style = UI_TIP_STYLE_MONO,
@@ -501,7 +551,7 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 		}
 	}
 
-	if ((U.flag & USER_TOOLTIPS_PYTHON) == 0 && !but->optype && rna_struct.strinfo) {
+	if ((U.flag & USER_TOOLTIPS_PYTHON) && !but->optype && rna_struct.strinfo) {
 		{
 			uiTooltipField *field = text_field_add(
 			        data, &(uiTooltipFormat){
@@ -565,6 +615,112 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 	}
 }
 
+static uiTooltipData *ui_tooltip_data_from_manipulator(bContext *C, wmManipulator *mpr)
+{
+	uiTooltipData *data = MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
+
+	/* TODO(campbell): a way for manipulators to have their own descriptions (low priority). */
+
+	/* Operator Actions */
+	{
+		bool use_drag = mpr->drag_part != -1 && mpr->highlight_part != mpr->drag_part;
+
+		const struct {
+			int part;
+			const char *prefix;
+		} mpop_actions[] = {
+			{
+				.part = mpr->highlight_part,
+				.prefix = use_drag ? TIP_("Click") : NULL,
+			}, {
+				.part = use_drag ? mpr->drag_part : -1,
+				.prefix = use_drag ? TIP_("Drag") : NULL,
+			},
+		};
+
+		for (int i = 0; i < ARRAY_SIZE(mpop_actions); i++) {
+			wmManipulatorOpElem *mpop = (mpop_actions[i].part != -1) ? WM_manipulator_operator_get(mpr, mpop_actions[i].part) : NULL;
+			if (mpop != NULL) {
+				/* Description */
+				const char *info = RNA_struct_ui_description(mpop->type->srna);
+				if (!(info && info[0])) {
+					info  = RNA_struct_ui_name(mpop->type->srna);
+				}
+
+				if (info && info[0]) {
+					char *text = NULL;
+					if (mpop_actions[i].prefix != NULL) {
+						text = BLI_sprintfN("%s: %s", mpop_actions[i].prefix, info);
+					}
+					else {
+						text = BLI_strdup(info);
+					}
+
+					if (text != NULL) {
+						uiTooltipField *field = text_field_add(
+						        data, &(uiTooltipFormat){
+						            .style = UI_TIP_STYLE_HEADER,
+						            .color_id = UI_TIP_LC_VALUE,
+						            .is_pad = true,
+						        });
+						field->text = text;
+					}
+				}
+
+				/* Shortcut */
+				{
+					bool found = false;
+					IDProperty *prop = mpop->ptr.data;
+					char buf[128];
+					if (WM_key_event_operator_string(
+					            C, mpop->type->idname, WM_OP_INVOKE_DEFAULT, prop, true,
+					            buf, ARRAY_SIZE(buf)))
+					{
+						found = true;
+					}
+					uiTooltipField *field = text_field_add(
+					        data, &(uiTooltipFormat){
+					            .style = UI_TIP_STYLE_NORMAL,
+					            .color_id = UI_TIP_LC_VALUE,
+					            .is_pad = true,
+					        });
+					field->text = BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None");
+				}
+			}
+		}
+	}
+
+	/* Property Actions */
+	if (mpr->type->target_property_defs_len) {
+		wmManipulatorProperty *mpr_prop_array = WM_manipulator_target_property_array(mpr);
+		for (int i = 0; i < mpr->type->target_property_defs_len; i++) {
+			/* TODO(campbell): function callback descriptions. */
+			wmManipulatorProperty *mpr_prop = &mpr_prop_array[i];
+			if (mpr_prop->prop != NULL) {
+				const char *info = RNA_property_ui_description(mpr_prop->prop);
+				if (info && info[0]) {
+					uiTooltipField *field = text_field_add(
+					        data, &(uiTooltipFormat){
+					            .style = UI_TIP_STYLE_NORMAL,
+					            .color_id = UI_TIP_LC_VALUE,
+					            .is_pad = true,
+					        });
+					field->text = BLI_strdup(info);
+				}
+			}
+		}
+	}
+
+	if (data->fields_len == 0) {
+		MEM_freeN(data);
+		return NULL;
+	}
+	else {
+		return data;
+	}
+}
+
+
 static ARegion *ui_tooltip_create_with_data(
         bContext *C, uiTooltipData *data,
         const float init_position[2],
@@ -738,6 +894,28 @@ ARegion *UI_tooltip_create_from_button(bContext *C, ARegion *butregion, uiBut *b
 	}
 	uiTooltipData *data = NULL;
 
+	/* custom tips for pre-defined operators */
+	if (but->optype) {
+		/* TODO(campbell): we now use 'WM_OT_tool_set_by_name', this logic will be moved into the status bar. */
+		if (false && STREQ(but->optype->idname, "WM_OT_tool_set")) {
+			char keymap[64] = "";
+			RNA_string_get(but->opptr, "keymap", keymap);
+			if (keymap[0]) {
+				ScrArea *sa = CTX_wm_area(C);
+				/* It happens in rare cases, for tooltips originated from the toolbar.
+				 * It is hard to reproduce, but it happens when the mouse is nowhere near the actual tool. */
+				if (sa == NULL) {
+					return NULL;
+				}
+				wmKeyMap *km = WM_keymap_find_all(C, keymap, sa->spacetype, RGN_TYPE_WINDOW);
+				if (km != NULL) {
+					data = ui_tooltip_data_from_keymap(C, km);
+				}
+			}
+		}
+	}
+	/* toolsystem exception */
+
 	if (data == NULL) {
 		data = ui_tooltip_data_from_button(C, but);
 	}
@@ -756,6 +934,23 @@ ARegion *UI_tooltip_create_from_button(bContext *C, ARegion *butregion, uiBut *b
 	return ui_tooltip_create_with_data(C, data, init_position, aspect);
 }
 
+ARegion *UI_tooltip_create_from_manipulator(bContext *C, wmManipulator *mpr)
+{
+	wmWindow *win = CTX_wm_window(C);
+	const float aspect = 1.0f;
+	float init_position[2];
+
+	uiTooltipData *data = ui_tooltip_data_from_manipulator(C, mpr);
+	if (data == NULL) {
+		return NULL;
+	}
+
+	init_position[0] = win->eventstate->x;
+	init_position[1] = win->eventstate->y;
+
+	return ui_tooltip_create_with_data(C, data, init_position, aspect);
+}
+
 void UI_tooltip_free(bContext *C, bScreen *sc, ARegion *ar)
 {
 	ui_region_temp_remove(C, sc, ar);
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 2c3d94214d1..0decc937e19 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -61,6 +61,9 @@ ARegion *ui_region_temp_add(bScreen *sc)
 void ui_region_temp_remove(bContext *C, bScreen *sc, ARegion *ar)
 {
 	wmWindow *win = CTX_wm_window(C);
+
+	BLI_assert(ar->regiontype == RGN_TYPE_TEMPORARY);
+	BLI_assert(BLI_findindex(&sc->regionbase, ar) != -1);
 	if (win)
 		wm_draw_region_clear(win, ar);
 
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index e5f1a69d3b3..adc3a24d1a9 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -149,7 +149,7 @@ static uiFont *uifont_to_blfont(int id)
 
 
 void UI_fontstyle_draw_ex(
-        const uiFontStyle *fs, const rcti *rect, const char *str,
+        const uiFontStyle *fs, const rcti *rect, const char *str, const unsigned char col[4],
         size_t len, float *r_xofs, float *r_yofs)
 {
 	int xofs = 0, yofs;
@@ -196,6 +196,7 @@ void UI_fontstyle_draw_ex(
 	/* clip is very strict, so we give it some space */
 	BLF_clipping(fs->uifont_id, rect->xmin - 2, rect->ymin - 4, rect->xmax + 1, rect->ymax + 4);
 	BLF_position(fs->uifont_id, rect->xmin + xofs, rect->ymin + yofs, 0.0f);
+	BLF_color4ubv(fs->uifont_id, col);
 
 	BLF_draw(fs->uifont_id, str, len);
 
@@ -205,17 +206,17 @@ void UI_fontstyle_draw_ex(
 	*r_yofs = yofs;
 }
 
-void UI_fontstyle_draw(const uiFontStyle *fs, const rcti *rect, const char *str)
+void UI_fontstyle_draw(const uiFontStyle *fs, const rcti *rect, const char *str, const unsigned char col[4])
 {
 	float xofs, yofs;
 
 	UI_fontstyle_draw_ex(
-	        fs, rect, str,
+	        fs, rect, str, col,
 	        BLF_DRAW_STR_DUMMY_MAX, &xofs, &yofs);
 }
 
 /* drawn same as above, but at 90 degree angle */
-void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const char *str)
+void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const char *str, const unsigned char col[4])
 {
 	float height;
 	int xofs, yofs;
@@ -249,6 +250,7 @@ void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const ch
 
 	BLF_enable(fs->uifont_id, BLF_ROTATION);
 	BLF_rotation(fs->uifont_id, angle);
+	BLF_color4ubv(fs->uifont_id, col);
 
 	if (fs->shadow) {
 		BLF_enable(fs->uifont_id, BLF_SHADOW);
@@ -275,13 +277,14 @@ void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const ch
  *
  * For drawing on-screen labels.
  */
-void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const char *str)
+void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const char *str, const unsigned char col[4])
 {
 	if (fs->kerning == 1)
 		BLF_enable(fs->uifont_id, BLF_KERNING_DEFAULT);
 
 	UI_fontstyle_set(fs);
 	BLF_position(fs->uifont_id, x, y, 0.0f);
+	BLF_color4ubv(fs->uifont_id, col);
 	BLF_draw(fs->uifont_id, str, BLF_DRAW_STR_DUMMY_MAX);
 
 	if (fs->kerning == 1)
@@ -293,7 +296,7 @@ void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const cha
  */
 void UI_fontstyle_draw_simple_backdrop(
         const uiFontStyle *fs, float x, float y, const char *str,
-        const unsigned char fg[4], const unsigned char bg[4])
+        const float col_fg[4], const float col_bg[4])
 {
 	if (fs->kerning == 1)
 		BLF_enable(fs->uifont_id, BLF_KERNING_DEFAULT);
@@ -307,21 +310,19 @@ void UI_fontstyle_draw_simple_backdrop(
 		const float margin = height / 4.0f;
 
 		/* backdrop */
-		glColor4ubv(bg);
+		float color[4] = { col_bg[0], col_bg[1], col_bg[2], 0.5f };
 
-		UI_draw_roundbox_corner_set(UI_CNR_ALL | UI_RB_ALPHA);
-		UI_draw_roundbox(
+		UI_draw_roundbox_corner_set(UI_CNR_ALL);
+		UI_draw_roundbox_aa(true,
 		        x - margin,
 		        (y + decent) - margin,
 		        x + width + margin,
 		        (y + decent) + height + margin,
-		        margin);
-
-		glColor4ubv(fg);
+		        margin, color);
 	}
 
-
 	BLF_position(fs->uifont_id, x, y, 0.0f);
+	BLF_color4fv(fs->uifont_id, col_fg);
 	BLF_draw(fs->uifont_id, str, BLF_DRAW_STR_DUMMY_MAX);
 
 	if (fs->kerning == 1)
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 574e1463857..d934d4dd1e4 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -56,11 +56,12 @@
 #include "BKE_colorband.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
+#include "BKE_library_override.h"
 #include "BKE_linestyle.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
@@ -69,9 +70,11 @@
 #include "BKE_particle.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
-#include "BKE_sca.h"
 #include "BKE_screen.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 #include "ED_render.h"
@@ -91,11 +94,128 @@
 
 // #define USE_OP_RESET_BUT  // we may want to make this optional, disable for now.
 
+/* defines for templateID/TemplateSearch */
+#define TEMPLATE_SEARCH_TEXTBUT_WIDTH  (UI_UNIT_X * 6)
+#define TEMPLATE_SEARCH_TEXTBUT_HEIGHT  UI_UNIT_Y
+
 
 void UI_template_fix_linking(void)
 {
 }
 
+/**
+ * Add a block button for the search menu for templateID and templateSearch.
+ */
+static void template_add_button_search_menu(
+        const bContext *C, uiLayout *layout, uiBlock *block,
+        PointerRNA *ptr, PropertyRNA *prop,
+        uiBlockCreateFunc block_func, void *block_argN, const char * const tip,
+        const bool use_previews, const bool editable)
+{
+	PointerRNA active_ptr = RNA_property_pointer_get(ptr, prop);
+	ID *id = (active_ptr.data && RNA_struct_is_ID(active_ptr.type)) ? active_ptr.data : NULL;
+	const ID *idfrom = ptr->id.data;
+	const StructRNA *type = active_ptr.type ? active_ptr.type : RNA_property_pointer_type(ptr, prop);
+	uiBut *but;
+
+	if (use_previews) {
+		ARegion *region = CTX_wm_region(C);
+		ScrArea *area = CTX_wm_area(C);
+		/* XXX ugly top-bar exception */
+		const bool use_big_size = (region->regiontype != RGN_TYPE_HEADER) && (area->spacetype != SPACE_TOPBAR); /* silly check, could be more generic */
+		/* Ugly exception for screens here, drawing their preview in icon size looks ugly/useless */
+		const bool use_preview_icon = use_big_size || (id && (GS(id->name) != ID_SCR));
+		const short width = UI_UNIT_X * (use_big_size ? 6 : 1.6f);
+		const short height = UI_UNIT_Y * (use_big_size ? 6 : 1);
+
+		but = uiDefBlockButN(block, block_func, block_argN, "", 0, 0, width, height, tip);
+		if (use_preview_icon) {
+			int icon = id ? ui_id_icon_get(C, id, use_big_size) : RNA_struct_ui_icon(type);
+			ui_def_but_icon(but, icon, UI_HAS_ICON | UI_BUT_ICON_PREVIEW);
+		}
+		else {
+			ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
+			UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT);
+		}
+
+		if ((idfrom && idfrom->lib) || !editable)
+			UI_but_flag_enable(but, UI_BUT_DISABLED);
+		if (use_big_size) {
+			uiLayoutRow(layout, true);
+		}
+	}
+	else {
+		but = uiDefBlockButN(block, block_func, block_argN, "", 0, 0, UI_UNIT_X * 1.6, UI_UNIT_Y, tip);
+		ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
+		if (id) {
+			/* default dragging of icon for id browse buttons */
+			UI_but_drag_set_id(but, id);
+		}
+		UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT);
+
+		if ((idfrom && idfrom->lib) || !editable)
+			UI_but_flag_enable(but, UI_BUT_DISABLED);
+	}
+}
+
+static uiBlock *template_common_search_menu(
+        const bContext *C, ARegion *region,
+        uiButSearchFunc search_func, void *search_arg,
+        uiButHandleFunc handle_func, void *active_item,
+        const int preview_rows, const int preview_cols)
+{
+	static char search[256];
+	wmWindow *win = CTX_wm_window(C);
+	uiBlock *block;
+	uiBut *but;
+
+	/* clear initial search string, then all items show */
+	search[0] = 0;
+
+	block = UI_block_begin(C, region, "_popup", UI_EMBOSS);
+	UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_SEARCH_MENU);
+
+	/* preview thumbnails */
+	if (preview_rows > 0 && preview_cols > 0) {
+		const int w = 4 * U.widget_unit * preview_cols;
+		const int h = 5 * U.widget_unit * preview_rows;
+
+		/* fake button, it holds space for search items */
+		uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 26, w, h, NULL, 0, 0, 0, 0, NULL);
+
+		but = uiDefSearchBut(
+		        block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, w, UI_UNIT_Y,
+		        preview_rows, preview_cols, "");
+	}
+	/* list view */
+	else {
+		const int searchbox_width  = UI_searchbox_size_x();
+		const int searchbox_height = UI_searchbox_size_y();
+
+		/* fake button, it holds space for search items */
+		uiDefBut(
+		        block, UI_BTYPE_LABEL, 0, "", 10, 15, searchbox_width, searchbox_height,
+		        NULL, 0, 0, 0, 0, NULL);
+		but = uiDefSearchBut(
+		        block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0,
+		        searchbox_width, UI_UNIT_Y - 1, 0, 0, "");
+	}
+	UI_but_func_search_set(
+	        but, ui_searchbox_create_generic, search_func,
+	        search_arg, handle_func, active_item);
+
+
+	UI_block_bounds_set_normal(block, 0.3f * U.widget_unit);
+	UI_block_direction_set(block, UI_DIR_DOWN);
+
+	/* give search-field focus */
+	UI_but_focus_on_enter_event(win, but);
+	/* this type of search menu requires undo */
+	but->flag |= UI_BUT_UNDO;
+
+	return block;
+}
+
 /********************** Header Template *************************/
 
 void uiTemplateHeader(uiLayout *layout, bContext *C)
@@ -120,7 +240,7 @@ typedef struct TemplateID {
 } TemplateID;
 
 /* Search browse menu, assign  */
-static void id_search_call_cb(bContext *C, void *arg_template, void *item)
+static void template_ID_set_property_cb(bContext *C, void *arg_template, void *item)
 {
 	TemplateID *template_ui = (TemplateID *)arg_template;
 
@@ -231,30 +351,25 @@ static void id_search_cb_objects_from_scene(const bContext *C, void *arg_templat
 	}
 
 	BKE_main_id_flag_listbase(lb, LIB_TAG_DOIT, false);
-	for (Base *base = scene->base.first; base; base = base->next) {
-		base->object->id.tag |= LIB_TAG_DOIT;
+
+	FOREACH_SCENE_OBJECT_BEGIN(scene, ob_iter)
+	{
+		ob_iter->id.tag |= LIB_TAG_DOIT;
 	}
+	FOREACH_SCENE_OBJECT_END;
 	id_search_cb_tagged(C, arg_template, str, items);
 }
 
 /* ID Search browse menu, open */
 static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
 {
-	static char search[256];
 	static TemplateID template_ui;
-	PointerRNA idptr;
-	wmWindow *win = CTX_wm_window(C);
-	uiBlock *block;
-	uiBut *but;
+	PointerRNA active_item_ptr;
 	void (*id_search_cb_p)(const bContext *, void *, const char *, uiSearchItems *) = id_search_cb;
 
-	/* clear initial search string, then all items show */
-	search[0] = 0;
 	/* arg_litem is malloced, can be freed by parent button */
 	template_ui = *((TemplateID *)arg_litem);
-
-	/* get active id for showing first item */
-	idptr = RNA_property_pointer_get(&template_ui.ptr, template_ui.prop);
+	active_item_ptr = RNA_property_pointer_get(&template_ui.ptr, template_ui.prop);
 
 	if (template_ui.filter) {
 		/* Currently only used for objects. */
@@ -265,46 +380,9 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
 		}
 	}
 
-	block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
-	UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_SEARCH_MENU);
-
-	/* preview thumbnails */
-	if (template_ui.prv_rows > 0 && template_ui.prv_cols > 0) {
-		int w = 4 * U.widget_unit * template_ui.prv_cols;
-		int h = 5 * U.widget_unit * template_ui.prv_rows;
-
-		/* fake button, it holds space for search items */
-		uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 26, w, h, NULL, 0, 0, 0, 0, NULL);
-
-		but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, w, UI_UNIT_Y,
-		                     template_ui.prv_rows, template_ui.prv_cols, "");
-		UI_but_func_search_set(
-		        but, ui_searchbox_create_generic, id_search_cb_p,
-		        &template_ui, id_search_call_cb, idptr.data);
-	}
-	/* list view */
-	else {
-		const int searchbox_width  = UI_searchbox_size_x();
-		const int searchbox_height = UI_searchbox_size_y();
-
-		/* fake button, it holds space for search items */
-		uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 15, searchbox_width, searchbox_height, NULL, 0, 0, 0, 0, NULL);
-		but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, searchbox_width, UI_UNIT_Y - 1, 0, 0, "");
-		UI_but_func_search_set(
-		        but, ui_searchbox_create_generic, id_search_cb_p,
-		        &template_ui, id_search_call_cb, idptr.data);
-	}
-
-
-	UI_block_bounds_set_normal(block, 0.3f * U.widget_unit);
-	UI_block_direction_set(block, UI_DIR_DOWN);
-
-	/* give search-field focus */
-	UI_but_focus_on_enter_event(win, but);
-	/* this type of search menu requires undo */
-	but->flag |= UI_BUT_UNDO;
-
-	return block;
+	return template_common_search_menu(
+	               C, ar, id_search_cb_p, &template_ui, template_ID_set_property_cb, active_item_ptr.data,
+	               template_ui.prv_rows, template_ui.prv_cols);
 }
 
 /************************ ID Template ***************************/
@@ -382,14 +460,34 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 		case UI_ID_LOCAL:
 			if (id) {
 				Main *bmain = CTX_data_main(C);
-				if (id_make_local(bmain, id, false, false)) {
-					BKE_main_id_clear_newpoins(bmain);
+				if (CTX_wm_window(C)->eventstate->shift) {
+					ID *override_id = BKE_override_static_create_from_id(bmain, id);
+					if (override_id != NULL) {
+						BKE_main_id_clear_newpoins(bmain);
 
-					/* reassign to get get proper updates/notifiers */
-					idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop);
-					RNA_property_pointer_set(&template_ui->ptr, template_ui->prop, idptr);
-					RNA_property_update(C, &template_ui->ptr, template_ui->prop);
+						/* Assign new pointer, takes care of updates/notifiers */
+						RNA_id_pointer_create(override_id, &idptr);
+					}
+				}
+				else {
+					if (id_make_local(bmain, id, false, false)) {
+						BKE_main_id_clear_newpoins(bmain);
+
+						/* reassign to get get proper updates/notifiers */
+						idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop);
+					}
 				}
+				RNA_property_pointer_set(&template_ui->ptr, template_ui->prop, idptr);
+				RNA_property_update(C, &template_ui->ptr, template_ui->prop);
+			}
+			break;
+		case UI_ID_OVERRIDE:
+			if (id && id->override_static) {
+				BKE_override_static_free(&id->override_static);
+				/* reassign to get get proper updates/notifiers */
+				idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop);
+				RNA_property_pointer_set(&template_ui->ptr, template_ui->prop, idptr);
+				RNA_property_update(C, &template_ui->ptr, template_ui->prop);
 			}
 			break;
 		case UI_ID_ALONE:
@@ -403,13 +501,13 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 					Scene *scene = CTX_data_scene(C);
 					ED_object_single_user(bmain, scene, (struct Object *)id);
 					WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
-					DAG_relations_tag_update(bmain);
+					DEG_relations_tag_update(bmain);
 				}
 				else {
 					if (id) {
 						Main *bmain = CTX_data_main(C);
 						id_single_user(C, id, &template_ui->ptr, template_ui->prop);
-						DAG_relations_tag_update(bmain);
+						DEG_relations_tag_update(bmain);
 					}
 				}
 			}
@@ -421,7 +519,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 	}
 }
 
-static const char *template_id_browse_tip(StructRNA *type)
+static const char *template_id_browse_tip(const StructRNA *type)
 {
 	if (type) {
 		switch (RNA_type_to_ID_code(type)) {
@@ -453,6 +551,8 @@ static const char *template_id_browse_tip(StructRNA *type)
 			case ID_PAL: return N_("Browse Palette Data to be linked");
 			case ID_PC:  return N_("Browse Paint Curve Data to be linked");
 			case ID_CF:  return N_("Browse Cache Files to be linked");
+			case ID_WS:  return N_("Browse Workspace to be linked");
+			case ID_LP:  return N_("Browse LightProbe to be linked");
 		}
 	}
 	return N_("Browse ID data to be linked");
@@ -472,6 +572,68 @@ static const char *template_id_context(StructRNA *type)
 }
 #endif
 
+static uiBut *template_id_def_new_but(
+        uiBlock *block, const ID *id, const TemplateID *template_ui, StructRNA *type,
+        const char * const newop, const bool editable, const bool id_open, const bool use_tab_but,
+        int but_height)
+{
+	ID *idfrom = template_ui->ptr.id.data;
+	uiBut *but;
+	const int w = id ? UI_UNIT_X : id_open ? UI_UNIT_X * 3 : UI_UNIT_X * 6;
+	const int but_type = use_tab_but ? UI_BTYPE_TAB : UI_BTYPE_BUT;
+
+	/* i18n markup, does nothing! */
+	BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_DEFAULT,
+	                                 BLT_I18NCONTEXT_ID_SCENE,
+	                                 BLT_I18NCONTEXT_ID_OBJECT,
+	                                 BLT_I18NCONTEXT_ID_MESH,
+	                                 BLT_I18NCONTEXT_ID_CURVE,
+	                                 BLT_I18NCONTEXT_ID_METABALL,
+	                                 BLT_I18NCONTEXT_ID_MATERIAL,
+	                                 BLT_I18NCONTEXT_ID_TEXTURE,
+	                                 BLT_I18NCONTEXT_ID_IMAGE,
+	                                 BLT_I18NCONTEXT_ID_LATTICE,
+	                                 BLT_I18NCONTEXT_ID_LAMP,
+	                                 BLT_I18NCONTEXT_ID_CAMERA,
+	                                 BLT_I18NCONTEXT_ID_WORLD,
+	                                 BLT_I18NCONTEXT_ID_SCREEN,
+	                                 BLT_I18NCONTEXT_ID_TEXT,
+	);
+	BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_ID_SPEAKER,
+	                                 BLT_I18NCONTEXT_ID_SOUND,
+	                                 BLT_I18NCONTEXT_ID_ARMATURE,
+	                                 BLT_I18NCONTEXT_ID_ACTION,
+	                                 BLT_I18NCONTEXT_ID_NODETREE,
+	                                 BLT_I18NCONTEXT_ID_BRUSH,
+	                                 BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
+	                                 BLT_I18NCONTEXT_ID_GPENCIL,
+	                                 BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
+	                                 BLT_I18NCONTEXT_ID_WORKSPACE,
+	                                 BLT_I18NCONTEXT_ID_LIGHTPROBE,
+	);
+
+	if (newop) {
+		but = uiDefIconTextButO(block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN,
+		                        (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL);
+		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
+	}
+	else {
+		but = uiDefIconTextBut(block, but_type, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
+		                       0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL);
+		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
+	}
+
+	if ((idfrom && idfrom->lib) || !editable) {
+		UI_but_flag_enable(but, UI_BUT_DISABLED);
+	}
+
+#ifndef WITH_INTERNATIONAL
+	UNUSED_VARS(type);
+#endif
+
+	return but;
+}
+
 static void template_ID(
         bContext *C, uiLayout *layout, TemplateID *template_ui, StructRNA *type, int flag,
         const char *newop, const char *openop, const char *unlinkop)
@@ -482,6 +644,7 @@ static void template_ID(
 	// ListBase *lb; // UNUSED
 	ID *id, *idfrom;
 	const bool editable = RNA_property_editable(&template_ui->ptr, template_ui->prop);
+	const bool use_previews = template_ui->preview = (flag & UI_ID_PREVIEWS) != 0;
 
 	idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop);
 	id = idptr.data;
@@ -494,29 +657,11 @@ static void template_ID(
 	if (idptr.type)
 		type = idptr.type;
 
-	if (flag & UI_ID_PREVIEWS) {
-		template_ui->preview = true;
-
-		but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template_ui), "", 0, 0, UI_UNIT_X * 6, UI_UNIT_Y * 6,
-		                     TIP_(template_id_browse_tip(type)));
-		ui_def_but_icon(but, id ? ui_id_icon_get(C, id, true) : RNA_struct_ui_icon(type),
-		                UI_HAS_ICON | UI_BUT_ICON_PREVIEW);
-
-		if ((idfrom && idfrom->lib) || !editable)
-			UI_but_flag_enable(but, UI_BUT_DISABLED);
-
-		uiLayoutRow(layout, true);
-	}
-	else if (flag & UI_ID_BROWSE) {
-		but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template_ui), "", 0, 0, UI_UNIT_X * 1.6, UI_UNIT_Y,
-		                     TIP_(template_id_browse_tip(type)));
-		ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
-		/* default dragging of icon for id browse buttons */
-		UI_but_drag_set_id(but, id);
-		UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT);
-
-		if ((idfrom && idfrom->lib) || !editable)
-			UI_but_flag_enable(but, UI_BUT_DISABLED);
+	if (flag & UI_ID_BROWSE) {
+		template_add_button_search_menu(
+		        C, layout, block, &template_ui->ptr, template_ui->prop,
+		        id_search_menu, MEM_dupallocN(template_ui), TIP_(template_id_browse_tip(type)),
+		        use_previews, editable);
 	}
 
 	/* text button with name */
@@ -526,8 +671,9 @@ static void template_ID(
 
 		//text_idbutton(id, name);
 		name[0] = '\0';
-		but = uiDefButR(block, UI_BTYPE_TEXT, 0, name, 0, 0, UI_UNIT_X * 6, UI_UNIT_Y,
-		                &idptr, "name", -1, 0, 0, -1, -1, RNA_struct_ui_description(type));
+		but = uiDefButR(
+		        block, UI_BTYPE_TEXT, 0, name, 0, 0, TEMPLATE_SEARCH_TEXTBUT_WIDTH, TEMPLATE_SEARCH_TEXTBUT_HEIGHT,
+		        &idptr, "name", -1, 0, 0, -1, -1, RNA_struct_ui_description(type));
 		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_RENAME));
 		if (user_alert) UI_but_flag_enable(but, UI_BUT_REDALERT);
 
@@ -538,13 +684,25 @@ static void template_ID(
 				UI_but_flag_enable(but, UI_BUT_DISABLED);
 			}
 			else {
+				const bool disabled = (!id_make_local(CTX_data_main(C), id, true /* test */, false) ||
+				                       (idfrom && idfrom->lib));
 				but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                   NULL, 0, 0, 0, 0, TIP_("Direct linked library data-block, click to make local"));
-				if (!id_make_local(CTX_data_main(C), id, true /* test */, false) || (idfrom && idfrom->lib))
+				                   NULL, 0, 0, 0, 0,
+				                   TIP_("Direct linked library data-block, click to make local, "
+				                        "Shift + Click to create a static override"));
+				if (disabled) {
 					UI_but_flag_enable(but, UI_BUT_DISABLED);
+				}
+				else {
+					UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_LOCAL));
+				}
 			}
-
-			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_LOCAL));
+		}
+		else if (ID_IS_STATIC_OVERRIDE(id)) {
+			but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_OVERRIDE, 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                   NULL, 0, 0, 0, 0,
+			                   TIP_("Static override of linked library data-block, click to make fully local"));
+			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_OVERRIDE));
 		}
 
 		if (id->us > 1) {
@@ -572,55 +730,13 @@ static void template_ID(
 
 		if (user_alert) UI_but_flag_enable(but, UI_BUT_REDALERT);
 
-		if (id->lib == NULL && !(ELEM(GS(id->name), ID_GR, ID_SCE, ID_SCR, ID_TXT, ID_OB))) {
+		if (id->lib == NULL && !(ELEM(GS(id->name), ID_GR, ID_SCE, ID_SCR, ID_TXT, ID_OB, ID_WS))) {
 			uiDefButR(block, UI_BTYPE_TOGGLE, 0, "F", 0, 0, UI_UNIT_X, UI_UNIT_Y, &idptr, "use_fake_user", -1, 0, 0, -1, -1, NULL);
 		}
 	}
 
 	if (flag & UI_ID_ADD_NEW) {
-		int w = id ? UI_UNIT_X : (flag & UI_ID_OPEN) ? UI_UNIT_X * 3 : UI_UNIT_X * 6;
-
-		/* i18n markup, does nothing! */
-		BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_DEFAULT,
-		                                 BLT_I18NCONTEXT_ID_SCENE,
-		                                 BLT_I18NCONTEXT_ID_OBJECT,
-		                                 BLT_I18NCONTEXT_ID_MESH,
-		                                 BLT_I18NCONTEXT_ID_CURVE,
-		                                 BLT_I18NCONTEXT_ID_METABALL,
-		                                 BLT_I18NCONTEXT_ID_MATERIAL,
-		                                 BLT_I18NCONTEXT_ID_TEXTURE,
-		                                 BLT_I18NCONTEXT_ID_IMAGE,
-		                                 BLT_I18NCONTEXT_ID_LATTICE,
-		                                 BLT_I18NCONTEXT_ID_LAMP,
-		                                 BLT_I18NCONTEXT_ID_CAMERA,
-		                                 BLT_I18NCONTEXT_ID_WORLD,
-		                                 BLT_I18NCONTEXT_ID_SCREEN,
-		                                 BLT_I18NCONTEXT_ID_TEXT,
-		);
-		BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_ID_SPEAKER,
-		                                 BLT_I18NCONTEXT_ID_SOUND,
-		                                 BLT_I18NCONTEXT_ID_ARMATURE,
-		                                 BLT_I18NCONTEXT_ID_ACTION,
-		                                 BLT_I18NCONTEXT_ID_NODETREE,
-		                                 BLT_I18NCONTEXT_ID_BRUSH,
-		                                 BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
-		                                 BLT_I18NCONTEXT_ID_GPENCIL,
-		                                 BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
-		);
-
-		if (newop) {
-			but = uiDefIconTextButO(block, UI_BTYPE_BUT, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN,
-			                        (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, UI_UNIT_Y, NULL);
-			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
-		}
-		else {
-			but = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
-			                       0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
-			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
-		}
-
-		if ((idfrom && idfrom->lib) || !editable)
-			UI_but_flag_enable(but, UI_BUT_DISABLED);
+		template_id_def_new_but(block, id, template_ui, type, newop, editable, flag & UI_ID_OPEN, false, UI_UNIT_X);
 	}
 
 	/* Due to space limit in UI - skip the "open" icon for packed data, and allow to unpack.
@@ -689,9 +805,58 @@ static void template_ID(
 	UI_block_align_end(block);
 }
 
+static void template_ID_tabs(
+        bContext *C, uiLayout *layout, TemplateID *template, StructRNA *type, int flag,
+        const char *newop, const char *UNUSED(openop), const char *unlinkop)
+{
+	const ARegion *region = CTX_wm_region(C);
+	const PointerRNA active_ptr = RNA_property_pointer_get(&template->ptr, template->prop);
+	const int but_align = (region->alignment == RGN_ALIGN_TOP) ? UI_BUT_ALIGN_DOWN : UI_BUT_ALIGN_TOP;
+	const int but_height = UI_UNIT_Y * 1.1;
+
+	uiBlock *block = uiLayoutGetBlock(layout);
+	uiStyle *style = UI_style_get_dpi();
+
+
+	for (ID *id = template->idlb->first; id; id = id->next) {
+		wmOperatorType *unlink_ot = WM_operatortype_find(unlinkop, false);
+		const bool is_active = active_ptr.data == id;
+		const unsigned int but_width = UI_fontstyle_string_width(&style->widgetlabel, id->name + 2) + UI_UNIT_X +
+		                               (is_active ? ICON_DEFAULT_WIDTH_SCALE : 0);
+		uiButTab *tab;
+
+		tab = (uiButTab *)uiDefButR_prop(
+		        block, UI_BTYPE_TAB, 0, "", 0, 0, but_width, UI_UNIT_Y * 1.1,
+		        &template->ptr, template->prop, 0, 0.0f,
+		        sizeof(id->name) - 2, 0.0f, 0.0f, "");
+		UI_but_funcN_set(&tab->but, template_ID_set_property_cb, MEM_dupallocN(template), id);
+		tab->but.custom_data = (void *)id;
+		tab->unlink_ot = unlink_ot;
+
+		if (is_active) {
+			UI_but_flag_enable(&tab->but, UI_BUT_VALUE_CLEAR);
+		}
+		UI_but_drawflag_enable(&tab->but, but_align);
+	}
+
+	if (flag & UI_ID_ADD_NEW) {
+		const bool editable = RNA_property_editable(&template->ptr, template->prop);
+		uiBut *but;
+
+		if (active_ptr.type) {
+			type = active_ptr.type;
+		}
+
+		but = template_id_def_new_but(block, active_ptr.data, template, type, newop, editable, flag & UI_ID_OPEN, true, but_height);
+		UI_but_drawflag_enable(but, but_align);
+	}
+}
+
 static void ui_template_id(
-        uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, const char *newop,
-        const char *openop, const char *unlinkop, int flag, int prv_rows, int prv_cols, int filter)
+        uiLayout *layout, bContext *C,
+        PointerRNA *ptr, const char *propname,
+        const char *newop, const char *openop, const char *unlinkop,
+        int flag, int prv_rows, int prv_cols, int filter, bool use_tabs)
 {
 	TemplateID *template_ui;
 	PropertyRNA *prop;
@@ -732,8 +897,14 @@ static void ui_template_id(
 	 *	- template_ID makes a copy of the template data and assigns it to the relevant buttons
 	 */
 	if (template_ui->idlb) {
-		uiLayoutRow(layout, true);
-		template_ID(C, layout, template_ui, type, flag, newop, openop, unlinkop);
+		if (use_tabs) {
+			uiLayoutRow(layout, true);
+			template_ID_tabs(C, layout, template_ui, type, flag, newop, openop, unlinkop);
+		}
+		else {
+			uiLayoutRow(layout, true);
+			template_ID(C, layout, template_ui, type, flag, newop, openop, unlinkop);
+		}
 	}
 
 	MEM_freeN(template_ui);
@@ -743,23 +914,49 @@ void uiTemplateID(
         uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, const char *newop,
         const char *openop, const char *unlinkop, int filter)
 {
-	ui_template_id(layout, C, ptr, propname, newop, openop, unlinkop,
-	               UI_ID_BROWSE | UI_ID_RENAME | UI_ID_DELETE, 0, 0, filter);
+	ui_template_id(
+	        layout, C, ptr, propname,
+	        newop, openop, unlinkop,
+	        UI_ID_BROWSE | UI_ID_RENAME | UI_ID_DELETE,
+	        0, 0, filter, false);
 }
 
 void uiTemplateIDBrowse(
         uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, const char *newop,
         const char *openop, const char *unlinkop, int filter)
 {
-	ui_template_id(layout, C, ptr, propname, newop, openop, unlinkop, UI_ID_BROWSE | UI_ID_RENAME, 0, 0, filter);
+	ui_template_id(
+	        layout, C, ptr, propname,
+	        newop, openop, unlinkop,
+	        UI_ID_BROWSE | UI_ID_RENAME,
+	        0, 0, filter, false);
 }
 
 void uiTemplateIDPreview(
         uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, const char *newop,
         const char *openop, const char *unlinkop, int rows, int cols, int filter)
 {
-	ui_template_id(layout, C, ptr, propname, newop, openop, unlinkop,
-	               UI_ID_BROWSE | UI_ID_RENAME | UI_ID_DELETE | UI_ID_PREVIEWS, rows, cols, filter);
+	ui_template_id(
+	        layout, C, ptr, propname,
+	        newop, openop, unlinkop,
+	        UI_ID_BROWSE | UI_ID_RENAME | UI_ID_DELETE | UI_ID_PREVIEWS,
+	        rows, cols, filter, false);
+}
+
+/**
+ * Version of #uiTemplateID using tabs.
+ */
+void uiTemplateIDTabs(
+        uiLayout *layout, bContext *C,
+        PointerRNA *ptr, const char *propname,
+        const char *newop, const char *openop, const char *unlinkop,
+        int filter)
+{
+	ui_template_id(
+	        layout, C, ptr, propname,
+	        newop, openop, unlinkop,
+	        UI_ID_BROWSE | UI_ID_RENAME | UI_ID_DELETE,
+	        0, 0, filter, true);
 }
 
 /************************ ID Chooser Template ***************************/
@@ -821,6 +1018,208 @@ void uiTemplateAnyID(
 	uiItemFullR(sub, ptr, propID, 0, 0, 0, "", ICON_NONE);
 }
 
+/********************* Search Template ********************/
+
+typedef struct TemplateSearch {
+	uiRNACollectionSearch search_data;
+
+	bool use_previews;
+	int preview_rows, preview_cols;
+} TemplateSearch;
+
+static void template_search_handle_cb(bContext *C, void *arg_template, void *item)
+{
+	TemplateSearch *template_search = arg_template;
+	uiRNACollectionSearch *coll_search = &template_search->search_data;
+	StructRNA *type = RNA_property_pointer_type(&coll_search->target_ptr, coll_search->target_prop);
+	PointerRNA item_ptr;
+
+	RNA_pointer_create(NULL, type, item, &item_ptr);
+	RNA_property_pointer_set(&coll_search->target_ptr, coll_search->target_prop, item_ptr);
+	RNA_property_update(C, &coll_search->target_ptr, coll_search->target_prop);
+}
+
+static uiBlock *template_search_menu(bContext *C, ARegion *region, void *arg_template)
+{
+	static TemplateSearch template_search;
+	PointerRNA active_ptr;
+
+	/* arg_template is malloced, can be freed by parent button */
+	template_search = *((TemplateSearch *)arg_template);
+	active_ptr = RNA_property_pointer_get(&template_search.search_data.target_ptr,
+	                                      template_search.search_data.target_prop);
+
+	return template_common_search_menu(
+	               C, region, ui_rna_collection_search_cb, &template_search,
+	               template_search_handle_cb, active_ptr.data,
+	               template_search.preview_rows, template_search.preview_cols);
+}
+
+static void template_search_add_button_searchmenu(
+        const bContext *C, uiLayout *layout, uiBlock *block,
+        TemplateSearch *template_search, const bool editable)
+{
+	const char *ui_description = RNA_property_ui_description(template_search->search_data.target_prop);
+
+	template_add_button_search_menu(
+	        C, layout, block,
+	        &template_search->search_data.target_ptr, template_search->search_data.target_prop,
+	        template_search_menu, MEM_dupallocN(template_search), ui_description,
+	        template_search->use_previews, editable);
+}
+
+static void template_search_add_button_name(
+        uiBlock *block, PointerRNA *active_ptr, const StructRNA *type)
+{
+	uiDefAutoButR(
+	        block, active_ptr, RNA_struct_name_property(type), 0, "", ICON_NONE,
+	        0, 0, TEMPLATE_SEARCH_TEXTBUT_WIDTH, TEMPLATE_SEARCH_TEXTBUT_HEIGHT);
+}
+
+static void template_search_add_button_operator(
+        uiBlock *block, const char * const operator_name,
+        const int opcontext, const int icon, const bool editable)
+{
+	if (!operator_name) {
+		return;
+	}
+
+	uiBut *but = uiDefIconButO(
+	        block, UI_BTYPE_BUT, operator_name, opcontext, icon,
+	        0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
+
+	if (!editable) {
+		UI_but_drawflag_enable(but, UI_BUT_DISABLED);
+	}
+}
+
+static void template_search_buttons(
+        const bContext *C, uiLayout *layout, TemplateSearch *template_search,
+        const char *newop, const char *unlinkop)
+{
+	uiBlock *block = uiLayoutGetBlock(layout);
+	uiRNACollectionSearch *search_data = &template_search->search_data;
+	StructRNA *type = RNA_property_pointer_type(&search_data->target_ptr, search_data->target_prop);
+	const bool editable = RNA_property_editable(&search_data->target_ptr, search_data->target_prop);
+	PointerRNA active_ptr = RNA_property_pointer_get(&search_data->target_ptr, search_data->target_prop);
+
+	if (active_ptr.type) {
+		/* can only get correct type when there is an active item */
+		type = active_ptr.type;
+	}
+
+	uiLayoutRow(layout, true);
+	UI_block_align_begin(block);
+
+	template_search_add_button_searchmenu(C, layout, block, template_search, editable);
+	template_search_add_button_name(block, &active_ptr, type);
+	template_search_add_button_operator(block, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, editable);
+	template_search_add_button_operator(block, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, editable);
+
+	UI_block_align_end(block);
+}
+
+static PropertyRNA *template_search_get_searchprop(
+        PointerRNA *targetptr, PropertyRNA *targetprop,
+        PointerRNA *searchptr, const char * const searchpropname)
+{
+	PropertyRNA *searchprop;
+
+	if (searchptr && !searchptr->data) {
+		searchptr = NULL;
+	}
+
+	if (!searchptr && !searchpropname) {
+		/* both NULL means we don't use a custom rna collection to search in */
+	}
+	else if (!searchptr && searchpropname) {
+		RNA_warning("searchpropname defined (%s) but searchptr is missing", searchpropname);
+	}
+	else if (searchptr && !searchpropname) {
+		RNA_warning("searchptr defined (%s) but searchpropname is missing", RNA_struct_identifier(searchptr->type));
+	}
+	else if (!(searchprop = RNA_struct_find_property(searchptr, searchpropname))) {
+		RNA_warning("search collection property not found: %s.%s",
+		            RNA_struct_identifier(searchptr->type), searchpropname);
+	}
+	else if (RNA_property_type(searchprop) != PROP_COLLECTION) {
+		RNA_warning("search collection property is not a collection type: %s.%s",
+		            RNA_struct_identifier(searchptr->type), searchpropname);
+	}
+	/* check if searchprop has same type as targetprop */
+	else if (RNA_property_pointer_type(searchptr, searchprop) != RNA_property_pointer_type(targetptr, targetprop)) {
+		RNA_warning("search collection items from %s.%s are not of type %s",
+		            RNA_struct_identifier(searchptr->type), searchpropname,
+		            RNA_struct_identifier(RNA_property_pointer_type(targetptr, targetprop)));
+	}
+	else {
+		return searchprop;
+	}
+
+	return NULL;
+}
+
+static TemplateSearch *template_search_setup(
+        PointerRNA *ptr, const char * const propname,
+        PointerRNA *searchptr, const char * const searchpropname)
+{
+	TemplateSearch *template_search;
+	PropertyRNA *prop, *searchprop;
+
+	prop = RNA_struct_find_property(ptr, propname);
+
+	if (!prop || RNA_property_type(prop) != PROP_POINTER) {
+		RNA_warning("pointer property not found: %s.%s", RNA_struct_identifier(ptr->type), propname);
+		return NULL;
+	}
+	searchprop = template_search_get_searchprop(ptr, prop, searchptr, searchpropname);
+
+	template_search = MEM_callocN(sizeof(*template_search), __func__);
+	template_search->search_data.target_ptr = *ptr;
+	template_search->search_data.target_prop = prop;
+	template_search->search_data.search_ptr = *searchptr;
+	template_search->search_data.search_prop = searchprop;
+
+	return template_search;
+}
+
+/**
+ * Search menu to pick an item from a collection.
+ * A version of uiTemplateID that works for non-ID types.
+ */
+void uiTemplateSearch(
+        uiLayout *layout, bContext *C,
+        PointerRNA *ptr, const char *propname,
+        PointerRNA *searchptr, const char *searchpropname,
+        const char *newop, const char *unlinkop)
+{
+	TemplateSearch *template_search = template_search_setup(ptr, propname, searchptr, searchpropname);
+	if (template_search != NULL) {
+		template_search_buttons(C, layout, template_search, newop, unlinkop);
+		MEM_freeN(template_search);
+	}
+}
+
+void uiTemplateSearchPreview(
+        uiLayout *layout, bContext *C,
+        PointerRNA *ptr, const char *propname,
+        PointerRNA *searchptr, const char *searchpropname,
+        const char *newop, const char *unlinkop,
+        const int rows, const int cols)
+{
+	TemplateSearch *template_search = template_search_setup(ptr, propname, searchptr, searchpropname);
+
+	if (template_search != NULL) {
+		template_search->use_previews = true;
+		template_search->preview_rows = rows;
+		template_search->preview_cols = cols;
+
+		template_search_buttons(C, layout, template_search, newop, unlinkop);
+
+		MEM_freeN(template_search);
+	}
+}
+
 /********************* RNA Path Builder Template ********************/
 
 /* ---------- */
@@ -874,7 +1273,7 @@ static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v)
 	ob->partype = PAROBJECT;
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	ED_undo_push(C, "Modifier convert to real");
 }
@@ -1017,8 +1416,7 @@ static uiLayout *draw_modifier(
 		UI_block_emboss_set(block, UI_EMBOSS_NONE);
 		/* When Modifier is a simulation, show button to switch to context rather than the delete button. */
 		if (modifier_can_delete(md) &&
-		    (!modifier_is_simulation(md) ||
-		     STREQ(scene->r.engine, RE_engine_id_BLENDER_GAME)))
+		    !modifier_is_simulation(md))
 		{
 			uiItemO(row, "", ICON_X, "OBJECT_OT_modifier_remove");
 		}
@@ -1132,6 +1530,70 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr)
 	return NULL;
 }
 
+
+/************************ Redo Buttons Template *************************/
+
+static bool template_operator_redo_property_buts_poll(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
+{
+	return (RNA_property_tags(prop) & OP_PROP_TAG_ADVANCED) == 0;
+}
+
+static void template_operator_redo_property_buts_draw(
+        const bContext *C, wmOperator *op,
+        uiLayout *layout, int layout_flags,
+        bool *r_has_advanced)
+{
+	if (op->type->flag & OPTYPE_MACRO) {
+		for (wmOperator *macro_op = op->macro.first; macro_op; macro_op = macro_op->next) {
+			template_operator_redo_property_buts_draw(C, macro_op, layout, layout_flags, r_has_advanced);
+		}
+	}
+	else {
+		/* Might want to make label_align adjustable somehow. */
+		eAutoPropButsReturn return_info = uiTemplateOperatorPropertyButs(
+		        C, layout, op, r_has_advanced ? template_operator_redo_property_buts_poll : NULL,
+		        UI_BUT_LABEL_ALIGN_NONE, layout_flags);
+		if (return_info & UI_PROP_BUTS_ANY_FAILED_CHECK) {
+			if (r_has_advanced) {
+				*r_has_advanced = true;
+			}
+		}
+	}
+}
+
+void uiTemplateOperatorRedoProperties(uiLayout *layout, const bContext *C)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	uiBlock *block = uiLayoutGetBlock(layout);
+
+	if (op == NULL) {
+		return;
+	}
+
+	/* Disable for now, doesn't fit well in popover. */
+#if 0
+	/* Repeat button with operator name as text. */
+	uiItemFullO(layout, "SCREEN_OT_repeat_last", RNA_struct_ui_name(op->type->srna),
+	            ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, NULL);
+#endif
+
+	if (WM_operator_repeat_check(C, op)) {
+#if 0
+		bool has_advanced = false;
+#endif
+
+		UI_block_func_set(block, ED_undo_operator_repeat_cb, op, NULL);
+		template_operator_redo_property_buts_draw(C, op, layout, UI_TEMPLATE_OP_PROPS_COMPACT, NULL /* &has_advanced */ );
+		UI_block_func_set(block, NULL, NULL, NULL); /* may want to reset to old state instead of NULLing all */
+
+#if 0
+		if (has_advanced) {
+			uiItemO(layout, IFACE_("More..."), ICON_NONE, "SCREEN_OT_redo_last");
+		}
+#endif
+	}
+}
+
 /************************ Constraint Template *************************/
 
 #include "DNA_constraint_types.h"
@@ -1155,7 +1617,7 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
 			Main *bmain = CTX_data_main(C);
 			if (ob->pose)
 				BKE_pose_tag_recalc(bmain, ob->pose); /* checks & sorts pose channels */
-			DAG_relations_tag_update(bmain);
+			DEG_relations_tag_update(bmain);
 			break;
 		}
 #endif
@@ -1169,8 +1631,8 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
 	 * object_test_constraints(ob);
 	 * if (ob->pose) BKE_pose_update_constraint_flags(ob->pose); */
 
-	if (ob->type == OB_ARMATURE) DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
-	else DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	if (ob->type == OB_ARMATURE) DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+	else DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
 }
@@ -2628,77 +3090,6 @@ void uiTemplateLayers(
 	}
 }
 
-void uiTemplateGameStates(
-        uiLayout *layout, PointerRNA *ptr, const char *propname,
-        PointerRNA *used_ptr, const char *used_propname, int active_state)
-{
-	uiLayout *uRow, *uCol;
-	PropertyRNA *prop, *used_prop = NULL;
-	int groups, cols, states;
-	int group, col, state, row;
-	int cols_per_group = 5;
-	Object *ob = (Object *)ptr->id.data;
-
-	prop = RNA_struct_find_property(ptr, propname);
-	if (!prop) {
-		RNA_warning("states property not found: %s.%s", RNA_struct_identifier(ptr->type), propname);
-		return;
-	}
-
-	/* the number of states determines the way we group them
-	 *	- we want 2 rows only (for now)
-	 *	- the number of columns (cols) is the total number of buttons per row
-	 *	  the 'remainder' is added to this, as it will be ok to have first row slightly wider if need be
-	 *	- for now, only split into groups if group will have at least 5 items
-	 */
-	states = RNA_property_array_length(ptr, prop);
-	cols = (states / 2) + (states % 2);
-	groups = ((cols / 2) < cols_per_group) ? (1) : (cols / cols_per_group);
-
-	if (used_ptr && used_propname) {
-		used_prop = RNA_struct_find_property(used_ptr, used_propname);
-		if (!used_prop) {
-			RNA_warning("used layers property not found: %s.%s", RNA_struct_identifier(ptr->type), used_propname);
-			return;
-		}
-
-		if (RNA_property_array_length(used_ptr, used_prop) < states)
-			used_prop = NULL;
-	}
-
-	/* layers are laid out going across rows, with the columns being divided into groups */
-
-	for (group = 0; group < groups; group++) {
-		uCol = uiLayoutColumn(layout, true);
-
-		for (row = 0; row < 2; row++) {
-			uiBlock *block;
-			uiBut *but;
-
-			uRow = uiLayoutRow(uCol, true);
-			block = uiLayoutGetBlock(uRow);
-			state = groups * cols_per_group * row + cols_per_group * group;
-
-			/* add layers as toggle buts */
-			for (col = 0; (col < cols_per_group) && (state < states); col++, state++) {
-				int icon = 0;
-				int butlay = 1 << state;
-
-				if (active_state & butlay)
-					icon = ICON_LAYER_ACTIVE;
-				else if (used_prop && RNA_property_boolean_get_index(used_ptr, used_prop, state))
-					icon = ICON_LAYER_USED;
-
-				but = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, icon, 0, 0, UI_UNIT_X / 2, UI_UNIT_Y / 2, ptr, prop,
-				                         state, 0, 0, -1, -1, sca_state_name_get(ob, state));
-				UI_but_func_set(but, handle_layer_buttons, but, SET_INT_IN_POINTER(state));
-				but->type = UI_BTYPE_TOGGLE;
-			}
-		}
-	}
-}
-
-
 /************************* List Template **************************/
 static void uilist_draw_item_default(
         struct uiList *ui_list, struct bContext *UNUSED(C), struct uiLayout *layout,
@@ -3490,11 +3881,14 @@ static void ui_layout_operator_buts__reset_cb(bContext *UNUSED(C), void *op_pt,
  * Draw Operator property buttons for redoing execution with different settings.
  * This function does not initialize the layout, functions can be called on the layout before and after.
  */
-void uiTemplateOperatorPropertyButs(
+eAutoPropButsReturn uiTemplateOperatorPropertyButs(
         const bContext *C, uiLayout *layout, wmOperator *op,
         bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *),
-        const char label_align, const short flag)
+        const eButLabelAlign label_align, const short flag)
 {
+	uiBlock *block = uiLayoutGetBlock(layout);
+	eAutoPropButsReturn return_info = 0;
+
 	if (!op->properties) {
 		IDPropertyTemplate val = {0};
 		op->properties = IDP_New(IDP_GROUP, &val, "wmOperatorProperties");
@@ -3507,14 +3901,14 @@ void uiTemplateOperatorPropertyButs(
 	/* poll() on this operator may still fail, at the moment there is no nice feedback when this happens
 	 * just fails silently */
 	if (!WM_operator_repeat_check(C, op)) {
-		UI_block_lock_set(uiLayoutGetBlock(layout), true, "Operator can't' redo");
+		UI_block_lock_set(block, true, "Operator can't' redo");
 
 		/* XXX, could give some nicer feedback or not show redo panel at all? */
 		uiItemL(layout, IFACE_("* Redo Unsupported *"), ICON_NONE);
 	}
 	else {
 		/* useful for macros where only one of the steps can't be re-done */
-		UI_block_lock_clear(uiLayoutGetBlock(layout));
+		UI_block_lock_clear(block);
 	}
 
 	/* menu */
@@ -3523,7 +3917,7 @@ void uiTemplateOperatorPropertyButs(
 		PointerRNA op_ptr;
 		uiLayout *row;
 
-		uiLayoutGetBlock(layout)->ui_operator = op;
+		block->ui_operator = op;
 
 		row = uiLayoutRow(layout, true);
 		uiItemM(row, (bContext *)C, "WM_MT_operator_presets", NULL, ICON_NONE);
@@ -3542,19 +3936,19 @@ void uiTemplateOperatorPropertyButs(
 		op->type->ui((bContext *)C, op);
 		op->layout = NULL;
 
-		/* UI_LAYOUT_OP_SHOW_EMPTY ignored */
+		/* UI_LAYOUT_OP_SHOW_EMPTY ignored. return_info is ignored too. We could
+		 * allow ot.ui callback to return this, but not needed right now. */
 	}
 	else {
 		wmWindowManager *wm = CTX_wm_manager(C);
 		PointerRNA ptr;
-		int empty;
 
 		RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 		/* main draw call */
-		empty = uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0;
+		return_info = uiDefAutoButsRNA(layout, &ptr, check_prop, label_align, (flag & UI_TEMPLATE_OP_PROPS_COMPACT));
 
-		if (empty && (flag & UI_TEMPLATE_OP_PROPS_SHOW_EMPTY)) {
+		if ((return_info & UI_PROP_BUTS_NONE_ADDED) && (flag & UI_TEMPLATE_OP_PROPS_SHOW_EMPTY)) {
 			uiItemL(layout, IFACE_("No Properties"), ICON_NONE);
 		}
 	}
@@ -3564,7 +3958,6 @@ void uiTemplateOperatorPropertyButs(
 	 * but this is not so important if this button is drawn in those cases
 	 * (which isn't all that likely anyway) - campbell */
 	if (op->properties->len) {
-		uiBlock *block;
 		uiBut *but;
 		uiLayout *col; /* needed to avoid alignment errors with previous buttons */
 
@@ -3578,7 +3971,6 @@ void uiTemplateOperatorPropertyButs(
 
 	/* set various special settings for buttons */
 	{
-		uiBlock *block = uiLayoutGetBlock(layout);
 		const bool is_popup = (block->flag & UI_BLOCK_KEEP_OPEN) != 0;
 		uiBut *but;
 
@@ -3598,6 +3990,8 @@ void uiTemplateOperatorPropertyButs(
 			}
 		}
 	}
+
+	return return_info;
 }
 
 /************************* Running Jobs Template **************************/
@@ -3935,6 +4329,7 @@ void uiTemplateKeymapItemProperties(uiLayout *layout, PointerRNA *ptr)
 	if (propptr.data) {
 		uiBut *but = uiLayoutGetBlock(layout)->buttons.last;
 
+		WM_operator_properties_sanitize(&propptr, false);
 		template_keymap_item_properties(layout, NULL, &propptr);
 
 		/* attach callbacks to compensate for missing properties update,
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 28aecc14035..e049416ce07 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -157,66 +157,159 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
  * \a check_prop callback filters functions to avoid drawing certain properties,
  * in cases where PROP_HIDDEN flag can't be used for a property.
  */
-int uiDefAutoButsRNA(
+eAutoPropButsReturn uiDefAutoButsRNA(
         uiLayout *layout, PointerRNA *ptr,
         bool (*check_prop)(PointerRNA *, PropertyRNA *),
-        const char label_align)
+        const eButLabelAlign label_align, const bool compact)
 {
+	eAutoPropButsReturn return_info = UI_PROP_BUTS_NONE_ADDED;
 	uiLayout *split, *col;
 	int flag;
 	const char *name;
-	int tot = 0;
-
-	assert(ELEM(label_align, '\0', 'H', 'V'));
 
 	RNA_STRUCT_BEGIN (ptr, prop)
 	{
 		flag = RNA_property_flag(prop);
-		if (flag & PROP_HIDDEN || (check_prop && check_prop(ptr, prop) == 0))
+
+		if (flag & PROP_HIDDEN) {
+			continue;
+		}
+		if (check_prop && check_prop(ptr, prop) == 0) {
+			return_info |= UI_PROP_BUTS_ANY_FAILED_CHECK;
 			continue;
+		}
 
-		if (label_align != '\0') {
-			PropertyType type = RNA_property_type(prop);
-			const bool is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(prop));
+		switch (label_align) {
+			case UI_BUT_LABEL_ALIGN_COLUMN:
+			case UI_BUT_LABEL_ALIGN_SPLIT_COLUMN:
+			{
+				PropertyType type = RNA_property_type(prop);
+				const bool is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(prop));
 
-			name = RNA_property_ui_name(prop);
+				name = RNA_property_ui_name(prop);
 
-			if (label_align == 'V') {
-				col = uiLayoutColumn(layout, true);
+				if (label_align == UI_BUT_LABEL_ALIGN_COLUMN) {
+					col = uiLayoutColumn(layout, true);
 
-				if (!is_boolean)
-					uiItemL(col, name, ICON_NONE);
-			}
-			else {  /* (label_align == 'H') */
-				BLI_assert(label_align == 'H');
-				split = uiLayoutSplit(layout, 0.5f, false);
+					if (!is_boolean)
+						uiItemL(col, name, ICON_NONE);
+				}
+				else {
+					BLI_assert(label_align == UI_BUT_LABEL_ALIGN_SPLIT_COLUMN);
+					split = uiLayoutSplit(layout, 0.5f, false);
+
+					col = uiLayoutColumn(split, false);
+					uiItemL(col, (is_boolean) ? "" : name, ICON_NONE);
+					col = uiLayoutColumn(split, false);
+				}
+
+				/* may meed to add more cases here.
+				 * don't override enum flag names */
 
-				col = uiLayoutColumn(split, false);
-				uiItemL(col, (is_boolean) ? "" : name, ICON_NONE);
-				col = uiLayoutColumn(split, false);
+				/* name is shown above, empty name for button below */
+				name = (flag & PROP_ENUM_FLAG || is_boolean) ? NULL : "";
+
+				break;
 			}
+			case UI_BUT_LABEL_ALIGN_NONE:
+			default:
+				col = layout;
+				name = NULL; /* no smart label alignment, show default name with button */
+				break;
+		}
+
+		uiItemFullR(col, ptr, prop, -1, 0, compact ? UI_ITEM_R_COMPACT : 0, name, ICON_NONE);
+		return_info &= ~UI_PROP_BUTS_NONE_ADDED;
+	}
+	RNA_STRUCT_END;
 
-			/* may meed to add more cases here.
-			 * don't override enum flag names */
+	return return_info;
+}
+
+/* *** RNA collection search menu *** */
+
+typedef struct CollItemSearch {
+	struct CollItemSearch *next, *prev;
+	void *data;
+	char *name;
+	int index;
+	int iconid;
+} CollItemSearch;
+
+static int sort_search_items_list(const void *a, const void *b)
+{
+	const CollItemSearch *cis1 = a;
+	const CollItemSearch *cis2 = b;
 
-			/* name is shown above, empty name for button below */
-			name = (flag & PROP_ENUM_FLAG || is_boolean) ? NULL : "";
+	if (BLI_strcasecmp(cis1->name, cis2->name) > 0)
+		return 1;
+	else
+		return 0;
+}
+
+void ui_rna_collection_search_cb(const struct bContext *C, void *arg, const char *str, uiSearchItems *items)
+{
+	uiRNACollectionSearch *data = arg;
+	char *name;
+	int i = 0, iconid = 0, flag = RNA_property_flag(data->target_prop);
+	ListBase *items_list = MEM_callocN(sizeof(ListBase), "items_list");
+	CollItemSearch *cis;
+	const bool skip_filter = !(data->but_changed && *data->but_changed);
+
+	/* build a temporary list of relevant items first */
+	RNA_PROP_BEGIN (&data->search_ptr, itemptr, data->search_prop)
+	{
+
+		if (flag & PROP_ID_SELF_CHECK)
+			if (itemptr.data == data->target_ptr.id.data)
+				continue;
+
+		/* use filter */
+		if (RNA_property_type(data->target_prop) == PROP_POINTER) {
+			if (RNA_property_pointer_poll(&data->target_ptr, data->target_prop, &itemptr) == 0)
+				continue;
 		}
-		else {
-			col = layout;
-			name = NULL; /* no smart label alignment, show default name with button */
+
+		name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */
+		iconid = 0;
+		if (itemptr.type && RNA_struct_is_ID(itemptr.type)) {
+			iconid = ui_id_icon_get(C, itemptr.data, false);
+		}
+
+		if (name) {
+			if (skip_filter || BLI_strcasestr(name, str)) {
+				cis = MEM_callocN(sizeof(CollItemSearch), "CollectionItemSearch");
+				cis->data = itemptr.data;
+				cis->name = MEM_dupallocN(name);
+				cis->index = i;
+				cis->iconid = iconid;
+				BLI_addtail(items_list, cis);
+			}
+			MEM_freeN(name);
 		}
 
-		uiItemFullR(col, ptr, prop, -1, 0, 0, name, ICON_NONE);
-		tot++;
+		i++;
+	}
+	RNA_PROP_END;
+
+	BLI_listbase_sort(items_list, sort_search_items_list);
+
+	/* add search items from temporary list */
+	for (cis = items_list->first; cis; cis = cis->next) {
+		if (UI_search_item_add(items, cis->name, cis->data, cis->iconid) == false) {
+			break;
+		}
 	}
-	RNA_STRUCT_END;
 
-	return tot;
+	for (cis = items_list->first; cis; cis = cis->next) {
+		MEM_freeN(cis->name);
+	}
+	BLI_freelistN(items_list);
+	MEM_freeN(items_list);
 }
 
-/***************************** ID Utilities *******************************/
 
+/***************************** ID Utilities *******************************/
 int UI_icon_from_id(ID *id)
 {
 	Object *ob;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index e3230d39ae2..928ac8c9171 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -43,13 +43,9 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
 
 #include "RNA_access.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
 #include "BLF_api.h"
 
 #include "UI_interface.h"
@@ -58,6 +54,10 @@
 #include "interface_intern.h"
 
 #include "GPU_basic_shader.h"
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #ifdef WITH_INPUT_IME
 #  include "WM_types.h"
@@ -72,13 +72,19 @@ enum {
 	/* Show that holding the button opens a menu. */
 	UI_STATE_HOLD_ACTION = UI_BUT_UPDATE_DELAY,
 	UI_STATE_TEXT_INPUT  = UI_BUT_UNDO,
+	UI_STATE_ACTIVE_LEFT  = UI_BUT_VALUE_CLEAR,
+	UI_STATE_ACTIVE_RIGHT = UI_BUT_TEXTEDIT_UPDATE,
 
-	UI_STATE_FLAGS_ALL = (UI_STATE_HOLD_ACTION | UI_STATE_TEXT_INPUT),
+	UI_STATE_FLAGS_ALL = (UI_STATE_HOLD_ACTION |
+	                      UI_STATE_TEXT_INPUT |
+	                      UI_STATE_ACTIVE_LEFT |
+	                      UI_STATE_ACTIVE_RIGHT),
 };
 /* Prevent accidental use. */
 #define UI_BUT_UPDATE_DELAY ((void)0)
 #define UI_BUT_UNDO ((void)0)
 
+
 /* ************** widget base functions ************** */
 /**
  * - in: roundbox codes for corner types and radius
@@ -98,6 +104,8 @@ enum {
 
 typedef struct uiWidgetTrias {
 	unsigned int tot;
+	int type;
+	float size, center[2];
 
 	float vec[16][2];
 	const unsigned int (*index)[3];
@@ -105,21 +113,24 @@ typedef struct uiWidgetTrias {
 } uiWidgetTrias;
 
 /* max as used by round_box__edges */
+/* Make sure to change widget_base_vert.glsl accordingly. */
 #define WIDGET_CURVE_RESOLU 9
 #define WIDGET_SIZE_MAX (WIDGET_CURVE_RESOLU * 4)
 
 typedef struct uiWidgetBase {
-
+	/* TODO remove these completely */
 	int totvert, halfwayvert;
 	float outer_v[WIDGET_SIZE_MAX][2];
 	float inner_v[WIDGET_SIZE_MAX][2];
 	float inner_uv[WIDGET_SIZE_MAX][2];
 
-	bool draw_inner, draw_outline, draw_emboss, draw_shadedir;
+	bool draw_inner, draw_outline, draw_emboss;
 
 	uiWidgetTrias tria1;
 	uiWidgetTrias tria2;
 
+	/* Widget shader parameters, must match the shader layout. */
+	uiWidgetBaseParameters uniform_params;
 } uiWidgetBase;
 
 /** uiWidgetType: for time being only for visual appearance,
@@ -150,13 +161,15 @@ static const float cornervec[WIDGET_CURVE_RESOLU][2] = {
 	{0.924, 0.617}, {0.98, 0.805}, {1.0, 1.0}
 };
 
-#define WIDGET_AA_JITTER 8
-static const float jit[WIDGET_AA_JITTER][2] = {
+
+const float ui_pixel_jitter[UI_PIXEL_AA_JITTER][2] = {
 	{ 0.468813, -0.481430}, {-0.155755, -0.352820},
 	{ 0.219306, -0.238501}, {-0.393286, -0.110949},
 	{-0.024699,  0.013908}, { 0.343805,  0.147431},
 	{-0.272855,  0.269918}, { 0.095909,  0.388710}
 };
+#define WIDGET_AA_JITTER UI_PIXEL_AA_JITTER
+#define jit ui_pixel_jitter
 
 /* -------------------------------------------------------------------- */
 /** \name Shape Preset Data
@@ -195,8 +208,8 @@ static const uint g_shape_preset_checkmark_face[4][3] = {
 	{3, 2, 4}, {3, 4, 5}, {1, 0, 3}, {0, 2, 3}
 };
 
-#define OY -0.2
-#define SC 0.35
+#define OY (-0.2 / 2)
+#define SC (0.35 * 2)
 static const float g_shape_preset_hold_action_vert[6][2] = {
 	{-0.5 + SC, 1.0 + OY},  {0.5, 1.0 + OY},  {0.5, 0.0 + OY + SC},
 };
@@ -206,52 +219,349 @@ static const uint g_shape_preset_hold_action_face[2][3] = {{2, 0, 1}, {3, 5, 4}}
 
 /** \} */
 
+/* **************** Batch creations ****************** */
+/**
+ * In order to speed up UI drawing we create some batches that are then
+ * modified by specialized shaders to draw certain elements really fast.
+ * TODO: find a better place. Maybe it's own file?
+ **/
+
+/* offset in triavec[] in shader per type */
+static const int tria_ofs[ROUNDBOX_TRIA_MAX] = {
+	[ROUNDBOX_TRIA_NONE]              = 0,
+	[ROUNDBOX_TRIA_ARROWS]            = 0,
+	[ROUNDBOX_TRIA_SCROLL]            = 6,
+	[ROUNDBOX_TRIA_MENU]              = 22,
+	[ROUNDBOX_TRIA_CHECK]             = 28,
+	[ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 34,
+};
+static const int tria_vcount[ROUNDBOX_TRIA_MAX] = {
+	[ROUNDBOX_TRIA_NONE]              = 0,
+	[ROUNDBOX_TRIA_ARROWS]            = 3,
+	[ROUNDBOX_TRIA_SCROLL]            = 16,
+	[ROUNDBOX_TRIA_MENU]              = 3,
+	[ROUNDBOX_TRIA_CHECK]             = 6,
+	[ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 3,
+};
+
+static struct {
+	Gwn_Batch *roundbox_widget[ROUNDBOX_TRIA_MAX];
+
+	Gwn_Batch *roundbox_simple;
+	Gwn_Batch *roundbox_simple_aa;
+	Gwn_Batch *roundbox_simple_outline;
+	Gwn_Batch *roundbox_shadow;
+
+	Gwn_VertFormat format;
+	uint vflag_id;
+} g_ui_batch_cache = {{0}};
+
+static Gwn_VertFormat *vflag_format(void)
+{
+	if (g_ui_batch_cache.format.attrib_ct == 0) {
+		Gwn_VertFormat *format = &g_ui_batch_cache.format;
+		g_ui_batch_cache.vflag_id = GWN_vertformat_attr_add(format, "vflag", GWN_COMP_U32, 1, GWN_FETCH_INT);
+	}
+	return &g_ui_batch_cache.format;
+}
+
+#define INNER 0
+#define OUTLINE 1
+#define EMBOSS 2
+#define NO_AA WIDGET_AA_JITTER
+
+static void set_roundbox_vertex_data(
+        Gwn_VertBufRaw *vflag_step, uint32_t d)
+{
+	uint32_t *data = GWN_vertbuf_raw_step(vflag_step);
+	*data = d;
+}
+
+static uint32_t set_roundbox_vertex(
+        Gwn_VertBufRaw *vflag_step,
+        int corner_id, int corner_v, int jit_v, bool inner, bool emboss, int color)
+{
+	uint32_t *data = GWN_vertbuf_raw_step(vflag_step);
+	*data  = corner_id;
+	*data |= corner_v << 2;
+	*data |= jit_v << 6;
+	*data |= color << 12;
+	*data |= (inner) ? (1 << 10) : 0; /* is inner vert */
+	*data |= (emboss) ? (1 << 11) : 0; /* is emboss vert */
+	return *data;
+}
+
+static uint32_t set_tria_vertex(
+        Gwn_VertBufRaw *vflag_step,
+        int tria_type, int tria_v, int tria_id, int jit_v)
+{
+	uint32_t *data = GWN_vertbuf_raw_step(vflag_step);
+	if (ELEM(tria_type, ROUNDBOX_TRIA_ARROWS, ROUNDBOX_TRIA_MENU)) {
+		tria_v += tria_id * 3;
+	}
+	*data  = tria_ofs[tria_type] + tria_v;
+	*data |= jit_v << 6;
+	*data |= (tria_id == 0) ? (1 << 10) : 0; /* is first tria */
+	*data |= 1 << 14; /* is tria vert */
+	return *data;
+}
+
+static void roundbox_batch_add_tria(Gwn_VertBufRaw *vflag_step, int tria, uint32_t last_data)
+{
+	const int tria_num = ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW) ? 1 : 2;
+	/* for each tria */
+	for (int t = 0; t < tria_num; ++t) {
+		for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+			/* restart */
+			set_roundbox_vertex_data(vflag_step, last_data);
+			set_tria_vertex(vflag_step, tria, 0, t, j);
+			for (int v = 0; v < tria_vcount[tria]; v++) {
+				last_data = set_tria_vertex(vflag_step, tria, v, t, j);
+			}
+		}
+	}
+}
+
+Gwn_Batch *ui_batch_roundbox_widget_get(int tria)
+{
+	if (g_ui_batch_cache.roundbox_widget[tria] == NULL) {
+		uint32_t last_data;
+		Gwn_VertBufRaw vflag_step;
+		Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(vflag_format());
+		int vcount = WIDGET_SIZE_MAX; /* inner */
+		vcount += 2; /* restart */
+		vcount += ((WIDGET_SIZE_MAX + 1) * 2) * WIDGET_AA_JITTER; /* outline (edges) */
+		vcount += 2; /* restart */
+		vcount += ((WIDGET_CURVE_RESOLU * 2) * 2) * WIDGET_AA_JITTER; /* emboss */
+		if (tria) {
+			vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria1 */
+			if (!ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW)) {
+				vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria2 */
+			}
+		}
+		GWN_vertbuf_data_alloc(vbo, vcount);
+		GWN_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+		/* Inner */
+		for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+			for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
+				last_data = set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
+				last_data = set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
+			}
+		}
+		/* restart */
+		set_roundbox_vertex_data(&vflag_step, last_data);
+		set_roundbox_vertex(&vflag_step, 0, 0, 0, true, false, OUTLINE);
+		/* Outlines */
+		for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+			for (int c = 0; c < 4; c++) {
+				for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+					set_roundbox_vertex(&vflag_step, c, a, j, true, false, OUTLINE);
+					set_roundbox_vertex(&vflag_step, c, a, j, false, false, OUTLINE);
+				}
+			}
+			/* Close the loop. */
+			set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, OUTLINE);
+			last_data = set_roundbox_vertex(&vflag_step, 0, 0, j, false, false, OUTLINE);
+		}
+		/* restart */
+		set_roundbox_vertex_data(&vflag_step, last_data);
+		set_roundbox_vertex(&vflag_step, 0, 0, 0, false, false, EMBOSS);
+		/* Emboss */
+		bool rev = false; /* go back and forth : avoid degenerate triangle (but beware of backface cull) */
+		for (int j = 0; j < WIDGET_AA_JITTER; j++, rev = !rev) {
+			for (int c = (rev) ? 1 : 0; (rev) ? c >= 0 : c < 2; (rev) ? c-- : c++) {
+				int sta = (rev) ? WIDGET_CURVE_RESOLU - 1 : 0;
+				int end = WIDGET_CURVE_RESOLU;
+				for (int a = sta; (rev) ? a >= 0 : a < end; (rev) ? a-- : a++) {
+					set_roundbox_vertex(&vflag_step, c, a, j, false, false, EMBOSS);
+					last_data = set_roundbox_vertex(&vflag_step, c, a, j, false, true, EMBOSS);
+				}
+			}
+		}
+		if (tria) {
+			roundbox_batch_add_tria(&vflag_step, tria, last_data);
+		}
+		g_ui_batch_cache.roundbox_widget[tria] = GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
+		gpu_batch_presets_register(g_ui_batch_cache.roundbox_widget[tria]);
+	}
+	return g_ui_batch_cache.roundbox_widget[tria];
+}
+
+Gwn_Batch *ui_batch_roundbox_get(bool filled, bool antialiased)
+{
+	Gwn_Batch **batch = NULL;
+
+	if (filled) {
+		if (antialiased)
+			batch = &g_ui_batch_cache.roundbox_simple_aa;
+		else
+			batch = &g_ui_batch_cache.roundbox_simple;
+	}
+	else {
+		if (antialiased)
+			BLI_assert(0); /* Use GL_LINE_SMOOTH instead!!: */
+		else
+			batch = &g_ui_batch_cache.roundbox_simple_outline;
+	}
+
+	if (*batch == NULL) {
+		uint32_t last_data;
+		Gwn_VertBufRaw vflag_step;
+		Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(vflag_format());
+		int vcount = WIDGET_SIZE_MAX;
+		vcount += (filled) ? 2 : 0;
+		vcount *= (antialiased) ? WIDGET_AA_JITTER : 1;
+		GWN_vertbuf_data_alloc(vbo, vcount);
+		GWN_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+
+		if (filled) {
+			for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+				if (!antialiased) {
+					j = NO_AA;
+				}
+				/* restart */
+				set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, INNER);
+				for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+					for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
+						last_data = set_roundbox_vertex(&vflag_step, c1, a1, j, true, false, INNER);
+						last_data = set_roundbox_vertex(&vflag_step, c2, a2, j, true, false, INNER);
+					}
+				}
+				/* restart */
+				set_roundbox_vertex_data(&vflag_step, last_data);
+				if (!antialiased) {
+					break;
+				}
+			}
+			*batch = GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
+		}
+		else {
+			for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+				if (!antialiased) {
+					j = NO_AA;
+				}
+				for (int c = 0; c < 4; c++) {
+					for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+						set_roundbox_vertex(&vflag_step, c, a, j, true, false, INNER);
+					}
+				}
+				if (!antialiased) {
+					break;
+				}
+			}
+			*batch = GWN_batch_create_ex(GWN_PRIM_LINE_LOOP, vbo, NULL, GWN_BATCH_OWNS_VBO);
+		}
+
+		gpu_batch_presets_register(*batch);
+	}
+	return *batch;
+}
+
+Gwn_Batch *ui_batch_roundbox_shadow_get(void)
+{
+	if (g_ui_batch_cache.roundbox_shadow == NULL) {
+		uint32_t last_data;
+		Gwn_VertBufRaw vflag_step;
+		Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(vflag_format());
+		int vcount = (WIDGET_SIZE_MAX + 1) * 2 + 2 + WIDGET_SIZE_MAX;
+		GWN_vertbuf_data_alloc(vbo, vcount);
+		GWN_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+
+		for (int c = 0; c < 4; c++) {
+			for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+				set_roundbox_vertex(&vflag_step, c, a, NO_AA, true, false, INNER);
+				set_roundbox_vertex(&vflag_step, c, a, NO_AA, false, false, INNER);
+			}
+		}
+		/* close loop */
+		last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
+		last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, false, false, INNER);
+		/* restart */
+		set_roundbox_vertex_data(&vflag_step, last_data);
+		set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
+		/* filled */
+		for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+			for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
+				set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
+				set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
+			}
+		}
+		g_ui_batch_cache.roundbox_shadow = GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
+		gpu_batch_presets_register(g_ui_batch_cache.roundbox_shadow);
+	}
+	return g_ui_batch_cache.roundbox_shadow;
+}
+
+#undef INNER
+#undef OUTLINE
+#undef EMBOSS
+#undef NO_AA
+
 /* ************************************************* */
 
-void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3)
+void UI_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3,
+                       const float color[4])
 {
 	float tri_arr[3][2] = {{x1, y1}, {x2, y2}, {x3, y3}};
-	float color[4];
-	int j;
+	float draw_color[4];
+
+	copy_v4_v4(draw_color, color);
+	/* Note: This won't give back the original color. */
+	draw_color[3] *= 1.0f / WIDGET_AA_JITTER;
 
 	glEnable(GL_BLEND);
-	glGetFloatv(GL_CURRENT_COLOR, color);
-	color[3] *= 0.125f;
-	glColor4fv(color);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_FLOAT, 0, tri_arr);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4fv(draw_color);
+	immBegin(GWN_PRIM_TRIS, 3 * WIDGET_AA_JITTER);
 
 	/* for each AA step */
-	for (j = 0; j < WIDGET_AA_JITTER; j++) {
-		glTranslate2fv(jit[j]);
-		glDrawArrays(GL_TRIANGLES, 0, 3);
-		glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
+	for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+		immVertex2f(pos, tri_arr[0][0] + jit[j][0], tri_arr[0][1] + jit[j][1]);
+		immVertex2f(pos, tri_arr[1][0] + jit[j][0], tri_arr[1][1] + jit[j][1]);
+		immVertex2f(pos, tri_arr[2][0] + jit[j][0], tri_arr[2][1] + jit[j][1]);
 	}
 
-	glDisableClientState(GL_VERTEX_ARRAY);
+	immEnd();
+
+	immUnbindProgram();
+
 	glDisable(GL_BLEND);
 }
 
-void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float maxy, float rad, bool use_alpha)
+void UI_draw_anti_fan(float tri_array[][2], unsigned int length, const float color[4])
 {
-	float color[4];
-	int j;
+	float draw_color[4];
+
+	copy_v4_v4(draw_color, color);
+	draw_color[3] *= 2.0f / WIDGET_AA_JITTER;
 
 	glEnable(GL_BLEND);
-	glGetFloatv(GL_CURRENT_COLOR, color);
-	if (use_alpha) {
-		color[3] = 0.5f;
-	}
-	color[3] *= 0.125f;
-	glColor4fv(color);
 
-	for (j = 0; j < WIDGET_AA_JITTER; j++) {
-		glTranslate2fv(jit[j]);
-		UI_draw_roundbox_gl_mode(mode, minx, miny, maxx, maxy, rad);
-		glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4fv(draw_color);
+
+	/* for each AA step */
+	for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+		immBegin(GWN_PRIM_TRI_FAN, length);
+		immVertex2f(pos, tri_array[0][0], tri_array[0][1]);
+		immVertex2f(pos, tri_array[1][0], tri_array[1][1]);
+
+		/* We jitter only the middle of the fan, the extremes are pinned. */
+		for (int i = 2; i < length - 1; i++) {
+			immVertex2f(pos, tri_array[i][0] + jit[j][0], tri_array[i][1] + jit[j][1]);
+		}
+
+		immVertex2f(pos, tri_array[length - 1][0], tri_array[length - 1][1]);
+		immEnd();
 	}
 
+	immUnbindProgram();
+
 	glDisable(GL_BLEND);
 }
 
@@ -260,11 +570,16 @@ static void widget_init(uiWidgetBase *wtb)
 	wtb->totvert = wtb->halfwayvert = 0;
 	wtb->tria1.tot = 0;
 	wtb->tria2.tot = 0;
+	wtb->tria1.type = ROUNDBOX_TRIA_NONE;
+	wtb->tria1.size = 0;
+	wtb->tria2.size = 0;
 
 	wtb->draw_inner = true;
 	wtb->draw_outline = true;
 	wtb->draw_emboss = true;
-	wtb->draw_shadedir = true;
+
+	wtb->uniform_params.shade_dir = 1.0f;
+	wtb->uniform_params.alpha_discard = 1.0f;
 }
 
 /* helper call, makes shadow rect, with 'sun' above menu, so only shadow to left/right/bottom */
@@ -372,6 +687,17 @@ static void round_box__edges(uiWidgetBase *wt, int roundboxalign, const rcti *re
 	if (2.0f * (radi + 1.0f) > minsize)
 		radi = 0.5f * minsize - U.pixelsize;
 
+	wt->uniform_params.rad = rad;
+	wt->uniform_params.radi = radi;
+	wt->uniform_params.facxi = facxi;
+	wt->uniform_params.facyi = facyi;
+	wt->uniform_params.round_corners[0] = (roundboxalign & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f;
+	wt->uniform_params.round_corners[1] = (roundboxalign & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f;
+	wt->uniform_params.round_corners[2] = (roundboxalign & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f;
+	wt->uniform_params.round_corners[3] = (roundboxalign & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f;
+	BLI_rctf_rcti_copy(&wt->uniform_params.rect, rect);
+	BLI_rctf_init(&wt->uniform_params.recti, minxi, maxxi, minyi, maxyi);
+
 	/* mult */
 	for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
 		veci[a][0] = radi * cornervec[a][0];
@@ -516,23 +842,30 @@ static void shape_preset_init_trias_ex(
 	float centx, centy, sizex, sizey, minsize;
 	int a, i1 = 0, i2 = 1;
 
-	minsize = min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect));
+	if (where == 'r' || where == 'l') {
+		minsize = BLI_rcti_size_y(rect);
+	}
+	else {
+		minsize = BLI_rcti_size_x(rect);
+	}
 
 	/* center position and size */
 	centx = (float)rect->xmin + 0.4f * minsize;
 	centy = (float)rect->ymin + 0.5f * minsize;
-	sizex = sizey = -0.5f * triasize * minsize;
+	tria->size = sizex = sizey = -0.5f * triasize * minsize;
 
 	if (where == 'r') {
 		centx = (float)rect->xmax - 0.4f * minsize;
 		sizex = -sizex;
 	}
 	else if (where == 't') {
+		centx = (float)rect->xmin + 0.5f * minsize;
 		centy = (float)rect->ymax - 0.5f * minsize;
 		sizey = -sizey;
 		i2 = 0; i1 = 1;
 	}
 	else if (where == 'b') {
+		centx = (float)rect->xmin + 0.5f * minsize;
 		sizex = -sizex;
 		i2 = 0; i1 = 1;
 	}
@@ -542,12 +875,16 @@ static void shape_preset_init_trias_ex(
 		tria->vec[a][1] = sizey * verts[a][i2] + centy;
 	}
 
+	tria->center[0] = centx;
+	tria->center[1] = centy;
+
 	tria->tot = tris_tot;
 	tria->index = tris;
 }
 
 static void shape_preset_init_number_arrows(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
 {
+	tria->type = ROUNDBOX_TRIA_ARROWS;
 	shape_preset_init_trias_ex(
 	        tria, rect, triasize, where,
 	        g_shape_preset_number_arrow_vert, ARRAY_SIZE(g_shape_preset_number_arrow_vert),
@@ -556,6 +893,12 @@ static void shape_preset_init_number_arrows(uiWidgetTrias *tria, const rcti *rec
 
 static void shape_preset_init_hold_action(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
 {
+	tria->type = ROUNDBOX_TRIA_HOLD_ACTION_ARROW;
+	/* With the current changes to use batches for widget drawing, the code
+	 * below is doing almost nothing effectively. 'where' doesn't work either,
+	 * shader is currently hardcoded to work for the button triangle pointing
+	 * at the lower right. The same limitation applies to other trias as well.
+	 * XXX Should be addressed. */
 	shape_preset_init_trias_ex(
 	        tria, rect, triasize, where,
 	        g_shape_preset_hold_action_vert, ARRAY_SIZE(g_shape_preset_hold_action_vert),
@@ -564,29 +907,37 @@ static void shape_preset_init_hold_action(uiWidgetTrias *tria, const rcti *rect,
 
 static void shape_preset_init_scroll_circle(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
 {
+	tria->type = ROUNDBOX_TRIA_SCROLL;
 	shape_preset_init_trias_ex(
 	        tria, rect, triasize, where,
 	        g_shape_preset_scroll_circle_vert, ARRAY_SIZE(g_shape_preset_scroll_circle_vert),
 	        g_shape_preset_scroll_circle_face, ARRAY_SIZE(g_shape_preset_scroll_circle_face));
 }
 
-static void shape_preset_draw_trias(uiWidgetTrias *tria)
+static void widget_draw_vertex_buffer(unsigned int pos, unsigned int col, int mode,
+                                      const float quads_pos[WIDGET_SIZE_MAX][2],
+                                      const unsigned char quads_col[WIDGET_SIZE_MAX][4],
+                                      unsigned int totvert)
 {
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_FLOAT, 0, tria->vec);
-	glDrawElements(GL_TRIANGLES, tria->tot * 3, GL_UNSIGNED_INT, tria->index);
-	glDisableClientState(GL_VERTEX_ARRAY);
+	immBegin(mode, totvert);
+	for (int i = 0; i < totvert; ++i) {
+		if (quads_col)
+			immAttrib4ubv(col, quads_col[i]);
+		immVertex2fv(pos, quads_pos[i]);
+	}
+	immEnd();
 }
 
 static void shape_preset_trias_from_rect_menu(uiWidgetTrias *tria, const rcti *rect)
 {
 	float centx, centy, size;
 	int a;
+	tria->type = ROUNDBOX_TRIA_MENU;
 
 	/* center position and size */
-	centx = rect->xmax - 0.32f * BLI_rcti_size_y(rect);
-	centy = rect->ymin + 0.50f * BLI_rcti_size_y(rect);
-	size = 0.4f * BLI_rcti_size_y(rect);
+	tria->center[0] = centx = rect->xmax - 0.32f * BLI_rcti_size_y(rect);
+	tria->center[1] = centy = rect->ymin + 0.50f * BLI_rcti_size_y(rect);
+	tria->size = size = 0.4f * BLI_rcti_size_y(rect);
 
 	for (a = 0; a < 6; a++) {
 		tria->vec[a][0] = size * g_shape_preset_menu_arrow_vert[a][0] + centx;
@@ -601,11 +952,12 @@ static void shape_preset_trias_from_rect_checkmark(uiWidgetTrias *tria, const rc
 {
 	float centx, centy, size;
 	int a;
+	tria->type = ROUNDBOX_TRIA_CHECK;
 
 	/* center position and size */
-	centx = rect->xmin + 0.5f * BLI_rcti_size_y(rect);
-	centy = rect->ymin + 0.5f * BLI_rcti_size_y(rect);
-	size = 0.5f * BLI_rcti_size_y(rect);
+	tria->center[0] = centx = rect->xmin + 0.5f * BLI_rcti_size_y(rect);
+	tria->center[1] = centy = rect->ymin + 0.5f * BLI_rcti_size_y(rect);
+	tria->size = size = 0.5f * BLI_rcti_size_y(rect);
 
 	for (a = 0; a < 6; a++) {
 		tria->vec[a][0] = size * g_shape_preset_checkmark_vert[a][0] + centx;
@@ -655,180 +1007,210 @@ static void widget_verts_to_triangle_strip(uiWidgetBase *wtb, const int totvert,
 	copy_v2_v2(triangle_strip[a * 2 + 1], wtb->inner_v[0]);
 }
 
-static void widget_verts_to_triangle_strip_open(uiWidgetBase *wtb, const int totvert, float triangle_strip[WIDGET_SIZE_MAX * 2][2])
-{
-	int a;
-	for (a = 0; a < totvert; a++) {
-		triangle_strip[a * 2][0] = wtb->outer_v[a][0];
-		triangle_strip[a * 2][1] = wtb->outer_v[a][1];
-		triangle_strip[a * 2 + 1][0] = wtb->outer_v[a][0];
-		triangle_strip[a * 2 + 1][1] = wtb->outer_v[a][1] - 1.0f;
-	}
-}
-
-static void widgetbase_outline(uiWidgetBase *wtb)
+static void widgetbase_outline(uiWidgetBase *wtb, unsigned int pos)
 {
 	float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
 	widget_verts_to_triangle_strip(wtb, wtb->totvert, triangle_strip);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_FLOAT, 0, triangle_strip);
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, wtb->totvert * 2 + 2);
-	glDisableClientState(GL_VERTEX_ARRAY);
+	widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, wtb->totvert * 2 + 2);
 }
 
-static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol)
+static void widgetbase_set_uniform_alpha_discard(
+        uiWidgetBase *wtb,
+        const bool alpha_check,
+        const float discard_factor)
 {
-	int j, a;
+	if (alpha_check) {
+		wtb->uniform_params.alpha_discard = -discard_factor;
+	}
+	else {
+		wtb->uniform_params.alpha_discard = discard_factor;
+	}
+}
 
-	glEnable(GL_BLEND);
+static void widgetbase_set_uniform_alpha_check(
+        uiWidgetBase *wtb,
+        const bool alpha_check)
+{
+	const float discard_factor = fabs(wtb->uniform_params.alpha_discard);
+	widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
+}
 
-	/* backdrop non AA */
-	if (wtb->draw_inner) {
-		BLI_assert(wtb->totvert != 0);
-		if (wcol->shaded == 0) {
-			if (wcol->alpha_check) {
-				float inner_v_half[WIDGET_SIZE_MAX][2];
-				float x_mid = 0.0f; /* used for dumb clamping of values */
+static void widgetbase_set_uniform_discard_factor(
+        uiWidgetBase *wtb,
+        const float discard_factor)
+{
+	bool alpha_check = wtb->uniform_params.alpha_discard < 0.0f;
+	widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
+}
 
-				/* dark checkers */
-				glColor4ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, 255);
-				glEnableClientState(GL_VERTEX_ARRAY);
-				glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
-				glDrawArrays(GL_POLYGON, 0, wtb->totvert);
+static void widgetbase_set_uniform_colors_ubv(
+        uiWidgetBase *wtb,
+        const unsigned char *col1, const unsigned char *col2,
+        const unsigned char *outline,
+        const unsigned char *emboss,
+        const unsigned char *tria,
+        const bool alpha_check)
+{
+	widgetbase_set_uniform_alpha_check(wtb, alpha_check);
+	rgba_float_args_set_ch(wtb->uniform_params.color_inner1, col1[0], col1[1], col1[2], col1[3]);
+	rgba_float_args_set_ch(wtb->uniform_params.color_inner2, col2[0], col2[1], col2[2], col2[3]);
+	rgba_float_args_set_ch(wtb->uniform_params.color_outline, outline[0], outline[1], outline[2], outline[3]);
+	rgba_float_args_set_ch(wtb->uniform_params.color_emboss, emboss[0], emboss[1], emboss[2], emboss[3]);
+	rgba_float_args_set_ch(wtb->uniform_params.color_tria, tria[0], tria[1], tria[2], tria[3]);
+}
 
-				/* light checkers */
-				GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-				glColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
-				GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_CHECKER_8PX);
+/* keep in sync with shader */
+#define MAX_WIDGET_BASE_BATCH 6
+#define MAX_WIDGET_PARAMETERS 11
 
-				glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
-				glDrawArrays(GL_POLYGON, 0, wtb->totvert);
+struct {
+	Gwn_Batch *batch; /* Batch type */
+	uiWidgetBaseParameters params[MAX_WIDGET_BASE_BATCH];
+	int count;
+	bool enabled;
+} g_widget_base_batch = {0};
 
-				GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+void UI_widgetbase_draw_cache_flush(void)
+{
+	float checker_params[3] = {UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
 
-				/* alpha fill */
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	if (g_widget_base_batch.count == 0)
+		return;
 
-				glColor4ubv((unsigned char *)wcol->inner);
+	Gwn_Batch *batch = g_widget_base_batch.batch;
+	if (g_widget_base_batch.count == 1) {
+		/* draw single */
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+		GWN_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)g_widget_base_batch.params);
+		GWN_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+		GWN_batch_draw(batch);
+	}
+	else {
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE_INST);
+		GWN_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS * MAX_WIDGET_BASE_BATCH,
+		                            (float *)g_widget_base_batch.params);
+		GWN_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+		gpuBindMatrices(batch->interface);
+		GWN_batch_draw_range_ex(batch, 0, g_widget_base_batch.count, true);
+		GWN_batch_program_use_end(batch);
+	}
+	g_widget_base_batch.count = 0;
+}
 
-				for (a = 0; a < wtb->totvert; a++) {
-					x_mid += wtb->inner_v[a][0];
-				}
-				x_mid /= wtb->totvert;
+void UI_widgetbase_draw_cache_begin(void)
+{
+	BLI_assert(g_widget_base_batch.enabled == false);
+	g_widget_base_batch.enabled = true;
+}
 
-				glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
-				glDrawArrays(GL_POLYGON, 0, wtb->totvert);
+void UI_widgetbase_draw_cache_end(void)
+{
+	BLI_assert(g_widget_base_batch.enabled == true);
+	g_widget_base_batch.enabled = false;
 
-				/* 1/2 solid color */
-				glColor4ub(wcol->inner[0], wcol->inner[1], wcol->inner[2], 255);
+	glEnable(GL_BLEND);
 
-				for (a = 0; a < wtb->totvert; a++) {
-					inner_v_half[a][0] = MIN2(wtb->inner_v[a][0], x_mid);
-					inner_v_half[a][1] = wtb->inner_v[a][1];
-				}
+	UI_widgetbase_draw_cache_flush();
 
-				glVertexPointer(2, GL_FLOAT, 0, inner_v_half);
-				glDrawArrays(GL_POLYGON, 0, wtb->totvert);
-				glDisableClientState(GL_VERTEX_ARRAY);
-			}
-			else {
-				/* simple fill */
-				glColor4ubv((unsigned char *)wcol->inner);
+	glDisable(GL_BLEND);
+}
 
-				glEnableClientState(GL_VERTEX_ARRAY);
-				glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
-				glDrawArrays(GL_POLYGON, 0, wtb->totvert);
-				glDisableClientState(GL_VERTEX_ARRAY);
-			}
+static void draw_widgetbase_batch(Gwn_Batch *batch, uiWidgetBase *wtb)
+{
+	wtb->uniform_params.tria1_size = wtb->tria1.size;
+	wtb->uniform_params.tria2_size = wtb->tria2.size;
+	copy_v2_v2(wtb->uniform_params.tria1_center, wtb->tria1.center);
+	copy_v2_v2(wtb->uniform_params.tria2_center, wtb->tria2.center);
+
+	if (g_widget_base_batch.enabled) {
+		if (g_widget_base_batch.batch == NULL) {
+			g_widget_base_batch.batch = ui_batch_roundbox_widget_get(ROUNDBOX_TRIA_ARROWS);
 		}
-		else {
-			char col1[4], col2[4];
-			unsigned char col_array[WIDGET_SIZE_MAX * 4];
-			unsigned char *col_pt = col_array;
-
-			shadecolors4(col1, col2, wcol->inner, wcol->shadetop, wcol->shadedown);
 
-			for (a = 0; a < wtb->totvert; a++, col_pt += 4) {
-				round_box_shade_col4_r(col_pt, col1, col2, wtb->inner_uv[a][wtb->draw_shadedir ? 1 : 0]);
-			}
-
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glEnableClientState(GL_COLOR_ARRAY);
-			glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
-			glColorPointer(4, GL_UNSIGNED_BYTE, 0, col_array);
-			glDrawArrays(GL_POLYGON, 0, wtb->totvert);
-			glDisableClientState(GL_VERTEX_ARRAY);
-			glDisableClientState(GL_COLOR_ARRAY);
+		/* draw multi */
+		if (batch != g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE] &&
+		    batch != g_widget_base_batch.batch)
+		{
+			/* issue previous calls before changing batch type. */
+			UI_widgetbase_draw_cache_flush();
+			g_widget_base_batch.batch = batch;
 		}
-	}
 
-	/* for each AA step */
-	if (wtb->draw_outline) {
-		BLI_assert(wtb->totvert != 0);
-		float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
-		float triangle_strip_emboss[WIDGET_SIZE_MAX * 2][2]; /* only for emboss */
-
-		const unsigned char tcol[4] = {wcol->outline[0],
-		                               wcol->outline[1],
-		                               wcol->outline[2],
-		                               wcol->outline[3] / WIDGET_AA_JITTER};
-		unsigned char emboss[4];
+		/* No need to change batch if tria is not visible. Just scale it to 0. */
+		if (batch == g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE]) {
+			wtb->uniform_params.tria1_size = wtb->uniform_params.tria2_size = 0;
+		}
 
-		widget_verts_to_triangle_strip(wtb, wtb->totvert, triangle_strip);
+		g_widget_base_batch.params[g_widget_base_batch.count] = wtb->uniform_params;
+		g_widget_base_batch.count++;
 
-		if (wtb->draw_emboss) {
-			widget_verts_to_triangle_strip_open(wtb, wtb->halfwayvert, triangle_strip_emboss);
-			UI_GetThemeColor4ubv(TH_WIDGET_EMBOSS, emboss);
+		if (g_widget_base_batch.count == MAX_WIDGET_BASE_BATCH) {
+			UI_widgetbase_draw_cache_flush();
 		}
+	}
+	else {
+		float checker_params[3] = {UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
+		/* draw single */
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+		GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)&wtb->uniform_params);
+		GWN_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+		GWN_batch_draw(batch);
+	}
+}
 
-		glEnableClientState(GL_VERTEX_ARRAY);
-
-		for (j = 0; j < WIDGET_AA_JITTER; j++) {
-			glTranslate2fv(jit[j]);
+static void widgetbase_draw(uiWidgetBase *wtb, const uiWidgetColors *wcol)
+{
+	unsigned char inner_col1[4] = {0};
+	unsigned char inner_col2[4] = {0};
+	unsigned char emboss_col[4] = {0};
+	unsigned char outline_col[4] = {0};
+	unsigned char tria_col[4] = {0};
+	/* For color widget. */
+	bool alpha_check = (wcol->alpha_check && (wcol->shaded == 0));
 
-			/* outline */
-			glColor4ubv(tcol);
+	glEnable(GL_BLEND);
 
-			glVertexPointer(2, GL_FLOAT, 0, triangle_strip);
-			glDrawArrays(GL_TRIANGLE_STRIP, 0, wtb->totvert * 2 + 2);
+	/* backdrop non AA */
+	if (wtb->draw_inner) {
+		if (wcol->shaded == 0) {
+			/* simple fill */
+			inner_col1[0] = inner_col2[0] = (unsigned char)wcol->inner[0];
+			inner_col1[1] = inner_col2[1] = (unsigned char)wcol->inner[1];
+			inner_col1[2] = inner_col2[2] = (unsigned char)wcol->inner[2];
+			inner_col1[3] = inner_col2[3] = (unsigned char)wcol->inner[3];
+		}
+		else {
+			/* gradient fill */
+			shadecolors4((char *)inner_col1, (char *)inner_col2, wcol->inner, wcol->shadetop, wcol->shadedown);
+		}
+	}
 
-			/* emboss bottom shadow */
-			if (wtb->draw_emboss) {
-				if (emboss[3]) {
-					glColor4ubv(emboss);
-					glVertexPointer(2, GL_FLOAT, 0, triangle_strip_emboss);
-					glDrawArrays(GL_TRIANGLE_STRIP, 0, wtb->halfwayvert * 2);
-				}
-			}
+	if (wtb->draw_outline) {
+		outline_col[0] = wcol->outline[0];
+		outline_col[1] = wcol->outline[1];
+		outline_col[2] = wcol->outline[2];
+		outline_col[3] = wcol->outline[3] / WIDGET_AA_JITTER;
 
-			glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
+		/* emboss bottom shadow */
+		if (wtb->draw_emboss) {
+			UI_GetThemeColor4ubv(TH_WIDGET_EMBOSS, emboss_col);
 		}
+	}
 
-		glDisableClientState(GL_VERTEX_ARRAY);
+	if (wtb->tria1.type != ROUNDBOX_TRIA_NONE) {
+		tria_col[0] = wcol->item[0];
+		tria_col[1] = wcol->item[1];
+		tria_col[2] = wcol->item[2];
+		tria_col[3] = (unsigned char)((float)wcol->item[3] / WIDGET_AA_JITTER);
 	}
 
-	/* decoration */
-	if (wtb->tria1.tot || wtb->tria2.tot) {
-		const unsigned char tcol[4] = {wcol->item[0],
-		                               wcol->item[1],
-		                               wcol->item[2],
-		                               (unsigned char)((float)wcol->item[3] / WIDGET_AA_JITTER)};
-		glColor4ubv(tcol);
-
-		/* for each AA step */
-		for (j = 0; j < WIDGET_AA_JITTER; j++) {
-			glTranslate2fv(jit[j]);
-
-			if (wtb->tria1.tot) {
-				shape_preset_draw_trias(&wtb->tria1);
-			}
-			if (wtb->tria2.tot) {
-				shape_preset_draw_trias(&wtb->tria2);
-			}
+	/* Draw everything in one drawcall */
+	if (inner_col1[3] || inner_col2[3] || outline_col[3] || emboss_col[3] || tria_col[3] || alpha_check) {
+		widgetbase_set_uniform_colors_ubv(wtb, inner_col1, inner_col2, outline_col, emboss_col, tria_col, alpha_check);
 
-			glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
-		}
+		Gwn_Batch *roundbox_batch = ui_batch_roundbox_widget_get(wtb->tria1.type);
+		draw_widgetbase_batch(roundbox_batch, wtb);
 	}
 
 	glDisable(GL_BLEND);
@@ -913,7 +1295,7 @@ static void widget_draw_icon_ex(
 
 		if (but->drawflag & UI_BUT_ICON_LEFT) {
 			/* special case - icon_only pie buttons */
-			if (ui_block_is_pie_menu(but->block) && but->type != UI_BTYPE_MENU && but->str && but->str[0] == '\0')
+			if (ui_block_is_pie_menu(but->block) && !ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) && but->str && but->str[0] == '\0')
 				xs = rect->xmin + 2.0f * ofs;
 			else if (but->dt == UI_EMBOSS_NONE || but->type == UI_BTYPE_LABEL)
 				xs = rect->xmin + 2.0f * ofs;
@@ -936,8 +1318,13 @@ static void widget_draw_icon_ex(
 			float rgb[3] = {1.25f, 1.25f, 1.25f};
 			UI_icon_draw_aspect_color(xs, ys, icon, aspect, rgb);
 		}
-		else
+		else if ((but->flag & (UI_ACTIVE | UI_SELECT | UI_SELECT_DRAW)) || !UI_but_is_tool(but)) {
 			UI_icon_draw_aspect(xs, ys, icon, aspect, alpha);
+		}
+		else {
+			const bTheme *btheme = UI_GetTheme();
+			UI_icon_draw_desaturate(xs, ys, icon, aspect, alpha, 1.0 - btheme->tui.icon_saturation);
+		}
 	}
 
 	if (show_menu_icon) {
@@ -1122,7 +1509,7 @@ float UI_text_clip_middle_ex(
 static void ui_text_clip_middle(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
 {
 	/* No margin for labels! */
-	const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
+	const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
 	const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
 	const size_t max_len = sizeof(but->drawstr);
 	const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
@@ -1138,7 +1525,7 @@ static void ui_text_clip_middle(uiFontStyle *fstyle, uiBut *but, const rcti *rec
 static void ui_text_clip_middle_protect_right(uiFontStyle *fstyle, uiBut *but, const rcti *rect, const char rsep)
 {
 	/* No margin for labels! */
-	const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
+	const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
 	const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
 	const size_t max_len = sizeof(but->drawstr);
 	const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
@@ -1290,6 +1677,7 @@ static void widget_draw_text_ime_underline(
 	int ofs_x, width;
 	int rect_x = BLI_rcti_size_x(rect);
 	int sel_start = ime_data->sel_start, sel_end = ime_data->sel_end;
+	float fcol[4];
 
 	if (drawstr[0] != 0) {
 		if (but->pos >= but->ofs) {
@@ -1302,8 +1690,8 @@ static void widget_draw_text_ime_underline(
 		width = BLF_width(fstyle->uifont_id, drawstr + but->ofs,
 		                  ime_data->composite_len + but->pos - but->ofs);
 
-		glColor4ubv((unsigned char *)wcol->text);
-		UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 1);
+		rgba_uchar_to_float(fcol, wcol->text);
+		UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 1, fcol);
 
 		/* draw the thick line */
 		if (sel_start != -1 && sel_end != -1) {
@@ -1320,7 +1708,7 @@ static void widget_draw_text_ime_underline(
 			width = BLF_width(fstyle->uifont_id, drawstr + but->ofs,
 			                  sel_end + sel_start - but->ofs);
 
-			UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 2);
+			UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 2, fcol);
 		}
 	}
 }
@@ -1394,6 +1782,10 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 			int selsta_draw, selwidth_draw;
 
 			if (drawstr[0] != 0) {
+				/* We are drawing on top of widget bases. Flush cache. */
+				glEnable(GL_BLEND);
+				UI_widgetbase_draw_cache_flush();
+				glDisable(GL_BLEND);
 
 				if (but->selsta >= but->ofs) {
 					selsta_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selsta - but->ofs);
@@ -1404,11 +1796,16 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 
 				selwidth_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selend - but->ofs);
 
-				glColor4ubv((unsigned char *)wcol->item);
-				glRecti(rect->xmin + selsta_draw,
-				        rect->ymin + 2,
-				        min_ii(rect->xmin + selwidth_draw, rect->xmax - 2),
-				        rect->ymax - 2);
+				unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+				immUniformColor4ubv((unsigned char *)wcol->item);
+				immRecti(pos, rect->xmin + selsta_draw,
+				         rect->ymin + 2,
+				         min_ii(rect->xmin + selwidth_draw, rect->xmax - 2),
+				         rect->ymax - 2);
+
+				immUnbindProgram();
 			}
 		}
 
@@ -1430,14 +1827,23 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 			else {
 				t = 0;
 			}
+			/* We are drawing on top of widget bases. Flush cache. */
+			glEnable(GL_BLEND);
+			UI_widgetbase_draw_cache_flush();
+			glDisable(GL_BLEND);
 
-			glColor3f(0.2, 0.6, 0.9);
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+			immUniformColor3f(0.2f, 0.6f, 0.9f);
 
 			tx = rect->xmin + t + 2;
 			ty = rect->ymin + 2;
 
 			/* draw cursor */
-			glRecti(rect->xmin + t, ty, tx, rect->ymax - 2);
+			immRecti(pos, rect->xmin + t, ty, tx, rect->ymax - 2);
+
+			immUnbindProgram();
 		}
 
 #ifdef WITH_INPUT_IME
@@ -1462,7 +1868,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 #endif
 
 	/* cut string in 2 parts - only for menu entries */
-	if ((but->block->flag & UI_BLOCK_LOOP) &&
+	if ((but->block->flag & (UI_BLOCK_LOOP | UI_BLOCK_SHOW_SHORTCUT_ALWAYS)) &&
 	    (but->editstr == NULL))
 	{
 		if (but->flag & UI_BUT_HAS_SEP_CHAR) {
@@ -1498,43 +1904,46 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 	}
 #endif
 
-	glColor4ubv((unsigned char *)wcol->text);
-
 	if (!use_right_only) {
 		/* for underline drawing */
 		float font_xofs, font_yofs;
 
-		UI_fontstyle_draw_ex(fstyle, rect, drawstr + but->ofs,
-		                   drawstr_left_len - but->ofs, &font_xofs, &font_yofs);
+		int drawlen = (drawstr_left_len == INT_MAX) ? strlen(drawstr + but->ofs) : (drawstr_left_len - but->ofs);
 
-		if (but->menu_key != '\0') {
-			char fixedbuf[128];
-			const char *str;
+		if (drawlen > 0) {
+			UI_fontstyle_draw_ex(fstyle, rect, drawstr + but->ofs, (unsigned char *)wcol->text,
+			                     drawlen, &font_xofs, &font_yofs);
 
-			BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawstr_left_len));
+			if (but->menu_key != '\0') {
+				char fixedbuf[128];
+				const char *str;
 
-			str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
-			if (str == NULL)
-				str = strchr(fixedbuf, but->menu_key);
+				BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawlen));
 
-			if (str) {
-				int ul_index = -1;
-				float ul_advance;
+				str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
+				if (str == NULL)
+					str = strchr(fixedbuf, but->menu_key);
 
-				ul_index = (int)(str - fixedbuf);
+				if (str) {
+					int ul_index = -1;
+					float ul_advance;
 
-				if (fstyle->kerning == 1) {
-					BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
-				}
+					ul_index = (int)(str - fixedbuf);
 
-				fixedbuf[ul_index] = '\0';
-				ul_advance = BLF_width(fstyle->uifont_id, fixedbuf, ul_index);
+					if (fstyle->kerning == 1) {
+						BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+					}
+
+					fixedbuf[ul_index] = '\0';
+					ul_advance = BLF_width(fstyle->uifont_id, fixedbuf, ul_index);
 
-				BLF_position(fstyle->uifont_id, rect->xmin + font_xofs + ul_advance, rect->ymin + font_yofs, 0.0f);
-				BLF_draw(fstyle->uifont_id, "_", 2);
+					BLF_position(fstyle->uifont_id, rect->xmin + font_xofs + ul_advance, rect->ymin + font_yofs, 0.0f);
+					BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wcol->text);
+					BLF_draw(fstyle->uifont_id, "_", 2);
 
-				if (fstyle->kerning == 1) {
-					BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+					if (fstyle->kerning == 1) {
+						BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+					}
 				}
 			}
 		}
@@ -1544,7 +1953,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 	if (drawstr_right) {
 		fstyle->align = UI_STYLE_TEXT_RIGHT;
 		rect->xmax -= UI_TEXT_CLIP_MARGIN;
-		UI_fontstyle_draw(fstyle, rect, drawstr_right);
+		UI_fontstyle_draw(fstyle, rect, drawstr_right, (unsigned char *)wcol->text);
 	}
 }
 
@@ -1559,7 +1968,7 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
 	ui_but_text_password_hide(password_str, but, false);
 
 	/* check for button text label */
-	if (but->type == UI_BTYPE_MENU && (but->flag & UI_BUT_NODE_LINK)) {
+	if (ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) && (but->flag & UI_BUT_NODE_LINK)) {
 		rcti temp = *rect;
 		temp.xmin = rect->xmax - BLI_rcti_size_y(rect) - 1;
 		widget_draw_icon(but, ICON_LAYER_USED, alpha, &temp, false);
@@ -1597,12 +2006,26 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
 	}
 	/* Icons on the left with optional text label on the right */
 	else if (but->flag & UI_HAS_ICON || show_menu_icon) {
+		const bool is_tool = UI_but_is_tool(but);
+
 		const BIFIconID icon = (but->flag & UI_HAS_ICON) ? but->icon + but->iconadd : ICON_NONE;
-		const float icon_size = ICON_DEFAULT_WIDTH_SCALE;
+		int icon_size_init = is_tool ? ICON_DEFAULT_HEIGHT_TOOLBAR : ICON_DEFAULT_HEIGHT;
+		const float icon_size = icon_size_init / (but->block->aspect / UI_DPI_FAC);
+
+#ifdef USE_TOOLBAR_HACK
+		if (is_tool) {
+			/* pass (even if its a menu toolbar) */
+			but->drawflag |= UI_BUT_TEXT_LEFT;
+			but->drawflag |= UI_BUT_ICON_LEFT;
+		}
+#endif
 
 		/* menu item - add some more padding so menus don't feel cramped. it must
 		 * be part of the button so that this area is still clickable */
-		if (ui_block_is_pie_menu(but->block)) {
+		if (is_tool) {
+			/* pass (even if its a menu toolbar) */
+		}
+		else if (ui_block_is_pie_menu(but->block)) {
 			if (but->dt == UI_EMBOSS_RADIAL)
 				rect->xmin += 0.3f * U.widget_unit;
 		}
@@ -1668,6 +2091,9 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
 	widget_draw_text(fstyle, wcol, but, rect);
 
 	ui_but_text_password_hide(password_str, but, true);
+
+	/* if a widget uses font shadow it has to be deactivated now */
+	BLF_disable(fstyle->uifont_id, BLF_SHADOW);
 }
 
 #undef UI_TEXT_CLIP_MARGIN
@@ -1682,6 +2108,8 @@ static struct uiWidgetStateColors wcol_state_colors = {
 	{215, 211, 75, 255},
 	{180, 0, 255, 255},
 	{153, 0, 230, 255},
+	{74, 137, 137, 255},
+	{49, 112, 112, 255},
 	0.5f, 0.0f
 };
 
@@ -1695,7 +2123,9 @@ static struct uiWidgetColors wcol_num = {
 	{255, 255, 255, 255},
 
 	1,
-	-20, 0
+	-20, 0,
+	0,
+	0.5f,
 };
 
 static struct uiWidgetColors wcol_numslider = {
@@ -1708,7 +2138,9 @@ static struct uiWidgetColors wcol_numslider = {
 	{255, 255, 255, 255},
 
 	1,
-	-20, 0
+	-20, 0,
+	0,
+	0.5f,
 };
 
 static struct uiWidgetColors wcol_text = {
@@ -1721,7 +2153,9 @@ static struct uiWidgetColors wcol_text = {
 	{255, 255, 255, 255},
 
 	1,
-	0, 25
+	0, 25,
+	0,
+	0.2f,
 };
 
 static struct uiWidgetColors wcol_option = {
@@ -1734,7 +2168,9 @@ static struct uiWidgetColors wcol_option = {
 	{255, 255, 255, 255},
 
 	1,
-	15, -15
+	15, -15,
+	0,
+	0.3333333f,
 };
 
 /* button that shows popup */
@@ -1748,7 +2184,9 @@ static struct uiWidgetColors wcol_menu = {
 	{204, 204, 204, 255},
 
 	1,
-	15, -15
+	15, -15,
+	0,
+	0.2f,
 };
 
 /* button that starts pulldown */
@@ -1762,7 +2200,9 @@ static struct uiWidgetColors wcol_pulldown = {
 	{0, 0, 0, 255},
 
 	0,
-	25, -20
+	25, -20,
+	0,
+	0.2f,
 };
 
 /* button inside menu */
@@ -1776,7 +2216,9 @@ static struct uiWidgetColors wcol_menu_item = {
 	{0, 0, 0, 255},
 
 	1,
-	38, 0
+	38, 0,
+	0,
+	0.2f,
 };
 
 /* backdrop menu + title text color */
@@ -1790,7 +2232,9 @@ static struct uiWidgetColors wcol_menu_back = {
 	{255, 255, 255, 255},
 
 	0,
-	25, -20
+	25, -20,
+	0,
+	0.25f,
 };
 
 /* pie menus */
@@ -1804,7 +2248,9 @@ static struct uiWidgetColors wcol_pie_menu = {
 	{255, 255, 255, 255},
 
 	1,
-	10, -10
+	10, -10,
+	0,
+	0.5f,
 };
 
 
@@ -1819,7 +2265,9 @@ static struct uiWidgetColors wcol_tooltip = {
 	{255, 255, 255, 255},
 
 	0,
-	25, -20
+	25, -20,
+	0,
+	0.25f,
 };
 
 static struct uiWidgetColors wcol_radio = {
@@ -1832,7 +2280,9 @@ static struct uiWidgetColors wcol_radio = {
 	{0, 0, 0, 255},
 
 	1,
-	15, -15
+	15, -15,
+	0,
+	0.2f,
 };
 
 static struct uiWidgetColors wcol_regular = {
@@ -1845,7 +2295,9 @@ static struct uiWidgetColors wcol_regular = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.25f,
 };
 
 static struct uiWidgetColors wcol_tool = {
@@ -1858,7 +2310,25 @@ static struct uiWidgetColors wcol_tool = {
 	{255, 255, 255, 255},
 
 	1,
-	15, -15
+	15, -15,
+	0,
+	0.2f,
+};
+
+static struct uiWidgetColors wcol_toolbar_item = {
+	.outline = {0x19, 0x19, 0x19, 0xff},
+	.inner = {0x46, 0x46, 0x46, 0xff},
+	.inner_sel = {0xcc, 0xcc, 0xcc, 0xff},
+	.item = {0x0, 0x0, 0x0, 0xff},
+
+	.text = {0xff, 0xff, 0xff, 0xff},
+	.text_sel = {0x33, 0x33, 0x33, 0xff},
+
+	.shaded = 0,
+	.shadetop = 0,
+	.shadedown = 0,
+	.alpha_check = 0,
+	.roundness = 0.3f,
 };
 
 static struct uiWidgetColors wcol_box = {
@@ -1871,7 +2341,9 @@ static struct uiWidgetColors wcol_box = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.2f,
 };
 
 static struct uiWidgetColors wcol_toggle = {
@@ -1884,7 +2356,9 @@ static struct uiWidgetColors wcol_toggle = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.25f,
 };
 
 static struct uiWidgetColors wcol_scroll = {
@@ -1897,7 +2371,9 @@ static struct uiWidgetColors wcol_scroll = {
 	{255, 255, 255, 255},
 
 	1,
-	5, -5
+	5, -5,
+	0,
+	0.5f,
 };
 
 static struct uiWidgetColors wcol_progress = {
@@ -1910,7 +2386,9 @@ static struct uiWidgetColors wcol_progress = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.25f,
 };
 
 static struct uiWidgetColors wcol_list_item = {
@@ -1923,7 +2401,24 @@ static struct uiWidgetColors wcol_list_item = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.2f,
+};
+
+struct uiWidgetColors wcol_tab = {
+	{60, 60, 60, 255},
+	{83, 83, 83, 255},
+	{114, 114, 114, 255},
+	{90, 90, 90, 255},
+
+	{0, 0, 0, 255},
+	{0, 0, 0, 255},
+
+	0,
+	0, 0,
+	0,
+	0.25f,
 };
 
 /* free wcol struct to play with */
@@ -1937,7 +2432,9 @@ static struct uiWidgetColors wcol_tmp = {
 	{255, 255, 255, 255},
 
 	0,
-	0, 0
+	0, 0,
+	0,
+	0.25f,
 };
 
 
@@ -1946,8 +2443,10 @@ void ui_widget_color_init(ThemeUI *tui)
 {
 	tui->wcol_regular = wcol_regular;
 	tui->wcol_tool = wcol_tool;
+	tui->wcol_toolbar_item = wcol_toolbar_item;
 	tui->wcol_text = wcol_text;
 	tui->wcol_radio = wcol_radio;
+	tui->wcol_tab = wcol_tab;
 	tui->wcol_option = wcol_option;
 	tui->wcol_toggle = wcol_toggle;
 	tui->wcol_num = wcol_num;
@@ -1994,6 +2493,13 @@ static void ui_widget_color_disabled(uiWidgetType *wt)
 	wt->wcol_theme = &wcol_theme_s;
 }
 
+static void widget_active_color(char cp[3])
+{
+	cp[0] = cp[0] >= 240 ? 255 : cp[0] + 15;
+	cp[1] = cp[1] >= 240 ? 255 : cp[1] + 15;
+	cp[2] = cp[2] >= 240 ? 255 : cp[2] + 15;
+}
+
 /* copy colors from theme, and set changes in it based on state */
 static void widget_state(uiWidgetType *wt, int state)
 {
@@ -2020,6 +2526,8 @@ static void widget_state(uiWidgetType *wt, int state)
 			widget_state_blend(wt->wcol.inner, wcol_state->inner_anim_sel, wcol_state->blend);
 		else if (state & UI_BUT_DRIVEN)
 			widget_state_blend(wt->wcol.inner, wcol_state->inner_driven_sel, wcol_state->blend);
+		else if (state & UI_BUT_OVERRIDEN)
+			widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden_sel, wcol_state->blend);
 
 		copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
 
@@ -2033,11 +2541,11 @@ static void widget_state(uiWidgetType *wt, int state)
 			widget_state_blend(wt->wcol.inner, wcol_state->inner_anim, wcol_state->blend);
 		else if (state & UI_BUT_DRIVEN)
 			widget_state_blend(wt->wcol.inner, wcol_state->inner_driven, wcol_state->blend);
+		else if (state & UI_BUT_OVERRIDEN)
+			widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden, wcol_state->blend);
 
 		if (state & UI_ACTIVE) { /* mouse over? */
-			wt->wcol.inner[0] = wt->wcol.inner[0] >= 240 ? 255 : wt->wcol.inner[0] + 15;
-			wt->wcol.inner[1] = wt->wcol.inner[1] >= 240 ? 255 : wt->wcol.inner[1] + 15;
-			wt->wcol.inner[2] = wt->wcol.inner[2] >= 240 ? 255 : wt->wcol.inner[2] + 15;
+			widget_active_color(wt->wcol.inner);
 		}
 	}
 
@@ -2078,6 +2586,8 @@ static void widget_state_numslider(uiWidgetType *wt, int state)
 			widget_state_blend(wt->wcol.item, wcol_state->inner_anim_sel, blend);
 		else if (state & UI_BUT_DRIVEN)
 			widget_state_blend(wt->wcol.item, wcol_state->inner_driven_sel, blend);
+		else if (state & UI_BUT_OVERRIDEN)
+			widget_state_blend(wt->wcol.item, wcol_state->inner_overridden_sel, blend);
 
 		if (state & UI_SELECT)
 			SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
@@ -2089,6 +2599,8 @@ static void widget_state_numslider(uiWidgetType *wt, int state)
 			widget_state_blend(wt->wcol.item, wcol_state->inner_anim, blend);
 		else if (state & UI_BUT_DRIVEN)
 			widget_state_blend(wt->wcol.item, wcol_state->inner_driven, blend);
+		else if (state & UI_BUT_OVERRIDEN)
+			widget_state_blend(wt->wcol.item, wcol_state->inner_overridden, blend);
 	}
 }
 
@@ -2114,15 +2626,9 @@ static void widget_state_nothing(uiWidgetType *wt, int UNUSED(state))
 }
 
 /* special case, button that calls pulldown */
-static void widget_state_pulldown(uiWidgetType *wt, int state)
+static void widget_state_pulldown(uiWidgetType *wt, int UNUSED(state))
 {
 	wt->wcol = *(wt->wcol_theme);
-
-	copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
-	copy_v3_v3_char(wt->wcol.outline, wt->wcol.inner);
-
-	if (state & UI_ACTIVE)
-		copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
 }
 
 /* special case, pie menu items */
@@ -2207,22 +2713,23 @@ static void widget_softshadow(const rcti *rect, int roundboxalign, const float r
 	/* we draw a number of increasing size alpha quad strips */
 	alphastep = 3.0f * btheme->tui.menu_shadow_fac / radout;
 
-	glEnableClientState(GL_VERTEX_ARRAY);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	for (step = 1; step <= (int)radout; step++) {
 		float expfac = sqrtf(step / radout);
 
 		round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, (float)step);
 
-		glColor4f(0.0f, 0.0f, 0.0f, alphastep * (1.0f - expfac));
+		immUniformColor4f(0.0f, 0.0f, 0.0f, alphastep * (1.0f - expfac));
 
 		widget_verts_to_triangle_strip(&wtb, totvert, triangle_strip);
 
-		glVertexPointer(2, GL_FLOAT, 0, triangle_strip);
-		glDrawArrays(GL_TRIANGLE_STRIP, 0, totvert * 2); /* add + 2 for getting a complete soft rect. Now it skips top edge to allow transparent menus */
+		widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, totvert * 2);
 	}
 
-	glDisableClientState(GL_VERTEX_ARRAY);
+	immUnbindProgram();
 }
 
 static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int direction)
@@ -2247,32 +2754,32 @@ static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int dir
 	}
 
 	glEnable(GL_BLEND);
-	widget_softshadow(rect, roundboxalign, 0.25f * U.widget_unit);
+	widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
 
-	round_box_edges(&wtb, roundboxalign, rect, 0.25f * U.widget_unit);
+	round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
 	wtb.draw_emboss = false;
 	widgetbase_draw(&wtb, wcol);
 
 	glDisable(GL_BLEND);
 }
 
-
 static void ui_hsv_cursor(float x, float y)
 {
-	glPushMatrix();
-	glTranslatef(x, y, 0.0f);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-	glColor3f(1.0f, 1.0f, 1.0f);
-	glutil_draw_filled_arc(0.0f, M_PI * 2.0, 3.0f * U.pixelsize, 8);
+	immUniformColor3f(1.0f, 1.0f, 1.0f);
+	imm_draw_circle_fill_2d(pos, x, y, 3.0f * U.pixelsize, 8);
 
 	glEnable(GL_BLEND);
 	glEnable(GL_LINE_SMOOTH);
-	glColor3f(0.0f, 0.0f, 0.0f);
-	glutil_draw_lined_arc(0.0f, M_PI * 2.0, 3.0f * U.pixelsize, 12);
+	immUniformColor3f(0.0f, 0.0f, 0.0f);
+	imm_draw_circle_wire_2d(pos, x, y, 3.0f * U.pixelsize, 12);
 	glDisable(GL_BLEND);
 	glDisable(GL_LINE_SMOOTH);
 
-	glPopMatrix();
+	immUnbindProgram();
 }
 
 void ui_hsvcircle_vals_from_pos(float *val_rad, float *val_dist, const rcti *rect,
@@ -2312,18 +2819,17 @@ void ui_hsvcircle_pos_from_vals(uiBut *but, const rcti *rect, float *hsv, float
 
 static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *rect)
 {
+	/* TODO(merwin): reimplement as shader for pixel-perfect colors */
+
 	const int tot = 64;
 	const float radstep = 2.0f * (float)M_PI / (float)tot;
 	const float centx = BLI_rcti_cent_x_fl(rect);
 	const float centy = BLI_rcti_cent_y_fl(rect);
 	float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
 
-	/* gouraud triangle fan */
 	ColorPicker *cpicker = but->custom_data;
 	const float *hsv_ptr = cpicker->color_data;
-	float xpos, ypos, ang = 0.0f;
 	float rgb[3], hsvo[3], hsv[3], col[3], colcent[3];
-	int a;
 	bool color_profile = ui_but_is_colorpicker_display_space(but);
 
 	/* color */
@@ -2354,11 +2860,18 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *
 
 	ui_color_picker_to_rgb(0.0f, 0.0f, hsv[2], colcent, colcent + 1, colcent + 2);
 
-	glBegin(GL_TRIANGLE_FAN);
-	glColor3fv(colcent);
-	glVertex2f(centx, centy);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
 
-	for (a = 0; a <= tot; a++, ang += radstep) {
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+	immBegin(GWN_PRIM_TRI_FAN, tot + 2);
+	immAttrib3fv(color, colcent);
+	immVertex2f(pos, centx, centy);
+
+	float ang = 0.0f;
+	for (int a = 0; a <= tot; a++, ang += radstep) {
 		float si = sinf(ang);
 		float co = cosf(ang);
 
@@ -2366,25 +2879,32 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *
 
 		ui_color_picker_to_rgb_v(hsv, col);
 
-		glColor3fv(col);
-		glVertex2f(centx + co * radius, centy + si * radius);
+		immAttrib3fv(color, col);
+		immVertex2f(pos, centx + co * radius, centy + si * radius);
 	}
-	glEnd();
+	immEnd();
+	immUnbindProgram();
 
 	/* fully rounded outline */
-	glPushMatrix();
-	glTranslatef(centx, centy, 0.0f);
+	format = immVertexFormat();
+	pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	glEnable(GL_BLEND);
 	glEnable(GL_LINE_SMOOTH);
-	glColor3ubv((unsigned char *)wcol->outline);
-	glutil_draw_lined_arc(0.0f, M_PI * 2.0, radius, tot + 1);
+
+	immUniformColor3ubv((unsigned char *)wcol->outline);
+	imm_draw_circle_wire_2d(pos, centx, centy, radius, tot);
+
+	immUnbindProgram();
+
 	glDisable(GL_BLEND);
 	glDisable(GL_LINE_SMOOTH);
-	glPopMatrix();
 
 	/* cursor */
+	float xpos, ypos;
 	ui_hsvcircle_pos_from_vals(but, rect, hsvo, &xpos, &ypos);
-
 	ui_hsv_cursor(xpos, ypos);
 }
 
@@ -2394,7 +2914,8 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *
 void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, const float alpha)
 {
 	/* allows for 4 steps (red->yellow) */
-	const float color_step = 1.0f / 48.0f;
+	const int steps = 48;
+	const float color_step = 1.0f / steps;
 	int a;
 	float h = hsv[0], s = hsv[1], v = hsv[2];
 	float dx, dy, sx1, sx2, sy;
@@ -2450,7 +2971,12 @@ void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, cons
 	}
 
 	/* old below */
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
 
+	immBegin(GWN_PRIM_TRIS, steps * 3 * 6);
 	for (dx = 0.0f; dx < 0.999f; dx += color_step) { /* 0.999 = prevent float inaccuracy for steps */
 		const float dx_next = dx + color_step;
 
@@ -2508,22 +3034,29 @@ void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, cons
 		sy = rect->ymin;
 		dy = (float)BLI_rcti_size_y(rect) / 3.0f;
 
-		glBegin(GL_QUADS);
 		for (a = 0; a < 3; a++, sy += dy) {
-			glColor4f(col0[a][0], col0[a][1], col0[a][2], alpha);
-			glVertex2f(sx1, sy);
+			immAttrib4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
+			immVertex2f(pos, sx1, sy);
+
+			immAttrib4f(col, col1[a][0], col1[a][1], col1[a][2], alpha);
+			immVertex2f(pos, sx2, sy);
 
-			glColor4f(col1[a][0], col1[a][1], col1[a][2], alpha);
-			glVertex2f(sx2, sy);
+			immAttrib4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
+			immVertex2f(pos, sx2, sy + dy);
 
-			glColor4f(col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
-			glVertex2f(sx2, sy + dy);
+			immAttrib4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
+			immVertex2f(pos, sx1, sy);
 
-			glColor4f(col0[a + 1][0], col0[a + 1][1], col0[a + 1][2], alpha);
-			glVertex2f(sx1, sy + dy);
+			immAttrib4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
+			immVertex2f(pos, sx2, sy + dy);
+
+			immAttrib4f(col, col0[a + 1][0], col0[a + 1][1], col0[a + 1][2], alpha);
+			immVertex2f(pos, sx1, sy + dy);
 		}
-		glEnd();
 	}
+	immEnd();
+
+	immUnbindProgram();
 }
 
 bool ui_but_is_colorpicker_display_space(uiBut *but)
@@ -2599,15 +3132,20 @@ static void ui_draw_but_HSVCUBE(uiBut *but, const rcti *rect)
 	ui_hsv_cursor(x, y);
 
 	/* outline */
-	glColor3ub(0,  0,  0);
-	fdrawbox((rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax));
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3ub(0, 0, 0);
+	imm_draw_box_wire_2d(pos, (rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax));
+	immUnbindProgram();
 }
 
 /* vertical 'value' slider, using new widget code */
 static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
 {
+	bTheme *btheme = UI_GetTheme();
+	uiWidgetColors *wcol = &btheme->tui.wcol_numslider;
 	uiWidgetBase wtb;
-	const float rad = 0.5f * BLI_rcti_size_x(rect);
+	const float rad = wcol->roundness * BLI_rcti_size_x(rect);
 	float x, y;
 	float rgb[3], hsv[3], v;
 	bool color_profile = but->block->color_profile;
@@ -2649,6 +3187,11 @@ static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
 
 	widgetbase_draw(&wtb, &wcol_tmp);
 
+	/* We are drawing on top of widget bases. Flush cache. */
+	glEnable(GL_BLEND);
+	UI_widgetbase_draw_cache_flush();
+	glDisable(GL_BLEND);
+
 	/* cursor */
 	x = rect->xmin + 0.5f * BLI_rcti_size_x(rect);
 	y = rect->ymin + v    * BLI_rcti_size_y(rect);
@@ -2657,6 +3200,20 @@ static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
 	ui_hsv_cursor(x, y);
 }
 
+/* Generic round-box drawing. */
+static void ui_draw_roundbox(const rcti *rect, const float rad, const uiWidgetColors *wcol)
+{
+	uiWidgetBase wtb;
+	widget_init(&wtb);
+	round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+	widgetbase_draw(&wtb, wcol);
+
+	/* We are drawing on top of widget bases. Flush cache. */
+	glEnable(GL_BLEND);
+	UI_widgetbase_draw_cache_flush();
+	glDisable(GL_BLEND);
+}
+
 
 /* ************ separator, for menus etc ***************** */
 static void ui_draw_separator(const rcti *rect,  uiWidgetColors *wcol)
@@ -2669,19 +3226,29 @@ static void ui_draw_separator(const rcti *rect,  uiWidgetColors *wcol)
 		30
 	};
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	glEnable(GL_BLEND);
-	glColor4ubv(col);
+	immUniformColor4ubv(col);
 	glLineWidth(1.0f);
-	sdrawline(rect->xmin, y, rect->xmax, y);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(pos, rect->xmin, y);
+	immVertex2f(pos, rect->xmax, y);
+	immEnd();
+
 	glDisable(GL_BLEND);
+
+	immUnbindProgram();
 }
 
 /* ************ button callbacks, draw ***************** */
 static void widget_numbut_draw(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, bool emboss)
 {
 	uiWidgetBase wtb;
-	const float rad = 0.5f * BLI_rcti_size_y(rect);
-	float textofs = rad * 0.85f;
+	const float rad = wcol->roundness * BLI_rcti_size_y(rect);
+	const int handle_width = min_ii(BLI_rcti_size_x(rect) / 3, BLI_rcti_size_y(rect) * 0.7f);
 
 	if (state & UI_SELECT)
 		SWAP(short, wcol->shadetop, wcol->shadedown);
@@ -2697,14 +3264,80 @@ static void widget_numbut_draw(uiWidgetColors *wcol, rcti *rect, int state, int
 	}
 
 	/* decoration */
-	if (!(state & UI_STATE_TEXT_INPUT)) {
-		shape_preset_init_number_arrows(&wtb.tria1, rect, 0.6f, 'l');
-		shape_preset_init_number_arrows(&wtb.tria2, rect, 0.6f, 'r');
-	}
+	if ((state & UI_ACTIVE) && !(state & UI_STATE_TEXT_INPUT)) {
+		uiWidgetColors wcol_zone;
+		uiWidgetBase wtb_zone;
+		rcti rect_zone;
+		int roundboxalign_zone;
+
+		/* left arrow zone */
+		widget_init(&wtb_zone);
+		wtb_zone.draw_outline = false;
+		wtb_zone.draw_emboss = false;
+
+		wcol_zone = *wcol;
+		copy_v3_v3_char(wcol_zone.item, wcol->text);
+		if (state & UI_STATE_ACTIVE_LEFT) {
+			widget_active_color(wcol_zone.inner);
+		}
 
-	widgetbase_draw(&wtb, wcol);
+		rect_zone = *rect;
+		rect_zone.xmax = rect->xmin + handle_width + U.pixelsize;
+		roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+		round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
+
+		shape_preset_init_number_arrows(&wtb_zone.tria1, &rect_zone, 0.6f, 'l');
+		widgetbase_draw(&wtb_zone, &wcol_zone);
+
+		/* right arrow zone */
+		widget_init(&wtb_zone);
+		wtb_zone.draw_outline = false;
+		wtb_zone.draw_emboss = false;
+		wtb_zone.tria1.type = ROUNDBOX_TRIA_ARROWS;
+
+		wcol_zone = *wcol;
+		copy_v3_v3_char(wcol_zone.item, wcol->text);
+		if (state & UI_STATE_ACTIVE_RIGHT) {
+			widget_active_color(wcol_zone.inner);
+		}
+
+		rect_zone = *rect;
+		rect_zone.xmin = rect->xmax - handle_width - U.pixelsize;
+		roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
+		round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
+
+		shape_preset_init_number_arrows(&wtb_zone.tria2, &rect_zone, 0.6f, 'r');
+		widgetbase_draw(&wtb_zone, &wcol_zone);
+
+		/* middle highlight zone */
+		widget_init(&wtb_zone);
+		wtb_zone.draw_outline = false;
+		wtb_zone.draw_emboss = false;
+
+		wcol_zone = *wcol;
+		copy_v3_v3_char(wcol_zone.item, wcol->text);
+		if (!(state & (UI_STATE_ACTIVE_LEFT | UI_STATE_ACTIVE_RIGHT))) {
+			widget_active_color(wcol_zone.inner);
+		}
+
+		rect_zone = *rect;
+		rect_zone.xmin = rect->xmin + handle_width - U.pixelsize;
+		rect_zone.xmax = rect->xmax - handle_width + U.pixelsize;
+		round_box_edges(&wtb_zone, 0, &rect_zone, 0);
+		widgetbase_draw(&wtb_zone, &wcol_zone);
+
+		/* outline */
+		wtb.draw_inner = false;
+		widgetbase_draw(&wtb, wcol);
+	}
+	else {
+		/* inner and outline */
+		widgetbase_draw(&wtb, wcol);
+	}
 
 	if (!(state & UI_STATE_TEXT_INPUT)) {
+		const float textofs = 0.425f * BLI_rcti_size_y(rect);
+
 		/* text space */
 		rect->xmin += textofs;
 		rect->xmax -= textofs;
@@ -2724,53 +3357,6 @@ static void widget_numbut_embossn(uiBut *UNUSED(but), uiWidgetColors *wcol, rcti
 	widget_numbut_draw(wcol, rect, state, roundboxalign, true);
 }
 
-bool ui_link_bezier_points(const rcti *rect, float coord_array[][2], int resol)
-{
-	float dist, vec[4][2];
-
-	vec[0][0] = rect->xmin;
-	vec[0][1] = rect->ymin;
-	vec[3][0] = rect->xmax;
-	vec[3][1] = rect->ymax;
-
-	dist = 0.5f * fabsf(vec[0][0] - vec[3][0]);
-
-	vec[1][0] = vec[0][0] + dist;
-	vec[1][1] = vec[0][1];
-
-	vec[2][0] = vec[3][0] - dist;
-	vec[2][1] = vec[3][1];
-
-	BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], &coord_array[0][0], resol, sizeof(float[2]));
-	BKE_curve_forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], &coord_array[0][1], resol, sizeof(float[2]));
-
-	/* TODO: why return anything if always true? */
-	return true;
-}
-
-#define LINK_RESOL  24
-void ui_draw_link_bezier(const rcti *rect)
-{
-	float coord_array[LINK_RESOL + 1][2];
-
-	if (ui_link_bezier_points(rect, coord_array, LINK_RESOL)) {
-#if 0 /* unused */
-		/* we can reuse the dist variable here to increment the GL curve eval amount*/
-		const float dist = 1.0f / (float)LINK_RESOL;
-#endif
-		glEnable(GL_BLEND);
-		glEnable(GL_LINE_SMOOTH);
-
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glVertexPointer(2, GL_FLOAT, 0, coord_array);
-		glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL + 1);
-		glDisableClientState(GL_VERTEX_ARRAY);
-
-		glDisable(GL_BLEND);
-		glDisable(GL_LINE_SMOOTH);
-	}
-}
-
 /* function in use for buttons and for view2d sliders */
 void UI_draw_widget_scroll(uiWidgetColors *wcol, const rcti *rect, const rcti *slider, int state)
 {
@@ -2785,11 +3371,11 @@ void UI_draw_widget_scroll(uiWidgetColors *wcol, const rcti *rect, const rcti *s
 	horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
 
 	if (horizontal)
-		rad = 0.5f * BLI_rcti_size_y(rect);
+		rad = wcol->roundness * BLI_rcti_size_y(rect);
 	else
-		rad = 0.5f * BLI_rcti_size_x(rect);
+		rad = wcol->roundness * BLI_rcti_size_x(rect);
 
-	wtb.draw_shadedir = (horizontal) ? true : false;
+	wtb.uniform_params.shade_dir = (horizontal) ? 1.0f : 0.0;
 
 	/* draw back part, colors swapped and shading inverted */
 	if (horizontal)
@@ -2921,7 +3507,7 @@ static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect, int
 
 	/* round corners */
 	float value = but->a1;
-	float offs = 0.25f * BLI_rcti_size_y(&rect_prog);
+	float offs = wcol->roundness * BLI_rcti_size_y(&rect_prog);
 	float w = value * BLI_rcti_size_x(&rect_prog);
 
 	/* ensure minimium size */
@@ -2944,96 +3530,85 @@ static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect, int
 	rect->xmax += (BLI_rcti_size_x(&rect_prog) / 2);
 }
 
-static void widget_link(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
-{
-
-	if (but->flag & UI_SELECT) {
-		rcti rectlink;
-
-		UI_ThemeColor(TH_TEXT_HI);
-
-		rectlink.xmin = BLI_rcti_cent_x(rect);
-		rectlink.ymin = BLI_rcti_cent_y(rect);
-		rectlink.xmax = but->linkto[0];
-		rectlink.ymax = but->linkto[1];
-
-		ui_draw_link_bezier(&rectlink);
-	}
-}
-
 static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
 {
 	uiWidgetBase wtb, wtb1;
 	rcti rect1;
-	double value;
-	float offs, toffs, fac = 0;
+	float offs, toffs;
 	char outline[3];
 
 	widget_init(&wtb);
 	widget_init(&wtb1);
 
-	/* backdrop first */
-
-	/* fully rounded */
-	offs = 0.5f * BLI_rcti_size_y(rect);
+	/* Backdrop first. */
+	offs = wcol->roundness * BLI_rcti_size_y(rect);
 	toffs = offs * 0.75f;
 	round_box_edges(&wtb, roundboxalign, rect, offs);
 
 	wtb.draw_outline = false;
 	widgetbase_draw(&wtb, wcol);
 
-	/* draw left/right parts only when not in text editing */
+	/* Draw slider part only when not in text editing. */
 	if (!(state & UI_STATE_TEXT_INPUT)) {
-		int roundboxalign_slider;
+		int roundboxalign_slider = roundboxalign;
 
-		/* slider part */
 		copy_v3_v3_char(outline, wcol->outline);
 		copy_v3_v3_char(wcol->outline, wcol->item);
 		copy_v3_v3_char(wcol->inner, wcol->item);
 
-		if (!(state & UI_SELECT))
+		if (!(state & UI_SELECT)) {
 			SWAP(short, wcol->shadetop, wcol->shadedown);
+		}
 
 		rect1 = *rect;
+		float factor, factor_ui;
+		float factor_discard = 1.0f; /* No discard. */
+		float value = (float)ui_but_value_get(but);
 
-		value = ui_but_value_get(but);
-		if ((but->softmax - but->softmin) > 0) {
-			fac = ((float)value - but->softmin) * (BLI_rcti_size_x(&rect1) - offs) / (but->softmax - but->softmin);
+		if (but->rnaprop && (RNA_property_subtype(but->rnaprop) == PROP_PERCENTAGE)) {
+			factor = value / but->softmax;
+		}
+		else {
+			factor = (value - but->softmin) / (but->softmax - but->softmin);
 		}
 
-		/* left part of slider, always rounded */
-		rect1.xmax = rect1.xmin + ceil(offs + U.pixelsize);
-		round_box_edges(&wtb1, roundboxalign & ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT), &rect1, offs);
-		wtb1.draw_outline = false;
-		widgetbase_draw(&wtb1, wcol);
-
-		/* right part of slider, interpolate roundness */
-		rect1.xmax = rect1.xmin + fac + offs;
-		rect1.xmin +=  floor(offs - U.pixelsize);
+		float width = (float)BLI_rcti_size_x(rect);
+		factor_ui = factor * width;
 
-		if (rect1.xmax + offs > rect->xmax) {
-			roundboxalign_slider = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
-			offs *= (rect1.xmax + offs - rect->xmax) / offs;
+		if (factor_ui <= offs) {
+			/* Left part only. */
+			roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+			rect1.xmax = rect1.xmin + offs;
+			factor_discard = factor_ui / offs;
+		}
+		else if (factor_ui <= width - offs) {
+			/* Left part + middle part. */
+			roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+			rect1.xmax = rect1.xmin + factor_ui;
 		}
 		else {
-			roundboxalign_slider = 0;
-			offs = 0.0f;
+			/* Left part + middle part + right part. */
+			factor_discard = factor;
 		}
-		round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs);
 
+		round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs);
+		wtb1.draw_outline = false;
+		widgetbase_set_uniform_discard_factor(&wtb1, factor_discard);
 		widgetbase_draw(&wtb1, wcol);
+
 		copy_v3_v3_char(wcol->outline, outline);
 
-		if (!(state & UI_SELECT))
+		if (!(state & UI_SELECT)) {
 			SWAP(short, wcol->shadetop, wcol->shadedown);
+		}
 	}
 
-	/* outline */
+	/* Outline. */
 	wtb.draw_outline = true;
 	wtb.draw_inner = false;
 	widgetbase_draw(&wtb, wcol);
 
-	/* add space at either side of the button so text aligns with numbuttons (which have arrow icons) */
+	/* Add space at either side of the button so text aligns with numbuttons (which have arrow icons). */
 	if (!(state & UI_STATE_TEXT_INPUT)) {
 		rect->xmax -= toffs;
 		rect->xmin += toffs;
@@ -3064,13 +3639,12 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.25f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	ui_but_v3_get(but, col);
 
-	if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
+	if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN | UI_BUT_REDALERT)) {
 		/* draw based on state - color for keyed etc */
 		widgetbase_draw(&wtb, wcol);
 
@@ -3101,7 +3675,6 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 	}
 
 	widgetbase_draw(&wtb, wcol);
-
 	if (but->a1 == UI_PALETTE_COLOR && ((Palette *)but->rnapoin.id.data)->active_color == (int)but->a2) {
 		float width = rect->xmax - rect->xmin;
 		float height = rect->ymax - rect->ymin;
@@ -3110,12 +3683,22 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 
 		bw += (bw < 0.5f) ? 0.5f : -0.5f;
 
-		glColor4f(bw, bw, bw, 1.0);
-		glBegin(GL_TRIANGLES);
-		glVertex2f(rect->xmin + 0.1f * width, rect->ymin + 0.9f * height);
-		glVertex2f(rect->xmin + 0.1f * width, rect->ymin + 0.5f * height);
-		glVertex2f(rect->xmin + 0.5f * width, rect->ymin + 0.9f * height);
-		glEnd();
+		/* We are drawing on top of widget bases. Flush cache. */
+		glEnable(GL_BLEND);
+		UI_widgetbase_draw_cache_flush();
+		glDisable(GL_BLEND);
+
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformColor3f(bw, bw, bw);
+		immBegin(GWN_PRIM_TRIS, 3);
+		immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.9f * height);
+		immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.5f * height);
+		immVertex2f(pos, rect->xmin + 0.5f * width, rect->ymin + 0.9f * height);
+		immEnd();
+
+		immUnbindProgram();
 	}
 }
 
@@ -3133,8 +3716,7 @@ static void widget_icon_has_anim(uiBut *but, uiWidgetColors *wcol, rcti *rect, i
 		widget_init(&wtb);
 		wtb.draw_outline = false;
 
-		/* rounded */
-		rad = 0.5f * BLI_rcti_size_y(rect);
+		rad = wcol->roundness * BLI_rcti_size_y(rect);
 		round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
 		widgetbase_draw(&wtb, wcol);
 	}
@@ -3156,8 +3738,7 @@ static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int roun
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
@@ -3171,12 +3752,13 @@ static void widget_menubut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state),
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	/* decoration */
 	shape_preset_trias_from_rect_menu(&wtb.tria1, rect);
+	/* copy size and center to 2nd tria */
+	wtb.tria2 = wtb.tria1;
 
 	widgetbase_draw(&wtb, wcol);
 
@@ -3191,8 +3773,7 @@ static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(stat
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	/* decoration */
@@ -3208,8 +3789,7 @@ static void widget_menunodebut(uiWidgetColors *wcol, rcti *rect, int UNUSED(stat
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	wcol->inner[0] = min_ii(wcol->inner[0] + 15, 255);
@@ -3226,9 +3806,22 @@ static void widget_menunodebut(uiWidgetColors *wcol, rcti *rect, int UNUSED(stat
 
 static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
 {
-	if (state & UI_ACTIVE) {
+	float back[4];
+	UI_GetThemeColor4fv(TH_BACK, back);
+
+	if ((state & UI_ACTIVE) || (back[3] < 1.0f)) {
 		uiWidgetBase wtb;
-		const float rad = 0.2f * U.widget_unit;
+		const float rad = wcol->roundness * U.widget_unit;
+
+		if (state & UI_ACTIVE) {
+			copy_v4_v4_char(wcol->inner, wcol->inner_sel);
+			copy_v3_v3_char(wcol->text, wcol->text_sel);
+			copy_v3_v3_char(wcol->outline, wcol->inner);
+		}
+		else {
+			wcol->inner[3] *= 1.0f - back[3];
+			wcol->outline[3] = 0.0f;
+		}
 
 		widget_init(&wtb);
 
@@ -3262,7 +3855,7 @@ static void widget_menu_radial_itembut(uiBut *but, uiWidgetColors *wcol, rcti *r
 
 	wtb.draw_emboss = false;
 
-	rad = 0.5f * BLI_rcti_size_y(rect);
+	rad = wcol->roundness * BLI_rcti_size_y(rect);
 	round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
 
 	wcol->inner[3] *= fac;
@@ -3282,9 +3875,9 @@ static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, int UNUSED(sta
 
 	widget_init(&wtb);
 
-	/* rounded, but no outline */
+	/* no outline */
 	wtb.draw_outline = false;
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
@@ -3309,8 +3902,7 @@ static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, int state, int UN
 	recttemp.xmax -= delta;
 	recttemp.ymax -= delta;
 
-	/* half rounded */
-	rad = BLI_rcti_size_y(&recttemp) / 3;
+	rad = wcol->roundness * BLI_rcti_size_y(&recttemp);
 	round_box_edges(&wtb, UI_CNR_ALL, &recttemp, rad);
 
 	/* decoration */
@@ -3351,8 +3943,7 @@ static void widget_radiobut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state),
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
@@ -3375,8 +3966,7 @@ static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(
 		wcol->inner[2] = but->col[2];
 	}
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
@@ -3391,8 +3981,7 @@ static void widget_but(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int
 
 	widget_init(&wtb);
 
-	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = wcol->roundness * U.widget_unit;
 	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
@@ -3402,7 +3991,7 @@ static void widget_but(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int
 static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
 {
 	uiWidgetBase wtb;
-	const float rad = 0.25f * U.widget_unit;
+	const float rad = wcol->roundness * U.widget_unit;
 
 	widget_init(&wtb);
 
@@ -3416,7 +4005,7 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state),
 static void widget_roundbut_exec(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
 {
 	uiWidgetBase wtb;
-	const float rad = 0.25f * U.widget_unit;
+	const float rad = wcol->roundness * U.widget_unit;
 
 	widget_init(&wtb);
 
@@ -3431,10 +4020,68 @@ static void widget_roundbut_exec(uiWidgetColors *wcol, rcti *rect, int state, in
 	widgetbase_draw(&wtb, wcol);
 }
 
+static void widget_tab(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
+{
+	const uiStyle *style = UI_style_get();
+	const float rad = wcol->roundness * U.widget_unit;
+	const int fontid = style->widget.uifont_id;
+	const bool is_active = (state & UI_SELECT);
+
+/* Draw shaded outline - Disabled for now, seems incorrect and also looks nicer without it imho ;) */
+//#define USE_TAB_SHADED_HIGHLIGHT
+
+	uiWidgetBase wtb;
+	unsigned char theme_col_tab_highlight[3];
+
+#ifdef USE_TAB_SHADED_HIGHLIGHT
+	/* create outline highlight colors */
+	if (is_active) {
+		interp_v3_v3v3_uchar(theme_col_tab_highlight, (unsigned char *)wcol->inner_sel,
+		                     (unsigned char *)wcol->outline, 0.2f);
+	}
+	else {
+		interp_v3_v3v3_uchar(theme_col_tab_highlight, (unsigned char *)wcol->inner,
+		                     (unsigned char *)wcol->outline, 0.12f);
+	}
+#endif
+
+	widget_init(&wtb);
+
+	/* half rounded */
+	round_box_edges(&wtb, roundboxalign, rect, rad);
+
+	/* draw inner */
+#ifdef USE_TAB_SHADED_HIGHLIGHT
+	wtb.draw_outline = 0;
+#endif
+	widgetbase_draw(&wtb, wcol);
+
+	/* We are drawing on top of widget bases. Flush cache. */
+	glEnable(GL_BLEND);
+	UI_widgetbase_draw_cache_flush();
+	glDisable(GL_BLEND);
+
+#ifdef USE_TAB_SHADED_HIGHLIGHT
+	/* draw outline (3d look) */
+	ui_draw_but_TAB_outline(rect, rad, theme_col_tab_highlight, (unsigned char *)wcol->inner);
+#endif
+
+	/* text shadow */
+	BLF_enable(fontid, BLF_SHADOW);
+	BLF_shadow(fontid, 3, (const float[4]){1.0f, 1.0f, 1.0f, 0.25f});
+	BLF_shadow_offset(fontid, 0, -1);
+
+#ifndef USE_TAB_SHADED_HIGHLIGHT
+	UNUSED_VARS(is_active, theme_col_tab_highlight);
+#endif
+}
+
 static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *wt, rcti *rect)
 {
+	bTheme *btheme = UI_GetTheme();
+	uiWidgetColors *wcol = &btheme->tui.wcol_radio;
 	uiWidgetBase wtb;
-	const float rad = 0.25f * U.widget_unit;
+	const float rad = wcol->roundness * U.widget_unit;
 	unsigned char col[4];
 
 	/* state copy! */
@@ -3446,12 +4093,17 @@ static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *
 		/* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
 		but->block->drawextra(C, but->poin, but->block->drawextra_arg1, but->block->drawextra_arg2, rect);
 
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		/* make mask to draw over image */
 		UI_GetThemeColor3ubv(TH_BACK, col);
-		glColor3ubv(col);
+		immUniformColor3ubv(col);
 
 		round_box__edges(&wtb, UI_CNR_ALL, rect, 0.0f, rad);
-		widgetbase_outline(&wtb);
+		widgetbase_outline(&wtb, pos);
+
+		immUnbindProgram();
 	}
 
 	/* outline */
@@ -3513,6 +4165,16 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
 			wt.draw = widget_roundbut_exec;
 			break;
 
+		case UI_WTYPE_TOOLBAR_ITEM:
+			wt.wcol_theme = &btheme->tui.wcol_toolbar_item;
+			wt.draw = widget_roundbut_exec;
+			break;
+
+		case UI_WTYPE_TAB:
+			wt.wcol_theme = &btheme->tui.wcol_tab;
+			wt.draw = widget_tab;
+			break;
+
 		case UI_WTYPE_TOOLTIP:
 			wt.wcol_theme = &btheme->tui.wcol_tooltip;
 			wt.draw = widget_menu_back;
@@ -3635,7 +4297,7 @@ static int widget_roundbox_set(uiBut *but, rcti *rect)
 	/* alignment */
 	if ((but->drawflag & UI_BUT_ALIGN) && but->type != UI_BTYPE_PULLDOWN) {
 
-		/* ui_block_position has this correction too, keep in sync */
+		/* ui_popup_block_position has this correction too, keep in sync */
 		if (but->drawflag & (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_STITCH_TOP))
 			rect->ymax += U.pixelsize;
 		if (but->drawflag & (UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_STITCH_LEFT))
@@ -3673,7 +4335,7 @@ static int widget_roundbox_set(uiBut *but, rcti *rect)
 	}
 
 	/* align with open menu */
-	if (but->active) {
+	if (but->active && (but->type != UI_BTYPE_POPOVER)) {
 		int direction = ui_but_menu_direction(but);
 
 		if      (direction == UI_DIR_UP)    roundbox &= ~(UI_CNR_TOP_RIGHT    | UI_CNR_TOP_LEFT);
@@ -3697,6 +4359,10 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 	uiFontStyle *fstyle = &style->widget;
 	uiWidgetType *wt = NULL;
 
+#ifdef USE_POPOVER_ONCE
+	const rcti rect_orig = *rect;
+#endif
+
 	/* handle menus separately */
 	if (but->dt == UI_EMBOSS_PULLDOWN) {
 		switch (but->type) {
@@ -3747,7 +4413,16 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 				break;
 
 			case UI_BTYPE_BUT:
+#ifdef USE_TOOLBAR_HACK
+				if (UI_but_is_tool(but)) {
+					wt = widget_type(UI_WTYPE_TOOLBAR_ITEM);
+				}
+				else {
+					wt = widget_type(UI_WTYPE_EXEC);
+				}
+#else
 				wt = widget_type(UI_WTYPE_EXEC);
+#endif
 				break;
 
 			case UI_BTYPE_NUM:
@@ -3776,6 +4451,10 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 					wt->wcol_theme = &btheme->tui.wcol_menu_back;
 				break;
 
+			case UI_BTYPE_TAB:
+				wt = widget_type(UI_WTYPE_TAB);
+				break;
+
 			case UI_BTYPE_BUT_TOGGLE:
 			case UI_BTYPE_TOGGLE:
 			case UI_BTYPE_TOGGLE_N:
@@ -3799,6 +4478,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 
 			case UI_BTYPE_MENU:
 			case UI_BTYPE_BLOCK:
+			case UI_BTYPE_POPOVER:
 				if (but->flag & UI_BUT_NODE_LINK) {
 					/* new node-link button, not active yet XXX */
 					wt = widget_type(UI_WTYPE_MENU_NODE_LINK);
@@ -3838,13 +4518,6 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 				wt = widget_type(UI_WTYPE_BOX);
 				break;
 
-			case UI_BTYPE_LINK:
-			case UI_BTYPE_INLINK:
-				wt = widget_type(UI_WTYPE_ICON);
-				wt->custom = widget_link;
-
-				break;
-
 			case UI_BTYPE_EXTRA:
 				widget_draw_extra_mask(C, but, widget_type(UI_WTYPE_BOX), rect);
 				break;
@@ -3941,6 +4614,15 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 			state |= UI_STATE_HOLD_ACTION;
 		}
 
+		if (state & UI_ACTIVE) {
+			if (but->drawflag & UI_BUT_ACTIVE_LEFT) {
+				state |= UI_STATE_ACTIVE_LEFT;
+			}
+			else if (but->drawflag & UI_BUT_ACTIVE_RIGHT) {
+				state |= UI_STATE_ACTIVE_RIGHT;
+			}
+		}
+
 		if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE))
 			if (but->dt != UI_EMBOSS_PULLDOWN)
 				disabled = true;
@@ -3956,6 +4638,25 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 
 		if (disabled)
 			glEnable(GL_BLEND);
+
+#ifdef USE_POPOVER_ONCE
+		if (but->block->flag & UI_BLOCK_POPOVER_ONCE) {
+			if ((state & UI_ACTIVE) && ui_but_is_popover_once_compat(but)) {
+				uiWidgetType wt_back = *wt;
+				uiWidgetType *wt_temp = widget_type(UI_WTYPE_MENU_ITEM);
+				wt_temp->state(wt_temp, state);
+				copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+				wt->wcol.inner[3] = 128;
+				wt->wcol.roundness = 0.5f;
+				ui_draw_roundbox(
+				        &rect_orig,
+				        0.25f * min_ff(BLI_rcti_size_x(&rect_orig), BLI_rcti_size_y(&rect_orig)),
+				        &wt_temp->wcol);
+				*wt = wt_back;
+			}
+		}
+#endif
+
 		wt->text(fstyle, &wt->wcol, but, rect);
 		if (disabled)
 			glDisable(GL_BLEND);
@@ -3966,6 +4667,28 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 	}
 }
 
+static void ui_draw_clip_tri(uiBlock *block, rcti *rect, uiWidgetType *wt)
+{
+	if (block) {
+		float draw_color[4];
+		unsigned char *color = (unsigned char *)wt->wcol.text;
+
+		draw_color[0] = ((float)color[0]) / 255.0f;
+		draw_color[1] = ((float)color[1]) / 255.0f;
+		draw_color[2] = ((float)color[2]) / 255.0f;
+		draw_color[3] = 1.0f;
+
+		if (block->flag & UI_BLOCK_CLIPTOP) {
+			/* XXX no scaling for UI here yet */
+			UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymax - 8, 't', draw_color);
+		}
+		if (block->flag & UI_BLOCK_CLIPBOTTOM) {
+			/* XXX no scaling for UI here yet */
+			UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymin + 10, 'v', draw_color);
+		}
+	}
+}
+
 void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
 {
 	uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
@@ -3976,18 +4699,79 @@ void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
 	else
 		wt->draw(&wt->wcol, rect, 0, 0);
 
-	if (block) {
-		if (block->flag & UI_BLOCK_CLIPTOP) {
-			/* XXX no scaling for UI here yet */
-			glColor3ubv((unsigned char *)wt->wcol.text);
-			UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymax - 8, 't');
+	ui_draw_clip_tri(block, rect, wt);
+}
+
+/**
+ * Similar to 'widget_menu_back', however we can't use the widget preset system
+ * because we need to pass in the original location so we know where to show the arrow.
+ */
+static void ui_draw_popover_back_impl(
+        const uiWidgetColors *wcol, rcti *rect, int direction,
+        const float mval_origin[2])
+{
+	/* tsk, this isn't nice. */
+	const float unit_half = (BLI_rcti_size_x(rect) / UI_POPOVER_WIDTH_UNITS) / 2;
+	const float cent_x = mval_origin ? mval_origin[0] : BLI_rcti_cent_x(rect);
+	rect->ymax -= unit_half;
+	rect->ymin += unit_half;
+
+	glEnable(GL_BLEND);
+
+	/* Extracted from 'widget_menu_back', keep separate to avoid menu changes breaking popovers */
+	{
+		uiWidgetBase wtb;
+		widget_init(&wtb);
+
+		const int roundboxalign = UI_CNR_ALL;
+		widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
+
+		round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
+		wtb.draw_emboss = false;
+		widgetbase_draw(&wtb, wcol);
+	}
+
+	/* Draw popover arrow (top/bottom) */
+	if (ELEM(direction, UI_DIR_UP, UI_DIR_DOWN)) {
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4ubv((unsigned char *)wcol->inner);
+		glEnable(GL_BLEND);
+		immBegin(GWN_PRIM_TRIS, 3);
+		if (direction == UI_DIR_DOWN) {
+			const float y = rect->ymax;
+			immVertex2f(pos, cent_x - unit_half, y);
+			immVertex2f(pos, cent_x + unit_half, y);
+			immVertex2f(pos, cent_x, y + unit_half);
 		}
-		if (block->flag & UI_BLOCK_CLIPBOTTOM) {
-			/* XXX no scaling for UI here yet */
-			glColor3ubv((unsigned char *)wt->wcol.text);
-			UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymin + 10, 'v');
+		else {
+			const float y = rect->ymin;
+			immVertex2f(pos, cent_x - unit_half, y);
+			immVertex2f(pos, cent_x + unit_half, y);
+			immVertex2f(pos, cent_x, y - unit_half);
 		}
+		immEnd();
+		immUnbindProgram();
 	}
+
+	glDisable(GL_BLEND);
+}
+
+void ui_draw_popover_back(ARegion *ar, uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
+{
+	uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
+
+	if (block) {
+		float mval_origin[2] = {block->mx, block->my};
+		ui_window_to_block_fl(ar, block, &mval_origin[0], &mval_origin[1]);
+		ui_draw_popover_back_impl(wt->wcol_theme, rect, block->direction, mval_origin);
+	}
+	else {
+		wt->state(wt, 0);
+		wt->draw(&wt->wcol, rect, 0, 0);
+	}
+
+	ui_draw_clip_tri(block, rect, wt);
 }
 
 static void draw_disk_shaded(
@@ -4003,33 +4787,21 @@ static void draw_disk_shaded(
 	float y1, y2;
 	float fac;
 	unsigned char r_col[4];
+	unsigned int pos, col;
 
-	glBegin(GL_TRIANGLE_STRIP);
-
-	s = sinf(start);
-	c = cosf(start);
-
-	y1 = s * radius_int;
-	y2 = s * radius_ext;
-
+	Gwn_VertFormat *format = immVertexFormat();
+	pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 	if (shaded) {
-		fac = (y1 + radius_ext) * radius_ext_scale;
-		round_box_shade_col4_r(r_col, col1, col2, fac);
-
-		glColor4ubv(r_col);
+		col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+		immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
 	}
-
-	glVertex2f(c * radius_int, s * radius_int);
-
-	if (shaded) {
-		fac = (y2 + radius_ext) * radius_ext_scale;
-		round_box_shade_col4_r(r_col, col1, col2, fac);
-
-		glColor4ubv(r_col);
+	else {
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4ubv((unsigned char *)col1);
 	}
-	glVertex2f(c * radius_ext, s * radius_ext);
 
-	for (i = 1; i < subd; i++) {
+	immBegin(GWN_PRIM_TRI_STRIP, subd * 2);
+	for (i = 0; i < subd; i++) {
 		float a;
 
 		a = start + ((i) / (float)(subd - 1)) * angle;
@@ -4041,20 +4813,20 @@ static void draw_disk_shaded(
 		if (shaded) {
 			fac = (y1 + radius_ext) * radius_ext_scale;
 			round_box_shade_col4_r(r_col, col1, col2, fac);
-
-			glColor4ubv(r_col);
+			immAttrib4ubv(col, r_col);
 		}
-		glVertex2f(c * radius_int, s * radius_int);
+		immVertex2f(pos, c * radius_int, s * radius_int);
 
 		if (shaded) {
 			fac = (y2 + radius_ext) * radius_ext_scale;
 			round_box_shade_col4_r(r_col, col1, col2, fac);
-
-			glColor4ubv(r_col);
+			immAttrib4ubv(col, r_col);
 		}
-		glVertex2f(c * radius_ext, s * radius_ext);
+		immVertex2f(pos, c * radius_ext, s * radius_ext);
 	}
-	glEnd();
+	immEnd();
+
+	immUnbindProgram();
 }
 
 void ui_draw_pie_center(uiBlock *block)
@@ -4073,8 +4845,8 @@ void ui_draw_pie_center(uiBlock *block)
 	float angle = atan2f(pie_dir[1], pie_dir[0]);
 	float range = (block->pie_data.flags & UI_PIE_DEGREES_RANGE_LARGE) ? M_PI_2 : M_PI_4;
 
-	glPushMatrix();
-	glTranslatef(cx, cy, 0.0f);
+	gpuPushMatrix();
+	gpuTranslate2f(cx, cy);
 
 	glEnable(GL_BLEND);
 	if (btheme->tui.wcol_pie_menu.shaded) {
@@ -4083,8 +4855,7 @@ void ui_draw_pie_center(uiBlock *block)
 		draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, col1, col2, true);
 	}
 	else {
-		glColor4ubv((GLubyte *)btheme->tui.wcol_pie_menu.inner);
-		draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, NULL, NULL, false);
+		draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, btheme->tui.wcol_pie_menu.inner, NULL, false);
 	}
 
 	if (!(block->pie_data.flags & UI_PIE_INVALID_DIR)) {
@@ -4094,25 +4865,34 @@ void ui_draw_pie_center(uiBlock *block)
 			draw_disk_shaded(angle - range / 2.0f, range, pie_radius_internal, pie_radius_external, subd, col1, col2, true);
 		}
 		else {
-			glColor4ubv((GLubyte *)btheme->tui.wcol_pie_menu.inner_sel);
-			draw_disk_shaded(angle - range / 2.0f, range, pie_radius_internal, pie_radius_external, subd, NULL, NULL, false);
+			draw_disk_shaded(angle - range / 2.0f, range, pie_radius_internal, pie_radius_external, subd, btheme->tui.wcol_pie_menu.inner_sel, NULL, false);
 		}
 	}
 
-	glColor4ubv((GLubyte *)btheme->tui.wcol_pie_menu.outline);
-	glutil_draw_lined_arc(0.0f, (float)M_PI * 2.0f, pie_radius_internal, subd);
-	glutil_draw_lined_arc(0.0f, (float)M_PI * 2.0f, pie_radius_external, subd);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4ubv((unsigned char *)btheme->tui.wcol_pie_menu.outline);
+
+	imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_internal, subd);
+	imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_external, subd);
+
+	immUnbindProgram();
 
 	if (U.pie_menu_confirm > 0 && !(block->pie_data.flags & (UI_PIE_INVALID_DIR | UI_PIE_CLICK_STYLE))) {
 		float pie_confirm_radius = U.pixelsize * (pie_radius_internal + U.pie_menu_confirm);
 		float pie_confirm_external = U.pixelsize * (pie_radius_internal + U.pie_menu_confirm + 7.0f);
 
-		glColor4ub(btheme->tui.wcol_pie_menu.text_sel[0], btheme->tui.wcol_pie_menu.text_sel[1], btheme->tui.wcol_pie_menu.text_sel[2], 64);
-		draw_disk_shaded(angle - range / 2.0f, range, pie_confirm_radius, pie_confirm_external, subd, NULL, NULL, false);
+		const char col[4] = {btheme->tui.wcol_pie_menu.text_sel[0],
+		                     btheme->tui.wcol_pie_menu.text_sel[1],
+		                     btheme->tui.wcol_pie_menu.text_sel[2],
+		                     64};
+
+		draw_disk_shaded(angle - range / 2.0f, range, pie_confirm_radius, pie_confirm_external, subd, col, NULL, false);
 	}
 
 	glDisable(GL_BLEND);
-	glPopMatrix();
+	gpuPopMatrix();
 }
 
 
@@ -4196,8 +4976,7 @@ void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int ic
 			UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
 		}
 
-		glColor4ubv((unsigned char *)wt->wcol.text);
-		UI_fontstyle_draw(fstyle, rect, drawstr);
+		UI_fontstyle_draw(fstyle, rect, drawstr, (unsigned char *)wt->wcol.text);
 	}
 
 	/* part text right aligned */
@@ -4205,7 +4984,7 @@ void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int ic
 		if (cpoin) {
 			fstyle->align = UI_STYLE_TEXT_RIGHT;
 			rect->xmax = _rect.xmax - 5;
-			UI_fontstyle_draw(fstyle, rect, cpoin + 1);
+			UI_fontstyle_draw(fstyle, rect, cpoin + 1, (unsigned char *)wt->wcol.text);
 			*cpoin = UI_SEP_CHAR;
 		}
 	}
@@ -4263,8 +5042,7 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int
 		BLI_strncpy(drawstr, name, sizeof(drawstr));
 		UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
 
-		glColor4ubv((unsigned char *)wt->wcol.text);
-		UI_fontstyle_draw(fstyle, &trect, drawstr);
+		UI_fontstyle_draw(fstyle, &trect, drawstr, (unsigned char *)wt->wcol.text);
 	}
 }
 
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 3477a66d600..1bfb050563d 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -54,6 +54,10 @@
 
 #include "BIF_gl.h"
 
+#include "BLF_api.h"
+
+#include "ED_screen.h"
+
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 
@@ -94,6 +98,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 	static char error[4] = {240, 0, 240, 255};
 	static char alert[4] = {240, 60, 60, 255};
 	static char headerdesel[4] = {0, 0, 0, 255};
+	static char back[4] = {0, 0, 0, 255};
 	static char setting = 0;
 	const char *cp = error;
 
@@ -154,18 +159,18 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case SPACE_CONSOLE:
 					ts = &btheme->tconsole;
 					break;
-				case SPACE_TIME:
-					ts = &btheme->ttime;
-					break;
 				case SPACE_NODE:
 					ts = &btheme->tnode;
 					break;
-				case SPACE_LOGIC:
-					ts = &btheme->tlogic;
-					break;
 				case SPACE_CLIP:
 					ts = &btheme->tclip;
 					break;
+				case SPACE_TOPBAR:
+					ts = &btheme->ttopbar;
+					break;
+				case SPACE_STATUSBAR:
+					ts = &btheme->tstatusbar;
+					break;
 				default:
 					ts = &btheme->tv3d;
 					break;
@@ -181,6 +186,12 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 						cp = ts->header;
 					else
 						cp = ts->button;
+
+					copy_v4_v4_char(back, cp);
+					if (!ED_region_is_overlap(spacetype, theme_regionid)) {
+						back[3] = 255;
+					}
+					cp = back;
 					break;
 				case TH_LOW_GRAD:
 					cp = ts->gradients.gradient;
@@ -231,6 +242,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					headerdesel[0] = cp[0] > 10 ? cp[0] - 10 : 0;
 					headerdesel[1] = cp[1] > 10 ? cp[1] - 10 : 0;
 					headerdesel[2] = cp[2] > 10 ? cp[2] - 10 : 0;
+					headerdesel[3] = cp[3];
 					cp = headerdesel;
 					break;
 				case TH_HEADER_TEXT:
@@ -242,6 +254,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					cp = ts->panelcolors.header; break;
 				case TH_PANEL_BACK:
 					cp = ts->panelcolors.back; break;
+				case TH_PANEL_SUB_BACK:
+					cp = ts->panelcolors.sub_back; break;
 				case TH_PANEL_SHOW_HEADER:
 					cp = &setting;
 					setting = ts->panelcolors.show_header;
@@ -659,6 +673,9 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case TH_WIDGET_EMBOSS:
 					cp = btheme->tui.widget_emboss; break;
 
+				case TH_EDITOR_OUTLINE:
+					cp = btheme->tui.editor_outline;
+					break;
 				case TH_AXIS_X:
 					cp = btheme->tui.xaxis; break;
 				case TH_AXIS_Y:
@@ -666,6 +683,17 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case TH_AXIS_Z:
 					cp = btheme->tui.zaxis; break;
 
+				case TH_MANIPULATOR_HI:
+					cp = btheme->tui.manipulator_hi; break;
+				case TH_MANIPULATOR_PRIMARY:
+					cp = btheme->tui.manipulator_primary; break;
+				case TH_MANIPULATOR_SECONDARY:
+					cp = btheme->tui.manipulator_secondary; break;
+				case TH_MANIPULATOR_A:
+					cp = btheme->tui.manipulator_a; break;
+				case TH_MANIPULATOR_B:
+					cp = btheme->tui.manipulator_b; break;
+
 				case TH_INFO_SELECTED:
 					cp = ts->info_selected;
 					break;
@@ -795,6 +823,7 @@ static void ui_theme_init_new_do(ThemeSpace *ts)
 	ts->panelcolors.show_header = false;
 	rgba_char_args_set(ts->panelcolors.back,   114, 114, 114, 128);
 	rgba_char_args_set(ts->panelcolors.header, 0, 0, 0, 25);
+	rgba_char_args_set(ts->panelcolors.sub_back, 0, 0, 0, 25);
 
 	rgba_char_args_set(ts->button,         145, 145, 145, 245);
 	rgba_char_args_set(ts->button_title,   0, 0, 0, 255);
@@ -836,6 +865,15 @@ static void ui_theme_space_init_handles_color(ThemeSpace *theme_space)
 	rgba_char_args_set(theme_space->act_spline, 0xdb, 0x25, 0x12, 255);
 }
 
+static void ui_theme_space_init_manipulator_colors(bTheme *btheme)
+{
+	rgba_char_args_set(btheme->tui.manipulator_hi, 255, 255, 255, 255);
+	rgba_char_args_set(btheme->tui.manipulator_primary, 222, 255, 13, 255);
+	rgba_char_args_set(btheme->tui.manipulator_secondary, 0, 255, 255, 255);
+	rgba_char_args_set(btheme->tui.manipulator_a, 23, 127, 23, 255);
+	rgba_char_args_set(btheme->tui.manipulator_b, 127, 23, 23, 255);
+}
+
 /**
  * initialize default theme
  * \note: when you add new colors, created & saved themes need initialized
@@ -862,6 +900,7 @@ void ui_theme_init_default(void)
 	btheme->tui.iconfile[0] = 0;
 	rgba_char_args_set(btheme->tui.wcol_tooltip.text, 255, 255, 255, 255);
 	rgba_char_args_set_fl(btheme->tui.widget_emboss, 1.0f, 1.0f, 1.0f, 0.02f);
+	rgba_char_args_set_fl(btheme->tui.editor_outline, 0.25f, 0.25f, 0.25f, 1.0f);
 
 	rgba_char_args_set(btheme->tui.xaxis, 220,   0,   0, 255);
 	rgba_char_args_set(btheme->tui.yaxis,   0, 220,   0, 255);
@@ -876,6 +915,9 @@ void ui_theme_init_default(void)
 	/* common (new) variables */
 	ui_theme_init_new(btheme);
 
+	/* Manipulator. */
+	ui_theme_space_init_manipulator_colors(btheme);
+
 	/* space view3d */
 	rgba_char_args_set_fl(btheme->tv3d.back,       0.225, 0.225, 0.225, 1.0);
 	rgba_char_args_set(btheme->tv3d.text,       0, 0, 0, 255);
@@ -1185,10 +1227,6 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tnode.console_output, 223, 202, 53, 255);  /* interface nodes */
 	btheme->tnode.noodle_curving = 5;
 
-	/* space logic */
-	btheme->tlogic = btheme->tv3d;
-	rgba_char_args_set(btheme->tlogic.back, 100, 100, 100, 255);
-
 	/* space clip */
 	btheme->tclip = btheme->tv3d;
 
@@ -1207,6 +1245,17 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tclip.strip_select, 0xff, 0x8c, 0x00, 0xff);
 	btheme->tclip.handle_vertex_size = 5;
 	ui_theme_space_init_handles_color(&btheme->tclip);
+
+	/* space topbar */
+	char tmp[4];
+	btheme->ttopbar = btheme->tv3d;
+	/* swap colors */
+	copy_v4_v4_char(tmp, btheme->ttopbar.header);
+	copy_v4_v4_char(btheme->ttopbar.header, btheme->ttopbar.tab_inactive);
+	copy_v4_v4_char(btheme->ttopbar.back, tmp);
+
+	/* space statusbar */
+	btheme->tstatusbar = btheme->tv3d;
 }
 
 void ui_style_init_default(void)
@@ -1273,25 +1322,35 @@ void UI_ThemeColor4(int colorid)
 
 	cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
 	glColor4ubv(cp);
-
 }
 
 /* set the color with offset for shades */
 void UI_ThemeColorShade(int colorid, int offset)
 {
-	int r, g, b;
+	unsigned char col[4];
+	UI_GetThemeColorShade4ubv(colorid, offset, col);
+	glColor4ubv(col);
+}
+
+void UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset)
+{
+	int r, g, b, a;
 	const unsigned char *cp;
 
 	cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
-	r = offset + (int) cp[0];
+	r = coloffset + (int) cp[0];
 	CLAMP(r, 0, 255);
-	g = offset + (int) cp[1];
+	g = coloffset + (int) cp[1];
 	CLAMP(g, 0, 255);
-	b = offset + (int) cp[2];
+	b = coloffset + (int) cp[2];
 	CLAMP(b, 0, 255);
-	glColor4ub(r, g, b, cp[3]);
+	a = alphaoffset + (int) cp[3];
+	CLAMP(a, 0, 255);
+
+	glColor4ub(r, g, b, a);
 }
-void UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset)
+
+void UI_GetThemeColorShadeAlpha4ubv(int colorid, int coloffset, int alphaoffset, unsigned char col[4])
 {
 	int r, g, b, a;
 	const unsigned char *cp;
@@ -1305,7 +1364,11 @@ void UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset)
 	CLAMP(b, 0, 255);
 	a = alphaoffset + (int) cp[3];
 	CLAMP(a, 0, 255);
-	glColor4ub(r, g, b, a);
+
+	col[0] = r;
+	col[1] = g;
+	col[2] = b;
+	col[3] = a;
 }
 
 void UI_GetThemeColorBlend3ubv(int colorid1, int colorid2, float fac, unsigned char col[3])
@@ -1321,6 +1384,19 @@ void UI_GetThemeColorBlend3ubv(int colorid1, int colorid2, float fac, unsigned c
 	col[2] = floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
 }
 
+void UI_GetThemeColorBlend3f(int colorid1, int colorid2, float fac, float r_col[3])
+{
+	const unsigned char *cp1, *cp2;
+
+	cp1 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid1);
+	cp2 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid2);
+
+	CLAMP(fac, 0.0f, 1.0f);
+	r_col[0] = ((1.0f - fac) * cp1[0] + fac * cp2[0]) / 255.0f;
+	r_col[1] = ((1.0f - fac) * cp1[1] + fac * cp2[1]) / 255.0f;
+	r_col[2] = ((1.0f - fac) * cp1[2] + fac * cp2[2]) / 255.0f;
+}
+
 /* blend between to theme colors, and set it */
 void UI_ThemeColorBlend(int colorid1, int colorid2, float fac)
 {
@@ -1373,6 +1449,12 @@ void UI_ThemeColorBlendShadeAlpha(int colorid1, int colorid2, float fac, int off
 	glColor4ub(r, g, b, a);
 }
 
+void UI_FontThemeColor(int fontid, int colorid)
+{
+	unsigned char color[4];
+	UI_GetThemeColor4ubv(colorid, color);
+	BLF_color4ubv(fontid, color);
+}
 
 /* get individual values, not scaled */
 float UI_GetThemeValuef(int colorid)
@@ -1471,6 +1553,111 @@ void UI_GetThemeColorShade3ubv(int colorid, int offset, unsigned char col[3])
 	col[2] = b;
 }
 
+void UI_GetThemeColorBlendShade3ubv(int colorid1, int colorid2, float fac, int offset, unsigned char col[3])
+{
+	const unsigned char *cp1, *cp2;
+
+	cp1 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid1);
+	cp2 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid2);
+
+	CLAMP(fac, 0.0f, 1.0f);
+
+	float blend[3];
+	blend[0] = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]);
+	blend[1] = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]);
+	blend[2] = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
+
+	unit_float_to_uchar_clamp_v3(col, blend);
+}
+
+void UI_GetThemeColorShade4ubv(int colorid, int offset, unsigned char col[4])
+{
+	int r, g, b;
+	const unsigned char *cp;
+
+	cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
+	r = offset + (int) cp[0];
+	CLAMP(r, 0, 255);
+	g = offset + (int) cp[1];
+	CLAMP(g, 0, 255);
+	b = offset + (int) cp[2];
+	CLAMP(b, 0, 255);
+
+	col[0] = r;
+	col[1] = g;
+	col[2] = b;
+	col[3] = cp[3];
+}
+
+void UI_GetThemeColorShadeAlpha4fv(int colorid, int coloffset, int alphaoffset, float col[4])
+{
+	int r, g, b, a;
+	const unsigned char *cp;
+
+	cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
+
+	r = coloffset + (int) cp[0];
+	CLAMP(r, 0, 255);
+	g = coloffset + (int) cp[1];
+	CLAMP(g, 0, 255);
+	b = coloffset + (int) cp[2];
+	CLAMP(b, 0, 255);
+	a = alphaoffset + (int) cp[3];
+	CLAMP(b, 0, 255);
+
+	col[0] = ((float)r) / 255.0f;
+	col[1] = ((float)g) / 255.0f;
+	col[2] = ((float)b) / 255.0f;
+	col[3] = ((float)a) / 255.0f;
+}
+
+void UI_GetThemeColorBlendShade3fv(int colorid1, int colorid2, float fac, int offset, float col[3])
+{
+	int r, g, b;
+	const unsigned char *cp1, *cp2;
+
+	cp1 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid1);
+	cp2 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid2);
+
+	CLAMP(fac, 0.0f, 1.0f);
+
+	r = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]);
+	CLAMP(r, 0, 255);
+	g = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]);
+	CLAMP(g, 0, 255);
+	b = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
+	CLAMP(b, 0, 255);
+
+	col[0] = ((float)r) / 255.0f;
+	col[1] = ((float)g) / 255.0f;
+	col[2] = ((float)b) / 255.0f;
+}
+
+void UI_GetThemeColorBlendShade4fv(int colorid1, int colorid2, float fac, int offset, float col[4])
+{
+	int r, g, b, a;
+	const unsigned char *cp1, *cp2;
+
+	cp1 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid1);
+	cp2 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid2);
+
+	CLAMP(fac, 0.0f, 1.0f);
+
+	r = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]);
+	CLAMP(r, 0, 255);
+	g = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]);
+	CLAMP(g, 0, 255);
+	b = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
+	CLAMP(b, 0, 255);
+	a = offset + floorf((1.0f - fac) * cp1[3] + fac * cp2[3]);
+	CLAMP(a, 0, 255);
+
+	col[0] = ((float)r) / 255.0f;
+	col[1] = ((float)g) / 255.0f;
+	col[2] = ((float)b) / 255.0f;
+	col[3] = ((float)a) / 255.0f;
+}
+
 /* get the color, in char pointer */
 void UI_GetThemeColor3ubv(int colorid, unsigned char col[3])
 {
@@ -1659,11 +1846,9 @@ void init_userdef_do_versions(void)
 		U.savetime = 1;
 // XXX		error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please consider removing it.\n");
 	}
-	/* transform widget settings */
-	if (U.tw_hotspot == 0) {
-		U.tw_hotspot = 14;
-		U.tw_size = 25;          /* percentage of window size */
-		U.tw_handlesize = 16;    /* percentage of widget radius */
+	if (U.manipulator_size == 0) {
+		U.manipulator_size = 75;
+		U.manipulator_flag |= USER_MANIPULATOR_DRAW;
 	}
 	if (U.pad_rot_angle == 0.0f)
 		U.pad_rot_angle = 15.0f;
@@ -1944,13 +2129,6 @@ void init_userdef_do_versions(void)
 			if (btheme->tui.wcol_num.outline[3] == 0)
 				ui_widget_color_init(&btheme->tui);
 
-			/* Logic editor theme, check for alpha==0 is safe, then color was never set */
-			if (btheme->tlogic.syntaxn[3] == 0) {
-				/* re-uses syntax color storage */
-				btheme->tlogic = btheme->tv3d;
-				rgba_char_args_set(btheme->tlogic.back, 100, 100, 100, 255);
-			}
-
 			rgba_char_args_set_fl(btheme->tinfo.back, 0.45, 0.45, 0.45, 1.0);
 			rgba_char_args_set_fl(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
 		}
@@ -1986,8 +2164,6 @@ void init_userdef_do_versions(void)
 				strcpy(km->idname, "3D View Generic");
 			else if (STREQ(km->idname, "EditMesh"))
 				strcpy(km->idname, "Mesh");
-			else if (STREQ(km->idname, "TimeLine"))
-				strcpy(km->idname, "Timeline");
 			else if (STREQ(km->idname, "UVEdit"))
 				strcpy(km->idname, "UV Editor");
 			else if (STREQ(km->idname, "Animation_Channels"))
@@ -2014,10 +2190,6 @@ void init_userdef_do_versions(void)
 				strcpy(km->idname, "Property Editor");
 		}
 	}
-	if (!USER_VERSION_ATLEAST(250, 16)) {
-		if (U.wmdrawmethod == USER_DRAW_TRIPLE)
-			U.wmdrawmethod = USER_DRAW_AUTOMATIC;
-	}
 
 	if (!USER_VERSION_ATLEAST(252, 3)) {
 		if (U.flag & USER_LMOUSESELECT)
@@ -2321,9 +2493,6 @@ void init_userdef_do_versions(void)
 		if (U.memcachelimit <= 0) {
 			U.memcachelimit = 32;
 		}
-		if (U.frameserverport == 0) {
-			U.frameserverport = 8080;
-		}
 		if (U.dbl_click_time == 0) {
 			U.dbl_click_time = 350;
 		}
@@ -2497,9 +2666,6 @@ void init_userdef_do_versions(void)
 
 	if (!USER_VERSION_ATLEAST(269, 9)) {
 		bTheme *btheme;
-
-		U.tw_size = U.tw_size * 5.0f;
-
 		/* Action Editor (and NLA Editor) - Keyframe Colors */
 		/* Graph Editor - larger vertex size defaults */
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
@@ -2633,10 +2799,6 @@ void init_userdef_do_versions(void)
 			rgba_char_args_set(btheme->tnode.gp_vertex, 0, 0, 0, 255);
 			rgba_char_args_set(btheme->tnode.gp_vertex_select, 255, 133, 0, 255);
 			btheme->tnode.gp_vertex_size = 3;
-
-			/* Timeline Keyframe Indicators */
-			rgba_char_args_set(btheme->ttime.time_keyframe, 0xDD, 0xD7, 0x00, 0xFF);
-			rgba_char_args_set(btheme->ttime.time_gp_keyframe, 0xB5, 0xE6, 0x1D, 0xFF);
 		}
 	}
 
@@ -2766,13 +2928,113 @@ void init_userdef_do_versions(void)
 		U.transopts &= ~(
 		    USER_TR_DEPRECATED_2 | USER_TR_DEPRECATED_3 | USER_TR_DEPRECATED_4 |
 		    USER_TR_DEPRECATED_6 | USER_TR_DEPRECATED_7);
-		U.gameflags &= ~(
-		    USER_GL_RENDER_DEPRECATED_0 | USER_GL_RENDER_DEPRECATED_1 |
-		    USER_GL_RENDER_DEPRECATED_3 | USER_GL_RENDER_DEPRECATED_4);
 
 		U.uiflag |= USER_LOCK_CURSOR_ADJUST;
 	}
 
+	if (!USER_VERSION_ATLEAST(280, 9)) {
+		/* interface_widgets.c */
+		struct uiWidgetColors wcol_tab = {
+			{60, 60, 60, 255},
+			{83, 83, 83, 255},
+			{114, 114, 114, 255},
+			{90, 90, 90, 255},
+
+			{0, 0, 0, 255},
+			{0, 0, 0, 255},
+
+			0,
+			0, 0
+		};
+
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			char tmp[4];
+
+			btheme->tui.wcol_tab = wcol_tab;
+			btheme->ttopbar = btheme->tv3d;
+			/* swap colors */
+			copy_v4_v4_char(tmp, btheme->ttopbar.header);
+			copy_v4_v4_char(btheme->ttopbar.header, btheme->ttopbar.tab_inactive);
+			copy_v4_v4_char(btheme->ttopbar.back, tmp);
+		}
+	}
+
+	if (!USER_VERSION_ATLEAST(280, 9)) {
+		/* Timeline removal */
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			if (btheme->tipo.anim_active[3] == 0) {
+				rgba_char_args_set(btheme->tipo.anim_active,    204, 112, 26, 102);
+			}
+			if (btheme->tseq.anim_active[3] == 0) {
+				rgba_char_args_set(btheme->tseq.anim_active,    204, 112, 26, 102);
+			}
+		}
+	}
+
+	if (!USER_VERSION_ATLEAST(280, 10)) {
+		/* Roundness */
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			btheme->tui.wcol_regular.roundness = 0.25f;
+			btheme->tui.wcol_tool.roundness = 0.2f;
+			btheme->tui.wcol_text.roundness = 0.2f;
+			btheme->tui.wcol_radio.roundness = 0.2f;
+			btheme->tui.wcol_option.roundness = 0.333333f;
+			btheme->tui.wcol_toggle.roundness = 0.25f;
+			btheme->tui.wcol_num.roundness = 0.5f;
+			btheme->tui.wcol_numslider.roundness = 0.5f;
+			btheme->tui.wcol_tab.roundness = 0.25f;
+			btheme->tui.wcol_menu.roundness = 0.2f;
+			btheme->tui.wcol_pulldown.roundness = 0.2f;
+			btheme->tui.wcol_menu_back.roundness = 0.25f;
+			btheme->tui.wcol_menu_item.roundness = 0.25f;
+			btheme->tui.wcol_tooltip.roundness = 0.25f;
+			btheme->tui.wcol_box.roundness = 0.2f;
+			btheme->tui.wcol_scroll.roundness = 0.5f;
+			btheme->tui.wcol_progress.roundness = 0.25f;
+			btheme->tui.wcol_list_item.roundness = 0.2f;
+			btheme->tui.wcol_pie_menu.roundness = 0.5f;
+			rgba_char_args_set_fl(btheme->tui.editor_outline, 0.25f, 0.25f, 0.25f, 1.0f);
+		}
+	}
+
+	if (((bTheme *)U.themes.first)->tui.wcol_toolbar_item.text[3] == 0) {
+		struct uiWidgetColors wcol_toolbar_item = {
+			.outline = {0x0, 0x0, 0x0, 0xff},
+			.inner = {0x46, 0x46, 0x46, 0xff},
+			.inner_sel = {0xcc, 0xcc, 0xcc, 0xff},
+			.item = {0x0, 0x0, 0x0, 0xff},
+
+			.text = {0xff, 0xff, 0xff, 0xff},
+			.text_sel = {0x33, 0x33, 0x33, 0xff},
+
+			.shaded = 0,
+			.shadetop = 0,
+			.shadedown = 0,
+			.alpha_check = 0,
+			.roundness = 0.3f,
+		};
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			btheme->tui.wcol_toolbar_item = wcol_toolbar_item;
+			btheme->tui.icon_saturation = 1.0f;
+		}
+	}
+
+	if (!USER_VERSION_ATLEAST(280, 16)) {
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			btheme->tstatusbar = btheme->tv3d;
+		}
+	}
+
+	if (!USER_VERSION_ATLEAST(280, 17)) {
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			ThemeSpace *ts;
+
+			for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
+				rgba_char_args_set(ts->panelcolors.sub_back, 0, 0, 0, 25);
+			}
+		}
+	}
+
 	/**
 	 * Include next version bump.
 	 */
@@ -2780,17 +3042,20 @@ void init_userdef_do_versions(void)
 		/* (keep this block even if it becomes empty). */
 	}
 
+	if (((bTheme *)U.themes.first)->tui.manipulator_hi[3] == 0) {
+		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+			ui_theme_space_init_manipulator_colors(btheme);
+		}
+	}
+
 	if (U.pixelsize == 0.0f)
 		U.pixelsize = 1.0f;
 
 	if (U.image_draw_method == 0)
 		U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
 
-	// keep the following until the new audaspace is default to be built with
-#ifdef WITH_SYSTEM_AUDASPACE
 	// we default to the first audio device
 	U.audiodevice = 0;
-#endif
 
 	/* Not versioning, just avoid errors. */
 #ifndef WITH_CYCLES
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index eb7b8968bee..530a6e28860 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -49,11 +49,11 @@
 #include "BKE_screen.h"
 #include "BKE_global.h"
 
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "WM_api.h"
 
-#include "BIF_gl.h"
-
 #include "BLF_api.h"
 
 #include "ED_screen.h"
@@ -147,50 +147,51 @@ static void view2d_masks(View2D *v2d, bool check_scrollers)
 
 	scroll = view2d_scroll_mapped(v2d->scroll);
 
-	/* scrollers shrink mask area, but should be based off regionsize
+	/* scrollers are based off regionsize
 	 *	- they can only be on one to two edges of the region they define
 	 *	- if they overlap, they must not occupy the corners (which are reserved for other widgets)
 	 */
 	if (scroll) {
+		int scroll_width  = (v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) ?   V2D_SCROLL_WIDTH_TEXT  : v2d->size_vert;
+		int scroll_height = (v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) ? V2D_SCROLL_HEIGHT_TEXT : v2d->size_hor;
+
+		CLAMP_MIN(scroll_width, V2D_SCROLL_WIDTH_MIN);
+		CLAMP_MIN(scroll_height, V2D_SCROLL_HEIGHT_MIN);
+
 		/* vertical scroller */
 		if (scroll & V2D_SCROLL_LEFT) {
 			/* on left-hand edge of region */
 			v2d->vert = v2d->mask;
-			v2d->vert.xmax = V2D_SCROLL_WIDTH;
-			v2d->mask.xmin = v2d->vert.xmax + 1;
+			v2d->vert.xmax = scroll_width;
 		}
 		else if (scroll & V2D_SCROLL_RIGHT) {
 			/* on right-hand edge of region */
 			v2d->vert = v2d->mask;
 			v2d->vert.xmax++; /* one pixel extra... was leaving a minor gap... */
-			v2d->vert.xmin = v2d->vert.xmax - V2D_SCROLL_WIDTH;
-			v2d->mask.xmax = v2d->vert.xmin - 1;
+			v2d->vert.xmin = v2d->vert.xmax - scroll_width;
 		}
 
 		/* horizontal scroller */
 		if (scroll & (V2D_SCROLL_BOTTOM)) {
 			/* on bottom edge of region */
 			v2d->hor = v2d->mask;
-			v2d->hor.ymax = V2D_SCROLL_HEIGHT;
-			v2d->mask.ymin = v2d->hor.ymax + 1;
+			v2d->hor.ymax = scroll_height;
 		}
 		else if (scroll & V2D_SCROLL_TOP) {
 			/* on upper edge of region */
 			v2d->hor = v2d->mask;
-			v2d->hor.ymin = v2d->hor.ymax - V2D_SCROLL_HEIGHT;
-			v2d->mask.ymax = v2d->hor.ymin - 1;
+			v2d->hor.ymin = v2d->hor.ymax - scroll_height;
 		}
 
 		/* adjust vertical scroller if there's a horizontal scroller, to leave corner free */
 		if (scroll & V2D_SCROLL_VERTICAL) {
-			/* just set y min/max for vertical scroller to y min/max of mask as appropriate */
 			if (scroll & (V2D_SCROLL_BOTTOM)) {
 				/* on bottom edge of region */
-				v2d->vert.ymin = v2d->mask.ymin;
+				v2d->vert.ymin = v2d->hor.ymax;
 			}
 			else if (scroll & V2D_SCROLL_TOP) {
 				/* on upper edge of region */
-				v2d->vert.ymax = v2d->mask.ymax;
+				v2d->vert.ymax = v2d->hor.ymin;
 			}
 		}
 	}
@@ -357,6 +358,11 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 	/* set masks (always do), but leave scroller scheck to totrect_set */
 	view2d_masks(v2d, 0);
 
+	if (do_init) {
+		/* Visible by default. */
+		v2d->alpha_hor = v2d->alpha_vert = 255;
+	}
+
 	/* set 'tot' rect before setting cur? */
 	/* XXX confusing stuff here still - I made this function not check scroller hide - that happens in totrect_set */
 	if (tot_changed)
@@ -813,7 +819,7 @@ void UI_view2d_sync(bScreen *screen, ScrArea *area, View2D *v2dcur, int flag)
 					}
 
 					/* region possibly changed, so refresh */
-					ED_region_tag_redraw(ar);
+					ED_region_tag_redraw_no_rebuild(ar);
 				}
 			}
 		}
@@ -839,7 +845,7 @@ void UI_view2d_sync(bScreen *screen, ScrArea *area, View2D *v2dcur, int flag)
 						}
 
 						/* region possibly changed, so refresh */
-						ED_region_tag_redraw(ar);
+						ED_region_tag_redraw_no_rebuild(ar);
 					}
 				}
 			}
@@ -1107,9 +1113,6 @@ void UI_view2d_view_ortho(View2D *v2d)
 
 	/* set matrix on all appropriate axes */
 	wmOrtho2(curmasked.xmin, curmasked.xmax, curmasked.ymin, curmasked.ymax);
-
-	/* XXX is this necessary? */
-	glLoadIdentity();
 }
 
 /**
@@ -1137,9 +1140,6 @@ void UI_view2d_view_orthoSpecial(ARegion *ar, View2D *v2d, const bool xaxis)
 		wmOrtho2(curmasked.xmin - xofs, curmasked.xmax - xofs, -yofs, ar->winy - yofs);
 	else
 		wmOrtho2(-xofs, ar->winx - xofs, curmasked.ymin - yofs, curmasked.ymax - yofs);
-
-	/* XXX is this necessary? */
-	glLoadIdentity();
 }
 
 
@@ -1151,7 +1151,7 @@ void UI_view2d_view_restore(const bContext *C)
 	int height = BLI_rcti_size_y(&ar->winrct) + 1;
 
 	wmOrtho2(0.0f, (float)width, 0.0f, (float)height);
-	glLoadIdentity();
+	gpuLoadIdentity();
 
 	//	ED_region_pixelspace(CTX_wm_region(C));
 }
@@ -1305,12 +1305,45 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 {
 	float vec1[2], vec2[2];
 	int a, step;
+	int vertical_minor_step = (BLI_rcti_size_x(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC),
+		horizontal_major_step = (BLI_rcti_size_y(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC);
+	unsigned char grid_line_color[3];
 
 	/* check for grid first, as it may not exist */
 	if (grid == NULL)
 		return;
 
-	glBegin(GL_LINES);
+	/* Count the needed vertices for the gridlines */
+	unsigned vertex_count = 0;
+	if (flag & V2D_VERTICAL_LINES) {
+		/* vertical lines */
+		vertex_count += 2 * vertical_minor_step;		/* minor gridlines */
+		vertex_count += 2 * (vertical_minor_step + 2);	/* major gridlines */
+	}
+	if (flag & V2D_HORIZONTAL_LINES) {
+		/* horizontal lines */
+		vertex_count += 2 * (horizontal_major_step + 1);	/* major gridlines */
+
+		/* fine lines */
+		if (flag & V2D_HORIZONTAL_FINELINES)
+			vertex_count += 2 * (horizontal_major_step + 1);
+	}
+	/* axes */
+	if (flag & V2D_HORIZONTAL_AXIS)
+		vertex_count += 2;
+	if (flag & V2D_VERTICAL_AXIS)
+		vertex_count += 2;
+
+	/* If there is nothing to render, exit early */
+	if (vertex_count == 0)
+		return;
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+	immBegin(GWN_PRIM_LINES, vertex_count);
 
 	/* vertical lines */
 	if (flag & V2D_VERTICAL_LINES) {
@@ -1320,24 +1353,31 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 		vec2[1] = v2d->cur.ymax;
 
 		/* minor gridlines */
-		step = (BLI_rcti_size_x(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC);
-		UI_ThemeColor(TH_GRID);
+		step = vertical_minor_step;
+		if (step != 0) {
+			UI_GetThemeColor3ubv(TH_GRID, grid_line_color);
 
-		for (a = 0; a < step; a++) {
-			glVertex2fv(vec1);
-			glVertex2fv(vec2);
+			for (a = 0; a < step; a++) {
+				immSkipAttrib(color);
+				immVertex2fv(pos, vec1);
+				immAttrib3ubv(color, grid_line_color);
+				immVertex2fv(pos, vec2);
 
-			vec2[0] = vec1[0] += grid->dx;
+				vec2[0] = vec1[0] += grid->dx;
+			}
 		}
 
 		/* major gridlines */
 		vec2[0] = vec1[0] -= 0.5f * grid->dx;
-		UI_ThemeColorShade(TH_GRID, 16);
+
+		UI_GetThemeColorShade3ubv(TH_GRID, 16, grid_line_color);
 
 		step++;
 		for (a = 0; a <= step; a++) {
-			glVertex2fv(vec1);
-			glVertex2fv(vec2);
+			immSkipAttrib(color);
+			immVertex2fv(pos, vec1);
+			immAttrib3ubv(color, grid_line_color);
+			immVertex2fv(pos, vec2);
 
 			vec2[0] = vec1[0] -= grid->dx;
 		}
@@ -1350,12 +1390,15 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 		vec1[0] = grid->startx;
 		vec2[0] = v2d->cur.xmax;
 
-		step = (BLI_rcti_size_y(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC);
+		step = horizontal_major_step;
+
+		UI_GetThemeColor3ubv(TH_GRID, grid_line_color);
 
-		UI_ThemeColor(TH_GRID);
 		for (a = 0; a <= step; a++) {
-			glVertex2fv(vec1);
-			glVertex2fv(vec2);
+			immSkipAttrib(color);
+			immVertex2fv(pos, vec1);
+			immAttrib3ubv(color, grid_line_color);
+			immVertex2fv(pos, vec2);
 
 			vec2[1] = vec1[1] += grid->dy;
 		}
@@ -1365,10 +1408,12 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 		step++;
 
 		if (flag & V2D_HORIZONTAL_FINELINES) {
-			UI_ThemeColorShade(TH_GRID, 16);
+			UI_GetThemeColorShade3ubv(TH_GRID, 16, grid_line_color);
 			for (a = 0; a < step; a++) {
-				glVertex2fv(vec1);
-				glVertex2fv(vec2);
+				immSkipAttrib(color);
+				immVertex2fv(pos, vec1);
+				immAttrib3ubv(color, grid_line_color);
+				immVertex2fv(pos, vec2);
 
 				vec2[1] = vec1[1] -= grid->dy;
 			}
@@ -1376,7 +1421,7 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 	}
 
 	/* Axes are drawn as darker lines */
-	UI_ThemeColorShade(TH_GRID, -50);
+	UI_GetThemeColorShade3ubv(TH_GRID, -50, grid_line_color);
 
 	/* horizontal axis */
 	if (flag & V2D_HORIZONTAL_AXIS) {
@@ -1384,8 +1429,10 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 		vec2[0] = v2d->cur.xmax;
 		vec1[1] = vec2[1] = 0.0f;
 
-		glVertex2fv(vec1);
-		glVertex2fv(vec2);
+		immSkipAttrib(color);
+		immVertex2fv(pos, vec1);
+		immAttrib3ubv(color, grid_line_color);
+		immVertex2fv(pos, vec2);
 	}
 
 	/* vertical axis */
@@ -1394,91 +1441,157 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag)
 		vec2[1] = v2d->cur.ymax;
 		vec1[0] = vec2[0] = 0.0f;
 
-		glVertex2fv(vec1);
-		glVertex2fv(vec2);
+		immSkipAttrib(color);
+		immVertex2fv(pos, vec1);
+		immAttrib3ubv(color, grid_line_color);
+		immVertex2fv(pos, vec2);
 	}
 
-	glEnd();
+	immEnd();
+	immUnbindProgram();
 }
 
 /* Draw a constant grid in given 2d-region */
 void UI_view2d_constant_grid_draw(View2D *v2d, float step)
 {
-	float start;
+	float start_x, start_y;
+	int count_x, count_y;
 
-	UI_ThemeColorShade(TH_BACK, -10);
+	start_x = v2d->cur.xmin;
+	if (start_x < 0.0)
+		start_x += -(float)fmod(v2d->cur.xmin, step);
+	else
+		start_x += (step - (float)fmod(v2d->cur.xmin, step));
 
-	start = v2d->cur.xmin - (float)fmod(v2d->cur.xmin, step);
+	if (start_x > v2d->cur.xmax)
+		count_x = 0;
+	else
+		count_x = (v2d->cur.xmax - start_x) / step + 1;
 
-	glBegin(GL_LINES);
-	for (; start < v2d->cur.xmax; start += step) {
-		glVertex2f(start, v2d->cur.ymin);
-		glVertex2f(start, v2d->cur.ymax);
-	}
+	start_y = v2d->cur.ymin;
+	if (start_y < 0.0)
+		start_y += -(float)fmod(v2d->cur.ymin, step);
+	else
+		start_y += (step - (float)fabs(fmod(v2d->cur.ymin, step)));
 
-	start = v2d->cur.ymin - (float)fmod(v2d->cur.ymin, step);
-	for (; start < v2d->cur.ymax; start += step) {
-		glVertex2f(v2d->cur.xmin, start);
-		glVertex2f(v2d->cur.xmax, start);
-	}
+	if (start_y > v2d->cur.ymax)
+		count_y = 0;
+	else
+		count_y = (v2d->cur.ymax - start_y) / step + 1;
 
-	/* X and Y axis */
-	UI_ThemeColorShade(TH_BACK, -18);
-	glVertex2f(0.0f, v2d->cur.ymin);
-	glVertex2f(0.0f, v2d->cur.ymax);
-	glVertex2f(v2d->cur.xmin, 0.0f);
-	glVertex2f(v2d->cur.xmax, 0.0f);
+	if (count_x > 0 || count_y > 0) {
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+		float theme_color[3];
+
+		UI_GetThemeColorShade3fv(TH_BACK, -10, theme_color);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+		immBegin(GWN_PRIM_LINES, count_x * 2 + count_y * 2 + 4);
+
+		immAttrib3fv(color, theme_color);
+		for (int i = 0; i < count_x ; start_x += step, i++) {
+			immVertex2f(pos, start_x, v2d->cur.ymin);
+			immVertex2f(pos, start_x, v2d->cur.ymax);
+		}
+
+		for (int i = 0; i < count_y; start_y += step, i++) {
+			immVertex2f(pos, v2d->cur.xmin, start_y);
+			immVertex2f(pos, v2d->cur.xmax, start_y);
+		}
 
-	glEnd();
+		/* X and Y axis */
+		UI_GetThemeColorShade3fv(TH_BACK, -18, theme_color);
+
+		immAttrib3fv(color, theme_color);
+		immVertex2f(pos, 0.0f, v2d->cur.ymin);
+		immVertex2f(pos, 0.0f, v2d->cur.ymax);
+		immVertex2f(pos, v2d->cur.xmin, 0.0f);
+		immVertex2f(pos, v2d->cur.xmax, 0.0f);
+
+		immEnd();
+		immUnbindProgram();
+	}
 }
 
 /* Draw a multi-level grid in given 2d-region */
 void UI_view2d_multi_grid_draw(View2D *v2d, int colorid, float step, int level_size, int totlevels)
 {
+	/* Exit if there is nothing to draw */
+	if (totlevels == 0)
+		return;
+
 	int offset = -10;
 	float lstep = step;
-	int level;
+	unsigned char grid_line_color[3];
+
+	/* Make an estimate of at least how many vertices will be needed */
+	unsigned vertex_count = 4;
+	vertex_count += 2 * ((int)((v2d->cur.xmax - v2d->cur.xmin) / lstep) + 1);
+	vertex_count += 2 * ((int)((v2d->cur.ymax - v2d->cur.ymin) / lstep) + 1);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
 
 	glLineWidth(1.0f);
-	for (level = 0; level < totlevels; ++level) {
-		int i;
-		float start;
 
-		UI_ThemeColorShade(colorid, offset);
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+	immBeginAtMost(GWN_PRIM_LINES, vertex_count);
 
-		i = (v2d->cur.xmin >= 0.0f ? -(int)(-v2d->cur.xmin / lstep) : (int)(v2d->cur.xmin / lstep));
-		start = i * lstep;
+	for (int level = 0; level < totlevels; ++level) {
+		UI_GetThemeColorShade3ubv(colorid, offset, grid_line_color);
+
+		int i = (int)(v2d->cur.xmin / lstep);
+		if (v2d->cur.xmin > 0.0f)
+			i++;
+		float start = i * lstep;
 
-		glBegin(GL_LINES);
 		for (; start < v2d->cur.xmax; start += lstep, ++i) {
 			if (i == 0 || (level < totlevels - 1 && i % level_size == 0))
 				continue;
-			glVertex2f(start, v2d->cur.ymin);
-			glVertex2f(start, v2d->cur.ymax);
+
+			immSkipAttrib(color);
+			immVertex2f(pos, start, v2d->cur.ymin);
+			immAttrib3ubv(color, grid_line_color);
+			immVertex2f(pos, start, v2d->cur.ymax);
 		}
 
-		i = (v2d->cur.ymin >= 0.0f ? -(int)(-v2d->cur.ymin / lstep) : (int)(v2d->cur.ymin / lstep));
+		i = (int)(v2d->cur.ymin / lstep);
+		if (v2d->cur.ymin > 0.0f)
+			i++;
 		start = i * lstep;
 
 		for (; start < v2d->cur.ymax; start += lstep, ++i) {
 			if (i == 0 || (level < totlevels - 1 && i % level_size == 0))
 				continue;
-			glVertex2f(v2d->cur.xmin, start);
-			glVertex2f(v2d->cur.xmax, start);
-		}
-
-		/* X and Y axis */
-		UI_ThemeColorShade(colorid, offset - 8);
-		glVertex2f(0.0f, v2d->cur.ymin);
-		glVertex2f(0.0f, v2d->cur.ymax);
-		glVertex2f(v2d->cur.xmin, 0.0f);
-		glVertex2f(v2d->cur.xmax, 0.0f);
 
-		glEnd();
+			immSkipAttrib(color);
+			immVertex2f(pos, v2d->cur.xmin, start);
+			immAttrib3ubv(color, grid_line_color);
+			immVertex2f(pos, v2d->cur.xmax, start);
+		}
 
 		lstep *= level_size;
 		offset -= 6;
 	}
+
+	/* X and Y axis */
+	UI_GetThemeColorShade3ubv(colorid, -18 + ((totlevels - 1) * -6), grid_line_color);
+
+	immSkipAttrib(color);
+	immVertex2f(pos, 0.0f, v2d->cur.ymin);
+	immAttrib3ubv(color, grid_line_color);
+	immVertex2f(pos, 0.0f, v2d->cur.ymax);
+
+	immSkipAttrib(color);
+	immVertex2f(pos, v2d->cur.xmin, 0.0f);
+	immAttrib3ubv(color, grid_line_color);
+	immVertex2f(pos, v2d->cur.xmax, 0.0f);
+
+	immEnd();
+	immUnbindProgram();
 }
 
 /* the price we pay for not exposting structs :( */
@@ -1534,11 +1647,14 @@ View2DScrollers *UI_view2d_scrollers_calc(
 	/* scrollers is allocated here... */
 	scrollers = MEM_callocN(sizeof(View2DScrollers), "View2DScrollers");
 
+	/* Always update before drawing (for dynamically sized scrollers). */
+	view2d_masks(v2d, false);
+
 	vert = v2d->vert;
 	hor = v2d->hor;
 
 	/* slider rects need to be smaller than region */
-	smaller = (int)(0.2f * U.widget_unit);
+	smaller = (int)(0.1f * U.widget_unit);
 	hor.xmin += smaller;
 	hor.xmax -= smaller;
 	if (scroll & V2D_SCROLL_BOTTOM)
@@ -1697,9 +1813,15 @@ static void scroll_printstr(Scene *scene, float x, float y, float val, int power
 /* Draw scrollbars in the given 2d-region */
 void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *vs)
 {
+	bTheme *btheme = UI_GetTheme();
 	Scene *scene = CTX_data_scene(C);
 	rcti vert, hor;
-	int scroll = view2d_scroll_mapped(v2d->scroll);
+	const int scroll = view2d_scroll_mapped(v2d->scroll);
+	const char emboss_alpha = btheme->tui.widget_emboss[3];
+	unsigned char scrollers_back_color[4];
+
+	/* Color for scrollbar backs */
+	UI_GetThemeColor4ubv(TH_BACK, scrollers_back_color);
 
 	/* make copies of rects for less typing */
 	vert = vs->vert;
@@ -1707,11 +1829,10 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 
 	/* horizontal scrollbar */
 	if (scroll & V2D_SCROLL_HORIZONTAL) {
-		bTheme *btheme = UI_GetTheme();
 		uiWidgetColors wcol = btheme->tui.wcol_scroll;
+		const float alpha_fac = v2d->alpha_hor / 255.0f;
 		rcti slider;
 		int state;
-		unsigned char col[4];
 
 		slider.xmin = vs->hor_min;
 		slider.xmax = vs->hor_max;
@@ -1720,6 +1841,11 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 
 		state = (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE) ? UI_SCROLL_PRESSED : 0;
 
+		wcol.inner[3]   *= alpha_fac;
+		wcol.item[3]    *= alpha_fac;
+		wcol.outline[3] *= alpha_fac;
+		btheme->tui.widget_emboss[3] *= alpha_fac; /* will be reset later */
+
 		/* show zoom handles if:
 		 *	- zooming on x-axis is allowed (no scroll otherwise)
 		 *	- slider bubble is large enough (no overdraw confusion)
@@ -1734,17 +1860,11 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			state |= UI_SCROLL_ARROWS;
 		}
 
-		/* clean rect behind slider, but not with transparent background */
-		UI_GetThemeColor4ubv(TH_BACK, col);
-		if (col[3] == 255) {
-			glColor3ub(col[0], col[1], col[2]);
-			glRecti(v2d->hor.xmin, v2d->hor.ymin, v2d->hor.xmax, v2d->hor.ymax);
-		}
-
 		UI_draw_widget_scroll(&wcol, &hor, &slider, state);
 
 		/* scale indicators */
 		if ((scroll & V2D_SCROLL_SCALE_HORIZONTAL) && (vs->grid)) {
+			const int font_id = BLF_default();
 			View2DGrid *grid = vs->grid;
 			float fac, dfac, fac2, val;
 
@@ -1759,7 +1879,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			dfac = dfac * BLI_rcti_size_x(&hor);
 
 			/* set starting value, and text color */
-			UI_ThemeColor(TH_TEXT);
+			UI_FontThemeColor(font_id, TH_TEXT);
 			val = grid->startx;
 
 			/* if we're clamping to whole numbers only, make sure entries won't be repeated */
@@ -1776,6 +1896,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			if (dfac > 0.0f) {
 				float h = 0.1f * UI_UNIT_Y + (float)(hor.ymin);
 
+				BLF_batch_draw_begin();
+
 				for (; fac < hor.xmax - 0.5f * U.widget_unit; fac += dfac, val += grid->dx) {
 
 					/* make prints look nicer for scrollers */
@@ -1802,17 +1924,18 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 							break;
 					}
 				}
+
+				BLF_batch_draw_end();
 			}
 		}
 	}
 
 	/* vertical scrollbar */
 	if (scroll & V2D_SCROLL_VERTICAL) {
-		bTheme *btheme = UI_GetTheme();
 		uiWidgetColors wcol = btheme->tui.wcol_scroll;
 		rcti slider;
+		const float alpha_fac = v2d->alpha_vert / 255.0f;
 		int state;
-		unsigned char col[4];
 
 		slider.xmin = vert.xmin;
 		slider.xmax = vert.xmax;
@@ -1821,6 +1944,11 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 
 		state = (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE) ? UI_SCROLL_PRESSED : 0;
 
+		wcol.inner[3]   *= alpha_fac;
+		wcol.item[3]    *= alpha_fac;
+		wcol.outline[3] *= alpha_fac;
+		btheme->tui.widget_emboss[3] *= alpha_fac; /* will be reset later */
+
 		/* show zoom handles if:
 		 *	- zooming on y-axis is allowed (no scroll otherwise)
 		 *	- slider bubble is large enough (no overdraw confusion)
@@ -1835,13 +1963,6 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			state |= UI_SCROLL_ARROWS;
 		}
 
-		/* clean rect behind slider, but not with transparent background */
-		UI_GetThemeColor4ubv(TH_BACK, col);
-		if (col[3] == 255) {
-			glColor3ub(col[0], col[1], col[2]);
-			glRecti(v2d->vert.xmin, v2d->vert.ymin, v2d->vert.xmax, v2d->vert.ymax);
-		}
-
 		UI_draw_widget_scroll(&wcol, &vert, &slider, state);
 
 
@@ -1863,7 +1984,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			dfac = dfac     * BLI_rcti_size_y(&vert);
 
 			/* set starting value, and text color */
-			UI_ThemeColor(TH_TEXT);
+			const int font_id = BLF_default();
+			UI_FontThemeColor(font_id, TH_TEXT);
 			val = grid->starty;
 
 			/* if vertical clamping (to whole numbers) is used (i.e. in Sequencer), apply correction */
@@ -1872,9 +1994,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 
 			/* draw vertical steps */
 			if (dfac > 0.0f) {
-
-				BLF_rotation_default(M_PI_2);
-				BLF_enable_default(BLF_ROTATION);
+				BLF_rotation(font_id, M_PI_2);
+				BLF_enable(font_id, BLF_ROTATION);
 
 				for (; fac < vert.ymax - 10; fac += dfac, val += grid->dy) {
 
@@ -1885,11 +2006,13 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 					scroll_printstr(scene, (float)(vert.xmax) - 2.0f, fac, val, grid->powery, vs->yunits, 'v');
 				}
 
-				BLF_disable_default(BLF_ROTATION);
+				BLF_disable(font_id, BLF_ROTATION);
 			}
 		}
 	}
 
+	/* Was changed above, so reset. */
+	btheme->tui.widget_emboss[3] = emboss_alpha;
 }
 
 /* free temporary memory used for drawing scrollers */
@@ -2296,9 +2419,8 @@ void UI_view2d_offset(struct View2D *v2d, float xfac, float yfac)
  * - 'v' = in vertical scroller.
  * - 0 = not in scroller.
  */
-short UI_view2d_mouse_in_scrollers(const bContext *C, View2D *v2d, int x, int y)
+short UI_view2d_mouse_in_scrollers(const ARegion *ar, View2D *v2d, int x, int y)
 {
-	ARegion *ar = CTX_wm_region(C);
 	int co[2];
 	int scroll = view2d_scroll_mapped(v2d->scroll);
 
@@ -2407,7 +2529,8 @@ void UI_view2d_text_cache_draw(ARegion *ar)
 	int col_pack_prev = 0;
 
 	/* investigate using BLF_ascender() */
-	const float default_height = g_v2d_strings ? BLF_height_default("28", 3) : 0.0f;
+	const int font_id = BLF_default();
+	const float default_height = g_v2d_strings ? BLF_height(font_id, "28", 3) : 0.0f;
 
 	wmOrtho2_region_pixelspace(ar);
 
@@ -2418,7 +2541,7 @@ void UI_view2d_text_cache_draw(ARegion *ar)
 		if (yofs < 1) yofs = 1;
 
 		if (col_pack_prev != v2s->col.pack) {
-			glColor3ubv(v2s->col.ub);
+			BLF_color3ubv(font_id, v2s->col.ub);
 			col_pack_prev = v2s->col.pack;
 		}
 
@@ -2426,11 +2549,11 @@ void UI_view2d_text_cache_draw(ARegion *ar)
 			BLF_draw_default((float)(v2s->mval[0] + xofs), (float)(v2s->mval[1] + yofs), 0.0,
 			                  v2s->str, BLF_DRAW_STR_DUMMY_MAX);
 		else {
-			BLF_clipping_default(v2s->rect.xmin - 4, v2s->rect.ymin - 4, v2s->rect.xmax + 4, v2s->rect.ymax + 4);
-			BLF_enable_default(BLF_CLIPPING);
+			BLF_enable(font_id, BLF_CLIPPING);
+			BLF_clipping(font_id, v2s->rect.xmin - 4, v2s->rect.ymin - 4, v2s->rect.xmax + 4, v2s->rect.ymax + 4);
 			BLF_draw_default(v2s->rect.xmin + xofs, v2s->rect.ymin + yofs, 0.0f,
 			                 v2s->str, BLF_DRAW_STR_DUMMY_MAX);
-			BLF_disable_default(BLF_CLIPPING);
+			BLF_disable(font_id, BLF_CLIPPING);
 		}
 	}
 	g_v2d_strings = NULL;
@@ -2439,11 +2562,6 @@ void UI_view2d_text_cache_draw(ARegion *ar)
 		BLI_memarena_free(g_v2d_strings_arena);
 		g_v2d_strings_arena = NULL;
 	}
-
-	// glMatrixMode(GL_PROJECTION);
-	// glPopMatrix();
-	// glMatrixMode(GL_MODELVIEW);
-	// glPopMatrix();
 }
 
 
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 35558bd5af1..fbc8fe790c9 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -169,18 +169,13 @@ static void view_pan_apply_ex(bContext *C, v2dViewPanData *vpd, float dx, float
 	/* validate that view is in valid configuration after this operation */
 	UI_view2d_curRect_validate(v2d);
 
+	/* don't rebuild full tree in outliner, since we're just changing our view */
+	ED_region_tag_redraw_no_rebuild(vpd->ar);
+
 	/* request updates to be done... */
-	ED_region_tag_redraw(vpd->ar);
 	WM_event_add_mousemove(C);
 
 	UI_view2d_sync(vpd->sc, vpd->sa, v2d, V2D_LOCK_COPY);
-
-	/* exceptions */
-	if (vpd->sa->spacetype == SPACE_OUTLINER) {
-		/* don't rebuild full tree, since we're just changing our view */
-		SpaceOops *soops = vpd->sa->spacedata.first;
-		soops->storeflag |= SO_TREESTORE_REDRAW;
-	}
 }
 
 static void view_pan_apply(bContext *C, wmOperator *op)
@@ -641,6 +636,7 @@ static void view_zoomstep_apply_ex(
 	View2D *v2d = &ar->v2d;
 	const rctf cur_old = v2d->cur;
 	float dx, dy;
+	const int snap_test = ED_region_snap_size_test(ar);
 
 	/* calculate amount to move view by, ensuring symmetry so the
 	 * old zoom level is restored after zooming back the same amount
@@ -725,8 +721,14 @@ static void view_zoomstep_apply_ex(
 	/* validate that view is in valid configuration after this operation */
 	UI_view2d_curRect_validate(v2d);
 
+	if (ED_region_snap_size_apply(ar, snap_test)) {
+		ScrArea *sa = CTX_wm_area(C);
+		ED_area_tag_redraw(sa);
+		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+	}
+
 	/* request updates to be done... */
-	ED_region_tag_redraw(vzd->ar);
+	ED_region_tag_redraw_no_rebuild(vzd->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 }
 
@@ -898,6 +900,7 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
 	v2dViewZoomData *vzd = op->customdata;
 	View2D *v2d = vzd->v2d;
 	float dx, dy;
+	const int snap_test = ED_region_snap_size_test(vzd->ar);
 
 	/* get amount to move view by */
 	dx = RNA_float_get(op->ptr, "deltax");
@@ -962,8 +965,14 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
 	/* validate that view is in valid configuration after this operation */
 	UI_view2d_curRect_validate(v2d);
 
+	if (ED_region_snap_size_apply(vzd->ar, snap_test)) {
+		ScrArea *sa = CTX_wm_area(C);
+		ED_area_tag_redraw(sa);
+		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+	}
+
 	/* request updates to be done... */
-	ED_region_tag_redraw(vzd->ar);
+	ED_region_tag_redraw_no_rebuild(vzd->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 }
 
@@ -1478,7 +1487,7 @@ void UI_view2d_smooth_view(
 		v2d->cur = sms.new_cur;
 
 		UI_view2d_curRect_validate(v2d);
-		ED_region_tag_redraw(ar);
+		ED_region_tag_redraw_no_rebuild(ar);
 		UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 	}
 }
@@ -1522,7 +1531,7 @@ static int view2d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const w
 
 	UI_view2d_curRect_validate(v2d);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	ED_region_tag_redraw(ar);
+	ED_region_tag_redraw_no_rebuild(ar);
 
 	if (v2d->sms == NULL) {
 		UI_view2d_zoom_cache_reset();
@@ -1734,7 +1743,7 @@ static void scroller_activate_init(bContext *C, wmOperator *op, const wmEvent *e
 	}
 
 	UI_view2d_scrollers_free(scrollers);
-	ED_region_tag_redraw(ar);
+	ED_region_tag_redraw_no_rebuild(ar);
 }
 
 /* cleanup temp customdata  */
@@ -1748,7 +1757,7 @@ static void scroller_activate_exit(bContext *C, wmOperator *op)
 		MEM_freeN(op->customdata);
 		op->customdata = NULL;
 
-		ED_region_tag_redraw(CTX_wm_region(C));
+		ED_region_tag_redraw_no_rebuild(CTX_wm_region(C));
 	}
 }
 
@@ -1810,7 +1819,7 @@ static void scroller_activate_apply(bContext *C, wmOperator *op)
 	UI_view2d_curRect_validate(v2d);
 
 	/* request updates to be done... */
-	ED_region_tag_redraw(vsm->ar);
+	ED_region_tag_redraw_no_rebuild(vsm->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 }
 
@@ -1894,7 +1903,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, const wmEvent *
 	short in_scroller = 0;
 
 	/* check if mouse in scrollbars, if they're enabled */
-	in_scroller = UI_view2d_mouse_in_scrollers(C, v2d, event->x, event->y);
+	in_scroller = UI_view2d_mouse_in_scrollers(ar, v2d, event->x, event->y);
 
 	/* if in a scroller, init customdata then set modal handler which will catch mousedown to start doing useful stuff */
 	if (in_scroller) {
@@ -2000,6 +2009,7 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 	int winx, winy;
+	const int snap_test = ED_region_snap_size_test(ar);
 
 	/* zoom 1.0 */
 	winx = (float)(BLI_rcti_size_x(&v2d->mask) + 1);
@@ -2034,6 +2044,12 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 	/* validate that view is in valid configuration after this operation */
 	UI_view2d_curRect_validate(v2d);
 
+	if (ED_region_snap_size_apply(ar, snap_test)) {
+		ScrArea *sa = CTX_wm_area(C);
+		ED_area_tag_redraw(sa);
+		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+	}
+
 	/* request updates to be done... */
 	ED_region_tag_redraw(ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index b3bbce939a5..4d3f106a5d6 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../makesdna
 	../../makesrna
 	../../windowmanager
diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c
index 08181af2ef3..b584782e183 100644
--- a/source/blender/editors/io/io_alembic.c
+++ b/source/blender/editors/io/io_alembic.c
@@ -545,20 +545,10 @@ static int wm_alembic_import_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	/* Switch to object mode to avoid being stuck in other modes (T54326). */
-	if (CTX_data_mode_enum(C) != CTX_MODE_OBJECT) {
-		Object *obedit = CTX_data_edit_object(C);
-
-		if (obedit != NULL) {
-			ED_object_mode_toggle(C, obedit->mode);
-		}
-		else {
-			Object *ob = CTX_data_active_object(C);
-
-			if (ob) {
-				ED_object_mode_toggle(C, ob->mode);
-			}
-		}
+	/* Switch out of edit mode to avoid being stuck in it (T54326). */
+	Object *obedit = CTX_data_edit_object(C);
+	if (obedit) {
+		ED_object_mode_toggle(C, OB_MODE_EDIT);
 	}
 
 	bool ok = ABC_import(C, filename, scale, is_sequence, set_frame_range,
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index 83f5af0709d..bb0280875bd 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -28,7 +28,7 @@
  *  \ingroup collada
  */
 #ifdef WITH_COLLADA
-#include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 
 #include "BLT_translation.h"
 
@@ -36,12 +36,13 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_object.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 
@@ -93,7 +94,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	int sample_animations;
 	int sampling_rate;
 
-	int export_texture_type;
+	int include_material_textures;
 	int use_texture_copies;
 	int active_uv_only;
 
@@ -149,7 +150,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 
 	deform_bones_only        = RNA_boolean_get(op->ptr, "deform_bones_only");
 
-	export_texture_type      = RNA_enum_get(op->ptr, "export_texture_type_selection");
+	include_material_textures = RNA_boolean_get(op->ptr, "include_material_textures");
 	use_texture_copies       = RNA_boolean_get(op->ptr, "use_texture_copies");
 	active_uv_only           = RNA_boolean_get(op->ptr, "active_uv_only");
 
@@ -168,8 +169,8 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	/* get editmode results */
 	ED_object_editmode_load(bmain, CTX_data_edit_object(C));
 
-	EvaluationContext *eval_ctx = bmain->eval_ctx;
 	Scene *scene = CTX_data_scene(C);
+
 	ExportSettings export_settings;
 
 	export_settings.filepath = filepath;
@@ -185,7 +186,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	export_settings.sampling_rate = sampling_rate;
 
 	export_settings.active_uv_only = active_uv_only != 0;
-	export_settings.export_texture_type = export_texture_type;
+	export_settings.include_material_textures = include_material_textures != 0;
 	export_settings.use_texture_copies = use_texture_copies != 0;
 
 	export_settings.triangulate = triangulate != 0;
@@ -201,8 +202,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	if (export_settings.include_armatures) includeFilter |= OB_REL_MOD_ARMATURE;
 	if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
 
-
-	export_count = collada_export(eval_ctx,
+	export_count = collada_export(CTX_data_depsgraph(C),
 		scene,
 		&export_settings
 	);
@@ -275,7 +275,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
 	uiItemR(row, imfptr, "active_uv_only", 0, NULL, ICON_NONE);
 
 	row = uiLayoutRow(box, false);
-	uiItemR(row, imfptr, "export_texture_type_selection", 0, "", ICON_NONE);
+	uiItemR(row, imfptr, "include_material_textures", 0, NULL, ICON_NONE);
 
 	row = uiLayoutRow(box, false);
 	uiItemR(row, imfptr, "use_texture_copies", 1, NULL, ICON_NONE);
@@ -352,15 +352,9 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	};
 
 	static const EnumPropertyItem prop_bc_export_transformation_type[] = {
-		{ BC_TRANSFORMATION_TYPE_MATRIX, "matrix", 0, "Matrix", "Use <matrix> to specify transformations" },
-		{ BC_TRANSFORMATION_TYPE_TRANSROTLOC, "transrotloc", 0, "TransRotLoc", "Use <translate>, <rotate>, <scale> to specify transformations" },
-		{ 0, NULL, 0, NULL, NULL }
-	};
-
-	static const EnumPropertyItem prop_bc_export_texture_type[] = {
-		{ BC_TEXTURE_TYPE_MAT, "mat", 0, "Materials", "Export Materials" },
-		{ BC_TEXTURE_TYPE_UV, "uv", 0, "UV Textures", "Export UV Textures (Face textures) as materials" },
-		{ 0, NULL, 0, NULL, NULL }
+		{BC_TRANSFORMATION_TYPE_MATRIX, "matrix", 0, "Matrix", "Use <matrix> to specify transformations"},
+		{BC_TRANSFORMATION_TYPE_TRANSROTLOC, "transrotloc", 0, "TransRotLoc", "Use <translate>, <rotate>, <scale> to specify transformations"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	ot->name = "Export COLLADA";
@@ -414,9 +408,13 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	RNA_def_int(func, "sampling_rate", 1, 1, INT_MAX,
 		"Sampling Rate", "The distance between 2 keyframes. 1 means: Every frame is keyed", 1, INT_MAX);
 
+
 	RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map",
 	                "Export only the selected UV Map");
 
+	RNA_def_boolean(func, "include_material_textures", 0, "Include Material Textures",
+	                "Export textures assigned to the object Materials");
+
 	RNA_def_boolean(func, "use_texture_copies", 1, "Copy",
 	                "Copy textures to same folder where the .dae file is exported");
 
@@ -433,20 +431,11 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	RNA_def_boolean(func, "sort_by_name", 0, "Sort by Object name",
 	                "Sort exported data by Object name");
 
-
 	RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX,
-		"Transform", "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX);
+	            "Transform", "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX);
 
 	RNA_def_enum(func, "export_transformation_type_selection", prop_bc_export_transformation_type, 0,
-		"Transform", "Transformation type for translation, scale and rotation");
-
-
-	RNA_def_int(func, "export_texture_type", 0, INT_MIN, INT_MAX,
-		"Texture Type", "Type for exported Textures (UV or MAT)", INT_MIN, INT_MAX);
-
-	RNA_def_enum(func, "export_texture_type_selection", prop_bc_export_texture_type, 0,
-		"Texture Type", "Type for exported Textures (UV or MAT)");
-
+	             "Transform", "Transformation type for translation, scale and rotation");
 
 	RNA_def_boolean(func, "open_sim", 0, "Export to SL/OpenSim",
 	                "Compatibility mode for SL, OpenSim and other compatible online worlds");
@@ -499,6 +488,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
 	import_settings.keep_bind_info = keep_bind_info != 0;
 
 	if (collada_import(C, &import_settings)) {
+		DEG_id_tag_update(&CTX_data_scene(C)->id, DEG_TAG_BASE_FLAGS_UPDATE);
 		return OPERATOR_FINISHED;
 	}
 	else {
diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt
index 3bb954ddf46..2207e0fa736 100644
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -22,10 +22,12 @@ set(INC
 	../include
 	../../blenkernel
 	../../blenlib
+	../../depsgraph
 	../../makesdna
 	../../makesrna
 	../../render/extern/include
 	../../windowmanager
+	../../../../intern/clog
 	../../../../intern/guardedalloc
 )
 
diff --git a/source/blender/editors/lattice/editlattice_select.c b/source/blender/editors/lattice/editlattice_select.c
index d0d64b85195..2ba1dde243b 100644
--- a/source/blender/editors/lattice/editlattice_select.c
+++ b/source/blender/editors/lattice/editlattice_select.c
@@ -50,6 +50,7 @@
 #include "BKE_context.h"
 #include "BKE_lattice.h"
 #include "BKE_report.h"
+#include "BKE_layer.h"
 
 #include "ED_screen.h"
 #include "ED_lattice.h"
@@ -84,36 +85,43 @@ static void bpoint_select_set(BPoint *bp, bool select)
 
 static int lattice_select_random_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
-
 	const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f;
 	const int seed = WM_operator_properties_select_random_seed_increment_get(op);
 	const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
 
-	RNG *rng = BLI_rng_new_srandom(seed);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
 
-	int tot;
-	BPoint *bp;
+		RNG *rng = BLI_rng_new_srandom(seed);
 
-	tot = lt->pntsu * lt->pntsv * lt->pntsw;
-	bp = lt->def;
-	while (tot--) {
-		if (!bp->hide) {
-			if (BLI_rng_get_float(rng) < randfac) {
-				bpoint_select_set(bp, select);
+		int tot;
+		BPoint *bp;
+
+		tot = lt->pntsu * lt->pntsv * lt->pntsw;
+		bp = lt->def;
+		while (tot--) {
+			if (!bp->hide) {
+				if (BLI_rng_get_float(rng) < randfac) {
+					bpoint_select_set(bp, select);
+				}
 			}
+			bp++;
 		}
-		bp++;
-	}
 
-	if (select == false) {
-		lt->actbp = LT_ACTBP_NONE;
-	}
+		if (select == false) {
+			lt->actbp = LT_ACTBP_NONE;
+		}
 
-	BLI_rng_free(rng);
+		BLI_rng_free(rng);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -183,18 +191,27 @@ static void ed_lattice_select_mirrored(Lattice *lt, const int axis, const bool e
 
 static int lattice_select_mirror_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
 	const int axis_flag = RNA_enum_get(op->ptr, "axis");
 	const bool extend = RNA_boolean_get(op->ptr, "extend");
 
-	for (int axis = 0; axis < 3; axis++) {
-		if ((1 << axis) & axis_flag) {
-			ed_lattice_select_mirrored(lt, axis, extend);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
+
+		for (int axis = 0; axis < 3; axis++) {
+			if ((1 << axis) & axis_flag) {
+				ed_lattice_select_mirrored(lt, axis, extend);
+			}
 		}
-	}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		/* TODO, only notify changes */
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -349,51 +366,55 @@ void ED_lattice_flags_set(Object *obedit, int flag)
 
 static int lattice_select_all_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Lattice *lt = obedit->data;
-	BPoint *bp;
-	int a;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	int action = RNA_enum_get(op->ptr, "action");
 
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
 	if (action == SEL_TOGGLE) {
 		action = SEL_SELECT;
-
-		bp = lt->editlatt->latt->def;
-		a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
-
-		while (a--) {
-			if (bp->hide == 0) {
-				if (bp->f1 & SELECT) {
-					action = SEL_DESELECT;
-					break;
-				}
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *obedit = objects[ob_index];
+			Lattice *lt = obedit->data;
+			if (BKE_lattice_is_any_selected(lt->editlatt->latt)) {
+				action = SEL_DESELECT;
+				break;
 			}
-			bp++;
 		}
 	}
 
-	switch (action) {
-		case SEL_SELECT:
-			ED_lattice_flags_set(obedit, 1);
-			break;
-		case SEL_DESELECT:
-			ED_lattice_flags_set(obedit, 0);
-			break;
-		case SEL_INVERT:
-			bp = lt->editlatt->latt->def;
-			a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
-			lt->editlatt->latt->actbp = LT_ACTBP_NONE;
-
-			while (a--) {
-				if (bp->hide == 0) {
-					bp->f1 ^= SELECT;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Lattice *lt;
+		BPoint *bp;
+		int a;
+
+		switch (action) {
+			case SEL_SELECT:
+				ED_lattice_flags_set(obedit, 1);
+				break;
+			case SEL_DESELECT:
+				ED_lattice_flags_set(obedit, 0);
+				break;
+			case SEL_INVERT:
+				lt = obedit->data;
+				bp = lt->editlatt->latt->def;
+				a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
+				lt->editlatt->latt->actbp = LT_ACTBP_NONE;
+
+				while (a--) {
+					if (bp->hide == 0) {
+						bp->f1 ^= SELECT;
+					}
+					bp++;
 				}
-				bp++;
-			}
-			break;
+				break;
+		}
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	}
+	MEM_freeN(objects);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/lattice/editlattice_tools.c b/source/blender/editors/lattice/editlattice_tools.c
index c39ba44c1dc..bf60c1e7da6 100644
--- a/source/blender/editors/lattice/editlattice_tools.c
+++ b/source/blender/editors/lattice/editlattice_tools.c
@@ -39,9 +39,10 @@
 #include "RNA_define.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_lattice.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_screen.h"
 
 #include "WM_api.h"
@@ -80,7 +81,7 @@ static int make_regular_exec(bContext *C, wmOperator *UNUSED(op))
 		BKE_lattice_resize(lt, lt->pntsu, lt->pntsv, lt->pntsw, NULL);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -306,7 +307,7 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
 	}
 
 	/* updates */
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/lattice/editlattice_undo.c b/source/blender/editors/lattice/editlattice_undo.c
index 7a7372f5a6a..cbd89016b44 100644
--- a/source/blender/editors/lattice/editlattice_undo.c
+++ b/source/blender/editors/lattice/editlattice_undo.c
@@ -33,6 +33,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "CLG_log.h"
+
 #include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
 
@@ -42,11 +44,14 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
 #include "ED_lattice.h"
+#include "ED_undo.h"
 #include "ED_util.h"
 
 #include "WM_types.h"
@@ -54,6 +59,9 @@
 
 #include "lattice_intern.h"
 
+/** We only need this locally. */
+static CLG_LogRef LOG = {"ed.undo.lattice"};
+
 /* -------------------------------------------------------------------- */
 /** \name Undo Conversion
  * \{ */
@@ -123,13 +131,19 @@ static Object *editlatt_object_from_context(bContext *C)
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
+ *
+ * \note This is similar for all edit-mode types.
  * \{ */
 
-typedef struct LatticeUndoStep {
-	UndoStep step;
-	/* note: will split out into list for multi-object-editmode. */
+typedef struct LatticeUndoStep_Elem {
 	UndoRefID_Object obedit_ref;
 	UndoLattice data;
+} LatticeUndoStep_Elem;
+
+typedef struct LatticeUndoStep {
+	UndoStep step;
+	LatticeUndoStep_Elem *elems;
+	uint                  elems_len;
 } LatticeUndoStep;
 
 static bool lattice_undosys_poll(bContext *C)
@@ -140,10 +154,24 @@ static bool lattice_undosys_poll(bContext *C)
 static bool lattice_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	LatticeUndoStep *us = (LatticeUndoStep *)us_p;
-	us->obedit_ref.ptr = editlatt_object_from_context(C);
-	Lattice *lt = us->obedit_ref.ptr->data;
-	undolatt_from_editlatt(&us->data, lt->editlatt);
-	us->step.data_size = us->data.undo_size;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+	us->elems_len = objects_len;
+
+	for (uint i = 0; i < objects_len; i++) {
+		Object *ob = objects[i];
+		LatticeUndoStep_Elem *elem = &us->elems[i];
+
+		elem->obedit_ref.ptr = ob;
+		Lattice *lt = ob->data;
+		undolatt_from_editlatt(&elem->data, lt->editlatt);
+		us->step.data_size += elem->data.undo_size;
+	}
+	MEM_freeN(objects);
 	return true;
 }
 
@@ -154,25 +182,47 @@ static void lattice_undosys_step_decode(struct bContext *C, UndoStep *us_p, int
 	BLI_assert(lattice_undosys_poll(C));
 
 	LatticeUndoStep *us = (LatticeUndoStep *)us_p;
-	Object *obedit = us->obedit_ref.ptr;
-	Lattice *lt = obedit->data;
-	EditLatt *editlatt = lt->editlatt;
-	undolatt_to_editlatt(&us->data, editlatt);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		LatticeUndoStep_Elem *elem = &us->elems[i];
+		Object *obedit = elem->obedit_ref.ptr;
+		Lattice *lt = obedit->data;
+		if (lt->editlatt == NULL) {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid",
+			           us_p->name, obedit->id.name);
+			continue;
+		}
+		undolatt_to_editlatt(&elem->data, lt->editlatt);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	}
+
+	/* The first element is always active */
+	ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
 static void lattice_undosys_step_free(UndoStep *us_p)
 {
 	LatticeUndoStep *us = (LatticeUndoStep *)us_p;
-	undolatt_free_data(&us->data);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		LatticeUndoStep_Elem *elem = &us->elems[i];
+		undolatt_free_data(&elem->data);
+	}
+	MEM_freeN(us->elems);
 }
 
 static void lattice_undosys_foreach_ID_ref(
         UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
 {
 	LatticeUndoStep *us = (LatticeUndoStep *)us_p;
-	foreach_ID_ref_fn(user_data, ((UndoRefID *)&us->obedit_ref));
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		LatticeUndoStep_Elem *elem = &us->elems[i];
+		foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+	}
 }
 
 /* Export for ED_undo_sys. */
diff --git a/source/blender/editors/manipulator_library/CMakeLists.txt b/source/blender/editors/manipulator_library/CMakeLists.txt
new file mode 100644
index 00000000000..86e1bb3b6d7
--- /dev/null
+++ b/source/blender/editors/manipulator_library/CMakeLists.txt
@@ -0,0 +1,60 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+	../include
+	../../blenkernel
+	../../blenlib
+	../../blentranslation
+	../../bmesh
+	../../depsgraph
+	../../gpu
+	../../makesdna
+	../../makesrna
+	../../windowmanager
+	../../../../intern/guardedalloc
+	../../../../intern/eigen
+	../../../../intern/glew-mx
+)
+
+set(INC_SYS
+	${GLEW_INCLUDE_PATH}
+)
+
+set(SRC
+	manipulator_draw_utils.c
+	manipulator_geometry.h
+	manipulator_library_intern.h
+	manipulator_library_presets.c
+	manipulator_library_utils.c
+	geometry/geom_arrow_manipulator.c
+	geometry/geom_cube_manipulator.c
+	geometry/geom_dial_manipulator.c
+	manipulator_types/arrow2d_manipulator.c
+	manipulator_types/arrow3d_manipulator.c
+	manipulator_types/button2d_manipulator.c
+	manipulator_types/cage2d_manipulator.c
+	manipulator_types/cage3d_manipulator.c
+	manipulator_types/dial3d_manipulator.c
+	manipulator_types/grab3d_manipulator.c
+	manipulator_types/primitive3d_manipulator.c
+)
+
+add_definitions(${GL_DEFINITIONS})
+
+blender_add_lib(bf_editor_manipulator_library "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
new file mode 100644
index 00000000000..34f7d73589c
--- /dev/null
+++ b/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
@@ -0,0 +1,141 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file geom_arrow_manipulator.c
+ *  \ingroup wm
+ */
+
+#include "../manipulator_geometry.h"
+
+static float verts[][3] = {
+	{-0.000000, 0.012320, 0.000000},
+	{-0.000000, 0.012320, 0.974306},
+	{0.008711, 0.008711, 0.000000},
+	{0.008711, 0.008711, 0.974306},
+	{0.012320, -0.000000, 0.000000},
+	{0.012320, -0.000000, 0.974306},
+	{0.008711, -0.008711, 0.000000},
+	{0.008711, -0.008711, 0.974306},
+	{-0.000000, -0.012320, 0.000000},
+	{-0.000000, -0.012320, 0.974306},
+	{-0.008711, -0.008711, 0.000000},
+	{-0.008711, -0.008711, 0.974306},
+	{-0.012320, 0.000000, 0.000000},
+	{-0.012320, 0.000000, 0.974306},
+	{-0.008711, 0.008711, 0.000000},
+	{-0.008711, 0.008711, 0.974306},
+	{0.000000, 0.072555, 0.974306},
+	{0.051304, 0.051304, 0.974306},
+	{0.072555, -0.000000, 0.974306},
+	{0.051304, -0.051304, 0.974306},
+	{-0.000000, -0.072555, 0.974306},
+	{-0.051304, -0.051304, 0.974306},
+	{-0.072555, 0.000000, 0.974306},
+	{-0.051304, 0.051304, 0.974306},
+	{0.000000, -0.000000, 1.268098},
+};
+
+static float normals[][3] = {
+	{0.000000, 0.776360, -0.630238},
+	{0.000000, 0.594348, -0.804163},
+	{0.548967, 0.548967, -0.630238},
+	{0.420270, 0.420270, -0.804163},
+	{0.776360, 0.000000, -0.630238},
+	{0.594378, 0.000000, -0.804163},
+	{0.548967, -0.548967, -0.630238},
+	{0.420270, -0.420270, -0.804163},
+	{0.000000, -0.776360, -0.630238},
+	{0.000000, -0.594378, -0.804163},
+	{-0.548967, -0.548967, -0.630238},
+	{-0.420270, -0.420270, -0.804163},
+	{-0.776360, 0.000000, -0.630238},
+	{-0.594378, 0.000000, -0.804163},
+	{-0.548967, 0.548967, -0.630238},
+	{-0.420270, 0.420270, -0.804163},
+	{0.000000, 0.843226, -0.537492},
+	{0.596271, 0.596271, -0.537492},
+	{0.843226, 0.000000, -0.537492},
+	{0.596271, -0.596271, -0.537492},
+	{0.000000, -0.843226, -0.537492},
+	{-0.596271, -0.596271, -0.537492},
+	{-0.843226, 0.000000, -0.537492},
+	{-0.596271, 0.596271, -0.537492},
+	{0.000000, 0.000000, 1.000000},
+};
+
+static unsigned short indices[] = {
+	1, 3, 2,
+	3, 5, 4,
+	5, 7, 6,
+	7, 9, 8,
+	9, 11, 10,
+	11, 13, 12,
+	5, 18, 19,
+	15, 1, 0,
+	13, 15, 14,
+	6, 10, 14,
+	11, 21, 22,
+	7, 19, 20,
+	13, 22, 23,
+	3, 17, 18,
+	9, 20, 21,
+	15, 23, 16,
+	1, 16, 17,
+	23, 22, 24,
+	21, 20, 24,
+	19, 18, 24,
+	17, 16, 24,
+	16, 23, 24,
+	22, 21, 24,
+	20, 19, 24,
+	18, 17, 24,
+	0, 1, 2,
+	2, 3, 4,
+	4, 5, 6,
+	6, 7, 8,
+	8, 9, 10,
+	10, 11, 12,
+	7, 5, 19,
+	14, 15, 0,
+	12, 13, 14,
+	14, 0, 2,
+	2, 4, 6,
+	6, 8, 10,
+	10, 12, 14,
+	14, 2, 6,
+	13, 11, 22,
+	9, 7, 20,
+	15, 13, 23,
+	5, 3, 18,
+	11, 9, 21,
+	1, 15, 16,
+	3, 1, 17,
+};
+
+ManipulatorGeomInfo wm_manipulator_geom_data_arrow = {
+	.nverts  = 25,
+	.ntris   = 46,
+	.verts   = verts,
+	.normals = normals,
+	.indices = indices,
+};
diff --git a/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
new file mode 100644
index 00000000000..cee8e1e22ee
--- /dev/null
+++ b/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
@@ -0,0 +1,75 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file geom_cube_manipulator.c
+ *  \ingroup wm
+ */
+
+#include "../manipulator_geometry.h"
+
+static const float verts[][3] = {
+	{1.000000, 1.000000, -1.000000},
+	{1.000000, -1.000000, -1.000000},
+	{-1.000000, -1.000000, -1.000000},
+	{-1.000000, 1.000000, -1.000000},
+	{1.000000, 1.000000, 1.000000},
+	{0.999999, -1.000001, 1.000000},
+	{-1.000000, -1.000000, 1.000000},
+	{-1.000000, 1.000000, 1.000000},
+};
+
+static const float normals[][3] = {
+	{0.577349, 0.577349, -0.577349},
+	{0.577349, -0.577349, -0.577349},
+	{-0.577349, -0.577349, -0.577349},
+	{-0.577349, 0.577349, -0.577349},
+	{0.577349, 0.577349, 0.577349},
+	{0.577349, -0.577349, 0.577349},
+	{-0.577349, -0.577349, 0.577349},
+	{-0.577349, 0.577349, 0.577349},
+};
+
+static const unsigned short indices[] = {
+	1, 2, 3,
+	7, 6, 5,
+	4, 5, 1,
+	5, 6, 2,
+	2, 6, 7,
+	0, 3, 7,
+	0, 1, 3,
+	4, 7, 5,
+	0, 4, 1,
+	1, 5, 2,
+	3, 2, 7,
+	4, 0, 7,
+};
+
+ManipulatorGeomInfo wm_manipulator_geom_data_cube = {
+	.nverts  = 8,
+	.ntris   = 12,
+	.verts   = verts,
+	.normals = normals,
+	.indices = indices,
+};
diff --git a/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
new file mode 100644
index 00000000000..811fc872a81
--- /dev/null
+++ b/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
@@ -0,0 +1,813 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file geom_dial_manipulator.c
+ *  \ingroup wm
+ */
+
+#include "../manipulator_geometry.h"
+
+static const float verts[][3] = {
+	{1.034000, 0.000000, 0.000000},
+	{1.017000, 0.000000, 0.029445},
+	{0.983000, 0.000000, 0.029445},
+	{0.966000, 0.000000, 0.000000},
+	{0.983000, 0.000000, -0.029445},
+	{1.017000, 0.000000, -0.029445},
+	{1.014132, 0.201723, 0.000000},
+	{0.997459, 0.198407, 0.029445},
+	{0.964112, 0.191774, 0.029445},
+	{0.947439, 0.188457, 0.000000},
+	{0.964112, 0.191774, -0.029445},
+	{0.997459, 0.198407, -0.029445},
+	{0.955292, 0.395695, 0.000000},
+	{0.939586, 0.389189, 0.029445},
+	{0.908174, 0.376178, 0.029445},
+	{0.892468, 0.369672, 0.000000},
+	{0.908174, 0.376178, -0.029445},
+	{0.939586, 0.389189, -0.029445},
+	{0.859740, 0.574460, 0.000000},
+	{0.845605, 0.565015, 0.029445},
+	{0.817335, 0.546126, 0.029445},
+	{0.803200, 0.536681, 0.000000},
+	{0.817335, 0.546126, -0.029445},
+	{0.845605, 0.565015, -0.029445},
+	{0.731148, 0.731148, 0.000000},
+	{0.719128, 0.719128, 0.029445},
+	{0.695086, 0.695086, 0.029445},
+	{0.683065, 0.683065, 0.000000},
+	{0.695086, 0.695086, -0.029445},
+	{0.719128, 0.719128, -0.029445},
+	{0.574460, 0.859740, 0.000000},
+	{0.565015, 0.845605, 0.029445},
+	{0.546125, 0.817335, 0.029445},
+	{0.536681, 0.803200, 0.000000},
+	{0.546125, 0.817335, -0.029445},
+	{0.565015, 0.845605, -0.029445},
+	{0.395695, 0.955291, 0.000000},
+	{0.389189, 0.939585, 0.029445},
+	{0.376178, 0.908173, 0.029445},
+	{0.369672, 0.892467, 0.000000},
+	{0.376178, 0.908173, -0.029445},
+	{0.389189, 0.939585, -0.029445},
+	{0.201724, 1.014132, 0.000000},
+	{0.198407, 0.997459, 0.029445},
+	{0.191774, 0.964112, 0.029445},
+	{0.188457, 0.947439, 0.000000},
+	{0.191774, 0.964112, -0.029445},
+	{0.198407, 0.997459, -0.029445},
+	{0.000000, 1.034000, 0.000000},
+	{0.000000, 1.017000, 0.029445},
+	{0.000000, 0.983000, 0.029445},
+	{0.000000, 0.966000, 0.000000},
+	{0.000000, 0.983000, -0.029445},
+	{0.000000, 1.017000, -0.029445},
+	{-0.201723, 1.014132, 0.000000},
+	{-0.198407, 0.997459, 0.029445},
+	{-0.191774, 0.964112, 0.029445},
+	{-0.188457, 0.947439, 0.000000},
+	{-0.191774, 0.964112, -0.029445},
+	{-0.198407, 0.997459, -0.029445},
+	{-0.395695, 0.955291, 0.000000},
+	{-0.389189, 0.939585, 0.029445},
+	{-0.376178, 0.908174, 0.029445},
+	{-0.369672, 0.892468, 0.000000},
+	{-0.376178, 0.908174, -0.029445},
+	{-0.389189, 0.939585, -0.029445},
+	{-0.574459, 0.859740, 0.000000},
+	{-0.565015, 0.845605, 0.029445},
+	{-0.546125, 0.817335, 0.029445},
+	{-0.536681, 0.803200, 0.000000},
+	{-0.546125, 0.817335, -0.029445},
+	{-0.565015, 0.845605, -0.029445},
+	{-0.731149, 0.731148, 0.000000},
+	{-0.719128, 0.719127, 0.029445},
+	{-0.695086, 0.695086, 0.029445},
+	{-0.683065, 0.683065, 0.000000},
+	{-0.695086, 0.695086, -0.029445},
+	{-0.719128, 0.719127, -0.029445},
+	{-0.859740, 0.574460, 0.000000},
+	{-0.845604, 0.565015, 0.029445},
+	{-0.817335, 0.546126, 0.029445},
+	{-0.803200, 0.536681, 0.000000},
+	{-0.817335, 0.546126, -0.029445},
+	{-0.845604, 0.565015, -0.029445},
+	{-0.955291, 0.395695, 0.000000},
+	{-0.939585, 0.389189, 0.029445},
+	{-0.908173, 0.376178, 0.029445},
+	{-0.892468, 0.369672, 0.000000},
+	{-0.908173, 0.376178, -0.029445},
+	{-0.939585, 0.389189, -0.029445},
+	{-1.014132, 0.201723, 0.000000},
+	{-0.997459, 0.198407, 0.029445},
+	{-0.964112, 0.191774, 0.029445},
+	{-0.947439, 0.188457, 0.000000},
+	{-0.964112, 0.191774, -0.029445},
+	{-0.997459, 0.198407, -0.029445},
+	{-1.034000, 0.000000, 0.000000},
+	{-1.017000, 0.000000, 0.029445},
+	{-0.983000, 0.000000, 0.029445},
+	{-0.966000, 0.000000, 0.000000},
+	{-0.983000, 0.000000, -0.029445},
+	{-1.017000, 0.000000, -0.029445},
+	{-1.014132, -0.201723, 0.000000},
+	{-0.997459, -0.198407, 0.029445},
+	{-0.964112, -0.191774, 0.029445},
+	{-0.947439, -0.188457, 0.000000},
+	{-0.964112, -0.191774, -0.029445},
+	{-0.997459, -0.198407, -0.029445},
+	{-0.955292, -0.395694, 0.000000},
+	{-0.939586, -0.389189, 0.029445},
+	{-0.908174, -0.376177, 0.029445},
+	{-0.892468, -0.369672, 0.000000},
+	{-0.908174, -0.376177, -0.029445},
+	{-0.939586, -0.389189, -0.029445},
+	{-0.859740, -0.574460, 0.000000},
+	{-0.845604, -0.565015, 0.029445},
+	{-0.817335, -0.546126, 0.029445},
+	{-0.803200, -0.536681, 0.000000},
+	{-0.817335, -0.546126, -0.029445},
+	{-0.845604, -0.565015, -0.029445},
+	{-0.731149, -0.731148, 0.000000},
+	{-0.719128, -0.719127, 0.029445},
+	{-0.695086, -0.695086, 0.029445},
+	{-0.683065, -0.683065, 0.000000},
+	{-0.695086, -0.695086, -0.029445},
+	{-0.719128, -0.719127, -0.029445},
+	{-0.574460, -0.859739, 0.000000},
+	{-0.565015, -0.845604, 0.029445},
+	{-0.546126, -0.817334, 0.029445},
+	{-0.536681, -0.803199, 0.000000},
+	{-0.546126, -0.817334, -0.029445},
+	{-0.565015, -0.845604, -0.029445},
+	{-0.395695, -0.955291, 0.000000},
+	{-0.389189, -0.939585, 0.029445},
+	{-0.376178, -0.908174, 0.029445},
+	{-0.369672, -0.892468, 0.000000},
+	{-0.376178, -0.908174, -0.029445},
+	{-0.389189, -0.939585, -0.029445},
+	{-0.201724, -1.014132, 0.000000},
+	{-0.198407, -0.997459, 0.029445},
+	{-0.191774, -0.964112, 0.029445},
+	{-0.188458, -0.947438, 0.000000},
+	{-0.191774, -0.964112, -0.029445},
+	{-0.198407, -0.997459, -0.029445},
+	{0.000000, -1.034000, 0.000000},
+	{0.000000, -1.017000, 0.029445},
+	{0.000000, -0.983000, 0.029445},
+	{0.000000, -0.966000, 0.000000},
+	{0.000000, -0.983000, -0.029445},
+	{0.000000, -1.017000, -0.029445},
+	{0.201723, -1.014132, 0.000000},
+	{0.198407, -0.997459, 0.029445},
+	{0.191773, -0.964112, 0.029445},
+	{0.188457, -0.947439, 0.000000},
+	{0.191773, -0.964112, -0.029445},
+	{0.198407, -0.997459, -0.029445},
+	{0.395695, -0.955291, 0.000000},
+	{0.389189, -0.939585, 0.029445},
+	{0.376178, -0.908173, 0.029445},
+	{0.369672, -0.892467, 0.000000},
+	{0.376178, -0.908173, -0.029445},
+	{0.389189, -0.939585, -0.029445},
+	{0.574460, -0.859740, 0.000000},
+	{0.565015, -0.845605, 0.029445},
+	{0.546125, -0.817335, 0.029445},
+	{0.536681, -0.803200, 0.000000},
+	{0.546125, -0.817335, -0.029445},
+	{0.565015, -0.845605, -0.029445},
+	{0.731148, -0.731149, 0.000000},
+	{0.719127, -0.719128, 0.029445},
+	{0.695086, -0.695086, 0.029445},
+	{0.683065, -0.683066, 0.000000},
+	{0.695086, -0.695086, -0.029445},
+	{0.719127, -0.719128, -0.029445},
+	{0.859740, -0.574460, 0.000000},
+	{0.845605, -0.565015, 0.029445},
+	{0.817335, -0.546126, 0.029445},
+	{0.803200, -0.536681, 0.000000},
+	{0.817335, -0.546126, -0.029445},
+	{0.845605, -0.565015, -0.029445},
+	{0.955291, -0.395695, 0.000000},
+	{0.939585, -0.389189, 0.029445},
+	{0.908173, -0.376178, 0.029445},
+	{0.892467, -0.369673, 0.000000},
+	{0.908173, -0.376178, -0.029445},
+	{0.939585, -0.389189, -0.029445},
+	{1.014132, -0.201723, 0.000000},
+	{0.997459, -0.198407, 0.029445},
+	{0.964112, -0.191774, 0.029445},
+	{0.947439, -0.188457, 0.000000},
+	{0.964112, -0.191774, -0.029445},
+	{0.997459, -0.198407, -0.029445},
+};
+
+static const float normals[][3] = {
+	{1.000000, 0.000000, 0.000000},
+	{0.522691, 0.000000, 0.852504},
+	{-0.475845, 0.000000, 0.879513},
+	{-1.000000, 0.000000, 0.000000},
+	{-0.475845, 0.000000, -0.879513},
+	{0.522691, 0.000000, -0.852504},
+	{0.980773, 0.195074, 0.000000},
+	{0.512650, 0.101962, 0.852504},
+	{-0.466689, -0.092807, 0.879513},
+	{-0.980773, -0.195074, 0.000000},
+	{-0.466689, -0.092807, -0.879513},
+	{0.512650, 0.101962, -0.852504},
+	{0.923856, 0.382672, 0.000000},
+	{0.482894, 0.200018, 0.852504},
+	{-0.439619, -0.182073, 0.879513},
+	{-0.923856, -0.382672, 0.000000},
+	{-0.439619, -0.182073, -0.879513},
+	{0.482894, 0.200018, -0.852504},
+	{0.831446, 0.555559, 0.000000},
+	{0.434614, 0.290384, 0.852504},
+	{-0.395642, -0.264351, 0.879513},
+	{-0.831446, -0.555559, 0.000000},
+	{-0.395642, -0.264351, -0.879513},
+	{0.434614, 0.290384, -0.852504},
+	{0.707083, 0.707083, 0.000000},
+	{0.369610, 0.369610, 0.852504},
+	{-0.336467, -0.336467, 0.879513},
+	{-0.707083, -0.707083, 0.000000},
+	{-0.336467, -0.336467, -0.879513},
+	{0.369610, 0.369610, -0.852504},
+	{0.555559, 0.831446, 0.000000},
+	{0.290384, 0.434614, 0.852504},
+	{-0.264351, -0.395642, 0.879513},
+	{-0.555559, -0.831446, 0.000000},
+	{-0.264351, -0.395642, -0.879513},
+	{0.290384, 0.434614, -0.852504},
+	{0.382672, 0.923856, 0.000000},
+	{0.200018, 0.482894, 0.852504},
+	{-0.182073, -0.439619, 0.879513},
+	{-0.382672, -0.923856, 0.000000},
+	{-0.182073, -0.439619, -0.879513},
+	{0.200018, 0.482894, -0.852504},
+	{0.195074, 0.980773, 0.000000},
+	{0.101962, 0.512650, 0.852504},
+	{-0.092807, -0.466689, 0.879513},
+	{-0.195074, -0.980773, 0.000000},
+	{-0.092807, -0.466689, -0.879513},
+	{0.101962, 0.512650, -0.852504},
+	{0.000000, 1.000000, 0.000000},
+	{0.000000, 0.522691, 0.852504},
+	{0.000000, -0.475845, 0.879513},
+	{0.000000, -1.000000, 0.000000},
+	{0.000000, -0.475845, -0.879513},
+	{0.000000, 0.522691, -0.852504},
+	{-0.195074, 0.980773, 0.000000},
+	{-0.101962, 0.512650, 0.852504},
+	{0.092807, -0.466689, 0.879513},
+	{0.195074, -0.980773, 0.000000},
+	{0.092807, -0.466689, -0.879513},
+	{-0.101962, 0.512650, -0.852504},
+	{-0.382672, 0.923856, 0.000000},
+	{-0.200018, 0.482894, 0.852504},
+	{0.182073, -0.439619, 0.879513},
+	{0.382672, -0.923856, 0.000000},
+	{0.182073, -0.439619, -0.879513},
+	{-0.200018, 0.482894, -0.852504},
+	{-0.555559, 0.831446, 0.000000},
+	{-0.290384, 0.434614, 0.852504},
+	{0.264351, -0.395642, 0.879513},
+	{0.555559, -0.831446, 0.000000},
+	{0.264351, -0.395642, -0.879513},
+	{-0.290384, 0.434614, -0.852504},
+	{-0.707083, 0.707083, 0.000000},
+	{-0.369610, 0.369610, 0.852504},
+	{0.336467, -0.336467, 0.879513},
+	{0.707083, -0.707083, 0.000000},
+	{0.336467, -0.336467, -0.879513},
+	{-0.369610, 0.369610, -0.852504},
+	{-0.831446, 0.555559, 0.000000},
+	{-0.434614, 0.290384, 0.852504},
+	{0.395642, -0.264351, 0.879513},
+	{0.831446, -0.555559, 0.000000},
+	{0.395642, -0.264351, -0.879513},
+	{-0.434614, 0.290384, -0.852504},
+	{-0.923856, 0.382672, 0.000000},
+	{-0.482894, 0.200018, 0.852504},
+	{0.439619, -0.182073, 0.879513},
+	{0.923856, -0.382672, 0.000000},
+	{0.439619, -0.182073, -0.879513},
+	{-0.482894, 0.200018, -0.852504},
+	{-0.980773, 0.195074, 0.000000},
+	{-0.512650, 0.101962, 0.852504},
+	{0.466689, -0.092807, 0.879513},
+	{0.980773, -0.195074, 0.000000},
+	{0.466689, -0.092807, -0.879513},
+	{-0.512650, 0.101962, -0.852504},
+	{-1.000000, 0.000000, 0.000000},
+	{-0.522691, 0.000000, 0.852504},
+	{0.475845, 0.000000, 0.879513},
+	{1.000000, 0.000000, 0.000000},
+	{0.475845, 0.000000, -0.879513},
+	{-0.522691, 0.000000, -0.852504},
+	{-0.980773, -0.195074, 0.000000},
+	{-0.512650, -0.101962, 0.852504},
+	{0.466689, 0.092807, 0.879513},
+	{0.980773, 0.195074, 0.000000},
+	{0.466689, 0.092807, -0.879513},
+	{-0.512650, -0.101962, -0.852504},
+	{-0.923856, -0.382672, 0.000000},
+	{-0.482894, -0.200018, 0.852504},
+	{0.439619, 0.182073, 0.879513},
+	{0.923856, 0.382672, 0.000000},
+	{0.439619, 0.182073, -0.879513},
+	{-0.482894, -0.200018, -0.852504},
+	{-0.831446, -0.555559, 0.000000},
+	{-0.434614, -0.290384, 0.852504},
+	{0.395642, 0.264351, 0.879513},
+	{0.831446, 0.555559, 0.000000},
+	{0.395642, 0.264351, -0.879513},
+	{-0.434614, -0.290384, -0.852504},
+	{-0.707083, -0.707083, 0.000000},
+	{-0.369610, -0.369610, 0.852504},
+	{0.336467, 0.336467, 0.879513},
+	{0.707083, 0.707083, 0.000000},
+	{0.336467, 0.336467, -0.879513},
+	{-0.369610, -0.369610, -0.852504},
+	{-0.555559, -0.831446, 0.000000},
+	{-0.290384, -0.434614, 0.852504},
+	{0.264351, 0.395642, 0.879513},
+	{0.555559, 0.831446, 0.000000},
+	{0.264351, 0.395642, -0.879513},
+	{-0.290384, -0.434614, -0.852504},
+	{-0.382672, -0.923856, 0.000000},
+	{-0.200018, -0.482894, 0.852504},
+	{0.182073, 0.439619, 0.879513},
+	{0.382672, 0.923856, 0.000000},
+	{0.182073, 0.439619, -0.879513},
+	{-0.200018, -0.482894, -0.852504},
+	{-0.195074, -0.980773, 0.000000},
+	{-0.101962, -0.512650, 0.852504},
+	{0.092807, 0.466689, 0.879513},
+	{0.195074, 0.980773, 0.000000},
+	{0.092807, 0.466689, -0.879513},
+	{-0.101962, -0.512650, -0.852504},
+	{0.000000, -1.000000, 0.000000},
+	{0.000000, -0.522691, 0.852504},
+	{0.000000, 0.475845, 0.879513},
+	{0.000000, 1.000000, 0.000000},
+	{0.000000, 0.475845, -0.879513},
+	{0.000000, -0.522691, -0.852504},
+	{0.195074, -0.980773, 0.000000},
+	{0.101962, -0.512650, 0.852504},
+	{-0.092807, 0.466689, 0.879513},
+	{-0.195074, 0.980773, 0.000000},
+	{-0.092807, 0.466689, -0.879513},
+	{0.101962, -0.512650, -0.852504},
+	{0.382672, -0.923856, 0.000000},
+	{0.200018, -0.482894, 0.852504},
+	{-0.182073, 0.439619, 0.879513},
+	{-0.382672, 0.923856, 0.000000},
+	{-0.182073, 0.439619, -0.879513},
+	{0.200018, -0.482894, -0.852504},
+	{0.555559, -0.831446, 0.000000},
+	{0.290384, -0.434614, 0.852504},
+	{-0.264351, 0.395642, 0.879513},
+	{-0.555559, 0.831446, 0.000000},
+	{-0.264351, 0.395642, -0.879513},
+	{0.290384, -0.434614, -0.852504},
+	{0.707083, -0.707083, 0.000000},
+	{0.369610, -0.369610, 0.852504},
+	{-0.336467, 0.336467, 0.879513},
+	{-0.707083, 0.707083, 0.000000},
+	{-0.336467, 0.336467, -0.879513},
+	{0.369610, -0.369610, -0.852504},
+	{0.831446, -0.555559, 0.000000},
+	{0.434614, -0.290384, 0.852504},
+	{-0.395642, 0.264351, 0.879513},
+	{-0.831446, 0.555559, 0.000000},
+	{-0.395642, 0.264351, -0.879513},
+	{0.434614, -0.290384, -0.852504},
+	{0.923856, -0.382672, 0.000000},
+	{0.482894, -0.200018, 0.852504},
+	{-0.439619, 0.182073, 0.879513},
+	{-0.923856, 0.382672, 0.000000},
+	{-0.439619, 0.182073, -0.879513},
+	{0.482894, -0.200018, -0.852504},
+	{0.980773, -0.195074, 0.000000},
+	{0.512650, -0.101962, 0.852504},
+	{-0.466689, 0.092807, 0.879513},
+	{-0.980773, 0.195074, 0.000000},
+	{-0.466689, 0.092807, -0.879513},
+	{0.512650, -0.101962, -0.852504},
+};
+
+static const unsigned short indices[] = {
+	6, 7, 1,
+	7, 8, 2,
+	8, 9, 3,
+	9, 10, 4,
+	10, 11, 5,
+	5, 11, 6,
+	12, 13, 7,
+	13, 14, 8,
+	14, 15, 9,
+	15, 16, 10,
+	16, 17, 11,
+	11, 17, 12,
+	18, 19, 13,
+	13, 19, 20,
+	20, 21, 15,
+	15, 21, 22,
+	22, 23, 17,
+	17, 23, 18,
+	24, 25, 19,
+	19, 25, 26,
+	26, 27, 21,
+	21, 27, 28,
+	28, 29, 23,
+	23, 29, 24,
+	30, 31, 25,
+	25, 31, 32,
+	26, 32, 33,
+	27, 33, 34,
+	34, 35, 29,
+	29, 35, 30,
+	36, 37, 31,
+	31, 37, 38,
+	38, 39, 33,
+	39, 40, 34,
+	40, 41, 35,
+	35, 41, 36,
+	36, 42, 43,
+	43, 44, 38,
+	44, 45, 39,
+	45, 46, 40,
+	46, 47, 41,
+	47, 42, 36,
+	48, 49, 43,
+	49, 50, 44,
+	50, 51, 45,
+	51, 52, 46,
+	52, 53, 47,
+	47, 53, 48,
+	54, 55, 49,
+	49, 55, 56,
+	50, 56, 57,
+	57, 58, 52,
+	58, 59, 53,
+	53, 59, 54,
+	60, 61, 55,
+	55, 61, 62,
+	56, 62, 63,
+	63, 64, 58,
+	64, 65, 59,
+	59, 65, 60,
+	66, 67, 61,
+	61, 67, 68,
+	68, 69, 63,
+	69, 70, 64,
+	70, 71, 65,
+	71, 66, 60,
+	72, 73, 67,
+	73, 74, 68,
+	68, 74, 75,
+	75, 76, 70,
+	76, 77, 71,
+	71, 77, 72,
+	78, 79, 73,
+	79, 80, 74,
+	74, 80, 81,
+	81, 82, 76,
+	82, 83, 77,
+	83, 78, 72,
+	78, 84, 85,
+	85, 86, 80,
+	80, 86, 87,
+	87, 88, 82,
+	82, 88, 89,
+	89, 84, 78,
+	90, 91, 85,
+	91, 92, 86,
+	86, 92, 93,
+	93, 94, 88,
+	88, 94, 95,
+	95, 90, 84,
+	96, 97, 91,
+	97, 98, 92,
+	98, 99, 93,
+	99, 100, 94,
+	100, 101, 95,
+	101, 96, 90,
+	102, 103, 97,
+	103, 104, 98,
+	104, 105, 99,
+	99, 105, 106,
+	106, 107, 101,
+	101, 107, 102,
+	108, 109, 103,
+	103, 109, 110,
+	110, 111, 105,
+	105, 111, 112,
+	112, 113, 107,
+	107, 113, 108,
+	114, 115, 109,
+	115, 116, 110,
+	116, 117, 111,
+	111, 117, 118,
+	112, 118, 119,
+	113, 119, 114,
+	114, 120, 121,
+	121, 122, 116,
+	122, 123, 117,
+	117, 123, 124,
+	124, 125, 119,
+	125, 120, 114,
+	126, 127, 121,
+	121, 127, 128,
+	128, 129, 123,
+	123, 129, 130,
+	130, 131, 125,
+	125, 131, 126,
+	132, 133, 127,
+	133, 134, 128,
+	128, 134, 135,
+	135, 136, 130,
+	136, 137, 131,
+	131, 137, 132,
+	132, 138, 139,
+	133, 139, 140,
+	134, 140, 141,
+	141, 142, 136,
+	142, 143, 137,
+	143, 138, 132,
+	138, 144, 145,
+	139, 145, 146,
+	146, 147, 141,
+	141, 147, 148,
+	148, 149, 143,
+	149, 144, 138,
+	144, 150, 151,
+	151, 152, 146,
+	146, 152, 153,
+	153, 154, 148,
+	154, 155, 149,
+	155, 150, 144,
+	156, 157, 151,
+	151, 157, 158,
+	158, 159, 153,
+	159, 160, 154,
+	160, 161, 155,
+	155, 161, 156,
+	156, 162, 163,
+	163, 164, 158,
+	158, 164, 165,
+	165, 166, 160,
+	160, 166, 167,
+	167, 162, 156,
+	162, 168, 169,
+	169, 170, 164,
+	164, 170, 171,
+	165, 171, 172,
+	166, 172, 173,
+	173, 168, 162,
+	174, 175, 169,
+	175, 176, 170,
+	170, 176, 177,
+	177, 178, 172,
+	172, 178, 179,
+	173, 179, 174,
+	174, 180, 181,
+	181, 182, 176,
+	176, 182, 183,
+	183, 184, 178,
+	178, 184, 185,
+	179, 185, 180,
+	186, 187, 181,
+	187, 188, 182,
+	188, 189, 183,
+	183, 189, 190,
+	190, 191, 185,
+	191, 186, 180,
+	0, 1, 187,
+	1, 2, 188,
+	2, 3, 189,
+	3, 4, 190,
+	190, 4, 5,
+	191, 5, 0,
+	0, 6, 1,
+	1, 7, 2,
+	2, 8, 3,
+	3, 9, 4,
+	4, 10, 5,
+	0, 5, 6,
+	6, 12, 7,
+	7, 13, 8,
+	8, 14, 9,
+	9, 15, 10,
+	10, 16, 11,
+	6, 11, 12,
+	12, 18, 13,
+	14, 13, 20,
+	14, 20, 15,
+	16, 15, 22,
+	16, 22, 17,
+	12, 17, 18,
+	18, 24, 19,
+	20, 19, 26,
+	20, 26, 21,
+	22, 21, 28,
+	22, 28, 23,
+	18, 23, 24,
+	24, 30, 25,
+	26, 25, 32,
+	27, 26, 33,
+	28, 27, 34,
+	28, 34, 29,
+	24, 29, 30,
+	30, 36, 31,
+	32, 31, 38,
+	32, 38, 33,
+	33, 39, 34,
+	34, 40, 35,
+	30, 35, 36,
+	37, 36, 43,
+	37, 43, 38,
+	38, 44, 39,
+	39, 45, 40,
+	40, 46, 41,
+	41, 47, 36,
+	42, 48, 43,
+	43, 49, 44,
+	44, 50, 45,
+	45, 51, 46,
+	46, 52, 47,
+	42, 47, 48,
+	48, 54, 49,
+	50, 49, 56,
+	51, 50, 57,
+	51, 57, 52,
+	52, 58, 53,
+	48, 53, 54,
+	54, 60, 55,
+	56, 55, 62,
+	57, 56, 63,
+	57, 63, 58,
+	58, 64, 59,
+	54, 59, 60,
+	60, 66, 61,
+	62, 61, 68,
+	62, 68, 63,
+	63, 69, 64,
+	64, 70, 65,
+	65, 71, 60,
+	66, 72, 67,
+	67, 73, 68,
+	69, 68, 75,
+	69, 75, 70,
+	70, 76, 71,
+	66, 71, 72,
+	72, 78, 73,
+	73, 79, 74,
+	75, 74, 81,
+	75, 81, 76,
+	76, 82, 77,
+	77, 83, 72,
+	79, 78, 85,
+	79, 85, 80,
+	81, 80, 87,
+	81, 87, 82,
+	83, 82, 89,
+	83, 89, 78,
+	84, 90, 85,
+	85, 91, 86,
+	87, 86, 93,
+	87, 93, 88,
+	89, 88, 95,
+	89, 95, 84,
+	90, 96, 91,
+	91, 97, 92,
+	92, 98, 93,
+	93, 99, 94,
+	94, 100, 95,
+	95, 101, 90,
+	96, 102, 97,
+	97, 103, 98,
+	98, 104, 99,
+	100, 99, 106,
+	100, 106, 101,
+	96, 101, 102,
+	102, 108, 103,
+	104, 103, 110,
+	104, 110, 105,
+	106, 105, 112,
+	106, 112, 107,
+	102, 107, 108,
+	108, 114, 109,
+	109, 115, 110,
+	110, 116, 111,
+	112, 111, 118,
+	113, 112, 119,
+	108, 113, 114,
+	115, 114, 121,
+	115, 121, 116,
+	116, 122, 117,
+	118, 117, 124,
+	118, 124, 119,
+	119, 125, 114,
+	120, 126, 121,
+	122, 121, 128,
+	122, 128, 123,
+	124, 123, 130,
+	124, 130, 125,
+	120, 125, 126,
+	126, 132, 127,
+	127, 133, 128,
+	129, 128, 135,
+	129, 135, 130,
+	130, 136, 131,
+	126, 131, 132,
+	133, 132, 139,
+	134, 133, 140,
+	135, 134, 141,
+	135, 141, 136,
+	136, 142, 137,
+	137, 143, 132,
+	139, 138, 145,
+	140, 139, 146,
+	140, 146, 141,
+	142, 141, 148,
+	142, 148, 143,
+	143, 149, 138,
+	145, 144, 151,
+	145, 151, 146,
+	147, 146, 153,
+	147, 153, 148,
+	148, 154, 149,
+	149, 155, 144,
+	150, 156, 151,
+	152, 151, 158,
+	152, 158, 153,
+	153, 159, 154,
+	154, 160, 155,
+	150, 155, 156,
+	157, 156, 163,
+	157, 163, 158,
+	159, 158, 165,
+	159, 165, 160,
+	161, 160, 167,
+	161, 167, 156,
+	163, 162, 169,
+	163, 169, 164,
+	165, 164, 171,
+	166, 165, 172,
+	167, 166, 173,
+	167, 173, 162,
+	168, 174, 169,
+	169, 175, 170,
+	171, 170, 177,
+	171, 177, 172,
+	173, 172, 179,
+	168, 173, 174,
+	175, 174, 181,
+	175, 181, 176,
+	177, 176, 183,
+	177, 183, 178,
+	179, 178, 185,
+	174, 179, 180,
+	180, 186, 181,
+	181, 187, 182,
+	182, 188, 183,
+	184, 183, 190,
+	184, 190, 185,
+	185, 191, 180,
+	186, 0, 187,
+	187, 1, 188,
+	188, 2, 189,
+	189, 3, 190,
+	191, 190, 5,
+	186, 191, 0,
+};
+
+ManipulatorGeomInfo wm_manipulator_geom_data_dial = {
+	.nverts  = 192,
+	.ntris   = 384,
+	.verts   = verts,
+	.normals = normals,
+	.indices = indices,
+};
diff --git a/source/blender/editors/manipulator_library/manipulator_draw_utils.c b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
new file mode 100644
index 00000000000..430841311aa
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
@@ -0,0 +1,131 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file manipulator_draw_utils.c
+ *  \ingroup wm
+ */
+
+#include "BLI_listbase.h"
+#include "BLI_ghash.h"
+#include "BLI_math.h"
+#include "BLI_string.h"
+#include "BLI_string_utils.h"
+
+#include "BKE_context.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
+#include "GPU_batch.h"
+#include "GPU_glew.h"
+#include "GPU_immediate.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+/* only for own init/exit calls (wm_manipulatortype_init/wm_manipulatortype_free) */
+#include "wm.h"
+
+/* own includes */
+#include "manipulator_library_intern.h"
+
+/**
+ * Main draw call for ManipulatorGeomInfo data
+ */
+void wm_manipulator_geometryinfo_draw(const ManipulatorGeomInfo *info, const bool select, const float color[4])
+{
+	/* TODO store the Batches inside the ManipulatorGeomInfo and updated it when geom changes
+	 * So we don't need to re-created and discard it every time */
+
+	const bool use_lighting = true || (!select && ((U.manipulator_flag & USER_MANIPULATOR_SHADED) != 0));
+	Gwn_VertBuf *vbo;
+	Gwn_IndexBuf *el;
+	Gwn_Batch *batch;
+	Gwn_IndexBufBuilder elb = {0};
+
+	Gwn_VertFormat format = {0};
+	uint pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	uint nor_id;
+
+	if (use_lighting) {
+		nor_id = GWN_vertformat_attr_add(&format, "nor", GWN_COMP_I16, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
+	}
+
+	/* Elements */
+	GWN_indexbuf_init(&elb, GWN_PRIM_TRIS, info->ntris, info->nverts);
+	for (int i = 0; i < info->ntris; ++i) {
+		const unsigned short *idx = &info->indices[i * 3];
+		GWN_indexbuf_add_tri_verts(&elb, idx[0], idx[1], idx[2]);
+	}
+	el = GWN_indexbuf_build(&elb);
+
+	vbo = GWN_vertbuf_create_with_format(&format);
+	GWN_vertbuf_data_alloc(vbo, info->nverts);
+
+	GWN_vertbuf_attr_fill(vbo, pos_id, info->verts);
+
+	if (use_lighting) {
+		/* Normals are expected to be smooth. */
+		GWN_vertbuf_attr_fill(vbo, nor_id, info->normals);
+	}
+
+	batch = GWN_batch_create_ex(GWN_PRIM_TRIS, vbo, el, GWN_BATCH_OWNS_VBO | GWN_BATCH_OWNS_INDEX);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_UNIFORM_COLOR);
+
+	GWN_batch_uniform_4fv(batch, "color", color);
+
+	/* We may want to re-visit this, for now disable
+	 * since it causes issues leaving the GL state modified. */
+#if 0
+	glEnable(GL_CULL_FACE);
+	glEnable(GL_DEPTH_TEST);
+#endif
+
+	GWN_batch_draw(batch);
+
+#if 0
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_CULL_FACE);
+#endif
+
+
+	GWN_batch_discard(batch);
+}
+
+void wm_manipulator_vec_draw(
+        const float color[4], const float (*verts)[3], uint vert_count,
+        uint pos, uint primitive_type)
+{
+	immUniformColor4fv(color);
+	immBegin(primitive_type, vert_count);
+	for (int i = 0; i < vert_count; i++) {
+		immVertex3fv(pos, verts[i]);
+	}
+	immEnd();
+}
diff --git a/source/blender/editors/space_time/time_intern.h b/source/blender/editors/manipulator_library/manipulator_geometry.h
index 3d2bc18c334..2083f9d4d31 100644
--- a/source/blender/editors/space_time/time_intern.h
+++ b/source/blender/editors/manipulator_library/manipulator_geometry.h
@@ -15,29 +15,40 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
  * All rights reserved.
  *
- *
- * Contributor(s): Blender Foundation
- *
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_time/time_intern.h
- *  \ingroup sptime
+/** \file manipulator_geometry.h
+ *  \ingroup wm
+ *
+ * \name Manipulator Geometry
+ *
+ * \brief Prototypes for arrays defining the manipulator geometry. The actual definitions can be found in files usually
+ *        called geom_xxx_manipulator.c
  */
 
 
-#ifndef __TIME_INTERN_H__
-#define __TIME_INTERN_H__
+#ifndef __MANIPULATOR_GEOMETRY_H__
+#define __MANIPULATOR_GEOMETRY_H__
 
-/* internal exports only */
+typedef struct ManipulatorGeomInfo {
+	int nverts;
+	int ntris;
+	const float (*verts)[3];
+	const float (*normals)[3];
+	const unsigned short *indices;
+} ManipulatorGeomInfo;
 
+/* arrow manipulator */
+extern ManipulatorGeomInfo wm_manipulator_geom_data_arrow;
 
-/* time_ops.c */
-void time_operatortypes(void);
-void time_keymap(struct wmKeyConfig *keyconf);
+/* cube manipulator */
+extern ManipulatorGeomInfo wm_manipulator_geom_data_cube;
 
-#endif /* __TIME_INTERN_H__ */
+/* dial manipulator */
+extern ManipulatorGeomInfo wm_manipulator_geom_data_dial;
 
+#endif  /* __MANIPULATOR_GEOMETRY_H__ */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_intern.h b/source/blender/editors/manipulator_library/manipulator_library_intern.h
new file mode 100644
index 00000000000..01ca217fc0a
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_library_intern.h
@@ -0,0 +1,112 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file manipulator_library_intern.h
+ *  \ingroup wm
+ */
+
+#ifndef __MANIPULATOR_LIBRARY_INTERN_H__
+#define __MANIPULATOR_LIBRARY_INTERN_H__
+
+/* distance around which manipulators respond to input (and get highlighted) */
+#define MANIPULATOR_HOTSPOT 14.0f
+
+/**
+ * Data for common interactions. Used in manipulator_library_utils.c functions.
+ */
+typedef struct ManipulatorCommonData {
+	int flag;
+
+	float range_fac;      /* factor for arrow min/max distance */
+	float offset;
+
+	/* property range for constrained manipulators */
+	float range;
+	/* min/max value for constrained manipulators */
+	float min, max;
+} ManipulatorCommonData;
+
+typedef struct ManipulatorInteraction {
+	float init_value; /* initial property value */
+	float init_mval[2];
+	float init_offset;
+	float init_matrix_final[4][4];
+	float init_matrix_basis[4][4];
+
+	/* offset of last handling step */
+	float prev_offset;
+	/* Total offset added by precision tweaking.
+	 * Needed to allow toggling precision on/off without causing jumps */
+	float precision_offset;
+} ManipulatorInteraction;
+
+/* ManipulatorCommonData->flag  */
+enum {
+	MANIPULATOR_CUSTOM_RANGE_SET = (1 << 0),
+};
+
+
+float manipulator_offset_from_value(
+        ManipulatorCommonData *data, const float value,
+        const bool constrained, const bool inverted);
+float manipulator_value_from_offset(
+        ManipulatorCommonData *data, ManipulatorInteraction *inter, const float offset,
+        const bool constrained, const bool inverted, const bool use_precision);
+
+void manipulator_property_data_update(
+        struct wmManipulator *mpr, ManipulatorCommonData *data, wmManipulatorProperty *mpr_prop,
+        const bool constrained, const bool inverted);
+
+void  manipulator_property_value_reset(
+        bContext *C, const struct wmManipulator *mpr, ManipulatorInteraction *inter, wmManipulatorProperty *mpr_prop);
+
+
+/* -------------------------------------------------------------------- */
+
+void manipulator_color_get(
+        const struct wmManipulator *mpr, const bool highlight,
+        float r_color[4]);
+
+bool manipulator_window_project_2d(
+        bContext *C, const struct wmManipulator *mpr, const float mval[2], int axis, bool use_offset,
+        float r_co[2]);
+
+bool manipulator_window_project_3d(
+        bContext *C, const struct wmManipulator *mpr, const float mval[2], bool use_offset,
+        float r_co[3]);
+
+/* -------------------------------------------------------------------- */
+/* Manipulator drawing */
+
+#include "manipulator_geometry.h"
+
+void wm_manipulator_geometryinfo_draw(const struct ManipulatorGeomInfo *info, const bool select, const float color[4]);
+void wm_manipulator_vec_draw(
+        const float color[4], const float (*verts)[3], uint vert_count,
+        uint pos, uint primitive_type);
+
+
+#endif  /* __MANIPULATOR_LIBRARY_INTERN_H__ */
+
diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/manipulator_library/manipulator_library_presets.c
new file mode 100644
index 00000000000..cccf484f29d
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_library_presets.c
@@ -0,0 +1,151 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/manipulator_library/manipulator_library_presets.c
+ *  \ingroup wm
+ *
+ * \name Manipulator Lib Presets
+ *
+ * \brief Preset shapes that can be drawn from any manipulator type.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "DNA_view3d_types.h"
+#include "DNA_object_types.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+
+#include "DEG_depsgraph.h"
+
+#include "RNA_access.h"
+
+#include "WM_types.h"
+#include "WM_api.h"
+
+#include "ED_view3d.h"
+#include "ED_screen.h"
+
+/* own includes */
+#include "ED_manipulator_library.h"  /* own include */
+#include "manipulator_library_intern.h"  /* own include */
+
+/* TODO, this is to be used by RNA. might move to ED_manipulator_library */
+
+/**
+ * Given a single axis, orient the matrix to a different direction.
+ */
+static void single_axis_convert(
+        int src_axis, float src_mat[4][4],
+        int dst_axis, float dst_mat[4][4])
+{
+	copy_m4_m4(dst_mat, src_mat);
+	if (src_axis == dst_axis) {
+		return;
+	}
+
+	float rotmat[3][3];
+	mat3_from_axis_conversion_single(src_axis, dst_axis, rotmat);
+	transpose_m3(rotmat);
+	mul_m4_m4m3(dst_mat, src_mat, rotmat);
+}
+
+/**
+ * Use for all geometry.
+ */
+static void ed_manipulator_draw_preset_geometry(
+        const struct wmManipulator *mpr, float mat[4][4], int select_id,
+        const ManipulatorGeomInfo *info)
+{
+	const bool is_select = (select_id != -1);
+	const bool is_highlight = is_select && (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+
+	float color[4];
+	manipulator_color_get(mpr, is_highlight, color);
+
+	if (is_select) {
+		GPU_select_load_id(select_id);
+	}
+
+	gpuPushMatrix();
+	gpuMultMatrix(mat);
+	wm_manipulator_geometryinfo_draw(info, is_select, color);
+	gpuPopMatrix();
+
+	if (is_select) {
+		GPU_select_load_id(-1);
+	}
+}
+
+void ED_manipulator_draw_preset_box(
+        const struct wmManipulator *mpr, float mat[4][4], int select_id)
+{
+	ed_manipulator_draw_preset_geometry(mpr, mat, select_id, &wm_manipulator_geom_data_cube);
+}
+
+void ED_manipulator_draw_preset_arrow(
+        const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id)
+{
+	float mat_rotate[4][4];
+	single_axis_convert(OB_POSZ, mat, axis, mat_rotate);
+	ed_manipulator_draw_preset_geometry(mpr, mat_rotate, select_id, &wm_manipulator_geom_data_arrow);
+}
+
+void ED_manipulator_draw_preset_circle(
+        const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id)
+{
+	float mat_rotate[4][4];
+	single_axis_convert(OB_POSZ, mat, axis, mat_rotate);
+	ed_manipulator_draw_preset_geometry(mpr, mat_rotate, select_id, &wm_manipulator_geom_data_dial);
+}
+
+void ED_manipulator_draw_preset_facemap(
+        const bContext *C, const struct wmManipulator *mpr, struct Scene *scene, Object *ob,  const int facemap, int select_id)
+{
+	const bool is_select = (select_id != -1);
+	const bool is_highlight = is_select && (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+
+	float color[4];
+	manipulator_color_get(mpr, is_highlight, color);
+
+	if (is_select) {
+		GPU_select_load_id(select_id);
+	}
+
+	gpuPushMatrix();
+	gpuMultMatrix(ob->obmat);
+	ED_draw_object_facemap(CTX_data_depsgraph(C), scene, ob, color, facemap);
+	gpuPopMatrix();
+
+	if (is_select) {
+		GPU_select_load_id(-1);
+	}
+}
+
diff --git a/source/blender/editors/manipulator_library/manipulator_library_utils.c b/source/blender/editors/manipulator_library/manipulator_library_utils.c
new file mode 100644
index 00000000000..957f0abdd71
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_library_utils.c
@@ -0,0 +1,256 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2015 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file manipulator_library_utils.c
+ *  \ingroup wm
+ *
+ * \name Manipulator Library Utilities
+ *
+ * \brief This file contains functions for common behaviors of manipulators.
+ */
+
+#include "BLI_math.h"
+#include "BLI_listbase.h"
+
+#include "DNA_view3d_types.h"
+#include "DNA_screen_types.h"
+
+#include "BKE_context.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_view3d.h"
+
+/* own includes */
+#include "manipulator_library_intern.h"
+
+/* factor for precision tweaking */
+#define MANIPULATOR_PRECISION_FAC 0.05f
+
+
+BLI_INLINE float manipulator_offset_from_value_constr(
+        const float range_fac, const float min, const float range, const float value,
+        const bool inverted)
+{
+	return inverted ? (range_fac * (min + range - value) / range) : (range_fac * (value / range));
+}
+
+BLI_INLINE float manipulator_value_from_offset_constr(
+        const float range_fac, const float min, const float range, const float value,
+        const bool inverted)
+{
+	return inverted ? (min + range - (value * range / range_fac)) : (value * range / range_fac);
+}
+
+float manipulator_offset_from_value(
+        ManipulatorCommonData *data, const float value, const bool constrained, const bool inverted)
+{
+	if (constrained)
+		return manipulator_offset_from_value_constr(data->range_fac, data->min, data->range, value, inverted);
+
+	return value;
+}
+
+float manipulator_value_from_offset(
+        ManipulatorCommonData *data, ManipulatorInteraction *inter, const float offset,
+        const bool constrained, const bool inverted, const bool use_precision)
+{
+	const float max = data->min + data->range;
+
+	if (use_precision) {
+		/* add delta offset of this step to total precision_offset */
+		inter->precision_offset += offset - inter->prev_offset;
+	}
+	inter->prev_offset = offset;
+
+	float ofs_new = inter->init_offset + offset - inter->precision_offset * (1.0f - MANIPULATOR_PRECISION_FAC);
+	float value;
+
+	if (constrained) {
+		value = manipulator_value_from_offset_constr(data->range_fac, data->min, data->range, ofs_new, inverted);
+	}
+	else {
+		value = ofs_new;
+	}
+
+	/* clamp to custom range */
+	if (data->flag & MANIPULATOR_CUSTOM_RANGE_SET) {
+		CLAMP(value, data->min, max);
+	}
+
+	return value;
+}
+
+void manipulator_property_data_update(
+        wmManipulator *mpr, ManipulatorCommonData *data, wmManipulatorProperty *mpr_prop,
+        const bool constrained, const bool inverted)
+{
+	if (mpr_prop->custom_func.value_get_fn != NULL) {
+		/* pass  */
+	}
+	else if (mpr_prop->prop != NULL) {
+		/* pass  */
+	}
+	else {
+		data->offset = 0.0f;
+		return;
+	}
+
+	float value = WM_manipulator_target_property_value_get(mpr, mpr_prop);
+
+	if (constrained) {
+		if ((data->flag & MANIPULATOR_CUSTOM_RANGE_SET) == 0) {
+			float range[2];
+			if (WM_manipulator_target_property_range_get(mpr, mpr_prop, range)) {
+				data->range = range[1] - range[0];
+				data->min = range[0];
+			}
+			else {
+				BLI_assert(0);
+			}
+		}
+		data->offset = manipulator_offset_from_value_constr(data->range_fac, data->min, data->range, value, inverted);
+	}
+	else {
+		data->offset = value;
+	}
+}
+
+void manipulator_property_value_reset(
+        bContext *C, const wmManipulator *mpr, ManipulatorInteraction *inter,
+        wmManipulatorProperty *mpr_prop)
+{
+	WM_manipulator_target_property_value_set(C, mpr, mpr_prop, inter->init_value);
+}
+
+/* -------------------------------------------------------------------- */
+
+void manipulator_color_get(
+        const wmManipulator *mpr, const bool highlight,
+        float r_col[4])
+{
+	if (highlight && !(mpr->flag & WM_MANIPULATOR_DRAW_HOVER)) {
+		copy_v4_v4(r_col, mpr->color_hi);
+	}
+	else {
+		copy_v4_v4(r_col, mpr->color);
+	}
+}
+
+/* -------------------------------------------------------------------- */
+
+/**
+ * Takes mouse coordinates and returns them in relation to the manipulator.
+ * Both 2D & 3D supported, use so we can use 2D manipulators in the 3D view.
+ */
+bool manipulator_window_project_2d(
+        bContext *C, const struct wmManipulator *mpr, const float mval[2], int axis, bool use_offset,
+        float r_co[2])
+{
+	float mat[4][4];
+	{
+		float mat_identity[4][4];
+		struct WM_ManipulatorMatrixParams params = {NULL};
+		if (use_offset == false) {
+			unit_m4(mat_identity);
+			params.matrix_offset = mat_identity;
+		}
+		WM_manipulator_calc_matrix_final_params(mpr, &params, mat);
+	}
+
+	/* rotate mouse in relation to the center and relocate it */
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		/* For 3d views, transform 2D mouse pos onto plane. */
+		View3D *v3d = CTX_wm_view3d(C);
+		ARegion *ar = CTX_wm_region(C);
+
+		float plane[4];
+
+		plane_from_point_normal_v3(plane, mat[3], mat[2]);
+
+		float ray_origin[3], ray_direction[3];
+
+		if (ED_view3d_win_to_ray(CTX_data_depsgraph(C), ar, v3d, mval, ray_origin, ray_direction, false)) {
+			float lambda;
+			if (isect_ray_plane_v3(ray_origin, ray_direction, plane, &lambda, true)) {
+				float co[3];
+				madd_v3_v3v3fl(co, ray_origin, ray_direction, lambda);
+				float imat[4][4];
+				invert_m4_m4(imat, mat);
+				mul_m4_v3(imat, co);
+				r_co[0] = co[(axis + 1) % 3];
+				r_co[1] = co[(axis + 2) % 3];
+				return true;
+			}
+		}
+		return false;
+	}
+	else {
+		float co[3] = {mval[0], mval[1], 0.0f};
+		float imat[4][4];
+		invert_m4_m4(imat, mat);
+		mul_mat3_m4_v3(imat, co);
+		copy_v2_v2(r_co, co);
+		return true;
+	}
+}
+
+bool manipulator_window_project_3d(
+        bContext *C, const struct wmManipulator *mpr, const float mval[2], bool use_offset,
+        float r_co[3])
+{
+	float mat[4][4];
+	{
+		float mat_identity[4][4];
+		struct WM_ManipulatorMatrixParams params = {NULL};
+		if (use_offset == false) {
+			unit_m4(mat_identity);
+			params.matrix_offset = mat_identity;
+		}
+		WM_manipulator_calc_matrix_final_params(mpr, &params, mat);
+	}
+
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		View3D *v3d = CTX_wm_view3d(C);
+		ARegion *ar = CTX_wm_region(C);
+		/* Note: we might want a custom reference point passed in,
+		 * instead of the manipulator center. */
+		ED_view3d_win_to_3d(v3d, ar, mat[3], mval, r_co);
+		invert_m4(mat);
+		mul_m4_v3(mat, r_co);
+		return true;
+	}
+	else {
+		float co[3] = {mval[0], mval[1], 0.0f};
+		float imat[4][4];
+		invert_m4_m4(imat, mat);
+		mul_m4_v3(imat, co);
+		copy_v2_v2(r_co, co);
+		return true;
+	}
+}
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
new file mode 100644
index 00000000000..749e92e25fb
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
@@ -0,0 +1,224 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file arrow2d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name 2D Arrow Manipulator
+ *
+ * \brief Simple arrow manipulator which is dragged into a certain direction.
+ */
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_rect.h"
+
+#include "DNA_windowmanager_types.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "WM_api.h"
+
+#include "../manipulator_library_intern.h"
+
+static void arrow2d_draw_geom(wmManipulator *mpr, const float matrix[4][4], const float color[4])
+{
+	const float size = 0.11f;
+	const float size_breadth = size / 2.0f;
+	const float size_length = size * 1.7f;
+	/* Subtract the length so the arrow fits in the hotspot. */
+	const float arrow_length = RNA_float_get(mpr->ptr, "length") - size_length;
+	const float arrow_angle = RNA_float_get(mpr->ptr, "angle");
+
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix);
+	gpuRotate2D(RAD2DEGF(arrow_angle));
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4fv(color);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2f(pos, 0.0f, 0.0f);
+	immVertex2f(pos, 0.0f, arrow_length);
+	immEnd();
+
+	immBegin(GWN_PRIM_TRIS, 3);
+	immVertex2f(pos, size_breadth, arrow_length);
+	immVertex2f(pos, -size_breadth, arrow_length);
+	immVertex2f(pos, 0.0f, arrow_length + size_length);
+	immEnd();
+
+	immUnbindProgram();
+
+	gpuPopMatrix();
+}
+
+static void manipulator_arrow2d_draw(const bContext *UNUSED(C), wmManipulator *mpr)
+{
+	float color[4];
+
+	float matrix_final[4][4];
+
+	manipulator_color_get(mpr, mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT, color);
+
+	glLineWidth(mpr->line_width);
+
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	glEnable(GL_BLEND);
+	arrow2d_draw_geom(mpr, matrix_final, color);
+	glDisable(GL_BLEND);
+
+	if (mpr->interaction_data) {
+		ManipulatorInteraction *inter = mpr->interaction_data;
+
+		glEnable(GL_BLEND);
+		arrow2d_draw_geom(mpr, inter->init_matrix_final, (const float[4]){0.5f, 0.5f, 0.5f, 0.5f});
+		glDisable(GL_BLEND);
+	}
+}
+
+static void manipulator_arrow2d_setup(wmManipulator *mpr)
+{
+	mpr->flag |= WM_MANIPULATOR_DRAW_MODAL;
+}
+
+static int manipulator_arrow2d_invoke(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *UNUSED(event))
+{
+	ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
+
+	copy_m4_m4(inter->init_matrix_basis, mpr->matrix_basis);
+	WM_manipulator_calc_matrix_final(mpr, inter->init_matrix_final);
+
+	mpr->interaction_data = inter;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int manipulator_arrow2d_test_select(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	const float mval[2] = {event->mval[0], event->mval[1]};
+	const float arrow_length = RNA_float_get(mpr->ptr, "length");
+	const float arrow_angle = RNA_float_get(mpr->ptr, "angle");
+	const float line_len = arrow_length * mpr->scale_final;
+	float mval_local[2];
+
+	copy_v2_v2(mval_local, mval);
+	sub_v2_v2(mval_local, mpr->matrix_basis[3]);
+
+	float line[2][2];
+	line[0][0] = line[0][1] = line[1][0] = 0.0f;
+	line[1][1] = line_len;
+
+	/* rotate only if needed */
+	if (arrow_angle != 0.0f) {
+		float rot_point[2];
+		copy_v2_v2(rot_point, line[1]);
+		rotate_v2_v2fl(line[1], rot_point, arrow_angle);
+	}
+
+	/* arrow line intersection check */
+	float isect_1[2], isect_2[2];
+	const int isect = isect_line_sphere_v2(
+	        line[0], line[1], mval_local, MANIPULATOR_HOTSPOT + mpr->line_width * 0.5f,
+	        isect_1, isect_2);
+
+	if (isect > 0) {
+		float line_ext[2][2]; /* extended line for segment check including hotspot */
+		copy_v2_v2(line_ext[0], line[0]);
+		line_ext[1][0] = line[1][0] + MANIPULATOR_HOTSPOT * ((line[1][0] - line[0][0]) / line_len);
+		line_ext[1][1] = line[1][1] + MANIPULATOR_HOTSPOT * ((line[1][1] - line[0][1]) / line_len);
+
+		const float lambda_1 = line_point_factor_v2(isect_1, line_ext[0], line_ext[1]);
+		if (isect == 1) {
+			if (IN_RANGE_INCL(lambda_1, 0.0f, 1.0f)) {
+				return 0;
+			}
+		}
+		else {
+			BLI_assert(isect == 2);
+			const float lambda_2 = line_point_factor_v2(isect_2, line_ext[0], line_ext[1]);
+			if (IN_RANGE_INCL(lambda_1, 0.0f, 1.0f) && IN_RANGE_INCL(lambda_2, 0.0f, 1.0f)) {
+				return 0;
+			}
+		}
+	}
+
+	return -1;
+}
+
+/* -------------------------------------------------------------------- */
+/** \name 2D Arrow Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_arrow_2d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_arrow_2d";
+
+	/* api callbacks */
+	wt->draw = manipulator_arrow2d_draw;
+	wt->setup = manipulator_arrow2d_setup;
+	wt->invoke = manipulator_arrow2d_invoke;
+	wt->test_select = manipulator_arrow2d_test_select;
+
+	wt->struct_size = sizeof(wmManipulator);
+
+	/* rna */
+	RNA_def_float(wt->srna, "length", 1.0f, 0.0f, FLT_MAX, "Arrow Line Length", "", 0.0f, FLT_MAX);
+	RNA_def_float_rotation(
+	        wt->srna, "angle", 0, NULL, DEG2RADF(-360.0f), DEG2RADF(360.0f),
+	        "Roll", "", DEG2RADF(-360.0f), DEG2RADF(360.0f));
+}
+
+void ED_manipulatortypes_arrow_2d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_arrow_2d);
+}
+
+/** \} */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
new file mode 100644
index 00000000000..409a2c3ca83
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
@@ -0,0 +1,478 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file arrow3d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Arrow Manipulator
+ *
+ * 3D Manipulator
+ *
+ * \brief Simple arrow manipulator which is dragged into a certain direction.
+ * The arrow head can have varying shapes, e.g. cone, box, etc.
+ *
+ * - `matrix[0]` is derived from Y and Z.
+ * - `matrix[1]` is 'up' for manipulator types that have an up.
+ * - `matrix[2]` is the arrow direction (for all arrowes).
+ */
+
+#include "BIF_gl.h"
+
+#include "BLI_math.h"
+
+#include "DNA_view3d_types.h"
+
+#include "BKE_context.h"
+
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_types.h"
+#include "WM_api.h"
+
+#include "ED_view3d.h"
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_geometry.h"
+#include "../manipulator_library_intern.h"
+
+/* to use custom arrows exported to geom_arrow_manipulator.c */
+//#define USE_MANIPULATOR_CUSTOM_ARROWS
+
+typedef struct ArrowManipulator3D {
+	wmManipulator manipulator;
+	ManipulatorCommonData data;
+} ArrowManipulator3D;
+
+
+/* -------------------------------------------------------------------- */
+
+static void manipulator_arrow_matrix_basis_get(const wmManipulator *mpr, float r_matrix[4][4])
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+
+	copy_m4_m4(r_matrix, arrow->manipulator.matrix_basis);
+	madd_v3_v3fl(r_matrix[3], arrow->manipulator.matrix_basis[2], arrow->data.offset);
+}
+
+static void arrow_draw_geom(const ArrowManipulator3D *arrow, const bool select, const float color[4])
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	bool unbind_shader = true;
+	const int draw_style = RNA_enum_get(arrow->manipulator.ptr, "draw_style");
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
+	if (draw_style == ED_MANIPULATOR_ARROW_STYLE_CROSS) {
+		immUniformColor4fv(color);
+
+		immBegin(GWN_PRIM_LINES, 4);
+		immVertex3f(pos, -1.0f,  0.0f, 0.0f);
+		immVertex3f(pos,  1.0f,  0.0f, 0.0f);
+		immVertex3f(pos,  0.0f, -1.0f, 0.0f);
+		immVertex3f(pos,  0.0f,  1.0f, 0.0f);
+		immEnd();
+	}
+	else if (draw_style == ED_MANIPULATOR_ARROW_STYLE_CONE) {
+		float aspect[2];
+		RNA_float_get_array(arrow->manipulator.ptr, "aspect", aspect);
+		const float unitx = aspect[0];
+		const float unity = aspect[1];
+		const float vec[4][3] = {
+			{-unitx, -unity, 0},
+			{ unitx, -unity, 0},
+			{ unitx,  unity, 0},
+			{-unitx,  unity, 0},
+		};
+
+		glLineWidth(arrow->manipulator.line_width);
+		wm_manipulator_vec_draw(color, vec, ARRAY_SIZE(vec), pos, GWN_PRIM_LINE_LOOP);
+	}
+	else {
+#ifdef USE_MANIPULATOR_CUSTOM_ARROWS
+		wm_manipulator_geometryinfo_draw(&wm_manipulator_geom_data_arrow, select, color);
+#else
+		const float arrow_length = RNA_float_get(arrow->manipulator.ptr, "length");
+
+		const float vec[2][3] = {
+			{0.0f, 0.0f, 0.0f},
+			{0.0f, 0.0f, arrow_length},
+		};
+
+		glLineWidth(arrow->manipulator.line_width);
+		wm_manipulator_vec_draw(color, vec, ARRAY_SIZE(vec), pos, GWN_PRIM_LINE_STRIP);
+
+
+		/* *** draw arrow head *** */
+
+		gpuPushMatrix();
+
+		if (draw_style == ED_MANIPULATOR_ARROW_STYLE_BOX) {
+			const float size = 0.05f;
+
+			/* translate to line end with some extra offset so box starts exactly where line ends */
+			gpuTranslate3f(0.0f, 0.0f, arrow_length + size);
+			/* scale down to box size */
+			gpuScale3f(size, size, size);
+
+			/* draw cube */
+			immUnbindProgram();
+			unbind_shader = false;
+			wm_manipulator_geometryinfo_draw(&wm_manipulator_geom_data_cube, select, color);
+		}
+		else {
+			BLI_assert(draw_style == ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+
+			const float len = 0.25f;
+			const float width = 0.06f;
+			const bool use_lighting = (!select && ((U.manipulator_flag & USER_MANIPULATOR_SHADED) != 0));
+
+			/* translate to line end */
+			gpuTranslate3f(0.0f, 0.0f, arrow_length);
+
+			if (use_lighting) {
+				immUnbindProgram();
+				immBindBuiltinProgram(GPU_SHADER_3D_SMOOTH_COLOR);
+			}
+
+			imm_draw_circle_fill_3d(pos, 0.0, 0.0, width, 8);
+			imm_draw_cylinder_fill_3d(pos, width, 0.0, len, 8, 1);
+		}
+
+		gpuPopMatrix();
+#endif  /* USE_MANIPULATOR_CUSTOM_ARROWS */
+	}
+
+	if (unbind_shader) {
+		immUnbindProgram();
+	}
+}
+
+static void arrow_draw_intern(ArrowManipulator3D *arrow, const bool select, const bool highlight)
+{
+	wmManipulator *mpr = &arrow->manipulator;
+	float color[4];
+	float matrix_final[4][4];
+
+	manipulator_color_get(mpr, highlight, color);
+
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+	glEnable(GL_BLEND);
+	arrow_draw_geom(arrow, select, color);
+	glDisable(GL_BLEND);
+
+	gpuPopMatrix();
+
+	if (mpr->interaction_data) {
+		ManipulatorInteraction *inter = mpr->interaction_data;
+
+		gpuPushMatrix();
+		gpuMultMatrix(inter->init_matrix_final);
+
+
+		glEnable(GL_BLEND);
+		arrow_draw_geom(arrow, select, (const float[4]){0.5f, 0.5f, 0.5f, 0.5f});
+		glDisable(GL_BLEND);
+
+		gpuPopMatrix();
+	}
+}
+
+static void manipulator_arrow_draw_select(
+        const bContext *UNUSED(C), wmManipulator *mpr,
+        int select_id)
+{
+	GPU_select_load_id(select_id);
+	arrow_draw_intern((ArrowManipulator3D *)mpr, true, false);
+}
+
+static void manipulator_arrow_draw(const bContext *UNUSED(C), wmManipulator *mpr)
+{
+	arrow_draw_intern((ArrowManipulator3D *)mpr, false, (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0);
+}
+
+/**
+ * Calculate arrow offset independent from prop min value,
+ * meaning the range will not be offset by min value first.
+ */
+static int manipulator_arrow_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak tweak_flag)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+	ManipulatorInteraction *inter = mpr->interaction_data;
+	View3D *v3d = CTX_wm_view3d(C);
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+
+	float offset[3];
+	float facdir = 1.0f;
+
+	/* (src, dst) */
+	struct {
+		float mval[2];
+		float ray_origin[3], ray_direction[3];
+		float location[3];
+	} proj[2] = {
+		{.mval = {UNPACK2(inter->init_mval)}},
+		{.mval = {UNPACK2(event->mval)}},
+	};
+
+	float arrow_co[3];
+	float arrow_no[3];
+	copy_v3_v3(arrow_co, inter->init_matrix_basis[3]);
+	normalize_v3_v3(arrow_no, arrow->manipulator.matrix_basis[2]);
+
+	int ok = 0;
+
+	for (int j = 0; j < 2; j++) {
+		if (ED_view3d_win_to_ray(
+		            CTX_data_depsgraph(C),
+		            ar, v3d, proj[j].mval,
+		            proj[j].ray_origin, proj[j].ray_direction, false))
+		{
+			/* Force Y axis if we're view aligned */
+			if (j == 0) {
+				if (RAD2DEGF(acosf(dot_v3v3(proj[j].ray_direction, arrow->manipulator.matrix_basis[2]))) < 5.0f) {
+					normalize_v3_v3(arrow_no, rv3d->viewinv[1]);
+				}
+			}
+
+			float arrow_no_proj[3];
+			project_plane_v3_v3v3(arrow_no_proj, arrow_no, proj[j].ray_direction);
+
+			normalize_v3(arrow_no_proj);
+
+			float plane[4];
+			plane_from_point_normal_v3(plane, proj[j].ray_origin, arrow_no_proj);
+
+			float lambda;
+			if (isect_ray_plane_v3(arrow_co, arrow_no, plane, &lambda, false)) {
+				madd_v3_v3v3fl(proj[j].location, arrow_co, arrow_no, lambda);
+				ok++;
+			}
+		}
+	}
+
+	if (ok != 2) {
+		return OPERATOR_RUNNING_MODAL;
+	}
+
+	sub_v3_v3v3(offset, proj[1].location, proj[0].location);
+	facdir = dot_v3v3(arrow_no, offset) < 0.0f ? -1 : 1;
+
+	ManipulatorCommonData *data = &arrow->data;
+	const float ofs_new = facdir * len_v3(offset);
+
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+
+	/* set the property for the operator and call its modal function */
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		const int draw_options = RNA_enum_get(arrow->manipulator.ptr, "draw_options");
+		const bool constrained = (draw_options & ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED) != 0;
+		const bool inverted = (draw_options & ED_MANIPULATOR_ARROW_STYLE_INVERTED) != 0;
+		const bool use_precision = (tweak_flag & WM_MANIPULATOR_TWEAK_PRECISE) != 0;
+		float value = manipulator_value_from_offset(data, inter, ofs_new, constrained, inverted, use_precision);
+
+		WM_manipulator_target_property_value_set(C, mpr, mpr_prop, value);
+		/* get clamped value */
+		value = WM_manipulator_target_property_value_get(mpr, mpr_prop);
+
+		data->offset = manipulator_offset_from_value(data, value, constrained, inverted);
+	}
+	else {
+		data->offset = ofs_new;
+	}
+
+	/* tag the region for redraw */
+	ED_region_tag_redraw(ar);
+	WM_event_add_mousemove(C);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void manipulator_arrow_setup(wmManipulator *mpr)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+
+	arrow->manipulator.flag |= WM_MANIPULATOR_DRAW_MODAL;
+
+	arrow->data.range_fac = 1.0f;
+}
+
+static int manipulator_arrow_invoke(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+	ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+
+	/* Some manipulators don't use properties. */
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		inter->init_value = WM_manipulator_target_property_value_get(mpr, mpr_prop);
+	}
+
+	inter->init_offset = arrow->data.offset;
+
+	inter->init_mval[0] = event->mval[0];
+	inter->init_mval[1] = event->mval[1];
+
+	manipulator_arrow_matrix_basis_get(mpr, inter->init_matrix_basis);
+	WM_manipulator_calc_matrix_final(mpr, inter->init_matrix_final);
+
+	mpr->interaction_data = inter;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void manipulator_arrow_property_update(wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+	const int draw_options = RNA_enum_get(arrow->manipulator.ptr, "draw_options");
+	const bool constrained = (draw_options & ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED) != 0;
+	const bool inverted = (draw_options & ED_MANIPULATOR_ARROW_STYLE_INVERTED) != 0;
+	manipulator_property_data_update(mpr, &arrow->data, mpr_prop, constrained, inverted);
+}
+
+static void manipulator_arrow_exit(bContext *C, wmManipulator *mpr, const bool cancel)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+	ManipulatorCommonData *data = &arrow->data;
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+	const bool is_prop_valid = WM_manipulator_target_property_is_valid(mpr_prop);
+
+	if (!cancel) {
+		/* Assign incase applying the opetration needs an updated offset
+		 * editmesh bisect needs this. */
+		if (is_prop_valid) {
+			data->offset = WM_manipulator_target_property_value_get(mpr, mpr_prop);
+		}
+		return;
+	}
+
+	ManipulatorInteraction *inter = mpr->interaction_data;
+	if (is_prop_valid) {
+		manipulator_property_value_reset(C, mpr, inter, mpr_prop);
+	}
+	data->offset = inter->init_offset;
+}
+
+
+/* -------------------------------------------------------------------- */
+/** \name Arrow Manipulator API
+ *
+ * \{ */
+
+/**
+ * Define a custom property UI range
+ *
+ * \note Needs to be called before WM_manipulator_target_property_def_rna!
+ */
+void ED_manipulator_arrow3d_set_ui_range(wmManipulator *mpr, const float min, const float max)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+
+	BLI_assert(min < max);
+	BLI_assert(!(WM_manipulator_target_property_is_valid(WM_manipulator_target_property_find(mpr, "offset")) &&
+	             "Make sure this function is called before WM_manipulator_target_property_def_rna"));
+
+	arrow->data.range = max - min;
+	arrow->data.min = min;
+	arrow->data.flag |= MANIPULATOR_CUSTOM_RANGE_SET;
+}
+
+/**
+ * Define a custom factor for arrow min/max distance
+ *
+ * \note Needs to be called before WM_manipulator_target_property_def_rna!
+ */
+void ED_manipulator_arrow3d_set_range_fac(wmManipulator *mpr, const float range_fac)
+{
+	ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
+	BLI_assert(!(WM_manipulator_target_property_is_valid(WM_manipulator_target_property_find(mpr, "offset")) &&
+	             "Make sure this function is called before WM_manipulator_target_property_def_rna"));
+
+	arrow->data.range_fac = range_fac;
+}
+
+static void MANIPULATOR_WT_arrow_3d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_arrow_3d";
+
+	/* api callbacks */
+	wt->draw = manipulator_arrow_draw;
+	wt->draw_select = manipulator_arrow_draw_select;
+	wt->matrix_basis_get = manipulator_arrow_matrix_basis_get;
+	wt->modal = manipulator_arrow_modal;
+	wt->setup = manipulator_arrow_setup;
+	wt->invoke = manipulator_arrow_invoke;
+	wt->property_update = manipulator_arrow_property_update;
+	wt->exit = manipulator_arrow_exit;
+
+	wt->struct_size = sizeof(ArrowManipulator3D);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_style[] = {
+		{ED_MANIPULATOR_ARROW_STYLE_NORMAL, "NORMAL", 0, "Normal", ""},
+		{ED_MANIPULATOR_ARROW_STYLE_CROSS, "CROSS", 0, "Cross", ""},
+		{ED_MANIPULATOR_ARROW_STYLE_BOX, "BOX", 0, "Box", ""},
+		{ED_MANIPULATOR_ARROW_STYLE_CONE, "CONE", 0, "Cone", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_ARROW_STYLE_INVERTED, "INVERT", 0, "Inverted", ""},
+		{ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED, "CONSTRAIN", 0, "Constrained", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_ARROW_STYLE_NORMAL, "Draw Style", "");
+	RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+
+	RNA_def_float(wt->srna, "length", 1.0f, 0.0f, FLT_MAX, "Arrow Line Length", "", 0.0f, FLT_MAX);
+	RNA_def_float_vector(wt->srna, "aspect", 2, NULL, 0, FLT_MAX, "Aspect", "Cone/box style only", 0.0f, FLT_MAX);
+
+	WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 1);
+}
+
+void ED_manipulatortypes_arrow_3d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_arrow_3d);
+}
+
+/** \} */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
new file mode 100644
index 00000000000..86c3b4a09de
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
@@ -0,0 +1,321 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file button2d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Button Manipulator
+ *
+ * 2D Manipulator, also works in 3D views.
+ *
+ * \brief Single click button action for use in manipulator groups.
+ *
+ * \note Currently only basic icon & vector-shape buttons are supported.
+ *
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+#include "GPU_batch.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_interface.h"
+#include "UI_interface_icons.h"
+#include "UI_resources.h"
+
+/* own includes */
+#include "../manipulator_geometry.h"
+#include "../manipulator_library_intern.h"
+
+typedef struct ButtonManipulator2D {
+	wmManipulator manipulator;
+	bool is_init;
+	/* Use an icon or shape */
+	int icon;
+	Gwn_Batch *shape_batch[2];
+} ButtonManipulator2D;
+
+#define CIRCLE_RESOLUTION 32
+
+/* -------------------------------------------------------------------- */
+
+static void button2d_geom_draw_backdrop(
+        const wmManipulator *mpr, const float color[4], const bool select)
+{
+	glLineWidth(mpr->line_width);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
+	immUniformColor4fv(color);
+
+	/* TODO, other draw styles */
+	imm_draw_circle_fill_2d(pos, 0, 0, 1.0f, CIRCLE_RESOLUTION);
+
+	immUnbindProgram();
+
+	UNUSED_VARS(select);
+}
+
+static void button2d_draw_intern(
+        const bContext *C, wmManipulator *mpr,
+        const bool select, const bool highlight)
+{
+	ButtonManipulator2D *button = (ButtonManipulator2D *)mpr;
+
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	if (button->is_init == false) {
+		button->is_init = true;
+		PropertyRNA *prop = RNA_struct_find_property(mpr->ptr, "icon");
+		if (RNA_property_is_set(mpr->ptr, prop)) {
+			button->icon = RNA_property_enum_get(mpr->ptr, prop);
+		}
+		else {
+			prop = RNA_struct_find_property(mpr->ptr, "shape");
+			const uint polys_len = RNA_property_string_length(mpr->ptr, prop);
+			/* We shouldn't need the +1, but a NULL char is set. */
+			char *polys = MEM_mallocN(polys_len + 1, __func__);
+			RNA_property_string_get(mpr->ptr, prop, polys);
+			button->shape_batch[0] = GPU_batch_tris_from_poly_2d_encoded((uchar *)polys, polys_len, NULL);
+			button->shape_batch[1] = GPU_batch_wire_from_poly_2d_encoded((uchar *)polys, polys_len, NULL);
+			MEM_freeN(polys);
+		}
+	}
+
+	float color[4];
+	float matrix_final[4][4];
+
+	manipulator_color_get(mpr, highlight, color);
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+
+	bool is_3d = (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) != 0;
+
+
+	if (draw_options & ED_MANIPULATOR_BUTTON_SHOW_HELPLINE) {
+		float matrix_final_no_offset[4][4];
+		WM_manipulator_calc_matrix_final_no_offset(mpr, matrix_final_no_offset);
+		uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformColor4fv(color);
+		glLineWidth(mpr->line_width);
+		immUniformColor4fv(color);
+		immBegin(GWN_PRIM_LINE_STRIP, 2);
+		immVertex3fv(pos, matrix_final[3]);
+		immVertex3fv(pos, matrix_final_no_offset[3]);
+		immEnd();
+		immUnbindProgram();
+	}
+
+	bool need_to_pop = true;
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	if (is_3d) {
+		RegionView3D *rv3d = CTX_wm_region_view3d(C);
+		float matrix_align[4][4];
+		float matrix_final_unit[4][4];
+		normalize_m4_m4(matrix_final_unit, matrix_final);
+		mul_m4_m4m4(matrix_align, rv3d->viewmat, matrix_final_unit);
+		zero_v3(matrix_align[3]);
+		transpose_m4(matrix_align);
+		gpuMultMatrix(matrix_align);
+	}
+
+	if (select) {
+		BLI_assert(is_3d);
+		button2d_geom_draw_backdrop(mpr, color, select);
+	}
+	else {
+
+		glEnable(GL_BLEND);
+		if (button->shape_batch[0] != NULL) {
+			glEnable(GL_LINE_SMOOTH);
+			glDisable(GL_POLYGON_SMOOTH);
+			glLineWidth(1.0f);
+			for (uint i = 0; i < ARRAY_SIZE(button->shape_batch) && button->shape_batch[i]; i++) {
+				/* Invert line color for wire. */
+				GWN_batch_program_set_builtin(button->shape_batch[i], GPU_SHADER_2D_UNIFORM_COLOR);
+				GWN_batch_uniform_4f(button->shape_batch[i], "color", UNPACK4(color));
+				GWN_batch_draw(button->shape_batch[i]);
+
+				if (draw_options & ED_MANIPULATOR_BUTTON_SHOW_OUTLINE) {
+					color[0] = 1.0f - color[0];
+					color[1] = 1.0f - color[1];
+					color[2] = 1.0f - color[2];
+				}
+			}
+			glDisable(GL_LINE_SMOOTH);
+			glEnable(GL_POLYGON_SMOOTH);
+		}
+		else if (button->icon != ICON_NONE) {
+			button2d_geom_draw_backdrop(mpr, color, select);
+			float size[2];
+			if (is_3d) {
+				const float fac = 2.0f;
+				gpuTranslate2f(-(fac / 2), -(fac / 2));
+				gpuScale2f(fac / (ICON_DEFAULT_WIDTH *  UI_DPI_FAC), fac / (ICON_DEFAULT_HEIGHT * UI_DPI_FAC));
+				size[0] = 1.0f;
+				size[1] = 1.0f;
+			}
+			else {
+				size[0] = mpr->matrix_basis[3][0] - (ICON_DEFAULT_WIDTH / 2.0) * UI_DPI_FAC;
+				size[1] = mpr->matrix_basis[3][1] - (ICON_DEFAULT_HEIGHT / 2.0) * UI_DPI_FAC;
+				gpuPopMatrix();
+				need_to_pop = false;
+			}
+			UI_icon_draw(size[0], size[1], button->icon);
+		}
+		glDisable(GL_BLEND);
+	}
+
+	if (need_to_pop) {
+		gpuPopMatrix();
+	}
+}
+
+static void manipulator_button2d_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
+{
+	GPU_select_load_id(select_id);
+	button2d_draw_intern(C, mpr, true, false);
+}
+
+static void manipulator_button2d_draw(const bContext *C, wmManipulator *mpr)
+{
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+
+	glEnable(GL_BLEND);
+	button2d_draw_intern(C, mpr, false, is_highlight);
+	glDisable(GL_BLEND);
+}
+
+static int manipulator_button2d_test_select(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	float point_local[2];
+
+	if (0) {
+		/* correct, but unnecessarily slow. */
+		if (manipulator_window_project_2d(
+		        C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, true, point_local) == false)
+		{
+			return -1;
+		}
+	}
+	else {
+		copy_v2_v2(point_local, (float[2]){UNPACK2(event->mval)});
+		sub_v2_v2(point_local, mpr->matrix_basis[3]);
+		mul_v2_fl(point_local, 1.0f / (mpr->scale_basis * UI_DPI_FAC));
+	}
+	/* The 'mpr->scale_final' is already applied when projecting. */
+	if (len_squared_v2(point_local) < 1.0f) {
+		return 0;
+	}
+
+	return -1;
+}
+
+static int manipulator_button2d_cursor_get(wmManipulator *mpr)
+{
+	if (RNA_boolean_get(mpr->ptr, "show_drag")) {
+		return BC_NSEW_SCROLLCURSOR;
+	}
+	return CURSOR_STD;
+}
+
+static void manipulator_button2d_free(wmManipulator *mpr)
+{
+	ButtonManipulator2D *shape = (ButtonManipulator2D *)mpr;
+
+	for (uint i = 0; i < ARRAY_SIZE(shape->shape_batch); i++) {
+		GWN_BATCH_DISCARD_SAFE(shape->shape_batch[i]);
+	}
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Button Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_button_2d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_button_2d";
+
+	/* api callbacks */
+	wt->draw = manipulator_button2d_draw;
+	wt->draw_select = manipulator_button2d_draw_select;
+	wt->test_select = manipulator_button2d_test_select;
+	wt->cursor_get = manipulator_button2d_cursor_get;
+	wt->free = manipulator_button2d_free;
+
+	wt->struct_size = sizeof(ButtonManipulator2D);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_BUTTON_SHOW_OUTLINE, "OUTLINE", 0, "Outline", ""},
+		{ED_MANIPULATOR_BUTTON_SHOW_HELPLINE, "HELPLINE", 0, "Help Line", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	PropertyRNA *prop;
+
+	RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+
+	prop = RNA_def_property(wt->srna, "icon", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, rna_enum_icon_items);
+
+	/* Passed to 'GPU_batch_tris_from_poly_2d_encoded' */
+	RNA_def_property(wt->srna, "shape", PROP_STRING, PROP_BYTESTRING);
+
+	/* Currently only used for cursor display. */
+	RNA_def_boolean(wt->srna, "show_drag", true, "Show Drag", "");
+}
+
+void ED_manipulatortypes_button_2d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_button_2d);
+}
+
+/** \} */ // Button Manipulator API
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
new file mode 100644
index 00000000000..fe748f33d35
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
@@ -0,0 +1,1099 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file cage2d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Cage Manipulator
+ *
+ * 2D Manipulator
+ *
+ * \brief Rectangular manipulator acting as a 'cage' around its content.
+ * Interacting scales or translates the manipulator.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+#include "BLI_dial_2d.h"
+#include "BLI_rect.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
+#include "GPU_matrix.h"
+#include "GPU_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_select.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_library_intern.h"
+
+#define MANIPULATOR_RESIZER_SIZE 10.0f
+#define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
+
+static void manipulator_calc_rect_view_scale(
+        const wmManipulator *mpr, const float dims[2], float scale[2])
+{
+	float matrix_final_no_offset[4][4];
+	float asp[2] = {1.0f, 1.0f};
+	if (dims[0] > dims[1]) {
+		asp[0] = dims[1] / dims[0];
+	}
+	else {
+		asp[1] = dims[0] / dims[1];
+	}
+	float x_axis[3], y_axis[3];
+	WM_manipulator_calc_matrix_final_no_offset(mpr, matrix_final_no_offset);
+	mul_v3_mat3_m4v3(x_axis, matrix_final_no_offset, mpr->matrix_offset[0]);
+	mul_v3_mat3_m4v3(y_axis, matrix_final_no_offset, mpr->matrix_offset[1]);
+
+	mul_v2_v2(x_axis, asp);
+	mul_v2_v2(y_axis, asp);
+
+	scale[0] = 1.0f / len_v3(x_axis);
+	scale[1] = 1.0f / len_v3(y_axis);
+}
+
+static void manipulator_calc_rect_view_margin(
+        const wmManipulator *mpr, const float dims[2], float margin[2])
+{
+	float handle_size;
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		handle_size = 0.15f;
+	}
+	else {
+		handle_size = MANIPULATOR_RESIZER_SIZE;
+	}
+	handle_size *= mpr->scale_final;
+	float scale_xy[2];
+	manipulator_calc_rect_view_scale(mpr, dims, scale_xy);
+	margin[0] = ((handle_size * scale_xy[0]));
+	margin[1] = ((handle_size * scale_xy[1]));
+}
+
+/* -------------------------------------------------------------------- */
+
+static void manipulator_rect_pivot_from_scale_part(int part, float r_pt[2], bool r_constrain_axis[2])
+{
+	bool x = true, y = true;
+	switch (part) {
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X: { ARRAY_SET_ITEMS(r_pt,  0.5,  0.0); x = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X: { ARRAY_SET_ITEMS(r_pt, -0.5,  0.0); x = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y: { ARRAY_SET_ITEMS(r_pt,  0.0,  0.5); y = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y: { ARRAY_SET_ITEMS(r_pt,  0.0, -0.5); y = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y: { ARRAY_SET_ITEMS(r_pt,  0.5,  0.5); x = y = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y: { ARRAY_SET_ITEMS(r_pt,  0.5, -0.5); x = y = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y: { ARRAY_SET_ITEMS(r_pt, -0.5,  0.5); x = y = false; break; }
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y: { ARRAY_SET_ITEMS(r_pt, -0.5, -0.5); x = y = false; break; }
+		default: BLI_assert(0);
+	}
+	r_constrain_axis[0] = x;
+	r_constrain_axis[1] = y;
+}
+
+/* -------------------------------------------------------------------- */
+/** \name Box Draw Style
+ *
+ * Useful for 3D views, see: #ED_MANIPULATOR_CAGE2D_STYLE_BOX
+ * \{ */
+
+static void cage2d_draw_box_corners(
+        const rctf *r, const float margin[2], const float color[3])
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	immBegin(GWN_PRIM_LINES, 16);
+
+	immVertex2f(pos, r->xmin, r->ymin + margin[1]);
+	immVertex2f(pos, r->xmin, r->ymin);
+	immVertex2f(pos, r->xmin, r->ymin);
+	immVertex2f(pos, r->xmin + margin[0], r->ymin);
+
+	immVertex2f(pos, r->xmax, r->ymin + margin[1]);
+	immVertex2f(pos, r->xmax, r->ymin);
+	immVertex2f(pos, r->xmax, r->ymin);
+	immVertex2f(pos, r->xmax - margin[0], r->ymin);
+
+	immVertex2f(pos, r->xmax, r->ymax - margin[1]);
+	immVertex2f(pos, r->xmax, r->ymax);
+	immVertex2f(pos, r->xmax, r->ymax);
+	immVertex2f(pos, r->xmax - margin[0], r->ymax);
+
+	immVertex2f(pos, r->xmin, r->ymax - margin[1]);
+	immVertex2f(pos, r->xmin, r->ymax);
+	immVertex2f(pos, r->xmin, r->ymax);
+	immVertex2f(pos, r->xmin + margin[0], r->ymax);
+
+	immEnd();
+
+	immUnbindProgram();
+}
+
+static void cage2d_draw_box_interaction(
+        const float color[4], const int highlighted,
+        const float size[2], const float margin[2],
+        const float line_width, const bool is_solid, const int draw_options)
+{
+	/* 4 verts for translate, otherwise only 3 are used. */
+	float verts[4][2];
+	uint verts_len = 0;
+	Gwn_PrimType prim_type = GWN_PRIM_NONE;
+
+	switch (highlighted) {
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X:
+		{
+			rctf r = {
+				.xmin = -size[0], .xmax = -size[0] + margin[0],
+				.ymin = -size[1] + margin[1], .ymax = size[1] - margin[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmin, r.ymin);
+			ARRAY_SET_ITEMS(verts[1], r.xmin, r.ymax);
+			verts_len = 2;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[2], r.xmax, r.ymax);
+				ARRAY_SET_ITEMS(verts[3], r.xmax, r.ymin);
+				verts_len += 2;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X:
+		{
+			rctf r = {
+				.xmin = size[0] - margin[0], .xmax = size[0],
+				.ymin = -size[1] + margin[1], .ymax = size[1] - margin[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmax, r.ymin);
+			ARRAY_SET_ITEMS(verts[1], r.xmax, r.ymax);
+			verts_len = 2;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[2], r.xmin, r.ymax);
+				ARRAY_SET_ITEMS(verts[3], r.xmin, r.ymin);
+				verts_len += 2;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y:
+		{
+			rctf r = {
+				.xmin = -size[0] + margin[0], .xmax = size[0] - margin[0],
+				.ymin = -size[1], .ymax = -size[1] + margin[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmin, r.ymin);
+			ARRAY_SET_ITEMS(verts[1], r.xmax, r.ymin);
+			verts_len = 2;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[2], r.xmax, r.ymax);
+				ARRAY_SET_ITEMS(verts[3], r.xmin, r.ymax);
+				verts_len += 2;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y:
+		{
+			rctf r = {
+				.xmin = -size[0] + margin[0], .xmax = size[0] - margin[0],
+				.ymin = size[1] - margin[1], .ymax = size[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmin, r.ymax);
+			ARRAY_SET_ITEMS(verts[1], r.xmax, r.ymax);
+			verts_len = 2;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[2], r.xmax, r.ymin);
+				ARRAY_SET_ITEMS(verts[3], r.xmin, r.ymin);
+				verts_len += 2;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y:
+		{
+			rctf r = {
+				.xmin = -size[0], .xmax = -size[0] + margin[0],
+				.ymin = -size[1], .ymax = -size[1] + margin[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmax, r.ymin);
+			ARRAY_SET_ITEMS(verts[1], r.xmax, r.ymax);
+			ARRAY_SET_ITEMS(verts[2], r.xmin, r.ymax);
+			verts_len = 3;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[3], r.xmin, r.ymin);
+				verts_len += 1;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y:
+		{
+			rctf r = {
+				.xmin = -size[0], .xmax = -size[0] + margin[0],
+				.ymin = size[1] - margin[1], .ymax = size[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmax, r.ymax);
+			ARRAY_SET_ITEMS(verts[1], r.xmax, r.ymin);
+			ARRAY_SET_ITEMS(verts[2], r.xmin, r.ymin);
+			verts_len = 3;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[3], r.xmin, r.ymax);
+				verts_len += 1;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y:
+		{
+			rctf r = {
+				.xmin = size[0] - margin[0], .xmax = size[0],
+				.ymin = -size[1], .ymax = -size[1] + margin[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmin, r.ymin);
+			ARRAY_SET_ITEMS(verts[1], r.xmin, r.ymax);
+			ARRAY_SET_ITEMS(verts[2], r.xmax, r.ymax);
+			verts_len = 3;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[3], r.xmax, r.ymin);
+				verts_len += 1;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y:
+		{
+			rctf r = {
+				.xmin = size[0] - margin[0], .xmax = size[0],
+				.ymin = size[1] - margin[1], .ymax = size[1],
+			};
+			ARRAY_SET_ITEMS(verts[0], r.xmin, r.ymax);
+			ARRAY_SET_ITEMS(verts[1], r.xmin, r.ymin);
+			ARRAY_SET_ITEMS(verts[2], r.xmax, r.ymin);
+			verts_len = 3;
+			if (is_solid) {
+				ARRAY_SET_ITEMS(verts[3], r.xmax, r.ymax);
+				verts_len += 1;
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+		case ED_MANIPULATOR_CAGE2D_PART_ROTATE:
+		{
+			const float rotate_pt[2] = {0.0f, size[1] + margin[1]};
+			const rctf r_rotate = {
+				.xmin = rotate_pt[0] - margin[0] / 2.0f,
+				.xmax = rotate_pt[0] + margin[0] / 2.0f,
+				.ymin = rotate_pt[1] - margin[1] / 2.0f,
+				.ymax = rotate_pt[1] + margin[1] / 2.0f,
+			};
+
+			ARRAY_SET_ITEMS(verts[0], r_rotate.xmin, r_rotate.ymin);
+			ARRAY_SET_ITEMS(verts[1], r_rotate.xmin, r_rotate.ymax);
+			ARRAY_SET_ITEMS(verts[2], r_rotate.xmax, r_rotate.ymax);
+			ARRAY_SET_ITEMS(verts[3], r_rotate.xmax, r_rotate.ymin);
+			verts_len = 4;
+			if (is_solid) {
+				prim_type = GWN_PRIM_TRI_FAN;
+			}
+			else {
+				prim_type = GWN_PRIM_LINE_STRIP;
+			}
+			break;
+		}
+
+		case ED_MANIPULATOR_CAGE2D_PART_TRANSLATE:
+			if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+				ARRAY_SET_ITEMS(verts[0], -margin[0] / 2, -margin[1] / 2);
+				ARRAY_SET_ITEMS(verts[1],  margin[0] / 2,  margin[1] / 2);
+				ARRAY_SET_ITEMS(verts[2], -margin[0] / 2,  margin[1] / 2);
+				ARRAY_SET_ITEMS(verts[3],  margin[0] / 2, -margin[1] / 2);
+				verts_len = 4;
+				if (is_solid) {
+					prim_type = GWN_PRIM_TRI_FAN;
+				}
+				else {
+					prim_type = GWN_PRIM_LINES;
+				}
+			}
+			else {
+				/* Only used for 3D view selection, never displayed to the user. */
+				ARRAY_SET_ITEMS(verts[0], -size[0], -size[1]);
+				ARRAY_SET_ITEMS(verts[1], -size[0],  size[1]);
+				ARRAY_SET_ITEMS(verts[2], size[0],   size[1]);
+				ARRAY_SET_ITEMS(verts[3], size[0],  -size[1]);
+				verts_len = 4;
+				if (is_solid) {
+					prim_type = GWN_PRIM_TRI_FAN;
+				}
+				else {
+					/* unreachable */
+					BLI_assert(0);
+					prim_type = GWN_PRIM_LINE_STRIP;
+				}
+			}
+			break;
+		default:
+			return;
+	}
+
+	BLI_assert(prim_type != GWN_PRIM_NONE);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	struct {
+		uint pos, col;
+	} attr_id = {
+		.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT),
+		.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT),
+	};
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+	{
+		if (is_solid) {
+			BLI_assert(ELEM(prim_type, GWN_PRIM_TRI_FAN));
+			immBegin(prim_type, verts_len);
+			immAttrib3f(attr_id.col, 0.0f, 0.0f, 0.0f);
+			for (uint i = 0; i < verts_len; i++) {
+				immVertex2fv(attr_id.pos, verts[i]);
+			}
+			immEnd();
+		}
+		else {
+			BLI_assert(ELEM(prim_type, GWN_PRIM_LINE_STRIP, GWN_PRIM_LINES));
+			glLineWidth(line_width + 3.0f);
+
+			immBegin(prim_type, verts_len);
+			immAttrib3f(attr_id.col, 0.0f, 0.0f, 0.0f);
+			for (uint i = 0; i < verts_len; i++) {
+				immVertex2fv(attr_id.pos, verts[i]);
+			}
+			immEnd();
+
+			glLineWidth(line_width);
+
+			immBegin(prim_type, verts_len);
+			immAttrib3fv(attr_id.col, color);
+			for (uint i = 0; i < verts_len; i++) {
+				immVertex2fv(attr_id.pos, verts[i]);
+			}
+			immEnd();
+		}
+	}
+
+	immUnbindProgram();
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Circle Draw Style
+ *
+ * Useful for 2D views, see: #ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE
+ * \{ */
+
+static void imm_draw_point_aspect_2d(
+        uint pos, float x, float y, float rad_x, float rad_y, bool solid)
+{
+	immBegin(solid ? GWN_PRIM_TRI_FAN : GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, x - rad_x, y - rad_y);
+	immVertex2f(pos, x - rad_x, y + rad_y);
+	immVertex2f(pos, x + rad_x, y + rad_y);
+	immVertex2f(pos, x + rad_x, y - rad_y);
+	immEnd();
+}
+
+static void cage2d_draw_circle_wire(
+        const rctf *r, const float margin[2], const float color[3],
+        const int transform_flag, const int draw_options)
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	immBegin(GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, r->xmin, r->ymin);
+	immVertex2f(pos, r->xmax, r->ymin);
+	immVertex2f(pos, r->xmax, r->ymax);
+	immVertex2f(pos, r->xmin, r->ymax);
+	immEnd();
+
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE) {
+		immBegin(GWN_PRIM_LINE_LOOP, 2);
+		immVertex2f(pos, BLI_rctf_cent_x(r), r->ymax);
+		immVertex2f(pos, BLI_rctf_cent_x(r), r->ymax + margin[1]);
+		immEnd();
+	}
+
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+		if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+			const float rad[2] = {margin[0] / 2, margin[1] / 2};
+			const float center[2] = {BLI_rctf_cent_x(r), BLI_rctf_cent_y(r)};
+
+			immBegin(GWN_PRIM_LINES, 4);
+			immVertex2f(pos, center[0] - rad[0], center[1] - rad[1]);
+			immVertex2f(pos, center[0] + rad[0], center[1] + rad[1]);
+			immVertex2f(pos, center[0] + rad[0], center[1] - rad[1]);
+			immVertex2f(pos, center[0] - rad[0], center[1] + rad[1]);
+			immEnd();
+		}
+	}
+
+	immUnbindProgram();
+}
+
+static void cage2d_draw_circle_handles(
+        const rctf *r, const float margin[2], const float color[3],
+        const int transform_flag,
+        bool solid)
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	void (*circle_fn)(uint, float, float, float, float, int) =
+	        (solid) ? imm_draw_circle_fill_aspect_2d : imm_draw_circle_wire_aspect_2d;
+	const int resolu = 12;
+	const float rad[2] = {margin[0] / 3, margin[1] / 3};
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	/* should  really divide by two, but looks too bulky. */
+	{
+		imm_draw_point_aspect_2d(pos, r->xmin, r->ymin, rad[0], rad[1], solid);
+		imm_draw_point_aspect_2d(pos, r->xmax, r->ymin, rad[0], rad[1], solid);
+		imm_draw_point_aspect_2d(pos, r->xmax, r->ymax, rad[0], rad[1], solid);
+		imm_draw_point_aspect_2d(pos, r->xmin, r->ymax, rad[0], rad[1], solid);
+	}
+
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE) {
+		const float handle[2] = {BLI_rctf_cent_x(r), r->ymax + (margin[1] * MANIPULATOR_MARGIN_OFFSET_SCALE)};
+		circle_fn(pos, handle[0], handle[1], rad[0], rad[1], resolu);
+	}
+
+	immUnbindProgram();
+}
+
+/** \} */
+
+static void manipulator_cage2d_draw_intern(
+        wmManipulator *mpr, const bool select, const bool highlight, const int select_id)
+{
+	// const bool use_clamp = (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) == 0;
+	float dims[2];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+	float matrix_final[4][4];
+
+	const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
+	const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+
+	const float size_real[2] = {dims[0] / 2.0f, dims[1] / 2.0f};
+
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	float margin[2];
+	manipulator_calc_rect_view_margin(mpr, dims, margin);
+
+	/* Handy for quick testing draw (if it's outside bounds). */
+	if (false) {
+		glEnable(GL_BLEND);
+		uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4fv((const float[4]){1, 1, 1, 0.5f});
+		float s = 0.5f;
+		immRectf(pos, -s, -s, s, s);
+		immUnbindProgram();
+		glDisable(GL_BLEND);
+	}
+
+	if (select) {
+		/* expand for hotspot */
+		const float size[2] = {size_real[0] + margin[0] / 2, size_real[1] + margin[1] / 2};
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE) {
+			int scale_parts[] = {
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y,
+
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y,
+				ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y,
+			};
+			for (int i = 0; i < ARRAY_SIZE(scale_parts); i++) {
+				GPU_select_load_id(select_id | scale_parts[i]);
+				cage2d_draw_box_interaction(
+				        mpr->color, scale_parts[i], size, margin, mpr->line_width, true, draw_options);
+			}
+		}
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+			const int transform_part = ED_MANIPULATOR_CAGE2D_PART_TRANSLATE;
+			GPU_select_load_id(select_id | transform_part);
+			cage2d_draw_box_interaction(
+			        mpr->color, transform_part, size, margin, mpr->line_width, true, draw_options);
+		}
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE) {
+			cage2d_draw_box_interaction(
+			        mpr->color, ED_MANIPULATOR_CAGE2D_PART_ROTATE, size_real, margin, mpr->line_width, true, draw_options);
+		}
+	}
+	else {
+		const rctf r = {
+			.xmin = -size_real[0],
+			.ymin = -size_real[1],
+			.xmax = size_real[0],
+			.ymax = size_real[1],
+		};
+		if (draw_style == ED_MANIPULATOR_CAGE2D_STYLE_BOX) {
+			/* corner manipulators */
+			glLineWidth(mpr->line_width + 3.0f);
+			cage2d_draw_box_corners(&r, margin, (const float[3]){0, 0, 0});
+
+			/* corner manipulators */
+			float color[4];
+			manipulator_color_get(mpr, highlight, color);
+			glLineWidth(mpr->line_width);
+			cage2d_draw_box_corners(&r, margin, color);
+
+			bool show = false;
+			if (mpr->highlight_part == ED_MANIPULATOR_CAGE2D_PART_TRANSLATE) {
+				/* Only show if we're drawing the center handle
+				 * otherwise the entire rectangle is the hotspot. */
+				if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+					show = true;
+				}
+			}
+			else {
+				show = true;
+			}
+
+			if (show) {
+				cage2d_draw_box_interaction(
+				        mpr->color, mpr->highlight_part, size_real, margin, mpr->line_width, false, draw_options);
+			}
+
+			if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE) {
+				cage2d_draw_box_interaction(
+				        mpr->color, ED_MANIPULATOR_CAGE2D_PART_ROTATE, size_real, margin, mpr->line_width, false, draw_options);
+			}
+		}
+		else if (draw_style == ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE) {
+			float color[4];
+			manipulator_color_get(mpr, highlight, color);
+
+			glEnable(GL_LINE_SMOOTH);
+			glEnable(GL_BLEND);
+
+			glLineWidth(mpr->line_width + 3.0f);
+			cage2d_draw_circle_wire(&r, margin, (const float[3]){0, 0, 0}, transform_flag, draw_options);
+			glLineWidth(mpr->line_width);
+			cage2d_draw_circle_wire(&r, margin, color, transform_flag, draw_options);
+
+
+			/* corner manipulators */
+			cage2d_draw_circle_handles(&r, margin, color, transform_flag, true);
+			cage2d_draw_circle_handles(&r, margin, (const float[3]){0, 0, 0}, transform_flag, false);
+
+			glDisable(GL_BLEND);
+			glDisable(GL_LINE_SMOOTH);
+		}
+		else {
+			BLI_assert(0);
+		}
+	}
+
+	glLineWidth(1.0);
+	gpuPopMatrix();
+}
+
+/**
+ * For when we want to draw 2d cage in 3d views.
+ */
+static void manipulator_cage2d_draw_select(const bContext *UNUSED(C), wmManipulator *mpr, int select_id)
+{
+	manipulator_cage2d_draw_intern(mpr, true, false, select_id);
+}
+
+static void manipulator_cage2d_draw(const bContext *UNUSED(C), wmManipulator *mpr)
+{
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+	manipulator_cage2d_draw_intern(mpr, false, is_highlight, -1);
+}
+
+static int manipulator_cage2d_get_cursor(wmManipulator *mpr)
+{
+	int highlight_part = mpr->highlight_part;
+
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		return BC_NSEW_SCROLLCURSOR;
+	}
+
+	switch (highlight_part) {
+		case ED_MANIPULATOR_CAGE2D_PART_TRANSLATE:
+			return BC_NSEW_SCROLLCURSOR;
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X:
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X:
+			return CURSOR_X_MOVE;
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y:
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y:
+			return CURSOR_Y_MOVE;
+
+			/* TODO diagonal cursor */
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y:
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y:
+			return BC_NSEW_SCROLLCURSOR;
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y:
+		case ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y:
+			return BC_NSEW_SCROLLCURSOR;
+		case ED_MANIPULATOR_CAGE2D_PART_ROTATE:
+			return BC_CROSSCURSOR;
+		default:
+			return CURSOR_STD;
+	}
+}
+
+static int manipulator_cage2d_test_select(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	float point_local[2];
+	float dims[2];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+	const float size_real[2] = {dims[0] / 2.0f, dims[1] / 2.0f};
+
+	if (manipulator_window_project_2d(
+	        C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, true, point_local) == false)
+	{
+		return -1;
+	}
+
+	float margin[2];
+	manipulator_calc_rect_view_margin(mpr, dims, margin);
+	/* expand for hotspot */
+	const float size[2] = {size_real[0] + margin[0] / 2, size_real[1] + margin[1] / 2};
+
+	const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+		rctf r;
+		if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+			r.xmin = -margin[0] / 2;
+			r.ymin = -margin[1] / 2;
+			r.xmax =  margin[0] / 2;
+			r.ymax =  margin[1] / 2;
+		}
+		else {
+			r.xmin = -size[0] + margin[0];
+			r.ymin = -size[1] + margin[1];
+			r.xmax =  size[0] - margin[0];
+			r.ymax =  size[1] - margin[1];
+		};
+		bool isect = BLI_rctf_isect_pt_v(&r, point_local);
+		if (isect) {
+			return ED_MANIPULATOR_CAGE2D_PART_TRANSLATE;
+		}
+	}
+
+	/* if manipulator does not have a scale intersection, don't do it */
+	if (transform_flag & (ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM)) {
+		const rctf r_xmin = {.xmin = -size[0], .ymin = -size[1], .xmax = -size[0] + margin[0], .ymax = size[1]};
+		const rctf r_xmax = {.xmin = size[0] - margin[0], .ymin = -size[1], .xmax = size[0], .ymax = size[1]};
+		const rctf r_ymin = {.xmin = -size[0], .ymin = -size[1], .xmax = size[0], .ymax = -size[1] + margin[1]};
+		const rctf r_ymax = {.xmin = -size[0], .ymin = size[1] - margin[1], .xmax = size[0], .ymax = size[1]};
+
+		if (BLI_rctf_isect_pt_v(&r_xmin, point_local)) {
+			if (BLI_rctf_isect_pt_v(&r_ymin, point_local)) {
+				return ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y;
+			}
+			if (BLI_rctf_isect_pt_v(&r_ymax, point_local)) {
+				return ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y;
+			}
+			return ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X;
+		}
+		if (BLI_rctf_isect_pt_v(&r_xmax, point_local)) {
+			if (BLI_rctf_isect_pt_v(&r_ymin, point_local)) {
+				return ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y;
+			}
+			if (BLI_rctf_isect_pt_v(&r_ymax, point_local)) {
+				return ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y;
+			}
+			return ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X;
+		}
+		if (BLI_rctf_isect_pt_v(&r_ymin, point_local)) {
+			return ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y;
+		}
+		if (BLI_rctf_isect_pt_v(&r_ymax, point_local)) {
+			return ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y;
+		}
+	}
+
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE) {
+		/* Rotate:
+		 *  (*) <-- hot spot is here!
+		 * +---+
+		 * |   |
+		 * +---+ */
+		const float r_rotate_pt[2] = {0.0f, size_real[1] + (margin[1] * MANIPULATOR_MARGIN_OFFSET_SCALE)};
+		const rctf r_rotate = {
+			.xmin = r_rotate_pt[0] - margin[0] / 2.0f,
+			.xmax = r_rotate_pt[0] + margin[0] / 2.0f,
+			.ymin = r_rotate_pt[1] - margin[1] / 2.0f,
+			.ymax = r_rotate_pt[1] + margin[1] / 2.0f,
+		};
+
+		if (BLI_rctf_isect_pt_v(&r_rotate, point_local)) {
+			return ED_MANIPULATOR_CAGE2D_PART_ROTATE;
+		}
+	}
+
+	return -1;
+}
+
+typedef struct RectTransformInteraction {
+	float orig_mouse[2];
+	float orig_matrix_offset[4][4];
+	float orig_matrix_final_no_offset[4][4];
+	Dial *dial;
+} RectTransformInteraction;
+
+static void manipulator_cage2d_setup(wmManipulator *mpr)
+{
+	mpr->flag |= WM_MANIPULATOR_DRAW_MODAL | WM_MANIPULATOR_DRAW_NO_SCALE;
+}
+
+static int manipulator_cage2d_invoke(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	RectTransformInteraction *data = MEM_callocN(sizeof(RectTransformInteraction), "cage_interaction");
+
+	copy_m4_m4(data->orig_matrix_offset, mpr->matrix_offset);
+	WM_manipulator_calc_matrix_final_no_offset(mpr, data->orig_matrix_final_no_offset);
+
+	if (manipulator_window_project_2d(
+	        C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, false, data->orig_mouse) == 0)
+	{
+		zero_v2(data->orig_mouse);
+	}
+
+	mpr->interaction_data = data;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int manipulator_cage2d_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	/* For transform logic to be managable we operate in -0.5..0.5 2D space,
+	 * no matter the size of the rectangle, mouse coorts are scaled to unit space.
+	 * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment.
+	 *
+	 * - The cursor offset are multiplied by 'dims'.
+	 * - Matrix translation is also multiplied by 'dims'.
+	 */
+	RectTransformInteraction *data = mpr->interaction_data;
+	float point_local[2];
+
+	float dims[2];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+
+	{
+		float matrix_back[4][4];
+		copy_m4_m4(matrix_back, mpr->matrix_offset);
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+
+		bool ok = manipulator_window_project_2d(
+		        C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, false, point_local);
+		copy_m4_m4(mpr->matrix_offset, matrix_back);
+		if (!ok) {
+			return OPERATOR_RUNNING_MODAL;
+		}
+	}
+
+	const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
+	wmManipulatorProperty *mpr_prop;
+
+	mpr_prop = WM_manipulator_target_property_find(mpr, "matrix");
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+	}
+
+	if (mpr->highlight_part == ED_MANIPULATOR_CAGE2D_PART_TRANSLATE) {
+		/* do this to prevent clamping from changing size */
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+		mpr->matrix_offset[3][0] = data->orig_matrix_offset[3][0] + (point_local[0] - data->orig_mouse[0]);
+		mpr->matrix_offset[3][1] = data->orig_matrix_offset[3][1] + (point_local[1] - data->orig_mouse[1]);
+	}
+	else if (mpr->highlight_part == ED_MANIPULATOR_CAGE2D_PART_ROTATE) {
+
+#define MUL_V2_V3_M4_FINAL(test_co, mouse_co) \
+		mul_v3_m4v3(test_co, data->orig_matrix_final_no_offset, ((const float[3]){UNPACK2(mouse_co), 0.0}))
+
+		float test_co[3];
+
+		if (data->dial == NULL) {
+			MUL_V2_V3_M4_FINAL(test_co, data->orig_matrix_offset[3]);
+
+			data->dial = BLI_dial_initialize(test_co, FLT_EPSILON);
+
+			MUL_V2_V3_M4_FINAL(test_co, data->orig_mouse);
+			BLI_dial_angle(data->dial, test_co);
+		}
+
+		/* rotate */
+		MUL_V2_V3_M4_FINAL(test_co, point_local);
+		const float angle =  BLI_dial_angle(data->dial, test_co);
+
+		float matrix_space_inv[4][4];
+		float matrix_rotate[4][4];
+		float pivot[3];
+
+		copy_v3_v3(pivot, data->orig_matrix_offset[3]);
+
+		invert_m4_m4(matrix_space_inv, mpr->matrix_space);
+
+		unit_m4(matrix_rotate);
+		mul_m4_m4m4(matrix_rotate, matrix_rotate, matrix_space_inv);
+		rotate_m4(matrix_rotate, 'Z', -angle);
+		mul_m4_m4m4(matrix_rotate, matrix_rotate, mpr->matrix_space);
+
+		zero_v3(matrix_rotate[3]);
+		transform_pivot_set_m4(matrix_rotate, pivot);
+
+		mul_m4_m4m4(mpr->matrix_offset, matrix_rotate, data->orig_matrix_offset);
+
+#undef MUL_V2_V3_M4_FINAL
+	}
+	else {
+		/* scale */
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+		float pivot[2];
+		bool constrain_axis[2] = {false};
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+			manipulator_rect_pivot_from_scale_part(mpr->highlight_part, pivot, constrain_axis);
+		}
+		else {
+			zero_v2(pivot);
+		}
+
+		/* Cursor deltas scaled to (-0.5..0.5). */
+		float delta_orig[2], delta_curr[2];
+		for (int i = 0; i < 2; i++) {
+			delta_orig[i] = ((data->orig_mouse[i] - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
+			delta_curr[i] = ((point_local[i]      - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
+		}
+
+		float scale[2] = {1.0f, 1.0f};
+		for (int i = 0; i < 2; i++) {
+			if (constrain_axis[i] == false) {
+				if (delta_orig[i] < 0.0f) {
+					delta_orig[i] *= -1.0f;
+					delta_curr[i] *= -1.0f;
+				}
+				const int sign = signum_i(scale[i]);
+
+				scale[i] = 1.0f + ((delta_curr[i] - delta_orig[i]) / len_v3(data->orig_matrix_offset[i]));
+
+				if ((transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_SIGNED) == 0) {
+					if (sign != signum_i(scale[i])) {
+						scale[i] = 0.0f;
+					}
+				}
+			}
+		}
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM) {
+			if (constrain_axis[0] == false && constrain_axis[1] == false) {
+				scale[1] = scale[0] = (scale[1] + scale[0]) / 2.0f;
+			}
+			else if (constrain_axis[0] == false) {
+				scale[1] = scale[0];
+			}
+			else if (constrain_axis[1] == false) {
+				scale[0] = scale[1];
+			}
+			else {
+				BLI_assert(0);
+			}
+		}
+
+		/* scale around pivot */
+		float matrix_scale[4][4];
+		unit_m4(matrix_scale);
+
+		mul_v3_fl(matrix_scale[0], scale[0]);
+		mul_v3_fl(matrix_scale[1], scale[1]);
+
+		transform_pivot_set_m4(matrix_scale, (const float[3]){pivot[0] * dims[0], pivot[1] * dims[1], 0.0f});
+		mul_m4_m4m4(mpr->matrix_offset, data->orig_matrix_offset, matrix_scale);
+	}
+
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_set_array(C, mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+	}
+
+	/* tag the region for redraw */
+	ED_region_tag_redraw(CTX_wm_region(C));
+	WM_event_add_mousemove(C);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void manipulator_cage2d_property_update(wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
+{
+	if (STREQ(mpr_prop->type->idname, "matrix")) {
+		if (WM_manipulator_target_property_array_length(mpr, mpr_prop) == 16) {
+			WM_manipulator_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+		}
+		else {
+			BLI_assert(0);
+		}
+	}
+	else {
+		BLI_assert(0);
+	}
+}
+
+static void manipulator_cage2d_exit(bContext *C, wmManipulator *mpr, const bool cancel)
+{
+	RectTransformInteraction *data = mpr->interaction_data;
+
+	MEM_SAFE_FREE(data->dial);
+
+	if (!cancel)
+		return;
+
+	wmManipulatorProperty *mpr_prop;
+
+	/* reset properties */
+	mpr_prop = WM_manipulator_target_property_find(mpr, "matrix");
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_set_array(C, mpr, mpr_prop, &data->orig_matrix_offset[0][0]);
+	}
+
+	copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+}
+
+
+/* -------------------------------------------------------------------- */
+/** \name Cage Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_cage_2d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_cage_2d";
+
+	/* api callbacks */
+	wt->draw = manipulator_cage2d_draw;
+	wt->draw_select = manipulator_cage2d_draw_select;
+	wt->test_select = manipulator_cage2d_test_select;
+	wt->setup = manipulator_cage2d_setup;
+	wt->invoke = manipulator_cage2d_invoke;
+	wt->property_update = manipulator_cage2d_property_update;
+	wt->modal = manipulator_cage2d_modal;
+	wt->exit = manipulator_cage2d_exit;
+	wt->cursor_get = manipulator_cage2d_get_cursor;
+
+	wt->struct_size = sizeof(wmManipulator);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_style[] = {
+		{ED_MANIPULATOR_CAGE2D_STYLE_BOX, "BOX", 0, "Box", ""},
+		{ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE, "CIRCLE", 0, "Circle", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_transform[] = {
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE, "ROTATE", 0, "Rotate", ""},
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE, "XFORM_CENTER_HANDLE", 0, "Center Handle", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static float unit_v2[2] = {1.0f, 1.0f};
+	RNA_def_float_vector(wt->srna, "dimensions", 2, unit_v2, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
+	RNA_def_enum_flag(wt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
+	RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE, "Draw Style", "");
+	RNA_def_enum_flag(
+	        wt->srna, "draw_options", rna_enum_draw_options,
+	        ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE, "Draw Options", "");
+
+	WM_manipulatortype_target_property_def(wt, "matrix", PROP_FLOAT, 16);
+}
+
+void ED_manipulatortypes_cage_2d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_cage_2d);
+}
+
+/** \} */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
new file mode 100644
index 00000000000..6c2e2bd564d
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
@@ -0,0 +1,691 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file cage3d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Cage Manipulator
+ *
+ * 2D Manipulator
+ *
+ * \brief Rectangular manipulator acting as a 'cage' around its content.
+ * Interacting scales or translates the manipulator.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+#include "BLI_rect.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
+#include "GPU_matrix.h"
+#include "GPU_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_select.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_library_intern.h"
+
+#define MANIPULATOR_RESIZER_SIZE 10.0f
+#define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
+
+static void manipulator_calc_matrix_final_no_offset(
+        const wmManipulator *mpr, float orig_matrix_final_no_offset[4][4], bool use_space)
+{
+	float mat_identity[4][4];
+	struct WM_ManipulatorMatrixParams params = {NULL};
+	unit_m4(mat_identity);
+	if (use_space == false) {
+		params.matrix_basis = mat_identity;
+	}
+	params.matrix_offset = mat_identity;
+	WM_manipulator_calc_matrix_final_params(mpr, &params, orig_matrix_final_no_offset);
+}
+
+static void manipulator_calc_rect_view_scale(
+        const wmManipulator *mpr, const float dims[3], float scale[3])
+{
+	UNUSED_VARS(dims);
+
+	/* Unlike cage2d, no need to correct for aspect. */
+	float matrix_final_no_offset[4][4];
+
+	float x_axis[3], y_axis[3], z_axis[3];
+	manipulator_calc_matrix_final_no_offset(mpr, matrix_final_no_offset, false);
+	mul_v3_mat3_m4v3(x_axis, matrix_final_no_offset, mpr->matrix_offset[0]);
+	mul_v3_mat3_m4v3(y_axis, matrix_final_no_offset, mpr->matrix_offset[1]);
+	mul_v3_mat3_m4v3(z_axis, matrix_final_no_offset, mpr->matrix_offset[2]);
+
+	scale[0] = 1.0f / len_v3(x_axis);
+	scale[1] = 1.0f / len_v3(y_axis);
+	scale[2] = 1.0f / len_v3(z_axis);
+}
+
+static void manipulator_calc_rect_view_margin(
+        const wmManipulator *mpr, const float dims[3], float margin[3])
+{
+	float handle_size;
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		handle_size = 0.15f;
+	}
+	else {
+		handle_size = MANIPULATOR_RESIZER_SIZE;
+	}
+	// XXX, the scale isn't taking offset into account, we need to calculate scale per handle!
+	// handle_size *= mpr->scale_final;
+
+	float scale_xyz[3];
+	manipulator_calc_rect_view_scale(mpr, dims, scale_xyz);
+	margin[0] = ((handle_size * scale_xyz[0]));
+	margin[1] = ((handle_size * scale_xyz[1]));
+	margin[2] = ((handle_size * scale_xyz[2]));
+}
+
+/* -------------------------------------------------------------------- */
+
+static void manipulator_rect_pivot_from_scale_part(int part, float r_pt[3], bool r_constrain_axis[3])
+{
+	if (part >= ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z &&
+	    part <= ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z)
+	{
+		int index = (part - ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z);
+		int range[3];
+		range[2] = index % 3;
+		index    = index / 3;
+		range[1] = index % 3;
+		index    = index / 3;
+		range[0] = index % 3;
+
+		const float sign[3] = {0.5f, 0.0f, -0.5f};
+		for (int i = 0; i < 3; i++) {
+			r_pt[i] = sign[range[i]];
+			r_constrain_axis[i] = (range[i] == 1);
+		}
+	}
+}
+
+/* -------------------------------------------------------------------- */
+/** \name Box Draw Style
+ *
+ * Useful for 3D views, see: #ED_MANIPULATOR_CAGE2D_STYLE_BOX
+ * \{ */
+
+static void cage3d_draw_box_corners(
+        const float r[3], const float margin[3], const float color[3])
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	UNUSED_VARS(margin);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	imm_draw_cube_wire_3d(pos, (float[3]){0}, r);
+
+	immUnbindProgram();
+}
+
+static void cage3d_draw_box_interaction(
+        const float color[4], const int highlighted,
+        const float size[3], const float margin[3])
+{
+	if (highlighted >= ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z &&
+	    highlighted <= ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z)
+	{
+		int index = (highlighted - ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z);
+		int range[3];
+		range[2] = index % 3;
+		index    = index / 3;
+		range[1] = index % 3;
+		index    = index / 3;
+		range[0] = index % 3;
+
+		const float sign[3] = {-1.0f, 0.0f, 1.0f};
+		float co[3];
+
+		for (int i = 0; i < 3; i++) {
+			co[i] = size[i] * sign[range[i]];
+		}
+		const float rad[3] = {margin[0] / 3, margin[1] / 3, margin[2] / 3};
+
+		{
+			uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+			immUniformColor3fv(color);
+			imm_draw_cube_fill_3d(pos, co, rad);
+			immUnbindProgram();
+		}
+	}
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Circle Draw Style
+ *
+ * Useful for 2D views, see: #ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE
+ * \{ */
+
+static void imm_draw_point_aspect_3d(
+        uint pos, const float co[3], const float rad[3], bool solid)
+{
+	if (solid) {
+		imm_draw_cube_fill_3d(pos, co, rad);
+	}
+	else {
+		imm_draw_cube_wire_3d(pos, co, rad);
+	}
+}
+
+static void cage3d_draw_circle_wire(
+        const float r[3], const float margin[3], const float color[3],
+        const int transform_flag, const int draw_options)
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	imm_draw_cube_wire_3d(pos, (float[3]){0}, r);
+
+#if 0
+	if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+		if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+			const float rad[2] = {margin[0] / 2, margin[1] / 2};
+			const float center[2] = {0.0f, 0.0f};
+
+			immBegin(GWN_PRIM_LINES, 4);
+			immVertex2f(pos, center[0] - rad[0], center[1] - rad[1]);
+			immVertex2f(pos, center[0] + rad[0], center[1] + rad[1]);
+			immVertex2f(pos, center[0] + rad[0], center[1] - rad[1]);
+			immVertex2f(pos, center[0] - rad[0], center[1] + rad[1]);
+			immEnd();
+		}
+	}
+#else
+	UNUSED_VARS(margin, transform_flag, draw_options);
+#endif
+
+
+	immUnbindProgram();
+}
+
+static void cage3d_draw_circle_handles(
+        const RegionView3D *rv3d, const float matrix_final[4][4],
+        const float r[3], const float margin[3], const float color[3],
+        bool solid, float scale)
+{
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	const float rad[3] = {margin[0] / 3, margin[1] / 3, margin[2] / 3};
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	immUniformColor3fv(color);
+
+	float sign[3] = {-1.0f, 0.0f, 1.0f};
+	for (int x = 0; x < 3; x++) {
+		for (int y = 0; y < 3; y++) {
+			for (int z = 0; z < 3; z++) {
+				if (x == 1 && y == 1 && z == 1) {
+					continue;
+				}
+				const float co[3] = {r[0] * sign[x], r[1] * sign[y], r[2] * sign[z]};
+				float co_test[3];
+				mul_v3_m4v3(co_test, matrix_final, co);
+				float rad_scale[3];
+				mul_v3_v3fl(rad_scale, rad, ED_view3d_pixel_size(rv3d, co_test) * scale);
+				imm_draw_point_aspect_3d(pos, co, rad_scale, solid);
+			}
+		}
+	}
+
+	immUnbindProgram();
+}
+
+/** \} */
+
+static void manipulator_cage3d_draw_intern(
+        RegionView3D *rv3d,
+        wmManipulator *mpr, const bool select, const bool highlight, const int select_id)
+{
+	// const bool use_clamp = (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) == 0;
+	float dims[3];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+	float matrix_final[4][4];
+
+	const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
+	const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+
+	const float size_real[3] = {dims[0] / 2.0f, dims[1] / 2.0f, dims[2] / 2.0f};
+
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	float margin[3];
+	manipulator_calc_rect_view_margin(mpr, dims, margin);
+
+	/* Handy for quick testing draw (if it's outside bounds). */
+	if (false) {
+		glEnable(GL_BLEND);
+		uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformColor4fv((const float[4]){1, 1, 1, 0.5f});
+		float s = 0.5f;
+		immRectf(pos, -s, -s, s, s);
+		immUnbindProgram();
+		glDisable(GL_BLEND);
+	}
+
+	if (select) {
+		/* expand for hotspot */
+#if 0
+		const float size[3] = {
+		    size_real[0] + margin[0] / 2,
+		    size_real[1] + margin[1] / 2,
+		    size_real[2] + margin[2] / 2,
+		};
+#else
+		/* just use same value for now. */
+		const float size[3] = {UNPACK3(size_real)};
+#endif
+
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE) {
+			for (int i = ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z;
+			     i <= ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z;
+			     i++)
+			{
+				if (i == ED_MANIPULATOR_CAGE3D_PART_SCALE_MID_X_MID_Y_MID_Z) {
+					continue;
+				}
+				GPU_select_load_id(select_id | i);
+				cage3d_draw_box_interaction(
+				        mpr->color, i, size, margin);
+			}
+		}
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+			const int transform_part = ED_MANIPULATOR_CAGE3D_PART_TRANSLATE;
+			GPU_select_load_id(select_id | transform_part);
+			cage3d_draw_box_interaction(
+			        mpr->color, transform_part, size, margin);
+		}
+	}
+	else {
+#if 0
+		const rctf _r = {
+			.xmin = -size_real[0],
+			.ymin = -size_real[1],
+			.xmax = size_real[0],
+			.ymax = size_real[1],
+		};
+#endif
+		if (draw_style == ED_MANIPULATOR_CAGE2D_STYLE_BOX) {
+			/* corner manipulators */
+			glLineWidth(mpr->line_width + 3.0f);
+			cage3d_draw_box_corners(size_real, margin, (const float[3]){0, 0, 0});
+
+			/* corner manipulators */
+			float color[4];
+			manipulator_color_get(mpr, highlight, color);
+			glLineWidth(mpr->line_width);
+			cage3d_draw_box_corners(size_real, margin, color);
+
+			bool show = false;
+			if (mpr->highlight_part == ED_MANIPULATOR_CAGE3D_PART_TRANSLATE) {
+				/* Only show if we're drawing the center handle
+				 * otherwise the entire rectangle is the hotspot. */
+				if (draw_options & ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
+					show = true;
+				}
+			}
+			else {
+				show = true;
+			}
+
+			if (show) {
+				cage3d_draw_box_interaction(
+				        mpr->color, mpr->highlight_part, size_real, margin);
+			}
+		}
+		else if (draw_style == ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE) {
+			float color[4];
+			manipulator_color_get(mpr, highlight, color);
+
+			glEnable(GL_LINE_SMOOTH);
+			glEnable(GL_POLYGON_SMOOTH);
+			glEnable(GL_BLEND);
+
+			glLineWidth(mpr->line_width + 3.0f);
+			cage3d_draw_circle_wire(size_real, margin, (const float[3]){0, 0, 0}, transform_flag, draw_options);
+			glLineWidth(mpr->line_width);
+			cage3d_draw_circle_wire(size_real, margin, color, transform_flag, draw_options);
+
+			/* corner manipulators */
+			cage3d_draw_circle_handles(rv3d, matrix_final, size_real, margin, (const float[3]){0, 0, 0}, true, 60);
+			cage3d_draw_circle_handles(rv3d, matrix_final, size_real, margin, color, true, 40);
+
+			glDisable(GL_BLEND);
+			glDisable(GL_POLYGON_SMOOTH);
+			glDisable(GL_LINE_SMOOTH);
+		}
+		else {
+			BLI_assert(0);
+		}
+	}
+
+	glLineWidth(1.0);
+	gpuPopMatrix();
+}
+
+/**
+ * For when we want to draw 3d cage in 3d views.
+ */
+static void manipulator_cage3d_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
+{
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+	manipulator_cage3d_draw_intern(rv3d, mpr, true, false, select_id);
+}
+
+static void manipulator_cage3d_draw(const bContext *C, wmManipulator *mpr)
+{
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+	manipulator_cage3d_draw_intern(rv3d, mpr, false, is_highlight, -1);
+}
+
+static int manipulator_cage3d_get_cursor(wmManipulator *mpr)
+{
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		return BC_NSEW_SCROLLCURSOR;
+	}
+
+	return CURSOR_STD;
+}
+
+typedef struct RectTransformInteraction {
+	float orig_mouse[3];
+	float orig_matrix_offset[4][4];
+	float orig_matrix_final_no_offset[4][4];
+} RectTransformInteraction;
+
+static void manipulator_cage3d_setup(wmManipulator *mpr)
+{
+	mpr->flag |= /* WM_MANIPULATOR_DRAW_MODAL | */ /* TODO */
+	             WM_MANIPULATOR_DRAW_NO_SCALE;
+}
+
+static int manipulator_cage3d_invoke(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	RectTransformInteraction *data = MEM_callocN(sizeof(RectTransformInteraction), "cage_interaction");
+
+	copy_m4_m4(data->orig_matrix_offset, mpr->matrix_offset);
+	manipulator_calc_matrix_final_no_offset(mpr, data->orig_matrix_final_no_offset, true);
+
+	if (manipulator_window_project_3d(
+	        C, mpr, (const float[2]){UNPACK2(event->mval)}, false, data->orig_mouse) == 0)
+	{
+		zero_v3(data->orig_mouse);
+	}
+
+	mpr->interaction_data = data;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int manipulator_cage3d_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	/* For transform logic to be managable we operate in -0.5..0.5 2D space,
+	 * no matter the size of the rectangle, mouse coorts are scaled to unit space.
+	 * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment.
+	 *
+	 * - The cursor offset are multiplied by 'dims'.
+	 * - Matrix translation is also multiplied by 'dims'.
+	 */
+	RectTransformInteraction *data = mpr->interaction_data;
+	float point_local[3];
+
+	float dims[3];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+
+	{
+		float matrix_back[4][4];
+		copy_m4_m4(matrix_back, mpr->matrix_offset);
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+
+		bool ok = manipulator_window_project_3d(
+		        C, mpr, (const float[2]){UNPACK2(event->mval)}, false, point_local);
+		copy_m4_m4(mpr->matrix_offset, matrix_back);
+		if (!ok) {
+			return OPERATOR_RUNNING_MODAL;
+		}
+	}
+
+	const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
+	wmManipulatorProperty *mpr_prop;
+
+	mpr_prop = WM_manipulator_target_property_find(mpr, "matrix");
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+	}
+
+	if (mpr->highlight_part == ED_MANIPULATOR_CAGE3D_PART_TRANSLATE) {
+		/* do this to prevent clamping from changing size */
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+		mpr->matrix_offset[3][0] = data->orig_matrix_offset[3][0] + (point_local[0] - data->orig_mouse[0]);
+		mpr->matrix_offset[3][1] = data->orig_matrix_offset[3][1] + (point_local[1] - data->orig_mouse[1]);
+		mpr->matrix_offset[3][2] = data->orig_matrix_offset[3][2] + (point_local[2] - data->orig_mouse[2]);
+	}
+	else if (mpr->highlight_part == ED_MANIPULATOR_CAGE3D_PART_ROTATE) {
+		/* TODO (if needed) */
+	}
+	else {
+		/* scale */
+		copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+		float pivot[3];
+		bool constrain_axis[3] = {false};
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE) {
+			manipulator_rect_pivot_from_scale_part(mpr->highlight_part, pivot, constrain_axis);
+		}
+		else {
+			zero_v3(pivot);
+		}
+
+		/* Cursor deltas scaled to (-0.5..0.5). */
+		float delta_orig[3], delta_curr[3];
+
+		for (int i = 0; i < 3; i++) {
+			delta_orig[i] = ((data->orig_mouse[i] - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
+			delta_curr[i] = ((point_local[i]      - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
+		}
+
+		float scale[3] = {1.0f, 1.0f, 1.0f};
+		for (int i = 0; i < 3; i++) {
+			if (constrain_axis[i] == false) {
+				if (delta_orig[i] < 0.0f) {
+					delta_orig[i] *= -1.0f;
+					delta_curr[i] *= -1.0f;
+				}
+				const int sign = signum_i(scale[i]);
+
+				scale[i] = 1.0f + ((delta_curr[i] - delta_orig[i]) / len_v3(data->orig_matrix_offset[i]));
+
+				if ((transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_SIGNED) == 0) {
+					if (sign != signum_i(scale[i])) {
+						scale[i] = 0.0f;
+					}
+				}
+			}
+		}
+
+		if (transform_flag & ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM) {
+			if (constrain_axis[0] == false && constrain_axis[1] == false) {
+				scale[1] = scale[0] = (scale[1] + scale[0]) / 2.0f;
+			}
+			else if (constrain_axis[0] == false) {
+				scale[1] = scale[0];
+			}
+			else if (constrain_axis[1] == false) {
+				scale[0] = scale[1];
+			}
+			else {
+				BLI_assert(0);
+			}
+		}
+
+		/* scale around pivot */
+		float matrix_scale[4][4];
+		unit_m4(matrix_scale);
+
+		mul_v3_fl(matrix_scale[0], scale[0]);
+		mul_v3_fl(matrix_scale[1], scale[1]);
+		mul_v3_fl(matrix_scale[2], scale[2]);
+
+		transform_pivot_set_m4(
+		        matrix_scale,
+		        (const float[3]){pivot[0] * dims[0], pivot[1] * dims[1], pivot[2] * dims[2]});
+		mul_m4_m4m4(mpr->matrix_offset, data->orig_matrix_offset, matrix_scale);
+	}
+
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_set_array(C, mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+	}
+
+	/* tag the region for redraw */
+	ED_region_tag_redraw(CTX_wm_region(C));
+	WM_event_add_mousemove(C);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void manipulator_cage3d_property_update(wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
+{
+	if (STREQ(mpr_prop->type->idname, "matrix")) {
+		if (WM_manipulator_target_property_array_length(mpr, mpr_prop) == 16) {
+			WM_manipulator_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+		}
+		else {
+			BLI_assert(0);
+		}
+	}
+	else {
+		BLI_assert(0);
+	}
+}
+
+static void manipulator_cage3d_exit(bContext *C, wmManipulator *mpr, const bool cancel)
+{
+	RectTransformInteraction *data = mpr->interaction_data;
+
+	if (!cancel)
+		return;
+
+	wmManipulatorProperty *mpr_prop;
+
+	/* reset properties */
+	mpr_prop = WM_manipulator_target_property_find(mpr, "matrix");
+	if (mpr_prop->type != NULL) {
+		WM_manipulator_target_property_value_set_array(C, mpr, mpr_prop, &data->orig_matrix_offset[0][0]);
+	}
+
+	copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+}
+
+
+/* -------------------------------------------------------------------- */
+/** \name Cage Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_cage_3d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_cage_3d";
+
+	/* api callbacks */
+	wt->draw = manipulator_cage3d_draw;
+	wt->draw_select = manipulator_cage3d_draw_select;
+	wt->setup = manipulator_cage3d_setup;
+	wt->invoke = manipulator_cage3d_invoke;
+	wt->property_update = manipulator_cage3d_property_update;
+	wt->modal = manipulator_cage3d_modal;
+	wt->exit = manipulator_cage3d_exit;
+	wt->cursor_get = manipulator_cage3d_get_cursor;
+
+	wt->struct_size = sizeof(wmManipulator);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_style[] = {
+		{ED_MANIPULATOR_CAGE2D_STYLE_BOX, "BOX", 0, "Box", ""},
+		{ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE, "CIRCLE", 0, "Circle", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_transform[] = {
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
+		{ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE, "XFORM_CENTER_HANDLE", 0, "Center Handle", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static float unit_v3[3] = {1.0f, 1.0f, 1.0f};
+	RNA_def_float_vector(wt->srna, "dimensions", 3, unit_v3, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
+	RNA_def_enum_flag(wt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
+	RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_CAGE2D_STYLE_CIRCLE, "Draw Style", "");
+	RNA_def_enum_flag(
+	        wt->srna, "draw_options", rna_enum_draw_options,
+	        ED_MANIPULATOR_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE, "Draw Options", "");
+
+	WM_manipulatortype_target_property_def(wt, "matrix", PROP_FLOAT, 16);
+}
+
+void ED_manipulatortypes_cage_3d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_cage_3d);
+}
+
+/** \} */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
new file mode 100644
index 00000000000..a3034597f56
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -0,0 +1,482 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file dial3d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Dial Manipulator
+ *
+ * 3D Manipulator
+ *
+ * \brief Circle shaped manipulator for circular interaction.
+ * Currently no own handling, use with operator only.
+ *
+ * - `matrix[0]` is derived from Y and Z.
+ * - `matrix[1]` is 'up' when DialManipulator.use_start_y_axis is set.
+ * - `matrix[2]` is the axis the dial rotates around (all dials).
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_geometry.h"
+#include "../manipulator_library_intern.h"
+
+/* to use custom dials exported to geom_dial_manipulator.c */
+// #define USE_MANIPULATOR_CUSTOM_DIAL
+
+static int manipulator_dial_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak tweak_flag);
+
+typedef struct DialInteraction {
+	float init_mval[2];
+
+	/* only for when using properties */
+	float init_prop_angle;
+
+	/* cache the last angle to detect rotations bigger than -/+ PI */
+	float last_angle;
+	/* number of full rotations */
+	int rotations;
+
+	/* final output values, used for drawing */
+	struct {
+		float angle_ofs;
+		float angle_delta;
+	} output;
+} DialInteraction;
+
+#define DIAL_WIDTH       1.0f
+#define DIAL_RESOLUTION 48
+
+/**
+ * We can't use this for the #wmManipulatorType.matrix_basis_get callback, it conflicts with depth picking.
+ */
+static void dial_calc_matrix(const wmManipulator *mpr, float mat[4][4])
+{
+	float rot[3][3];
+	const float up[3] = {0.0f, 0.0f, 1.0f};
+
+	rotation_between_vecs_to_mat3(rot, up, mpr->matrix_basis[2]);
+	copy_m4_m3(mat, rot);
+	copy_v3_v3(mat[3], mpr->matrix_basis[3]);
+}
+
+/* -------------------------------------------------------------------- */
+
+static void dial_geom_draw(
+        const wmManipulator *mpr, const float color[4], const bool select,
+        float axis_modal_mat[4][4], float clip_plane[4])
+{
+#ifdef USE_MANIPULATOR_CUSTOM_DIAL
+	UNUSED_VARS(dial, col, axis_modal_mat, clip_plane);
+	wm_manipulator_geometryinfo_draw(&wm_manipulator_geom_data_dial, select);
+#else
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const bool filled = (draw_options & ED_MANIPULATOR_DIAL_DRAW_FLAG_FILL) != 0;
+
+	glLineWidth(mpr->line_width);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	if (clip_plane) {
+		immBindBuiltinProgram(GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR);
+		float clip_plane_f[4] = {clip_plane[0], clip_plane[1], clip_plane[2], clip_plane[3]};
+		immUniform4fv("ClipPlane", clip_plane_f);
+		immUniformMatrix4fv("ModelMatrix", axis_modal_mat);
+	}
+	else {
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	}
+
+	immUniformColor4fv(color);
+
+	if (filled) {
+		imm_draw_circle_fill_2d(pos, 0, 0, 1.0, DIAL_RESOLUTION);
+	}
+	else {
+		imm_draw_circle_wire_2d(pos, 0, 0, 1.0, DIAL_RESOLUTION);
+	}
+
+	immUnbindProgram();
+
+	UNUSED_VARS(select);
+#endif
+}
+
+/**
+ * Draws a line from (0, 0, 0) to \a co_outer, at \a angle.
+ */
+static void dial_ghostarc_draw_helpline(const float angle, const float co_outer[3], const float color[4])
+{
+	glLineWidth(1.0f);
+
+	gpuPushMatrix();
+	gpuRotate3f(RAD2DEGF(angle), 0.0f, 0.0f, -1.0f);
+
+	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
+	immUniformColor4fv(color);
+
+	immBegin(GWN_PRIM_LINE_STRIP, 2);
+	immVertex3f(pos, 0.0f, 0.0f, 0.0f);
+	immVertex3fv(pos, co_outer);
+	immEnd();
+
+	immUnbindProgram();
+
+	gpuPopMatrix();
+}
+
+static void dial_ghostarc_draw(
+        const wmManipulator *mpr, const float angle_ofs, const float angle_delta, const float color[4])
+{
+	const float width_inner = DIAL_WIDTH - mpr->line_width * 0.5f / U.manipulator_size;
+
+	Gwn_VertFormat *format = immVertexFormat();
+	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	immUniformColor4fv(color);
+	imm_draw_disk_partial_fill_2d(
+	        pos, 0, 0, 0.0, width_inner, DIAL_RESOLUTION, RAD2DEGF(angle_ofs), RAD2DEGF(angle_delta));
+	immUnbindProgram();
+}
+
+static void dial_ghostarc_get_angles(
+        struct Depsgraph *depsgraph,
+        const wmManipulator *mpr,
+        const wmEvent *event,
+        const ARegion *ar, const View3D *v3d,
+        float mat[4][4], const float co_outer[3],
+        float *r_start, float *r_delta)
+{
+	DialInteraction *inter = mpr->interaction_data;
+	const RegionView3D *rv3d = ar->regiondata;
+	const float mval[2] = {event->x - ar->winrct.xmin, event->y - ar->winrct.ymin};
+
+	/* we might need to invert the direction of the angles */
+	float view_vec[3], axis_vec[3];
+	ED_view3d_global_to_vector(rv3d, mpr->matrix_basis[3], view_vec);
+	normalize_v3_v3(axis_vec, mpr->matrix_basis[2]);
+
+	float proj_outer_rel[3];
+	mul_v3_project_m4_v3(proj_outer_rel, mat, co_outer);
+	sub_v3_v3(proj_outer_rel, mpr->matrix_basis[3]);
+
+	float proj_mval_new_rel[3];
+	float proj_mval_init_rel[3];
+	float dial_plane[4];
+	float ray_co[3], ray_no[3];
+	float ray_lambda;
+
+	plane_from_point_normal_v3(dial_plane, mpr->matrix_basis[3], axis_vec);
+
+	if (!ED_view3d_win_to_ray(depsgraph, ar, v3d, inter->init_mval, ray_co, ray_no, false) ||
+	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+	{
+		goto fail;
+	}
+	madd_v3_v3v3fl(proj_mval_init_rel, ray_co, ray_no, ray_lambda);
+	sub_v3_v3(proj_mval_init_rel, mpr->matrix_basis[3]);
+
+	if (!ED_view3d_win_to_ray(depsgraph, ar, v3d, mval, ray_co, ray_no, false) ||
+	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+	{
+		goto fail;
+	}
+	madd_v3_v3v3fl(proj_mval_new_rel, ray_co, ray_no, ray_lambda);
+	sub_v3_v3(proj_mval_new_rel, mpr->matrix_basis[3]);
+
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+
+	/* Start direction from mouse or set by user */
+	const float *proj_init_rel =
+	        (draw_options & ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y) ?
+	        mpr->matrix_basis[1] : proj_mval_init_rel;
+
+	/* return angles */
+	const float start = angle_wrap_rad(angle_signed_on_axis_v3v3_v3(proj_outer_rel, proj_init_rel, axis_vec));
+	const float delta = angle_wrap_rad(angle_signed_on_axis_v3v3_v3(proj_mval_init_rel, proj_mval_new_rel, axis_vec));
+
+	/* Change of sign, we passed the 180 degree threshold. This means we need to add a turn
+	 * to distinguish between transition from 0 to -1 and -PI to +PI, use comparison with PI/2.
+	 * Logic taken from BLI_dial_angle */
+	if ((delta * inter->last_angle < 0.0f) &&
+	    (fabsf(inter->last_angle) > (float)M_PI_2))
+	{
+		if (inter->last_angle < 0.0f)
+			inter->rotations--;
+		else
+			inter->rotations++;
+	}
+	inter->last_angle = delta;
+
+	*r_start = start;
+	*r_delta = fmod(delta + 2.0f * (float)M_PI * inter->rotations, 2 * (float)M_PI);
+	return;
+
+	/* If we can't project (unlikely). */
+fail:
+	*r_start = 0.0;
+	*r_delta = 0.0;
+}
+
+static void dial_draw_intern(
+        const bContext *C, wmManipulator *mpr,
+        const bool select, const bool highlight, float clip_plane[4])
+{
+	float matrix_basis_adjust[4][4];
+	float matrix_final[4][4];
+	float color[4];
+
+	BLI_assert(CTX_wm_area(C)->spacetype == SPACE_VIEW3D);
+
+	manipulator_color_get(mpr, highlight, color);
+
+	dial_calc_matrix(mpr, matrix_basis_adjust);
+
+	WM_manipulator_calc_matrix_final_params(
+	        mpr, &((struct WM_ManipulatorMatrixParams) {
+	            .matrix_basis = (void *)matrix_basis_adjust,
+	        }), matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	/* draw rotation indicator arc first */
+	if ((mpr->flag & WM_MANIPULATOR_DRAW_VALUE) &&
+	    (mpr->state & WM_MANIPULATOR_STATE_MODAL))
+	{
+		const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; /* coordinate at which the arc drawing will be started */
+
+		DialInteraction *inter = mpr->interaction_data;
+
+		/* XXX, View3D rotation manipulator doesn't call modal. */
+		if (!WM_manipulator_target_property_is_valid_any(mpr)) {
+			wmWindow *win = CTX_wm_window(C);
+			manipulator_dial_modal((bContext *)C, mpr, win->eventstate, 0);
+		}
+
+		float angle_ofs = inter->output.angle_ofs;
+		float angle_delta = inter->output.angle_delta;
+
+		/* draw! */
+		for (int i = 0; i < 2; i++) {
+			glDisable(GL_POLYGON_SMOOTH);
+			dial_ghostarc_draw(mpr, angle_ofs, angle_delta, (const float[4]){0.8f, 0.8f, 0.8f, 0.4f});
+			glEnable(GL_POLYGON_SMOOTH);
+
+			dial_ghostarc_draw_helpline(angle_ofs, co_outer, color); /* starting position */
+			dial_ghostarc_draw_helpline(angle_ofs + angle_delta, co_outer, color); /* starting position + current value */
+
+			if (i == 0) {
+				const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+				if ((draw_options & ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR) == 0) {
+					break;
+				}
+			}
+
+			angle_ofs += (float)M_PI;
+		}
+	}
+
+	/* draw actual dial manipulator */
+	dial_geom_draw(mpr, color, select, matrix_basis_adjust, clip_plane);
+
+	gpuPopMatrix();
+}
+
+static void manipulator_dial_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
+{
+	float clip_plane_buf[4];
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	float *clip_plane = (draw_options & ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP) ? clip_plane_buf : NULL;
+
+	/* enable clipping if needed */
+	if (clip_plane) {
+		ARegion *ar = CTX_wm_region(C);
+		RegionView3D *rv3d = ar->regiondata;
+
+		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
+		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], mpr->matrix_basis[3]);
+		glEnable(GL_CLIP_DISTANCE0);
+	}
+
+	GPU_select_load_id(select_id);
+	dial_draw_intern(C, mpr, true, false, clip_plane);
+
+	if (clip_plane) {
+		glDisable(GL_CLIP_DISTANCE0);
+	}
+}
+
+static void manipulator_dial_draw(const bContext *C, wmManipulator *mpr)
+{
+	const bool is_modal = mpr->state & WM_MANIPULATOR_STATE_MODAL;
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+	float clip_plane_buf[4];
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	float *clip_plane = (!is_modal && (draw_options & ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP)) ? clip_plane_buf : NULL;
+
+	/* enable clipping if needed */
+	if (clip_plane) {
+		ARegion *ar = CTX_wm_region(C);
+		RegionView3D *rv3d = ar->regiondata;
+
+		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
+		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], mpr->matrix_basis[3]);
+		clip_plane[3] -= 0.02f * mpr->scale_final;
+
+		glEnable(GL_CLIP_DISTANCE0);
+	}
+
+	glEnable(GL_BLEND);
+	dial_draw_intern(C, mpr, false, is_highlight, clip_plane);
+	glDisable(GL_BLEND);
+
+	if (clip_plane) {
+		glDisable(GL_CLIP_DISTANCE0);
+	}
+}
+
+static int manipulator_dial_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; /* coordinate at which the arc drawing will be started */
+	float angle_ofs, angle_delta;
+
+	float matrix[4][4];
+
+	dial_calc_matrix(mpr, matrix);
+
+	dial_ghostarc_get_angles(
+	        CTX_data_depsgraph(C),
+	        mpr, event, CTX_wm_region(C), CTX_wm_view3d(C), matrix, co_outer, &angle_ofs, &angle_delta);
+
+	DialInteraction *inter = mpr->interaction_data;
+
+	inter->output.angle_delta = angle_delta;
+	inter->output.angle_ofs = angle_ofs;
+
+	/* set the property for the operator and call its modal function */
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		WM_manipulator_target_property_value_set(C, mpr, mpr_prop, inter->init_prop_angle + angle_delta);
+	}
+	return OPERATOR_RUNNING_MODAL;
+}
+
+
+static void manipulator_dial_setup(wmManipulator *mpr)
+{
+	const float dir_default[3] = {0.0f, 0.0f, 1.0f};
+
+	/* defaults */
+	copy_v3_v3(mpr->matrix_basis[2], dir_default);
+}
+
+static int manipulator_dial_invoke(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	DialInteraction *inter = MEM_callocN(sizeof(DialInteraction), __func__);
+
+	inter->init_mval[0] = event->mval[0];
+	inter->init_mval[1] = event->mval[1];
+
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		inter->init_prop_angle = WM_manipulator_target_property_value_get(mpr, mpr_prop);
+	}
+
+	mpr->interaction_data = inter;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+/* -------------------------------------------------------------------- */
+/** \name Dial Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_dial_3d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_dial_3d";
+
+	/* api callbacks */
+	wt->draw = manipulator_dial_draw;
+	wt->draw_select = manipulator_dial_draw_select;
+	wt->setup = manipulator_dial_setup;
+	wt->invoke = manipulator_dial_invoke;
+	wt->modal = manipulator_dial_modal;
+
+	wt->struct_size = sizeof(wmManipulator);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP, "CLIP", 0, "Clipped", ""},
+		{ED_MANIPULATOR_DIAL_DRAW_FLAG_FILL, "FILL", 0, "Filled", ""},
+		{ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR, "ANGLE_MIRROR", 0, "Angle Mirror", ""},
+		{ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y, "ANGLE_START_Y", 0, "Angle Start Y", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+
+	WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 1);
+}
+
+void ED_manipulatortypes_dial_3d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_dial_3d);
+}
+
+/** \} */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
new file mode 100644
index 00000000000..e2d1979b7a6
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
@@ -0,0 +1,374 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file grab3d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Grab Manipulator
+ *
+ * 3D Manipulator, also works in 2D views.
+ *
+ * \brief Simple manipulator to grab and translate.
+ *
+ * - `matrix[0]` is derived from Y and Z.
+ * - `matrix[1]` currently not used.
+ * - `matrix[2]` is the widget direction (for all manipulators).
+ *
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_geometry.h"
+#include "../manipulator_library_intern.h"
+
+typedef struct GrabManipulator3D {
+	wmManipulator manipulator;
+	/* Added to 'matrix_basis' when calculating the matrix. */
+	float prop_co[3];
+} GrabManipulator3D;
+
+static void manipulator_grab_matrix_basis_get(const wmManipulator *mpr, float r_matrix[4][4])
+{
+	GrabManipulator3D *grab = (GrabManipulator3D *)mpr;
+
+	copy_m4_m4(r_matrix, grab->manipulator.matrix_basis);
+	add_v3_v3(r_matrix[3], grab->prop_co);
+}
+
+static int manipulator_grab_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak tweak_flag);
+
+typedef struct GrabInteraction {
+	float init_mval[2];
+
+	/* only for when using properties */
+	float init_prop_co[3];
+
+	float init_matrix_final[4][4];
+} GrabInteraction;
+
+#define DIAL_RESOLUTION 32
+
+/* -------------------------------------------------------------------- */
+
+static void grab_geom_draw(
+        const wmManipulator *mpr, const float color[4], const bool select, const int draw_options)
+{
+#ifdef USE_MANIPULATOR_CUSTOM_DIAL
+	UNUSED_VARS(grab3d, col, axis_modal_mat);
+	wm_manipulator_geometryinfo_draw(&wm_manipulator_geom_data_grab3d, select);
+#else
+	const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
+	const bool filled = (draw_options & ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL) != 0;
+
+	glLineWidth(mpr->line_width);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
+	immUniformColor4fv(color);
+
+	if (draw_style == ED_MANIPULATOR_GRAB_STYLE_RING_2D) {
+		if (filled) {
+			imm_draw_circle_fill_2d(pos, 0, 0, 1.0f, DIAL_RESOLUTION);
+		}
+		else {
+			imm_draw_circle_wire_2d(pos, 0, 0, 1.0f, DIAL_RESOLUTION);
+		}
+	}
+	else if (draw_style == ED_MANIPULATOR_GRAB_STYLE_CROSS_2D) {
+		immBegin(GWN_PRIM_LINES, 4);
+		immVertex2f(pos,  1.0f,  1.0f);
+		immVertex2f(pos, -1.0f, -1.0f);
+
+		immVertex2f(pos, -1.0f,  1.0f);
+		immVertex2f(pos,  1.0f, -1.0f);
+		immEnd();
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	immUnbindProgram();
+
+	UNUSED_VARS(select);
+#endif
+}
+
+static void grab3d_get_translate(
+        const wmManipulator *mpr, const wmEvent *event, const ARegion *ar,
+        float co_delta[3])
+{
+	GrabInteraction *inter = mpr->interaction_data;
+	const float mval_delta[2] = {
+	    event->mval[0] - inter->init_mval[0],
+	    event->mval[1] - inter->init_mval[1],
+	};
+
+	RegionView3D *rv3d = ar->regiondata;
+	float co_ref[3];
+	mul_v3_mat3_m4v3(co_ref, mpr->matrix_space, inter->init_prop_co);
+	const float zfac = ED_view3d_calc_zfac(rv3d, co_ref, NULL);
+
+	ED_view3d_win_to_delta(ar, mval_delta, co_delta, zfac);
+
+	float matrix_space_inv[3][3];
+	copy_m3_m4(matrix_space_inv, mpr->matrix_space);
+	invert_m3(matrix_space_inv);
+	mul_m3_v3(matrix_space_inv, co_delta);
+}
+
+static void grab3d_draw_intern(
+        const bContext *C, wmManipulator *mpr,
+        const bool select, const bool highlight)
+{
+	GrabInteraction *inter = mpr->interaction_data;
+	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const bool align_view = (draw_options & ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW) != 0;
+	float color[4];
+	float matrix_final[4][4];
+	float matrix_align[4][4];
+
+	manipulator_color_get(mpr, highlight, color);
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	if (align_view) {
+		float matrix_final_unit[4][4];
+		RegionView3D *rv3d = CTX_wm_region_view3d(C);
+		normalize_m4_m4(matrix_final_unit, matrix_final);
+		mul_m4_m4m4(matrix_align, rv3d->viewmat, matrix_final_unit);
+		zero_v3(matrix_align[3]);
+		transpose_m4(matrix_align);
+		gpuMultMatrix(matrix_align);
+	}
+
+	glEnable(GL_BLEND);
+	grab_geom_draw(mpr, color, select, draw_options);
+	glDisable(GL_BLEND);
+	gpuPopMatrix();
+
+	if (mpr->interaction_data) {
+		gpuPushMatrix();
+		gpuMultMatrix(inter->init_matrix_final);
+
+		if (align_view) {
+			gpuMultMatrix(matrix_align);
+		}
+
+		glEnable(GL_BLEND);
+		grab_geom_draw(mpr, (const float[4]){0.5f, 0.5f, 0.5f, 0.5f}, select, draw_options);
+		glDisable(GL_BLEND);
+		gpuPopMatrix();
+	}
+}
+
+static void manipulator_grab_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
+{
+	GPU_select_load_id(select_id);
+	grab3d_draw_intern(C, mpr, true, false);
+}
+
+static void manipulator_grab_draw(const bContext *C, wmManipulator *mpr)
+{
+	const bool is_modal = mpr->state & WM_MANIPULATOR_STATE_MODAL;
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+
+	(void)is_modal;
+
+	glEnable(GL_BLEND);
+	grab3d_draw_intern(C, mpr, false, is_highlight);
+	glDisable(GL_BLEND);
+}
+
+static int manipulator_grab_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	GrabManipulator3D *grab = (GrabManipulator3D *)mpr;
+	GrabInteraction *inter = mpr->interaction_data;
+	ARegion *ar = CTX_wm_region(C);
+
+	float prop_delta[3];
+	if (CTX_wm_area(C)->spacetype == SPACE_VIEW3D) {
+		grab3d_get_translate(mpr, event, ar, prop_delta);
+	}
+	else {
+		float mval_proj_init[2], mval_proj_curr[2];
+		if ((manipulator_window_project_2d(
+		         C, mpr, inter->init_mval, 2, false, mval_proj_init) == false) ||
+		    (manipulator_window_project_2d(
+		         C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, false, mval_proj_curr) == false))
+		{
+			return OPERATOR_RUNNING_MODAL;
+		}
+		sub_v2_v2v2(prop_delta, mval_proj_curr, mval_proj_init);
+		prop_delta[2] = 0.0f;
+	}
+	add_v3_v3v3(grab->prop_co, inter->init_prop_co, prop_delta);
+
+	/* set the property for the operator and call its modal function */
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		WM_manipulator_target_property_value_set_array(C, mpr, mpr_prop, grab->prop_co);
+	}
+	else {
+		zero_v3(grab->prop_co);
+	}
+
+	ED_region_tag_redraw(ar);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int manipulator_grab_invoke(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	GrabInteraction *inter = MEM_callocN(sizeof(GrabInteraction), __func__);
+
+	inter->init_mval[0] = event->mval[0];
+	inter->init_mval[1] = event->mval[1];
+
+#if 0
+	copy_v3_v3(inter->init_prop_co, grab->prop_co);
+#else
+	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_find(mpr, "offset");
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		WM_manipulator_target_property_value_get_array(mpr, mpr_prop, inter->init_prop_co);
+	}
+#endif
+
+	WM_manipulator_calc_matrix_final(mpr, inter->init_matrix_final);
+
+	mpr->interaction_data = inter;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+
+static int manipulator_grab_test_select(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	float point_local[2];
+
+	if (manipulator_window_project_2d(
+	        C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, true, point_local) == false)
+	{
+		return -1;
+	}
+
+	/* The 'mpr->scale_final' is already applied when projecting. */
+	if (len_squared_v2(point_local) < 1.0f) {
+		return 0;
+	}
+
+	return -1;
+}
+
+static void manipulator_grab_property_update(wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
+{
+	GrabManipulator3D *grab = (GrabManipulator3D *)mpr;
+	if (WM_manipulator_target_property_is_valid(mpr_prop)) {
+		WM_manipulator_target_property_value_get_array(mpr, mpr_prop, grab->prop_co);
+	}
+	else {
+		zero_v3(grab->prop_co);
+	}
+}
+
+static int manipulator_grab_cursor_get(wmManipulator *UNUSED(mpr))
+{
+	return BC_NSEW_SCROLLCURSOR;
+}
+
+/* -------------------------------------------------------------------- */
+/** \name Grab Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_grab_3d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_grab_3d";
+
+	/* api callbacks */
+	wt->draw = manipulator_grab_draw;
+	wt->draw_select = manipulator_grab_draw_select;
+	wt->test_select = manipulator_grab_test_select;
+	wt->matrix_basis_get = manipulator_grab_matrix_basis_get;
+	wt->invoke = manipulator_grab_invoke;
+	wt->property_update = manipulator_grab_property_update;
+	wt->modal = manipulator_grab_modal;
+	wt->cursor_get = manipulator_grab_cursor_get;
+
+	wt->struct_size = sizeof(GrabManipulator3D);
+
+	/* rna */
+	static EnumPropertyItem rna_enum_draw_style[] = {
+		{ED_MANIPULATOR_GRAB_STYLE_RING_2D, "RING_2D", 0, "Ring", ""},
+		{ED_MANIPULATOR_GRAB_STYLE_CROSS_2D, "CROSS_2D", 0, "Ring", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	static EnumPropertyItem rna_enum_draw_options[] = {
+		{ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL, "FILL", 0, "Filled", ""},
+		{ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW, "ALIGN_VIEW", 0, "Align View", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_GRAB_STYLE_RING_2D, "Draw Style", "");
+	RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+
+	WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 3);
+}
+
+void ED_manipulatortypes_grab_3d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_grab_3d);
+}
+
+/** \} */ // Grab Manipulator API
diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
new file mode 100644
index 00000000000..531cf742e6f
--- /dev/null
+++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
@@ -0,0 +1,190 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file primitive3d_manipulator.c
+ *  \ingroup wm
+ *
+ * \name Primitive Manipulator
+ *
+ * 3D Manipulator
+ *
+ * \brief Manipulator with primitive drawing type (plane, cube, etc.).
+ * Currently only plane primitive supported without own handling, use with operator only.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "DNA_view3d_types.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_manipulator_library.h"
+
+/* own includes */
+#include "../manipulator_library_intern.h"
+
+static float verts_plane[4][3] = {
+	{-1, -1, 0},
+	{ 1, -1, 0},
+	{ 1,  1, 0},
+	{-1,  1, 0},
+};
+
+
+/* -------------------------------------------------------------------- */
+
+static void manipulator_primitive_draw_geom(
+        const float col_inner[4], const float col_outer[4], const int draw_style)
+{
+	float (*verts)[3];
+	uint vert_count = 0;
+
+	if (draw_style == ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE) {
+		verts = verts_plane;
+		vert_count = ARRAY_SIZE(verts_plane);
+	}
+
+	if (vert_count > 0) {
+		uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		wm_manipulator_vec_draw(col_inner, verts, vert_count, pos, GWN_PRIM_TRI_FAN);
+		wm_manipulator_vec_draw(col_outer, verts, vert_count, pos, GWN_PRIM_LINE_LOOP);
+		immUnbindProgram();
+	}
+}
+
+static void manipulator_primitive_draw_intern(
+        wmManipulator *mpr, const bool UNUSED(select),
+        const bool highlight)
+{
+	float color_inner[4], color_outer[4];
+	float matrix_final[4][4];
+	const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
+
+	manipulator_color_get(mpr, highlight, color_outer);
+	copy_v4_v4(color_inner, color_outer);
+	color_inner[3] *= 0.5f;
+
+	WM_manipulator_calc_matrix_final(mpr, matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	glEnable(GL_BLEND);
+	manipulator_primitive_draw_geom(color_inner, color_outer, draw_style);
+	glDisable(GL_BLEND);
+
+	gpuPopMatrix();
+
+	if (mpr->interaction_data) {
+		ManipulatorInteraction *inter = mpr->interaction_data;
+
+		copy_v4_fl(color_inner, 0.5f);
+		copy_v3_fl(color_outer, 0.5f);
+		color_outer[3] = 0.8f;
+
+		gpuPushMatrix();
+		gpuMultMatrix(inter->init_matrix_final);
+
+		glEnable(GL_BLEND);
+		manipulator_primitive_draw_geom(color_inner, color_outer, draw_style);
+		glDisable(GL_BLEND);
+
+		gpuPopMatrix();
+	}
+}
+
+static void manipulator_primitive_draw_select(
+        const bContext *UNUSED(C), wmManipulator *mpr,
+        int select_id)
+{
+	GPU_select_load_id(select_id);
+	manipulator_primitive_draw_intern(mpr, true, false);
+}
+
+static void manipulator_primitive_draw(const bContext *UNUSED(C), wmManipulator *mpr)
+{
+	manipulator_primitive_draw_intern(
+	        mpr, false,
+	        (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT));
+}
+
+static void manipulator_primitive_setup(wmManipulator *mpr)
+{
+	mpr->flag |= WM_MANIPULATOR_DRAW_MODAL;
+}
+
+static int manipulator_primitive_invoke(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *UNUSED(event))
+{
+	ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
+
+	WM_manipulator_calc_matrix_final(mpr, inter->init_matrix_final);
+
+	mpr->interaction_data = inter;
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+/* -------------------------------------------------------------------- */
+/** \name Primitive Manipulator API
+ *
+ * \{ */
+
+static void MANIPULATOR_WT_primitive_3d(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "MANIPULATOR_WT_primitive_3d";
+
+	/* api callbacks */
+	wt->draw = manipulator_primitive_draw;
+	wt->draw_select = manipulator_primitive_draw_select;
+	wt->setup = manipulator_primitive_setup;
+	wt->invoke = manipulator_primitive_invoke;
+
+	wt->struct_size = sizeof(wmManipulator);
+
+	static EnumPropertyItem rna_enum_draw_style[] = {
+		{ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE, "PLANE", 0, "Plane", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE, "Draw Style", "");
+}
+
+void ED_manipulatortypes_primitive_3d(void)
+{
+	WM_manipulatortype_append(MANIPULATOR_WT_primitive_3d);
+}
+
+/** \} */
diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt
index 033d034cf4e..d17df344dc9 100644
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -25,6 +25,7 @@ set(INC
 	../include
 	../../blenkernel
 	../../blenlib
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
index 69335195b96..ad1a567f843 100644
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@ -34,9 +34,10 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_mask_types.h"
@@ -692,7 +693,7 @@ static int add_feather_vertex_exec(bContext *C, wmOperator *op)
 
 		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 407c19a3860..689a96a3dec 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -36,6 +36,7 @@
 #include "BLI_math.h"
 #include "BLI_rect.h"
 #include "BLI_task.h"
+#include "BLI_listbase.h"
 
 #include "BKE_context.h"
 #include "BKE_mask.h"
@@ -48,10 +49,13 @@
 #include "ED_clip.h"
 #include "ED_mask.h"  /* own include */
 #include "ED_space_api.h"
-#include "BIF_gl.h"
+
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_draw.h"
+#include "GPU_shader.h"
+#include "GPU_matrix.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -93,40 +97,6 @@ static void mask_spline_feather_color_get(MaskLayer *UNUSED(masklay), MaskSpline
 	r_rgb[3] = 255;
 }
 
-#if 0
-static void draw_spline_parents(MaskLayer *UNUSED(masklay), MaskSpline *spline)
-{
-	int i;
-	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
-
-	if (!spline->tot_point)
-		return;
-
-	GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-	GPU_basic_shader_line_stipple(1, 0xAAAA);
-
-	glColor3ub(0, 0, 0);
-	glBegin(GL_LINES);
-
-	for (i = 0; i < spline->tot_point; i++) {
-		MaskSplinePoint *point = &points_array[i];
-		BezTriple *bezt = &point->bezt;
-
-		if (point->parent.id) {
-			glVertex2f(bezt->vec[1][0],
-			           bezt->vec[1][1]);
-
-			glVertex2f(bezt->vec[1][0] - point->parent.offset[0],
-			           bezt->vec[1][1] - point->parent.offset[1]);
-		}
-	}
-
-	glEnd();
-
-	GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-}
-#endif
-
 static void mask_point_undistort_pos(SpaceClip *sc, float r_co[2], const float co[2])
 {
 	BKE_mask_coord_to_movieclip(sc->clip, &sc->user, r_co, co);
@@ -134,46 +104,9 @@ static void mask_point_undistort_pos(SpaceClip *sc, float r_co[2], const float c
 	BKE_mask_coord_from_movieclip(sc->clip, &sc->user, r_co, r_co);
 }
 
-static void draw_circle(const float x, const float y,
-                        const float size, const bool fill,
-                        const float xscale, const float yscale)
-{
-	static GLuint wire_displist = 0;
-	static GLuint fill_displist = 0;
-	GLuint displist = fill ? fill_displist : wire_displist;
-
-	/* Initialize round circle shape. */
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, fill ? GLU_FILL : GLU_SILHOUETTE);
-		gluDisk(qobj, 0,  0.7, 8, 1);
-		gluDeleteQuadric(qobj);
-
-		glEndList();
-
-		if (fill) {
-			fill_displist = displist;
-		}
-		else {
-			wire_displist = displist;
-		}
-	}
-
-	glPushMatrix();
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * size, 1.0f / yscale * size, 1.0f);
-	glCallList(displist);
-	glPopMatrix();
-}
-
 static void draw_single_handle(const MaskLayer *mask_layer, const MaskSplinePoint *point,
                                const eMaskWhichHandle which_handle, const int draw_type,
-                               const float handle_size, const float xscale, const float yscale,
+                               const float handle_size,
                                const float point_pos[2], const float handle_pos[2])
 {
 	const BezTriple *bezt = &point->bezt;
@@ -190,54 +123,70 @@ static void draw_single_handle(const MaskLayer *mask_layer, const MaskSplinePoin
 		return;
 	}
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	const unsigned char rgb_gray[4] = {0x60, 0x60, 0x60, 0xff};
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3ubv(rgb_gray);
+
 	/* this could be split into its own loop */
 	if (draw_type == MASK_DT_OUTLINE) {
-		const unsigned char rgb_gray[4] = {0x60, 0x60, 0x60, 0xff};
-		glLineWidth(3);
-		glColor4ubv(rgb_gray);
-		glBegin(GL_LINES);
-		glVertex2fv(point_pos);
-		glVertex2fv(handle_pos);
-		glEnd();
+		glLineWidth(3.0f);
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2fv(pos, point_pos);
+		immVertex2fv(pos, handle_pos);
+		immEnd();
 	}
 
 	switch (handle_type) {
 		case HD_FREE:
-			UI_ThemeColor(TH_HANDLE_FREE);
+			immUniformThemeColor(TH_HANDLE_FREE);
 			break;
 		case HD_AUTO:
-			UI_ThemeColor(TH_HANDLE_AUTO);
+			immUniformThemeColor(TH_HANDLE_AUTO);
 			break;
 		case HD_ALIGN:
 		case HD_ALIGN_DOUBLESIDE:
-			UI_ThemeColor(TH_HANDLE_ALIGN);
+			immUniformThemeColor(TH_HANDLE_ALIGN);
 			break;
 	}
 
-	glLineWidth(1);
-	glBegin(GL_LINES);
-	glVertex2fv(point_pos);
-	glVertex2fv(handle_pos);
-	glEnd();
+	glLineWidth(1.0f);
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2fv(pos, point_pos);
+	immVertex2fv(pos, handle_pos);
+	immEnd();
+	immUnbindProgram();
 
 	/* draw handle points */
+	immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA);
+	immUniform1f("size", handle_size);
+	immUniform1f("outlineWidth", 1.5f);
+
+	float point_color[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* active color by default */
 	if (MASKPOINT_ISSEL_HANDLE(point, which_handle)) {
-		if (point == mask_layer->act_point)
-			glColor3f(1.0f, 1.0f, 1.0f);
-		else
-			UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
+		if (point != mask_layer->act_point) {
+			UI_GetThemeColor3fv(TH_HANDLE_VERTEX_SELECT, point_color);
+		}
 	}
 	else {
-		UI_ThemeColor(TH_HANDLE_VERTEX);
+		UI_GetThemeColor3fv(TH_HANDLE_VERTEX, point_color);
 	}
 
-	draw_circle(handle_pos[0], handle_pos[1], handle_size, false, xscale, yscale);
+	immUniform4fv("outlineColor", point_color);
+	immUniformColor3fvAlpha(point_color, 0.25f);
+
+	immBegin(GWN_PRIM_POINTS, 1);
+	immVertex2fv(pos, handle_pos);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 /* return non-zero if spline is selected */
 static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline *spline,
-                               const char draw_flag, const char draw_type,
-                               const float xscale, const float yscale)
+                               const char draw_flag, const char draw_type)
 {
 	const bool is_spline_sel = (spline->flag & SELECT) && (masklay->restrictflag & MASK_RESTRICT_SELECT) == 0;
 	const bool is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH) != 0;
@@ -247,7 +196,7 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	bool undistort = false;
 
-	int i, handle_size, tot_feather_point;
+	int tot_feather_point;
 	float (*feather_points)[2], (*fp)[2];
 	float min[2], max[2];
 
@@ -258,22 +207,24 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 		undistort = sc->clip && (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT);
 
 	/* TODO, add this to sequence editor */
-	handle_size = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE) * U.pixelsize;
-
-	glPointSize(handle_size);
+	float handle_size = 2.0f * UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE) * U.pixelsize;
 
 	mask_spline_color_get(masklay, spline, is_spline_sel, rgb_spline);
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
+	immUniform1f("size", 0.7f * handle_size);
+
 	/* feather points */
 	feather_points = fp = BKE_mask_spline_feather_points(spline, &tot_feather_point);
-	for (i = 0; i < spline->tot_point; i++) {
+	for (int i = 0; i < spline->tot_point; i++) {
 
 		/* watch it! this is intentionally not the deform array, only check for sel */
 		MaskSplinePoint *point = &spline->points[i];
 
-		int j;
-
-		for (j = 0; j <= point->tot_uw; j++) {
+		for (int j = 0; j <= point->tot_uw; j++) {
 			float feather_point[2];
 			bool sel = false;
 
@@ -291,32 +242,32 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 
 			if (sel) {
 				if (point == masklay->act_point)
-					glColor3f(1.0f, 1.0f, 1.0f);
+					immUniformColor3f(1.0f, 1.0f, 1.0f);
 				else
-					UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
+					immUniformThemeColor(TH_HANDLE_VERTEX_SELECT);
 			}
 			else {
-				UI_ThemeColor(TH_HANDLE_VERTEX);
+				immUniformThemeColor(TH_HANDLE_VERTEX);
 			}
 
-			glBegin(GL_POINTS);
-			glVertex2fv(feather_point);
-			glEnd();
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex2fv(pos, feather_point);
+			immEnd();
 
 			fp++;
 		}
 	}
 	MEM_freeN(feather_points);
 
+	immUnbindProgram();
+
 	if (is_smooth) {
 		glEnable(GL_LINE_SMOOTH);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}
 
 	/* control points */
 	INIT_MINMAX2(min, max);
-	for (i = 0; i < spline->tot_point; i++) {
+	for (int i = 0; i < spline->tot_point; i++) {
 
 		/* watch it! this is intentionally not the deform array, only check for sel */
 		MaskSplinePoint *point = &spline->points[i];
@@ -339,7 +290,7 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 				mask_point_undistort_pos(sc, handle, handle);
 			}
 			draw_single_handle(masklay, point, MASK_WHICH_HANDLE_STICK,
-			                   draw_type, handle_size, xscale, yscale, vert, handle);
+			                   draw_type, handle_size, vert, handle);
 		}
 		else {
 			float handle_left[2], handle_right[2];
@@ -350,53 +301,62 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 				mask_point_undistort_pos(sc, handle_left, handle_left);
 			}
 			draw_single_handle(masklay, point, MASK_WHICH_HANDLE_LEFT,
-			                   draw_type, handle_size, xscale, yscale, vert, handle_left);
+			                   draw_type, handle_size, vert, handle_left);
 			draw_single_handle(masklay, point, MASK_WHICH_HANDLE_RIGHT,
-			                   draw_type, handle_size, xscale, yscale, vert, handle_right);
+			                   draw_type, handle_size, vert, handle_right);
 		}
 
+		/* bind program in loop so it does not interfere with draw_single_handle */
+		immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
+
 		/* draw CV point */
 		if (MASKPOINT_ISSEL_KNOT(point)) {
 			if (point == masklay->act_point)
-				glColor3f(1.0f, 1.0f, 1.0f);
+				immUniformColor3f(1.0f, 1.0f, 1.0f);
 			else
-				UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
+				immUniformThemeColor(TH_HANDLE_VERTEX_SELECT);
 		}
 		else
-			UI_ThemeColor(TH_HANDLE_VERTEX);
+			immUniformThemeColor(TH_HANDLE_VERTEX);
+
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex2fv(pos, vert);
+		immEnd();
 
-		glBegin(GL_POINTS);
-		glVertex2fv(vert);
-		glEnd();
+		immUnbindProgram();
 
 		minmax_v2v2_v2(min, max, vert);
 	}
 
+	if (is_smooth) {
+		glDisable(GL_LINE_SMOOTH);
+	}
+
 	if (is_spline_sel) {
-		float x = (min[0] + max[0]) / 2.0f;
-		float y = (min[1] + max[1]) / 2.0f;
-		/* TODO(sergey): Remove hardcoded colors. */
+		float x = (min[0] + max[0]) * 0.5f;
+		float y = (min[1] + max[1]) * 0.5f;
+
+		immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA);
+		immUniform1f("outlineWidth", 1.5f);
+
 		if (masklay->act_spline == spline) {
-			glColor3ub(255, 255, 255);
+			immUniformColor3f(1.0f, 1.0f, 1.0f);
 		}
 		else {
-			glColor3ub(255, 255, 0);
+			immUniformColor3f(1.0f, 1.0f, 0.0f);
 		}
 
-		draw_circle(x, y, 6.0f, true, xscale, yscale);
+		immUniform4f("outlineColor", 0.0f, 0.0f, 0.0f, 1.0f);
+		immUniform1f("size", 12.0f);
 
-		glColor3ub(0, 0, 0);
-		draw_circle(x, y, 6.0f, false, xscale, yscale);
-	}
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex2f(pos, x, y);
+		immEnd();
 
-	if (is_smooth) {
-		glDisable(GL_LINE_SMOOTH);
-		glDisable(GL_BLEND);
+		immUnbindProgram();
 	}
 }
 
-/* #define USE_XOR */
-
 static void mask_color_active_tint(unsigned char r_rgb[4], const unsigned char rgb[4], const bool is_active)
 {
 	if (!is_active) {
@@ -410,13 +370,21 @@ static void mask_color_active_tint(unsigned char r_rgb[4], const unsigned char r
 	}
 }
 
+static void mask_draw_array(unsigned int pos, Gwn_PrimType prim_type, const float (*points)[2], unsigned int vertex_ct)
+{
+	immBegin(prim_type, vertex_ct);
+	for (unsigned int i = 0; i < vertex_ct; ++i) {
+		immVertex2fv(pos, points[i]);
+	}
+	immEnd();
+}
+
 static void mask_draw_curve_type(const bContext *C, MaskSpline *spline, float (*orig_points)[2], int tot_point,
-                                 const bool is_feather, const bool is_smooth, const bool is_active,
+                                 const bool is_feather, const bool is_active,
                                  const unsigned char rgb_spline[4], const char draw_type)
 {
-	const int draw_method = (spline->flag & MASK_SPLINE_CYCLIC) ? GL_LINE_LOOP : GL_LINE_STRIP;
+	const Gwn_PrimType draw_method = (spline->flag & MASK_SPLINE_CYCLIC) ? GWN_PRIM_LINE_LOOP : GWN_PRIM_LINE_STRIP;
 	const unsigned char rgb_black[4] = {0x00, 0x00, 0x00, 0xff};
-//	const unsigned char rgb_white[4] = {0xff, 0xff, 0xff, 0xff};
 	unsigned char rgb_tmp[4];
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	float (*points)[2] = orig_points;
@@ -425,65 +393,45 @@ static void mask_draw_curve_type(const bContext *C, MaskSpline *spline, float (*
 		const bool undistort = sc->clip && (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT);
 
 		if (undistort) {
-			int i;
-
 			points = MEM_callocN(2 * tot_point * sizeof(float), "undistorthed mask curve");
 
-			for (i = 0; i < tot_point; i++) {
+			for (int i = 0; i < tot_point; i++) {
 				mask_point_undistort_pos(sc, points[i], orig_points[i]);
 			}
 		}
 	}
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_FLOAT, 0, points);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
 	switch (draw_type) {
 
 		case MASK_DT_OUTLINE:
-			glLineWidth(3);
-
-			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
-			glColor4ubv(rgb_tmp);
-
-			glDrawArrays(draw_method, 0, tot_point);
+			/* TODO(merwin): use fancy line shader here
+			 * probably better with geometry shader (after core profile switch)
+			 */
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-			glLineWidth(1);
-			mask_color_active_tint(rgb_tmp, rgb_spline, is_active);
-			glColor4ubv(rgb_tmp);
-			glDrawArrays(draw_method, 0, tot_point);
+			glLineWidth(3.0f);
 
-			break;
+			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
+			immUniformColor4ubv(rgb_tmp);
+			mask_draw_array(pos, draw_method, points, tot_point);
 
-		case MASK_DT_DASH:
-		default:
-			GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-			GPU_basic_shader_line_stipple(3, 0xAAAA);
+			glLineWidth(1.0f);
 
-#ifdef USE_XOR
-			glEnable(GL_COLOR_LOGIC_OP);
-			glLogicOp(GL_OR);
-#endif
 			mask_color_active_tint(rgb_tmp, rgb_spline, is_active);
-			glColor4ubv(rgb_tmp);
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(2, GL_FLOAT, 0, points);
-			glDrawArrays(draw_method, 0, tot_point);
-
-#ifdef USE_XOR
-			glDisable(GL_COLOR_LOGIC_OP);
-#endif
-			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
-			glColor4ubv(rgb_tmp);
-			GPU_basic_shader_line_stipple(3, 0x5555);
-			glDrawArrays(draw_method, 0, tot_point);
+			immUniformColor4ubv(rgb_tmp);
+			mask_draw_array(pos, draw_method, points, tot_point);
 
-			GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+			immUnbindProgram();
 			break;
 
-
 		case MASK_DT_BLACK:
 		case MASK_DT_WHITE:
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			glLineWidth(1.0f);
+
 			if (draw_type == MASK_DT_BLACK) { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 0;   }
 			else                            { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 255; }
 			/* alpha values seem too low but gl draws many points that compensate for it */
@@ -496,26 +444,39 @@ static void mask_draw_curve_type(const bContext *C, MaskSpline *spline, float (*
 				rgb_tmp[2] = (unsigned char)(((short)rgb_tmp[2] + (short)rgb_spline[2]) / 2);
 			}
 
-			if (is_smooth == false && is_feather) {
-				glEnable(GL_BLEND);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			}
-
 			mask_color_active_tint(rgb_tmp, rgb_tmp, is_active);
-			glColor4ubv(rgb_tmp);
+			immUniformColor4ubv(rgb_tmp);
+			mask_draw_array(pos, draw_method, points, tot_point);
 
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(2, GL_FLOAT, 0, points);
-			glDrawArrays(draw_method, 0, tot_point);
+			immUnbindProgram();
+			break;
 
-			if (is_smooth == false && is_feather) {
-				glDisable(GL_BLEND);
-			}
+		case MASK_DT_DASH:
+			/* TODO(merwin): use dashed line shader here
+			 * probably better with geometry shader (after core profile switch)
+			 */
+#if 0
+			glLineWidth(1.0f);
+
+			GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+			GPU_basic_shader_line_stipple(3, 0xAAAA);
 
+			mask_color_active_tint(rgb_tmp, rgb_spline, is_active);
+			immUniformColor4ubv(rgb_tmp);
+			mask_draw_array(pos, draw_method, points, tot_point);
+
+			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
+			immUniformColor4ubv(rgb_tmp);
+			GPU_basic_shader_line_stipple(3, 0x5555);
+			mask_draw_array(pos, draw_method, points, tot_point);
+
+			GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+#endif
 			break;
-	}
 
-	glDisableClientState(GL_VERTEX_ARRAY);
+		default:
+			BLI_assert(false);
+	}
 
 	if (points != orig_points)
 		MEM_freeN(points);
@@ -548,8 +509,6 @@ static void draw_spline_curve(const bContext *C, MaskLayer *masklay, MaskSpline
 
 	if (is_smooth) {
 		glEnable(GL_LINE_SMOOTH);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}
 
 	feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution(spline, &tot_feather_point, resol, (is_fill != false));
@@ -557,26 +516,24 @@ static void draw_spline_curve(const bContext *C, MaskLayer *masklay, MaskSpline
 	/* draw feather */
 	mask_spline_feather_color_get(masklay, spline, is_spline_sel, rgb_tmp);
 	mask_draw_curve_type(C, spline, feather_points, tot_feather_point,
-	                     true, is_smooth, is_active,
+	                     true, is_active,
 	                     rgb_tmp, draw_type);
 
 	if (!is_fill) {
-
 		const float *fp   = &diff_points[0][0];
 		float *fp_feather = &feather_points[0][0];
-		float tvec[2];
-		int i;
 
 		BLI_assert(tot_diff_point == tot_feather_point);
 
-		for (i = 0; i < tot_diff_point; i++, fp += 2, fp_feather += 2) {
+		for (int i = 0; i < tot_diff_point; i++, fp += 2, fp_feather += 2) {
+			float tvec[2];
 			sub_v2_v2v2(tvec, fp, fp_feather);
 			add_v2_v2v2(fp_feather, fp, tvec);
 		}
 
 		/* same as above */
 		mask_draw_curve_type(C, spline, feather_points, tot_feather_point,
-		                     true, is_smooth, is_active,
+		                     true, is_active,
 		                     rgb_tmp, draw_type);
 	}
 
@@ -585,21 +542,22 @@ static void draw_spline_curve(const bContext *C, MaskLayer *masklay, MaskSpline
 	/* draw main curve */
 	mask_spline_color_get(masklay, spline, is_spline_sel, rgb_tmp);
 	mask_draw_curve_type(C, spline, diff_points, tot_diff_point,
-	                     false, is_smooth, is_active,
+	                     false, is_active,
 	                     rgb_tmp, draw_type);
 	MEM_freeN(diff_points);
 
-	if (draw_flag & MASK_DRAWFLAG_SMOOTH) {
+	if (is_smooth) {
 		glDisable(GL_LINE_SMOOTH);
-		glDisable(GL_BLEND);
 	}
-
-	(void)draw_type;
 }
 
 static void draw_masklays(const bContext *C, Mask *mask, const char draw_flag, const char draw_type,
-                          const int width, const int height, const float xscale, const float yscale)
+                          const int width, const int height)
 {
+	glEnable(GL_BLEND);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	GPU_enable_program_point_size();
+
 	MaskLayer *masklay;
 	int i;
 
@@ -616,11 +574,9 @@ static void draw_masklays(const bContext *C, Mask *mask, const char draw_flag, c
 			/* draw curve itself first... */
 			draw_spline_curve(C, masklay, spline, draw_flag, draw_type, is_active, width, height);
 
-//			draw_spline_parents(masklay, spline);
-
 			if (!(masklay->restrictflag & MASK_RESTRICT_SELECT)) {
 				/* ...and then handles over the curve so they're nicely visible */
-				draw_spline_points(C, masklay, spline, draw_flag, draw_type, xscale, yscale);
+				draw_spline_points(C, masklay, spline, draw_flag, draw_type);
 			}
 
 			/* show undeform for testing */
@@ -629,33 +585,29 @@ static void draw_masklays(const bContext *C, Mask *mask, const char draw_flag, c
 
 				spline->points_deform = NULL;
 				draw_spline_curve(C, masklay, spline, draw_flag, draw_type, is_active, width, height);
-//				draw_spline_parents(masklay, spline);
-				draw_spline_points(C, masklay, spline, draw_flag, draw_type, xscale, yscale);
+				draw_spline_points(C, masklay, spline, draw_flag, draw_type);
 				spline->points_deform = back;
 			}
 		}
 	}
+
+	GPU_disable_program_point_size();
+	glDisable(GL_BLEND);
 }
 
 void ED_mask_draw(const bContext *C,
                   const char draw_flag, const char draw_type)
 {
 	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
-
 	Mask *mask = CTX_data_edit_mask(C);
 	int width, height;
-	float aspx, aspy;
-	float xscale, yscale;
 
 	if (!mask)
 		return;
 
 	ED_mask_get_size(sa, &width, &height);
-	ED_mask_get_aspect(sa, ar, &aspx, &aspy);
-	UI_view2d_scale_get(&ar->v2d, &xscale, &yscale);
 
-	draw_masklays(C, mask, draw_flag, draw_type, width, height, xscale * aspx, yscale * aspy);
+	draw_masklays(C, mask, draw_flag, draw_type, width, height);
 }
 
 static float *mask_rasterize(Mask *mask, const int width, const int height)
@@ -733,28 +685,26 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar,
 	}
 
 	if (draw_flag & MASK_DRAWFLAG_OVERLAY) {
+		float red[4] = {1.0f, 0.0f, 0.0f, 0.0f};
 		float *buffer = mask_rasterize(mask, width, height);
-		int format;
 
-		if (overlay_mode == MASK_OVERLAY_ALPHACHANNEL) {
-			glColor3f(1.0f, 1.0f, 1.0f);
-			format = GL_LUMINANCE;
-		}
-		else {
+		if (overlay_mode != MASK_OVERLAY_ALPHACHANNEL) {
 			/* More blending types could be supported in the future. */
 			glEnable(GL_BLEND);
-			glBlendFunc(GL_DST_COLOR, GL_SRC_ALPHA);
-			format = GL_ALPHA;
+			glBlendFunc(GL_DST_COLOR, GL_ZERO);
 		}
 
-		glPushMatrix();
-		glTranslatef(x, y, 0);
-		glScalef(zoomx, zoomy, 0);
+		gpuPushMatrix();
+		gpuTranslate2f(x, y);
+		gpuScale2f(zoomx, zoomy);
 		if (stabmat) {
-			glMultMatrixf(stabmat);
+			gpuMultMatrix(stabmat);
 		}
-		glaDrawPixelsTex(0.0f, 0.0f, width, height, format, GL_FLOAT, GL_NEAREST, buffer);
-		glPopMatrix();
+		IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR);
+		GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, red);
+		immDrawPixelsTex(&state, 0.0f, 0.0f, width, height, GL_RED, GL_FLOAT, GL_NEAREST, buffer, 1.0f, 1.0f, NULL);
+
+		gpuPopMatrix();
 
 		if (overlay_mode != MASK_OVERLAY_ALPHACHANNEL) {
 			glDisable(GL_BLEND);
@@ -764,26 +714,26 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar,
 	}
 
 	/* apply transformation so mask editing tools will assume drawing from the origin in normalized space */
-	glPushMatrix();
-	glTranslatef(x + xofs, y + yofs, 0);
-	glScalef(zoomx, zoomy, 0);
+	gpuPushMatrix();
+	gpuTranslate2f(x + xofs, y + yofs);
+	gpuScale2f(zoomx, zoomy);
 	if (stabmat) {
-		glMultMatrixf(stabmat);
+		gpuMultMatrix(stabmat);
 	}
-	glScalef(maxdim, maxdim, 0);
+	gpuScale2f(maxdim, maxdim);
 
 	if (do_draw_cb) {
 		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 	}
 
 	/* draw! */
-	draw_masklays(C, mask, draw_flag, draw_type, width, height, maxdim * zoomx, maxdim * zoomy);
+	draw_masklays(C, mask, draw_flag, draw_type, width, height);
 
 	if (do_draw_cb) {
 		ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
 }
 
 void ED_mask_draw_frames(Mask *mask, ARegion *ar, const int cfra, const int sfra, const int efra)
@@ -792,25 +742,31 @@ void ED_mask_draw_frames(Mask *mask, ARegion *ar, const int cfra, const int sfra
 
 	MaskLayer *masklay = BKE_mask_layer_active(mask);
 
-	glBegin(GL_LINES);
-	glColor4ub(255, 175, 0, 255);
-
 	if (masklay) {
-		MaskLayerShape *masklay_shape;
-
-		for (masklay_shape = masklay->splines_shapes.first;
-		     masklay_shape;
-		     masklay_shape = masklay_shape->next)
-		{
-			int frame = masklay_shape->frame;
-
-			/* draw_keyframe(i, CFRA, sfra, framelen, 1); */
-			int height = (frame == cfra) ? 22 : 10;
-			int x = (frame - sfra) * framelen;
-			glVertex2i(x, 0);
-			glVertex2i(x, height);
+		unsigned int num_lines = BLI_listbase_count(&masklay->splines_shapes);
+
+		if (num_lines > 0) {
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			immUniformColor4ub(255, 175, 0, 255);
+
+			immBegin(GWN_PRIM_LINES, 2 * num_lines);
+
+			for (MaskLayerShape *masklay_shape = masklay->splines_shapes.first;
+			     masklay_shape;
+			     masklay_shape = masklay_shape->next)
+			{
+				int frame = masklay_shape->frame;
+
+				/* draw_keyframe(i, CFRA, sfra, framelen, 1); */
+				int height = (frame == cfra) ? 22 : 10;
+				int x = (frame - sfra) * framelen;
+				immVertex2i(pos, x, 0);
+				immVertex2i(pos, x, height);
+			}
+			immEnd();
+			immUnbindProgram();
 		}
 	}
-
-	glEnd();
 }
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 97d5ee1eff0..b6ac23a37e8 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -35,10 +35,11 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h"  /* SELECT */
@@ -1062,7 +1063,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			}
 
 			WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-			DAG_id_tag_update(&data->mask->id, 0);
+			DEG_id_tag_update(&data->mask->id, 0);
 
 			break;
 		}
@@ -1089,7 +1090,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				}
 
 				WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-				DAG_id_tag_update(&data->mask->id, 0);
+				DEG_id_tag_update(&data->mask->id, 0);
 
 				free_slide_point_data(op->customdata); /* keep this last! */
 				return OPERATOR_FINISHED;
@@ -1105,7 +1106,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			cancel_slide_point(op->customdata);
 
 			WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-			DAG_id_tag_update(&data->mask->id, 0);
+			DEG_id_tag_update(&data->mask->id, 0);
 
 			free_slide_point_data(op->customdata); /* keep this last! */
 			return OPERATOR_CANCELLED;
@@ -1469,7 +1470,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
 			}
 
 			WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-			DAG_id_tag_update(&slide_data->mask->id, 0);
+			DEG_id_tag_update(&slide_data->mask->id, 0);
 
 			break;
 		}
@@ -1483,7 +1484,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
 				}
 
 				WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-				DAG_id_tag_update(&slide_data->mask->id, 0);
+				DEG_id_tag_update(&slide_data->mask->id, 0);
 
 				free_slide_spline_curvature_data(slide_data); /* keep this last! */
 				return OPERATOR_FINISHED;
@@ -1495,7 +1496,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
 			cancel_slide_spline_curvature(slide_data);
 
 			WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-			DAG_id_tag_update(&slide_data->mask->id, 0);
+			DEG_id_tag_update(&slide_data->mask->id, 0);
 
 			free_slide_spline_curvature_data(op->customdata); /* keep this last! */
 			return OPERATOR_CANCELLED;
@@ -1541,7 +1542,7 @@ static int cyclic_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 
-	DAG_id_tag_update(&mask->id, 0);
+	DEG_id_tag_update(&mask->id, 0);
 	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
 	return OPERATOR_FINISHED;
@@ -1900,7 +1901,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -1955,7 +1956,7 @@ static int mask_hide_view_clear_exec(bContext *C, wmOperator *op)
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -2019,7 +2020,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -2079,7 +2080,7 @@ static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
 		BKE_mask_update_display(mask, CFRA);
 
 		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index 4e0aa8f84ae..c500ec75aee 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -34,10 +34,11 @@
 #include "BLI_string.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_mask_types.h"
 
 #include "WM_api.h"
@@ -73,7 +74,7 @@ static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-	DAG_id_tag_update(&mask->id, 0);
+	DEG_id_tag_update(&mask->id, 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -176,7 +177,7 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-	DAG_id_tag_update(&mask->id, 0);
+	DEG_id_tag_update(&mask->id, 0);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
index 99ffc9cd7d2..3fb1cc87dbd 100644
--- a/source/blender/editors/mask/mask_shapekey.c
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -36,13 +36,14 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
 #include "DNA_object_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -75,7 +76,7 @@ static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -124,7 +125,7 @@ static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&mask->id, OB_RECALC_DATA);
 
 		return OPERATOR_FINISHED;
 	}
@@ -216,7 +217,7 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
@@ -386,7 +387,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 
 	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DEG_id_tag_update(&mask->id, 0);
 
 		return OPERATOR_FINISHED;
 	}
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index f1f0de3777e..5cd768b4fe3 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../bmesh
 	../../gpu
 	../../imbuf
@@ -31,6 +32,7 @@ set(INC
 	../../makesrna
 	../../render/extern/include
 	../../windowmanager
+	../../../../intern/clog
 	../../../../intern/guardedalloc
 	../../../../intern/glew-mx
 )
@@ -42,6 +44,7 @@ set(INC_SYS
 set(SRC
 	editface.c
 	editmesh_add.c
+	editmesh_add_manipulator.c
 	editmesh_bevel.c
 	editmesh_bisect.c
 	editmesh_extrude.c
@@ -53,6 +56,7 @@ set(SRC
 	editmesh_knife_project.c
 	editmesh_loopcut.c
 	editmesh_path.c
+	editmesh_polybuild.c
 	editmesh_rip.c
 	editmesh_rip_edge.c
 	editmesh_select.c
@@ -67,18 +71,6 @@ set(SRC
 	mesh_intern.h
 )
 
-if(WITH_GAMEENGINE)
-	add_definitions(-DWITH_GAMEENGINE)
-
-	list(APPEND INC
-		../../../../extern/recastnavigation
-	)
-
-	list(APPEND SRC
-		mesh_navmesh.c
-	)
-endif()
-
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 899f1924222..7e31b6a3774 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -51,7 +51,6 @@
 #include "WM_types.h"
 
 #include "GPU_draw.h"
-#include "GPU_buffers.h"
 
 /* own include */
 
@@ -99,10 +98,7 @@ void paintface_flush_flags(Object *ob, short flag)
 		}
 	}
 
-	if (flag & ME_HIDE) {
-		/* draw-object caches hidden faces, force re-generation T46867 */
-		GPU_drawobject_free(dm);
-	}
+	BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
 }
 
 void paintface_hide(Object *ob, const bool unselected)
@@ -512,6 +508,8 @@ void paintvert_flush_flags(Object *ob)
 			dm_mv->flag = me->mvert[i].flag;
 		}
 	}
+
+	BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
 }
 /*  note: if the caller passes false to flush_flags, then they will need to run paintvert_flush_flags(ob) themselves */
 void paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags)
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 9bea203e67b..66ad057e3ec 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -60,31 +60,36 @@
 
 /* ********* add primitive operators ************* */
 
+typedef struct MakePrimitiveData {
+	float mat[4][4];
+	bool was_editmode;
+} MakePrimitiveData;
+
 static Object *make_prim_init(
         bContext *C, const char *idname,
-        float *dia, float mat[4][4],
-        bool *was_editmode, const float loc[3], const float rot[3], const unsigned int layer)
+        const float loc[3], const float rot[3], const unsigned int layer,
+        MakePrimitiveData *r_creation_data)
 {
 	Object *obedit = CTX_data_edit_object(C);
 
-	*was_editmode = false;
+	r_creation_data->was_editmode = false;
 	if (obedit == NULL || obedit->type != OB_MESH) {
 		obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, layer);
 
 		/* create editmode */
 		ED_object_editmode_enter(C, EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
-		*was_editmode = true;
+		r_creation_data->was_editmode = true;
 	}
 
-	*dia = ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
+	ED_object_new_primitive_matrix(C, obedit, loc, rot, r_creation_data->mat);
 
 	return obedit;
 }
 
-static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode, int enter_editmode)
+static void make_prim_finish(bContext *C, Object *obedit, const MakePrimitiveData *creation_data, int enter_editmode)
 {
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const bool exit_editmode = ((was_editmode == true) && (enter_editmode == false));
+	const bool exit_editmode = ((creation_data->was_editmode == true) && (enter_editmode == false));
 
 	/* Primitive has all verts selected, use vert select flush
 	 * to push this up to edges & faces. */
@@ -102,17 +107,17 @@ static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode, int
 
 static int add_primitive_plane_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
-	bool was_editmode;
 	unsigned int layer;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Plane"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -122,12 +127,12 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op)
 	if (!EDBM_op_call_and_selectf(
 	        em, op, "verts.out", false,
 	        "create_grid x_segments=%i y_segments=%i size=%f matrix=%m4 calc_uvs=%b",
-	        1, 1, RNA_float_get(op->ptr, "radius"), mat, calc_uvs))
+	        1, 1, RNA_float_get(op->ptr, "radius"), creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -153,17 +158,17 @@ void MESH_OT_primitive_plane_add(wmOperatorType *ot)
 
 static int add_primitive_cube_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
-	bool was_editmode;
 	unsigned int layer;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cube"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -173,13 +178,13 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op)
 	if (!EDBM_op_call_and_selectf(
 	        em, op, "verts.out", false,
 	        "create_cube matrix=%m4 size=%f calc_uvs=%b",
-	        mat, RNA_float_get(op->ptr, "radius") * 2.0f, calc_uvs))
+	        creation_data.mat, RNA_float_get(op->ptr, "radius") * 2.0f, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
 	/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -211,13 +216,13 @@ static const EnumPropertyItem fill_type_items[] = {
 
 static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
 	int cap_end, cap_tri;
 	unsigned int layer;
-	bool was_editmode;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	cap_end = RNA_enum_get(op->ptr, "fill_type");
@@ -225,7 +230,7 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Circle"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -236,12 +241,12 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 	        em, op, "verts.out", false,
 	        "create_circle segments=%i radius=%f cap_ends=%b cap_tris=%b matrix=%m4 calc_uvs=%b",
 	        RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),
-	        cap_end, cap_tri, mat, calc_uvs))
+	        cap_end, cap_tri, creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -271,12 +276,12 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot)
 
 static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
 	unsigned int layer;
-	bool was_editmode;
 	const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
 	const bool cap_end = (end_fill_type != 0);
 	const bool cap_tri = (end_fill_type == 2);
@@ -284,7 +289,7 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cylinder"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -298,12 +303,12 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 	        RNA_float_get(op->ptr, "radius"),
 	        RNA_float_get(op->ptr, "radius"),
 	        cap_end, cap_tri,
-	        RNA_float_get(op->ptr, "depth"), mat, calc_uvs))
+	        RNA_float_get(op->ptr, "depth"), creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -334,12 +339,12 @@ void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
 
 static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
 	unsigned int layer;
-	bool was_editmode;
 	const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
 	const bool cap_end = (end_fill_type != 0);
 	const bool cap_tri = (end_fill_type == 2);
@@ -347,7 +352,7 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cone"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -358,12 +363,13 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 	        em, op, "verts.out", false,
 	        "create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4 calc_uvs=%b",
 	        RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius1"),
-	        RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat, calc_uvs))
+	        RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"),
+	        creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -395,17 +401,17 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot)
 
 static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
-	bool was_editmode;
 	unsigned int layer;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Grid"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -417,12 +423,12 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 	        "create_grid x_segments=%i y_segments=%i size=%f matrix=%m4 calc_uvs=%b",
 	        RNA_int_get(op->ptr, "x_subdivisions"),
 	        RNA_int_get(op->ptr, "y_subdivisions"),
-	        RNA_float_get(op->ptr, "radius"), mat, calc_uvs))
+	        RNA_float_get(op->ptr, "radius"), creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -454,22 +460,21 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot)
 
 static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float mat[4][4];
 	float loc[3], rot[3];
 	float dia;
 	bool enter_editmode;
 	unsigned int layer;
-	bool was_editmode;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Y', loc, rot, &enter_editmode, &layer, NULL);
 
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Suzanne"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Suzanne"), loc, rot, layer, &creation_data);
 	dia = RNA_float_get(op->ptr, "radius");
-	mul_mat3_m4_fl(mat, dia);
+	mul_mat3_m4_fl(creation_data.mat, dia);
 
 	em = BKE_editmesh_from_object(obedit);
 
@@ -479,12 +484,12 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
 
 	if (!EDBM_op_call_and_selectf(
 	        em, op, "verts.out",  false,
-	        "create_monkey matrix=%m4 calc_uvs=%b", mat, calc_uvs))
+	        "create_monkey matrix=%m4 calc_uvs=%b", creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -511,17 +516,17 @@ void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
 
 static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
-	bool was_editmode;
 	unsigned int layer;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Sphere"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -532,12 +537,12 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 	        em, op, "verts.out", false,
 	        "create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4 calc_uvs=%b",
 	        RNA_int_get(op->ptr, "segments"), RNA_int_get(op->ptr, "ring_count"),
-	        RNA_float_get(op->ptr, "size"), mat, calc_uvs))
+	        RNA_float_get(op->ptr, "size"), creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
@@ -567,17 +572,17 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
 
 static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 {
+	MakePrimitiveData creation_data;
 	Object *obedit;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3];
 	bool enter_editmode;
-	bool was_editmode;
 	unsigned int layer;
 	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
 
 	WM_operator_view3d_unit_defaults(C, op);
 	ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
-	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer);
+	obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Icosphere"), loc, rot, layer, &creation_data);
 	em = BKE_editmesh_from_object(obedit);
 
 	if (calc_uvs) {
@@ -588,12 +593,12 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 	        em, op, "verts.out", false,
 	        "create_icosphere subdivisions=%i diameter=%f matrix=%m4 calc_uvs=%b",
 	        RNA_int_get(op->ptr, "subdivisions"),
-	        RNA_float_get(op->ptr, "size"), mat, calc_uvs))
+	        RNA_float_get(op->ptr, "size"), creation_data.mat, calc_uvs))
 	{
 		return OPERATOR_CANCELLED;
 	}
 
-	make_prim_finish(C, obedit, was_editmode, enter_editmode);
+	make_prim_finish(C, obedit, &creation_data, enter_editmode);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/editmesh_add_manipulator.c b/source/blender/editors/mesh/editmesh_add_manipulator.c
new file mode 100644
index 00000000000..bfeccfe33a4
--- /dev/null
+++ b/source/blender/editors/mesh/editmesh_add_manipulator.c
@@ -0,0 +1,426 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mesh/editmesh_add_manipulator.c
+ *  \ingroup edmesh
+ *
+ * Creation manipulators.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_context.h"
+#include "BKE_editmesh.h"
+
+#include "ED_manipulator_library.h"
+#include "ED_mesh.h"
+#include "ED_object.h"
+#include "ED_screen.h"
+#include "ED_undo.h"
+#include "ED_view3d.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "UI_resources.h"
+
+#include "BLT_translation.h"
+
+#include "mesh_intern.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+/** \name Helper Functions
+ * \{ */
+
+/**
+ * When we place a shape, pick a plane.
+ *
+ * We may base this choice on context,
+ * for now pick the "ground" based on the 3D cursor's dominant plane pointing down relative to the view.
+ */
+static void calc_initial_placement_point_from_view(
+        bContext *C, const float mval[2],
+        float r_location[3], float r_rotation[3][3])
+{
+
+	Scene *scene = CTX_data_scene(C);
+	View3D *v3d = CTX_wm_view3d(C);
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+
+	bool use_mouse_project = true; /* TODO: make optional */
+
+	float cursor_matrix[4][4];
+	float orient_matrix[3][3];
+	ED_view3d_cursor3d_calc_mat4(scene, v3d, cursor_matrix);
+
+	float dots[3] = {
+		dot_v3v3(rv3d->viewinv[2], cursor_matrix[0]),
+		dot_v3v3(rv3d->viewinv[2], cursor_matrix[1]),
+		dot_v3v3(rv3d->viewinv[2], cursor_matrix[2]),
+	};
+	const int axis = axis_dominant_v3_single(dots);
+
+	copy_v3_v3(orient_matrix[0], cursor_matrix[(axis + 1) % 3]);
+	copy_v3_v3(orient_matrix[1], cursor_matrix[(axis + 2) % 3]);
+	copy_v3_v3(orient_matrix[2], cursor_matrix[axis]);
+
+	if (dot_v3v3(rv3d->viewinv[2], orient_matrix[2]) < 0.0f) {
+		negate_v3(orient_matrix[2]);
+	}
+	if (is_negative_m3(orient_matrix)) {
+		swap_v3_v3(orient_matrix[0], orient_matrix[1]);
+	}
+
+	if (use_mouse_project) {
+		float ray_co[3], ray_no[3];
+		if (ED_view3d_win_to_ray(
+		            CTX_data_depsgraph(C),
+		            ar, v3d, mval,
+		            ray_co, ray_no, false))
+		{
+			float plane[4];
+			plane_from_point_normal_v3(plane, cursor_matrix[3], orient_matrix[2]);
+			float lambda;
+			if (isect_ray_plane_v3(ray_co, ray_no, plane, &lambda, true)) {
+				madd_v3_v3v3fl(r_location, ray_co, ray_no, lambda);
+				copy_m3_m3(r_rotation, orient_matrix);
+				return;
+			}
+		}
+	}
+
+	/* fallback */
+	copy_v3_v3(r_location, cursor_matrix[3]);
+	copy_m3_m3(r_rotation, orient_matrix);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Placement Manipulator
+ * \{ */
+
+typedef struct ManipulatorPlacementGroup {
+	struct wmManipulator *cage;
+	struct {
+		bContext *context;
+		wmOperator *op;
+		PropertyRNA *prop_matrix;
+	} data;
+} ManipulatorPlacementGroup;
+
+/**
+ * \warning Calling redo from property updates is not great.
+ * This is needed because changing the RNA doesn't cause a redo
+ * and we're not using operator UI which does just this.
+ */
+static void manipulator_placement_exec(ManipulatorPlacementGroup *man)
+{
+	wmOperator *op = man->data.op;
+	if (op == WM_operator_last_redo((bContext *)man->data.context)) {
+		ED_undo_operator_repeat((bContext *)man->data.context, op);
+	}
+}
+
+static void manipulator_mesh_placement_update_from_op(ManipulatorPlacementGroup *man)
+{
+	wmOperator *op = man->data.op;
+	UNUSED_VARS(op);
+	/* For now don't read back from the operator. */
+#if 0
+	RNA_property_float_get_array(op->ptr, man->data.prop_matrix, &man->cage->matrix_offset[0][0]);
+#endif
+}
+
+/* translate callbacks */
+static void manipulator_placement_prop_matrix_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorPlacementGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	if (value_p != man->cage->matrix_offset) {
+		mul_m4_m4m4(value_p, man->cage->matrix_basis, man->cage->matrix_offset);
+		RNA_property_float_get_array(op->ptr, man->data.prop_matrix, value);
+	}
+}
+
+static void manipulator_placement_prop_matrix_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value)
+{
+	ManipulatorPlacementGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+
+	BLI_assert(mpr_prop->type->array_length == 16);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float mat[4][4];
+	mul_m4_m4m4(mat, man->cage->matrix_basis, value);
+
+	if (is_negative_m4(mat)) {
+		negate_mat3_m4(mat);
+	}
+
+	RNA_property_float_set_array(op->ptr, man->data.prop_matrix, &mat[0][0]);
+
+	manipulator_placement_exec(man);
+}
+
+static bool manipulator_mesh_placement_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_primitive_cube_add_manipulator")) {
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+static void manipulator_mesh_placement_modal_from_setup(
+        const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorPlacementGroup *man = mgroup->customdata;
+
+	/* Initial size. */
+	{
+		wmManipulator *mpr = man->cage;
+		zero_m4(mpr->matrix_offset);
+
+		/* TODO: support zero scaled matrix in 'MANIPULATOR_WT_cage_3d'. */
+		mpr->matrix_offset[0][0] = 0.01;
+		mpr->matrix_offset[1][1] = 0.01;
+		mpr->matrix_offset[2][2] = 0.01;
+		mpr->matrix_offset[3][3] = 1.0f;
+	}
+
+	/* Start off dragging. */
+	{
+		wmWindow *win = CTX_wm_window(C);
+		ARegion *ar = CTX_wm_region(C);
+		wmManipulator *mpr = man->cage;
+
+		{
+			float mat3[3][3];
+			float location[3];
+			calc_initial_placement_point_from_view(
+			        (bContext *)C, (float[2]){
+			            win->eventstate->x - ar->winrct.xmin,
+			            win->eventstate->y - ar->winrct.ymin,
+			        },
+			        location, mat3);
+			copy_m4_m3(mpr->matrix_basis, mat3);
+			copy_v3_v3(mpr->matrix_basis[3], location);
+		}
+
+		if (1) {
+			wmManipulatorMap *mmap = mgroup->parent_mmap;
+			WM_manipulator_modal_set_from_setup(
+			        mmap, (bContext *)C, man->cage, ED_MANIPULATOR_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z, win->eventstate);
+		}
+	}
+}
+
+static void manipulator_mesh_placement_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_primitive_cube_add_manipulator")) {
+		return;
+	}
+
+	struct ManipulatorPlacementGroup *man = MEM_callocN(sizeof(ManipulatorPlacementGroup), __func__);
+	mgroup->customdata = man;
+
+	const wmManipulatorType *wt_cage = WM_manipulatortype_find("MANIPULATOR_WT_cage_3d", true);
+
+	man->cage = WM_manipulator_new_ptr(wt_cage, mgroup, NULL);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->cage->color);
+
+	RNA_enum_set(man->cage->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_SIGNED);
+
+	WM_manipulator_set_flag(man->cage, WM_MANIPULATOR_DRAW_VALUE, true);
+
+	man->data.context = (bContext *)C;
+	man->data.op = op;
+	man->data.prop_matrix = RNA_struct_find_property(op->ptr, "matrix");
+
+	manipulator_mesh_placement_update_from_op(man);
+
+	/* Setup property callbacks */
+	{
+		WM_manipulator_target_property_def_func(
+		        man->cage, "matrix",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_placement_prop_matrix_get,
+		            .value_set_fn = manipulator_placement_prop_matrix_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+	}
+
+	manipulator_mesh_placement_modal_from_setup(C, mgroup);
+}
+
+static void manipulator_mesh_placement_draw_prepare(
+        const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	ManipulatorPlacementGroup *man = mgroup->customdata;
+	if (man->data.op->next) {
+		man->data.op = WM_operator_last_redo((bContext *)man->data.context);
+	}
+	manipulator_mesh_placement_update_from_op(man);
+}
+
+static void MESH_WGT_add_bounds(struct wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Mesh Add Bounds";
+	wgt->idname = "MESH_WGT_add_bounds";
+
+	wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = manipulator_mesh_placement_poll;
+	wgt->setup = manipulator_mesh_placement_setup;
+	wgt->draw_prepare = manipulator_mesh_placement_draw_prepare;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Add Cube Manipulator-Operator
+ *
+ * For now we use a separate operator to add a cube,
+ * we can try to merge then however they are invoked differently
+ * and share the same BMesh creation code.
+ * \{ */
+
+
+static int add_primitive_cube_manipulator_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit = CTX_data_edit_object(C);;
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	float matrix[4][4];
+
+	/* Get the matrix that defines the cube bounds (as set by the manipulator cage). */
+	{
+		PropertyRNA *prop_matrix = RNA_struct_find_property(op->ptr, "matrix");
+		if (RNA_property_is_set(op->ptr, prop_matrix)) {
+			RNA_property_float_get_array(op->ptr, prop_matrix, &matrix[0][0]);
+			invert_m4_m4(obedit->imat, obedit->obmat);
+			mul_m4_m4m4(matrix, obedit->imat, matrix);
+		}
+		else {
+			/* For the first update the widget may not set the matrix. */
+			return OPERATOR_FINISHED;
+		}
+	}
+
+	const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");
+
+	if (calc_uvs) {
+		ED_mesh_uv_texture_ensure(obedit->data, NULL);
+	}
+
+	if (!EDBM_op_call_and_selectf(
+	        em, op, "verts.out", false,
+	        "create_cube matrix=%m4 size=%f calc_uvs=%b",
+	        matrix, 1.0f, calc_uvs))
+	{
+		return OPERATOR_CANCELLED;
+	}
+
+	EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
+	EDBM_update_generic(em, true, true);
+
+	return OPERATOR_FINISHED;
+}
+
+static int add_primitive_cube_manipulator_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+{
+	View3D *v3d = CTX_wm_view3d(C);
+
+	int ret = add_primitive_cube_manipulator_exec(C, op);
+	if (ret & OPERATOR_FINISHED) {
+		/* Setup manipulators */
+		if (v3d && (v3d->twflag & V3D_MANIPULATOR_DRAW)) {
+			ARegion *ar = CTX_wm_region(C);
+			wmManipulatorMap *mmap = ar->manipulator_map;
+			wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find("MESH_WGT_add_bounds", false);
+			wmManipulatorGroup *mgroup = WM_manipulatormap_group_find_ptr(mmap, wgt);
+			if (mgroup != NULL) {
+				ManipulatorPlacementGroup *man = mgroup->customdata;
+				man->data.op = op;
+				manipulator_mesh_placement_modal_from_setup(C, mgroup);
+			}
+			else {
+				WM_manipulator_group_type_ensure_ptr(wgt);
+			}
+		}
+	}
+
+	return ret;
+}
+
+void MESH_OT_primitive_cube_add_manipulator(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Cube";
+	ot->description = "Construct a cube mesh";
+	ot->idname = "MESH_OT_primitive_cube_add_manipulator";
+
+	/* api callbacks */
+	ot->invoke = add_primitive_cube_manipulator_invoke;
+	ot->exec = add_primitive_cube_manipulator_exec;
+	ot->poll = ED_operator_editmesh_view3d;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	ED_object_add_mesh_props(ot);
+	ED_object_add_generic_props(ot, true);
+
+	/* hidden props */
+	PropertyRNA *prop = RNA_def_float_matrix(ot->srna, "matrix", 4, 4, NULL, 0.0f, 0.0f, "Matrix", "", 0.0f, 0.0f);
+	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
+
+	WM_manipulatorgrouptype_append(MESH_WGT_add_bounds);
+}
+
+/** \} */
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index bf349a4c678..c51a57e27b3 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -37,6 +37,7 @@
 #include "BKE_global.h"
 #include "BKE_editmesh.h"
 #include "BKE_unit.h"
+#include "BKE_layer.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -77,17 +78,24 @@ static const float value_scale_per_inch[NUM_VALUE_KINDS] = { 0.0f, 100.0f, 1.0f,
 
 typedef struct {
 	BMEditMesh *em;
+	BMBackup mesh_backup;
+} BevelObjectStore;
+
+
+typedef struct {
 	float initial_length[NUM_VALUE_KINDS];
 	float scale[NUM_VALUE_KINDS];
 	NumInput num_input[NUM_VALUE_KINDS];
 	float shift_value[NUM_VALUE_KINDS]; /* The current value when shift is pressed. Negative when shift not active. */
 	bool is_modal;
 
+	BevelObjectStore *ob_store;
+	uint ob_store_len;
+
 	/* modal only */
 	float mcenter[2];
-	BMBackup mesh_backup;
 	void *draw_handle_pixel;
-	short twtype;
+	short twflag;
 	short value_mode;  /* Which value does mouse movement and numeric input affect? */
 	float segments;     /* Segments as float so smooth mouse pan works in small increments */
 } BevelData;
@@ -128,24 +136,35 @@ static void edbm_bevel_update_header(bContext *C, wmOperator *op)
 
 static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 {
-	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BevelData *opdata;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	float pixels_per_inch;
 	int i;
 
-	if (em->bm->totvertsel == 0) {
-		return false;
-	}
-
 	if (is_modal) {
 		RNA_float_set(op->ptr, "offset", 0.0f);
 	}
 
 	op->customdata = opdata = MEM_mallocN(sizeof(BevelData), "beveldata_mesh_operator");
+	uint objects_used_len = 0;
+
+	{
+		uint ob_store_len = 0;
+		Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &ob_store_len);
+		opdata->ob_store = MEM_malloc_arrayN(ob_store_len, sizeof(*opdata->ob_store), __func__);
+		for (uint ob_index = 0; ob_index < ob_store_len; ob_index++) {
+			Object *obedit = objects[ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+			if (em->bm->totvertsel > 0) {
+				opdata->ob_store[objects_used_len].em = em;
+				objects_used_len++;
+			}
+		}
+		MEM_freeN(objects);
+		opdata->ob_store_len = objects_used_len;
+	}
 
-	opdata->em = em;
 	opdata->is_modal = is_modal;
 	opdata->value_mode = OFFSET_VALUE;
 	opdata->segments = (float) RNA_int_get(op->ptr, "segments");
@@ -174,14 +193,16 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 		View3D *v3d = CTX_wm_view3d(C);
 		ARegion *ar = CTX_wm_region(C);
 
-		opdata->mesh_backup = EDBM_redo_state_store(em);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			opdata->ob_store[ob_index].mesh_backup = EDBM_redo_state_store(opdata->ob_store[ob_index].em);
+		}
 		opdata->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ED_region_draw_mouse_line_cb,
 			opdata->mcenter, REGION_DRAW_POST_PIXEL);
 		G.moving = G_TRANSFORM_EDIT;
 
 		if (v3d) {
-			opdata->twtype = v3d->twtype;
-			v3d->twtype = 0;
+			opdata->twflag = v3d->twflag;
+			v3d->twflag = 0;
 		}
 	}
 
@@ -191,8 +212,10 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 static bool edbm_bevel_calc(wmOperator *op)
 {
 	BevelData *opdata = op->customdata;
-	BMEditMesh *em = opdata->em;
+	BMEditMesh *em;
 	BMOperator bmop;
+	bool changed = false;
+
 	const float offset = RNA_float_get(op->ptr, "offset");
 	const int offset_type = RNA_enum_get(op->ptr, "offset_type");
 	const int segments = RNA_int_get(op->ptr, "segments");
@@ -202,40 +225,45 @@ static bool edbm_bevel_calc(wmOperator *op)
 	int material = RNA_int_get(op->ptr, "material");
 	const bool loop_slide = RNA_boolean_get(op->ptr, "loop_slide");
 
-	/* revert to original mesh */
-	if (opdata->is_modal) {
-		EDBM_redo_state_restore(opdata->mesh_backup, em, false);
-	}
 
-	if (em->ob) {
-		material = CLAMPIS(material, -1, em->ob->totcol - 1);
-	}
+	for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+		em = opdata->ob_store[ob_index].em;
 
-	EDBM_op_init(em, &bmop, op,
-	             "bevel geom=%hev offset=%f segments=%i vertex_only=%b offset_type=%i profile=%f clamp_overlap=%b "
-	             "material=%i loop_slide=%b",
-	             BM_ELEM_SELECT, offset, segments, vertex_only, offset_type, profile,
-	             clamp_overlap, material, loop_slide);
+		/* revert to original mesh */
+		if (opdata->is_modal) {
+			EDBM_redo_state_restore(opdata->ob_store[ob_index].mesh_backup, em, false);
+		}
 
-	BMO_op_exec(em->bm, &bmop);
+		if (em->ob) {
+			material = CLAMPIS(material, -1, em->ob->totcol - 1);
+		}
 
-	if (offset != 0.0f) {
-		/* not essential, but we may have some loose geometry that
-		 * won't get bevel'd and better not leave it selected */
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
-	}
+		EDBM_op_init(em, &bmop, op,
+			"bevel geom=%hev offset=%f segments=%i vertex_only=%b offset_type=%i profile=%f clamp_overlap=%b "
+			"material=%i loop_slide=%b",
+			BM_ELEM_SELECT, offset, segments, vertex_only, offset_type, profile,
+			clamp_overlap, material, loop_slide);
 
-	/* no need to de-select existing geometry */
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return false;
-	}
+		BMO_op_exec(em->bm, &bmop);
 
-	EDBM_mesh_normals_update(opdata->em);
+		if (offset != 0.0f) {
+			/* not essential, but we may have some loose geometry that
+			 * won't get bevel'd and better not leave it selected */
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		}
+
+		/* no need to de-select existing geometry */
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-	EDBM_update_generic(opdata->em, true, true);
+		EDBM_mesh_normals_update(em);
 
-	return true;
+		EDBM_update_generic(em, true, true);
+		changed = true;
+	}
+	return changed;
 }
 
 static void edbm_bevel_exit(bContext *C, wmOperator *op)
@@ -251,14 +279,17 @@ static void edbm_bevel_exit(bContext *C, wmOperator *op)
 	if (opdata->is_modal) {
 		View3D *v3d = CTX_wm_view3d(C);
 		ARegion *ar = CTX_wm_region(C);
-		EDBM_redo_state_free(&opdata->mesh_backup, NULL, false);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, NULL, false);
+		}
 		ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel);
 		if (v3d) {
-			v3d->twtype = opdata->twtype;
+			v3d->twflag = opdata->twflag;
 		}
 		G.moving = 0;
 	}
-	MEM_freeN(opdata);
+	MEM_SAFE_FREE(opdata->ob_store);
+	MEM_SAFE_FREE(op->customdata);
 	op->customdata = NULL;
 }
 
@@ -266,8 +297,10 @@ static void edbm_bevel_cancel(bContext *C, wmOperator *op)
 {
 	BevelData *opdata = op->customdata;
 	if (opdata->is_modal) {
-		EDBM_redo_state_free(&opdata->mesh_backup, opdata->em, true);
-		EDBM_update_generic(opdata->em, false, true);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, opdata->ob_store[ob_index].em, true);
+			EDBM_update_generic(opdata->ob_store[ob_index].em, false, true);
+		}
 	}
 
 	edbm_bevel_exit(C, op);
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index 3a9e278f039..ee06f7abd2b 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -50,9 +50,17 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "UI_resources.h"
 
 #include "mesh_intern.h"  /* own include */
 
+#define USE_MANIPULATOR
+
+#ifdef USE_MANIPULATOR
+#include "ED_manipulator_library.h"
+#include "ED_undo.h"
+#endif
+
 static int mesh_bisect_exec(bContext *C, wmOperator *op);
 
 /* -------------------------------------------------------------------- */
@@ -62,7 +70,7 @@ typedef struct {
 	/* modal only */
 	BMBackup mesh_backup;
 	bool is_first;
-	short twtype;
+	short twflag;
 } BisectData;
 
 static bool mesh_bisect_interactive_calc(
@@ -148,8 +156,8 @@ static int mesh_bisect_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 		/* misc other vars */
 		G.moving = G_TRANSFORM_EDIT;
-		opdata->twtype = v3d->twtype;
-		v3d->twtype = 0;
+		opdata->twflag = v3d->twflag;
+		v3d->twflag = 0;
 
 		/* initialize modal callout */
 		ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Click and drag to draw cut line"));
@@ -161,7 +169,7 @@ static void edbm_bisect_exit(bContext *C, BisectData *opdata)
 {
 	View3D *v3d = CTX_wm_view3d(C);
 	EDBM_redo_state_free(&opdata->mesh_backup, NULL, false);
-	v3d->twtype = opdata->twtype;
+	v3d->twflag = opdata->twflag;
 	G.moving = 0;
 }
 
@@ -186,6 +194,16 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 	if (ret & (OPERATOR_FINISHED | OPERATOR_CANCELLED)) {
 		edbm_bisect_exit(C, &opdata_back);
+
+#ifdef USE_MANIPULATOR
+		/* Setup manipulators */
+		{
+			View3D *v3d = CTX_wm_view3d(C);
+			if (v3d && (v3d->twflag & V3D_MANIPULATOR_DRAW)) {
+				WM_manipulator_group_type_ensure("MESH_WGT_bisect");
+			}
+		}
+#endif
 	}
 
 	return ret;
@@ -225,7 +243,7 @@ static int mesh_bisect_exec(bContext *C, wmOperator *op)
 		RNA_property_float_get_array(op->ptr, prop_plane_co, plane_co);
 	}
 	else {
-		copy_v3_v3(plane_co, ED_view3d_cursor3d_get(scene, v3d));
+		copy_v3_v3(plane_co, ED_view3d_cursor3d_get(scene, v3d)->location);
 		RNA_property_float_set_array(op->ptr, prop_plane_co, plane_co);
 	}
 
@@ -315,6 +333,9 @@ static int mesh_bisect_exec(bContext *C, wmOperator *op)
 	}
 }
 
+#ifdef USE_MANIPULATOR
+static void MESH_WGT_bisect(struct wmManipulatorGroupType *wgt);
+#endif
 
 void MESH_OT_bisect(struct wmOperatorType *ot)
 {
@@ -350,4 +371,331 @@ void MESH_OT_bisect(struct wmOperatorType *ot)
 	RNA_def_float(ot->srna, "threshold", 0.0001, 0.0, 10.0, "Axis Threshold", "", 0.00001, 0.1);
 
 	WM_operator_properties_gesture_straightline(ot, CURSOR_EDIT);
+
+#ifdef USE_MANIPULATOR
+	WM_manipulatorgrouptype_append(MESH_WGT_bisect);
+#endif
+}
+
+
+#ifdef USE_MANIPULATOR
+
+/* -------------------------------------------------------------------- */
+
+/** \name Bisect Manipulator
+ * \{ */
+
+typedef struct ManipulatorGroup {
+	/* Arrow to change plane depth. */
+	struct wmManipulator *translate_z;
+	/* Translate XYZ */
+	struct wmManipulator *translate_c;
+	/* For grabbing the manipulator and moving freely. */
+	struct wmManipulator *rotate_c;
+
+	/* We could store more vars here! */
+	struct {
+		bContext *context;
+		wmOperator *op;
+		PropertyRNA *prop_plane_co;
+		PropertyRNA *prop_plane_no;
+
+		float rotate_axis[3];
+		float rotate_up[3];
+	} data;
+} ManipulatorGroup;
+
+/**
+ * XXX. calling redo from property updates is not great.
+ * This is needed because changing the RNA doesn't cause a redo
+ * and we're not using operator UI which does just this.
+ */
+static void manipulator_bisect_exec(ManipulatorGroup *man)
+{
+	wmOperator *op = man->data.op;
+	if (op == WM_operator_last_redo((bContext *)man->data.context)) {
+		ED_undo_operator_repeat((bContext *)man->data.context, op);
+	}
+}
+
+static void manipulator_mesh_bisect_update_from_op(ManipulatorGroup *man)
+{
+	wmOperator *op = man->data.op;
+
+	float plane_co[3], plane_no[3];
+
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
+
+	WM_manipulator_set_matrix_location(man->translate_z, plane_co);
+	WM_manipulator_set_matrix_location(man->rotate_c, plane_co);
+	/* translate_c location comes from the property. */
+
+	WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no);
+
+	WM_manipulator_set_scale(man->translate_c, 0.2);
+
+	RegionView3D *rv3d = ED_view3d_context_rv3d(man->data.context);
+	if (rv3d) {
+		normalize_v3_v3(man->data.rotate_axis, rv3d->viewinv[2]);
+		normalize_v3_v3(man->data.rotate_up, rv3d->viewinv[1]);
+
+		/* ensure its orthogonal */
+		project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis);
+		normalize_v3(man->data.rotate_up);
+
+		WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no);
+
+		float plane_no_cross[3];
+		cross_v3_v3v3(plane_no_cross, plane_no, man->data.rotate_axis);
+
+		WM_manipulator_set_matrix_offset_rotation_from_yz_axis(man->rotate_c, plane_no_cross, man->data.rotate_axis);
+		RNA_enum_set(man->rotate_c->ptr, "draw_options",
+		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR |
+		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y);
+	}
+}
+
+/* depth callbacks */
+static void manipulator_bisect_prop_depth_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_co[3], plane_no[3];
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
+
+	value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]);
+}
+
+static void manipulator_bisect_prop_depth_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	const float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_co[3], plane[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane);
+	normalize_v3(plane);
+
+	plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]);
+
+	/* Keep our location, may be offset simply to be inside the viewport. */
+	closest_to_plane_normalized_v3(plane_co, plane, plane_co);
+
+	RNA_property_float_set_array(op->ptr, man->data.prop_plane_co, plane_co);
+
+	manipulator_bisect_exec(man);
+}
+
+/* translate callbacks */
+static void manipulator_bisect_prop_translate_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+
+	BLI_assert(mpr_prop->type->array_length == 3);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, value_p);
+}
+
+static void manipulator_bisect_prop_translate_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+
+	BLI_assert(mpr_prop->type->array_length == 3);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	RNA_property_float_set_array(op->ptr, man->data.prop_plane_co, value_p);
+
+	manipulator_bisect_exec(man);
+}
+
+/* angle callbacks */
+static void manipulator_bisect_prop_angle_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_no[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
+	normalize_v3(plane_no);
+
+	float plane_no_proj[3];
+	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
+
+	if (!is_zero_v3(plane_no_proj)) {
+		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
+		value[0] = angle;
+	}
+	else {
+		value[0] = 0.0f;
+	}
+}
+
+static void manipulator_bisect_prop_angle_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	const float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_no[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
+	normalize_v3(plane_no);
+
+	float plane_no_proj[3];
+	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
+
+	if (!is_zero_v3(plane_no_proj)) {
+		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
+		const float angle_delta = angle - angle_compat_rad(value[0], angle);
+		if (angle_delta != 0.0f) {
+			float mat[3][3];
+			axis_angle_normalized_to_mat3(mat, man->data.rotate_axis, angle_delta);
+			mul_m3_v3(mat, plane_no);
+
+			/* re-normalize - seems acceptable */
+			RNA_property_float_set_array(op->ptr, man->data.prop_plane_no, plane_no);
+
+			manipulator_bisect_exec(man);
+		}
+	}
+}
+
+static bool manipulator_mesh_bisect_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
 }
+
+static void manipulator_mesh_bisect_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
+		return;
+	}
+
+	struct ManipulatorGroup *man = MEM_callocN(sizeof(ManipulatorGroup), __func__);
+	mgroup->customdata = man;
+
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
+	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true);
+	const wmManipulatorType *wt_dial = WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true);
+
+	man->translate_z = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+	man->translate_c = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
+	man->rotate_c = WM_manipulator_new_ptr(wt_dial, mgroup, NULL);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_z->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_c->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->rotate_c->color);
+
+	RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+	RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
+
+	WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true);
+	WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true);
+
+	{
+		man->data.context = (bContext *)C;
+		man->data.op = op;
+		man->data.prop_plane_co = RNA_struct_find_property(op->ptr, "plane_co");
+		man->data.prop_plane_no = RNA_struct_find_property(op->ptr, "plane_no");
+	}
+
+	manipulator_mesh_bisect_update_from_op(man);
+
+	/* Setup property callbacks */
+	{
+		WM_manipulator_target_property_def_func(
+		        man->translate_z, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_bisect_prop_depth_get,
+		            .value_set_fn = manipulator_bisect_prop_depth_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+		WM_manipulator_target_property_def_func(
+		        man->translate_c, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_bisect_prop_translate_get,
+		            .value_set_fn = manipulator_bisect_prop_translate_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+		WM_manipulator_target_property_def_func(
+		        man->rotate_c, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_bisect_prop_angle_get,
+		            .value_set_fn = manipulator_bisect_prop_angle_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+	}
+}
+
+static void manipulator_mesh_bisect_draw_prepare(
+        const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup *man = mgroup->customdata;
+	if (man->data.op->next) {
+		man->data.op = WM_operator_last_redo((bContext *)man->data.context);
+	}
+	manipulator_mesh_bisect_update_from_op(man);
+}
+
+static void MESH_WGT_bisect(struct wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Mesh Bisect";
+	wgt->idname = "MESH_WGT_bisect";
+
+	wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = manipulator_mesh_bisect_poll;
+	wgt->setup = manipulator_mesh_bisect_setup;
+	wgt->draw_prepare = manipulator_mesh_bisect_draw_prepare;
+}
+
+/** \} */
+
+#endif  /* USE_MANIPULATOR */
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 9467c545bbf..4841de3c856 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -35,22 +35,34 @@
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 
+#include "BKE_layer.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
+#include "BKE_global.h"
+#include "BKE_idprop.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
 
 #include "mesh_intern.h"  /* own include */
 
+#define USE_MANIPULATOR
+
 /* -------------------------------------------------------------------- */
 /** \name Extrude Internal Utilities
  * \{ */
@@ -283,36 +295,44 @@ static bool edbm_extrude_ex(
 
 static int edbm_extrude_repeat_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-
 	const int steps = RNA_int_get(op->ptr, "steps");
-
 	const float offs = RNA_float_get(op->ptr, "offset");
 	float dvec[3], tmat[3][3], bmat[3][3];
 	short a;
 
-	/* dvec */
-	normalize_v3_v3_length(dvec, rv3d->persinv[2], offs);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* base correction */
-	copy_m3_m4(bmat, obedit->obmat);
-	invert_m3_m3(tmat, bmat);
-	mul_m3_v3(tmat, dvec);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
 
-	for (a = 0; a < steps; a++) {
-		edbm_extrude_ex(obedit, em, BM_ALL_NOLOOP, BM_ELEM_SELECT, false, false);
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		BMO_op_callf(
-		        em->bm, BMO_FLAG_DEFAULTS,
-		        "translate vec=%v verts=%hv",
-		        dvec, BM_ELEM_SELECT);
-	}
+		/* dvec */
+		normalize_v3_v3_length(dvec, rv3d->persinv[2], offs);
+
+		/* base correction */
+		copy_m3_m4(bmat, obedit->obmat);
+		invert_m3_m3(tmat, bmat);
+		mul_m3_v3(tmat, dvec);
+
+		for (a = 0; a < steps; a++) {
+			edbm_extrude_ex(obedit, em, BM_ALL_NOLOOP, BM_ELEM_SELECT, false, false);
+
+			BMO_op_callf(
+				em->bm, BMO_FLAG_DEFAULTS,
+				"translate vec=%v verts=%hv",
+				dvec, BM_ELEM_SELECT);
+		}
 
-	EDBM_mesh_normals_update(em);
+		EDBM_mesh_normals_update(em);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -338,6 +358,326 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
 
 /** \} */
 
+
+/* -------------------------------------------------------------------- */
+/** \name Extrude Manipulator
+ * \{ */
+
+#ifdef USE_MANIPULATOR
+
+const float extrude_button_scale = 0.15f;
+const float extrude_button_offset_scale = 1.5f;
+const float extrude_arrow_scale = 1.0f;
+const float extrude_arrow_xyz_axis_scale = 1.0f;
+const float extrude_arrow_normal_axis_scale = 1.75f;
+
+static const uchar shape_plus[] = {
+	0x5f, 0xfb, 0x40, 0xee, 0x25, 0xda, 0x11, 0xbf, 0x4, 0xa0, 0x0, 0x80, 0x4, 0x5f, 0x11,
+	0x40, 0x25, 0x25, 0x40, 0x11, 0x5f, 0x4, 0x7f, 0x0, 0xa0, 0x4, 0xbf, 0x11, 0xda, 0x25,
+	0xee, 0x40, 0xfb, 0x5f, 0xff, 0x7f, 0xfb, 0xa0, 0xee, 0xbf, 0xda, 0xda, 0xbf, 0xee,
+	0xa0, 0xfb, 0x80, 0xff, 0x6e, 0xd7, 0x92, 0xd7, 0x92, 0x90, 0xd8, 0x90, 0xd8, 0x6d,
+	0x92, 0x6d, 0x92, 0x27, 0x6e, 0x27, 0x6e, 0x6d, 0x28, 0x6d, 0x28, 0x90, 0x6e,
+	0x90, 0x6e, 0xd7, 0x80, 0xff, 0x5f, 0xfb, 0x5f, 0xfb,
+};
+
+typedef struct ManipulatorExtrudeGroup {
+
+	/* XYZ & normal. */
+	struct wmManipulator *invoke_xyz_no[4];
+	struct wmManipulator *adjust_xyz_no[5];
+
+	struct {
+		float normal_mat3[3][3];  /* use Z axis for normal. */
+		int orientation_type;
+	} data;
+
+	wmOperatorType *ot_extrude;
+} ManipulatorExtrudeGroup;
+
+static void manipulator_mesh_extrude_orientation_matrix_set(
+        struct ManipulatorExtrudeGroup *man, const float mat[3][3])
+{
+	for (int i = 0; i < 3; i++) {
+		/* Set orientation without location. */
+		for (int j = 0; j < 3; j++) {
+			copy_v3_v3(man->adjust_xyz_no[i]->matrix_basis[j], mat[j]);
+		}
+		/* nop when (i == 2). */
+		swap_v3_v3(man->adjust_xyz_no[i]->matrix_basis[i], man->adjust_xyz_no[i]->matrix_basis[2]);
+		/* Orient to normal gives generally less awkward results. */
+		if (man->data.orientation_type != V3D_MANIP_NORMAL) {
+			if (dot_v3v3(man->adjust_xyz_no[i]->matrix_basis[2], man->data.normal_mat3[2]) < 0.0f) {
+				negate_v3(man->adjust_xyz_no[i]->matrix_basis[2]);
+			}
+		}
+		mul_v3_v3fl(
+		        man->invoke_xyz_no[i]->matrix_offset[3],
+		        man->adjust_xyz_no[i]->matrix_basis[2],
+		        (extrude_arrow_xyz_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
+	}
+}
+
+static bool manipulator_mesh_extrude_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	bToolRef_Runtime *tref_rt = sa->runtime.tool ? sa->runtime.tool->runtime : NULL;
+	if ((tref_rt == NULL) ||
+	    !STREQ(wgt->idname, tref_rt->manipulator_group) ||
+	    !ED_operator_editmesh_view3d((bContext *)C))
+	{
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+static void manipulator_mesh_extrude_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct ManipulatorExtrudeGroup *man = MEM_callocN(sizeof(ManipulatorExtrudeGroup), __func__);
+	mgroup->customdata = man;
+
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
+	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_button_2d", true);
+
+	for (int i = 0; i < 4; i++) {
+		man->adjust_xyz_no[i] = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+		man->invoke_xyz_no[i] = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
+		man->invoke_xyz_no[i]->flag |= WM_MANIPULATOR_DRAW_OFFSET_SCALE;
+	}
+
+	{
+		PropertyRNA *prop = RNA_struct_find_property(man->invoke_xyz_no[3]->ptr, "shape");
+		for (int i = 0; i < 4; i++) {
+			RNA_property_string_set_bytes(
+			        man->invoke_xyz_no[i]->ptr, prop,
+			        (const char *)shape_plus, ARRAY_SIZE(shape_plus));
+		}
+	}
+
+	man->ot_extrude = WM_operatortype_find("MESH_OT_extrude_context_move", true);
+
+	for (int i = 0; i < 3; i++) {
+		UI_GetThemeColor3fv(TH_AXIS_X + i, man->invoke_xyz_no[i]->color);
+		UI_GetThemeColor3fv(TH_AXIS_X + i, man->adjust_xyz_no[i]->color);
+	}
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->invoke_xyz_no[3]->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->adjust_xyz_no[3]->color);
+
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_scale(man->invoke_xyz_no[i], extrude_button_scale);
+		WM_manipulator_set_scale(man->adjust_xyz_no[i], extrude_arrow_scale);
+	}
+	WM_manipulator_set_scale(man->adjust_xyz_no[3], extrude_arrow_normal_axis_scale);
+
+	for (int i = 0; i < 4; i++) {
+	}
+
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_DRAW_VALUE, true);
+	}
+
+	/* XYZ & normal axis extrude. */
+	for (int i = 0; i < 4; i++) {
+		PointerRNA *ptr = WM_manipulator_operator_set(man->invoke_xyz_no[i], 0, man->ot_extrude, NULL);
+		{
+			int constraint[3] = {0, 0, 0};
+			constraint[MIN2(i, 2)] = 1;
+			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
+			RNA_boolean_set(&macroptr, "release_confirm", true);
+			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
+		}
+	}
+
+	/* Adjust extrude. */
+	for (int i = 0; i < 4; i++) {
+		PointerRNA *ptr = WM_manipulator_operator_set(man->adjust_xyz_no[i], 0, man->ot_extrude, NULL);
+		{
+			int constraint[3] = {0, 0, 0};
+			constraint[MIN2(i, 2)] = 1;
+			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
+			RNA_boolean_set(&macroptr, "release_confirm", true);
+			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
+		}
+		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->adjust_xyz_no[i], 0);
+		mpop->is_redo = true;
+	}
+}
+
+static void manipulator_mesh_extrude_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorExtrudeGroup *man = mgroup->customdata;
+
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_flag(man->invoke_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	if (G.moving) {
+		return;
+	}
+
+	Scene *scene = CTX_data_scene(C);
+	man->data.orientation_type = scene->orientation_type;
+	bool use_normal = (man->data.orientation_type != V3D_MANIP_NORMAL);
+	const int axis_len_used = use_normal ? 4 : 3;
+
+	struct TransformBounds tbounds;
+
+	if (use_normal) {
+		struct TransformBounds tbounds_normal;
+		if (!ED_transform_calc_manipulator_stats(
+		            C, &(struct TransformCalcParams){
+		                .orientation_type = V3D_MANIP_NORMAL + 1,
+		            }, &tbounds_normal))
+		{
+			unit_m3(tbounds_normal.axis);
+		}
+		copy_m3_m3(man->data.normal_mat3, tbounds_normal.axis);
+	}
+
+	/* TODO(campbell): run second since this modifies the 3D view, it should not. */
+	if (!ED_transform_calc_manipulator_stats(
+	            C, &(struct TransformCalcParams){
+	                .orientation_type = man->data.orientation_type + 1,
+	            }, &tbounds))
+	{
+		return;
+	}
+
+	/* Main axis is normal. */
+	if (!use_normal) {
+		copy_m3_m3(man->data.normal_mat3, tbounds.axis);
+	}
+
+	/* Offset the add icon. */
+	mul_v3_v3fl(
+	        man->invoke_xyz_no[3]->matrix_offset[3],
+	        man->data.normal_mat3[2],
+	        (extrude_arrow_normal_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
+
+	/* Needed for normal orientation. */
+	manipulator_mesh_extrude_orientation_matrix_set(man, tbounds.axis);
+	if (use_normal) {
+		copy_m4_m3(man->adjust_xyz_no[3]->matrix_basis, man->data.normal_mat3);
+	}
+
+	/* Location. */
+	for (int i = 0; i < axis_len_used; i++) {
+		WM_manipulator_set_matrix_location(man->invoke_xyz_no[i], tbounds.center);
+		WM_manipulator_set_matrix_location(man->adjust_xyz_no[i], tbounds.center);
+	}
+
+	wmOperator *op = WM_operator_last_redo(C);
+	bool has_redo = (op && op->type == man->ot_extrude);
+
+	/* Un-hide. */
+	for (int i = 0; i < axis_len_used; i++) {
+		WM_manipulator_set_flag(man->invoke_xyz_no[i], WM_MANIPULATOR_HIDDEN, false);
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, !has_redo);
+	}
+
+	/* Operator properties. */
+	if (use_normal) {
+		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->invoke_xyz_no[3], 0);
+		PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate");
+		RNA_enum_set(&macroptr, "constraint_orientation", V3D_MANIP_NORMAL);
+	}
+
+	/* Redo with current settings. */
+	if (has_redo) {
+		wmOperator *op_transform = op->macro.last;
+		float value[4];
+		RNA_float_get_array(op_transform->ptr, "value", value);
+		int constraint_axis[3];
+		RNA_boolean_get_array(op_transform->ptr, "constraint_axis", constraint_axis);
+		int orientation_type = RNA_enum_get(op_transform->ptr, "constraint_orientation");
+
+		/* We could also access this from 'ot->last_properties' */
+		for (int i = 0; i < 4; i++) {
+			if ((i != 3) ?
+			    (orientation_type == man->data.orientation_type && constraint_axis[i]) :
+			    (orientation_type == V3D_MANIP_NORMAL && constraint_axis[2]))
+			{
+				wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->adjust_xyz_no[i], 0);
+
+				PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate");
+
+				RNA_float_set_array(&macroptr, "value", value);
+				RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_axis);
+				RNA_enum_set(&macroptr, "constraint_orientation", orientation_type);
+			}
+			else {
+				/* TODO(campbell): ideally we could adjust all,
+				 * this is complicated by how operator redo and the transform macro works. */
+				WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
+			}
+		}
+	}
+
+	for (int i = 0; i < 4; i++) {
+		RNA_enum_set(
+		        man->invoke_xyz_no[i]->ptr,
+		        "draw_options",
+		        (man->adjust_xyz_no[i]->flag & WM_MANIPULATOR_HIDDEN) ?
+		        ED_MANIPULATOR_BUTTON_SHOW_HELPLINE : 0);
+	}
+}
+
+static void manipulator_mesh_extrude_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorExtrudeGroup *man = mgroup->customdata;
+	switch (man->data.orientation_type) {
+		case V3D_MANIP_VIEW:
+		{
+			RegionView3D *rv3d = CTX_wm_region_view3d(C);
+			float mat[3][3];
+			copy_m3_m4(mat, rv3d->viewinv);
+			normalize_m3(mat);
+			manipulator_mesh_extrude_orientation_matrix_set(man, mat);
+			break;
+		}
+	}
+}
+
+static void manipulator_mesh_extrude_message_subscribe(
+        const bContext *C, wmManipulatorGroup *mgroup, struct wmMsgBus *mbus)
+{
+	ARegion *ar = CTX_wm_region(C);
+
+	/* Subscribe to view properties */
+	wmMsgSubscribeValue msg_sub_value_mpr_tag_refresh = {
+		.owner = ar,
+		.user_data = mgroup->parent_mmap,
+		.notify = WM_manipulator_do_msg_notify_tag_refresh,
+	};
+
+	{
+		WM_msg_subscribe_rna_anon_prop(mbus, Scene, transform_orientation, &msg_sub_value_mpr_tag_refresh);
+	}
+
+}
+
+static void MESH_WGT_extrude(struct wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Mesh Extrude";
+	wgt->idname = "MESH_WGT_extrude";
+
+	wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = manipulator_mesh_extrude_poll;
+	wgt->setup = manipulator_mesh_extrude_setup;
+	wgt->refresh = manipulator_mesh_extrude_refresh;
+	wgt->draw_prepare = manipulator_mesh_extrude_draw_prepare;
+	wgt->message_subscribe = manipulator_mesh_extrude_message_subscribe;
+}
+
+#endif  /* USE_MANIPULATOR */
+
+/** \} */
+
 /* -------------------------------------------------------------------- */
 /** \name Extrude Operator
  * \{ */
@@ -391,18 +731,28 @@ static bool edbm_extrude_mesh(Object *obedit, BMEditMesh *em, wmOperator *op)
 /* extrude without transform */
 static int edbm_extrude_region_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
-	edbm_extrude_mesh(obedit, em, op);
-
-	/* This normally happens when pushing undo but modal operators
-	 * like this one don't push undo data until after modal mode is
-	 * done.*/
-	EDBM_mesh_normals_update(em);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		if (!edbm_extrude_mesh(obedit, em, op)) {
+			continue;
+		}
+		/* This normally happens when pushing undo but modal operators
+		 * like this one don't push undo data until after modal mode is
+		 * done.*/
+		EDBM_mesh_normals_update(em);
 
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -427,17 +777,83 @@ void MESH_OT_extrude_region(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
+/** \name Extrude Context Operator
+ *
+ * Guess what to do based on selection.
+ * \{ */
+
+/* extrude without transform */
+static int edbm_extrude_context_exec(bContext *C, wmOperator *op)
+{
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
+
+		edbm_extrude_mesh(obedit, em, op);
+		/* This normally happens when pushing undo but modal operators
+		 * like this one don't push undo data until after modal mode is
+		 * done.*/
+
+		EDBM_mesh_normals_update(em);
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
+	return OPERATOR_FINISHED;
+}
+
+void MESH_OT_extrude_context(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Extrude Context";
+	ot->idname = "MESH_OT_extrude_context";
+	ot->description = "Extrude selection";
+
+	/* api callbacks */
+	ot->exec = edbm_extrude_context_exec;
+	ot->poll = ED_operator_editmesh;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	Transform_Properties(ot, P_NO_DEFAULTS | P_MIRROR_DUMMY);
+
+#ifdef USE_MANIPULATOR
+	WM_manipulatorgrouptype_append(MESH_WGT_extrude);
+#endif
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
 /** \name Extrude Verts Operator
  * \{ */
 
 static int edbm_extrude_verts_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
-	edbm_extrude_verts_indiv(em, op, BM_ELEM_SELECT);
+		edbm_extrude_verts_indiv(em, op, BM_ELEM_SELECT);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -468,12 +884,22 @@ void MESH_OT_extrude_verts_indiv(wmOperatorType *ot)
 
 static int edbm_extrude_edges_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-	edbm_extrude_edges_indiv(em, op, BM_ELEM_SELECT);
+		edbm_extrude_edges_indiv(em, op, BM_ELEM_SELECT);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -504,12 +930,22 @@ void MESH_OT_extrude_edges_indiv(wmOperatorType *ot)
 
 static int edbm_extrude_faces_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	edbm_extrude_discrete_faces(em, op, BM_ELEM_SELECT);
+		edbm_extrude_discrete_faces(em, op, BM_ELEM_SELECT);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -671,7 +1107,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
 		              BM_ELEM_SELECT, ofs);
 	}
 	else {
-		const float *cursor = ED_view3d_cursor3d_get(vc.scene, vc.v3d);
+		const float *cursor = ED_view3d_cursor3d_get(vc.scene, vc.v3d)->location;
 		BMOperator bmop;
 		BMOIter oiter;
 
@@ -723,4 +1159,3 @@ void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot)
 }
 
 /** \} */
-
diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c
index ffbbae60949..3214f28412a 100644
--- a/source/blender/editors/mesh/editmesh_extrude_screw.c
+++ b/source/blender/editors/mesh/editmesh_extrude_screw.c
@@ -25,17 +25,20 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mesh/editmesh_extrude_spin.c
+/** \file blender/editors/mesh/editmesh_extrude_screw.c
  *  \ingroup edmesh
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_report.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
+#include "BKE_report.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -46,6 +49,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+
+
 #include "mesh_intern.h"  /* own include */
 
 /* -------------------------------------------------------------------- */
@@ -54,84 +59,110 @@
 
 static int edbm_screw_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	BMEdge *eed;
 	BMVert *eve, *v1, *v2;
 	BMIter iter, eiter;
-	BMOperator spinop;
 	float dvec[3], nor[3], cent[3], axis[3], v1_co_global[3], v2_co_global[3];
 	int steps, turns;
 	int valence;
-
+	uint objects_empty_len = 0;
+	uint failed_axis_len = 0;
+	uint failed_vertices_len = 0;
 
 	turns = RNA_int_get(op->ptr, "turns");
 	steps = RNA_int_get(op->ptr, "steps");
 	RNA_float_get_array(op->ptr, "center", cent);
 	RNA_float_get_array(op->ptr, "axis", axis);
 
-	if (is_zero_v3(axis)) {
-		BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis");
-		return OPERATOR_CANCELLED;
-	}
+	uint objects_len = 0;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* find two vertices with valence count == 1, more or less is wrong */
-	v1 = NULL;
-	v2 = NULL;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++)	{
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-		valence = 0;
-		BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) {
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-				valence++;
+		if (bm->totvertsel < 2) {
+			if (bm->totvertsel == 0) {
+				objects_empty_len++;
 			}
+			continue;
 		}
 
-		if (valence == 1) {
-			if (v1 == NULL) {
-				v1 = eve;
-			}
-			else if (v2 == NULL) {
-				v2 = eve;
+		if (is_zero_v3(axis)) {
+			failed_axis_len++;
+			continue;
+		}
+
+		/* find two vertices with valence count == 1, more or less is wrong */
+		v1 = NULL;
+		v2 = NULL;
+
+		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
+			valence = 0;
+			BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) {
+				if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
+					valence++;
+				}
 			}
-			else {
-				v1 = NULL;
-				break;
+
+			if (valence == 1) {
+				if (v1 == NULL) {
+					v1 = eve;
+				}
+				else if (v2 == NULL) {
+					v2 = eve;
+				}
+				else {
+					v1 = NULL;
+					break;
+				}
 			}
 		}
-	}
 
-	if (v1 == NULL || v2 == NULL) {
-		BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too");
-		return OPERATOR_CANCELLED;
-	}
+		if (v1 == NULL || v2 == NULL) {
+			failed_vertices_len++;
+			continue;
+		}
 
-	copy_v3_v3(nor, obedit->obmat[2]);
+		copy_v3_v3(nor, obedit->obmat[2]);
 
-	/* calculate dvec */
-	mul_v3_m4v3(v1_co_global, obedit->obmat, v1->co);
-	mul_v3_m4v3(v2_co_global, obedit->obmat, v2->co);
-	sub_v3_v3v3(dvec, v1_co_global, v2_co_global);
-	mul_v3_fl(dvec, 1.0f / steps);
+		/* calculate dvec */
+		mul_v3_m4v3(v1_co_global, obedit->obmat, v1->co);
+		mul_v3_m4v3(v2_co_global, obedit->obmat, v2->co);
+		sub_v3_v3v3(dvec, v1_co_global, v2_co_global);
+		mul_v3_fl(dvec, 1.0f / steps);
 
-	if (dot_v3v3(nor, dvec) > 0.0f)
-		negate_v3(dvec);
+		if (dot_v3v3(nor, dvec) > 0.0f)
+			negate_v3(dvec);
 
-	if (!EDBM_op_init(em, &spinop, op,
-	                  "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b",
-	                  BM_ELEM_SELECT, cent, axis, dvec, turns * steps, DEG2RADF(360.0f * turns), obedit->obmat, false))
-	{
-		return OPERATOR_CANCELLED;
-	}
-	BMO_op_exec(bm, &spinop);
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-	BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
-	if (!EDBM_op_finish(em, &spinop, op, true)) {
-		return OPERATOR_CANCELLED;
+		BMOperator spinop;
+		if (!EDBM_op_init(em, &spinop, op,
+		                  "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b",
+		                  BM_ELEM_SELECT, cent, axis, dvec, turns * steps, DEG2RADF(360.0f * turns), obedit->obmat, false))
+		{
+			continue;
+		}
+
+		BMO_op_exec(bm, &spinop);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
+
+		if (!EDBM_op_finish(em, &spinop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
+	MEM_freeN(objects);
 
-	EDBM_update_generic(em, true, true);
+	if (failed_axis_len == objects_len - objects_empty_len) {
+		BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis");
+	}
+	else if (failed_vertices_len == objects_len - objects_empty_len) {
+		BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too");
+	}
 
 	return OPERATOR_FINISHED;
 }
@@ -146,7 +177,7 @@ static int edbm_screw_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
 	PropertyRNA *prop;
 	prop = RNA_struct_find_property(op->ptr, "center");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d));
+		RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d)->location);
 	}
 	if (rv3d) {
 		prop = RNA_struct_find_property(op->ptr, "axis");
diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c
index 4cd3b033ca7..f98d7dacac8 100644
--- a/source/blender/editors/mesh/editmesh_extrude_spin.c
+++ b/source/blender/editors/mesh/editmesh_extrude_spin.c
@@ -36,18 +36,400 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
 #include "mesh_intern.h"  /* own include */
 
+#define USE_MANIPULATOR
+
+#ifdef USE_MANIPULATOR
+#include "ED_manipulator_library.h"
+#include "ED_undo.h"
+#endif
+
+/* -------------------------------------------------------------------- */
+/** \name Spin Manipulator
+ * \{ */
+
+#ifdef USE_MANIPULATOR
+typedef struct ManipulatorSpinGroup {
+	/* Arrow to change plane depth. */
+	struct wmManipulator *translate_z;
+	/* Translate XYZ */
+	struct wmManipulator *translate_c;
+	/* For grabbing the manipulator and moving freely. */
+	struct wmManipulator *rotate_c;
+	/* Spin angle */
+	struct wmManipulator *angle_z;
+
+	/* We could store more vars here! */
+	struct {
+		bContext *context;
+		wmOperator *op;
+		PropertyRNA *prop_axis_co;
+		PropertyRNA *prop_axis_no;
+		PropertyRNA *prop_angle;
+
+		float rotate_axis[3];
+		float rotate_up[3];
+	} data;
+} ManipulatorSpinGroup;
+
+/**
+ * XXX. calling redo from property updates is not great.
+ * This is needed because changing the RNA doesn't cause a redo
+ * and we're not using operator UI which does just this.
+ */
+static void manipulator_spin_exec(ManipulatorSpinGroup *man)
+{
+	wmOperator *op = man->data.op;
+	if (op == WM_operator_last_redo((bContext *)man->data.context)) {
+		ED_undo_operator_repeat((bContext *)man->data.context, op);
+	}
+}
+
+static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man)
+{
+	wmOperator *op = man->data.op;
+
+	float plane_co[3], plane_no[3];
+
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+
+	WM_manipulator_set_matrix_location(man->translate_z, plane_co);
+	WM_manipulator_set_matrix_location(man->rotate_c, plane_co);
+	WM_manipulator_set_matrix_location(man->angle_z, plane_co);
+	/* translate_c location comes from the property. */
+
+	WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no);
+	WM_manipulator_set_matrix_rotation_from_z_axis(man->angle_z, plane_no);
+
+	WM_manipulator_set_scale(man->translate_c, 0.2);
+
+	RegionView3D *rv3d = ED_view3d_context_rv3d(man->data.context);
+	if (rv3d) {
+		normalize_v3_v3(man->data.rotate_axis, rv3d->viewinv[2]);
+		normalize_v3_v3(man->data.rotate_up, rv3d->viewinv[1]);
+
+		/* ensure its orthogonal */
+		project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis);
+		normalize_v3(man->data.rotate_up);
+
+		WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no);
+		WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, plane_no, man->data.rotate_axis);
+
+		/* show the axis instead of mouse cursor */
+		RNA_enum_set(man->rotate_c->ptr, "draw_options",
+		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR |
+		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y);
+
+	}
+}
+
+/* depth callbacks */
+static void manipulator_spin_prop_depth_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_co[3], plane_no[3];
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+
+	value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]);
+}
+
+static void manipulator_spin_prop_depth_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	const float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_co[3], plane[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane);
+	normalize_v3(plane);
+
+	plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]);
+
+	/* Keep our location, may be offset simply to be inside the viewport. */
+	closest_to_plane_normalized_v3(plane_co, plane, plane_co);
+
+	RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, plane_co);
+
+	manipulator_spin_exec(man);
+}
+
+/* translate callbacks */
+static void manipulator_spin_prop_translate_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 3);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, value);
+}
+
+static void manipulator_spin_prop_translate_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+
+	BLI_assert(mpr_prop->type->array_length == 3);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, value);
+
+	manipulator_spin_exec(man);
+}
+
+/* angle callbacks */
+static void manipulator_spin_prop_axis_angle_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_no[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+	normalize_v3(plane_no);
+
+	float plane_no_proj[3];
+	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
+
+	if (!is_zero_v3(plane_no_proj)) {
+		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
+		value[0] = angle;
+	}
+	else {
+		value[0] = 0.0f;
+	}
+}
+
+static void manipulator_spin_prop_axis_angle_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	const float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+
+	float plane_no[4];
+	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+	normalize_v3(plane_no);
+
+	float plane_no_proj[3];
+	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
+
+	if (!is_zero_v3(plane_no_proj)) {
+		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
+		const float angle_delta = angle - angle_compat_rad(value[0], angle);
+		if (angle_delta != 0.0f) {
+			float mat[3][3];
+			axis_angle_normalized_to_mat3(mat, man->data.rotate_axis, angle_delta);
+			mul_m3_v3(mat, plane_no);
+
+			/* re-normalize - seems acceptable */
+			RNA_property_float_set_array(op->ptr, man->data.prop_axis_no, plane_no);
+
+			manipulator_spin_exec(man);
+		}
+	}
+}
+
+/* angle callbacks */
+static void manipulator_spin_prop_angle_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+	value[0] = RNA_property_float_get(op->ptr, man->data.prop_angle);
+}
+
+static void manipulator_spin_prop_angle_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+	wmOperator *op = man->data.op;
+	BLI_assert(mpr_prop->type->array_length == 1);
+	UNUSED_VARS_NDEBUG(mpr_prop);
+	const float *value = value_p;
+	RNA_property_float_set(op->ptr, man->data.prop_angle, value[0]);
+
+	manipulator_spin_exec(man);
+}
+
+static bool manipulator_mesh_spin_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_spin")) {
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+
+	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_spin")) {
+		return;
+	}
+
+	struct ManipulatorSpinGroup *man = MEM_callocN(sizeof(ManipulatorSpinGroup), __func__);
+	mgroup->customdata = man;
+
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
+	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true);
+	const wmManipulatorType *wt_dial = WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true);
+
+	man->translate_z = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+	man->translate_c = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
+	man->rotate_c = WM_manipulator_new_ptr(wt_dial, mgroup, NULL);
+	man->angle_z = WM_manipulator_new_ptr(wt_dial, mgroup, NULL);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_z->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_c->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->rotate_c->color);
+	UI_GetThemeColor3fv(TH_AXIS_Z, man->angle_z->color);
+
+
+	RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+	RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
+
+	WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true);
+	WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true);
+	WM_manipulator_set_flag(man->angle_z, WM_MANIPULATOR_DRAW_VALUE, true);
+
+	WM_manipulator_set_scale(man->angle_z, 0.5f);
+
+	{
+		man->data.context = (bContext *)C;
+		man->data.op = op;
+		man->data.prop_axis_co = RNA_struct_find_property(op->ptr, "center");
+		man->data.prop_axis_no = RNA_struct_find_property(op->ptr, "axis");
+		man->data.prop_angle = RNA_struct_find_property(op->ptr, "angle");
+	}
+
+	manipulator_mesh_spin_update_from_op(man);
+
+	/* Setup property callbacks */
+	{
+		WM_manipulator_target_property_def_func(
+		        man->translate_z, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_spin_prop_depth_get,
+		            .value_set_fn = manipulator_spin_prop_depth_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+		WM_manipulator_target_property_def_func(
+		        man->translate_c, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_spin_prop_translate_get,
+		            .value_set_fn = manipulator_spin_prop_translate_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+		WM_manipulator_target_property_def_func(
+		        man->rotate_c, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_spin_prop_axis_angle_get,
+		            .value_set_fn = manipulator_spin_prop_axis_angle_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+		WM_manipulator_target_property_def_func(
+		        man->angle_z, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_spin_prop_angle_get,
+		            .value_set_fn = manipulator_spin_prop_angle_set,
+		            .range_get_fn = NULL,
+		            .user_data = NULL,
+		        });
+
+	}
+}
+
+static void manipulator_mesh_spin_draw_prepare(
+        const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	ManipulatorSpinGroup *man = mgroup->customdata;
+	if (man->data.op->next) {
+		man->data.op = WM_operator_last_redo((bContext *)man->data.context);
+	}
+	manipulator_mesh_spin_update_from_op(man);
+}
+
+static void MESH_WGT_spin(struct wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Mesh Spin";
+	wgt->idname = "MESH_WGT_spin";
+
+	wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = manipulator_mesh_spin_poll;
+	wgt->setup = manipulator_mesh_spin_setup;
+	wgt->draw_prepare = manipulator_mesh_spin_draw_prepare;
+}
+
+/** \} */
+
+#endif  /* USE_MANIPULATOR */
 
 /* -------------------------------------------------------------------- */
 /** \name Spin Operator
@@ -55,10 +437,7 @@
 
 static int edbm_spin_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMOperator spinop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	float cent[3], axis[3];
 	float d[3] = {0.0f, 0.0f, 0.0f};
 	int steps, dupli;
@@ -77,21 +456,33 @@ static int edbm_spin_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	/* keep the values in worldspace since we're passing the obmat */
-	if (!EDBM_op_init(em, &spinop, op,
-	                  "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b",
-	                  BM_ELEM_SELECT, cent, axis, d, steps, angle, obedit->obmat, dupli))
-	{
-		return OPERATOR_CANCELLED;
-	}
-	BMO_op_exec(bm, &spinop);
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-	BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
-	if (!EDBM_op_finish(em, &spinop, op, true)) {
-		return OPERATOR_CANCELLED;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BMOperator spinop;
+
+		/* keep the values in worldspace since we're passing the obmat */
+		if (!EDBM_op_init(em, &spinop, op,
+		                  "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b",
+		                  BM_ELEM_SELECT, cent, axis, d, steps, angle, obedit->obmat, dupli))
+		{
+			continue;
+		}
+		BMO_op_exec(bm, &spinop);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
+		if (!EDBM_op_finish(em, &spinop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -106,7 +497,7 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e
 	PropertyRNA *prop;
 	prop = RNA_struct_find_property(op->ptr, "center");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d));
+		RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d)->location);
 	}
 	if (rv3d) {
 		prop = RNA_struct_find_property(op->ptr, "axis");
@@ -115,7 +506,18 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e
 		}
 	}
 
-	return edbm_spin_exec(C, op);
+	int ret = edbm_spin_exec(C, op);
+
+#ifdef USE_MANIPULATOR
+	if (ret & OPERATOR_FINISHED) {
+		/* Setup manipulators */
+		if (v3d && (v3d->twflag & V3D_MANIPULATOR_DRAW)) {
+			WM_manipulator_group_type_ensure("MESH_WGT_spin");
+		}
+	}
+#endif
+
+	return ret;
 }
 
 void MESH_OT_spin(wmOperatorType *ot)
@@ -146,7 +548,7 @@ void MESH_OT_spin(wmOperatorType *ot)
 	                     "Center", "Center in global view space", -1e4f, 1e4f);
 	RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -1.0f, 1.0f);
 
+#ifdef USE_MANIPULATOR
+	WM_manipulatorgrouptype_append(MESH_WGT_spin);
+#endif
 }
-
-/** \} */
-
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 3833b84b5d2..985d873dfc2 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -37,6 +37,7 @@
 #include "BKE_global.h"
 #include "BKE_editmesh.h"
 #include "BKE_unit.h"
+#include "BKE_layer.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -55,6 +56,10 @@
 
 #include "mesh_intern.h"  /* own include */
 
+typedef struct {
+	BMEditMesh *em;
+	BMBackup mesh_backup;
+} InsetObjectStore;
 
 typedef struct {
 	float old_thickness;
@@ -65,14 +70,15 @@ typedef struct {
 	bool is_modal;
 	bool shift;
 	float shift_amount;
-	BMEditMesh *em;
 	NumInput num_input;
 
+	InsetObjectStore *ob_store;
+	uint              ob_store_len;
+
 	/* modal only */
 	float mcenter[2];
-	BMBackup mesh_backup;
 	void *draw_handle_pixel;
-	short twtype;
+	short twflag;
 } InsetData;
 
 
@@ -115,12 +121,7 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 {
 	InsetData *opdata;
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
-	if (em->bm->totvertsel == 0) {
-		return false;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	if (is_modal) {
 		RNA_float_set(op->ptr, "thickness", 0.01f);
@@ -129,13 +130,30 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 
 	op->customdata = opdata = MEM_mallocN(sizeof(InsetData), "inset_operator_data");
 
+	uint objects_used_len = 0;
+
+	{
+		uint ob_store_len = 0;
+		Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &ob_store_len);
+		opdata->ob_store = MEM_malloc_arrayN(ob_store_len, sizeof(*opdata->ob_store), __func__);
+		for (uint ob_index = 0; ob_index < ob_store_len; ob_index++) {
+			Object *obedit = objects[ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+			if (em->bm->totvertsel > 0) {
+				opdata->ob_store[objects_used_len].em = em;
+				objects_used_len++;
+			}
+		}
+		MEM_freeN(objects);
+		opdata->ob_store_len = objects_used_len;
+	}
+
 	opdata->old_thickness = 0.01;
 	opdata->old_depth = 0.0;
 	opdata->modify_depth = false;
 	opdata->shift = false;
 	opdata->shift_amount = 0.0f;
 	opdata->is_modal = is_modal;
-	opdata->em = em;
 
 	initNumInput(&opdata->num_input);
 	opdata->num_input.idx_max = 1; /* Two elements. */
@@ -147,13 +165,16 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 		View3D *v3d = CTX_wm_view3d(C);
 		ARegion *ar = CTX_wm_region(C);
 
-		opdata->mesh_backup = EDBM_redo_state_store(em);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			opdata->ob_store[ob_index].mesh_backup = EDBM_redo_state_store(opdata->ob_store[ob_index].em);
+		}
+
 		opdata->draw_handle_pixel = ED_region_draw_cb_activate(
 		        ar->type, ED_region_draw_mouse_line_cb, opdata->mcenter, REGION_DRAW_POST_PIXEL);
 		G.moving = G_TRANSFORM_EDIT;
 		if (v3d) {
-			opdata->twtype = v3d->twtype;
-			v3d->twtype = 0;
+			opdata->twflag = v3d->twflag;
+			v3d->twflag = 0;
 		}
 	}
 
@@ -170,10 +191,12 @@ static void edbm_inset_exit(bContext *C, wmOperator *op)
 	if (opdata->is_modal) {
 		View3D *v3d = CTX_wm_view3d(C);
 		ARegion *ar = CTX_wm_region(C);
-		EDBM_redo_state_free(&opdata->mesh_backup, NULL, false);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, NULL, false);
+		}
 		ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel);
 		if (v3d) {
-			v3d->twtype = opdata->twtype;
+			v3d->twflag = opdata->twflag;
 		}
 		G.moving = 0;
 	}
@@ -181,7 +204,9 @@ static void edbm_inset_exit(bContext *C, wmOperator *op)
 	if (sa) {
 		ED_area_headerprint(sa, NULL);
 	}
-	MEM_freeN(op->customdata);
+
+	MEM_SAFE_FREE(opdata->ob_store);
+	MEM_SAFE_FREE(op->customdata);
 }
 
 static void edbm_inset_cancel(bContext *C, wmOperator *op)
@@ -190,8 +215,10 @@ static void edbm_inset_cancel(bContext *C, wmOperator *op)
 
 	opdata = op->customdata;
 	if (opdata->is_modal) {
-		EDBM_redo_state_free(&opdata->mesh_backup, opdata->em, true);
-		EDBM_update_generic(opdata->em, false, true);
+		for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+			EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, opdata->ob_store[ob_index].em, true);
+			EDBM_update_generic(opdata->ob_store[ob_index].em, false, true);
+		}
 	}
 
 	edbm_inset_exit(C, op);
@@ -205,6 +232,7 @@ static bool edbm_inset_calc(wmOperator *op)
 	InsetData *opdata;
 	BMEditMesh *em;
 	BMOperator bmop;
+	bool changed = false;
 
 	const bool use_boundary        = RNA_boolean_get(op->ptr, "use_boundary");
 	const bool use_even_offset     = RNA_boolean_get(op->ptr, "use_even_offset");
@@ -218,49 +246,55 @@ static bool edbm_inset_calc(wmOperator *op)
 	const bool use_interpolate     = RNA_boolean_get(op->ptr, "use_interpolate");
 
 	opdata = op->customdata;
-	em = opdata->em;
 
-	if (opdata->is_modal) {
-		EDBM_redo_state_restore(opdata->mesh_backup, em, false);
-	}
+	for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
+		em = opdata->ob_store[ob_index].em;
 
-	if (use_individual) {
-		EDBM_op_init(em, &bmop, op,
-		             "inset_individual faces=%hf use_even_offset=%b  use_relative_offset=%b "
-		             "use_interpolate=%b thickness=%f depth=%f",
-		             BM_ELEM_SELECT, use_even_offset, use_relative_offset, use_interpolate,
-		             thickness, depth);
-	}
-	else {
-		EDBM_op_init(em, &bmop, op,
-		             "inset_region faces=%hf use_boundary=%b use_even_offset=%b use_relative_offset=%b "
-		             "use_interpolate=%b thickness=%f depth=%f use_outset=%b use_edge_rail=%b",
-		             BM_ELEM_SELECT, use_boundary, use_even_offset, use_relative_offset, use_interpolate,
-		             thickness, depth, use_outset, use_edge_rail);
-
-		if (use_outset) {
-			BMO_slot_buffer_from_enabled_hflag(em->bm, &bmop, bmop.slots_in, "faces_exclude", BM_FACE, BM_ELEM_HIDDEN);
+		if (opdata->is_modal) {
+			EDBM_redo_state_restore(opdata->ob_store[ob_index].mesh_backup, em, false);
 		}
-	}
-	BMO_op_exec(em->bm, &bmop);
 
-	if (use_select_inset) {
-		/* deselect original faces/verts */
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
-	}
-	else {
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_in, "faces", BM_FACE, BM_ELEM_SELECT, true);
-	}
+		if (use_individual) {
+			EDBM_op_init(
+			        em, &bmop, op,
+			        "inset_individual faces=%hf use_even_offset=%b  use_relative_offset=%b "
+			        "use_interpolate=%b thickness=%f depth=%f",
+			        BM_ELEM_SELECT, use_even_offset, use_relative_offset, use_interpolate,
+			        thickness, depth);
+		}
+		else {
+			EDBM_op_init(
+			        em, &bmop, op,
+			        "inset_region faces=%hf use_boundary=%b use_even_offset=%b use_relative_offset=%b "
+			        "use_interpolate=%b thickness=%f depth=%f use_outset=%b use_edge_rail=%b",
+			        BM_ELEM_SELECT, use_boundary, use_even_offset, use_relative_offset, use_interpolate,
+			        thickness, depth, use_outset, use_edge_rail);
+
+			if (use_outset) {
+				BMO_slot_buffer_from_enabled_hflag(em->bm, &bmop, bmop.slots_in, "faces_exclude", BM_FACE, BM_ELEM_HIDDEN);
+			}
+		}
+		BMO_op_exec(em->bm, &bmop);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return false;
-	}
-	else {
-		EDBM_update_generic(em, true, true);
-		return true;
+		if (use_select_inset) {
+			/* deselect original faces/verts */
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		}
+		else {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_in, "faces", BM_FACE, BM_ELEM_SELECT, true);
+		}
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+		else {
+			EDBM_update_generic(em, true, true);
+			changed = true;
+		}
 	}
+	return changed;
 }
 
 static int edbm_inset_exec(bContext *C, wmOperator *op)
@@ -378,7 +412,9 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			case LEFTMOUSE:
 			case PADENTER:
 			case RETKEY:
-				if (event->val == KM_PRESS) {
+				if ((event->val == KM_PRESS) ||
+				    ((event->val == KM_RELEASE) && RNA_boolean_get(op->ptr, "release_confirm")))
+				{
 					edbm_inset_calc(op);
 					edbm_inset_exit(C, op);
 					return OPERATOR_FINISHED;
@@ -540,4 +576,7 @@ void MESH_OT_inset(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "use_select_inset", false, "Select Outer", "Select the new inset faces");
 	RNA_def_boolean(ot->srna, "use_individual", false, "Individual", "Individual Face Inset");
 	RNA_def_boolean(ot->srna, "use_interpolate", true, "Interpolate", "Blend face data across the inset");
+
+	prop = RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "");
+	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c
index d681d904e74..ad76f0c66f1 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -33,6 +33,7 @@
 #include "BLI_kdopbvh.h"
 #include "BLI_linklist_stack.h"
 
+#include "BKE_layer.h"
 #include "BKE_editmesh_bvh.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
@@ -146,9 +147,6 @@ enum {
 
 static int edbm_intersect_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	const int mode = RNA_enum_get(op->ptr, "mode");
 	int (*test_fn)(BMFace *, void *);
 	bool use_separate_all = false;
@@ -186,29 +184,45 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op)
 		default:  /* ISECT_SEPARATE_NONE */
 			break;
 	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	uint isect_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	has_isect = BM_mesh_intersect(
-	        bm,
-	        em->looptris, em->tottri,
-	        test_fn, NULL,
-	        use_self, use_separate_all, true, true, true,
-	        -1,
-	        eps);
-
-	if (use_separate_cut) {
-		/* detach selected/un-selected faces */
-		BM_mesh_separate_faces(
-		        bm,
-		        BM_elem_cb_check_hflag_enabled_simple(const BMFace *, BM_ELEM_SELECT));
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+
+		has_isect = BM_mesh_intersect(
+			em->bm,
+			em->looptris, em->tottri,
+			test_fn, NULL,
+			use_self, use_separate_all, true, true, true,
+			-1,
+			eps);
+
+		if (use_separate_cut) {
+			/* detach selected/un-selected faces */
+			BM_mesh_separate_faces(
+				em->bm,
+				BM_elem_cb_check_hflag_enabled_simple(const BMFace *, BM_ELEM_SELECT));
+		}
 
-	if (has_isect) {
-		edbm_intersect_select(em);
+		if (has_isect) {
+			edbm_intersect_select(em);
+		}
+		else {
+			isect_len++;
+		}
 	}
-	else {
+	MEM_freeN(objects);
+
+	if (isect_len == objects_len) {
 		BKE_report(op->reports, RPT_WARNING, "No intersections found");
 	}
-
 	return OPERATOR_FINISHED;
 }
 
@@ -266,9 +280,6 @@ void MESH_OT_intersect(struct wmOperatorType *ot)
 
 static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	const int boolean_operation = RNA_enum_get(op->ptr, "operation");
 	bool use_swap = RNA_boolean_get(op->ptr, "use_swap");
 	const float eps = RNA_float_get(op->ptr, "threshold");
@@ -276,23 +287,39 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op)
 	bool has_isect;
 
 	test_fn = use_swap ? bm_face_isect_pair_swap : bm_face_isect_pair;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	uint isect_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	has_isect = BM_mesh_intersect(
-	        bm,
-	        em->looptris, em->tottri,
-	        test_fn, NULL,
-	        false, false, true, true, true,
-	        boolean_operation,
-	        eps);
+		has_isect = BM_mesh_intersect(
+			em->bm,
+			em->looptris, em->tottri,
+			test_fn, NULL,
+			false, false, true, true, true,
+			boolean_operation,
+			eps);
 
 
-	if (has_isect) {
-		edbm_intersect_select(em);
+		if (has_isect) {
+			edbm_intersect_select(em);
+		}
+		else {
+			isect_len++;
+		}
 	}
-	else {
+	MEM_freeN(objects);
+
+	if (isect_len == objects_len) {
 		BKE_report(op->reports, RPT_WARNING, "No intersections found");
 	}
-
 	return OPERATOR_FINISHED;
 }
 
@@ -652,257 +679,270 @@ static BMEdge *bm_face_split_edge_find(
 
 static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	const char hflag = BM_ELEM_TAG;
 
 	BMEdge *e;
 	BMIter iter;
 
-	BLI_SMALLSTACK_DECLARE(loop_stack, BMLoop *);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	{
-		BMVert *v;
-		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
-			BM_elem_flag_disable(v, hflag);
+		if ((bm->totedgesel == 0) ||
+		    (bm->totfacesel == 0))
+		{
+			continue;
 		}
-	}
-
-	/* edge index is set to -1 then used to assosiate them with faces */
-	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(e, BM_ELEM_SELECT) && BM_edge_is_wire(e)) {
-			BM_elem_flag_enable(e, hflag);
 
-			BM_elem_flag_enable(e->v1, hflag);
-			BM_elem_flag_enable(e->v2, hflag);
+		BLI_SMALLSTACK_DECLARE(loop_stack, BMLoop *);
 
+		{
+			BMVert *v;
+			BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
+				BM_elem_flag_disable(v, hflag);
+			}
 		}
-		else {
-			BM_elem_flag_disable(e, hflag);
-		}
-		BM_elem_index_set(e, -1);  /* set_dirty */
-	}
-	bm->elem_index_dirty |= BM_EDGE;
 
-	{
-		BMFace *f;
-		int i;
-		BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
-			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
-				BM_elem_flag_enable(f, hflag);
+		/* edge index is set to -1 then used to assosiate them with faces */
+		BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(e, BM_ELEM_SELECT) && BM_edge_is_wire(e)) {
+				BM_elem_flag_enable(e, hflag);
+
+				BM_elem_flag_enable(e->v1, hflag);
+				BM_elem_flag_enable(e->v2, hflag);
+
 			}
 			else {
-				BM_elem_flag_disable(f, hflag);
+				BM_elem_flag_disable(e, hflag);
 			}
-			BM_elem_flag_disable(f, BM_ELEM_INTERNAL_TAG);
-			BM_elem_index_set(f, i);  /* set_ok */
+			BM_elem_index_set(e, -1);  /* set_dirty */
 		}
-	}
-	bm->elem_index_dirty &= ~BM_FACE;
-
-	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(e, hflag)) {
-			BMIter viter;
-			BMVert *v;
-			BM_ITER_ELEM (v, &viter, e, BM_VERTS_OF_EDGE) {
-				BMIter liter;
-				BMLoop *l;
-
-				unsigned int loop_stack_len;
-				BMLoop *l_best = NULL;
-
-				BLI_assert(BLI_SMALLSTACK_IS_EMPTY(loop_stack));
-				loop_stack_len = 0;
-
-				BM_ITER_ELEM (l, &liter, v, BM_LOOPS_OF_VERT) {
-					if (BM_elem_flag_test(l->f, hflag)) {
-						BLI_SMALLSTACK_PUSH(loop_stack, l);
-						loop_stack_len++;
-					}
-				}
+		bm->elem_index_dirty |= BM_EDGE;
 
-				if (loop_stack_len == 0) {
-					/* pass */
-				}
-				else if (loop_stack_len == 1) {
-					l_best = BLI_SMALLSTACK_POP(loop_stack);
+		{
+			BMFace *f;
+			int i;
+			BM_ITER_MESH_INDEX(f, &iter, bm, BM_FACES_OF_MESH, i) {
+				if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
+					BM_elem_flag_enable(f, hflag);
 				}
 				else {
-					/* complicated case, match the edge with a face-loop */
+					BM_elem_flag_disable(f, hflag);
+				}
+				BM_elem_flag_disable(f, BM_ELEM_INTERNAL_TAG);
+				BM_elem_index_set(f, i);  /* set_ok */
+			}
+		}
+		bm->elem_index_dirty &= ~BM_FACE;
+
+		BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(e, hflag)) {
+				BMIter viter;
+				BMVert *v;
+				BM_ITER_ELEM(v, &viter, e, BM_VERTS_OF_EDGE) {
+					BMIter liter;
+					BMLoop *l;
+
+					unsigned int loop_stack_len;
+					BMLoop *l_best = NULL;
+
+					BLI_assert(BLI_SMALLSTACK_IS_EMPTY(loop_stack));
+					loop_stack_len = 0;
+
+					BM_ITER_ELEM(l, &liter, v, BM_LOOPS_OF_VERT) {
+						if (BM_elem_flag_test(l->f, hflag)) {
+							BLI_SMALLSTACK_PUSH(loop_stack, l);
+							loop_stack_len++;
+						}
+					}
+
+					if (loop_stack_len == 0) {
+						/* pass */
+					}
+					else if (loop_stack_len == 1) {
+						l_best = BLI_SMALLSTACK_POP(loop_stack);
+					}
+					else {
+						/* complicated case, match the edge with a face-loop */
 
-					BMVert *v_other = BM_edge_other_vert(e, v);
-					float e_dir[3];
+						BMVert *v_other = BM_edge_other_vert(e, v);
+						float e_dir[3];
 
-					/* we want closest to zero */
-					float dot_best = FLT_MAX;
+						/* we want closest to zero */
+						float dot_best = FLT_MAX;
 
-					sub_v3_v3v3(e_dir, v_other->co, v->co);
-					normalize_v3(e_dir);
+						sub_v3_v3v3(e_dir, v_other->co, v->co);
+						normalize_v3(e_dir);
 
-					while ((l = BLI_SMALLSTACK_POP(loop_stack))) {
-						float dot_test;
+						while ((l = BLI_SMALLSTACK_POP(loop_stack))) {
+							float dot_test;
 
-						/* Check dot first to save on expensive angle-comparison.
-						 * ideal case is 90d difference == 0.0 dot */
-						dot_test = fabsf(dot_v3v3(e_dir, l->f->no));
-						if (dot_test < dot_best) {
+							/* Check dot first to save on expensive angle-comparison.
+							 * ideal case is 90d difference == 0.0 dot */
+							dot_test = fabsf(dot_v3v3(e_dir, l->f->no));
+							if (dot_test < dot_best) {
 
-							/* check we're in the correct corner (works with convex loops too) */
-							if (angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, v_other->co,    l->f->no) <
-							    angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, l->next->v->co, l->f->no))
-							{
-								dot_best = dot_test;
-								l_best = l;
+								/* check we're in the correct corner (works with convex loops too) */
+								if (angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, v_other->co, l->f->no) <
+								    angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, l->next->v->co, l->f->no))
+								{
+									dot_best = dot_test;
+									l_best = l;
+								}
 							}
 						}
 					}
-				}
 
-				if (l_best) {
-					BM_elem_index_set(e, BM_elem_index_get(l_best->f));  /* set_dirty */
+					if (l_best) {
+						BM_elem_index_set(e, BM_elem_index_get(l_best->f));  /* set_dirty */
+					}
 				}
 			}
 		}
-	}
 
-	{
-		BMFace *f;
-		BLI_buffer_declare_static(BMEdge **, edge_net_temp_buf, 0, 128);
+		{
+			BMFace *f;
+			BLI_buffer_declare_static(BMEdge **, edge_net_temp_buf, 0, 128);
 
-		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(f, hflag)) {
-				bm_face_split_by_edges(bm, f, hflag, &edge_net_temp_buf);
+			BM_ITER_MESH(f, &iter, bm, BM_FACES_OF_MESH) {
+				if (BM_elem_flag_test(f, hflag)) {
+					bm_face_split_by_edges(bm, f, hflag, &edge_net_temp_buf);
+				}
 			}
+			BLI_buffer_free(&edge_net_temp_buf);
 		}
-		BLI_buffer_free(&edge_net_temp_buf);
-	}
 
 #ifdef USE_NET_ISLAND_CONNECT
-	/* before overwriting edge index values, collect edges left untouched */
-	BLI_Stack *edges_loose = BLI_stack_new(sizeof(BMEdge * ), __func__);
-	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(e, BM_ELEM_SELECT) && BM_edge_is_wire(e)) {
-			BLI_stack_push(edges_loose, &e);
+		/* before overwriting edge index values, collect edges left untouched */
+		BLI_Stack *edges_loose = BLI_stack_new(sizeof(BMEdge *), __func__);
+		BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(e, BM_ELEM_SELECT) && BM_edge_is_wire(e)) {
+				BLI_stack_push(edges_loose, &e);
+			}
 		}
-	}
 #endif
 
-	EDBM_mesh_normals_update(em);
-	EDBM_update_generic(em, true, true);
+		EDBM_mesh_normals_update(em);
+		EDBM_update_generic(em, true, true);
 
 
 #ifdef USE_NET_ISLAND_CONNECT
-	/* we may have remaining isolated regions remaining,
-	 * these will need to have connecting edges created */
-	if (!BLI_stack_is_empty(edges_loose)) {
-		GHash *face_edge_map = BLI_ghash_ptr_new(__func__);
+		/* we may have remaining isolated regions remaining,
+		 * these will need to have connecting edges created */
+		if (!BLI_stack_is_empty(edges_loose)) {
+			GHash *face_edge_map = BLI_ghash_ptr_new(__func__);
 
-		MemArena *mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
+			MemArena *mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
 
-		BM_mesh_elem_index_ensure(bm, BM_FACE);
+			BM_mesh_elem_index_ensure(bm, BM_FACE);
 
-		{
-			BMBVHTree *bmbvh = BKE_bmbvh_new(bm, em->looptris, em->tottri, BMBVH_RESPECT_SELECT, NULL, false);
+			{
+				BMBVHTree *bmbvh = BKE_bmbvh_new(bm, em->looptris, em->tottri, BMBVH_RESPECT_SELECT, NULL, false);
 
-			BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-				BM_elem_index_set(e, -1);  /* set_dirty */
-			}
+				BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+					BM_elem_index_set(e, -1);  /* set_dirty */
+				}
 
-			while (!BLI_stack_is_empty(edges_loose)) {
-				BLI_stack_pop(edges_loose, &e);
-				float e_center[3];
-				mid_v3_v3v3(e_center, e->v1->co, e->v2->co);
+				while (!BLI_stack_is_empty(edges_loose)) {
+					BLI_stack_pop(edges_loose, &e);
+					float e_center[3];
+					mid_v3_v3v3(e_center, e->v1->co, e->v2->co);
 
-				BMFace *f = BKE_bmbvh_find_face_closest(bmbvh, e_center, FLT_MAX);
-				if (f) {
-					ghash_insert_face_edge_link(face_edge_map, f, e, mem_arena);
-					BM_elem_index_set(e, BM_elem_index_get(f));  /* set_dirty */
+					BMFace *f = BKE_bmbvh_find_face_closest(bmbvh, e_center, FLT_MAX);
+					if (f) {
+						ghash_insert_face_edge_link(face_edge_map, f, e, mem_arena);
+						BM_elem_index_set(e, BM_elem_index_get(f));  /* set_dirty */
+					}
 				}
-			}
 
-			BKE_bmbvh_free(bmbvh);
-		}
+				BKE_bmbvh_free(bmbvh);
+			}
 
-		bm->elem_index_dirty |= BM_EDGE;
+			bm->elem_index_dirty |= BM_EDGE;
 
-		BM_mesh_elem_table_ensure(bm, BM_FACE);
+			BM_mesh_elem_table_ensure(bm, BM_FACE);
 
-		/* detect edges chains that span faces
-		 * and splice vertices into the closest edges */
-		{
-			GHashIterator gh_iter;
-
-			GHASH_ITER(gh_iter, face_edge_map) {
-				BMFace *f = BLI_ghashIterator_getKey(&gh_iter);
-				struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter);
-				LinkNode *e_link = e_ls_base->list;
-
-				do {
-					e = e_link->link;
-
-					for (int j = 0; j < 2; j++) {
-						BMVert *v_pivot = (&e->v1)[j];
-						/* checking that \a v_pivot isn't in the face
-						 * prevents attempting to splice the same vertex into an edge from multiple faces */
-						if (!BM_vert_in_face(v_pivot, f)) {
-							float v_pivot_co[3];
-							float v_pivot_fac;
-							BMEdge *e_split = bm_face_split_edge_find(
-							        e, f, v_pivot, bm->ftable, bm->totface,
-							        v_pivot_co, &v_pivot_fac);
-
-							if (e_split) {
-								/* for degenerate cases this vertex may be in one of this edges radial faces */
-								if (!bm_vert_in_faces_radial(v_pivot, e_split, f)) {
-									BMEdge *e_new;
-									BMVert *v_new = BM_edge_split(bm, e_split, e_split->v1, &e_new, v_pivot_fac);
-									if (v_new) {
-										/* we _know_ these don't share an edge */
-										BM_vert_splice(bm, v_pivot, v_new);
-										BM_elem_index_set(e_new, BM_elem_index_get(e_split));
+			/* detect edges chains that span faces
+			 * and splice vertices into the closest edges */
+			{
+				GHashIterator gh_iter;
+
+				GHASH_ITER(gh_iter, face_edge_map) {
+					BMFace *f = BLI_ghashIterator_getKey(&gh_iter);
+					struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter);
+					LinkNode *e_link = e_ls_base->list;
+
+					do {
+						e = e_link->link;
+
+						for (int j = 0; j < 2; j++) {
+							BMVert *v_pivot = (&e->v1)[j];
+							/* checking that \a v_pivot isn't in the face
+							 * prevents attempting to splice the same vertex into an edge from multiple faces */
+							if (!BM_vert_in_face(v_pivot, f)) {
+								float v_pivot_co[3];
+								float v_pivot_fac;
+								BMEdge *e_split = bm_face_split_edge_find(
+									e, f, v_pivot, bm->ftable, bm->totface,
+									v_pivot_co, &v_pivot_fac);
+
+								if (e_split) {
+									/* for degenerate cases this vertex may be in one of this edges radial faces */
+									if (!bm_vert_in_faces_radial(v_pivot, e_split, f)) {
+										BMEdge *e_new;
+										BMVert *v_new = BM_edge_split(bm, e_split, e_split->v1, &e_new, v_pivot_fac);
+										if (v_new) {
+											/* we _know_ these don't share an edge */
+											BM_vert_splice(bm, v_pivot, v_new);
+											BM_elem_index_set(e_new, BM_elem_index_get(e_split));
+										}
 									}
 								}
 							}
 						}
-					}
 
-				} while ((e_link = e_link->next));
+					} while ((e_link = e_link->next));
+				}
 			}
-		}
 
 
-		{
-			MemArena *mem_arena_edgenet = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
+			{
+				MemArena *mem_arena_edgenet = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
 
-			GHashIterator gh_iter;
+				GHashIterator gh_iter;
 
-			GHASH_ITER(gh_iter, face_edge_map) {
-				BMFace *f = BLI_ghashIterator_getKey(&gh_iter);
-				struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter);
+				GHASH_ITER(gh_iter, face_edge_map) {
+					BMFace *f = BLI_ghashIterator_getKey(&gh_iter);
+					struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter);
 
-				bm_face_split_by_edges_island_connect(
-				        bm, f,
-				        e_ls_base->list, e_ls_base->list_len,
-				        mem_arena_edgenet);
+					bm_face_split_by_edges_island_connect(
+						bm, f,
+						e_ls_base->list, e_ls_base->list_len,
+						mem_arena_edgenet);
 
-				BLI_memarena_clear(mem_arena_edgenet);
-			}
+					BLI_memarena_clear(mem_arena_edgenet);
+				}
 
-			BLI_memarena_free(mem_arena_edgenet);
-		}
+				BLI_memarena_free(mem_arena_edgenet);
+			}
 
-		BLI_memarena_free(mem_arena);
+			BLI_memarena_free(mem_arena);
 
-		BLI_ghash_free(face_edge_map, NULL, NULL);
+			BLI_ghash_free(face_edge_map, NULL, NULL);
 
-		EDBM_mesh_normals_update(em);
-		EDBM_update_generic(em, true, true);
-	}
+			EDBM_mesh_normals_update(em);
+			EDBM_update_generic(em, true, true);
+		}
 
-	BLI_stack_free(edges_loose);
+		BLI_stack_free(edges_loose);
 #endif  /* USE_NET_ISLAND_CONNECT */
 
+	}
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 8eb3ad84919..be54bba7aa4 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -54,8 +54,10 @@
 #include "BKE_editmesh_bvh.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h" /* for paint cursor */
+#include "DEG_depsgraph.h"
+
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "ED_screen.h"
 #include "ED_space_api.h"
@@ -1004,12 +1006,18 @@ static void knifetool_draw_angle_snapping(const KnifeTool_OpData *kcd)
 		copy_v3_v3(v2, ray_hit_best[1]);
 	}
 
-	UI_ThemeColor(TH_TRANSFORM);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+	immUniformThemeColor(TH_TRANSFORM);
 	glLineWidth(2.0);
-	glBegin(GL_LINES);
-	glVertex3fv(v1);
-	glVertex3fv(v2);
-	glEnd();
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex3fv(pos, v1);
+	immVertex3fv(pos, v2);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 static void knife_init_colors(KnifeColors *colors)
@@ -1037,66 +1045,69 @@ static void knifetool_draw(const bContext *C, ARegion *UNUSED(ar), void *arg)
 
 	glPolygonOffset(1.0f, 1.0f);
 
-	glPushMatrix();
-	glMultMatrixf(kcd->ob->obmat);
+	gpuPushMatrix();
+	gpuMultMatrix(kcd->ob->obmat);
+
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 
 	if (kcd->mode == MODE_DRAGGING) {
 		if (kcd->is_angle_snapping)
 			knifetool_draw_angle_snapping(kcd);
 
-		glColor3ubv(kcd->colors.line);
-
+		immUniformColor3ubv(kcd->colors.line);
 		glLineWidth(2.0);
 
-		glBegin(GL_LINES);
-		glVertex3fv(kcd->prev.cage);
-		glVertex3fv(kcd->curr.cage);
-		glEnd();
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex3fv(pos, kcd->prev.cage);
+		immVertex3fv(pos, kcd->curr.cage);
+		immEnd();
 	}
 
 	if (kcd->prev.vert) {
-		glColor3ubv(kcd->colors.point);
+		immUniformColor3ubv(kcd->colors.point);
 		glPointSize(11);
 
-		glBegin(GL_POINTS);
-		glVertex3fv(kcd->prev.cage);
-		glEnd();
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex3fv(pos, kcd->prev.cage);
+		immEnd();
 	}
 
 	if (kcd->prev.bmface) {
-		glColor3ubv(kcd->colors.curpoint);
+		immUniformColor3ubv(kcd->colors.curpoint);
 		glPointSize(9);
 
-		glBegin(GL_POINTS);
-		glVertex3fv(kcd->prev.cage);
-		glEnd();
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex3fv(pos, kcd->prev.cage);
+		immEnd();
 	}
 
 	if (kcd->curr.edge) {
-		glColor3ubv(kcd->colors.edge);
+		immUniformColor3ubv(kcd->colors.edge);
 		glLineWidth(2.0);
 
-		glBegin(GL_LINES);
-		glVertex3fv(kcd->curr.edge->v1->cageco);
-		glVertex3fv(kcd->curr.edge->v2->cageco);
-		glEnd();
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex3fv(pos, kcd->curr.edge->v1->cageco);
+		immVertex3fv(pos, kcd->curr.edge->v2->cageco);
+		immEnd();
 	}
 	else if (kcd->curr.vert) {
-		glColor3ubv(kcd->colors.point);
+		immUniformColor3ubv(kcd->colors.point);
 		glPointSize(11);
 
-		glBegin(GL_POINTS);
-		glVertex3fv(kcd->curr.cage);
-		glEnd();
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex3fv(pos, kcd->curr.cage);
+		immEnd();
 	}
 
 	if (kcd->curr.bmface) {
-		glColor3ubv(kcd->colors.curpoint);
+		immUniformColor3ubv(kcd->colors.curpoint);
 		glPointSize(9);
 
-		glBegin(GL_POINTS);
-		glVertex3fv(kcd->curr.cage);
-		glEnd();
+		immBegin(GWN_PRIM_POINTS, 1);
+		immVertex3fv(pos, kcd->curr.cage);
+		immEnd();
 	}
 
 	if (kcd->totlinehit > 0) {
@@ -1104,29 +1115,38 @@ static void knifetool_draw(const bContext *C, ARegion *UNUSED(ar), void *arg)
 		int i;
 
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 		/* draw any snapped verts first */
-		glColor4ubv(kcd->colors.point_a);
+		immUniformColor4ubv(kcd->colors.point_a);
 		glPointSize(11);
-		glBegin(GL_POINTS);
+
+		immBeginAtMost(GWN_PRIM_POINTS, kcd->totlinehit);
+
 		lh = kcd->linehits;
 		for (i = 0; i < kcd->totlinehit; i++, lh++) {
-			if (lh->v)
-				glVertex3fv(lh->cagehit);
+			if (lh->v) {
+				immVertex3fv(pos, lh->cagehit);
+			}
 		}
-		glEnd();
+
+		immEnd();
 
 		/* now draw the rest */
-		glColor4ubv(kcd->colors.curpoint_a);
+		immUniformColor4ubv(kcd->colors.curpoint_a);
 		glPointSize(7);
-		glBegin(GL_POINTS);
+
+		immBeginAtMost(GWN_PRIM_POINTS, kcd->totlinehit);
+
 		lh = kcd->linehits;
 		for (i = 0; i < kcd->totlinehit; i++, lh++) {
-			if (!lh->v)
-				glVertex3fv(lh->cagehit);
+			if (!lh->v) {
+				immVertex3fv(pos, lh->cagehit);
+			}
 		}
-		glEnd();
+
+		immEnd();
+
 		glDisable(GL_BLEND);
 	}
 
@@ -1134,44 +1154,46 @@ static void knifetool_draw(const bContext *C, ARegion *UNUSED(ar), void *arg)
 		BLI_mempool_iter iter;
 		KnifeEdge *kfe;
 
+		immUniformColor3ubv(kcd->colors.line);
 		glLineWidth(1.0);
-		glBegin(GL_LINES);
+
+		immBeginAtMost(GWN_PRIM_LINES, BLI_mempool_len(kcd->kedges) * 2);
 
 		BLI_mempool_iternew(kcd->kedges, &iter);
 		for (kfe = BLI_mempool_iterstep(&iter); kfe; kfe = BLI_mempool_iterstep(&iter)) {
 			if (!kfe->is_cut)
 				continue;
 
-			glColor3ubv(kcd->colors.line);
-
-			glVertex3fv(kfe->v1->cageco);
-			glVertex3fv(kfe->v2->cageco);
+			immVertex3fv(pos, kfe->v1->cageco);
+			immVertex3fv(pos, kfe->v2->cageco);
 		}
 
-		glEnd();
+		immEnd();
 	}
 
 	if (kcd->totkvert > 0) {
 		BLI_mempool_iter iter;
 		KnifeVert *kfv;
 
+		immUniformColor3ubv(kcd->colors.point);
 		glPointSize(5.0);
 
-		glBegin(GL_POINTS);
+		immBeginAtMost(GWN_PRIM_POINTS, BLI_mempool_len(kcd->kverts));
+
 		BLI_mempool_iternew(kcd->kverts, &iter);
 		for (kfv = BLI_mempool_iterstep(&iter); kfv; kfv = BLI_mempool_iterstep(&iter)) {
 			if (!kfv->is_cut)
 				continue;
 
-			glColor3ubv(kcd->colors.point);
-
-			glVertex3fv(kfv->cageco);
+			immVertex3fv(pos, kfv->cageco);
 		}
 
-		glEnd();
+		immEnd();
 	}
 
-	glPopMatrix();
+	immUnbindProgram();
+
+	gpuPopMatrix();
 
 	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
 }
@@ -1394,7 +1416,7 @@ static bool bm_ray_cast_cb_elem_not_in_face_check(BMFace *f, void *user_data)
  * intersecting faces matching this face (or connected when an vert/edge) will be ignored.
  */
 static bool point_is_visible(
-        KnifeTool_OpData *kcd, const float p[3], const float s[2], bglMats *mats,
+        KnifeTool_OpData *kcd, const float p[3], const float s[2],
         BMElem *ele_test)
 {
 	BMFace *f_hit;
@@ -1412,7 +1434,7 @@ static bool point_is_visible(
 		float view[3], p_ofs[3];
 
 		/* TODO: I think there's a simpler way to get the required raycast ray */
-		ED_view3d_unproject(mats, view, s[0], s[1], 0.0f);
+		ED_view3d_unproject(kcd->vc.ar, s[0], s[1], 0.0f, view);
 
 		mul_m4_v3(kcd->ob->imat, view);
 
@@ -1485,7 +1507,6 @@ static void set_linehit_depth(KnifeTool_OpData *kcd, KnifeLineHit *lh)
 /* Finds visible (or all, if cutting through) edges that intersects the current screen drag line */
 static void knife_find_line_hits(KnifeTool_OpData *kcd)
 {
-	bglMats mats;
 	SmallHash faces, kfes, kfvs;
 	float v1[3], v2[3], v3[3], v4[3], s1[2], s2[2];
 	BVHTree *planetree, *tree;
@@ -1515,8 +1536,6 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 	const bool use_hit_prev = true;
 	const bool use_hit_curr = (kcd->is_drag_hold == false);
 
-	bgl_get_mats(&mats);
-
 	if (kcd->linehits) {
 		MEM_freeN(kcd->linehits);
 		kcd->linehits = NULL;
@@ -1542,8 +1561,8 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 	}
 
 	/* unproject screen line */
-	ED_view3d_win_to_segment(kcd->ar, kcd->vc.v3d, s1, v1, v3, true);
-	ED_view3d_win_to_segment(kcd->ar, kcd->vc.v3d, s2, v2, v4, true);
+	ED_view3d_win_to_segment(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s1, v1, v3, true);
+	ED_view3d_win_to_segment(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s2, v2, v4, true);
 
 	mul_m4_v3(kcd->ob->imat, v1);
 	mul_m4_v3(kcd->ob->imat, v2);
@@ -1645,7 +1664,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 		knife_project_v2(kcd, v->cageco, s);
 		d = dist_squared_to_line_segment_v2(s, s1, s2);
 		if ((d <= vert_tol_sq) &&
-		    (point_is_visible(kcd, v->cageco, s, &mats, bm_elem_from_knife_vert(v, &kfe_hit))))
+		    (point_is_visible(kcd, v->cageco, s, bm_elem_from_knife_vert(v, &kfe_hit))))
 		{
 			memset(&hit, 0, sizeof(hit));
 			hit.v = v;
@@ -1708,7 +1727,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 				 * Need to find 3d intersection of ray through sint */
 				knife_input_ray_segment(kcd, sint, 1.0f, r1, r2);
 				isect_kind = isect_line_line_v3(kfe->v1->cageco, kfe->v2->cageco, r1, r2, p_cage, p_cage_tmp);
-				if (isect_kind >= 1 && point_is_visible(kcd, p_cage, sint, &mats, bm_elem_from_knife_edge(kfe))) {
+				if (isect_kind >= 1 && point_is_visible(kcd, p_cage, sint, bm_elem_from_knife_edge(kfe))) {
 					memset(&hit, 0, sizeof(hit));
 					if (kcd->snap_midpoints) {
 						/* choose intermediate point snap too */
@@ -1737,7 +1756,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 		float p[3], p_cage[3];
 
 		if (use_hit_prev && knife_ray_intersect_face(kcd, s1, v1, v3, f, face_tol_sq, p, p_cage)) {
-			if (point_is_visible(kcd, p_cage, s1, &mats, (BMElem *)f)) {
+			if (point_is_visible(kcd, p_cage, s1, (BMElem *)f)) {
 				memset(&hit, 0, sizeof(hit));
 				hit.f = f;
 				copy_v3_v3(hit.hit, p);
@@ -1749,7 +1768,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 		}
 
 		if (use_hit_curr && knife_ray_intersect_face(kcd, s2, v2, v4, f, face_tol_sq, p, p_cage)) {
-			if (point_is_visible(kcd, p_cage, s2, &mats, (BMElem *)f)) {
+			if (point_is_visible(kcd, p_cage, s2, (BMElem *)f)) {
 				memset(&hit, 0, sizeof(hit));
 				hit.f = f;
 				copy_v3_v3(hit.hit, p);
@@ -1782,13 +1801,9 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 static void knife_input_ray_segment(KnifeTool_OpData *kcd, const float mval[2], const float ofs,
                                     float r_origin[3], float r_origin_ofs[3])
 {
-	bglMats mats;
-
-	bgl_get_mats(&mats);
-
 	/* unproject to find view ray */
-	ED_view3d_unproject(&mats, r_origin,     mval[0], mval[1], 0.0f);
-	ED_view3d_unproject(&mats, r_origin_ofs, mval[0], mval[1], ofs);
+	ED_view3d_unproject(kcd->vc.ar, mval[0], mval[1], 0.0f, r_origin);
+	ED_view3d_unproject(kcd->vc.ar, mval[0], mval[1], ofs,  r_origin_ofs);
 
 	/* transform into object space */
 	invert_m4_m4(kcd->ob->imat, kcd->ob->obmat);
@@ -2503,7 +2518,8 @@ static void knife_recalc_projmat(KnifeTool_OpData *kcd)
 	mul_v3_mat3_m4v3(kcd->proj_zaxis, kcd->ob->imat, kcd->vc.rv3d->viewinv[2]);
 	normalize_v3(kcd->proj_zaxis);
 
-	kcd->is_ortho = ED_view3d_clip_range_get(kcd->vc.v3d, kcd->vc.rv3d,
+	kcd->is_ortho = ED_view3d_clip_range_get(kcd->vc.depsgraph,
+	                                         kcd->vc.v3d, kcd->vc.rv3d,
 	                                         &kcd->clipsta, &kcd->clipend, true);
 }
 
@@ -2574,7 +2590,7 @@ static void knifetool_init_bmbvh(KnifeTool_OpData *kcd)
 {
 	BM_mesh_elem_index_ensure(kcd->em->bm, BM_VERT);
 
-	kcd->cagecos = (const float (*)[3])BKE_editmesh_vertexCos_get(kcd->em, kcd->scene, NULL);
+	kcd->cagecos = (const float (*)[3])BKE_editmesh_vertexCos_get(kcd->vc.depsgraph, kcd->em, kcd->scene, NULL);
 
 	kcd->bmbvh = BKE_bmbvh_new_from_editmesh(
 	        kcd->em,
@@ -3008,7 +3024,6 @@ static bool edbm_mesh_knife_point_isect(LinkNode *polys, const float cent_ss[2])
 void EDBM_mesh_knife(bContext *C, LinkNode *polys, bool use_tag, bool cut_through)
 {
 	KnifeTool_OpData *kcd;
-	bglMats mats;
 
 	view3d_operator_needs_opengl(C);
 
@@ -3027,10 +3042,6 @@ void EDBM_mesh_knife(bContext *C, LinkNode *polys, bool use_tag, bool cut_throug
 		if (use_tag) {
 			BM_mesh_elem_hflag_enable_all(kcd->em->bm, BM_EDGE, BM_ELEM_TAG, false);
 		}
-
-		if (kcd->cut_through == false) {
-			bgl_get_mats(&mats);
-		}
 	}
 
 	/* execute */
@@ -3139,7 +3150,7 @@ void EDBM_mesh_knife(bContext *C, LinkNode *polys, bool use_tag, bool cut_throug
 							float cent[3], cent_ss[2];
 							BM_face_calc_point_in_face(f, cent);
 							knife_project_v2(kcd, cent, cent_ss);
-							if ((kcd->cut_through || point_is_visible(kcd, cent, cent_ss, &mats, (BMElem *)f)) &&
+							if ((kcd->cut_through || point_is_visible(kcd, cent, cent_ss, (BMElem *)f)) &&
 							    edbm_mesh_knife_point_isect(polys, cent_ss))
 							{
 								BM_elem_flag_enable(f, BM_ELEM_TAG);
diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c
index 0d3cc07589b..5a61c5aab48 100644
--- a/source/blender/editors/mesh/editmesh_knife_project.c
+++ b/source/blender/editors/mesh/editmesh_knife_project.c
@@ -42,6 +42,8 @@
 #include "BKE_editmesh.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 
@@ -56,29 +58,32 @@
 #include "mesh_intern.h"  /* own include */
 
 
-static LinkNode *knifeproject_poly_from_object(ARegion *ar, Scene *scene, Object *ob, LinkNode *polys)
+static LinkNode *knifeproject_poly_from_object(const bContext *C, Scene *scene, Object *ob, LinkNode *polys)
 {
-	DerivedMesh *dm;
-	bool dm_needsFree;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ARegion *ar = CTX_wm_region(C);
+	struct Mesh *me_eval;
+	bool me_eval_needs_free;
 
 	if (ob->type == OB_MESH || ob->derivedFinal) {
-		dm = ob->derivedFinal ? ob->derivedFinal : mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
-		dm_needsFree = false;
+		me_eval = (ob->runtime.mesh_eval ?
+		           ob->runtime.mesh_eval : mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_BAREMESH));
+		me_eval_needs_free = false;
 	}
 	else if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
-		dm = CDDM_from_curve(ob);
-		dm_needsFree = true;
+		me_eval = BKE_mesh_new_nomain_from_curve(ob);
+		me_eval_needs_free = true;
 	}
 	else {
-		dm = NULL;
+		me_eval = NULL;
 	}
 
-	if (dm) {
+	if (me_eval) {
 		ListBase nurbslist = {NULL, NULL};
 		float projmat[4][4];
 
-		BKE_mesh_to_curve_nurblist(dm, &nurbslist, 0);  /* wire */
-		BKE_mesh_to_curve_nurblist(dm, &nurbslist, 1);  /* boundary */
+		BKE_mesh_to_curve_nurblist(me_eval, &nurbslist, 0);  /* wire */
+		BKE_mesh_to_curve_nurblist(me_eval, &nurbslist, 1);  /* boundary */
 
 		ED_view3d_ob_project_mat_get(ar->regiondata, ob, projmat);
 
@@ -105,18 +110,16 @@ static LinkNode *knifeproject_poly_from_object(ARegion *ar, Scene *scene, Object
 
 		BKE_nurbList_free(&nurbslist);
 
-		if (dm_needsFree) {
-			dm->release(dm);
+		if (me_eval_needs_free) {
+			BKE_mesh_free(me_eval);
 		}
 	}
 
-
 	return polys;
 }
 
 static int knifeproject_exec(bContext *C, wmOperator *op)
 {
-	ARegion *ar = CTX_wm_region(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
@@ -127,7 +130,7 @@ static int knifeproject_exec(bContext *C, wmOperator *op)
 	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 	{
 		if (ob != obedit) {
-			polys = knifeproject_poly_from_object(ar, scene, ob, polys);
+			polys = knifeproject_poly_from_object(C, scene, ob, polys);
 		}
 	}
 	CTX_DATA_END;
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index f07073cd3d7..3e787b2055a 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -44,8 +44,10 @@
 #include "BKE_editmesh.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_unit.h"
+#include "BKE_layer.h"
 
-#include "BIF_gl.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "UI_interface.h"
 
@@ -62,6 +64,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "mesh_intern.h"  /* own include */
 
 #define SUBD_SMOOTH_MAX 4.0f
@@ -82,9 +86,15 @@ typedef struct RingSelOpData {
 
 	ViewContext vc;
 
+	Object **objects;
+	uint     objects_len;
+
+	/* These values switch objects based on the object under the cursor. */
+	uint ob_index;
 	Object *ob;
 	BMEditMesh *em;
 	BMEdge *eed;
+
 	NumInput num;
 
 	bool extend;
@@ -104,27 +114,41 @@ static void ringsel_draw(const bContext *C, ARegion *UNUSED(ar), void *arg)
 		if (v3d && v3d->zbuf)
 			glDisable(GL_DEPTH_TEST);
 
-		glPushMatrix();
-		glMultMatrixf(lcd->ob->obmat);
+		gpuPushMatrix();
+		gpuMultMatrix(lcd->ob->obmat);
+
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformColor3ub(255, 0, 255);
 
-		glColor3ub(255, 0, 255);
 		if (lcd->totedge > 0) {
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(3, GL_FLOAT, 0, lcd->edges);
-			glDrawArrays(GL_LINES, 0, lcd->totedge * 2);
-			glDisableClientState(GL_VERTEX_ARRAY);
+			immBegin(GWN_PRIM_LINES, lcd->totedge * 2);
+
+			for (int i = 0; i < lcd->totedge; i++) {
+				immVertex3fv(pos, lcd->edges[i][0]);
+				immVertex3fv(pos, lcd->edges[i][1]);
+			}
+
+			immEnd();
 		}
 
 		if (lcd->totpoint > 0) {
 			glPointSize(3.0f);
 
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(3, GL_FLOAT, 0, lcd->points);
-			glDrawArrays(GL_POINTS, 0, lcd->totpoint);
-			glDisableClientState(GL_VERTEX_ARRAY);
+			immBegin(GWN_PRIM_POINTS, lcd->totpoint);
+
+			for (int i = 0; i < lcd->totpoint; i++) {
+				immVertex3fv(pos, lcd->points[i]);
+			}
+
+			immEnd();
 		}
 
-		glPopMatrix();
+		immUnbindProgram();
+
+		gpuPopMatrix();
+
 		if (v3d && v3d->zbuf)
 			glEnable(GL_DEPTH_TEST);
 	}
@@ -367,18 +391,23 @@ static void edgering_preview_calc(RingSelOpData *lcd, const int previewlines)
 
 static void edgering_select(RingSelOpData *lcd)
 {
-	BMEditMesh *em = lcd->em;
-	BMEdge *eed_start = lcd->eed;
-	BMWalker walker;
-	BMEdge *eed;
-
-	if (!eed_start)
+	if (!lcd->eed) {
 		return;
+	}
 
 	if (!lcd->extend) {
-		EDBM_flag_disable_all(lcd->em, BM_ELEM_SELECT);
+		for (uint ob_index = 0; ob_index < lcd->objects_len; ob_index++) {
+			Object *ob_iter = lcd->objects[ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(ob_iter);
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			WM_main_add_notifier(NC_GEOM | ND_SELECT, ob_iter->data);
+		}
 	}
 
+	BMEditMesh *em = lcd->em;
+	BMEdge *eed_start = lcd->eed;
+	BMWalker walker;
+	BMEdge *eed;
 	BMW_init(&walker, em->bm, BMW_EDGERING,
 	         BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
 	         BMW_FLAG_TEST_HIDDEN,
@@ -482,6 +511,8 @@ static void ringsel_exit(bContext *UNUSED(C), wmOperator *op)
 
 	edgering_preview_free(lcd);
 
+	MEM_freeN(lcd->objects);
+
 	ED_region_tag_redraw(lcd->ar);
 
 	/* free the custom data */
@@ -499,11 +530,14 @@ static int ringsel_init(bContext *C, wmOperator *op, bool do_cut)
 	/* alloc new customdata */
 	lcd = op->customdata = MEM_callocN(sizeof(RingSelOpData), "ringsel Modal Op Data");
 
+	em_setup_viewcontext(C, &lcd->vc);
+
 	/* assign the drawing handle for drawing preview line... */
 	lcd->ar = CTX_wm_region(C);
 	lcd->draw_handle = ED_region_draw_cb_activate(lcd->ar->type, ringsel_draw, lcd, REGION_DRAW_POST_VIEW);
-	lcd->ob = CTX_data_edit_object(C);
-	lcd->em = BKE_editmesh_from_object(lcd->ob);
+	/* Initialize once the cursor is over a mesh. */
+	lcd->ob = NULL;
+	lcd->em = NULL;
 	lcd->extend = do_cut ? false : RNA_boolean_get(op->ptr, "extend");
 	lcd->do_cut = do_cut;
 	lcd->cuts = RNA_int_get(op->ptr, "number_cuts");
@@ -517,8 +551,6 @@ static int ringsel_init(bContext *C, wmOperator *op, bool do_cut)
 	lcd->num.unit_type[0] = B_UNIT_NONE;
 	lcd->num.unit_type[1] = B_UNIT_NONE;
 
-	em_setup_viewcontext(C, &lcd->vc);
-
 	ED_region_tag_redraw(lcd->ar);
 
 	return 1;
@@ -530,44 +562,102 @@ static void ringcut_cancel(bContext *C, wmOperator *op)
 	ringsel_exit(C, op);
 }
 
-static void loopcut_update_edge(RingSelOpData *lcd, BMEdge *e, const int previewlines)
+static void loopcut_update_edge(RingSelOpData *lcd, uint ob_index, BMEdge *e, const int previewlines)
 {
 	if (e != lcd->eed) {
 		lcd->eed = e;
+		lcd->ob = lcd->vc.obedit;
+		lcd->ob_index = ob_index;
+		lcd->em = lcd->vc.em;
 		ringsel_find_edge(lcd, previewlines);
 	}
+	else if (e == NULL) {
+		lcd->ob = NULL;
+		lcd->em = NULL;
+		lcd->ob_index = UINT_MAX;
+	}
 }
 
 static void loopcut_mouse_move(RingSelOpData *lcd, const int previewlines)
 {
-	float dist = ED_view3d_select_dist_px();
-	BMEdge *e = EDBM_edge_find_nearest(&lcd->vc, &dist);
-	loopcut_update_edge(lcd, e, previewlines);
+	struct {
+		Object *ob;
+		BMEdge *eed;
+		float dist;
+		int ob_index;
+	} best = {
+		.dist = ED_view3d_select_dist_px(),
+	};
+
+	for (uint ob_index = 0; ob_index < lcd->objects_len; ob_index++) {
+		Object *ob_iter = lcd->objects[ob_index];
+		ED_view3d_viewcontext_init_object(&lcd->vc, ob_iter);
+		BMEdge *eed_test = EDBM_edge_find_nearest_ex(&lcd->vc, &best.dist, NULL, false, false, NULL);
+		if (eed_test) {
+			best.ob = ob_iter;
+			best.eed = eed_test;
+			best.ob_index = ob_index;
+		}
+	}
+
+	if (best.eed) {
+		ED_view3d_viewcontext_init_object(&lcd->vc, best.ob);
+	}
+
+	loopcut_update_edge(lcd, best.ob_index, best.eed, previewlines);
 }
 
 /* called by both init() and exec() */
 static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	const bool is_interactive = (event != NULL);
-	Object *obedit = CTX_data_edit_object(C);
-	RingSelOpData *lcd;
 
-	if (modifiers_isDeformedByLattice(obedit) || modifiers_isDeformedByArmature(obedit))
-		BKE_report(op->reports, RPT_WARNING, "Loop cut does not work well on deformed edit mesh display");
+	/* Use for redo - intentionally wrap int to uint. */
+	const struct {
+		uint ob_index;
+		uint e_index;
+	} exec_data = {
+		.ob_index = (uint)RNA_int_get(op->ptr, "object_index"),
+		.e_index = (uint)RNA_int_get(op->ptr, "edge_index"),
+	};
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+
+	uint objects_len;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode(view_layer, &objects_len);
+
+	if (is_interactive) {
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *ob_iter = objects[ob_index];
+			if (modifiers_isDeformedByLattice(ob_iter) || modifiers_isDeformedByArmature(ob_iter)) {
+				BKE_report(op->reports, RPT_WARNING, "Loop cut does not work well on deformed edit mesh display");
+				break;
+			}
+		}
+	}
 
 	view3d_operator_needs_opengl(C);
 
 	/* for re-execution, check edge index is in range before we setup ringsel */
+	bool ok = true;
 	if (is_interactive == false) {
-		const int e_index = RNA_int_get(op->ptr, "edge_index");
-		BMEditMesh *em = BKE_editmesh_from_object(obedit);
-		if (UNLIKELY((e_index == -1) || (e_index >= em->bm->totedge))) {
+		if (exec_data.ob_index >= objects_len) {
 			return OPERATOR_CANCELLED;
+			ok = false;
+		}
+		else {
+			Object *ob_iter = objects[exec_data.ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(ob_iter);
+			if (exec_data.e_index >= em->bm->totedge) {
+				ok = false;
+			}
 		}
 	}
 
-	if (!ringsel_init(C, op, true))
+	if (!ok || !ringsel_init(C, op, true)) {
+		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
+	}
 
 	/* add a modal handler for this operator - handles loop selection */
 	if (is_interactive) {
@@ -575,18 +665,24 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event)
 		WM_event_add_modal_handler(C, op);
 	}
 
-	lcd = op->customdata;
+	RingSelOpData *lcd = op->customdata;
+
+	lcd->objects = objects;
+	lcd->objects_len = objects_len;
 
 	if (is_interactive) {
 		copy_v2_v2_int(lcd->vc.mval, event->mval);
 		loopcut_mouse_move(lcd, is_interactive ? 1 : 0);
 	}
 	else {
-		const int e_index = RNA_int_get(op->ptr, "edge_index");
+
+		Object *ob_iter = objects[exec_data.ob_index];
+		ED_view3d_viewcontext_init_object(&lcd->vc, ob_iter);
+
 		BMEdge *e;
-		BM_mesh_elem_table_ensure(lcd->em->bm, BM_EDGE);
-		e = BM_edge_at_index(lcd->em->bm, e_index);
-		loopcut_update_edge(lcd, e, 0);
+		BM_mesh_elem_table_ensure(lcd->vc.em->bm, BM_EDGE);
+		e = BM_edge_at_index(lcd->vc.em->bm, exec_data.e_index);
+		loopcut_update_edge(lcd, exec_data.ob_index, e, 0);
 	}
 
 #ifdef USE_LOOPSLIDE_HACK
@@ -636,6 +732,7 @@ static int loopcut_finish(RingSelOpData *lcd, bContext *C, wmOperator *op)
 	if (lcd->eed) {
 		/* set for redo */
 		BM_mesh_elem_index_ensure(lcd->em->bm, BM_EDGE);
+		RNA_int_set(op->ptr, "object_index", lcd->ob_index);
 		RNA_int_set(op->ptr, "edge_index", BM_elem_index_get(lcd->eed));
 
 		/* execute */
@@ -855,12 +952,17 @@ void MESH_OT_loopcut(wmOperatorType *ot)
 	                     "Smoothness", "Smoothness factor", -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	prop = RNA_def_property(ot->srna, "falloff", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, rna_enum_proportional_falloff_curve_only_items);
 	RNA_def_property_enum_default(prop, PROP_INVSQUARE);
 	RNA_def_property_ui_text(prop, "Falloff", "Falloff type the feather");
 	RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
 
+	/* For redo only. */
+	prop = RNA_def_int(ot->srna, "object_index", -1, -1, INT_MAX, "Object Index", "", 0, INT_MAX);
+	RNA_def_property_flag(prop, PROP_HIDDEN);
 	prop = RNA_def_int(ot->srna, "edge_index", -1, -1, INT_MAX, "Edge Index", "", 0, INT_MAX);
 	RNA_def_property_flag(prop, PROP_HIDDEN);
 
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index bf5a7e3a053..64d890a7314 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -29,6 +29,8 @@
  *  \ingroup edmesh
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
@@ -41,6 +43,7 @@
 #include "BLI_math.h"
 #include "BLI_linklist.h"
 
+#include "BKE_layer.h"
 #include "BKE_context.h"
 #include "BKE_editmesh.h"
 #include "BKE_report.h"
@@ -59,6 +62,8 @@
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
+#include "DEG_depsgraph.h"
+
 #include "mesh_intern.h"  /* own include */
 
 /* -------------------------------------------------------------------- */
@@ -126,10 +131,9 @@ static void verttag_set_cb(BMVert *v, bool val, void *user_data_v)
 }
 
 static void mouse_mesh_shortest_path_vert(
-        Scene *scene, const struct PathSelectParams *op_params,
+        Scene *UNUSED(scene), Object *obedit, const struct PathSelectParams *op_params,
         BMVert *v_act, BMVert *v_dst)
 {
-	Object *obedit = scene->obedit;
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMesh *bm = em->bm;
 
@@ -286,11 +290,11 @@ static void edgetag_set_cb(BMEdge *e, bool val, void *user_data_v)
 	}
 }
 
-static void edgetag_ensure_cd_flag(Scene *scene, Mesh *me)
+static void edgetag_ensure_cd_flag(Mesh *me, const char edge_mode)
 {
 	BMesh *bm = me->edit_btmesh->bm;
 
-	switch (scene->toolsettings->edge_mode) {
+	switch (edge_mode) {
 		case EDGE_MODE_TAG_CREASE:
 			BM_mesh_cd_flag_ensure(bm, me, ME_CDFLAG_EDGE_CREASE);
 			break;
@@ -313,10 +317,9 @@ static void edgetag_ensure_cd_flag(Scene *scene, Mesh *me)
 
 /* since you want to create paths with multiple selects, it doesn't have extend option */
 static void mouse_mesh_shortest_path_edge(
-        Scene *scene, const struct PathSelectParams *op_params,
+        Scene *scene, Object *obedit, const struct PathSelectParams *op_params,
         BMEdge *e_act, BMEdge *e_dst)
 {
-	Object *obedit = scene->obedit;
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMesh *bm = em->bm;
 
@@ -325,7 +328,7 @@ static void mouse_mesh_shortest_path_edge(
 	Mesh *me = obedit->data;
 	bool is_path_ordered = false;
 
-	edgetag_ensure_cd_flag(scene, obedit->data);
+	edgetag_ensure_cd_flag(obedit->data, op_params->edge_mode);
 
 	if (e_act && (e_act != e_dst)) {
 		if (op_params->use_fill) {
@@ -383,7 +386,7 @@ static void mouse_mesh_shortest_path_edge(
 	}
 	else {
 		const bool is_act = !edgetag_test_cb(e_dst, &user_data);
-		edgetag_ensure_cd_flag(scene, obedit->data);
+		edgetag_ensure_cd_flag(obedit->data, op_params->edge_mode);
 		edgetag_set_cb(e_dst, is_act, &user_data); /* switch the edge option */
 	}
 
@@ -459,10 +462,9 @@ static void facetag_set_cb(BMFace *f, bool val, void *user_data_v)
 }
 
 static void mouse_mesh_shortest_path_face(
-        Scene *scene, const struct PathSelectParams *op_params,
+        Scene *UNUSED(scene), Object *obedit, const struct PathSelectParams *op_params,
         BMFace *f_act, BMFace *f_dst)
 {
-	Object *obedit = scene->obedit;
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMesh *bm = em->bm;
 
@@ -554,7 +556,7 @@ static void mouse_mesh_shortest_path_face(
  * \{ */
 
 static bool edbm_shortest_path_pick_ex(
-        Scene *scene, const struct PathSelectParams *op_params,
+        Scene *scene, Object *obedit, const struct PathSelectParams *op_params,
         BMElem *ele_src, BMElem *ele_dst)
 {
 
@@ -562,15 +564,15 @@ static bool edbm_shortest_path_pick_ex(
 		/* pass */
 	}
 	else if (ele_src->head.htype == BM_VERT) {
-		mouse_mesh_shortest_path_vert(scene, op_params, (BMVert *)ele_src, (BMVert *)ele_dst);
+		mouse_mesh_shortest_path_vert(scene, obedit, op_params, (BMVert *)ele_src, (BMVert *)ele_dst);
 		return true;
 	}
 	else if (ele_src->head.htype == BM_EDGE) {
-		mouse_mesh_shortest_path_edge(scene, op_params, (BMEdge *)ele_src, (BMEdge *)ele_dst);
+		mouse_mesh_shortest_path_edge(scene, obedit, op_params, (BMEdge *)ele_src, (BMEdge *)ele_dst);
 		return true;
 	}
 	else if (ele_src->head.htype == BM_FACE) {
-		mouse_mesh_shortest_path_face(scene, op_params, (BMFace *)ele_src, (BMFace *)ele_dst);
+		mouse_mesh_shortest_path_face(scene, obedit, op_params, (BMFace *)ele_src, (BMFace *)ele_dst);
 		return true;
 	}
 
@@ -649,7 +651,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
 	op_params.track_active = track_active;
 	op_params.edge_mode = vc.scene->toolsettings->edge_mode;
 
-	if (!edbm_shortest_path_pick_ex(vc.scene, &op_params, ele_src, ele_dst)) {
+	if (!edbm_shortest_path_pick_ex(vc.scene, vc.obedit, &op_params, ele_src, ele_dst)) {
 		return OPERATOR_PASS_THROUGH;
 	}
 
@@ -686,7 +688,7 @@ static int edbm_shortest_path_pick_exec(bContext *C, wmOperator *op)
 	op_params.track_active = true;
 	op_params.edge_mode = scene->toolsettings->edge_mode;
 
-	if (!edbm_shortest_path_pick_ex(scene, &op_params, ele_src, ele_dst)) {
+	if (!edbm_shortest_path_pick_ex(scene, obedit, &op_params, ele_src, ele_dst)) {
 		return OPERATOR_CANCELLED;
 	}
 
@@ -727,67 +729,87 @@ void MESH_OT_shortest_path_pick(wmOperatorType *ot)
 static int edbm_shortest_path_select_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMesh *bm = em->bm;
-	BMIter iter;
-	BMEditSelection *ese_src, *ese_dst;
-	BMElem *ele_src = NULL, *ele_dst = NULL, *ele;
+	bool found_valid_elements = false;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BMIter iter;
+		BMEditSelection *ese_src, *ese_dst;
+		BMElem *ele_src = NULL, *ele_dst = NULL, *ele;
+
+		if ((em->bm->totvertsel == 0) &&
+		    (em->bm->totedgesel == 0) &&
+		    (em->bm->totfacesel == 0))
+		{
+			continue;
+		}
 
-	/* first try to find vertices in edit selection */
-	ese_src = bm->selected.last;
-	if (ese_src && (ese_dst = ese_src->prev) && (ese_src->htype  == ese_dst->htype)) {
-		ele_src = ese_src->ele;
-		ele_dst = ese_dst->ele;
-	}
-	else {
-		/* if selection history isn't available, find two selected elements */
-		ele_src = ele_dst = NULL;
-		if ((em->selectmode & SCE_SELECT_VERTEX) && (bm->totvertsel >= 2)) {
-			BM_ITER_MESH (ele, &iter, bm, BM_VERTS_OF_MESH) {
-				if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
-					if      (ele_src == NULL) ele_src = ele;
-					else if (ele_dst == NULL) ele_dst = ele;
-					else                      break;
+		/* first try to find vertices in edit selection */
+		ese_src = bm->selected.last;
+		if (ese_src && (ese_dst = ese_src->prev) && (ese_src->htype  == ese_dst->htype)) {
+			ele_src = ese_src->ele;
+			ele_dst = ese_dst->ele;
+		}
+		else {
+			/* if selection history isn't available, find two selected elements */
+			ele_src = ele_dst = NULL;
+			if ((em->selectmode & SCE_SELECT_VERTEX) && (bm->totvertsel >= 2)) {
+				BM_ITER_MESH (ele, &iter, bm, BM_VERTS_OF_MESH) {
+					if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
+						if      (ele_src == NULL) ele_src = ele;
+						else if (ele_dst == NULL) ele_dst = ele;
+						else                      break;
+					}
 				}
 			}
-		}
 
-		if ((ele_dst == NULL) && (em->selectmode & SCE_SELECT_EDGE) && (bm->totedgesel >= 2)) {
-			ele_src = NULL;
-			BM_ITER_MESH (ele, &iter, bm, BM_EDGES_OF_MESH) {
-				if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
-					if      (ele_src == NULL) ele_src = ele;
-					else if (ele_dst == NULL) ele_dst = ele;
-					else                      break;
+			if ((ele_dst == NULL) && (em->selectmode & SCE_SELECT_EDGE) && (bm->totedgesel >= 2)) {
+				ele_src = NULL;
+				BM_ITER_MESH (ele, &iter, bm, BM_EDGES_OF_MESH) {
+					if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
+						if      (ele_src == NULL) ele_src = ele;
+						else if (ele_dst == NULL) ele_dst = ele;
+						else                      break;
+					}
 				}
 			}
-		}
 
-		if ((ele_dst == NULL) && (em->selectmode & SCE_SELECT_FACE) && (bm->totfacesel >= 2)) {
-			ele_src = NULL;
-			BM_ITER_MESH (ele, &iter, bm, BM_FACES_OF_MESH) {
-				if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
-					if      (ele_src == NULL) ele_src = ele;
-					else if (ele_dst == NULL) ele_dst = ele;
-					else                      break;
+			if ((ele_dst == NULL) && (em->selectmode & SCE_SELECT_FACE) && (bm->totfacesel >= 2)) {
+				ele_src = NULL;
+				BM_ITER_MESH (ele, &iter, bm, BM_FACES_OF_MESH) {
+					if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
+						if      (ele_src == NULL) ele_src = ele;
+						else if (ele_dst == NULL) ele_dst = ele;
+						else                      break;
+					}
 				}
 			}
 		}
-	}
 
-	if (ele_src && ele_dst) {
-		struct PathSelectParams op_params;
-		path_select_params_from_op(op, &op_params);
+		if (ele_src && ele_dst) {
+			struct PathSelectParams op_params;
+			path_select_params_from_op(op, &op_params);
 
-		edbm_shortest_path_pick_ex(scene, &op_params, ele_src, ele_dst);
+			edbm_shortest_path_pick_ex(scene, obedit, &op_params, ele_src, ele_dst);
 
-		return OPERATOR_FINISHED;
+			found_valid_elements = true;
+		}
 	}
-	else {
-		BKE_report(op->reports, RPT_WARNING, "Path selection requires two matching elements to be selected");
+	MEM_freeN(objects);
+
+	if (!found_valid_elements) {
+		BKE_report(op->reports,
+		           RPT_WARNING,
+		           "Path selection requires two matching elements to be selected");
 		return OPERATOR_CANCELLED;
 	}
+
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_shortest_path_select(wmOperatorType *ot)
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
new file mode 100644
index 00000000000..e8bcfb5eb08
--- /dev/null
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -0,0 +1,542 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mesh/editmesh_polybuild.c
+ *  \ingroup edmesh
+ *
+ * Tools to implement polygon building tool,
+ * an experimental tool for quickly constructing/manipulating faces.
+ */
+
+#include "DNA_object_types.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_report.h"
+#include "BKE_editmesh.h"
+#include "BKE_mesh.h"
+
+#include "WM_types.h"
+
+#include "ED_mesh.h"
+#include "ED_screen.h"
+#include "ED_transform.h"
+#include "ED_view3d.h"
+
+#include "bmesh.h"
+
+#include "mesh_intern.h"  /* own include */
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+
+/* -------------------------------------------------------------------- */
+/** \name Local Utilities
+ * \{ */
+
+static void edbm_selectmode_ensure(Scene *scene, BMEditMesh *em, short selectmode)
+{
+	if ((scene->toolsettings->selectmode & selectmode) == 0) {
+		scene->toolsettings->selectmode |= selectmode;
+		em->selectmode = scene->toolsettings->selectmode;
+		EDBM_selectmode_set(em);
+	}
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Face At Cursor
+ * \{ */
+
+static int edbm_polybuild_face_at_cursor_invoke(
+        bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+{
+	ViewContext vc;
+	float center[3];
+	bool changed = false;
+
+	em_setup_viewcontext(C, &vc);
+	Object *obedit = CTX_data_edit_object(C);
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMesh *bm = em->bm;
+	BMElem *ele_act = BM_mesh_active_elem_get(bm);
+
+	invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
+	ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
+
+	edbm_selectmode_ensure(vc.scene, vc.em, SCE_SELECT_VERTEX);
+
+	if (ele_act == NULL || ele_act->head.htype == BM_FACE) {
+		/* Just add vert */
+		copy_v3_v3(center, ED_view3d_cursor3d_get(vc.scene, vc.v3d)->location);
+		mul_v3_m4v3(center, vc.obedit->obmat, center);
+		ED_view3d_win_to_3d_int(vc.v3d, vc.ar, center, event->mval, center);
+		mul_m4_v3(vc.obedit->imat, center);
+
+		BMVert *v_new = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BM_vert_select_set(bm, v_new, true);
+		changed = true;
+	}
+	else if (ele_act->head.htype == BM_EDGE) {
+		BMEdge *e_act = (BMEdge *)ele_act;
+		BMFace *f_reference = e_act->l ? e_act->l->f : NULL;
+
+		mid_v3_v3v3(center, e_act->v1->co, e_act->v2->co);
+		mul_m4_v3(vc.obedit->obmat, center);
+		ED_view3d_win_to_3d_int(vc.v3d, vc.ar, center, event->mval, center);
+		mul_m4_v3(vc.obedit->imat, center);
+
+		BMVert *v_tri[3];
+		v_tri[0] = e_act->v1;
+		v_tri[1] = e_act->v2;
+		v_tri[2] = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
+		if (e_act->l && e_act->l->v == v_tri[0]) {
+			SWAP(BMVert *, v_tri[0], v_tri[1]);
+		}
+		// BMFace *f_new =
+		BM_face_create_verts(bm, v_tri, 3, f_reference, BM_CREATE_NOP, true);
+
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BM_vert_select_set(bm, v_tri[2], true);
+		changed = true;
+	}
+	else if (ele_act->head.htype == BM_VERT) {
+		BMVert *v_act = (BMVert *)ele_act;
+		BMEdge *e_pair[2] = {NULL};
+
+		if (v_act->e != NULL) {
+			for (uint allow_wire = 0; allow_wire < 2 && (e_pair[1] == NULL); allow_wire++) {
+				int i = 0;
+				BMEdge *e_iter = v_act->e;
+				do {
+					if ((BM_elem_flag_test(e_iter, BM_ELEM_HIDDEN) == false) &&
+					    (allow_wire ? BM_edge_is_wire(e_iter) : BM_edge_is_boundary(e_iter)))
+					{
+						if (i == 2) {
+							e_pair[0] = e_pair[1] = NULL;
+							break;
+						}
+						e_pair[i++] = e_iter;
+					}
+				} while ((e_iter = BM_DISK_EDGE_NEXT(e_iter, v_act)) != v_act->e);
+			}
+		}
+
+		if (e_pair[1] != NULL) {
+			/* Quad from edge pair. */
+			if (BM_edge_calc_length_squared(e_pair[0]) <
+			    BM_edge_calc_length_squared(e_pair[1]))
+			{
+				SWAP(BMEdge *, e_pair[0], e_pair[1]);
+			}
+
+			BMFace *f_reference = e_pair[0]->l ? e_pair[0]->l->f : NULL;
+
+			mul_v3_m4v3(center, vc.obedit->obmat, v_act->co);
+			ED_view3d_win_to_3d_int(vc.v3d, vc.ar, center, event->mval, center);
+			mul_m4_v3(vc.obedit->imat, center);
+
+			BMVert *v_quad[4];
+			v_quad[0] = v_act;
+			v_quad[1] = BM_edge_other_vert(e_pair[0], v_act);
+			v_quad[2] = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
+			v_quad[3] = BM_edge_other_vert(e_pair[1], v_act);
+			if (e_pair[0]->l && e_pair[0]->l->v == v_quad[0]) {
+				SWAP(BMVert *, v_quad[1], v_quad[3]);
+			}
+			// BMFace *f_new =
+			BM_face_create_verts(bm, v_quad, 4, f_reference, BM_CREATE_NOP, true);
+
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			BM_vert_select_set(bm, v_quad[2], true);
+			changed = true;
+		}
+		else {
+			/* Just add edge */
+			mul_m4_v3(vc.obedit->obmat, center);
+			ED_view3d_win_to_3d_int(vc.v3d, vc.ar, v_act->co, event->mval, center);
+			mul_m4_v3(vc.obedit->imat, center);
+
+			BMVert *v_new = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
+
+			BM_edge_create(bm, v_act, v_new, NULL, BM_CREATE_NOP);
+
+			BM_vert_select_set(bm, v_new, true);
+		}
+	}
+
+	if (changed) {
+		BM_select_history_clear(bm);
+
+		EDBM_mesh_normals_update(em);
+		EDBM_update_generic(em, true, true);
+
+		WM_event_add_mousemove(C);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MESH_OT_polybuild_face_at_cursor(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Poly Build Face At Cursor";
+	ot->idname = "MESH_OT_polybuild_face_at_cursor";
+	ot->description = "";
+
+	/* api callbacks */
+	ot->invoke = edbm_polybuild_face_at_cursor_invoke;
+	ot->poll = EDBM_view3d_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* to give to transform */
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR_DUMMY);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Split At Cursor
+ * \{ */
+
+static int edbm_polybuild_split_at_cursor_invoke(
+        bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+{
+	ViewContext vc;
+	float center[3];
+	bool changed = false;
+
+	em_setup_viewcontext(C, &vc);
+	Object *obedit = CTX_data_edit_object(C);
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMesh *bm = em->bm;
+
+	invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
+	ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
+
+	edbm_selectmode_ensure(vc.scene, vc.em, SCE_SELECT_VERTEX);
+
+	BMElem *ele_act = BM_mesh_active_elem_get(bm);
+
+	if (ele_act == NULL || ele_act->head.hflag == BM_FACE) {
+		return OPERATOR_PASS_THROUGH;
+	}
+	else if (ele_act->head.htype == BM_EDGE) {
+		BMEdge *e_act = (BMEdge *)ele_act;
+		mid_v3_v3v3(center, e_act->v1->co, e_act->v2->co);
+		mul_m4_v3(vc.obedit->obmat, center);
+		ED_view3d_win_to_3d_int(vc.v3d, vc.ar, center, event->mval, center);
+		mul_m4_v3(vc.obedit->imat, center);
+
+		const float fac = line_point_factor_v3(center, e_act->v1->co, e_act->v2->co);
+		BMVert *v_new = BM_edge_split(bm, e_act, e_act->v1, NULL, CLAMPIS(fac, 0.0f, 1.0f));
+		copy_v3_v3(v_new->co, center);
+
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BM_vert_select_set(bm, v_new, true);
+		changed = true;
+	}
+	else if (ele_act->head.htype == BM_VERT) {
+		/* Just do nothing, allow dragging. */
+		return OPERATOR_FINISHED;
+	}
+
+	if (changed) {
+		BM_select_history_clear(bm);
+
+		EDBM_mesh_normals_update(em);
+		EDBM_update_generic(em, true, true);
+
+		WM_event_add_mousemove(C);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MESH_OT_polybuild_split_at_cursor(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Poly Build Split At Cursor";
+	ot->idname = "MESH_OT_polybuild_split_at_cursor";
+	ot->description = "";
+
+	/* api callbacks */
+	ot->invoke = edbm_polybuild_split_at_cursor_invoke;
+	ot->poll = EDBM_view3d_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* to give to transform */
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR_DUMMY);
+}
+
+/** \} */
+
+
+/* -------------------------------------------------------------------- */
+/** \name Dissolve At Cursor
+ *
+ * \{ */
+
+static int edbm_polybuild_dissolve_at_cursor_invoke(
+        bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+{
+	ViewContext vc;
+	em_setup_viewcontext(C, &vc);
+	bool changed = false;
+
+	Object *obedit = CTX_data_edit_object(C);
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMesh *bm = em->bm;
+	BMVert *v_act = BM_mesh_active_vert_get(bm);
+	BMEdge *e_act = BM_mesh_active_edge_get(bm);
+
+	invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
+	ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
+
+	edbm_selectmode_ensure(vc.scene, vc.em, SCE_SELECT_VERTEX);
+
+
+	if (e_act) {
+		BMLoop *l_a, *l_b;
+		if (BM_edge_loop_pair(e_act, &l_a, &l_b)) {
+			BMFace *f_new = BM_faces_join_pair(bm, l_a, l_b, true);
+			if (f_new) {
+				changed = true;
+			}
+		}
+	}
+	else if (v_act) {
+		if (BM_vert_is_edge_pair(v_act)) {
+			BM_edge_collapse(
+			        bm, v_act->e, v_act,
+			        true, true);
+		}
+		else {
+			/* too involved to do inline */
+			if (!EDBM_op_callf(em, op,
+			                   "dissolve_verts verts=%hv use_face_split=%b use_boundary_tear=%b",
+			                   BM_ELEM_SELECT, false, true))
+			{
+				return OPERATOR_CANCELLED;
+			}
+		}
+		changed = true;
+	}
+
+	if (changed) {
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+
+		BM_select_history_clear(bm);
+
+		EDBM_mesh_normals_update(em);
+		EDBM_update_generic(em, true, true);
+
+		WM_event_add_mousemove(C);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MESH_OT_polybuild_dissolve_at_cursor(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Poly Build Dissolve At Cursor";
+	ot->idname = "MESH_OT_polybuild_dissolve_at_cursor";
+	ot->description = "";
+
+	/* api callbacks */
+	ot->invoke = edbm_polybuild_dissolve_at_cursor_invoke;
+	ot->poll = EDBM_view3d_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Cursor Manipulator
+ *
+ * \note This may need its own file, for now not.
+ * \{ */
+
+static BMElem *edbm_hover_preselect(
+        bContext *C,
+        const int mval[2],
+        bool use_boundary)
+{
+	ViewContext vc;
+
+	em_setup_viewcontext(C, &vc);
+	Object *obedit = CTX_data_edit_object(C);
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMesh *bm = em->bm;
+
+	invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
+	ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
+
+	const float mval_fl[2] = {UNPACK2(mval)};
+	float ray_origin[3], ray_direction[3];
+
+	BMElem *ele_best = NULL;
+
+	if (ED_view3d_win_to_ray(
+	        CTX_data_depsgraph(C),
+	        vc.ar, vc.v3d, mval_fl,
+	        ray_origin, ray_direction, true))
+	{
+		BMEdge *e;
+
+		BMIter eiter;
+		float dist_sq_best = FLT_MAX;
+
+		BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
+			if ((BM_elem_flag_test(e, BM_ELEM_HIDDEN) == false) &&
+			    (!use_boundary || BM_edge_is_boundary(e)))
+			{
+				float dist_sq_test;
+				float point[3];
+				float depth;
+#if 0
+				dist_sq_test = dist_squared_ray_to_seg_v3(
+				        ray_origin, ray_direction,
+				        e->v1->co,  e->v2->co,
+				        point, &depth);
+#else
+				mid_v3_v3v3(point, e->v1->co,  e->v2->co);
+				dist_sq_test = dist_squared_to_ray_v3(
+				        ray_origin, ray_direction,
+				        point, &depth);
+#endif
+
+				if (dist_sq_test < dist_sq_best) {
+					dist_sq_best = dist_sq_test;
+					ele_best = (BMElem *)e;
+				}
+
+				dist_sq_test = dist_squared_to_ray_v3(
+				        ray_origin, ray_direction,
+				        e->v1->co, &depth);
+				if (dist_sq_test < dist_sq_best) {
+					dist_sq_best = dist_sq_test;
+					ele_best = (BMElem *)e->v1;
+				}
+				dist_sq_test = dist_squared_to_ray_v3(
+				        ray_origin, ray_direction,
+				        e->v2->co, &depth);
+				if (dist_sq_test < dist_sq_best) {
+					dist_sq_best = dist_sq_test;
+					ele_best = (BMElem *)e->v2;
+				}
+			}
+		}
+	}
+	return ele_best;
+}
+
+/*
+ * Developer note: this is not advocating pre-selection highlighting.
+ * This is just a quick way to test how a tool for interactively editing polygons may work. */
+static int edbm_polybuild_hover_invoke(
+        bContext *C, wmOperator *op, const wmEvent *event)
+{
+	const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
+	ViewContext vc;
+
+	em_setup_viewcontext(C, &vc);
+
+	/* Vertex selection is needed */
+	if ((vc.scene->toolsettings->selectmode & SCE_SELECT_VERTEX) == 0) {
+		return OPERATOR_PASS_THROUGH;
+	}
+
+	/* Don't overwrite click-drag events. */
+	if (use_boundary == false) {
+		/* pass */
+	}
+	else if (vc.win->tweak ||
+	         (vc.win->eventstate->check_click &&
+	          vc.win->eventstate->prevval == KM_PRESS &&
+	          ISMOUSE(vc.win->eventstate->prevtype)))
+	{
+		return OPERATOR_PASS_THROUGH;
+	}
+
+	Object *obedit = CTX_data_edit_object(C);
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMesh *bm = em->bm;
+	BMElem *ele_active = BM_mesh_active_elem_get(bm);
+	BMElem *ele_hover = edbm_hover_preselect(C, event->mval, use_boundary);
+
+	if (ele_hover && (ele_hover != ele_active)) {
+		if (event->shift == 0) {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+			BM_select_history_clear(bm);
+		}
+		BM_elem_select_set(bm, ele_hover, true);
+		BM_select_history_store(em->bm, ele_hover);
+		BKE_mesh_batch_cache_dirty(obedit->data, BKE_MESH_BATCH_DIRTY_SELECT);
+
+		ED_region_tag_redraw(vc.ar);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MESH_OT_polybuild_hover(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Poly Build Hover";
+	ot->idname = "MESH_OT_polybuild_hover";
+	ot->description = "";
+
+	/* api callbacks */
+	ot->invoke = edbm_polybuild_hover_invoke;
+	ot->poll = EDBM_view3d_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_INTERNAL;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "use_boundary", false, "Boundary", "Select only boundary geometry");
+}
+
+/** \} */
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index 0c8bd560bb2..23011f835c1 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -39,6 +39,7 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -523,11 +524,9 @@ static void edbm_tagged_loop_pairs_do_fill_faces(BMesh *bm, UnorderedLoopPair *u
 /**
  * This is the main vert ripping function (rip when one vertex is selected)
  */
-static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *event)
+static int edbm_rip_invoke__vert(bContext *C, const wmEvent *event, Object *obedit, bool do_fill)
 {
-	const bool do_fill = RNA_boolean_get(op->ptr, "use_fill");
 	UnorderedLoopPair *fill_uloop_pairs = NULL;
-	Object *obedit = CTX_data_edit_object(C);
 	ARegion *ar = CTX_wm_region(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
@@ -672,7 +671,6 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve
 			/* set selection back to avoid active-unselected vertex */
 			BM_vert_select_set(bm, v, true);
 			/* should never happen */
-			BKE_report(op->reports, RPT_ERROR, "Error ripping vertex from faces");
 			return OPERATOR_CANCELLED;
 		}
 		else {
@@ -759,7 +757,6 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve
 	}
 
 	if (!e_best) {
-		BKE_report(op->reports, RPT_ERROR, "Selected vertex has no edge/face pairs attached");
 		return OPERATOR_CANCELLED;
 	}
 
@@ -875,7 +872,6 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve
 
 
 	if (totvert_orig == bm->totvert) {
-		BKE_report(op->reports, RPT_ERROR, "No vertices could be ripped");
 		return OPERATOR_CANCELLED;
 	}
 
@@ -885,11 +881,9 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve
 /**
  * This is the main edge ripping function
  */
-static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *event)
+static int edbm_rip_invoke__edge(bContext *C, const wmEvent *event, Object *obedit, bool do_fill)
 {
-	const bool do_fill = RNA_boolean_get(op->ptr, "use_fill");
 	UnorderedLoopPair *fill_uloop_pairs = NULL;
-	Object *obedit = CTX_data_edit_object(C);
 	ARegion *ar = CTX_wm_region(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
@@ -1004,7 +998,6 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *eve
 	}
 
 	if (totedge_orig == bm->totedge) {
-		BKE_report(op->reports, RPT_ERROR, "No edges could be ripped");
 		return OPERATOR_CANCELLED;
 	}
 
@@ -1016,65 +1009,102 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *eve
 /* based on mouse cursor position, it defines how is being ripped */
 static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMIter iter;
-	BMEdge *e;
-	const bool singlesel = (bm->totvertsel == 1 && bm->totedgesel == 0 && bm->totfacesel == 0);
-	int ret;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	const bool do_fill = RNA_boolean_get(op->ptr, "use_fill");
 
-	/* running in face mode hardly makes sense, so convert to region loop and rip */
-	if (bm->totfacesel) {
-		/* highly nifty but hard to support since the operator can fail and we're left
-		 * with modified selection */
-		// WM_operator_name_call(C, "MESH_OT_region_to_loop", WM_OP_INVOKE_DEFAULT, NULL);
+	bool no_vertex_selected = true;
+	bool error_face_selected = true;
+	bool error_disconected_vertices = true;
+	bool error_rip_failed = true;
 
-		BKE_report(op->reports, RPT_ERROR, "Cannot rip selected faces");
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* we could support this, but not for now */
-	if ((bm->totvertsel > 1) && (bm->totedgesel == 0)) {
-		BKE_report(op->reports, RPT_ERROR, "Cannot rip multiple disconnected vertices");
-		return OPERATOR_CANCELLED;
-	}
+		BMesh *bm = em->bm;
+		BMIter iter;
+		BMEdge *e;
+		const bool singlesel = (bm->totvertsel == 1 && bm->totedgesel == 0 && bm->totfacesel == 0);
+		int ret;
 
-	/* note on selection:
-	 * When calling edge split we operate on tagged edges rather then selected
-	 * this is important because the edges to operate on are extended by one,
-	 * but the selection is left alone.
-	 *
-	 * After calling edge split - the duplicated edges have the same selection state as the
-	 * original, so all we do is de-select the far side from the mouse and we have a
-	 * useful selection for grabbing.
-	 */
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
+		no_vertex_selected = false;
+
+		/* running in face mode hardly makes sense, so convert to region loop and rip */
+		if (bm->totfacesel) {
+			/* highly nifty but hard to support since the operator can fail and we're left
+			* with modified selection */
+			// WM_operator_name_call(C, "MESH_OT_region_to_loop", WM_OP_INVOKE_DEFAULT, NULL);
+			continue;
+		}
+		error_face_selected = false;
 
-	/* BM_ELEM_SELECT --> BM_ELEM_TAG */
-	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-		BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
+		/* we could support this, but not for now */
+		if ((bm->totvertsel > 1) && (bm->totedgesel == 0)) {
+			continue;
+		}
+		error_disconected_vertices = false;
+
+		/* note on selection:
+		* When calling edge split we operate on tagged edges rather then selected
+		* this is important because the edges to operate on are extended by one,
+		* but the selection is left alone.
+		*
+		* After calling edge split - the duplicated edges have the same selection state as the
+		* original, so all we do is de-select the far side from the mouse and we have a
+		* useful selection for grabbing.
+		*/
+
+		/* BM_ELEM_SELECT --> BM_ELEM_TAG */
+		BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+			BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
+		}
+
+		/* split 2 main parts of this operator out into vertex and edge ripping */
+		if (singlesel) {
+			ret = edbm_rip_invoke__vert(C, event, obedit, do_fill);
+		}
+		else {
+			ret = edbm_rip_invoke__edge(C, event, obedit, do_fill);
+		}
+
+		if (ret != OPERATOR_FINISHED) {
+			continue;
+		}
+
+		BLI_assert(singlesel ? (bm->totvertsel > 0) : (bm->totedgesel > 0));
+
+		if (bm->totvertsel == 0) {
+			continue;
+		}
+		error_rip_failed = false;
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	/* split 2 main parts of this operator out into vertex and edge ripping */
-	if (singlesel) {
-		ret = edbm_rip_invoke__vert(C, op, event);
+	MEM_freeN(objects);
+
+	if (no_vertex_selected) {
+		/* Ignore it. */
+		return OPERATOR_CANCELLED;
 	}
-	else {
-		ret = edbm_rip_invoke__edge(C, op, event);
+	else if (error_face_selected) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot rip selected faces");
+		return OPERATOR_CANCELLED;
 	}
-
-	if (ret == OPERATOR_CANCELLED) {
+	else if (error_disconected_vertices) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot rip multiple disconnected vertices");
 		return OPERATOR_CANCELLED;
 	}
-
-	BLI_assert(singlesel ? (bm->totvertsel > 0) : (bm->totedgesel > 0));
-
-	if (bm->totvertsel == 0) {
+	else if (error_rip_failed) {
+		BKE_report(op->reports, RPT_ERROR, "Rip failed");
 		return OPERATOR_CANCELLED;
 	}
-
-	EDBM_update_generic(em, true, true);
-
+	/* No errors, everything went fine. */
 	return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/editors/mesh/editmesh_rip_edge.c b/source/blender/editors/mesh/editmesh_rip_edge.c
index a501dfc8c2c..33dc252ab14 100644
--- a/source/blender/editors/mesh/editmesh_rip_edge.c
+++ b/source/blender/editors/mesh/editmesh_rip_edge.c
@@ -24,6 +24,8 @@
  * based on mouse cursor position, split of vertices along the closest edge.
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
@@ -31,6 +33,7 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
 
 #include "WM_types.h"
 
@@ -50,181 +53,187 @@ static int edbm_rip_edge_invoke(bContext *C, wmOperator *UNUSED(op), const wmEve
 {
 	ARegion *ar = CTX_wm_region(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMIter viter;
-	BMVert *v;
-	const float mval_fl[2] = {UNPACK2(event->mval)};
-	float cent_sco[2];
-	int cent_tot;
-	bool changed = false;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* mouse direction to view center */
-	float mval_dir[2];
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	float projectMat[4][4];
+		BMIter viter;
+		BMVert *v;
+		const float mval_fl[2] = { UNPACK2(event->mval) };
+		float cent_sco[2];
+		int cent_tot;
+		bool changed = false;
 
-	if (bm->totvertsel == 0)
-		return OPERATOR_CANCELLED;
+		/* mouse direction to view center */
+		float mval_dir[2];
 
-	ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat);
+		float projectMat[4][4];
 
-	zero_v2(cent_sco);
-	cent_tot = 0;
+		if (bm->totvertsel == 0)
+			continue;
 
-	/* clear tags and calc screen center */
-	BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
-		BM_elem_flag_disable(v, BM_ELEM_TAG);
+		ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat);
 
-		if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
-			float v_sco[2];
-			ED_view3d_project_float_v2_m4(ar, v->co, v_sco, projectMat);
+		zero_v2(cent_sco);
+		cent_tot = 0;
+
+		/* clear tags and calc screen center */
+		BM_ITER_MESH(v, &viter, bm, BM_VERTS_OF_MESH) {
+			BM_elem_flag_disable(v, BM_ELEM_TAG);
+
+			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
+				float v_sco[2];
+				ED_view3d_project_float_v2_m4(ar, v->co, v_sco, projectMat);
 
-			add_v2_v2(cent_sco, v_sco);
-			cent_tot += 1;
+				add_v2_v2(cent_sco, v_sco);
+				cent_tot += 1;
+			}
 		}
-	}
-	mul_v2_fl(cent_sco, 1.0f / (float)cent_tot);
-
-	/* not essential, but gives more expected results with edge selection */
-	if (bm->totedgesel) {
-		/* angle against center can give odd result,
-		 * try re-position the center to the closest edge */
-		BMIter eiter;
-		BMEdge *e;
-		float dist_sq_best = len_squared_v2v2(cent_sco, mval_fl);
-
-		BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
-				float e_sco[2][2];
-				float cent_sco_test[2];
-				float dist_sq_test;
-
-				ED_view3d_project_float_v2_m4(ar, e->v1->co, e_sco[0], projectMat);
-				ED_view3d_project_float_v2_m4(ar, e->v2->co, e_sco[1], projectMat);
-
-				closest_to_line_segment_v2(cent_sco_test, mval_fl, e_sco[0], e_sco[1]);
-				dist_sq_test = len_squared_v2v2(cent_sco_test, mval_fl);
-				if (dist_sq_test < dist_sq_best) {
-					dist_sq_best = dist_sq_test;
-
-					/* we have a new screen center */
-					copy_v2_v2(cent_sco, cent_sco_test);
+		mul_v2_fl(cent_sco, 1.0f / (float)cent_tot);
+
+		/* not essential, but gives more expected results with edge selection */
+		if (bm->totedgesel) {
+			/* angle against center can give odd result,
+			* try re-position the center to the closest edge */
+			BMIter eiter;
+			BMEdge *e;
+			float dist_sq_best = len_squared_v2v2(cent_sco, mval_fl);
+
+			BM_ITER_MESH(e, &eiter, bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
+					float e_sco[2][2];
+					float cent_sco_test[2];
+					float dist_sq_test;
+
+					ED_view3d_project_float_v2_m4(ar, e->v1->co, e_sco[0], projectMat);
+					ED_view3d_project_float_v2_m4(ar, e->v2->co, e_sco[1], projectMat);
+
+					closest_to_line_segment_v2(cent_sco_test, mval_fl, e_sco[0], e_sco[1]);
+					dist_sq_test = len_squared_v2v2(cent_sco_test, mval_fl);
+					if (dist_sq_test < dist_sq_best) {
+						dist_sq_best = dist_sq_test;
+
+						/* we have a new screen center */
+						copy_v2_v2(cent_sco, cent_sco_test);
+					}
 				}
 			}
 		}
-	}
 
-	sub_v2_v2v2(mval_dir, mval_fl, cent_sco);
-	normalize_v2(mval_dir);
+		sub_v2_v2v2(mval_dir, mval_fl, cent_sco);
+		normalize_v2(mval_dir);
 
-	/* operate on selected verts */
-	BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
-		BMIter eiter;
-		BMEdge *e;
-		float v_sco[2];
+		/* operate on selected verts */
+		BM_ITER_MESH(v, &viter, bm, BM_VERTS_OF_MESH) {
+			BMIter eiter;
+			BMEdge *e;
+			float v_sco[2];
 
-		if (BM_elem_flag_test(v, BM_ELEM_SELECT) &&
-		    BM_elem_flag_test(v, BM_ELEM_TAG) == false)
-		{
-			/* Rules for */
-			float angle_best = FLT_MAX;
-			BMEdge *e_best = NULL;
+			if (BM_elem_flag_test(v, BM_ELEM_SELECT) &&
+			    BM_elem_flag_test(v, BM_ELEM_TAG) == false)
+			{
+				/* Rules for */
+				float angle_best = FLT_MAX;
+				BMEdge *e_best = NULL;
 
 #ifdef USE_TRICKY_EXTEND
-			/* first check if we can select the edge to split based on selection-only */
-			int tot_sel = 0, tot = 0;
-
-			BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-				if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
-					if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
-						e_best = e;
-						tot_sel += 1;
+				/* first check if we can select the edge to split based on selection-only */
+				int tot_sel = 0, tot = 0;
+
+				BM_ITER_ELEM(e, &eiter, v, BM_EDGES_OF_VERT) {
+					if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
+							e_best = e;
+							tot_sel += 1;
+						}
+						tot += 1;
 					}
-					tot += 1;
 				}
-			}
-			if (tot_sel != 1) {
-				e_best = NULL;
-			}
+				if (tot_sel != 1) {
+					e_best = NULL;
+				}
 
-			/* only one edge selected, operate on that */
-			if (e_best) {
-				goto found_edge;
-			}
-			/* none selected, fall through and find one */
-			else if (tot_sel == 0) {
-				/* pass */
-			}
-			/* selection not 0 or 1, do nothing */
-			else {
-				goto found_edge;
-			}
+				/* only one edge selected, operate on that */
+				if (e_best) {
+					goto found_edge;
+				}
+				/* none selected, fall through and find one */
+				else if (tot_sel == 0) {
+					/* pass */
+				}
+				/* selection not 0 or 1, do nothing */
+				else {
+					goto found_edge;
+				}
 #endif
-			ED_view3d_project_float_v2_m4(ar, v->co, v_sco, projectMat);
+				ED_view3d_project_float_v2_m4(ar, v->co, v_sco, projectMat);
 
-			BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-				if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
-					BMVert *v_other = BM_edge_other_vert(e, v);
-					float v_other_sco[2];
-					float angle_test;
+				BM_ITER_ELEM(e, &eiter, v, BM_EDGES_OF_VERT) {
+					if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
+						BMVert *v_other = BM_edge_other_vert(e, v);
+						float v_other_sco[2];
+						float angle_test;
 
-					ED_view3d_project_float_v2_m4(ar, v_other->co, v_other_sco, projectMat);
+						ED_view3d_project_float_v2_m4(ar, v_other->co, v_other_sco, projectMat);
 
-					/* avoid comparing with view-axis aligned edges (less than a pixel) */
-					if (len_squared_v2v2(v_sco, v_other_sco) > 1.0f) {
-						float v_dir[2];
+						/* avoid comparing with view-axis aligned edges (less than a pixel) */
+						if (len_squared_v2v2(v_sco, v_other_sco) > 1.0f) {
+							float v_dir[2];
 
-						sub_v2_v2v2(v_dir, v_other_sco, v_sco);
-						normalize_v2(v_dir);
+							sub_v2_v2v2(v_dir, v_other_sco, v_sco);
+							normalize_v2(v_dir);
 
-						angle_test = angle_normalized_v2v2(mval_dir, v_dir);
+							angle_test = angle_normalized_v2v2(mval_dir, v_dir);
 
-						if (angle_test < angle_best) {
-							angle_best = angle_test;
-							e_best = e;
+							if (angle_test < angle_best) {
+								angle_best = angle_test;
+								e_best = e;
+							}
 						}
 					}
 				}
-			}
 
 #ifdef USE_TRICKY_EXTEND
-found_edge:
+found_edge :
 #endif
-			if (e_best) {
-				const bool e_select = BM_elem_flag_test_bool(e_best, BM_ELEM_SELECT);
-				BMVert *v_new;
-				BMEdge *e_new;
+				if (e_best) {
+					const bool e_select = BM_elem_flag_test_bool(e_best, BM_ELEM_SELECT);
+					BMVert *v_new;
+					BMEdge *e_new;
 
-				v_new = BM_edge_split(bm, e_best, v, &e_new, 0.0f);
+					v_new = BM_edge_split(bm, e_best, v, &e_new, 0.0f);
 
-				BM_vert_select_set(bm, v, false);
-				BM_edge_select_set(bm, e_new, false);
+					BM_vert_select_set(bm, v, false);
+					BM_edge_select_set(bm, e_new, false);
 
-				BM_vert_select_set(bm, v_new, true);
-				if (e_select) {
-					BM_edge_select_set(bm, e_best, true);
-				}
-				BM_elem_flag_enable(v_new, BM_ELEM_TAG);  /* prevent further splitting */
+					BM_vert_select_set(bm, v_new, true);
+					if (e_select) {
+						BM_edge_select_set(bm, e_best, true);
+					}
+					BM_elem_flag_enable(v_new, BM_ELEM_TAG);  /* prevent further splitting */
 
-				changed = true;
+					changed = true;
+				}
 			}
 		}
-	}
-
-	if (changed) {
-		BM_select_history_clear(bm);
 
-		BM_mesh_select_mode_flush(bm);
+		if (changed) {
+			BM_select_history_clear(bm);
 
-		EDBM_update_generic(em, true, true);
+			BM_mesh_select_mode_flush(bm);
 
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
+			EDBM_update_generic(em, true, true);
+		}
 	}
+
+	MEM_freeN(objects);
+
+	return OPERATOR_FINISHED;
 }
 
 
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 019aa6d4201..634c65485e9 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -45,6 +45,7 @@
 #include "BKE_report.h"
 #include "BKE_paint.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
@@ -68,6 +69,9 @@
 
 #include "bmesh_tools.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "mesh_intern.h"  /* own include */
 
 /* use bmesh operator flags for a few operators */
@@ -209,7 +213,9 @@ static BLI_bitmap *edbm_backbuf_alloc(const int size)
 
 /* reads rect, and builds selection array for quick lookup */
 /* returns if all is OK */
-bool EDBM_backbuf_border_init(ViewContext *vc, short xmin, short ymin, short xmax, short ymax)
+bool EDBM_backbuf_border_init(
+        ViewContext *vc, short xmin,
+        short ymin, short xmax, short ymax)
 {
 	struct ImBuf *buf;
 	unsigned int *dr;
@@ -332,7 +338,9 @@ bool EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short
 }
 
 /* circle shaped sample area */
-bool EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads)
+bool EDBM_backbuf_circle_init(
+        ViewContext *vc,
+        short xs, short ys, short rads)
 {
 	struct ImBuf *buf;
 	unsigned int *dr;
@@ -389,6 +397,18 @@ bool EDBM_backbuf_circle_init(ViewContext *vc, short xs, short ys, short rads)
  * to avoid the bias interfering with distance comparisons when mixing types.
  * \{ */
 
+#define FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, select_mode_required) \
+	short select_mode = select_mode_required; \
+	bool fake_select_mode = (select_mode & (vc)->scene->toolsettings->selectmode) == 0; \
+	if (fake_select_mode) { \
+		(vc)->v3d->flag |= V3D_INVALID_BACKBUF; \
+	} ((void)0)
+
+#define FAKE_SELECT_MODE_END(vc, fake_select_mode) \
+	if (fake_select_mode) { \
+		(vc)->v3d->flag |= V3D_INVALID_BACKBUF; \
+	} ((void)0)
+
 #define FIND_NEAR_SELECT_BIAS 5
 #define FIND_NEAR_CYCLE_THRESHOLD_MIN 3
 
@@ -462,11 +482,16 @@ BMVert *EDBM_vert_find_nearest_ex(
 		BMVert *eve;
 
 		/* No afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad. */
-		ED_view3d_backbuf_validate(vc);
+		{
+			FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_VERTEX);
+			ED_view3d_backbuf_validate_with_select_mode(vc, select_mode);
 
-		index = ED_view3d_backbuf_sample_rect(
-		        vc, vc->mval, dist_px, bm_wireoffs, 0xFFFFFF, &dist_test);
-		eve = index ? BM_vert_at_index_find_or_table(bm, index - 1) : NULL;
+			index = ED_view3d_backbuf_sample_rect(
+			            vc, vc->mval, dist_px, bm_wireoffs, 0xFFFFFF, &dist_test);
+			eve = index ? BM_vert_at_index_find_or_table(bm, index - 1) : NULL;
+
+			FAKE_SELECT_MODE_END(vc, fake_select_mode);
+		}
 
 		if (eve) {
 			if (dist_test < *r_dist) {
@@ -649,19 +674,16 @@ BMEdge *EDBM_edge_find_nearest_ex(
 		unsigned int index;
 		BMEdge *eed;
 
-		/* Make sure that the edges are considered for selection.
-		 * TODO: cleanup: add `selectmode` as a parameter */
-		const short ts_selectmode = vc->scene->toolsettings->selectmode;
-		vc->scene->toolsettings->selectmode |= SCE_SELECT_EDGE;
-
 		/* No afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad. */
-		ED_view3d_backbuf_validate(vc);
+		{
+			FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_EDGE);
+			ED_view3d_backbuf_validate_with_select_mode(vc, select_mode);
 
-		/* restore `selectmode` */
-		vc->scene->toolsettings->selectmode = ts_selectmode;
+			index = ED_view3d_backbuf_sample_rect(vc, vc->mval, dist_px, bm_solidoffs, bm_wireoffs, &dist_test);
+			eed = index ? BM_edge_at_index_find_or_table(bm, index - 1) : NULL;
 
-		index = ED_view3d_backbuf_sample_rect(vc, vc->mval, dist_px, bm_solidoffs, bm_wireoffs, &dist_test);
-		eed = index ? BM_edge_at_index_find_or_table(bm, index - 1) : NULL;
+			FAKE_SELECT_MODE_END(vc, fake_select_mode);
+		}
 
 		if (r_eed_zbuf) {
 			*r_eed_zbuf = eed;
@@ -822,10 +844,15 @@ BMFace *EDBM_face_find_nearest_ex(
 		unsigned int index;
 		BMFace *efa;
 
-		ED_view3d_backbuf_validate(vc);
+		{
+			FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_FACE);
+			ED_view3d_backbuf_validate_with_select_mode(vc, select_mode);
+
+			index = ED_view3d_backbuf_sample(vc, vc->mval[0], vc->mval[1]);
+			efa = index ? BM_face_at_index_find_or_table(bm, index - 1) : NULL;
 
-		index = ED_view3d_backbuf_sample(vc, vc->mval[0], vc->mval[1]);
-		efa = index ? BM_face_at_index_find_or_table(bm, index - 1) : NULL;
+			FAKE_SELECT_MODE_END(vc, fake_select_mode);
+		}
 
 		if (r_efa_zbuf) {
 			*r_efa_zbuf = efa;
@@ -909,7 +936,9 @@ BMFace *EDBM_face_find_nearest(ViewContext *vc, float *r_dist)
  * selected vertices and edges get disadvantage
  * return 1 if found one
  */
-static int unified_findnearest(ViewContext *vc, BMVert **r_eve, BMEdge **r_eed, BMFace **r_efa)
+static bool unified_findnearest(
+        ViewContext *vc,
+        Base **r_base, BMVert **r_eve, BMEdge **r_eed, BMFace **r_efa)
 {
 	BMEditMesh *em = vc->em;
 	static short mval_prev[2] = {-1, -1};
@@ -919,68 +948,143 @@ static int unified_findnearest(ViewContext *vc, BMVert **r_eve, BMEdge **r_eed,
 	/* since edges select lines, we give dots advantage of ~20 pix */
 	const float dist_margin = (dist_init / 2);
 	float dist = dist_init;
-	BMFace *efa_zbuf = NULL;
-	BMEdge *eed_zbuf = NULL;
-
-	BMVert *eve = NULL;
-	BMEdge *eed = NULL;
-	BMFace *efa = NULL;
 
+	struct {
+		struct {
+			BMVert *ele;
+			Base *base;
+		} v;
+		struct {
+			BMEdge *ele;
+			Base *base;
+		} e, e_zbuf;
+		struct {
+			BMFace *ele;
+			Base *base;
+		} f, f_zbuf;
+	} hit = {{NULL}};
+
+	/* TODO(campbell): perform selection as one pass
+	 * instead of many smaller passes (which doesn't work for zbuf occlusion). */
+	uint bases_len = 0;
+	Base **bases = BKE_view_layer_array_from_bases_in_edit_mode(vc->view_layer, &bases_len);
 
 	/* no afterqueue (yet), so we check it now, otherwise the em_xxxofs indices are bad */
-	ED_view3d_backbuf_validate(vc);
 
 	if ((dist > 0.0f) && em->selectmode & SCE_SELECT_FACE) {
 		float dist_center = 0.0f;
 		float *dist_center_p = (em->selectmode & (SCE_SELECT_EDGE | SCE_SELECT_VERTEX)) ? &dist_center : NULL;
-		efa = EDBM_face_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &efa_zbuf);
-		if (efa && dist_center_p) {
-			dist = min_ff(dist_margin, dist_center);
-		}
+
+		for (uint base_index = 0; base_index < bases_len; base_index++) {
+			Base *base_iter = bases[base_index];
+			Object *obedit = base_iter->object;
+			ED_view3d_viewcontext_init_object(vc, obedit);
+			ED_view3d_backbuf_validate(vc);
+			BMFace *efa_zbuf = NULL;
+			BMFace *efa_test = EDBM_face_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &efa_zbuf);
+			if (hit.f.ele && dist_center_p) {
+				dist = min_ff(dist_margin, dist_center);
+			}
+			if (efa_test) {
+				hit.f.base = base_iter;
+				hit.f.ele  = efa_test;
+			}
+			if (efa_zbuf) {
+				hit.f_zbuf.base = base_iter;
+				hit.f_zbuf.ele  = efa_zbuf;
+			}
+		} /* bases */
 	}
 
 	if ((dist > 0.0f) && (em->selectmode & SCE_SELECT_EDGE)) {
 		float dist_center = 0.0f;
 		float *dist_center_p = (em->selectmode & SCE_SELECT_VERTEX) ? &dist_center : NULL;
-		eed = EDBM_edge_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &eed_zbuf);
-		if (eed && dist_center_p) {
-			dist = min_ff(dist_margin, dist_center);
-		}
+
+		for (uint base_index = 0; base_index < bases_len; base_index++) {
+			Base *base_iter = bases[base_index];
+			Object *obedit = base_iter->object;
+			ED_view3d_viewcontext_init_object(vc, obedit);
+			ED_view3d_backbuf_validate(vc);
+			BMEdge *eed_zbuf = NULL;
+			BMEdge *eed_test = EDBM_edge_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &eed_zbuf);
+			if (hit.e.ele && dist_center_p) {
+				dist = min_ff(dist_margin, dist_center);
+			}
+			if (eed_test) {
+				hit.e.base = base_iter;
+				hit.e.ele  = eed_test;
+			}
+			if (eed_zbuf) {
+				hit.e_zbuf.base = base_iter;
+				hit.e_zbuf.ele  = eed_zbuf;
+			}
+		} /* bases */
 	}
 
 	if ((dist > 0.0f) && em->selectmode & SCE_SELECT_VERTEX) {
-		eve = EDBM_vert_find_nearest_ex(vc, &dist, true, use_cycle);
+		for (uint base_index = 0; base_index < bases_len; base_index++) {
+			Base *base_iter = bases[base_index];
+			Object *obedit = base_iter->object;
+			ED_view3d_viewcontext_init_object(vc, obedit);
+			ED_view3d_backbuf_validate(vc);
+			BMVert *eve_test = EDBM_vert_find_nearest_ex(vc, &dist, true, use_cycle);
+			if (eve_test) {
+				hit.v.base = base_iter;
+				hit.v.ele  = eve_test;
+			}
+		} /* bases */
 	}
 
+	MEM_SAFE_FREE(bases);
+
 	/* return only one of 3 pointers, for frontbuffer redraws */
-	if (eve) {
-		efa = NULL; eed = NULL;
+	if (hit.v.ele) {
+		hit.f.ele = NULL;
+		hit.e.ele = NULL;
 	}
-	else if (eed) {
-		efa = NULL;
+	else if (hit.e.ele) {
+		hit.f.ele = NULL;
 	}
 
 	/* there may be a face under the cursor, who's center if too far away
 	 * use this if all else fails, it makes sense to select this */
-	if ((eve || eed || efa) == 0) {
-		if (eed_zbuf) {
-			eed = eed_zbuf;
+	if ((hit.v.ele || hit.e.ele || hit.f.ele) == 0) {
+		if (hit.e_zbuf.ele) {
+			hit.e.base = hit.e_zbuf.base;
+			hit.e.ele  = hit.e_zbuf.ele;
 		}
-		else if (efa_zbuf) {
-			efa = efa_zbuf;
+		else if (hit.f_zbuf.ele) {
+			hit.f.base = hit.f_zbuf.base;
+			hit.f.ele  = hit.f_zbuf.ele;
 		}
 	}
 
 	mval_prev[0] = vc->mval[0];
 	mval_prev[1] = vc->mval[1];
 
-	*r_eve = eve;
-	*r_eed = eed;
-	*r_efa = efa;
+	/* Only one element type will be non-null. */
+	BLI_assert(((hit.v.ele != NULL) + (hit.e.ele != NULL) + (hit.f.ele != NULL)) <= 1);
+
+	if (hit.v.ele) {
+		*r_base = hit.v.base;
+	}
+	if (hit.e.ele) {
+		*r_base = hit.e.base;
+	}
+	if (hit.f.ele) {
+		*r_base = hit.f.base;
+	}
 
-	return (eve || eed || efa);
+	*r_eve = hit.v.ele;
+	*r_eed = hit.e.ele;
+	*r_efa = hit.f.ele;
+
+	return (hit.v.ele || hit.e.ele || hit.f.ele);
 }
 
+#undef FAKE_SELECT_MODE_BEGIN
+#undef FAKE_SELECT_MODE_END
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -1014,13 +1118,13 @@ static const EnumPropertyItem prop_similar_types[] = {
 #endif
 
 	{SIMFACE_MATERIAL, "MATERIAL", 0, "Material", ""},
-	{SIMFACE_IMAGE, "IMAGE", 0, "Image", ""},
 	{SIMFACE_AREA, "AREA", 0, "Area", ""},
 	{SIMFACE_SIDES, "SIDES", 0, "Polygon Sides", ""},
 	{SIMFACE_PERIMETER, "PERIMETER", 0, "Perimeter", ""},
 	{SIMFACE_NORMAL, "NORMAL", 0, "Normal", ""},
 	{SIMFACE_COPLANAR, "COPLANAR", 0, "Co-planar", ""},
 	{SIMFACE_SMOOTH, "SMOOTH", 0, "Flat/Smooth", ""},
+	{SIMFACE_FACEMAP, "FACE_MAP", 0, "Face-Map", ""},
 #ifdef WITH_FREESTYLE
 	{SIMFACE_FREESTYLE, "FREESTYLE_FACE", 0, "Freestyle Face Marks", ""},
 #endif
@@ -1199,7 +1303,7 @@ static const EnumPropertyItem *select_similar_type_itemf(
 #ifdef WITH_FREESTYLE
 			const int a_end = SIMFACE_FREESTYLE;
 #else
-			const int a_end = SIMFACE_SMOOTH;
+			const int a_end = SIMFACE_FACEMAP;
 #endif
 			for (a = SIMFACE_MATERIAL; a <= a_end; a++) {
 				RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
@@ -1466,50 +1570,60 @@ static void walker_select(BMEditMesh *em, int walkercode, void *start, const boo
 
 static int edbm_loop_multiselect_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMEdge *eed;
-	BMEdge **edarray;
-	int edindex;
 	const bool is_ring = RNA_boolean_get(op->ptr, "ring");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	BMIter iter;
-	int totedgesel = 0;
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-			totedgesel++;
+		BMEdge *eed;
+		BMEdge **edarray;
+		int edindex;
+		BMIter iter;
+		int totedgesel = 0;
+
+		BM_ITER_MESH(eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
+				totedgesel++;
+			}
 		}
-	}
 
-	edarray = MEM_mallocN(sizeof(BMEdge *) * totedgesel, "edge array");
-	edindex = 0;
+		edarray = MEM_mallocN(sizeof(BMEdge *) * totedgesel, "edge array");
+		edindex = 0;
 
-	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-			edarray[edindex] = eed;
-			edindex++;
+		BM_ITER_MESH(eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
+				edarray[edindex] = eed;
+				edindex++;
+			}
 		}
-	}
 
-	if (is_ring) {
-		for (edindex = 0; edindex < totedgesel; edindex += 1) {
-			eed = edarray[edindex];
-			walker_select(em, BMW_EDGERING, eed, true);
+		if (is_ring) {
+			for (edindex = 0; edindex < totedgesel; edindex += 1) {
+				eed = edarray[edindex];
+				walker_select(em, BMW_EDGERING, eed, true);
+			}
+			EDBM_selectmode_flush(em);
 		}
-		EDBM_selectmode_flush(em);
-	}
-	else {
-		for (edindex = 0; edindex < totedgesel; edindex += 1) {
-			eed = edarray[edindex];
-			walker_select(em, BMW_EDGELOOP, eed, true);
+		else {
+			for (edindex = 0; edindex < totedgesel; edindex += 1) {
+				eed = edarray[edindex];
+				walker_select(em, BMW_EDGELOOP, eed, true);
+			}
+			EDBM_selectmode_flush(em);
 		}
-		EDBM_selectmode_flush(em);
-	}
-	MEM_freeN(edarray);
-//	if (EM_texFaceCheck())
+		MEM_freeN(edarray);
+		//	if (EM_texFaceCheck())
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1607,17 +1721,6 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de
 	mvalf[1] = (float)(vc.mval[1] = mval[1]);
 	em = vc.em;
 
-	/* Make sure that the edges are also considered for selection.
-	 * TODO: cleanup: add `selectmode` as a parameter */
-	const short ts_selectmode = vc.scene->toolsettings->selectmode;
-	vc.scene->toolsettings->selectmode |= SCE_SELECT_EDGE;
-
-	/* no afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad */
-	ED_view3d_backbuf_validate(&vc);
-
-	/* restore `selectmode` */
-	vc.scene->toolsettings->selectmode = ts_selectmode;
-
 	eed = EDBM_edge_find_nearest_ex(&vc, &dist, NULL, true, true, NULL);
 	if (eed == NULL) {
 		return false;
@@ -1794,27 +1897,43 @@ void MESH_OT_edgering_select(wmOperatorType *ot)
 
 static int edbm_select_all_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const int action = RNA_enum_get(op->ptr, "action");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	int action = RNA_enum_get(op->ptr, "action");
+
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	if (action == SEL_TOGGLE) {
+		action = SEL_SELECT;
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *obedit = objects[ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+			if (em->bm->totvertsel || em->bm->totedgesel || em->bm->totfacesel) {
+				action = SEL_DESELECT;
+				break;
+			}
+		}
+	}
 
-	switch (action) {
-		case SEL_TOGGLE:
-			EDBM_select_toggle_all(em);
-			break;
-		case SEL_SELECT:
-			EDBM_flag_enable_all(em, BM_ELEM_SELECT);
-			break;
-		case SEL_DESELECT:
-			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-			break;
-		case SEL_INVERT:
-			EDBM_select_swap(em);
-			EDBM_selectmode_flush(em);
-			break;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		switch (action) {
+			case SEL_SELECT:
+				EDBM_flag_enable_all(em, BM_ELEM_SELECT);
+				break;
+			case SEL_DESELECT:
+				EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+				break;
+			case SEL_INVERT:
+				EDBM_select_swap(em);
+				EDBM_selectmode_flush(em);
+				break;
+		}
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1844,18 +1963,23 @@ void MESH_OT_select_all(wmOperatorType *ot)
 
 static int edbm_faces_select_interior_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (EDBM_select_interior_faces(em)) {
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
+		if (!EDBM_select_interior_faces(em)) {
+			continue;
+		}
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	}
+	MEM_freeN(objects);
 
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_select_interior_faces(wmOperatorType *ot)
@@ -1885,6 +2009,8 @@ void MESH_OT_select_interior_faces(wmOperatorType *ot)
 bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
 {
 	ViewContext vc;
+
+	Base *basact = NULL;
 	BMVert *eve = NULL;
 	BMEdge *eed = NULL;
 	BMFace *efa = NULL;
@@ -1894,11 +2020,23 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
 	vc.mval[0] = mval[0];
 	vc.mval[1] = mval[1];
 
-	if (unified_findnearest(&vc, &eve, &eed, &efa)) {
+	if (unified_findnearest(&vc, &basact, &eve, &eed, &efa)) {
+		ED_view3d_viewcontext_init_object(&vc, basact->object);
 
 		/* Deselect everything */
-		if (extend == false && deselect == false && toggle == false)
-			EDBM_flag_disable_all(vc.em, BM_ELEM_SELECT);
+		if (extend == false && deselect == false && toggle == false) {
+			uint objects_len = 0;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer, &objects_len);
+
+			for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+				Object *ob_iter = objects[ob_index];
+				EDBM_flag_disable_all(BKE_editmesh_from_object(ob_iter), BM_ELEM_SELECT);
+				if (basact->object != ob_iter) {
+					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data);
+				}
+			}
+			MEM_freeN(objects);
+		}
 
 		if (efa) {
 			if (extend) {
@@ -1981,16 +2119,41 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
 
 		EDBM_selectmode_flush(vc.em);
 
-		/* change active material on object */
-		if (efa && efa->mat_nr != vc.obedit->actcol - 1) {
-			vc.obedit->actcol = efa->mat_nr + 1;
-			vc.em->mat_nr = efa->mat_nr;
+		if (efa) {
+			/* Change active material on object. */
+			if (efa->mat_nr != vc.obedit->actcol - 1) {
+				vc.obedit->actcol = efa->mat_nr + 1;
+				vc.em->mat_nr = efa->mat_nr;
+				WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_LINKS, NULL);
+			}
 
-			WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_LINKS, NULL);
+			/* Change active face-map on object. */
+			if (!BLI_listbase_is_empty(&vc.obedit->fmaps)) {
+				const int cd_fmap_offset = CustomData_get_offset(&vc.em->bm->pdata, CD_FACEMAP);
+				if (cd_fmap_offset != -1) {
+					int map = *((int *)BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset));
+					if ((map < -1) || (map > BLI_listbase_count_at_most(&vc.obedit->fmaps, map))) {
+						map = -1;
+					}
+					map += 1;
+					if (map != vc.obedit->actfmap) {
+						/* We may want to add notifiers later,
+						 * currently select update handles redraw. */
+						vc.obedit->actfmap = map;
+					}
+				}
+			}
 
 		}
 
+		/* Changing active object is handy since it allows us to
+		 * switch UV layers, vgroups for eg. */
+		if (vc.view_layer->basact != basact) {
+			vc.view_layer->basact = basact;
+			WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, vc.scene);
+		}
 		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+
 		return true;
 	}
 
@@ -2212,6 +2375,8 @@ bool EDBM_selectmode_toggle(
         bContext *C, const short selectmode_new,
         const int action, const bool use_extend, const bool use_expand)
 {
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ToolSettings *ts = CTX_data_tool_settings(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = NULL;
@@ -2225,6 +2390,7 @@ bool EDBM_selectmode_toggle(
 		return ret;
 	}
 
+	bool only_update = false;
 	switch (action) {
 		case -1:
 			/* already set */
@@ -2232,21 +2398,24 @@ bool EDBM_selectmode_toggle(
 		case 0:  /* disable */
 			/* check we have something to do */
 			if ((em->selectmode & selectmode_new) == 0) {
-				return false;
+				only_update = true;
+				break;
 			}
 			em->selectmode &= ~selectmode_new;
 			break;
 		case 1:  /* enable */
 			/* check we have something to do */
 			if ((em->selectmode & selectmode_new) != 0) {
-				return false;
+				only_update = true;
+				break;
 			}
 			em->selectmode |= selectmode_new;
 			break;
 		case 2:  /* toggle */
 			/* can't disable this flag if its the only one set */
 			if (em->selectmode == selectmode_new) {
-				return false;
+				only_update = true;
+				break;
 			}
 			em->selectmode ^= selectmode_new;
 			break;
@@ -2255,10 +2424,30 @@ bool EDBM_selectmode_toggle(
 			break;
 	}
 
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob_iter = objects[ob_index];
+		BMEditMesh *em_iter = BKE_editmesh_from_object(ob_iter);
+		if (em_iter != em) {
+			em_iter->selectmode = em->selectmode;
+		}
+	}
+
+	if (only_update) {
+		MEM_freeN(objects);
+		return false;
+	}
+
 	if (use_extend == 0 || em->selectmode == 0) {
 		if (use_expand) {
 			const short selmode_max = highest_order_bit_s(ts->selectmode);
-			EDBM_selectmode_convert(em, selmode_max, selectmode_new);
+			for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+				Object *ob_iter = objects[ob_index];
+				BMEditMesh *em_iter = BKE_editmesh_from_object(ob_iter);
+				EDBM_selectmode_convert(em_iter, selmode_max, selectmode_new);
+			}
 		}
 	}
 
@@ -2267,24 +2456,18 @@ bool EDBM_selectmode_toggle(
 			if (use_extend == 0 || em->selectmode == 0) {
 				em->selectmode = SCE_SELECT_VERTEX;
 			}
-			ts->selectmode = em->selectmode;
-			EDBM_selectmode_set(em);
 			ret = true;
 			break;
 		case SCE_SELECT_EDGE:
 			if (use_extend == 0 || em->selectmode == 0) {
 				em->selectmode = SCE_SELECT_EDGE;
 			}
-			ts->selectmode = em->selectmode;
-			EDBM_selectmode_set(em);
 			ret = true;
 			break;
 		case SCE_SELECT_FACE:
 			if (use_extend == 0 || em->selectmode == 0) {
 				em->selectmode = SCE_SELECT_FACE;
 			}
-			ts->selectmode = em->selectmode;
-			EDBM_selectmode_set(em);
 			ret = true;
 			break;
 		default:
@@ -2293,10 +2476,20 @@ bool EDBM_selectmode_toggle(
 	}
 
 	if (ret == true) {
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		ts->selectmode = em->selectmode;
+		em = NULL;
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *ob_iter = objects[ob_index];
+			BMEditMesh *em_iter = BKE_editmesh_from_object(ob_iter);
+			EDBM_selectmode_set(em_iter);
+			DEG_id_tag_update(ob_iter->data, DEG_TAG_COPY_ON_WRITE);
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data);
+		}
 		WM_main_add_notifier(NC_SCENE | ND_TOOLSETTINGS, NULL);
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 	}
 
+	MEM_freeN(objects);
 	return ret;
 }
 
@@ -2498,7 +2691,7 @@ static bool select_linked_delimit_test(
  * Gets the default from the operator fallback to own last-used value
  * (selected based on mode)
  */
-static int select_linked_delimit_default_from_op(wmOperator *op, int select_mode)
+static int select_linked_delimit_default_from_op(wmOperator *op, const int select_mode)
 {
 	static char delimit_last_store[2] = {0, BMO_DELIM_SEAM};
 	int delimit_last_index = (select_mode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) == 0;
@@ -2564,172 +2757,186 @@ static void select_linked_delimit_end(BMEditMesh *em)
 
 static int edbm_select_linked_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMIter iter;
-	BMWalker walker;
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 #ifdef USE_LINKED_SELECT_DEFAULT_HACK
-	int delimit = select_linked_delimit_default_from_op(op, em->selectmode);
+	const int delimit_init = select_linked_delimit_default_from_op(op, scene->toolsettings->selectmode);
 #else
-	int delimit = RNA_enum_get(op->ptr, "delimit");
+	const int delimit_init = RNA_enum_get(op->ptr, "delimit");
 #endif
 
-	select_linked_delimit_validate(bm, &delimit);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (delimit) {
-		select_linked_delimit_begin(em->bm, delimit);
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
 
-	if (em->selectmode & SCE_SELECT_VERTEX) {
-		BMVert *v;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BMIter iter;
+		BMWalker walker;
 
-		BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
-			BM_elem_flag_set(v, BM_ELEM_TAG, BM_elem_flag_test(v, BM_ELEM_SELECT));
-		}
+		int delimit = delimit_init;
+
+		select_linked_delimit_validate(bm, &delimit);
 
-		/* exclude all delimited verts */
 		if (delimit) {
-			BMEdge *e;
-			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-				if (!BMO_edge_flag_test(bm, e, BMO_ELE_TAG)) {
-					BM_elem_flag_disable(e->v1, BM_ELEM_TAG);
-					BM_elem_flag_disable(e->v2, BM_ELEM_TAG);
-				}
-			}
+			select_linked_delimit_begin(em->bm, delimit);
 		}
 
-		BMW_init(&walker, em->bm, delimit ? BMW_LOOP_SHELL_WIRE : BMW_VERT_SHELL,
-		         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
-		         BMW_FLAG_TEST_HIDDEN,
-		         BMW_NIL_LAY);
+		if (em->selectmode & SCE_SELECT_VERTEX) {
+			BMVert *v;
 
-		if (delimit) {
 			BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
-				if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
-					BMElem *ele_walk;
-					BMW_ITER (ele_walk, &walker, v) {
-						if (ele_walk->head.htype == BM_LOOP) {
-							BMVert *v_step = ((BMLoop *)ele_walk)->v;
-							BM_vert_select_set(em->bm, v_step, true);
-							BM_elem_flag_disable(v_step, BM_ELEM_TAG);
-						}
-						else {
-							BMEdge *e_step = (BMEdge *)ele_walk;
-							BLI_assert(ele_walk->head.htype == BM_EDGE);
-							BM_edge_select_set(em->bm, e_step, true);
-							BM_elem_flag_disable(e_step->v1, BM_ELEM_TAG);
-							BM_elem_flag_disable(e_step->v2, BM_ELEM_TAG);
+				BM_elem_flag_set(v, BM_ELEM_TAG, BM_elem_flag_test(v, BM_ELEM_SELECT));
+			}
+
+			/* exclude all delimited verts */
+			if (delimit) {
+				BMEdge *e;
+				BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+					if (!BMO_edge_flag_test(bm, e, BMO_ELE_TAG)) {
+						BM_elem_flag_disable(e->v1, BM_ELEM_TAG);
+						BM_elem_flag_disable(e->v2, BM_ELEM_TAG);
+					}
+				}
+			}
+
+			BMW_init(&walker, em->bm, delimit ? BMW_LOOP_SHELL_WIRE : BMW_VERT_SHELL,
+			         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
+			         BMW_FLAG_TEST_HIDDEN,
+			         BMW_NIL_LAY);
+
+			if (delimit) {
+				BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+					if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
+						BMElem *ele_walk;
+						BMW_ITER (ele_walk, &walker, v) {
+							if (ele_walk->head.htype == BM_LOOP) {
+								BMVert *v_step = ((BMLoop *)ele_walk)->v;
+								BM_vert_select_set(em->bm, v_step, true);
+								BM_elem_flag_disable(v_step, BM_ELEM_TAG);
+							}
+							else {
+								BMEdge *e_step = (BMEdge *)ele_walk;
+								BLI_assert(ele_walk->head.htype == BM_EDGE);
+								BM_edge_select_set(em->bm, e_step, true);
+								BM_elem_flag_disable(e_step->v1, BM_ELEM_TAG);
+								BM_elem_flag_disable(e_step->v2, BM_ELEM_TAG);
+							}
 						}
 					}
 				}
 			}
-		}
-		else {
-			BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
-				if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
-					BMEdge *e_walk;
-					BMW_ITER (e_walk, &walker, v) {
-						BM_edge_select_set(em->bm, e_walk, true);
-						BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
+			else {
+				BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+					if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
+						BMEdge *e_walk;
+						BMW_ITER (e_walk, &walker, v) {
+							BM_edge_select_set(em->bm, e_walk, true);
+							BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
+						}
 					}
 				}
 			}
-		}
 
-		BMW_end(&walker);
+			BMW_end(&walker);
 
-		EDBM_selectmode_flush(em);
-	}
-	else if (em->selectmode & SCE_SELECT_EDGE) {
-		BMEdge *e;
+			EDBM_selectmode_flush(em);
+		}
+		else if (em->selectmode & SCE_SELECT_EDGE) {
+			BMEdge *e;
 
-		if (delimit) {
-			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-				BM_elem_flag_set(
-				        e, BM_ELEM_TAG,
-				        (BM_elem_flag_test(e, BM_ELEM_SELECT) && BMO_edge_flag_test(bm, e, BMO_ELE_TAG)));
+			if (delimit) {
+				BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+					BM_elem_flag_set(
+					        e, BM_ELEM_TAG,
+					        (BM_elem_flag_test(e, BM_ELEM_SELECT) && BMO_edge_flag_test(bm, e, BMO_ELE_TAG)));
+				}
 			}
-		}
-		else {
-			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-				BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
+			else {
+				BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+					BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
+				}
 			}
-		}
-
-		BMW_init(&walker, em->bm, delimit ? BMW_LOOP_SHELL_WIRE : BMW_VERT_SHELL,
-		         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
-		         BMW_FLAG_TEST_HIDDEN,
-		         BMW_NIL_LAY);
 
-		if (delimit) {
-			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-				if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
-					BMElem *ele_walk;
-					BMW_ITER (ele_walk, &walker, e) {
-						if (ele_walk->head.htype == BM_LOOP) {
-							BMLoop *l_step = (BMLoop *)ele_walk;
-							BM_edge_select_set(em->bm, l_step->e, true);
-							BM_edge_select_set(em->bm, l_step->prev->e, true);
-							BM_elem_flag_disable(l_step->e, BM_ELEM_TAG);
-						}
-						else {
-							BMEdge *e_step = (BMEdge *)ele_walk;
-							BLI_assert(ele_walk->head.htype == BM_EDGE);
-							BM_edge_select_set(em->bm, e_step, true);
-							BM_elem_flag_disable(e_step, BM_ELEM_TAG);
+			BMW_init(&walker, em->bm, delimit ? BMW_LOOP_SHELL_WIRE : BMW_VERT_SHELL,
+			         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
+			         BMW_FLAG_TEST_HIDDEN,
+			         BMW_NIL_LAY);
+
+			if (delimit) {
+				BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+					if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
+						BMElem *ele_walk;
+						BMW_ITER (ele_walk, &walker, e) {
+							if (ele_walk->head.htype == BM_LOOP) {
+								BMLoop *l_step = (BMLoop *)ele_walk;
+								BM_edge_select_set(em->bm, l_step->e, true);
+								BM_edge_select_set(em->bm, l_step->prev->e, true);
+								BM_elem_flag_disable(l_step->e, BM_ELEM_TAG);
+							}
+							else {
+								BMEdge *e_step = (BMEdge *)ele_walk;
+								BLI_assert(ele_walk->head.htype == BM_EDGE);
+								BM_edge_select_set(em->bm, e_step, true);
+								BM_elem_flag_disable(e_step, BM_ELEM_TAG);
+							}
 						}
 					}
 				}
 			}
-		}
-		else {
-			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-				if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
-					BMEdge *e_walk;
-					BMW_ITER (e_walk, &walker, e) {
-						BM_edge_select_set(em->bm, e_walk, true);
-						BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
+			else {
+				BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+					if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
+						BMEdge *e_walk;
+						BMW_ITER (e_walk, &walker, e) {
+							BM_edge_select_set(em->bm, e_walk, true);
+							BM_elem_flag_disable(e_walk, BM_ELEM_TAG);
+						}
 					}
 				}
 			}
-		}
 
-		BMW_end(&walker);
+			BMW_end(&walker);
 
-		EDBM_selectmode_flush(em);
-	}
-	else {
-		BMFace *f;
-
-		BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-			BM_elem_flag_set(f, BM_ELEM_TAG, BM_elem_flag_test(f, BM_ELEM_SELECT));
+			EDBM_selectmode_flush(em);
 		}
+		else {
+			BMFace *f;
 
-		BMW_init(&walker, bm, BMW_ISLAND,
-		         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
-		         BMW_FLAG_TEST_HIDDEN,
-		         BMW_NIL_LAY);
+			BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
+				BM_elem_flag_set(f, BM_ELEM_TAG, BM_elem_flag_test(f, BM_ELEM_SELECT));
+			}
 
-		BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(f, BM_ELEM_TAG)) {
-				BMFace *f_walk;
-				BMW_ITER (f_walk, &walker, f) {
-					BM_face_select_set(bm, f_walk, true);
-					BM_elem_flag_disable(f_walk, BM_ELEM_TAG);
+			BMW_init(&walker, bm, BMW_ISLAND,
+			         BMW_MASK_NOP, delimit ? BMO_ELE_TAG : BMW_MASK_NOP, BMW_MASK_NOP,
+			         BMW_FLAG_TEST_HIDDEN,
+			         BMW_NIL_LAY);
+
+			BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (BM_elem_flag_test(f, BM_ELEM_TAG)) {
+					BMFace *f_walk;
+					BMW_ITER (f_walk, &walker, f) {
+						BM_face_select_set(bm, f_walk, true);
+						BM_elem_flag_disable(f_walk, BM_ELEM_TAG);
+					}
 				}
 			}
+
+			BMW_end(&walker);
 		}
 
-		BMW_end(&walker);
-	}
+		if (delimit) {
+			select_linked_delimit_end(em);
+		}
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
-	if (delimit) {
-		select_linked_delimit_end(em);
 	}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -2872,10 +3079,8 @@ static void edbm_select_linked_pick_ex(BMEditMesh *em, BMElem *ele, bool sel, in
 
 static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	Object *obedit = CTX_data_edit_object(C);
 	ViewContext vc;
-	BMEditMesh *em;
-	BMesh *bm;
+	Base *basact = NULL;
 	BMVert *eve;
 	BMEdge *eed;
 	BMFace *efa;
@@ -2891,25 +3096,37 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
 
 	/* setup view context for argument to callbacks */
 	em_setup_viewcontext(C, &vc);
-	em = vc.em;
-	bm = em->bm;
 
-	if (bm->totedge == 0) {
-		return OPERATOR_CANCELLED;
+	{
+		uint objects_len = 0;
+		Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer, &objects_len);
+		bool has_edges = false;
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *ob_iter = objects[ob_index];
+			ED_view3d_viewcontext_init_object(&vc, ob_iter);
+			if (vc.em->bm->totedge) {
+				has_edges = true;
+			}
+		}
+		MEM_freeN(objects);
+		if (has_edges == false) {
+			return OPERATOR_CANCELLED;
+		}
 	}
 
 	vc.mval[0] = event->mval[0];
 	vc.mval[1] = event->mval[1];
 
 	/* return warning! */
-	if (unified_findnearest(&vc, &eve, &eed, &efa) == 0) {
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
-
+	if (unified_findnearest(&vc, &basact, &eve, &eed, &efa) == 0) {
 		return OPERATOR_CANCELLED;
 	}
+	ED_view3d_viewcontext_init_object(&vc, basact->object);
+	BMEditMesh *em = vc.em;
+	BMesh *bm = em->bm;
 
 #ifdef USE_LINKED_SELECT_DEFAULT_HACK
-	int delimit = select_linked_delimit_default_from_op(op, em->selectmode);
+	int delimit = select_linked_delimit_default_from_op(op, vc.scene->toolsettings->selectmode);
 #else
 	int delimit = RNA_enum_get(op->ptr, "delimit");
 #endif
@@ -2922,9 +3139,11 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
 	BM_mesh_elem_index_ensure(bm, ele->head.htype);
 	index = EDBM_elem_to_index_any(em, ele);
 
+	/* TODO(MULTI_EDIT), index doesn't know which object,
+	 * index selections isn't very common. */
 	RNA_int_set(op->ptr, "index", index);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, basact->object->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -2995,47 +3214,56 @@ void MESH_OT_select_linked_pick(wmOperatorType *ot)
 
 static int edbm_select_face_by_sides_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	const bool extend = RNA_boolean_get(op->ptr, "extend");
 	const int numverts = RNA_int_get(op->ptr, "number");
 	const int type = RNA_enum_get(op->ptr, "type");
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (!RNA_boolean_get(op->ptr, "extend"))
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMIter iter;
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+		if (!extend) {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		}
 
-		bool select;
+		BM_ITER_MESH(efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			bool select;
 
-		switch (type) {
-			case 0:
-				select = (efa->len < numverts);
-				break;
-			case 1:
-				select = (efa->len == numverts);
-				break;
-			case 2:
-				select = (efa->len > numverts);
-				break;
-			case 3:
-				select = (efa->len != numverts);
-				break;
-			default:
-				BLI_assert(0);
-				select = false;
-				break;
-		}
+			switch (type) {
+				case 0:
+					select = (efa->len < numverts);
+					break;
+				case 1:
+					select = (efa->len == numverts);
+					break;
+				case 2:
+					select = (efa->len > numverts);
+					break;
+				case 3:
+					select = (efa->len != numverts);
+					break;
+				default:
+					BLI_assert(0);
+					select = false;
+					break;
+			}
 
-		if (select) {
-			BM_face_select_set(em->bm, efa, true);
+			if (select) {
+				BM_face_select_set(em->bm, efa, true);
+			}
 		}
-	}
 
-	EDBM_selectmode_flush(em);
+		EDBM_selectmode_flush(em);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -3075,53 +3303,65 @@ void MESH_OT_select_face_by_sides(wmOperatorType *ot)
 
 static int edbm_select_loose_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	const bool extend = RNA_boolean_get(op->ptr, "extend");
 
-	if (!RNA_boolean_get(op->ptr, "extend"))
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (em->selectmode & SCE_SELECT_VERTEX) {
-		BMVert *eve;
-		BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-			if (!eve->e) {
-				BM_vert_select_set(bm, eve, true);
-			}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BMIter iter;
+
+		if (!extend) {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 		}
-	}
 
-	if (em->selectmode & SCE_SELECT_EDGE) {
-		BMEdge *eed;
-		BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-			if (BM_edge_is_wire(eed)) {
-				BM_edge_select_set(bm, eed, true);
+		if (em->selectmode & SCE_SELECT_VERTEX) {
+			BMVert *eve;
+			BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+				if (!eve->e) {
+					BM_vert_select_set(bm, eve, true);
+				}
 			}
 		}
-	}
 
-	if (em->selectmode & SCE_SELECT_FACE) {
-		BMFace *efa;
-		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-			BMIter liter;
-			BMLoop *l;
-			bool is_loose = true;
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				if (!BM_edge_is_boundary(l->e)) {
-					is_loose = false;
-					break;
+		if (em->selectmode & SCE_SELECT_EDGE) {
+			BMEdge *eed;
+			BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
+				if (BM_edge_is_wire(eed)) {
+					BM_edge_select_set(bm, eed, true);
 				}
 			}
-			if (is_loose) {
-				BM_face_select_set(bm, efa, true);
+		}
+
+		if (em->selectmode & SCE_SELECT_FACE) {
+			BMFace *efa;
+			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
+				BMIter liter;
+				BMLoop *l;
+				bool is_loose = true;
+				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+					if (!BM_edge_is_boundary(l->e)) {
+						is_loose = false;
+						break;
+					}
+				}
+				if (is_loose) {
+					BM_face_select_set(bm, efa, true);
+				}
 			}
 		}
+
+		EDBM_selectmode_flush(em);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	}
 
-	EDBM_selectmode_flush(em);
+	MEM_freeN(objects);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	return OPERATOR_FINISHED;
 }
 
@@ -3151,28 +3391,46 @@ void MESH_OT_select_loose(wmOperatorType *ot)
 
 static int edbm_select_mirror_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const int axis_flag = RNA_enum_get(op->ptr, "axis");
 	const bool extend = RNA_boolean_get(op->ptr, "extend");
+	Object *obedit_active = CTX_data_edit_object(C);
+	BMEditMesh *em_active = BKE_editmesh_from_object(obedit_active);
+	const int select_mode = em_active->bm->selectmode;
+	int tot_mirr = 0, tot_fail = 0;
+
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (em->bm->totvert && em->bm->totvertsel) {
-		int totmirr, totfail;
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
+
+		int tot_mirr_iter = 0, tot_fail_iter = 0;
 
 		for (int axis = 0; axis < 3; axis++) {
 			if ((1 << axis) & axis_flag) {
-				EDBM_select_mirrored(em, axis, extend, &totmirr, &totfail);
+				EDBM_select_mirrored(em, axis, extend, &tot_mirr_iter, &tot_fail_iter);
 			}
 		}
 
-		if (totmirr) {
+		if (tot_mirr_iter) {
 			EDBM_selectmode_flush(em);
 			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 		}
 
-		ED_mesh_report_mirror_ex(op, totmirr, totfail, em->bm->selectmode);
+		tot_fail += tot_fail_iter;
+		tot_mirr += tot_mirr_iter;
 	}
+	MEM_freeN(objects);
 
+	if (tot_mirr || tot_fail) {
+		ED_mesh_report_mirror_ex(op, tot_mirr, tot_fail, select_mode);
+	}
 	return OPERATOR_FINISHED;
 }
 
@@ -3204,13 +3462,28 @@ void MESH_OT_select_mirror(wmOperatorType *ot)
 
 static int edbm_select_more_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const bool use_face_step = RNA_boolean_get(op->ptr, "use_face_step");
 
-	EDBM_select_more(em, use_face_step);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		if ((bm->totvertsel == 0) &&
+		    (bm->totedgesel == 0) &&
+		    (bm->totfacesel == 0))
+		{
+			continue;
+		}
+
+		EDBM_select_more(em, use_face_step);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -3239,13 +3512,28 @@ void MESH_OT_select_more(wmOperatorType *ot)
 
 static int edbm_select_less_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const bool use_face_step = RNA_boolean_get(op->ptr, "use_face_step");
 
-	EDBM_select_less(em, use_face_step);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+
+		if ((bm->totvertsel == 0) &&
+		    (bm->totedgesel == 0) &&
+		    (bm->totfacesel == 0))
+		{
+			continue;
+		}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		EDBM_select_less(em, use_face_step);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -3458,18 +3746,39 @@ static bool edbm_deselect_nth(BMEditMesh *em, const struct CheckerIntervalParams
 
 static int edbm_select_nth_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	struct CheckerIntervalParams op_params;
-
 	WM_operator_properties_checker_interval_from_op(op, &op_params);
+	bool found_active_elt = false;
 
-	if (edbm_deselect_nth(em, &op_params) == false) {
-		BKE_report(op->reports, RPT_ERROR, "Mesh has no active vert/edge/face");
-		return OPERATOR_CANCELLED;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if ((em->bm->totvertsel == 0) &&
+		    (em->bm->totedgesel == 0) &&
+		    (em->bm->totfacesel == 0))
+		{
+			continue;
+		}
+
+		if (edbm_deselect_nth(em, &op_params) == true) {
+			found_active_elt = true;
+			EDBM_update_generic(em, false, false);
+		}
 	}
+	MEM_freeN(objects);
 
-	EDBM_update_generic(em, false, false);
+	if (!found_active_elt) {
+		BKE_report(op->reports, RPT_ERROR,
+		           (objects_len == 1 ?
+		            "Mesh has no active vert/edge/face" :
+		            "Meshes have no active vert/edge/face"));
+		return OPERATOR_CANCELLED;
+	}
 
 	return OPERATOR_FINISHED;
 }
@@ -3513,34 +3822,42 @@ static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op)
 	 * check the angle between those faces, and if angle is
 	 * small enough, select the edge
 	 */
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMIter iter;
-	BMEdge *e;
-	BMLoop *l1, *l2;
 	const float angle_limit_cos = cosf(RNA_float_get(op->ptr, "sharpness"));
 
-	BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == false &&
-		    BM_edge_loop_pair(e, &l1, &l2))
-		{
-			/* edge has exactly two neighboring faces, check angle */
-			const float angle_cos = dot_v3v3(l1->f->no, l2->f->no);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-			if (angle_cos < angle_limit_cos) {
-				BM_edge_select_set(em->bm, e, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMIter iter;
+		BMEdge *e;
+		BMLoop *l1, *l2;
+
+		BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) == false &&
+			    BM_edge_loop_pair(e, &l1, &l2))
+			{
+				/* edge has exactly two neighboring faces, check angle */
+				const float angle_cos = dot_v3v3(l1->f->no, l2->f->no);
+
+				if (angle_cos < angle_limit_cos) {
+					BM_edge_select_set(em->bm, e, true);
+				}
 			}
 		}
-	}
 
-	if ((em->bm->selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) == 0) {
-		/* Since we can't select individual edges, select faces connected to them. */
-		EDBM_selectmode_convert(em, SCE_SELECT_EDGE, SCE_SELECT_FACE);
-	}
-	else {
-		EDBM_selectmode_flush(em);
+		if ((em->bm->selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) == 0) {
+			/* Since we can't select individual edges, select faces connected to them. */
+			EDBM_selectmode_convert(em, SCE_SELECT_EDGE, SCE_SELECT_FACE);
+		}
+		else {
+			EDBM_selectmode_flush(em);
+		}
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	}
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -3575,59 +3892,70 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot)
 
 static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-
-	BLI_LINKSTACK_DECLARE(stack, BMFace *);
-
-	BMIter iter, liter, liter2;
-	BMFace *f;
-	BMLoop *l, *l2;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 	const float angle_limit_cos = cosf(RNA_float_get(op->ptr, "sharpness"));
 
-	BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
-
-	BLI_LINKSTACK_INIT(stack);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-		if ((BM_elem_flag_test(f, BM_ELEM_HIDDEN) != 0) ||
-		    (BM_elem_flag_test(f, BM_ELEM_TAG)    != 0) ||
-		    (BM_elem_flag_test(f, BM_ELEM_SELECT) == 0))
-		{
+		if (bm->totfacesel == 0) {
 			continue;
 		}
 
-		BLI_assert(BLI_LINKSTACK_SIZE(stack) == 0);
+		BLI_LINKSTACK_DECLARE(stack, BMFace *);
 
-		do {
-			BM_face_select_set(bm, f, true);
+		BMIter iter, liter, liter2;
+		BMFace *f;
+		BMLoop *l, *l2;
 
-			BM_elem_flag_enable(f, BM_ELEM_TAG);
+		BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
 
-			BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
-				BM_ITER_ELEM (l2, &liter2, l, BM_LOOPS_OF_LOOP) {
-					float angle_cos;
+		BLI_LINKSTACK_INIT(stack);
 
-					if (BM_elem_flag_test(l2->f, BM_ELEM_TAG) ||
-					    BM_elem_flag_test(l2->f, BM_ELEM_HIDDEN))
-					{
-						continue;
-					}
+		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+			if ((BM_elem_flag_test(f, BM_ELEM_HIDDEN) != 0) ||
+			    (BM_elem_flag_test(f, BM_ELEM_TAG)    != 0) ||
+			    (BM_elem_flag_test(f, BM_ELEM_SELECT) == 0))
+			{
+				continue;
+			}
+
+			BLI_assert(BLI_LINKSTACK_SIZE(stack) == 0);
+
+			do {
+				BM_face_select_set(bm, f, true);
+
+				BM_elem_flag_enable(f, BM_ELEM_TAG);
+
+				BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
+					BM_ITER_ELEM (l2, &liter2, l, BM_LOOPS_OF_LOOP) {
+						float angle_cos;
 
-					angle_cos = dot_v3v3(f->no, l2->f->no);
+						if (BM_elem_flag_test(l2->f, BM_ELEM_TAG) ||
+						    BM_elem_flag_test(l2->f, BM_ELEM_HIDDEN))
+						{
+							continue;
+						}
+
+						angle_cos = dot_v3v3(f->no, l2->f->no);
 
-					if (angle_cos > angle_limit_cos) {
-						BLI_LINKSTACK_PUSH(stack, l2->f);
+						if (angle_cos > angle_limit_cos) {
+							BLI_LINKSTACK_PUSH(stack, l2->f);
+						}
 					}
 				}
-			}
-		} while ((f = BLI_LINKSTACK_POP(stack)));
-	}
+			} while ((f = BLI_LINKSTACK_POP(stack)));
+		}
 
-	BLI_LINKSTACK_FREE(stack);
+		BLI_LINKSTACK_FREE(stack);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -3662,61 +3990,70 @@ void MESH_OT_faces_select_linked_flat(wmOperatorType *ot)
 
 static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMVert *v;
-	BMEdge *e;
-	BMIter iter;
-
+	const bool use_extend = RNA_boolean_get(op->ptr, "extend");
 	const bool use_wire = RNA_boolean_get(op->ptr, "use_wire");
 	const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
 	const bool use_multi_face = RNA_boolean_get(op->ptr, "use_multi_face");
 	const bool use_non_contiguous = RNA_boolean_get(op->ptr, "use_non_contiguous");
 	const bool use_verts = RNA_boolean_get(op->ptr, "use_verts");
 
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (!RNA_boolean_get(op->ptr, "extend"))
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMVert *v;
+		BMEdge *e;
+		BMIter iter;
 
-	/* Selects isolated verts, and edges that do not have 2 neighboring
-	 * faces
-	 */
+		if (!use_extend) {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		}
 
-	if (em->selectmode == SCE_SELECT_FACE) {
-		BKE_report(op->reports, RPT_ERROR, "Does not work in face selection mode");
-		return OPERATOR_CANCELLED;
-	}
+		/* Selects isolated verts, and edges that do not have 2 neighboring
+		 * faces
+		 */
 
-	if (use_verts) {
-		BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
-			if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
-				if (!BM_vert_is_manifold(v)) {
-					BM_vert_select_set(em->bm, v, true);
+		if (em->selectmode == SCE_SELECT_FACE) {
+			BKE_report(op->reports, RPT_ERROR, "Does not work in face selection mode");
+			MEM_freeN(objects);
+			return OPERATOR_CANCELLED;
+		}
+
+		if (use_verts) {
+			BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+				if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
+					if (!BM_vert_is_manifold(v)) {
+						BM_vert_select_set(em->bm, v, true);
+					}
 				}
 			}
 		}
-	}
 
-	if (use_wire || use_boundary || use_multi_face || use_non_contiguous) {
-		BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
-				if ((use_wire && BM_edge_is_wire(e)) ||
-				    (use_boundary && BM_edge_is_boundary(e)) ||
-				    (use_non_contiguous && (BM_edge_is_manifold(e) && !BM_edge_is_contiguous(e))) ||
-				    (use_multi_face && (BM_edge_face_count_is_over(e, 2))))
-				{
-					/* check we never select perfect edge (in test above) */
-					BLI_assert(!(BM_edge_is_manifold(e) && BM_edge_is_contiguous(e)));
+		if (use_wire || use_boundary || use_multi_face || use_non_contiguous) {
+			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
+					if ((use_wire && BM_edge_is_wire(e)) ||
+					    (use_boundary && BM_edge_is_boundary(e)) ||
+					    (use_non_contiguous && (BM_edge_is_manifold(e) && !BM_edge_is_contiguous(e))) ||
+					    (use_multi_face && (BM_edge_face_count_is_over(e, 2))))
+					{
+						/* check we never select perfect edge (in test above) */
+						BLI_assert(!(BM_edge_is_manifold(e) && BM_edge_is_contiguous(e)));
 
-					BM_edge_select_set(em->bm, e, true);
+						BM_edge_select_set(em->bm, e, true);
+					}
 				}
 			}
 		}
-	}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
-	EDBM_selectmode_flush(em);
+		EDBM_selectmode_flush(em);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -3759,53 +4096,66 @@ void MESH_OT_select_non_manifold(wmOperatorType *ot)
 
 static int edbm_select_random_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
 	const float randfac =  RNA_float_get(op->ptr, "percent") / 100.0f;
 	const int seed = WM_operator_properties_select_random_seed_increment_get(op);
 
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	RNG *rng = BLI_rng_new_srandom(seed);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMIter iter;
+		int seed_iter = seed;
 
-	if (em->selectmode & SCE_SELECT_VERTEX) {
-		BMVert *eve;
-		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_vert_select_set(em->bm, eve, select);
+		/* This gives a consistent result regardless of object order. */
+		if (ob_index) {
+			seed_iter += BLI_ghashutil_strhash_p(obedit->id.name);
+		}
+
+		RNG *rng = BLI_rng_new_srandom(seed_iter);
+
+		if (em->selectmode & SCE_SELECT_VERTEX) {
+			BMVert *eve;
+			BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
+				if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_vert_select_set(em->bm, eve, select);
+				}
 			}
 		}
-	}
-	else if (em->selectmode & SCE_SELECT_EDGE) {
-		BMEdge *eed;
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_edge_select_set(em->bm, eed, select);
+		else if (em->selectmode & SCE_SELECT_EDGE) {
+			BMEdge *eed;
+			BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_edge_select_set(em->bm, eed, select);
+				}
 			}
 		}
-	}
-	else {
-		BMFace *efa;
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_face_select_set(em->bm, efa, select);
+		else {
+			BMFace *efa;
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_face_select_set(em->bm, efa, select);
+				}
 			}
 		}
-	}
 
-	BLI_rng_free(rng);
+		BLI_rng_free(rng);
 
-	if (select) {
-		/* was EDBM_select_flush, but it over select in edge/face mode */
-		EDBM_selectmode_flush(em);
-	}
-	else {
-		EDBM_deselect_flush(em);
-	}
+		if (select) {
+			/* was EDBM_select_flush, but it over select in edge/face mode */
+			EDBM_selectmode_flush(em);
+		}
+		else {
+			EDBM_deselect_flush(em);
+		}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -3855,30 +4205,51 @@ static int edbm_select_ungrouped_poll(bContext *C)
 
 static int edbm_select_ungrouped_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
+	const bool extend = RNA_boolean_get(op->ptr, "extend");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	BMVert *eve;
-	BMIter iter;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (!RNA_boolean_get(op->ptr, "extend")) {
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
+
+		if (cd_dvert_offset == -1) {
+			continue;
+		}
 
-	BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-			MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
-			/* no dv or dv set with no weight */
-			if (ELEM(NULL, dv, dv->dw)) {
-				BM_vert_select_set(em->bm, eve, true);
+		BMVert *eve;
+		BMIter iter;
+
+		bool changed = false;
+
+		if (!extend) {
+			if (em->bm->totvertsel) {
+				EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+				changed = true;
 			}
 		}
-	}
 
-	EDBM_selectmode_flush(em);
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
+			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+				MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
+				/* no dv or dv set with no weight */
+				if (ELEM(NULL, dv, dv->dw)) {
+					BM_vert_select_set(em->bm, eve, true);
+					changed = true;
+				}
+			}
+		}
 
+		if (changed) {
+			EDBM_selectmode_flush(em);
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		}
+	}
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -3998,48 +4369,58 @@ void MESH_OT_select_axis(wmOperatorType *ot)
 
 static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *f;
-	BMEdge *e;
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+		BMFace *f;
+		BMEdge *e;
+		BMIter iter;
 
-	BM_mesh_elem_hflag_disable_all(em->bm, BM_EDGE, BM_ELEM_TAG, false);
+		BM_mesh_elem_hflag_disable_all(em->bm, BM_EDGE, BM_ELEM_TAG, false);
 
-	BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-		BMLoop *l1, *l2;
-		BMIter liter1, liter2;
+		BM_ITER_MESH(f, &iter, em->bm, BM_FACES_OF_MESH) {
+			BMLoop *l1, *l2;
+			BMIter liter1, liter2;
 
-		BM_ITER_ELEM (l1, &liter1, f, BM_LOOPS_OF_FACE) {
-			int tot = 0, totsel = 0;
+			BM_ITER_ELEM(l1, &liter1, f, BM_LOOPS_OF_FACE) {
+				int tot = 0, totsel = 0;
 
-			BM_ITER_ELEM (l2, &liter2, l1->e, BM_LOOPS_OF_EDGE) {
-				tot++;
-				totsel += BM_elem_flag_test(l2->f, BM_ELEM_SELECT) != 0;
-			}
+				BM_ITER_ELEM(l2, &liter2, l1->e, BM_LOOPS_OF_EDGE) {
+					tot++;
+					totsel += BM_elem_flag_test(l2->f, BM_ELEM_SELECT) != 0;
+				}
 
-			if ((tot != totsel && totsel > 0) || (totsel == 1 && tot == 1))
-				BM_elem_flag_enable(l1->e, BM_ELEM_TAG);
+				if ((tot != totsel && totsel > 0) || (totsel == 1 && tot == 1))
+					BM_elem_flag_enable(l1->e, BM_ELEM_TAG);
+			}
 		}
-	}
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
-			BM_edge_select_set(em->bm, e, true);
+		BM_ITER_MESH(e, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
+				BM_edge_select_set(em->bm, e, true);
+			}
 		}
-	}
 
-	/* If in face-only select mode, switch to edge select mode so that
-	 * an edge-only selection is not inconsistent state */
-	if (em->selectmode == SCE_SELECT_FACE) {
-		em->selectmode = SCE_SELECT_EDGE;
-		EDBM_selectmode_set(em);
-		EDBM_selectmode_to_scene(C);
-	}
+		/* If in face-only select mode, switch to edge select mode so that
+		 * an edge-only selection is not inconsistent state */
+		if (em->selectmode == SCE_SELECT_FACE) {
+			em->selectmode = SCE_SELECT_EDGE;
+			EDBM_selectmode_set(em);
+			EDBM_selectmode_to_scene(C);
+		}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4210,31 +4591,44 @@ static int loop_find_regions(BMEditMesh *em, const bool selbigger)
 
 static int edbm_loop_to_region_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMIter iter;
-	BMFace *f;
 	const bool select_bigger = RNA_boolean_get(op->ptr, "select_bigger");
 
-	/* find the set of regions with smallest number of total faces */
-	BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
-	const int a = loop_find_regions(em, select_bigger);
-	const int b = loop_find_regions(em, !select_bigger);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
-	loop_find_regions(em, ((a <= b) != select_bigger) ? select_bigger : !select_bigger);
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BMIter iter;
+		BMFace *f;
+
+		/* find the set of regions with smallest number of total faces */
+		BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
+		const int a = loop_find_regions(em, select_bigger);
+		const int b = loop_find_regions(em, !select_bigger);
+
+		BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
+		loop_find_regions(em, ((a <= b) != select_bigger) ? select_bigger : !select_bigger);
+
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-		if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
-			BM_face_select_set(em->bm, f, true);
+		BM_ITER_MESH(f, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
+				BM_face_select_set(em->bm, f, true);
+			}
 		}
-	}
 
-	EDBM_selectmode_flush(em);
+		EDBM_selectmode_flush(em);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+	MEM_freeN(objects);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 	return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 0625ebe6dd6..5c6b6da54a6 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -47,15 +47,18 @@
 #include "BLI_rand.h"
 #include "BLI_sort_utils.h"
 
+#include "BKE_layer.h"
 #include "BKE_material.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 #include "BKE_texture.h"
 #include "BKE_main.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "BLT_translation.h"
 
 #include "RNA_define.h"
@@ -90,10 +93,8 @@
 
 static int edbm_subdivide_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const int cuts = RNA_int_get(op->ptr, "number_cuts");
-	float smooth = RNA_float_get(op->ptr, "smoothness");
+	const float smooth = RNA_float_get(op->ptr, "smoothness");
 	const float fractal = RNA_float_get(op->ptr, "fractal") / 2.5f;
 	const float along_normal = RNA_float_get(op->ptr, "fractal_along_normal");
 
@@ -102,17 +103,35 @@ static int edbm_subdivide_exec(bContext *C, wmOperator *op)
 	{
 		RNA_enum_set(op->ptr, "quadcorner", SUBD_CORNER_INNERVERT);
 	}
+	const int quad_corner_type = RNA_enum_get(op->ptr, "quadcorner");
+	const bool use_quad_tri = RNA_boolean_get(op->ptr, "quadtri");
+	const int seed = RNA_int_get(op->ptr, "seed");
 
-	BM_mesh_esubdivide(
-	        em->bm, BM_ELEM_SELECT,
-	        smooth, SUBD_FALLOFF_LIN, false,
-	        fractal, along_normal,
-	        cuts,
-	        SUBDIV_SELECT_ORIG, RNA_enum_get(op->ptr, "quadcorner"),
-	        RNA_boolean_get(op->ptr, "quadtri"), true, false,
-	        RNA_int_get(op->ptr, "seed"));
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	EDBM_update_generic(em, true, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (!(em->bm->totedgesel || em->bm->totfacesel)) {
+			continue;
+		}
+
+		BM_mesh_esubdivide(
+		        em->bm, BM_ELEM_SELECT,
+		        smooth, SUBD_FALLOFF_LIN, false,
+		        fractal, along_normal,
+		        cuts,
+		        SUBDIV_SELECT_ORIG, quad_corner_type,
+		        use_quad_tri, true, false,
+		        seed);
+
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -149,6 +168,8 @@ void MESH_OT_subdivide(wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "smoothness", 0.0f, 0.0f, 1e3f, "Smoothness", "Smoothness factor", 0.0f, 1.0f);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "quadtri", 0, "Quad/Tri Mode", "Tries to prevent ngons");
 	RNA_def_enum(ot->srna, "quadcorner", prop_mesh_cornervert_types, SUBD_CORNER_STRAIGHT_CUT,
 	             "Quad Corner Type", "How to subdivide quad corners (anything other than Straight Cut will prevent ngons)");
@@ -222,24 +243,36 @@ static void mesh_operator_edgering_props_get(wmOperator *op, struct EdgeRingOpSu
 
 static int edbm_subdivide_edge_ring_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object * *objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 	struct EdgeRingOpSubdProps op_props;
 
 	mesh_operator_edgering_props_get(op, &op_props);
 
-	if (!EDBM_op_callf(
-	            em, op,
-	            "subdivide_edgering edges=%he interp_mode=%i cuts=%i smooth=%f "
-	            "profile_shape=%i profile_shape_factor=%f",
-	            BM_ELEM_SELECT, op_props.interp_mode, op_props.cuts, op_props.smooth,
-	            op_props.profile_shape, op_props.profile_shape_factor))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object * obedit = objects[ob_index];
+		BMEditMesh * em = BKE_editmesh_from_object(obedit);
 
-	EDBM_update_generic(em, true, true);
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
+		if (!EDBM_op_callf(
+		        em, op,
+		        "subdivide_edgering edges=%he interp_mode=%i cuts=%i smooth=%f "
+		        "profile_shape=%i profile_shape_factor=%f",
+		        BM_ELEM_SELECT, op_props.interp_mode, op_props.cuts, op_props.smooth,
+		        op_props.profile_shape, op_props.profile_shape_factor))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -269,27 +302,39 @@ void MESH_OT_subdivide_edgering(wmOperatorType *ot)
 
 static int edbm_unsubdivide_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
-
 	const int iterations = RNA_int_get(op->ptr, "iterations");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	EDBM_op_init(em, &bmop, op,
-	             "unsubdivide verts=%hv iterations=%i", BM_ELEM_SELECT, iterations);
+		if ((em->bm->totvertsel == 0) &&
+		    (em->bm->totedgesel == 0) &&
+		    (em->bm->totfacesel == 0))
+		{
+			continue;
+		}
 
-	BMO_op_exec(em->bm, &bmop);
+		BMOperator bmop;
+		EDBM_op_init(em, &bmop, op,
+	               "unsubdivide verts=%hv iterations=%i", BM_ELEM_SELECT, iterations);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return 0;
-	}
+		BMO_op_exec(em->bm, &bmop);
 
-	if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
-		EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);  /* need to flush vert->face first */
-	}
-	EDBM_selectmode_flush(em);
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
+			EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);  /* need to flush vert->face first */
+		}
+		EDBM_selectmode_flush(em);
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -321,21 +366,22 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em)
 	ED_view3d_init_mats_rv3d(obedit, ar->regiondata);
 
 	struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
-	        CTX_data_main(C), CTX_data_scene(C), 0,
+	        CTX_data_scene(C), CTX_data_depsgraph(C), 0,
 	        ar, CTX_wm_view3d(C));
 
 	BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
 		if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 			float mval[2], co_proj[3];
 			if (ED_view3d_project_float_object(ar, eve->co, mval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-				if (ED_transform_snap_object_project_view3d_mixed(
+				if (ED_transform_snap_object_project_view3d(
 				        snap_context,
-				        SCE_SELECT_FACE,
+				        SCE_SNAP_MODE_FACE,
 				        &(const struct SnapObjectParams){
 				            .snap_select = SNAP_NOT_ACTIVE,
 				            .use_object_edit_cage = false,
+				            .use_occlusion_test = true,
 				        },
-				        mval, NULL, true,
+				        mval, NULL,
 				        co_proj, NULL))
 				{
 					mul_v3_m4v3(eve->co, obedit->imat, co_proj);
@@ -362,52 +408,79 @@ enum {
 	MESH_DELETE_ONLY_FACE = 4,
 };
 
-static void edbm_report_delete_info(ReportList *reports, BMesh *bm, const int totelem[3])
+static void edbm_report_delete_info(ReportList *reports, const int totelem_old[3], const int totelem_new[3])
 {
 	BKE_reportf(reports, RPT_INFO,
 	            "Removed: %d vertices, %d edges, %d faces",
-	            totelem[0] - bm->totvert, totelem[1] - bm->totedge, totelem[2] - bm->totface);
+	            totelem_old[0] - totelem_new[0], totelem_old[1] - totelem_new[1], totelem_old[2] - totelem_new[2]);
 }
 
 static int edbm_delete_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const int type = RNA_enum_get(op->ptr, "type");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	switch (type) {
-		case MESH_DELETE_VERT:
-			if (!EDBM_op_callf(em, op, "delete geom=%hv context=%i", BM_ELEM_SELECT, DEL_VERTS))  /* Erase Vertices */
-				return OPERATOR_CANCELLED;
-			break;
-		case MESH_DELETE_EDGE:
-			if (!EDBM_op_callf(em, op, "delete geom=%he context=%i", BM_ELEM_SELECT, DEL_EDGES))  /* Erase Edges */
-				return OPERATOR_CANCELLED;
-			break;
-		case MESH_DELETE_FACE:
-			if (!EDBM_op_callf(em, op, "delete geom=%hf context=%i", BM_ELEM_SELECT, DEL_FACES))  /* Erase Faces */
-				return OPERATOR_CANCELLED;
-			break;
-		case MESH_DELETE_EDGE_FACE:
-			/* Edges and Faces */
-			if (!EDBM_op_callf(em, op, "delete geom=%hef context=%i", BM_ELEM_SELECT, DEL_EDGESFACES))
-				return OPERATOR_CANCELLED;
-			break;
-		case MESH_DELETE_ONLY_FACE:
-			/* Only faces. */
-			if (!EDBM_op_callf(em, op, "delete geom=%hf context=%i", BM_ELEM_SELECT, DEL_ONLYFACES))
-				return OPERATOR_CANCELLED;
-			break;
-		default:
-			BLI_assert(0);
-			break;
-	}
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	bool changed_multi = false;
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		const int type = RNA_enum_get(op->ptr, "type");
 
-	EDBM_update_generic(em, true, true);
+		switch (type) {
+			case MESH_DELETE_VERT: /* Erase Vertices */
+				if (!(em->bm->totvertsel &&
+				      EDBM_op_callf(em, op, "delete geom=%hv context=%i", BM_ELEM_SELECT, DEL_VERTS)))
+				{
+					continue;
+				}
+				break;
+			case MESH_DELETE_EDGE: /* Erase Edges */
+				if (!(em->bm->totedgesel &&
+				      EDBM_op_callf(em, op, "delete geom=%he context=%i", BM_ELEM_SELECT, DEL_EDGES)))
+				{
+					continue;
+				}
+				break;
+			case MESH_DELETE_FACE: /* Erase Faces */
+				if (!(em->bm->totfacesel &&
+				      EDBM_op_callf(em, op, "delete geom=%hf context=%i", BM_ELEM_SELECT, DEL_FACES)))
+				{
+					continue;
+				}
+				break;
+			case MESH_DELETE_EDGE_FACE:
+				/* Edges and Faces */
+				if (!((em->bm->totedgesel || em->bm->totfacesel) &&
+				      EDBM_op_callf(em, op, "delete geom=%hef context=%i", BM_ELEM_SELECT, DEL_EDGESFACES)))
+				{
+					continue;
+				}
+				break;
+			case MESH_DELETE_ONLY_FACE:
+				/* Only faces. */
+				if (!(em->bm->totfacesel &&
+				      EDBM_op_callf(em, op, "delete geom=%hf context=%i", BM_ELEM_SELECT, DEL_ONLYFACES)))
+				{
+					continue;
+				}
+				break;
+			default:
+				BLI_assert(0);
+				break;
+		}
 
-	return OPERATOR_FINISHED;
+		changed_multi = true;
+
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
+
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void MESH_OT_delete(wmOperatorType *ot)
@@ -462,61 +535,75 @@ static bool bm_face_is_loose(BMFace *f)
 
 static int edbm_delete_loose_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	int totelem_old_sel[3];
+	int totelem_old[3];
 
-	const bool use_verts = (RNA_boolean_get(op->ptr, "use_verts") && bm->totvertsel);
-	const bool use_edges = (RNA_boolean_get(op->ptr, "use_edges") && bm->totedgesel);
-	const bool use_faces = (RNA_boolean_get(op->ptr, "use_faces") && bm->totfacesel);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	const int totelem[3] = {bm->totvert, bm->totedge, bm->totface};
+	EDBM_mesh_stats_multi(objects, objects_len, totelem_old, totelem_old_sel);
 
+	const bool use_verts = (RNA_boolean_get(op->ptr, "use_verts") && totelem_old_sel[0]);
+	const bool use_edges = (RNA_boolean_get(op->ptr, "use_edges") && totelem_old_sel[1]);
+	const bool use_faces = (RNA_boolean_get(op->ptr, "use_faces") && totelem_old_sel[2]);
 
-	BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_TAG, false);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
 
-	if (use_faces) {
-		BMFace *f;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BMIter iter;
+
+		BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_TAG, false);
+
+		if (use_faces) {
+			BMFace *f;
 
-		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
-				BM_elem_flag_set(f, BM_ELEM_TAG, bm_face_is_loose(f));
+			BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+				if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
+					BM_elem_flag_set(f, BM_ELEM_TAG, bm_face_is_loose(f));
+				}
 			}
-		}
 
-		BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_FACES);
-	}
+			BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_FACES);
+		}
 
-	if (use_edges) {
-		BMEdge *e;
+		if (use_edges) {
+			BMEdge *e;
 
-		BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
-				BM_elem_flag_set(e, BM_ELEM_TAG, BM_edge_is_wire(e));
+			BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
+					BM_elem_flag_set(e, BM_ELEM_TAG, BM_edge_is_wire(e));
+				}
 			}
-		}
 
-		BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_EDGES);
-	}
+			BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_EDGES);
+		}
 
-	if (use_verts) {
-		BMVert *v;
+		if (use_verts) {
+			BMVert *v;
 
-		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
-			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
-				BM_elem_flag_set(v, BM_ELEM_TAG, (v->e == NULL));
+			BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
+				if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
+					BM_elem_flag_set(v, BM_ELEM_TAG, (v->e == NULL));
+				}
 			}
+
+			BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_VERTS);
 		}
 
-		BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_VERTS);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	int totelem_new[3];
+	EDBM_mesh_stats_multi(objects, objects_len, totelem_new, NULL);
 
-	EDBM_update_generic(em, true, true);
+	edbm_report_delete_info(op->reports, totelem_old, totelem_new);
 
-	edbm_report_delete_info(op->reports, bm, totelem);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -551,13 +638,24 @@ void MESH_OT_delete_loose(wmOperatorType *ot)
 
 static int edbm_collapse_edge_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (!EDBM_op_callf(em, op, "collapse edges=%he uvs=%b", BM_ELEM_SELECT, true))
-		return OPERATOR_CANCELLED;
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		if (!EDBM_op_callf(em, op, "collapse edges=%he uvs=%b", BM_ELEM_SELECT, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -760,70 +858,83 @@ static void edbm_add_edge_face_exec__tricky_finalize_sel(BMesh *bm, BMElem *ele_
 
 static int edbm_add_edge_face_exec(bContext *C, wmOperator *op)
 {
-	BMOperator bmop;
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const bool use_smooth = edbm_add_edge_face__smooth_get(em->bm);
-	const int totedge_orig = em->bm->totedge;
-	const int totface_orig = em->bm->totface;
 	/* when this is used to dissolve we could avoid this, but checking isnt too slow */
 
-#ifdef USE_FACE_CREATE_SEL_EXTEND
-	BMElem *ele_desel;
-	BMFace *ele_desel_face;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* be extra clever, figure out if a partial selection should be extended so we can create geometry
-	 * with single vert or single edge selection */
-	ele_desel = edbm_add_edge_face_exec__tricky_extend_sel(em->bm);
-#endif
+		if ((em->bm->totvertsel == 0) &&
+		    (em->bm->totedgesel == 0) &&
+		    (em->bm->totvertsel == 0))
+		{
+			continue;
+		}
 
-	if (!EDBM_op_init(
-	            em, &bmop, op,
-	            "contextual_create geom=%hfev mat_nr=%i use_smooth=%b",
-	            BM_ELEM_SELECT, em->mat_nr, use_smooth))
-	{
-		return OPERATOR_CANCELLED;
-	}
+		bool use_smooth = edbm_add_edge_face__smooth_get(em->bm);
+		int totedge_orig = em->bm->totedge;
+		int totface_orig = em->bm->totface;
 
-	BMO_op_exec(em->bm, &bmop);
+		BMOperator bmop;
+#ifdef USE_FACE_CREATE_SEL_EXTEND
+		BMElem *ele_desel;
+		BMFace *ele_desel_face;
 
-	/* cancel if nothing was done */
-	if ((totedge_orig == em->bm->totedge) &&
-	    (totface_orig == em->bm->totface))
-	{
-		EDBM_op_finish(em, &bmop, op, true);
-		return OPERATOR_CANCELLED;
-	}
+		/* be extra clever, figure out if a partial selection should be extended so we can create geometry
+		 * with single vert or single edge selection */
+		ele_desel = edbm_add_edge_face_exec__tricky_extend_sel(em->bm);
+#endif
+		if (!EDBM_op_init(
+		            em, &bmop, op,
+		            "contextual_create geom=%hfev mat_nr=%i use_smooth=%b",
+		            BM_ELEM_SELECT, em->mat_nr, use_smooth))
+		{
+			continue;
+		}
 
+		BMO_op_exec(em->bm, &bmop);
+
+		/* cancel if nothing was done */
+		if ((totedge_orig == em->bm->totedge) &&
+		    (totface_orig == em->bm->totface))
+		{
+			EDBM_op_finish(em, &bmop, op, true);
+			continue;
+		}
 #ifdef USE_FACE_CREATE_SEL_EXTEND
-	/* normally we would want to leave the new geometry selected,
-	 * but being able to press F many times to add geometry is too useful! */
-	if (ele_desel &&
-	    (BMO_slot_buffer_count(bmop.slots_out, "faces.out") == 1) &&
-	    (ele_desel_face = BMO_slot_buffer_get_first(bmop.slots_out, "faces.out")))
-	{
-		edbm_add_edge_face_exec__tricky_finalize_sel(em->bm, ele_desel, ele_desel_face);
-	}
-	else
+		/* normally we would want to leave the new geometry selected,
+		 * but being able to press F many times to add geometry is too useful! */
+		if (ele_desel &&
+		    (BMO_slot_buffer_count(bmop.slots_out, "faces.out") == 1) &&
+		    (ele_desel_face = BMO_slot_buffer_get_first(bmop.slots_out, "faces.out")))
+		{
+			edbm_add_edge_face_exec__tricky_finalize_sel(em->bm, ele_desel, ele_desel_face);
+		}
+		else
 #endif
-	{
-		/* Newly created faces may include existing hidden edges,
-		 * copying face data from surrounding, may have copied hidden face flag too.
-		 *
-		 * Important that faces use flushing since 'edges.out' wont include hidden edges that already existed.
-		 */
-		BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_HIDDEN, true);
-		BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_HIDDEN, false);
+		{
+			/* Newly created faces may include existing hidden edges,
+			 * copying face data from surrounding, may have copied hidden face flag too.
+			 *
+			 * Important that faces use flushing since 'edges.out' wont include hidden edges that already existed.
+			 */
+			BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_HIDDEN, true);
+			BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_HIDDEN, false);
 
-		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
-		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
-	}
+			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
+		}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -852,37 +963,51 @@ void MESH_OT_edge_face_add(wmOperatorType *ot)
 static int edbm_mark_seam_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = ((Mesh *)obedit->data);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	BMEdge *eed;
 	BMIter iter;
 	const bool clear = RNA_boolean_get(op->ptr, "clear");
 
-	/* auto-enable seams drawing */
-	if (clear == 0) {
-		me->drawflag |= ME_DRAWSEAMS;
-	}
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	if (clear) {
-		BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-			if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN))
-				continue;
+		if (bm->totedgesel == 0) {
+			continue;
+		}
 
-			BM_elem_flag_disable(eed, BM_ELEM_SEAM);
+		Mesh *me = ((Mesh *)obedit->data);
+
+		/* auto-enable seams drawing */
+		if (clear == 0) {
+			me->drawflag |= ME_DRAWSEAMS;
 		}
-	}
-	else {
-		BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-			if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN))
-				continue;
-			BM_elem_flag_enable(eed, BM_ELEM_SEAM);
+
+		if (clear) {
+			BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
+				if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+					continue;
+				}
+
+				BM_elem_flag_disable(eed, BM_ELEM_SEAM);
+			}
+		}
+		else {
+			BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
+				if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+					continue;
+				}
+				BM_elem_flag_enable(eed, BM_ELEM_SEAM);
+			}
 		}
-	}
 
-	ED_uvedit_live_unwrap(scene, obedit);
-	EDBM_update_generic(em, true, false);
+		ED_uvedit_live_unwrap(scene, obedit);
+		EDBM_update_generic(em, true, false);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -905,6 +1030,8 @@ void MESH_OT_mark_seam(wmOperatorType *ot)
 
 	prop = RNA_def_boolean(ot->srna, "clear", 0, "Clear", "");
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+
+	WM_operatortype_props_advanced_begin(ot);
 }
 
 /** \} */
@@ -915,34 +1042,45 @@ void MESH_OT_mark_seam(wmOperatorType *ot)
 
 static int edbm_mark_sharp_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = ((Mesh *)obedit->data);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	BMEdge *eed;
 	BMIter iter;
 	const bool clear = RNA_boolean_get(op->ptr, "clear");
 	const bool use_verts = RNA_boolean_get(op->ptr, "use_verts");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	/* auto-enable sharp edge drawing */
-	if (clear == 0) {
-		me->drawflag |= ME_DRAWSHARP;
-	}
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		Mesh *me = ((Mesh *)obedit->data);
 
-	BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-		if (use_verts) {
-			if (!(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) {
+		if (bm->totedgesel == 0) {
+			continue;
+		}
+
+		/* auto-enable sharp edge drawing */
+		if (clear == 0) {
+			me->drawflag |= ME_DRAWSHARP;
+		}
+
+		BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
+			if (use_verts) {
+				if (!(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) {
+					continue;
+				}
+			}
+			else if (!BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 				continue;
 			}
-		}
-		else if (!BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-			continue;
+
+			BM_elem_flag_set(eed, BM_ELEM_SMOOTH, clear);
 		}
 
-		BM_elem_flag_set(eed, BM_ELEM_SMOOTH, clear);
+		EDBM_update_generic(em, true, false);
 	}
-
-	EDBM_update_generic(em, true, false);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -970,17 +1108,22 @@ void MESH_OT_mark_sharp(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
-static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
+static bool edbm_connect_vert_pair(BMEditMesh *em, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMesh *bm = em->bm;
 	BMOperator bmop;
-	bool is_pair = (bm->totvertsel == 2);
+	const int verts_len = bm->totvertsel;
+	bool is_pair = (verts_len == 2);
 	int len = 0;
 	bool check_degenerate = true;
-	const int verts_len = bm->totvertsel;
+
 	BMVert **verts;
+	bool checks_succeded = true;
+
+	/* sanity check */
+	if (!is_pair) {
+		return false;
+	}
 
 	verts = MEM_mallocN(sizeof(*verts) * verts_len, __func__);
 	{
@@ -988,20 +1131,18 @@ static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
 		BMVert *v;
 		int i = 0;
 
-		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
+		BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
 			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 				verts[i++] = v;
 			}
 		}
 
-		if (is_pair) {
-			if (BM_vert_pair_share_face_check_cb(
-			        verts[0], verts[1],
-			        BM_elem_cb_check_hflag_disabled_simple(BMFace *, BM_ELEM_HIDDEN)))
-			{
-				check_degenerate = false;
-				is_pair = false;
-			}
+		if (BM_vert_pair_share_face_check_cb(
+		            verts[0], verts[1],
+		            BM_elem_cb_check_hflag_disabled_simple(BMFace *, BM_ELEM_HIDDEN)))
+		{
+			check_degenerate = false;
+			is_pair = false;
 		}
 	}
 
@@ -1011,7 +1152,7 @@ static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
 		            "connect_vert_pair verts=%eb verts_exclude=%hv faces_exclude=%hf",
 		            verts, verts_len, BM_ELEM_HIDDEN, BM_ELEM_HIDDEN))
 		{
-			goto finally;
+			checks_succeded = false;
 		}
 	}
 	else {
@@ -1020,33 +1161,49 @@ static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
 		            "connect_verts verts=%eb faces_exclude=%hf check_degenerate=%b",
 		            verts, verts_len, BM_ELEM_HIDDEN, check_degenerate))
 		{
-			goto finally;
+			checks_succeded = false;
 		}
 	}
+	if (checks_succeded) {
+		BMO_op_exec(bm, &bmop);
+		len = BMO_slot_get(bmop.slots_out, "edges.out")->len;
 
-	BMO_op_exec(bm, &bmop);
-	len = BMO_slot_get(bmop.slots_out, "edges.out")->len;
-
-	if (len) {
-		if (is_pair) {
+		if (len && is_pair) {
 			/* new verts have been added, we have to select the edges, not just flush */
 			BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
 		}
-	}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		len = 0;
-	}
-	else {
-		EDBM_selectmode_flush(em);  /* so newly created edges get the selection state from the vertex */
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			len = 0;
+		}
+		else {
+			EDBM_selectmode_flush(em);  /* so newly created edges get the selection state from the vertex */
 
-		EDBM_update_generic(em, true, true);
+			EDBM_update_generic(em, true, true);
+		}
 	}
+	MEM_freeN(verts);
 
+	return len;
+}
 
-finally:
-	MEM_freeN(verts);
-	return len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
+static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
+{
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	uint failed_objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (!edbm_connect_vert_pair(em, op)) {
+			failed_objects_len++;
+		}
+	}
+	MEM_freeN(objects);
+	return failed_objects_len == objects_len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void MESH_OT_vert_connect(wmOperatorType *ot)
@@ -1285,43 +1442,66 @@ static bool bm_vert_connect_select_history_edge_to_vert_path(BMesh *bm, ListBase
 
 static int edbm_vert_connect_path_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-	bool is_pair = (em->bm->totvertsel == 2);
-	ListBase selected_orig = {NULL, NULL};
-	int retval;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	uint failed_selection_order_len = 0;
+	uint failed_connect_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* when there is only 2 vertices, we can ignore selection order */
-	if (is_pair) {
-		return edbm_vert_connect_exec(C, op);
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		const bool is_pair = (em->bm->totvertsel == 2);
+		ListBase selected_orig = {NULL, NULL};
 
-	if (bm->selected.first) {
-		BMEditSelection *ese = bm->selected.first;
-		if (ese->htype == BM_EDGE) {
-			if (bm_vert_connect_select_history_edge_to_vert_path(bm, &selected_orig)) {
-				SWAP(ListBase, bm->selected, selected_orig);
+		if (bm->totvertsel == 0) {
+			continue;
+		}
+
+		/* when there is only 2 vertices, we can ignore selection order */
+		if (is_pair) {
+			if (!edbm_connect_vert_pair(em, op)) {
+				failed_connect_len++;
 			}
+			continue;
 		}
-	}
 
-	if (bm_vert_connect_select_history(bm)) {
-		EDBM_selectmode_flush(em);
-		EDBM_update_generic(em, true, true);
-		retval = OPERATOR_FINISHED;
+		if (bm->selected.first) {
+			BMEditSelection *ese = bm->selected.first;
+			if (ese->htype == BM_EDGE) {
+				if (bm_vert_connect_select_history_edge_to_vert_path(bm, &selected_orig)) {
+					SWAP(ListBase, bm->selected, selected_orig);
+				}
+			}
+		}
+
+		if (bm_vert_connect_select_history(bm)) {
+			EDBM_selectmode_flush(em);
+			EDBM_update_generic(em, true, true);
+		}
+		else {
+			failed_selection_order_len++;
+		}
+
+		if (!BLI_listbase_is_empty(&selected_orig)) {
+			BM_select_history_clear(bm);
+			bm->selected = selected_orig;
+		}
 	}
-	else {
+
+	MEM_freeN(objects);
+
+	if (failed_selection_order_len == objects_len) {
 		BKE_report(op->reports, RPT_ERROR, "Invalid selection order");
-		retval = OPERATOR_CANCELLED;
+		return OPERATOR_CANCELLED;
 	}
-
-	if (!BLI_listbase_is_empty(&selected_orig)) {
-		BM_select_history_clear(bm);
-		bm->selected = selected_orig;
+	else if (failed_connect_len == objects_len) {
+		BKE_report(op->reports, RPT_ERROR, "Could not connect vertices");
+		return OPERATOR_CANCELLED;
 	}
 
-	return retval;
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_vert_connect_path(wmOperatorType *ot)
@@ -1341,20 +1521,29 @@ void MESH_OT_vert_connect_path(wmOperatorType *ot)
 
 static int edbm_vert_connect_concave_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (!EDBM_op_call_and_selectf(
-	             em, op,
-	             "faces.out", true,
-	             "connect_verts_concave faces=%hf",
-	             BM_ELEM_SELECT))
-	{
-		return OPERATOR_CANCELLED;
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
+		if (!EDBM_op_call_and_selectf(
+		             em, op,
+		             "faces.out", true,
+		             "connect_verts_concave faces=%hf",
+		             BM_ELEM_SELECT))
+		{
+			continue;
+		}
+		EDBM_update_generic(em, true, true);
+	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -1381,22 +1570,32 @@ void MESH_OT_vert_connect_concave(wmOperatorType *ot)
 
 static int edbm_vert_connect_nonplaner_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const float angle_limit = RNA_float_get(op->ptr, "angle_limit");
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (!EDBM_op_call_and_selectf(
-	             em, op,
-	             "faces.out", true,
-	             "connect_verts_nonplanar faces=%hf angle_limit=%f",
-	             BM_ELEM_SELECT, angle_limit))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_call_and_selectf(
+		            em, op,
+		            "faces.out", true,
+		            "connect_verts_nonplanar faces=%hf angle_limit=%f",
+		            BM_ELEM_SELECT, angle_limit))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
-	EDBM_update_generic(em, true, true);
 	return OPERATOR_FINISHED;
 }
 
@@ -1430,19 +1629,31 @@ void MESH_OT_vert_connect_nonplanar(wmOperatorType *ot)
 
 static int edbm_face_make_planar_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
 	const int repeat = RNA_int_get(op->ptr, "repeat");
 	const float fac = RNA_float_get(op->ptr, "factor");
 
-	if (!EDBM_op_callf(
-	        em, op, "planar_faces faces=%hf iterations=%i factor=%f",
-	        BM_ELEM_SELECT, repeat, fac))
-	{
-		return OPERATOR_CANCELLED;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_callf(
+		            em, op, "planar_faces faces=%hf iterations=%i factor=%f",
+		            BM_ELEM_SELECT, repeat, fac))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
+	MEM_freeN(objects);
 
-	EDBM_update_generic(em, true, true);
 	return OPERATOR_FINISHED;
 }
 
@@ -1473,23 +1684,32 @@ void MESH_OT_face_make_planar(wmOperatorType *ot)
 
 static int edbm_edge_split_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-	if (!EDBM_op_call_and_selectf(
-	        em, op,
-	        "edges.out", false,
-	        "split_edges edges=%he",
-	        BM_ELEM_SELECT))
-	{
-		return OPERATOR_CANCELLED;
-	}
+		if (!EDBM_op_call_and_selectf(
+		            em, op,
+		            "edges.out", false,
+		            "split_edges edges=%he",
+		            BM_ELEM_SELECT))
+		{
+			continue;
+		}
 
-	if (em->selectmode == SCE_SELECT_FACE) {
-		EDBM_select_flush(em);
-	}
+		if (em->selectmode == SCE_SELECT_FACE) {
+			EDBM_select_flush(em);
+		}
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1517,33 +1737,43 @@ void MESH_OT_edge_split(wmOperatorType *ot)
 
 static int edbm_duplicate_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMesh *bm = em->bm;
-	BMOperator bmop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	EDBM_op_init(
-	        em, &bmop, op,
-	        "duplicate geom=%hvef use_select_history=%b",
-	        BM_ELEM_SELECT, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
-	BMO_op_exec(bm, &bmop);
+		BMOperator bmop;
+		BMesh *bm = em->bm;
 
-	/* de-select all would clear otherwise */
-	BM_SELECT_HISTORY_BACKUP(bm);
+		EDBM_op_init(
+		        em, &bmop, op,
+		        "duplicate geom=%hvef use_select_history=%b",
+		        BM_ELEM_SELECT, true);
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BMO_op_exec(bm, &bmop);
 
-	BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
+		/* de-select all would clear otherwise */
+		BM_SELECT_HISTORY_BACKUP(bm);
 
-	/* rebuild editselection */
-	BM_SELECT_HISTORY_RESTORE(bm);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
 
-	EDBM_update_generic(em, true, true);
+		/* rebuild editselection */
+		BM_SELECT_HISTORY_RESTORE(bm);
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1581,18 +1811,29 @@ void MESH_OT_duplicate(wmOperatorType *ot)
  * \{ */
 static int edbm_flip_normals_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	if (!EDBM_op_callf(
-	        em, op, "reverse_faces faces=%hf flip_multires=%b",
-	        BM_ELEM_SELECT, true))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	EDBM_update_generic(em, true, false);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_callf(
+		        em, op, "reverse_faces faces=%hf flip_multires=%b",
+		        BM_ELEM_SELECT, true))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, false);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -1622,71 +1863,99 @@ void MESH_OT_flip_normals(wmOperatorType *ot)
  */
 static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
 	BMEdge *eed;
 	BMIter iter;
 	const bool use_ccw = RNA_boolean_get(op->ptr, "use_ccw");
-	int tot = 0;
 
-	if (em->bm->totedgesel == 0) {
-		BKE_report(op->reports, RPT_ERROR, "Select edges or face pairs for edge loops to rotate about");
-		return OPERATOR_CANCELLED;
-	}
+	int tot_rotate_all = 0, tot_failed_all = 0;
+	bool no_selected_edges = true, invalid_selected_edges = true;
 
-	/* first see if we have two adjacent faces */
-	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		BM_elem_flag_disable(eed, BM_ELEM_TAG);
-		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-			BMFace *fa, *fb;
-			if (BM_edge_face_pair(eed, &fa, &fb)) {
-				/* if both faces are selected we rotate between them,
-				 * otherwise - rotate between 2 unselected - but not mixed */
-				if (BM_elem_flag_test(fa, BM_ELEM_SELECT) == BM_elem_flag_test(fb, BM_ELEM_SELECT)) {
-					BM_elem_flag_enable(eed, BM_ELEM_TAG);
-					tot++;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		int tot = 0;
+
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
+		no_selected_edges = false;
+
+		/* first see if we have two adjacent faces */
+		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+			BM_elem_flag_disable(eed, BM_ELEM_TAG);
+			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
+				BMFace *fa, *fb;
+				if (BM_edge_face_pair(eed, &fa, &fb)) {
+					/* if both faces are selected we rotate between them,
+					 * otherwise - rotate between 2 unselected - but not mixed */
+					if (BM_elem_flag_test(fa, BM_ELEM_SELECT) == BM_elem_flag_test(fb, BM_ELEM_SELECT)) {
+						BM_elem_flag_enable(eed, BM_ELEM_TAG);
+						tot++;
+					}
 				}
 			}
 		}
-	}
 
-	/* ok, we don't have two adjacent faces, but we do have two selected ones.
-	 * that's an error condition.*/
-	if (tot == 0) {
-		BKE_report(op->reports, RPT_ERROR, "Could not find any selected edges that can be rotated");
-		return OPERATOR_CANCELLED;
-	}
+		/* ok, we don't have two adjacent faces, but we do have two selected ones.
+		 * that's an error condition.*/
+		if (tot == 0) {
+			continue;
+		}
+		invalid_selected_edges = false;
 
-	EDBM_op_init(em, &bmop, op, "rotate_edges edges=%he use_ccw=%b", BM_ELEM_TAG, use_ccw);
+		BMOperator bmop;
+		EDBM_op_init(em, &bmop, op, "rotate_edges edges=%he use_ccw=%b", BM_ELEM_TAG, use_ccw);
 
-	/* avoids leaving old verts selected which can be a problem running multiple times,
-	 * since this means the edges become selected around the face which then attempt to rotate */
-	BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_in, "edges", BM_EDGE, BM_ELEM_SELECT, true);
+		/* avoids leaving old verts selected which can be a problem running multiple times,
+		 * since this means the edges become selected around the face which then attempt to rotate */
+		BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_in, "edges", BM_EDGE, BM_ELEM_SELECT, true);
 
-	BMO_op_exec(em->bm, &bmop);
-	/* edges may rotate into hidden vertices, if this does _not_ run we get an ilogical state */
-	BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_HIDDEN, true);
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
+		BMO_op_exec(em->bm, &bmop);
+		/* edges may rotate into hidden vertices, if this does _not_ run we get an ilogical state */
+		BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_HIDDEN, true);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
+
+		const int tot_rotate = BMO_slot_buffer_count(bmop.slots_out, "edges.out");
+		const int tot_failed = tot - tot_rotate;
+
+		tot_rotate_all += tot_rotate;
+		tot_failed_all += tot_failed;
 
-	const int tot_rotate = BMO_slot_buffer_count(bmop.slots_out, "edges.out");
-	const int tot_failed = tot - tot_rotate;
-	if (tot_failed != 0) {
-		/* If some edges fail to rotate, we need to re-select them,
-		 * otherwise we can end up with invalid selection
-		 * (unselected edge between 2 selected faces). */
-		BM_mesh_elem_hflag_enable_test(em->bm, BM_EDGE, BM_ELEM_SELECT, true, false, BM_ELEM_TAG);
+		if (tot_failed != 0) {
+			/* If some edges fail to rotate, we need to re-select them,
+			 * otherwise we can end up with invalid selection
+			 * (unselected edge between 2 selected faces). */
+			BM_mesh_elem_hflag_enable_test(em->bm, BM_EDGE, BM_ELEM_SELECT, true, false, BM_ELEM_TAG);
+		}
+
+		EDBM_selectmode_flush(em);
 
-		BKE_reportf(op->reports, RPT_WARNING, "Unable to rotate %d edge(s)", tot_failed);
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
+	MEM_freeN(objects);
 
-	EDBM_selectmode_flush(em);
+	if (no_selected_edges) {
+		BKE_report(op->reports, RPT_ERROR, "Select edges or face pairs for edge loops to rotate about");
+		return OPERATOR_CANCELLED;
+	}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
+	/* Ok, we don't have two adjacent faces, but we do have two selected ones.
+	 * that's an error condition. */
+	if (invalid_selected_edges) {
+		BKE_report(op->reports, RPT_ERROR, "Could not find any selected edges that can be rotated");
 		return OPERATOR_CANCELLED;
 	}
 
-	EDBM_update_generic(em, true, true);
+	if (tot_failed_all != 0) {
+		BKE_reportf(op->reports, RPT_WARNING, "Unable to rotate %d edge(s)", tot_failed_all);
+	}
 
 	return OPERATOR_FINISHED;
 }
@@ -1717,13 +1986,28 @@ void MESH_OT_edge_rotate(wmOperatorType *ot)
 
 static int edbm_hide_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	EDBM_mesh_hide(em, RNA_boolean_get(op->ptr, "unselected"));
+		if ((bm->totvertsel == 0) &&
+		    (bm->totedgesel == 0) &&
+		    (bm->totfacesel == 0))
+		{
+			continue;
+		}
 
-	EDBM_update_generic(em, true, false);
+		EDBM_mesh_hide(em, unselected);
+		EDBM_update_generic(em, true, false);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -1753,13 +2037,19 @@ void MESH_OT_hide(wmOperatorType *ot)
 
 static int edbm_reveal_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const bool select = RNA_boolean_get(op->ptr, "select");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	EDBM_mesh_reveal(em, select);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	EDBM_update_generic(em, true, false);
+		EDBM_mesh_reveal(em, select);
+		EDBM_update_generic(em, true, false);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1789,19 +2079,28 @@ void MESH_OT_reveal(wmOperatorType *ot)
 
 static int edbm_normals_make_consistent_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	/* doflip has to do with bmesh_rationalize_normals, it's an internal
-	 * thing */
-	if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf", BM_ELEM_SELECT))
-		return OPERATOR_CANCELLED;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (RNA_boolean_get(op->ptr, "inside")) {
-		EDBM_op_callf(em, op, "reverse_faces faces=%hf flip_multires=%b", BM_ELEM_SELECT, true);
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, false);
+		if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf", BM_ELEM_SELECT)) {
+			continue;
+		}
+		if (RNA_boolean_get(op->ptr, "inside")) {
+			EDBM_op_callf(em, op, "reverse_faces faces=%hf flip_multires=%b", BM_ELEM_SELECT, true);
+		}
+
+		EDBM_update_generic(em, true, false);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1831,72 +2130,83 @@ void MESH_OT_normals_make_consistent(wmOperatorType *ot)
 
 static int edbm_do_smooth_vertex_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = obedit->data;
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	ModifierData *md;
-	bool mirrx = false, mirry = false, mirrz = false;
-	int i, repeat;
-	float clip_dist = 0.0f;
 	const float fac = RNA_float_get(op->ptr, "factor");
-	const bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
 
 	const bool xaxis = RNA_boolean_get(op->ptr, "xaxis");
 	const bool yaxis = RNA_boolean_get(op->ptr, "yaxis");
 	const bool zaxis = RNA_boolean_get(op->ptr, "zaxis");
+	int repeat = RNA_int_get(op->ptr, "repeat");
 
-	/* mirror before smooth */
-	if (((Mesh *)obedit->data)->editflag & ME_EDIT_MIRROR_X) {
-		EDBM_verts_mirror_cache_begin(em, 0, false, true, use_topology);
+	if (!repeat) {
+		repeat = 1;
 	}
 
-	/* if there is a mirror modifier with clipping, flag the verts that
-	 * are within tolerance of the plane(s) of reflection
-	 */
-	for (md = obedit->modifiers.first; md; md = md->next) {
-		if (md->type == eModifierType_Mirror && (md->mode & eModifierMode_Realtime)) {
-			MirrorModifierData *mmd = (MirrorModifierData *)md;
-
-			if (mmd->flag & MOD_MIR_CLIPPING) {
-				if (mmd->flag & MOD_MIR_AXIS_X)
-					mirrx = true;
-				if (mmd->flag & MOD_MIR_AXIS_Y)
-					mirry = true;
-				if (mmd->flag & MOD_MIR_AXIS_Z)
-					mirrz = true;
-
-				clip_dist = mmd->tolerance;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Mesh *me = obedit->data;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		ModifierData *md;
+		bool mirrx = false, mirry = false, mirrz = false;
+		int i;
+		float clip_dist = 0.0f;
+		const bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
+
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
+
+		/* mirror before smooth */
+		if (((Mesh *)obedit->data)->editflag & ME_EDIT_MIRROR_X) {
+			EDBM_verts_mirror_cache_begin(em, 0, false, true, use_topology);
+		}
+
+		/* if there is a mirror modifier with clipping, flag the verts that
+		 * are within tolerance of the plane(s) of reflection
+		 */
+		for (md = obedit->modifiers.first; md; md = md->next) {
+			if (md->type == eModifierType_Mirror && (md->mode & eModifierMode_Realtime)) {
+				MirrorModifierData *mmd = (MirrorModifierData *)md;
+
+				if (mmd->flag & MOD_MIR_CLIPPING) {
+					if (mmd->flag & MOD_MIR_AXIS_X)
+						mirrx = true;
+					if (mmd->flag & MOD_MIR_AXIS_Y)
+						mirry = true;
+					if (mmd->flag & MOD_MIR_AXIS_Z)
+						mirrz = true;
+
+					clip_dist = mmd->tolerance;
+				}
 			}
 		}
-	}
 
-	repeat = RNA_int_get(op->ptr, "repeat");
-	if (!repeat)
-		repeat = 1;
+		for (i = 0; i < repeat; i++) {
+			if (!EDBM_op_callf(
+			        em, op,
+			        "smooth_vert verts=%hv factor=%f mirror_clip_x=%b mirror_clip_y=%b mirror_clip_z=%b "
+			        "clip_dist=%f use_axis_x=%b use_axis_y=%b use_axis_z=%b",
+			        BM_ELEM_SELECT, fac, mirrx, mirry, mirrz, clip_dist, xaxis, yaxis, zaxis))
+			{
+				continue;
+			}
+		}
 
-	for (i = 0; i < repeat; i++) {
-		if (!EDBM_op_callf(
-		            em, op,
-		            "smooth_vert verts=%hv factor=%f mirror_clip_x=%b mirror_clip_y=%b mirror_clip_z=%b "
-		            "clip_dist=%f use_axis_x=%b use_axis_y=%b use_axis_z=%b",
-		            BM_ELEM_SELECT, fac, mirrx, mirry, mirrz, clip_dist, xaxis, yaxis, zaxis))
-		{
-			return OPERATOR_CANCELLED;
+		/* apply mirror */
+		if (((Mesh *)obedit->data)->editflag & ME_EDIT_MIRROR_X) {
+			EDBM_verts_mirror_apply(em, BM_ELEM_SELECT, 0);
+			EDBM_verts_mirror_cache_end(em);
 		}
-	}
 
-	/* apply mirror */
-	if (((Mesh *)obedit->data)->editflag & ME_EDIT_MIRROR_X) {
-		EDBM_verts_mirror_apply(em, BM_ELEM_SELECT, 0);
-		EDBM_verts_mirror_cache_end(em);
+		EDBM_update_generic(em, true, false);
 	}
-
-	EDBM_update_generic(em, true, false);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
 
-
 void MESH_OT_vertices_smooth(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -1913,6 +2223,9 @@ void MESH_OT_vertices_smooth(wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "factor", 0.5f, -10.0f, 10.0f, "Smoothing", "Smoothing factor", 0.0f, 1.0f);
 	RNA_def_int(ot->srna, "repeat", 1, 1, 1000, "Repeat", "Number of times to smooth the mesh", 1, 100);
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "xaxis", true, "X-Axis", "Smooth along the X axis");
 	RNA_def_boolean(ot->srna, "yaxis", true, "Y-Axis", "Smooth along the Y axis");
 	RNA_def_boolean(ot->srna, "zaxis", true, "Z-Axis", "Smooth along the Z axis");
@@ -1999,10 +2312,13 @@ void MESH_OT_vertices_smooth_laplacian(wmOperatorType *ot)
 
 	RNA_def_int(ot->srna, "repeat", 1, 1, 1000,
 	            "Number of iterations to smooth the mesh", "", 1, 200);
-	RNA_def_float(ot->srna, "lambda_factor", 5e-5f, 1e-7f, 1000.0f,
+	RNA_def_float(ot->srna, "lambda_factor", 1.0f, 1e-7f, 1000.0f,
 	              "Lambda factor", "", 1e-7f, 1000.0f);
 	RNA_def_float(ot->srna, "lambda_border", 5e-5f, 1e-7f, 1000.0f,
 	              "Lambda factor in border", "", 1e-7f, 1000.0f);
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "use_x", true, "Smooth X Axis", "Smooth object along X axis");
 	RNA_def_boolean(ot->srna, "use_y", true, "Smooth Y Axis", "Smooth object along Y axis");
 	RNA_def_boolean(ot->srna, "use_z", true, "Smooth Z Axis", "Smooth object along Z axis");
@@ -2031,12 +2347,21 @@ static void mesh_set_smooth_faces(BMEditMesh *em, short smooth)
 
 static int edbm_faces_shade_smooth_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer * view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object * *objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object * obedit = objects[ob_index];
+		BMEditMesh * em = BKE_editmesh_from_object(obedit);
 
-	mesh_set_smooth_faces(em, 1);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, false, false);
+		mesh_set_smooth_faces(em, 1);
+		EDBM_update_generic(em, false, false);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -2064,12 +2389,21 @@ void MESH_OT_faces_shade_smooth(wmOperatorType *ot)
 
 static int edbm_faces_shade_flat_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	mesh_set_smooth_faces(em, 0);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, false, false);
+		mesh_set_smooth_faces(em, 0);
+		EDBM_update_generic(em, false, false);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -2097,73 +2431,105 @@ void MESH_OT_faces_shade_flat(wmOperatorType *ot)
 
 static int edbm_rotate_uvs_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMOperator bmop;
-
 	/* get the direction from RNA */
 	const bool use_ccw = RNA_boolean_get(op->ptr, "use_ccw");
 
-	/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
-	EDBM_op_init(em, &bmop, op, "rotate_uvs faces=%hf use_ccw=%b", BM_ELEM_SELECT, use_ccw);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* execute the operator */
-	BMO_op_exec(em->bm, &bmop);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	/* finish the operator */
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		BMOperator bmop;
 
-	EDBM_update_generic(em, false, false);
+		/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
+		EDBM_op_init(em, &bmop, op, "rotate_uvs faces=%hf use_ccw=%b", BM_ELEM_SELECT, use_ccw);
 
+		/* execute the operator */
+		BMO_op_exec(em->bm, &bmop);
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, false, false);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
 static int edbm_reverse_uvs_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMOperator bmop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
-	EDBM_op_init(em, &bmop, op, "reverse_uvs faces=%hf", BM_ELEM_SELECT);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	/* execute the operator */
-	BMO_op_exec(em->bm, &bmop);
+		BMOperator bmop;
 
-	/* finish the operator */
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
+		EDBM_op_init(em, &bmop, op, "reverse_uvs faces=%hf", BM_ELEM_SELECT);
 
-	EDBM_update_generic(em, false, false);
+		/* execute the operator */
+		BMO_op_exec(em->bm, &bmop);
+
+		/* finish the operator */
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+		EDBM_update_generic(em, false, false);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
 static int edbm_rotate_colors_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMOperator bmop;
-
-	/* get the direction from RNA */
+		/* get the direction from RNA */
 	const bool use_ccw = RNA_boolean_get(op->ptr, "use_ccw");
 
-	/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
-	EDBM_op_init(em, &bmop, op, "rotate_colors faces=%hf use_ccw=%b", BM_ELEM_SELECT, use_ccw);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* execute the operator */
-	BMO_op_exec(em->bm, &bmop);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(ob);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	/* finish the operator */
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
+		BMOperator bmop;
+
+		/* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */
+		EDBM_op_init(em, &bmop, op, "rotate_colors faces=%hf use_ccw=%b", BM_ELEM_SELECT, use_ccw);
+
+		/* execute the operator */
+		BMO_op_exec(em->bm, &bmop);
+
+		/* finish the operator */
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		/* dependencies graph and notification stuff */
+		EDBM_update_generic(em, false, false);
 	}
 
-	/* dependencies graph and notification stuff */
-	EDBM_update_generic(em, false, false);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -2326,7 +2692,7 @@ static bool merge_target(
 	const float *vco = NULL;
 
 	if (use_cursor) {
-		vco = ED_view3d_cursor3d_get(scene, v3d);
+		vco = ED_view3d_cursor3d_get(scene, v3d)->location;
 		copy_v3_v3(co, vco);
 		invert_m4_m4(ob->imat, ob->obmat);
 		mul_m4_v3(ob->imat, co);
@@ -2368,44 +2734,60 @@ static int edbm_merge_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 	const int type = RNA_enum_get(op->ptr, "type");
 	const bool uvs = RNA_boolean_get(op->ptr, "uvs");
-	bool ok = false;
 
-	switch (type) {
-		case MESH_MERGE_CENTER:
-			ok = merge_target(em, scene, v3d, obedit, false, uvs, op);
-			break;
-		case MESH_MERGE_CURSOR:
-			ok = merge_target(em, scene, v3d, obedit, true, uvs, op);
-			break;
-		case MESH_MERGE_LAST:
-			ok = merge_firstlast(em, false, uvs, op);
-			break;
-		case MESH_MERGE_FIRST:
-			ok = merge_firstlast(em, true, uvs, op);
-			break;
-		case MESH_MERGE_COLLAPSE:
-			ok = EDBM_op_callf(em, op, "collapse edges=%he uvs=%b", BM_ELEM_SELECT, uvs);
-			break;
-		default:
-			BLI_assert(0);
-			break;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (!ok) {
-		return OPERATOR_CANCELLED;
-	}
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		bool ok = false;
+		switch (type) {
+			case MESH_MERGE_CENTER:
+				ok = merge_target(em, scene, v3d, obedit, false, uvs, op);
+				break;
+			case MESH_MERGE_CURSOR:
+				ok = merge_target(em, scene, v3d, obedit, true, uvs, op);
+				break;
+			case MESH_MERGE_LAST:
+				ok = merge_firstlast(em, false, uvs, op);
+				break;
+			case MESH_MERGE_FIRST:
+				ok = merge_firstlast(em, true, uvs, op);
+				break;
+			case MESH_MERGE_COLLAPSE:
+				ok = EDBM_op_callf(em, op, "collapse edges=%he uvs=%b", BM_ELEM_SELECT, uvs);
+				break;
+			default:
+				BLI_assert(0);
+				break;
+		}
 
-	/* once collapsed, we can't have edge/face selection */
-	if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
-		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		if (!ok) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+
+		/* once collapsed, we can't have edge/face selection */
+		if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
+			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		}
+		/* Only active object supported, see comment below. */
+		if (ELEM(type, MESH_MERGE_FIRST, MESH_MERGE_LAST)) {
+			break;
+		}
 	}
 
+	MEM_freeN(objects);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -2431,6 +2813,10 @@ static const EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED(
 	if (obedit && obedit->type == OB_MESH) {
 		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
+		/* Only active object supported:
+		 * In practice it doesn't make sense to run this operation on non-active meshes
+		 * since selecting will activate - we could have own code-path for these but it's a hassle
+		 * for now just apply to the active (first) object. */
 		if (em->selectmode & SCE_SELECT_VERTEX) {
 			if (em->bm->selected.first && em->bm->selected.last &&
 			    ((BMEditSelection *)em->bm->selected.first)->htype == BM_VERT &&
@@ -2478,6 +2864,9 @@ void MESH_OT_merge(wmOperatorType *ot)
 	/* properties */
 	ot->prop = RNA_def_enum(ot->srna, "type", merge_type_items, MESH_MERGE_CENTER, "Type", "Merge method to use");
 	RNA_def_enum_funcs(ot->prop, merge_type_itemf);
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "uvs", false, "UVs", "Move UVs according to merge");
 }
 
@@ -2489,60 +2878,79 @@ void MESH_OT_merge(wmOperatorType *ot)
 
 static int edbm_remove_doubles_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
 	const float threshold = RNA_float_get(op->ptr, "threshold");
 	const bool use_unselected = RNA_boolean_get(op->ptr, "use_unselected");
-	const int totvert_orig = em->bm->totvert;
-	int count;
-	char htype_select;
+	int count_multi = 0;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	/* avoid loosing selection state (select -> tags) */
-	if      (em->selectmode & SCE_SELECT_VERTEX) htype_select = BM_VERT;
-	else if (em->selectmode & SCE_SELECT_EDGE)   htype_select = BM_EDGE;
-	else                                         htype_select = BM_FACE;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* store selection as tags */
-	BM_mesh_elem_hflag_enable_test(em->bm, htype_select, BM_ELEM_TAG, true, true, BM_ELEM_SELECT);
+		/* Selection used as target with 'use_unselected'. */
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
+		BMOperator bmop;
+		const int totvert_orig = em->bm->totvert;
 
-	if (use_unselected) {
-		EDBM_op_init(
-		        em, &bmop, op,
-		        "automerge verts=%hv dist=%f",
-		        BM_ELEM_SELECT, threshold);
-		BMO_op_exec(em->bm, &bmop);
+		/* avoid loosing selection state (select -> tags) */
+		char htype_select;
+		if      (em->selectmode & SCE_SELECT_VERTEX) htype_select = BM_VERT;
+		else if (em->selectmode & SCE_SELECT_EDGE)   htype_select = BM_EDGE;
+		else                                         htype_select = BM_FACE;
 
-		if (!EDBM_op_finish(em, &bmop, op, true)) {
-			return OPERATOR_CANCELLED;
-		}
-	}
-	else {
-		EDBM_op_init(
-		        em, &bmop, op,
-		        "find_doubles verts=%hv dist=%f",
-		        BM_ELEM_SELECT, threshold);
-		BMO_op_exec(em->bm, &bmop);
+		/* store selection as tags */
+		BM_mesh_elem_hflag_enable_test(em->bm, htype_select, BM_ELEM_TAG, true, true, BM_ELEM_SELECT);
 
-		if (!EDBM_op_callf(em, op, "weld_verts targetmap=%S", &bmop, "targetmap.out")) {
-			BMO_op_finish(em->bm, &bmop);
-			return OPERATOR_CANCELLED;
+
+		if (use_unselected) {
+			EDBM_op_init(
+			        em, &bmop, op,
+			        "automerge verts=%hv dist=%f",
+			        BM_ELEM_SELECT, threshold);
+			BMO_op_exec(em->bm, &bmop);
+
+			if (!EDBM_op_finish(em, &bmop, op, true)) {
+				continue;
+			}
 		}
+		else {
+			EDBM_op_init(
+			        em, &bmop, op,
+			        "find_doubles verts=%hv dist=%f",
+			        BM_ELEM_SELECT, threshold);
 
-		if (!EDBM_op_finish(em, &bmop, op, true)) {
-			return OPERATOR_CANCELLED;
+			BMO_op_exec(em->bm, &bmop);
+
+			if (!EDBM_op_callf(em, op, "weld_verts targetmap=%S", &bmop, "targetmap.out")) {
+				BMO_op_finish(em->bm, &bmop);
+				continue;
+			}
+
+			if (!EDBM_op_finish(em, &bmop, op, true)) {
+				continue;
+			}
 		}
-	}
 
-	count = totvert_orig - em->bm->totvert;
-	BKE_reportf(op->reports, RPT_INFO, "Removed %d vertices", count);
+		const int count = (totvert_orig - em->bm->totvert);
 
-	/* restore selection from tags */
-	BM_mesh_elem_hflag_enable_test(em->bm, htype_select, BM_ELEM_SELECT, true, true, BM_ELEM_TAG);
-	EDBM_selectmode_flush(em);
+		/* restore selection from tags */
+		BM_mesh_elem_hflag_enable_test(em->bm, htype_select, BM_ELEM_SELECT, true, true, BM_ELEM_TAG);
+		EDBM_selectmode_flush(em);
 
-	EDBM_update_generic(em, true, true);
+		if (count) {
+			count_multi += count;
+			EDBM_update_generic(em, true, true);
+		}
+	}
+	MEM_freeN(objects);
+
+	BKE_reportf(op->reports, RPT_INFO, "Removed %d vertices", count_multi);
 
 	return OPERATOR_FINISHED;
 }
@@ -2599,7 +3007,7 @@ static void shape_propagate(BMEditMesh *em, wmOperator *op)
 	//TAG Mesh Objects that share this data
 	for (base = scene->base.first; base; base = base->next) {
 		if (base->object && base->object->data == me) {
-			DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 		}
 	}
 #endif
@@ -2779,39 +3187,48 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot)
 
 static int edbm_solidify_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = obedit->data;
-	BMEditMesh *em = me->edit_btmesh;
-	BMesh *bm = em->bm;
-	BMOperator bmop;
-
 	const float thickness = RNA_float_get(op->ptr, "thickness");
 
-	if (!EDBM_op_init(em, &bmop, op, "solidify geom=%hf thickness=%f", BM_ELEM_SELECT, thickness)) {
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	/* deselect only the faces in the region to be solidified (leave wire
-	 * edges and loose verts selected, as there will be no corresponding
-	 * geometry selected below) */
-	BMO_slot_buffer_hflag_disable(bm, bmop.slots_in, "geom", BM_FACE, BM_ELEM_SELECT, true);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	/* run the solidify operator */
-	BMO_op_exec(bm, &bmop);
+		BMOperator bmop;
 
-	/* select the newly generated faces */
-	BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
+		if (!EDBM_op_init(em, &bmop, op, "solidify geom=%hf thickness=%f", BM_ELEM_SELECT, thickness)) {
+			continue;
+		}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		/* deselect only the faces in the region to be solidified (leave wire
+		 * edges and loose verts selected, as there will be no corresponding
+		 * geometry selected below) */
+		BMO_slot_buffer_hflag_disable(bm, bmop.slots_in, "geom", BM_FACE, BM_ELEM_SELECT, true);
 
-	EDBM_update_generic(em, true, true);
+		/* run the solidify operator */
+		BMO_op_exec(bm, &bmop);
+
+		/* select the newly generated faces */
+		BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
 
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
-
 void MESH_OT_solidify(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
@@ -3184,7 +3601,7 @@ enum {
 	MESH_SEPARATE_LOOSE    = 2,
 };
 
-static Base *mesh_separate_tagged(Main *bmain, Scene *scene, Base *base_old, BMesh *bm_old)
+static Base *mesh_separate_tagged(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base_old, BMesh *bm_old)
 {
 	Base *base_new;
 	Object *obedit = base_old->object;
@@ -3205,11 +3622,11 @@ static Base *mesh_separate_tagged(Main *bmain, Scene *scene, Base *base_old, BMe
 	CustomData_bmesh_init_pool(&bm_new->ldata, bm_mesh_allocsize_default.totloop, BM_LOOP);
 	CustomData_bmesh_init_pool(&bm_new->pdata, bm_mesh_allocsize_default.totface, BM_FACE);
 
-	base_new = ED_object_add_duplicate(bmain, scene, base_old, USER_DUP_MESH);
+	base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, USER_DUP_MESH);
 	/* DAG_relations_tag_update(bmain); */ /* normally would call directly after but in this case delay recalc */
 	assign_matarar(bmain, base_new->object, give_matarar(obedit), *give_totcolp(obedit)); /* new in 2.5 */
 
-	ED_base_object_select(base_new, BA_SELECT);
+	ED_object_base_select(base_new, BA_SELECT);
 
 	BMO_op_callf(bm_old, (BMO_FLAG_DEFAULTS & ~BMO_FLAG_RESPECT_HIDE),
 	             "duplicate geom=%hvef dest=%p", BM_ELEM_TAG, bm_new);
@@ -3231,7 +3648,7 @@ static Base *mesh_separate_tagged(Main *bmain, Scene *scene, Base *base_old, BMe
 	return base_new;
 }
 
-static bool mesh_separate_selected(Main *bmain, Scene *scene, Base *base_old, BMesh *bm_old)
+static bool mesh_separate_selected(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base_old, BMesh *bm_old)
 {
 	/* we may have tags from previous operators */
 	BM_mesh_elem_hflag_disable_all(bm_old, BM_FACE | BM_EDGE | BM_VERT, BM_ELEM_TAG, false);
@@ -3239,7 +3656,7 @@ static bool mesh_separate_selected(Main *bmain, Scene *scene, Base *base_old, BM
 	/* sel -> tag */
 	BM_mesh_elem_hflag_enable_test(bm_old, BM_FACE | BM_EDGE | BM_VERT, BM_ELEM_TAG, true, false, BM_ELEM_SELECT);
 
-	return (mesh_separate_tagged(bmain, scene, base_old, bm_old) != NULL);
+	return (mesh_separate_tagged(bmain, scene, view_layer, base_old, bm_old) != NULL);
 }
 
 /* flush a hflag to from verts to edges/faces */
@@ -3338,7 +3755,7 @@ static void mesh_separate_material_assign_mat_nr(Main *bmain, Object *ob, const
 	}
 }
 
-static bool mesh_separate_material(Main *bmain, Scene *scene, Base *base_old, BMesh *bm_old)
+static bool mesh_separate_material(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base_old, BMesh *bm_old)
 {
 	BMFace *f_cmp, *f;
 	BMIter iter;
@@ -3379,7 +3796,7 @@ static bool mesh_separate_material(Main *bmain, Scene *scene, Base *base_old, BM
 		}
 
 		/* Move selection into a separate object */
-		base_new = mesh_separate_tagged(bmain, scene, base_old, bm_old);
+		base_new = mesh_separate_tagged(bmain, scene, view_layer, base_old, bm_old);
 		if (base_new) {
 			mesh_separate_material_assign_mat_nr(bmain, base_new->object, mat_nr);
 		}
@@ -3390,7 +3807,7 @@ static bool mesh_separate_material(Main *bmain, Scene *scene, Base *base_old, BM
 	return result;
 }
 
-static bool mesh_separate_loose(Main *bmain, Scene *scene, Base *base_old, BMesh *bm_old)
+static bool mesh_separate_loose(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base_old, BMesh *bm_old)
 {
 	int i;
 	BMEdge *e;
@@ -3443,7 +3860,7 @@ static bool mesh_separate_loose(Main *bmain, Scene *scene, Base *base_old, BMesh
 		bm_mesh_hflag_flush_vert(bm_old, BM_ELEM_TAG);
 
 		/* Move selection into a separate object */
-		result |= (mesh_separate_tagged(bmain, scene, base_old, bm_old) != NULL);
+		result |= (mesh_separate_tagged(bmain, scene, view_layer, base_old, bm_old) != NULL);
 	}
 
 	return result;
@@ -3453,42 +3870,52 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const int type = RNA_enum_get(op->ptr, "type");
 	int retval = 0;
 
 	if (ED_operator_editmesh(C)) {
-		Base *base = CTX_data_active_base(C);
-		BMEditMesh *em = BKE_editmesh_from_object(base->object);
-
-		if (type == 0) {
-			if ((em->bm->totvertsel == 0) &&
-			    (em->bm->totedgesel == 0) &&
-			    (em->bm->totfacesel == 0))
-			{
-				BKE_report(op->reports, RPT_ERROR, "Nothing selected");
-				return OPERATOR_CANCELLED;
+		uint bases_len = 0;
+		uint empty_selection_len = 0;
+		Base **bases = BKE_view_layer_array_from_bases_in_edit_mode_unique_data(view_layer, &bases_len);
+		for (uint bs_index = 0; bs_index < bases_len; bs_index++) {
+			Base *base = bases[bs_index];
+			BMEditMesh *em = BKE_editmesh_from_object(base->object);
+
+			if (type == 0) {
+				if ((em->bm->totvertsel == 0) &&
+				    (em->bm->totedgesel == 0) &&
+				    (em->bm->totfacesel == 0))
+				{
+					/* when all objects has no selection */
+					if (++empty_selection_len == bases_len) {
+						BKE_report(op->reports, RPT_ERROR, "Nothing selected");
+					}
+					continue;
+				}
 			}
-		}
 
-		/* editmode separate */
-		switch (type) {
-			case MESH_SEPARATE_SELECTED:
-				retval = mesh_separate_selected(bmain, scene, base, em->bm);
-				break;
-			case MESH_SEPARATE_MATERIAL:
-				retval = mesh_separate_material(bmain, scene, base, em->bm);
-				break;
-			case MESH_SEPARATE_LOOSE:
-				retval = mesh_separate_loose(bmain, scene, base, em->bm);
-				break;
-			default:
-				BLI_assert(0);
-				break;
-		}
+			/* editmode separate */
+			switch (type) {
+				case MESH_SEPARATE_SELECTED:
+					retval = mesh_separate_selected(bmain, scene, view_layer, base, em->bm);
+					break;
+				case MESH_SEPARATE_MATERIAL:
+					retval = mesh_separate_material(bmain, scene, view_layer, base, em->bm);
+					break;
+				case MESH_SEPARATE_LOOSE:
+					retval = mesh_separate_loose(bmain, scene, view_layer, base, em->bm);
+					break;
+				default:
+					BLI_assert(0);
+					break;
+			}
 
-		if (retval) {
-			EDBM_update_generic(em, true, true);
+			if (retval) {
+				EDBM_update_generic(em, true, true);
+			}
 		}
+		MEM_freeN(bases);
 	}
 	else {
 		if (type == MESH_SEPARATE_SELECTED) {
@@ -3514,10 +3941,10 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 
 					switch (type) {
 						case MESH_SEPARATE_MATERIAL:
-							retval_iter = mesh_separate_material(bmain, scene, base_iter, bm_old);
+							retval_iter = mesh_separate_material(bmain, scene, view_layer, base_iter, bm_old);
 							break;
 						case MESH_SEPARATE_LOOSE:
-							retval_iter = mesh_separate_loose(bmain, scene, base_iter, bm_old);
+							retval_iter = mesh_separate_loose(bmain, scene, view_layer, base_iter, bm_old);
 							break;
 						default:
 							BLI_assert(0);
@@ -3531,7 +3958,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 						            .calc_object_remap = true,
 						        }));
 
-						DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&me->id, OB_RECALC_DATA);
 						WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 					}
 
@@ -3546,7 +3973,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 
 	if (retval) {
 		/* delay depsgraph recalc until all objects are duplicated */
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
 
 		return OPERATOR_FINISHED;
@@ -3588,45 +4015,64 @@ void MESH_OT_separate(wmOperatorType *ot)
 
 static int edbm_fill_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const bool use_beauty = RNA_boolean_get(op->ptr, "use_beauty");
-	BMOperator bmop;
-	const int totface_orig = em->bm->totface;
-	int ret;
 
-	if (em->bm->totedgesel == 0) {
-		BKE_report(op->reports, RPT_WARNING, "No edges selected");
-		return OPERATOR_CANCELLED;
-	}
+	bool has_selected_edges = false, has_faces_filled = false;
 
-	if (!EDBM_op_init(em, &bmop, op,
-	                  "triangle_fill edges=%he use_beauty=%b",
-	                  BM_ELEM_SELECT, use_beauty))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	BMO_op_exec(em->bm, &bmop);
+		const int totface_orig = em->bm->totface;
+
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
+		has_selected_edges = true;
+
+		BMOperator bmop;
+		if (!EDBM_op_init(
+		            em, &bmop, op,
+		            "triangle_fill edges=%he use_beauty=%b",
+		            BM_ELEM_SELECT, use_beauty))
+		{
+			continue;
+		}
+
+		BMO_op_exec(em->bm, &bmop);
+
+		/* cancel if nothing was done */
+		if (totface_orig == em->bm->totface) {
+			EDBM_op_finish(em, &bmop, op, true);
+			continue;
+		}
+		has_faces_filled = true;
 
-	if (totface_orig != em->bm->totface) {
 		/* select new geometry */
 		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, BM_ELEM_SELECT, true);
 
-		EDBM_update_generic(em, true, true);
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-		ret = OPERATOR_FINISHED;
+		EDBM_update_generic(em, true, true);
 	}
-	else {
-		BKE_report(op->reports, RPT_WARNING, "No faces filled");
-		ret = OPERATOR_CANCELLED;
+	MEM_freeN(objects);
+
+	if (!has_selected_edges) {
+		BKE_report(op->reports, RPT_ERROR, "No edges selected");
+		return OPERATOR_CANCELLED;
 	}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		ret = OPERATOR_CANCELLED;
+	if (!has_faces_filled) {
+		BKE_report(op->reports, RPT_WARNING, "No faces filled");
+		return OPERATOR_CANCELLED;
 	}
 
-	return ret;
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_fill(wmOperatorType *ot)
@@ -3800,73 +4246,91 @@ static void edbm_fill_grid_prepare(BMesh *bm, int offset, int *r_span, bool span
 
 static int edbm_fill_grid_exec(bContext *C, wmOperator *op)
 {
-	BMOperator bmop;
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const bool use_smooth = edbm_add_edge_face__smooth_get(em->bm);
-	const int totedge_orig = em->bm->totedge;
-	const int totface_orig = em->bm->totface;
-	const bool use_interp_simple = RNA_boolean_get(op->ptr, "use_interp_simple");
 	const bool use_prepare = true;
+	const bool use_interp_simple = RNA_boolean_get(op->ptr, "use_interp_simple");
 
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
 
-	if (use_prepare) {
-		/* use when we have a single loop selected */
-		PropertyRNA *prop_span = RNA_struct_find_property(op->ptr, "span");
-		PropertyRNA *prop_offset = RNA_struct_find_property(op->ptr, "offset");
-		bool calc_span;
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		const int clamp = em->bm->totvertsel;
-		int span;
-		int offset;
+		const bool use_smooth = edbm_add_edge_face__smooth_get(em->bm);
+		const int totedge_orig = em->bm->totedge;
+		const int totface_orig = em->bm->totface;
 
-		if (RNA_property_is_set(op->ptr, prop_span)) {
-			span = RNA_property_int_get(op->ptr, prop_span);
-			span = min_ii(span, (clamp / 2) - 1);
-			calc_span = false;
-		}
-		else {
-			span = clamp / 4;
-			calc_span = true;
+		if (em->bm->totedgesel == 0) {
+			continue;
 		}
 
-		offset = RNA_property_int_get(op->ptr, prop_offset);
-		offset = clamp ? mod_i(offset, clamp) : 0;
+		if (use_prepare) {
+			/* use when we have a single loop selected */
+			PropertyRNA *prop_span = RNA_struct_find_property(op->ptr, "span");
+			PropertyRNA *prop_offset = RNA_struct_find_property(op->ptr, "offset");
+			bool calc_span;
 
-		/* in simple cases, move selection for tags, but also support more advanced cases */
-		edbm_fill_grid_prepare(em->bm, offset, &span, calc_span);
+			const int clamp = em->bm->totvertsel;
+			int span;
+			int offset;
 
-		RNA_property_int_set(op->ptr, prop_span, span);
-	}
-	/* end tricky prepare code */
+			if (RNA_property_is_set(op->ptr, prop_span)) {
+				span = RNA_property_int_get(op->ptr, prop_span);
+				span = min_ii(span, (clamp / 2) - 1);
+				calc_span = false;
+			}
+			else {
+				span = clamp / 4;
+				calc_span = true;
+			}
 
+			offset = RNA_property_int_get(op->ptr, prop_offset);
+			offset = clamp ? mod_i(offset, clamp) : 0;
 
-	if (!EDBM_op_init(
-	            em, &bmop, op,
-	            "grid_fill edges=%he mat_nr=%i use_smooth=%b use_interp_simple=%b",
-	            use_prepare ? BM_ELEM_TAG : BM_ELEM_SELECT,
-	            em->mat_nr, use_smooth, use_interp_simple))
-	{
-		return OPERATOR_CANCELLED;
-	}
+			/* in simple cases, move selection for tags, but also support more advanced cases */
+			edbm_fill_grid_prepare(em->bm, offset, &span, calc_span);
 
-	BMO_op_exec(em->bm, &bmop);
+			RNA_property_int_set(op->ptr, prop_span, span);
+		}
+		/* end tricky prepare code */
 
-	/* cancel if nothing was done */
-	if ((totedge_orig == em->bm->totedge) &&
-	    (totface_orig == em->bm->totface))
-	{
-		EDBM_op_finish(em, &bmop, op, true);
-		return OPERATOR_CANCELLED;
-	}
+		BMOperator bmop;
+		if (!EDBM_op_init(
+		            em, &bmop, op,
+		            "grid_fill edges=%he mat_nr=%i use_smooth=%b use_interp_simple=%b",
+		            use_prepare ? BM_ELEM_TAG : BM_ELEM_SELECT,
+		            em->mat_nr, use_smooth, use_interp_simple))
+		{
+			continue;
+		}
 
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		BMO_op_exec(em->bm, &bmop);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
+		/* NOTE: EDBM_op_finish() will change bmesh pointer inside of edit mesh,
+		 * so need to tell evaluated objects to sync new bmesh pointer to their
+		 * edit mesh structures.
+		 */
+		DEG_id_tag_update(&obedit->id, 0);
+
+		/* cancel if nothing was done */
+		if ((totedge_orig == em->bm->totedge) &&
+		    (totface_orig == em->bm->totface))
+		{
+			EDBM_op_finish(em, &bmop, op, true);
+			continue;
+		}
+
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -3903,20 +4367,32 @@ void MESH_OT_fill_grid(wmOperatorType *ot)
 
 static int edbm_fill_holes_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const int sides = RNA_int_get(op->ptr, "sides");
 
-	if (!EDBM_op_call_and_selectf(
-	        em, op,
-	        "faces.out", true,
-	        "holes_fill edges=%he sides=%i",
-	        BM_ELEM_SELECT, sides))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	EDBM_update_generic(em, true, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_call_and_selectf(
+		            em, op,
+		            "faces.out", true,
+		            "holes_fill edges=%he sides=%i",
+		            BM_ELEM_SELECT, sides))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 
@@ -3948,40 +4424,51 @@ void MESH_OT_fill_holes(wmOperatorType *ot)
 
 static int edbm_beautify_fill_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
 	const float angle_max = M_PI;
 	const float angle_limit = RNA_float_get(op->ptr, "angle_limit");
 	char hflag;
 
-	if (angle_limit >= angle_max) {
-		hflag = BM_ELEM_SELECT;
-	}
-	else {
-		BMIter iter;
-		BMEdge *e;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-			BM_elem_flag_set(
-			        e, BM_ELEM_TAG,
-			        (BM_elem_flag_test(e, BM_ELEM_SELECT) &&
-			         BM_edge_calc_face_angle_ex(e, angle_max) < angle_limit));
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
+		if (angle_limit >= angle_max) {
+			hflag = BM_ELEM_SELECT;
 		}
+		else {
+			BMIter iter;
+			BMEdge *e;
 
-		hflag = BM_ELEM_TAG;
-	}
+			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+				BM_elem_flag_set(
+				        e, BM_ELEM_TAG,
+				        (BM_elem_flag_test(e, BM_ELEM_SELECT) &&
+				         BM_edge_calc_face_angle_ex(e, angle_max) < angle_limit));
 
-	if (!EDBM_op_call_and_selectf(
-	        em, op, "geom.out", true,
-	        "beautify_fill faces=%hf edges=%he",
-	        BM_ELEM_SELECT, hflag))
-	{
-		return OPERATOR_CANCELLED;
+			}
+			hflag = BM_ELEM_TAG;
+		}
+
+		if (!EDBM_op_call_and_selectf(
+		        em, op, "geom.out", true,
+		        "beautify_fill faces=%hf edges=%he",
+		        BM_ELEM_SELECT, hflag))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4016,30 +4503,40 @@ void MESH_OT_beautify_fill(wmOperatorType *ot)
 
 static int edbm_poke_face_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
-
 	const float offset = RNA_float_get(op->ptr, "offset");
 	const bool use_relative_offset = RNA_boolean_get(op->ptr, "use_relative_offset");
 	const int center_mode = RNA_enum_get(op->ptr, "center_mode");
 
-	EDBM_op_init(em, &bmop, op, "poke faces=%hf offset=%f use_relative_offset=%b center_mode=%i",
-	             BM_ELEM_SELECT, offset, use_relative_offset, center_mode);
-	BMO_op_exec(em->bm, &bmop);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "verts.out", BM_VERT, BM_ELEM_SELECT, true);
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		BMOperator bmop;
+		EDBM_op_init(em, &bmop, op, "poke faces=%hf offset=%f use_relative_offset=%b center_mode=%i",
+		             BM_ELEM_SELECT, offset, use_relative_offset, center_mode);
+		BMO_op_exec(em->bm, &bmop);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	EDBM_mesh_normals_update(em);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "verts.out", BM_VERT, BM_ELEM_SELECT, true);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
 
-	EDBM_update_generic(em, true, true);
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_mesh_normals_update(em);
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 
@@ -4080,32 +4577,48 @@ void MESH_OT_poke(wmOperatorType *ot)
 
 static int edbm_quads_convert_to_tris_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
 	const int quad_method = RNA_enum_get(op->ptr, "quad_method");
 	const int ngon_method = RNA_enum_get(op->ptr, "ngon_method");
-	BMOIter oiter;
-	BMFace *f;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	EDBM_op_init(em, &bmop, op, "triangulate faces=%hf quad_method=%i ngon_method=%i", BM_ELEM_SELECT, quad_method, ngon_method);
-	BMO_op_exec(em->bm, &bmop);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* select the output */
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	/* remove the doubles */
-	BMO_ITER (f, &oiter, bmop.slots_out, "face_map_double.out", BM_FACE) {
-		BM_face_kill(em->bm, f);
-	}
+		BMOperator bmop;
+		BMOIter oiter;
+		BMFace *f;
 
-	EDBM_selectmode_flush(em);
+		EDBM_op_init(
+		        em, &bmop, op,
+		        "triangulate faces=%hf quad_method=%i ngon_method=%i",
+		        BM_ELEM_SELECT, quad_method, ngon_method);
+		BMO_op_exec(em->bm, &bmop);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
+		/* select the output */
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+
+		/* remove the doubles */
+		BMO_ITER (f, &oiter, bmop.slots_out, "face_map_double.out", BM_FACE) {
+			BM_face_kill(em->bm, f);
+		}
+
+		EDBM_selectmode_flush(em);
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4139,52 +4652,69 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot)
 
 static int edbm_tris_convert_to_quads_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	bool do_seam, do_sharp, do_uvs, do_vcols, do_materials;
-	float angle_face_threshold, angle_shape_threshold;
-	PropertyRNA *prop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	/* When joining exactly 2 faces, no limit.
-	 * this is useful for one off joins while editing. */
-	prop = RNA_struct_find_property(op->ptr, "face_threshold");
-	if ((em->bm->totfacesel == 2) &&
-	    (RNA_property_is_set(op->ptr, prop) == false))
-	{
-		angle_face_threshold = DEG2RADF(180.0f);
-	}
-	else {
-		angle_face_threshold = RNA_property_float_get(op->ptr, prop);
-	}
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	bool is_face_pair;
 
-	prop = RNA_struct_find_property(op->ptr, "shape_threshold");
-	if ((em->bm->totfacesel == 2) &&
-	    (RNA_property_is_set(op->ptr, prop) == false))
-	{
-		angle_shape_threshold = DEG2RADF(180.0f);
-	}
-	else {
-		angle_shape_threshold = RNA_property_float_get(op->ptr, prop);
-	}
-
-	do_seam = RNA_boolean_get(op->ptr, "seam");
-	do_sharp = RNA_boolean_get(op->ptr, "sharp");
-	do_uvs = RNA_boolean_get(op->ptr, "uvs");
-	do_vcols = RNA_boolean_get(op->ptr, "vcols");
-	do_materials = RNA_boolean_get(op->ptr, "materials");
-
-	if (!EDBM_op_call_and_selectf(
-	        em, op,
-	        "faces.out", true,
-	        "join_triangles faces=%hf angle_face_threshold=%f angle_shape_threshold=%f "
-	        "cmp_seam=%b cmp_sharp=%b cmp_uvs=%b cmp_vcols=%b cmp_materials=%b",
-	        BM_ELEM_SELECT, angle_face_threshold, angle_shape_threshold,
-	        do_seam, do_sharp, do_uvs, do_vcols, do_materials))
 	{
-		return OPERATOR_CANCELLED;
+		int totelem_sel[3];
+		EDBM_mesh_stats_multi(objects, objects_len, NULL, totelem_sel);
+		is_face_pair = (totelem_sel[2] == 2);
 	}
 
-	EDBM_update_generic(em, true, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		bool do_seam, do_sharp, do_uvs, do_vcols, do_materials;
+		float angle_face_threshold, angle_shape_threshold;
+		PropertyRNA *prop;
+
+		/* When joining exactly 2 faces, no limit.
+		 * this is useful for one off joins while editing. */
+		prop = RNA_struct_find_property(op->ptr, "face_threshold");
+		if (is_face_pair &&
+		    (RNA_property_is_set(op->ptr, prop) == false))
+		{
+			angle_face_threshold = DEG2RADF(180.0f);
+		}
+		else {
+			angle_face_threshold = RNA_property_float_get(op->ptr, prop);
+		}
+
+		prop = RNA_struct_find_property(op->ptr, "shape_threshold");
+		if (is_face_pair &&
+		    (RNA_property_is_set(op->ptr, prop) == false))
+		{
+			angle_shape_threshold = DEG2RADF(180.0f);
+		}
+		else {
+			angle_shape_threshold = RNA_property_float_get(op->ptr, prop);
+		}
+
+		do_seam = RNA_boolean_get(op->ptr, "seam");
+		do_sharp = RNA_boolean_get(op->ptr, "sharp");
+		do_uvs = RNA_boolean_get(op->ptr, "uvs");
+		do_vcols = RNA_boolean_get(op->ptr, "vcols");
+		do_materials = RNA_boolean_get(op->ptr, "materials");
+
+		if (!EDBM_op_call_and_selectf(
+		        em, op,
+		        "faces.out", true,
+		        "join_triangles faces=%hf angle_face_threshold=%f angle_shape_threshold=%f "
+		        "cmp_seam=%b cmp_sharp=%b cmp_uvs=%b cmp_vcols=%b cmp_materials=%b",
+		        BM_ELEM_SELECT, angle_face_threshold, angle_shape_threshold,
+		        do_seam, do_sharp, do_uvs, do_vcols, do_materials))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4240,10 +4770,6 @@ void MESH_OT_tris_convert_to_quads(wmOperatorType *ot)
 
 static int edbm_decimate_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
-
 	const float ratio = RNA_float_get(op->ptr, "ratio");
 	bool use_vertex_group = RNA_boolean_get(op->ptr, "use_vertex_group");
 	const float vertex_group_factor = RNA_float_get(op->ptr, "vertex_group_factor");
@@ -4257,95 +4783,108 @@ static int edbm_decimate_exec(bContext *C, wmOperator *op)
 		return OPERATOR_FINISHED;
 	}
 
-	float *vweights = MEM_mallocN(sizeof(*vweights) * bm->totvert, __func__);
-	{
-		const int cd_dvert_offset = CustomData_get_offset(&bm->vdata, CD_MDEFORMVERT);
-		const int defbase_act = obedit->actdef - 1;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-		if (use_vertex_group && (cd_dvert_offset == -1)) {
-			BKE_report(op->reports, RPT_WARNING, "No active vertex group");
-			use_vertex_group = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		if (bm->totedgesel == 0) {
+			continue;
 		}
 
-		BMIter iter;
-		BMVert *v;
-		int i;
-		BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) {
-			float weight = 0.0f;
-			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
-				if (use_vertex_group) {
-					const MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(v, cd_dvert_offset);
-					weight = defvert_find_weight(dv, defbase_act);
-					if (invert_vertex_group) {
-						weight = 1.0f - weight;
+		float *vweights = MEM_mallocN(sizeof(*vweights) * bm->totvert, __func__);
+		{
+			const int cd_dvert_offset = CustomData_get_offset(&bm->vdata, CD_MDEFORMVERT);
+			const int defbase_act = obedit->actdef - 1;
+
+			if (use_vertex_group && (cd_dvert_offset == -1)) {
+				BKE_report(op->reports, RPT_WARNING, "No active vertex group");
+				use_vertex_group = false;
+			}
+
+			BMIter iter;
+			BMVert *v;
+			int i;
+			BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) {
+				float weight = 0.0f;
+				if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
+					if (use_vertex_group) {
+						const MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(v, cd_dvert_offset);
+						weight = defvert_find_weight(dv, defbase_act);
+						if (invert_vertex_group) {
+							weight = 1.0f - weight;
+						}
+					}
+					else {
+						weight = 1.0f;
 					}
 				}
-				else {
-					weight = 1.0f;
-				}
-			}
 
-			vweights[i] = weight;
-			BM_elem_index_set(v, i); /* set_inline */
+				vweights[i] = weight;
+				BM_elem_index_set(v, i); /* set_inline */
+			}
+			bm->elem_index_dirty &= ~BM_VERT;
 		}
-		bm->elem_index_dirty &= ~BM_VERT;
-	}
-
-	float ratio_adjust;
 
-	if ((bm->totface == bm->totfacesel) || (ratio == 0.0f)) {
-		ratio_adjust = ratio;
-	}
-	else {
-		/**
-		 * Calculate a new ratio based on faces that could be remoevd during decimation.
-		 * needed so 0..1 has a meaningful range when operating on the selection.
-		 *
-		 * This doesn't have to be totally accurate,
-		 * but needs to be greater than the number of selected faces
-		 */
-
-		int totface_basis = 0;
-		int totface_adjacent = 0;
-		BMIter iter;
-		BMFace *f;
-		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-			/* count faces during decimation, ngons are triangulated */
-			const int f_len = f->len > 4 ? (f->len - 2) : 1;
-			totface_basis += f_len;
+		float ratio_adjust;
 
-			BMLoop *l_iter, *l_first;
-			l_iter = l_first = BM_FACE_FIRST_LOOP(f);
-			do {
-				if (vweights[BM_elem_index_get(l_iter->v)] != 0.0f) {
-					totface_adjacent += f_len;
-					break;
-				}
-			} while ((l_iter = l_iter->next) != l_first);
+		if ((bm->totface == bm->totfacesel) || (ratio == 0.0f)) {
+			ratio_adjust = ratio;
 		}
+		else {
+			/**
+			 * Calculate a new ratio based on faces that could be remoevd during decimation.
+			 * needed so 0..1 has a meaningful range when operating on the selection.
+			 *
+			 * This doesn't have to be totally accurate,
+			 * but needs to be greater than the number of selected faces
+			 */
+
+			int totface_basis = 0;
+			int totface_adjacent = 0;
+			BMIter iter;
+			BMFace *f;
+			BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+				/* count faces during decimation, ngons are triangulated */
+				const int f_len = f->len > 4 ? (f->len - 2) : 1;
+				totface_basis += f_len;
+
+				BMLoop *l_iter, *l_first;
+				l_iter = l_first = BM_FACE_FIRST_LOOP(f);
+				do {
+					if (vweights[BM_elem_index_get(l_iter->v)] != 0.0f) {
+						totface_adjacent += f_len;
+						break;
+					}
+				} while ((l_iter = l_iter->next) != l_first);
+			}
 
-		ratio_adjust = ratio;
-		ratio_adjust = 1.0f - ratio_adjust;
-		ratio_adjust *= (float)totface_adjacent / (float)totface_basis;
-		ratio_adjust = 1.0f - ratio_adjust;
-	}
+			ratio_adjust = ratio;
+			ratio_adjust = 1.0f - ratio_adjust;
+			ratio_adjust *= (float)totface_adjacent / (float)totface_basis;
+			ratio_adjust = 1.0f - ratio_adjust;
+		}
 
-	BM_mesh_decimate_collapse(
-	        em->bm, ratio_adjust, vweights, vertex_group_factor, false,
-	        symmetry_axis, symmetry_eps);
+		BM_mesh_decimate_collapse(
+		        em->bm, ratio_adjust, vweights, vertex_group_factor, false,
+		        symmetry_axis, symmetry_eps);
 
-	MEM_freeN(vweights);
+		MEM_freeN(vweights);
 
-	{
-		short selectmode = em->selectmode;
-		if ((selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) == 0) {
-			/* ensure we flush edges -> faces */
-			selectmode |= SCE_SELECT_EDGE;
+		{
+			short selectmode = em->selectmode;
+			if ((selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) == 0) {
+				/* ensure we flush edges -> faces */
+				selectmode |= SCE_SELECT_EDGE;
+			}
+			EDBM_selectmode_flush_ex(em, selectmode);
 		}
-		EDBM_selectmode_flush_ex(em, selectmode);
+		EDBM_update_generic(em, true, true);
 	}
-
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4444,22 +4983,32 @@ static void edbm_dissolve_prop__use_boundary_tear(wmOperatorType *ot)
 
 static int edbm_dissolve_verts_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
 	const bool use_face_split = RNA_boolean_get(op->ptr, "use_face_split");
 	const bool use_boundary_tear = RNA_boolean_get(op->ptr, "use_boundary_tear");
 
-	if (!EDBM_op_callf(
-	            em, op,
-	            "dissolve_verts verts=%hv use_face_split=%b use_boundary_tear=%b",
-	            BM_ELEM_SELECT, use_face_split, use_boundary_tear))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	EDBM_update_generic(em, true, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_callf(
+		            em, op,
+		            "dissolve_verts verts=%hv use_face_split=%b use_boundary_tear=%b",
+		            BM_ELEM_SELECT, use_face_split, use_boundary_tear))
+		{
+			continue;
+		}
+		EDBM_update_generic(em, true, true);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -4489,21 +5038,32 @@ void MESH_OT_dissolve_verts(wmOperatorType *ot)
 
 static int edbm_dissolve_edges_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
 	const bool use_verts = RNA_boolean_get(op->ptr, "use_verts");
 	const bool use_face_split = RNA_boolean_get(op->ptr, "use_face_split");
 
-	if (!EDBM_op_callf(
-	            em, op,
-	            "dissolve_edges edges=%he use_verts=%b use_face_split=%b",
-	            BM_ELEM_SELECT, use_verts, use_face_split))
-	{
-		return OPERATOR_CANCELLED;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
+
+		if (!EDBM_op_callf(
+		        em, op,
+		        "dissolve_edges edges=%he use_verts=%b use_face_split=%b",
+		        BM_ELEM_SELECT, use_verts, use_face_split))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
 	}
 
-	EDBM_update_generic(em, true, true);
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4534,21 +5094,30 @@ void MESH_OT_dissolve_edges(wmOperatorType *ot)
 
 static int edbm_dissolve_faces_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
 	const bool use_verts = RNA_boolean_get(op->ptr, "use_verts");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (!EDBM_op_call_and_selectf(
-	        em, op,
-	        "region.out", true,
-	        "dissolve_faces faces=%hf use_verts=%b",
-	        BM_ELEM_SELECT, use_verts))
-	{
-		return OPERATOR_CANCELLED;
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	EDBM_update_generic(em, true, true);
+		if (!EDBM_op_call_and_selectf(
+		        em, op,
+		        "region.out", true,
+		        "dissolve_faces faces=%hf use_verts=%b",
+		        BM_ELEM_SELECT, use_verts))
+		{
+			continue;
+		}
+
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4628,52 +5197,65 @@ void MESH_OT_dissolve_mode(wmOperatorType *ot)
 
 static int edbm_dissolve_limited_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMesh *bm = em->bm;
 	const float angle_limit = RNA_float_get(op->ptr, "angle_limit");
 	const bool use_dissolve_boundaries = RNA_boolean_get(op->ptr, "use_dissolve_boundaries");
 	const int delimit = RNA_enum_get(op->ptr, "delimit");
-
 	char dissolve_flag;
 
-	if (em->selectmode == SCE_SELECT_FACE) {
-		/* flush selection to tags and untag edges/verts with partially selected faces */
-		BMIter iter;
-		BMIter liter;
-
-		BMElem *ele;
-		BMFace *f;
-		BMLoop *l;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-		BM_ITER_MESH (ele, &iter, bm, BM_VERTS_OF_MESH) {
-			BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_SELECT));
-		}
-		BM_ITER_MESH (ele, &iter, bm, BM_EDGES_OF_MESH) {
-			BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_SELECT));
+		if ((bm->totvertsel == 0) &&
+		    (bm->totedgesel == 0) &&
+		    (bm->totfacesel == 0))
+		{
+			continue;
 		}
 
-		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(f, BM_ELEM_SELECT)) {
-				BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
-					BM_elem_flag_disable(l->v, BM_ELEM_TAG);
-					BM_elem_flag_disable(l->e, BM_ELEM_TAG);
+		if (em->selectmode == SCE_SELECT_FACE) {
+			/* flush selection to tags and untag edges/verts with partially selected faces */
+			BMIter iter;
+			BMIter liter;
+
+			BMElem *ele;
+			BMFace *f;
+			BMLoop *l;
+
+			BM_ITER_MESH (ele, &iter, bm, BM_VERTS_OF_MESH) {
+				BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_SELECT));
+			}
+			BM_ITER_MESH (ele, &iter, bm, BM_EDGES_OF_MESH) {
+				BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_SELECT));
+			}
+
+			BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(f, BM_ELEM_SELECT)) {
+					BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
+						BM_elem_flag_disable(l->v, BM_ELEM_TAG);
+						BM_elem_flag_disable(l->e, BM_ELEM_TAG);
+					}
 				}
 			}
-		}
 
-		dissolve_flag = BM_ELEM_TAG;
-	}
-	else {
-		dissolve_flag = BM_ELEM_SELECT;
-	}
+			dissolve_flag = BM_ELEM_TAG;
+		}
+		else {
+			dissolve_flag = BM_ELEM_SELECT;
+		}
 
-	EDBM_op_call_and_selectf(
-	            em, op, "region.out", true,
-	            "dissolve_limit edges=%he verts=%hv angle_limit=%f use_dissolve_boundaries=%b delimit=%i",
-	            dissolve_flag, dissolve_flag, angle_limit, use_dissolve_boundaries, delimit);
+		EDBM_op_call_and_selectf(
+		        em, op, "region.out", true,
+		        "dissolve_limit edges=%he verts=%hv angle_limit=%f use_dissolve_boundaries=%b delimit=%i",
+		        dissolve_flag, dissolve_flag, angle_limit, use_dissolve_boundaries, delimit);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -4711,26 +5293,48 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot)
 
 static int edbm_dissolve_degenerate_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	int totelem_old[3] = {0, 0, 0};
+	int totelem_new[3] = {0, 0, 0};
+
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		totelem_old[0] += bm->totvert;
+		totelem_old[1] += bm->totedge;
+		totelem_old[2] += bm->totface;
+	} /* objects */
+
 	const float thresh = RNA_float_get(op->ptr, "threshold");
-	BMesh *bm = em->bm;
-	const int totelem[3] = {bm->totvert, bm->totedge, bm->totface};
 
-	if (!EDBM_op_callf(
-	        em, op,
-	        "dissolve_degenerate edges=%he dist=%f",
-	        BM_ELEM_SELECT, thresh))
-	{
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	/* tricky to maintain correct selection here, so just flush up from verts */
-	EDBM_select_flush(em);
+		if (!EDBM_op_callf(
+		        em, op,
+		        "dissolve_degenerate edges=%he dist=%f",
+		        BM_ELEM_SELECT, thresh))
+		{
+			return OPERATOR_CANCELLED;
+		}
 
-	EDBM_update_generic(em, true, true);
+		/* tricky to maintain correct selection here, so just flush up from verts */
+		EDBM_select_flush(em);
 
-	edbm_report_delete_info(op->reports, bm, totelem);
+		EDBM_update_generic(em, true, true);
+
+		totelem_new[0] += bm->totvert;
+		totelem_new[1] += bm->totedge;
+		totelem_new[2] += bm->totface;
+	}
+
+	edbm_report_delete_info(op->reports, totelem_old, totelem_new);
 
 	return OPERATOR_FINISHED;
 }
@@ -4762,42 +5366,52 @@ void MESH_OT_dissolve_degenerate(wmOperatorType *ot)
 /* internally uses dissolve */
 static int edbm_delete_edgeloop_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
 	const bool use_face_split = RNA_boolean_get(op->ptr, "use_face_split");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	/* deal with selection */
-	{
-		BMEdge *e;
-		BMIter iter;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
+		if (em->bm->totedgesel == 0) {
+			continue;
+		}
 
-		BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(e, BM_ELEM_SELECT) && e->l) {
-				BMLoop *l_iter = e->l;
-				do {
-					BM_elem_flag_enable(l_iter->f, BM_ELEM_TAG);
-				} while ((l_iter = l_iter->radial_next) != e->l);
+		/* deal with selection */
+		{
+			BMEdge *e;
+			BMIter iter;
+
+			BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
+
+			BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(e, BM_ELEM_SELECT) && e->l) {
+					BMLoop *l_iter = e->l;
+					do {
+						BM_elem_flag_enable(l_iter->f, BM_ELEM_TAG);
+					} while ((l_iter = l_iter->radial_next) != e->l);
+				}
 			}
 		}
-	}
 
-	if (!EDBM_op_callf(
-	            em, op,
-	            "dissolve_edges edges=%he use_verts=%b use_face_split=%b",
-	            BM_ELEM_SELECT, true, use_face_split))
-	{
-		return OPERATOR_CANCELLED;
-	}
+		if (!EDBM_op_callf(
+		            em, op,
+		            "dissolve_edges edges=%he use_verts=%b use_face_split=%b",
+		            BM_ELEM_SELECT, true, use_face_split))
+		{
+			continue;
+		}
 
-	BM_mesh_elem_hflag_enable_test(em->bm, BM_FACE, BM_ELEM_SELECT, true, false, BM_ELEM_TAG);
+		BM_mesh_elem_hflag_enable_test(em->bm, BM_FACE, BM_ELEM_SELECT, true, false, BM_ELEM_TAG);
 
-	EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
+		EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
@@ -4827,22 +5441,34 @@ void MESH_OT_delete_edgeloop(wmOperatorType *ot)
 
 static int edbm_split_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(ob);
-	BMOperator bmop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if ((em->bm->totvertsel == 0) &&
+		    (em->bm->totedgesel == 0) &&
+		    (em->bm->totfacesel == 0))
+		{
+			continue;
+		}
+		BMOperator bmop;
+		EDBM_op_init(em, &bmop, op, "split geom=%hvef use_only_faces=%b", BM_ELEM_SELECT, false);
+		BMO_op_exec(em->bm, &bmop);
+		BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
 
-	EDBM_op_init(em, &bmop, op, "split geom=%hvef use_only_faces=%b", BM_ELEM_SELECT, false);
-	BMO_op_exec(em->bm, &bmop);
-	BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-	/* Geometry has changed, need to recalc normals and looptris */
-	EDBM_mesh_normals_update(em);
+		/* Geometry has changed, need to recalc normals and looptris */
+		EDBM_mesh_normals_update(em);
 
-	EDBM_update_generic(em, true, true);
+		EDBM_update_generic(em, true, true);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -5000,9 +5626,9 @@ static void sort_bmelem_flag(
 		float fact = reverse ? -1.0 : 1.0;
 
 		if (v3d && v3d->localvd)
-			copy_v3_v3(cur, v3d->cursor);
+			copy_v3_v3(cur, v3d->cursor.location);
 		else
-			copy_v3_v3(cur, scene->cursor);
+			copy_v3_v3(cur, scene->cursor.location);
 		invert_m4_m4(mat, ob->obmat);
 		mul_m4_v3(mat, cur);
 
@@ -5320,7 +5946,7 @@ static void sort_bmelem_flag(
 	}
 
 	BM_mesh_remap(em->bm, map[0], map[1], map[2]);
-/*	DAG_id_tag_update(ob->data, 0);*/
+/*	DEG_id_tag_update(ob->data, 0);*/
 
 	for (j = 3; j--; ) {
 		if (map[j])
@@ -5404,7 +6030,7 @@ static void edbm_sort_elements_ui(bContext *C, wmOperator *op)
 	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 	/* Main auto-draw call. */
-	uiDefAutoButsRNA(layout, &ptr, edbm_sort_elements_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, edbm_sort_elements_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 
 void MESH_OT_sort_elements(wmOperatorType *ot)
@@ -5459,84 +6085,6 @@ void MESH_OT_sort_elements(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Noise (Deform Vertices) Operator
- * \{ */
-
-static int edbm_noise_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	Material *ma;
-	Tex *tex;
-	BMVert *eve;
-	BMIter iter;
-	const float fac = RNA_float_get(op->ptr, "factor");
-
-	if (em == NULL) {
-		return OPERATOR_FINISHED;
-	}
-
-	if ((ma  = give_current_material(obedit, obedit->actcol)) == NULL ||
-	    (tex = give_current_material_texture(ma)) == NULL)
-	{
-		BKE_report(op->reports, RPT_WARNING, "Mesh has no material or texture assigned");
-		return OPERATOR_FINISHED;
-	}
-
-	if (tex->type == TEX_STUCCI) {
-		float b2, vec[3];
-		float ofs = tex->turbul / 200.0f;
-		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
-				b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]);
-				if (tex->stype) ofs *= (b2 * b2);
-				vec[0] = fac * (b2 - BLI_hnoise(tex->noisesize, eve->co[0] + ofs, eve->co[1], eve->co[2]));
-				vec[1] = fac * (b2 - BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1] + ofs, eve->co[2]));
-				vec[2] = fac * (b2 - BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2] + ofs));
-
-				add_v3_v3(eve->co, vec);
-			}
-		}
-	}
-	else {
-		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
-				float tin = 0.0f, dum;
-				if (ma->mtex[ma->texact] != NULL) {
-					externtex(ma->mtex[ma->texact], eve->co, &tin, &dum, &dum, &dum, &dum, 0, NULL, false, false);
-				}
-				eve->co[2] += fac * tin;
-			}
-		}
-	}
-
-	EDBM_mesh_normals_update(em);
-
-	EDBM_update_generic(em, true, false);
-
-	return OPERATOR_FINISHED;
-}
-
-void MESH_OT_noise(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Noise";
-	ot->description = "Use vertex coordinate as texture coordinate";
-	ot->idname = "MESH_OT_noise";
-
-	/* api callbacks */
-	ot->exec = edbm_noise_exec;
-	ot->poll = ED_operator_editmesh;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	RNA_def_float(ot->srna, "factor", 0.1f, -1e4f, 1e4f, "Factor", "", 0.0f, 1.0f);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
 /** \name Bridge Operator
  * \{ */
 
@@ -5731,9 +6279,6 @@ void MESH_OT_bridge_edge_loops(wmOperatorType *ot)
 
 static int edbm_wireframe_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
 	const bool use_boundary        = RNA_boolean_get(op->ptr, "use_boundary");
 	const bool use_even_offset     = RNA_boolean_get(op->ptr, "use_even_offset");
 	const bool use_replace         = RNA_boolean_get(op->ptr, "use_replace");
@@ -5743,25 +6288,41 @@ static int edbm_wireframe_exec(bContext *C, wmOperator *op)
 	const float thickness          = RNA_float_get(op->ptr,   "thickness");
 	const float offset             = RNA_float_get(op->ptr,   "offset");
 
-	EDBM_op_init(
-	        em, &bmop, op,
-	        "wireframe faces=%hf use_replace=%b use_boundary=%b use_even_offset=%b use_relative_offset=%b "
-	        "use_crease=%b crease_weight=%f thickness=%f offset=%f",
-	        BM_ELEM_SELECT, use_replace, use_boundary, use_even_offset, use_relative_offset,
-	        use_crease, crease_weight, thickness, offset);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	BMO_op_exec(em->bm, &bmop);
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+		BMOperator bmop;
+
+		EDBM_op_init(
+		        em, &bmop, op,
+		        "wireframe faces=%hf use_replace=%b use_boundary=%b use_even_offset=%b use_relative_offset=%b "
+		        "use_crease=%b crease_weight=%f thickness=%f offset=%f",
+		        BM_ELEM_SELECT, use_replace, use_boundary, use_even_offset, use_relative_offset,
+		        use_crease, crease_weight, thickness, offset);
+
+		BMO_op_exec(em->bm, &bmop);
+
+		BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
-	else {
 		EDBM_update_generic(em, true, true);
-		return OPERATOR_FINISHED;
 	}
+
+	MEM_freeN(objects);
+
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_wireframe(wmOperatorType *ot)
@@ -5863,73 +6424,89 @@ void MESH_OT_offset_edge_loops(wmOperatorType *ot)
 #ifdef WITH_BULLET
 static int edbm_convex_hull_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
+	const bool use_existing_faces = RNA_boolean_get(op->ptr, "use_existing_faces");
+	const bool delete_unused = RNA_boolean_get(op->ptr, "delete_unused");
+	const bool make_holes = RNA_boolean_get(op->ptr, "make_holes");
+	const bool join_triangles = RNA_boolean_get(op->ptr, "join_triangles");
 
-	EDBM_op_init(
-	        em, &bmop, op, "convex_hull input=%hvef "
-	        "use_existing_faces=%b",
-	        BM_ELEM_SELECT,
-	        RNA_boolean_get(op->ptr, "use_existing_faces"));
-	BMO_op_exec(em->bm, &bmop);
+	float angle_face_threshold = RNA_float_get(op->ptr, "face_threshold");
+	float angle_shape_threshold = RNA_float_get(op->ptr, "shape_threshold");
 
-	/* Hull fails if input is coplanar */
-	if (BMO_error_occurred(em->bm)) {
-		EDBM_op_finish(em, &bmop, op, true);
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
+		if (em->bm->totvertsel == 0) {
+			continue;
+		}
 
-	/* Delete unused vertices, edges, and faces */
-	if (RNA_boolean_get(op->ptr, "delete_unused")) {
-		if (!EDBM_op_callf(
-		            em, op, "delete geom=%S context=%i",
-		            &bmop, "geom_unused.out", DEL_ONLYTAGGED))
-		{
+		BMOperator bmop;
+
+		EDBM_op_init(
+		        em, &bmop, op, "convex_hull input=%hvef "
+		        "use_existing_faces=%b",
+		        BM_ELEM_SELECT,
+		        use_existing_faces);
+		BMO_op_exec(em->bm, &bmop);
+
+		/* Hull fails if input is coplanar */
+		if (BMO_error_occurred(em->bm)) {
 			EDBM_op_finish(em, &bmop, op, true);
-			return OPERATOR_CANCELLED;
+			continue;
 		}
-	}
 
-	/* Delete hole edges/faces */
-	if (RNA_boolean_get(op->ptr, "make_holes")) {
-		if (!EDBM_op_callf(
-		            em, op, "delete geom=%S context=%i",
-		            &bmop, "geom_holes.out", DEL_ONLYTAGGED))
-		{
-			EDBM_op_finish(em, &bmop, op, true);
-			return OPERATOR_CANCELLED;
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
+
+		/* Delete unused vertices, edges, and faces */
+		if (delete_unused) {
+			if (!EDBM_op_callf(
+			            em, op, "delete geom=%S context=%i",
+			            &bmop, "geom_unused.out", DEL_ONLYTAGGED))
+			{
+				EDBM_op_finish(em, &bmop, op, true);
+				continue;
+			}
 		}
-	}
 
-	/* Merge adjacent triangles */
-	if (RNA_boolean_get(op->ptr, "join_triangles")) {
-		float angle_face_threshold = RNA_float_get(op->ptr, "face_threshold");
-		float angle_shape_threshold = RNA_float_get(op->ptr, "shape_threshold");
+		/* Delete hole edges/faces */
+		if (make_holes) {
+			if (!EDBM_op_callf(
+			            em, op, "delete geom=%S context=%i",
+			            &bmop, "geom_holes.out", DEL_ONLYTAGGED))
+			{
+				EDBM_op_finish(em, &bmop, op, true);
+				continue;
+			}
+		}
 
-		if (!EDBM_op_call_and_selectf(
-		        em, op,
-		        "faces.out", true,
-		        "join_triangles faces=%S "
-		        "angle_face_threshold=%f angle_shape_threshold=%f",
-		        &bmop, "geom.out",
-		        angle_face_threshold, angle_shape_threshold))
-		{
-			EDBM_op_finish(em, &bmop, op, true);
-			return OPERATOR_CANCELLED;
+		/* Merge adjacent triangles */
+		if (join_triangles) {
+			if (!EDBM_op_call_and_selectf(
+			        em, op,
+			        "faces.out", true,
+			        "join_triangles faces=%S "
+			        "angle_face_threshold=%f angle_shape_threshold=%f",
+			        &bmop, "geom.out",
+			        angle_face_threshold, angle_shape_threshold))
+			{
+				EDBM_op_finish(em, &bmop, op, true);
+				continue;
+			}
+		}
+
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
 		}
-	}
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
-	else {
 		EDBM_update_generic(em, true, true);
 		EDBM_selectmode_flush(em);
-		return OPERATOR_FINISHED;
 	}
+
+	MEM_freeN(objects);
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_convex_hull(wmOperatorType *ot)
@@ -5975,30 +6552,42 @@ void MESH_OT_convex_hull(wmOperatorType *ot)
 
 static int mesh_symmetrize_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMOperator bmop;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	const float thresh = RNA_float_get(op->ptr, "threshold");
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++)	{
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	EDBM_op_init(
-	        em, &bmop, op,
-	        "symmetrize input=%hvef direction=%i dist=%f",
-	        BM_ELEM_SELECT, RNA_enum_get(op->ptr, "direction"), thresh);
-	BMO_op_exec(em->bm, &bmop);
+		if (em->bm->totvertsel == 0 ) {
+			continue;
+		}
+		BMOperator bmop;
+
+		const float thresh = RNA_float_get(op->ptr, "threshold");
+
+		EDBM_op_init(
+		        em, &bmop, op,
+		        "symmetrize input=%hvef direction=%i dist=%f",
+		        BM_ELEM_SELECT, RNA_enum_get(op->ptr, "direction"), thresh);
+		BMO_op_exec(em->bm, &bmop);
 
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
+		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
-	else {
-		EDBM_update_generic(em, true, true);
-		EDBM_selectmode_flush(em);
-		return OPERATOR_FINISHED;
+		if (!EDBM_op_finish(em, &bmop, op, true)) {
+			continue;
+		}
+		else {
+			EDBM_update_generic(em, true, true);
+			EDBM_selectmode_flush(em);
+		}
 	}
+	MEM_freeN(objects);
+
+	return OPERATOR_FINISHED;
 }
 
 void MESH_OT_symmetrize(struct wmOperatorType *ot)
@@ -6165,45 +6754,59 @@ void MESH_OT_symmetry_snap(struct wmOperatorType *ot)
 
 static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = (Mesh *)obedit->data;
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMEdge *eed;
 	BMIter iter;
 	FreestyleEdge *fed;
 	const bool clear = RNA_boolean_get(op->ptr, "clear");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if (em == NULL)
-		return OPERATOR_FINISHED;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* auto-enable Freestyle edge mark drawing */
-	if (clear == 0) {
-		me->drawflag |= ME_DRAW_FREESTYLE_EDGE;
-	}
+		if (em == NULL) {
+			continue;
+		}
 
-	if (!CustomData_has_layer(&em->bm->edata, CD_FREESTYLE_EDGE)) {
-		BM_data_layer_add(em->bm, &em->bm->edata, CD_FREESTYLE_EDGE);
-	}
+		BMesh *bm = em->bm;
+		Mesh *me = ((Mesh *)obedit->data);
 
-	if (clear) {
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-				fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_FREESTYLE_EDGE);
-				fed->flag &= ~FREESTYLE_EDGE_MARK;
+		if (bm->totedgesel == 0) {
+			continue;
+		}
+
+		/* auto-enable Freestyle edge mark drawing */
+		if (clear == 0) {
+			me->drawflag |= ME_DRAW_FREESTYLE_EDGE;
+		}
+
+		if (!CustomData_has_layer(&em->bm->edata, CD_FREESTYLE_EDGE)) {
+			BM_data_layer_add(em->bm, &em->bm->edata, CD_FREESTYLE_EDGE);
+		}
+
+		if (clear) {
+			BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+					fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_FREESTYLE_EDGE);
+					fed->flag &= ~FREESTYLE_EDGE_MARK;
+				}
 			}
 		}
-	}
-	else {
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-				fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_FREESTYLE_EDGE);
-				fed->flag |= FREESTYLE_EDGE_MARK;
+		else {
+			BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+					fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_FREESTYLE_EDGE);
+					fed->flag |= FREESTYLE_EDGE_MARK;
+				}
 			}
 		}
-	}
 
-	DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		DEG_id_tag_update(obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -6236,44 +6839,57 @@ void MESH_OT_mark_freestyle_edge(wmOperatorType *ot)
 
 static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = (Mesh *)obedit->data;
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMIter iter;
 	FreestyleFace *ffa;
 	const bool clear = RNA_boolean_get(op->ptr, "clear");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if (em == NULL) return OPERATOR_FINISHED;
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Mesh *me = (Mesh *)obedit->data;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	/* auto-enable Freestyle face mark drawing */
-	if (!clear) {
-		me->drawflag |= ME_DRAW_FREESTYLE_FACE;
-	}
+		if (em == NULL) {
+			continue;
+		}
 
-	if (!CustomData_has_layer(&em->bm->pdata, CD_FREESTYLE_FACE)) {
-		BM_data_layer_add(em->bm, &em->bm->pdata, CD_FREESTYLE_FACE);
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	if (clear) {
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-				ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_FREESTYLE_FACE);
-				ffa->flag &= ~FREESTYLE_FACE_MARK;
+		/* auto-enable Freestyle face mark drawing */
+		if (!clear) {
+			me->drawflag |= ME_DRAW_FREESTYLE_FACE;
+		}
+
+		if (!CustomData_has_layer(&em->bm->pdata, CD_FREESTYLE_FACE)) {
+			BM_data_layer_add(em->bm, &em->bm->pdata, CD_FREESTYLE_FACE);
+		}
+
+		if (clear) {
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
+					ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_FREESTYLE_FACE);
+					ffa->flag &= ~FREESTYLE_FACE_MARK;
+				}
 			}
 		}
-	}
-	else {
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-				ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_FREESTYLE_FACE);
-				ffa->flag |= FREESTYLE_FACE_MARK;
+		else {
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
+					ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_FREESTYLE_FACE);
+					ffa->flag |= FREESTYLE_FACE_MARK;
+				}
 			}
 		}
-	}
 
-	DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		DEG_id_tag_update(obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c
index 50aecd0a821..4d4b7a098b0 100644
--- a/source/blender/editors/mesh/editmesh_undo.c
+++ b/source/blender/editors/mesh/editmesh_undo.c
@@ -24,9 +24,12 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "CLG_log.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_key_types.h"
+#include "DNA_layer_types.h"
 
 #include "BLI_listbase.h"
 #include "BLI_array_utils.h"
@@ -35,14 +38,17 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
-#include "BKE_depsgraph.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
 #include "ED_mesh.h"
 #include "ED_util.h"
+#include "ED_undo.h"
 
 #include "WM_types.h"
 #include "WM_api.h"
@@ -68,6 +74,9 @@
 #  include "BLI_task.h"
 #endif
 
+/** We only need this locally. */
+static CLG_LogRef LOG = {"ed.undo.mesh"};
+
 /* -------------------------------------------------------------------- */
 /** \name Undo Conversion
  * \{ */
@@ -667,80 +676,23 @@ static Object *editmesh_object_from_context(bContext *C)
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
+ *
+ * \note This is similar for all edit-mode types.
  * \{ */
 
+typedef struct MeshUndoStep_Elem {
+	struct MeshUndoStep_Elem *next, *prev;
+	UndoRefID_Object obedit_ref;
+	UndoMesh data;
+} MeshUndoStep_Elem;
+
 typedef struct MeshUndoStep {
 	UndoStep step;
-	/* Use for all ID lookups (can be NULL). */
 	struct UndoIDPtrMap *id_map;
-
-	/* note: will split out into list for multi-object-editmode. */
-	UndoRefID_Object obedit_ref;
-	/* Needed for MTexPoly's image use. */
-	UndoRefID_Object *image_array_ref;
-	UndoMesh data;
+	MeshUndoStep_Elem *elems;
+	uint               elems_len;
 } MeshUndoStep;
 
-static void mesh_undosys_step_encode_store_ids(MeshUndoStep *us)
-{
-	Mesh *me = us->obedit_ref.ptr->data;
-	BMesh *bm = me->edit_btmesh->bm;
-	const int mtex_len = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
-	if (mtex_len != 0) {
-		ID **id_prev_array = BLI_array_alloca(id_prev_array,  mtex_len);
-		memset(id_prev_array, 0x0, sizeof(*id_prev_array) * mtex_len);
-
-		BMIter iter;
-		BMFace *efa;
-
-		if (us->id_map == NULL) {
-			us->id_map = BKE_undosys_ID_map_create();
-		}
-
-		uint cd_poly_tex_offset_first = CustomData_get_n_offset(&bm->pdata, CD_MTEXPOLY, 0);
-		uint cd_poly_tex_offset_end = cd_poly_tex_offset_first + (sizeof(MTexPoly) * mtex_len);
-		BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
-			for (uint cd_poly_tex_offset = cd_poly_tex_offset_first, i = 0;
-			     cd_poly_tex_offset < cd_poly_tex_offset_end;
-			     cd_poly_tex_offset += sizeof(MTexPoly), i++)
-			{
-				const MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-				if (tf->tpage != NULL) {
-					BKE_undosys_ID_map_add_with_prev(us->id_map, (ID *)tf->tpage, &id_prev_array[i]);
-				}
-			}
-		}
-	}
-}
-
-static void mesh_undosys_step_decode_restore_ids(MeshUndoStep *us)
-{
-	Mesh *me = us->obedit_ref.ptr->data;
-	BMesh *bm = me->edit_btmesh->bm;
-	const int mtex_len = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
-	if (mtex_len != 0 && us->id_map) {
-		BMIter iter;
-		BMFace *efa;
-
-		ID *(*id_prev_array)[2] = BLI_array_alloca(id_prev_array, mtex_len);
-		memset(id_prev_array, 0x0, sizeof(*id_prev_array) * mtex_len);
-
-		uint cd_poly_tex_offset_first = CustomData_get_n_offset(&bm->pdata, CD_MTEXPOLY, 0);
-		uint cd_poly_tex_offset_end = cd_poly_tex_offset_first + (sizeof(MTexPoly) * mtex_len);
-		BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
-			for (uint cd_poly_tex_offset = cd_poly_tex_offset_first, i = 0;
-			     cd_poly_tex_offset < cd_poly_tex_offset_end;
-			     cd_poly_tex_offset += sizeof(MTexPoly), i++)
-			{
-				MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-				if (tf->tpage != NULL) {
-					tf->tpage = (Image *)BKE_undosys_ID_map_lookup_with_prev(us->id_map, (ID *)tf->tpage, id_prev_array[i]);
-				}
-			}
-		}
-	}
-}
-
 static bool mesh_undosys_poll(bContext *C)
 {
 	return editmesh_object_from_context(C) != NULL;
@@ -749,11 +701,24 @@ static bool mesh_undosys_poll(bContext *C)
 static bool mesh_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	MeshUndoStep *us = (MeshUndoStep *)us_p;
-	us->obedit_ref.ptr = editmesh_object_from_context(C);
-	Mesh *me = us->obedit_ref.ptr->data;
-	undomesh_from_editmesh(&us->data, me->edit_btmesh, me->key);
-	mesh_undosys_step_encode_store_ids(us);
-	us->step.data_size = us->data.undo_size;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+	us->elems_len = objects_len;
+
+	for (uint i = 0; i < objects_len; i++) {
+		Object *ob = objects[i];
+		MeshUndoStep_Elem *elem = &us->elems[i];
+
+		elem->obedit_ref.ptr = ob;
+		Mesh *me = elem->obedit_ref.ptr->data;
+		undomesh_from_editmesh(&elem->data, me->edit_btmesh, me->key);
+		us->step.data_size += elem->data.undo_size;
+	}
+	MEM_freeN(objects);
 	return true;
 }
 
@@ -764,19 +729,37 @@ static void mesh_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNU
 	BLI_assert(mesh_undosys_poll(C));
 
 	MeshUndoStep *us = (MeshUndoStep *)us_p;
-	Object *obedit = us->obedit_ref.ptr;
-	Mesh *me = obedit->data;
-	BMEditMesh *em = me->edit_btmesh;
-	undomesh_to_editmesh(&us->data, em, obedit->data);
-	mesh_undosys_step_decode_restore_ids(us);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MeshUndoStep_Elem *elem = &us->elems[i];
+		Object *obedit = elem->obedit_ref.ptr;
+		Mesh *me = obedit->data;
+		if (me->edit_btmesh == NULL) {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid",
+			           us_p->name, obedit->id.name);
+			continue;
+		}
+		BMEditMesh *em = me->edit_btmesh;
+		undomesh_to_editmesh(&elem->data, em, obedit->data);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	}
+
+	/* The first element is always active */
+	ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
 static void mesh_undosys_step_free(UndoStep *us_p)
 {
 	MeshUndoStep *us = (MeshUndoStep *)us_p;
-	undomesh_free_data(&us->data);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MeshUndoStep_Elem *elem = &us->elems[i];
+		undomesh_free_data(&elem->data);
+	}
+	MEM_freeN(us->elems);
 
 	if (us->id_map != NULL) {
 		BKE_undosys_ID_map_destroy(us->id_map);
@@ -787,7 +770,12 @@ static void mesh_undosys_foreach_ID_ref(
         UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
 {
 	MeshUndoStep *us = (MeshUndoStep *)us_p;
-	foreach_ID_ref_fn(user_data, ((UndoRefID *)&us->obedit_ref));
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MeshUndoStep_Elem *elem = &us->elems[i];
+		foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+	}
+
 	if (us->id_map != NULL) {
 		BKE_undosys_ID_map_foreach_ID_ref(us->id_map, foreach_ID_ref_fn, user_data);
 	}
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 41e8a963383..ab44e017fc6 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -43,13 +43,14 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 #include "BKE_editmesh_bvh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BKE_object.h"  /* XXX. only for EDBM_mesh_load(). */
 
 #include "WM_api.h"
@@ -323,7 +324,7 @@ void EDBM_mesh_make(Object *ob, const int select_mode, const bool add_key_index)
 
 /**
  * \warning This can invalidate the #DerivedMesh cache of other objects (for linked duplicates).
- * Most callers should run #DAG_id_tag_update on \a ob->data, see: T46738, T46913
+ * Most callers should run #DEG_id_tag_update on \a ob->data, see: T46738, T46913
  */
 void EDBM_mesh_load(Object *ob)
 {
@@ -511,7 +512,6 @@ UvVertMap *BM_uv_vert_map_create(
 	/* vars from original func */
 	UvVertMap *vmap;
 	UvMapVert *buf;
-	/* MTexPoly *tf; */ /* UNUSED */
 	MLoopUV *luv;
 	unsigned int a;
 	int totverts, i, totuv, totfaces;
@@ -553,7 +553,7 @@ UvVertMap *BM_uv_vert_map_create(
 
 	BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, a) {
 		if ((use_select == false) || BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
-			float (*tf_uv)[2];
+			float (*tf_uv)[2] = NULL;
 
 			if (use_winding) {
 				tf_uv = (float (*)[2])BLI_buffer_reinit_data(&tf_uv_buf, vec2f, efa->len);
@@ -593,7 +593,6 @@ UvVertMap *BM_uv_vert_map_create(
 			newvlist = v;
 
 			efa = BM_face_at_index(bm, v->f);
-			/* tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
 
 			l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, v->tfindex);
 			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
@@ -605,8 +604,6 @@ UvVertMap *BM_uv_vert_map_create(
 			while (iterv) {
 				next = iterv->next;
 				efa = BM_face_at_index(bm, iterv->f);
-				/* tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
-
 				l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex);
 				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 				uv2 = luv->uv;
@@ -660,7 +657,7 @@ UvElementMap *BM_uv_element_map_create(
 	/* vars from original func */
 	UvElementMap *element_map;
 	UvElement *buf;
-	bool *winding;
+	bool *winding = NULL;
 	BLI_buffer_declare_static(vec2f, tf_uv_buf, BLI_BUFFER_NOP, BM_DEFAULT_NGON_STACK_SIZE);
 
 	MLoopUV *luv;
@@ -701,7 +698,7 @@ UvElementMap *BM_uv_element_map_create(
 		}
 
 		if (!selected || BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
-			float (*tf_uv)[2];
+			float (*tf_uv)[2] = NULL;
 
 			if (use_winding) {
 				tf_uv = (float (*)[2])BLI_buffer_reinit_data(&tf_uv_buf, vec2f, efa->len);
@@ -925,7 +922,7 @@ UvElement *BM_uv_element_get(UvElementMap *map, BMFace *efa, BMLoop *l)
 
 /* last_sel, use em->act_face otherwise get the last selected face in the editselections
  * at the moment, last_sel is mainly useful for making sure the space image dosnt flicker */
-BMFace *EDBM_uv_active_face_get(BMEditMesh *em, const bool sloppy, const bool selected, MTexPoly **r_tf)
+BMFace *EDBM_uv_active_face_get(BMEditMesh *em, const bool sloppy, const bool selected)
 {
 	BMFace *efa = NULL;
 
@@ -936,11 +933,9 @@ BMFace *EDBM_uv_active_face_get(BMEditMesh *em, const bool sloppy, const bool se
 	efa = BM_mesh_active_face_get(em->bm, sloppy, selected);
 
 	if (efa) {
-		if (r_tf) *r_tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 		return efa;
 	}
 
-	if (r_tf) *r_tf = NULL;
 	return NULL;
 }
 
@@ -949,7 +944,6 @@ bool EDBM_uv_check(BMEditMesh *em)
 {
 	/* some of these checks could be a touch overkill */
 	return em && em->bm->totface &&
-	       CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY) &&
 	       CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV);
 }
 
@@ -1008,7 +1002,7 @@ void EDBM_verts_mirror_cache_begin_ex(
 	BMesh *bm = em->bm;
 	BMIter iter;
 	BMVert *v;
-	int cd_vmirr_offset;
+	int cd_vmirr_offset = 0;
 	int i;
 	const float maxdist_sq = SQUARE(maxdist);
 
@@ -1036,7 +1030,7 @@ void EDBM_verts_mirror_cache_begin_ex(
 	BM_mesh_elem_index_ensure(bm, BM_VERT);
 
 	if (use_topology) {
-		ED_mesh_mirrtopo_init(me, NULL, -1, &mesh_topo_store, true);
+		ED_mesh_mirrtopo_init__real_mesh(me, NULL, &mesh_topo_store, true);
 	}
 	else {
 		tree = BLI_kdtree_new(bm->totvert);
@@ -1334,7 +1328,7 @@ void EDBM_update_generic(BMEditMesh *em, const bool do_tessface, const bool is_d
 {
 	Object *ob = em->ob;
 	/* order of calling isn't important */
-	DAG_id_tag_update(ob->data, OB_RECALC_DATA);
+	DEG_id_tag_update(ob->data, OB_RECALC_DATA);
 	WM_main_add_notifier(NC_GEOM | ND_DATA, ob->data);
 
 	if (do_tessface) {
@@ -1486,7 +1480,9 @@ static void scale_point(float c1[3], const float p[3], const float s)
 	add_v3_v3(c1, p);
 }
 
-bool BMBVH_EdgeVisible(struct BMBVHTree *tree, BMEdge *e, ARegion *ar, View3D *v3d, Object *obedit)
+bool BMBVH_EdgeVisible(struct BMBVHTree *tree, BMEdge *e,
+                       struct Depsgraph *depsgraph,
+                       ARegion *ar, View3D *v3d, Object *obedit)
 {
 	BMFace *f;
 	float co1[3], co2[3], co3[3], dir1[3], dir2[3], dir3[3];
@@ -1498,7 +1494,7 @@ bool BMBVH_EdgeVisible(struct BMBVHTree *tree, BMEdge *e, ARegion *ar, View3D *v
 		ar->winy / 2.0f,
 	};
 
-	ED_view3d_win_to_segment(ar, v3d, mval_f, origin, end, false);
+	ED_view3d_win_to_segment(depsgraph, ar, v3d, mval_f, origin, end, false);
 
 	invert_m4_m4(invmat, obedit->obmat);
 	mul_m4_v3(invmat, origin);
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index f3ccdf32938..d2410c7d97b 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -42,7 +42,6 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
@@ -50,6 +49,8 @@
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_define.h"
 
 #include "WM_api.h"
@@ -245,14 +246,14 @@ void ED_mesh_uv_loop_reset_ex(struct Mesh *me, const int layernum)
 		}
 	}
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 }
 
 void ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me)
 {
 	/* could be ldata or pdata */
-	CustomData *pdata = GET_CD_DATA(me, pdata);
-	const int layernum = CustomData_get_active_layer(pdata, CD_MTEXPOLY);
+	CustomData *ldata = GET_CD_DATA(me, ldata);
+	const int layernum = CustomData_get_active_layer(ldata, CD_MLOOPUV);
 	ED_mesh_uv_loop_reset_ex(me, layernum);
 
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
@@ -269,21 +270,10 @@ int ED_mesh_uv_texture_add(Mesh *me, const char *name, const bool active_set)
 	if (me->edit_btmesh) {
 		em = me->edit_btmesh;
 
-		layernum_dst = CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY);
+		layernum_dst = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPUV);
 		if (layernum_dst >= MAX_MTFACE)
 			return -1;
 
-		/* CD_MTEXPOLY */
-		BM_data_layer_add_named(em->bm, &em->bm->pdata, CD_MTEXPOLY, name);
-		/* copy data from active UV */
-		if (layernum_dst) {
-			const int layernum_src = CustomData_get_active_layer(&em->bm->pdata, CD_MTEXPOLY);
-			BM_data_layer_copy(em->bm, &em->bm->pdata, CD_MTEXPOLY, layernum_src, layernum_dst);
-		}
-		if (active_set || layernum_dst == 0) {
-			CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum_dst);
-		}
-
 		/* CD_MLOOPUV */
 		BM_data_layer_add_named(em->bm, &em->bm->ldata, CD_MLOOPUV, name);
 		/* copy data from active UV */
@@ -298,26 +288,22 @@ int ED_mesh_uv_texture_add(Mesh *me, const char *name, const bool active_set)
 		}
 	}
 	else {
-		layernum_dst = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
+		layernum_dst = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
 		if (layernum_dst >= MAX_MTFACE)
 			return -1;
 
-		if (me->mtpoly) {
-			CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DUPLICATE, me->mtpoly, me->totpoly, name);
+		if (me->mloopuv) {
 			CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_DUPLICATE, me->mloopuv, me->totloop, name);
 			CustomData_add_layer_named(&me->fdata, CD_MTFACE, CD_DUPLICATE, me->mtface, me->totface, name);
 			is_init = true;
 		}
 		else {
-			CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DEFAULT, NULL, me->totpoly, name);
 			CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_DEFAULT, NULL, me->totloop, name);
 			CustomData_add_layer_named(&me->fdata, CD_MTFACE, CD_DEFAULT, NULL, me->totface, name);
 		}
 
 		if (active_set || layernum_dst == 0) {
-			CustomData_set_layer_active(&me->pdata, CD_MTEXPOLY, layernum_dst);
 			CustomData_set_layer_active(&me->ldata, CD_MLOOPUV, layernum_dst);
-
 			CustomData_set_layer_active(&me->fdata, CD_MTFACE, layernum_dst);
 		}
 
@@ -329,7 +315,7 @@ int ED_mesh_uv_texture_add(Mesh *me, const char *name, const bool active_set)
 		ED_mesh_uv_loop_reset_ex(me, layernum_dst);
 	}
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
 	return layernum_dst;
@@ -343,12 +329,12 @@ void ED_mesh_uv_texture_ensure(struct Mesh *me, const char *name)
 	if (me->edit_btmesh) {
 		em = me->edit_btmesh;
 
-		layernum_dst = CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY);
+		layernum_dst = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPUV);
 		if (layernum_dst == 0)
 			ED_mesh_uv_texture_add(me, name, true);
 	}
 	else {
-		layernum_dst = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
+		layernum_dst = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
 		if (layernum_dst == 0)
 			ED_mesh_uv_texture_add(me, name, true);
 	}
@@ -357,23 +343,19 @@ void ED_mesh_uv_texture_ensure(struct Mesh *me, const char *name)
 
 bool ED_mesh_uv_texture_remove_index(Mesh *me, const int n)
 {
-	CustomData *pdata = GET_CD_DATA(me, pdata), *ldata = GET_CD_DATA(me, ldata);
-	CustomDataLayer *cdlp, *cdlu;
+	CustomData *ldata = GET_CD_DATA(me, ldata);
+	CustomDataLayer *cdlu;
 	int index;
 
-	index = CustomData_get_layer_index_n(pdata, CD_MTEXPOLY, n);
-	cdlp = (index == -1) ? NULL : &pdata->layers[index];
-
 	index = CustomData_get_layer_index_n(ldata, CD_MLOOPUV, n);
 	cdlu = (index == -1) ? NULL : &ldata->layers[index];
 
-	if (!cdlp || !cdlu)
+	if (!cdlu)
 		return false;
 
-	delete_customdata_layer(me, cdlp);
 	delete_customdata_layer(me, cdlu);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
 	return true;
@@ -381,14 +363,8 @@ bool ED_mesh_uv_texture_remove_index(Mesh *me, const int n)
 bool ED_mesh_uv_texture_remove_active(Mesh *me)
 {
 	/* texpoly/uv are assumed to be in sync */
-	CustomData *pdata = GET_CD_DATA(me, pdata);
-	const int n = CustomData_get_active_layer(pdata, CD_MTEXPOLY);
-
-	/* double check active layers align! */
-#ifdef DEBUG
 	CustomData *ldata = GET_CD_DATA(me, ldata);
-	BLI_assert(CustomData_get_active_layer(ldata, CD_MLOOPUV) == n);
-#endif
+	const int n = CustomData_get_active_layer(ldata, CD_MLOOPUV);
 
 	if (n != -1) {
 		return ED_mesh_uv_texture_remove_index(me, n);
@@ -400,8 +376,8 @@ bool ED_mesh_uv_texture_remove_active(Mesh *me)
 bool ED_mesh_uv_texture_remove_named(Mesh *me, const char *name)
 {
 	/* texpoly/uv are assumed to be in sync */
-	CustomData *pdata = GET_CD_DATA(me, pdata);
-	const int n = CustomData_get_named_layer(pdata, CD_MTEXPOLY, name);
+	CustomData *ldata = GET_CD_DATA(me, ldata);
+	const int n = CustomData_get_named_layer(ldata, CD_MLOOPUV, name);
 	if (n != -1) {
 		return ED_mesh_uv_texture_remove_index(me, n);
 	}
@@ -458,7 +434,7 @@ int ED_mesh_color_add(Mesh *me, const char *name, const bool active_set)
 		BKE_mesh_update_customdata_pointers(me, true);
 	}
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
 	return layernum;
@@ -473,7 +449,7 @@ bool ED_mesh_color_ensure(struct Mesh *me, const char *name)
 		BKE_mesh_update_customdata_pointers(me, true);
 	}
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	return (me->mloopcol != NULL);
 }
@@ -491,7 +467,7 @@ bool ED_mesh_color_remove_index(Mesh *me, const int n)
 		return false;
 
 	delete_customdata_layer(me, cdl);
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
 	return true;
@@ -562,7 +538,6 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot)
 
 static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	Base *base;
@@ -602,8 +577,6 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *e
 	if (me->edit_btmesh == NULL)
 		return OPERATOR_CANCELLED;
 
-	ED_uvedit_assign_image(bmain, scene, obedit, ima, NULL);
-
 	if (exitmode) {
 		EDBM_mesh_load(obedit);
 		EDBM_mesh_free(me->edit_btmesh);
@@ -612,7 +585,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *e
 
 		/* load_editMesh free's pointers used by CustomData layers which might be used by DerivedMesh too,
 		 * so signal to re-create DerivedMesh here (sergey) */
-		DAG_id_tag_update(&me->id, 0);
+		DEG_id_tag_update(&me->id, 0);
 	}
 
 	/* dummie drop support; ensure view shows a result :) */
@@ -751,7 +724,7 @@ static int mesh_customdata_clear_exec__internal(bContext *C,
 			CustomData_free_layers(data, type, tot);
 		}
 
-		DAG_id_tag_update(&me->id, 0);
+		DEG_id_tag_update(&me->id, 0);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 		return OPERATOR_FINISHED;
@@ -847,7 +820,7 @@ static int mesh_customdata_skin_add_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BKE_mesh_ensure_skin_customdata(me);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 	return OPERATOR_FINISHED;
@@ -938,7 +911,7 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator
 			CustomData_add_layer(data, CD_CUSTOMLOOPNORMAL, CD_DEFAULT, NULL, me->totloop);
 		}
 
-		DAG_id_tag_update(&me->id, 0);
+		DEG_id_tag_update(&me->id, 0);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 		return OPERATOR_FINISHED;
@@ -1015,7 +988,7 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface)
 
 	BKE_mesh_calc_normals(mesh);
 
-	DAG_id_tag_update(&mesh->id, 0);
+	DEG_id_tag_update(&mesh->id, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, mesh);
 }
 
@@ -1335,7 +1308,6 @@ void ED_mesh_calc_tessface(Mesh *mesh, bool free_mpoly)
 		mesh->mloopcol = NULL;
 		mesh->mloopuv = NULL;
 		mesh->mpoly = NULL;
-		mesh->mtpoly = NULL;
 	}
 }
 
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 74da7405d05..75fead00534 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -92,6 +92,8 @@ void MESH_OT_primitive_monkey_add(struct wmOperatorType *ot);
 void MESH_OT_primitive_uv_sphere_add(struct wmOperatorType *ot);
 void MESH_OT_primitive_ico_sphere_add(struct wmOperatorType *ot);
 
+/* *** editmesh_add_manipulator.c *** */
+void MESH_OT_primitive_cube_add_manipulator(struct wmOperatorType *ot);
 
 /* *** editmesh_bevel.c *** */
 void MESH_OT_bevel(struct wmOperatorType *ot);
@@ -102,6 +104,7 @@ void MESH_OT_bisect(struct wmOperatorType *ot);
 /* *** editmesh_extrude.c *** */
 void MESH_OT_extrude_repeat(struct wmOperatorType *ot);
 void MESH_OT_extrude_region(struct wmOperatorType *ot);
+void MESH_OT_extrude_context(struct wmOperatorType *ot);
 void MESH_OT_extrude_verts_indiv(struct wmOperatorType *ot);
 void MESH_OT_extrude_edges_indiv(struct wmOperatorType *ot);
 void MESH_OT_extrude_faces_indiv(struct wmOperatorType *ot);
@@ -113,6 +116,12 @@ void MESH_OT_screw(struct wmOperatorType *ot);
 /* *** editmesh_extrude_spin.c *** */
 void MESH_OT_spin(struct wmOperatorType *ot);
 
+/* *** editmesh_polybuild.c *** */
+void MESH_OT_polybuild_face_at_cursor(struct wmOperatorType *ot);
+void MESH_OT_polybuild_split_at_cursor(struct wmOperatorType *ot);
+void MESH_OT_polybuild_dissolve_at_cursor(struct wmOperatorType *ot);
+void MESH_OT_polybuild_hover(struct wmOperatorType *ot);
+
 /* *** editmesh_inset.c *** */
 void MESH_OT_inset(struct wmOperatorType *ot);
 
@@ -208,7 +217,6 @@ void MESH_OT_hide(struct wmOperatorType *ot);
 void MESH_OT_reveal(struct wmOperatorType *ot);
 void MESH_OT_mark_seam(struct wmOperatorType *ot);
 void MESH_OT_mark_sharp(struct wmOperatorType *ot);
-void MESH_OT_noise(struct wmOperatorType *ot);
 void MESH_OT_flip_normals(struct wmOperatorType *ot);
 void MESH_OT_solidify(struct wmOperatorType *ot);
 void MESH_OT_knife_cut(struct wmOperatorType *ot);
@@ -252,12 +260,4 @@ void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot);
 void MESH_OT_drop_named_image(struct wmOperatorType *ot);
 
 
-/* *** mesh_navmesh.c *** */
-void MESH_OT_navmesh_make(struct wmOperatorType *ot);
-void MESH_OT_navmesh_face_copy(struct wmOperatorType *ot);
-void MESH_OT_navmesh_face_add(struct wmOperatorType *ot);
-void MESH_OT_navmesh_reset(struct wmOperatorType *ot);
-void MESH_OT_navmesh_clear(struct wmOperatorType *ot);
-
-
 #endif  /* __MESH_INTERN_H__ */
diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c
index 20ece9c3336..4c078d2ac8b 100644
--- a/source/blender/editors/mesh/mesh_mirror.c
+++ b/source/blender/editors/mesh/mesh_mirror.c
@@ -37,6 +37,8 @@
 #include "BKE_DerivedMesh.h"
 #include "BLI_kdtree.h"
 #include "BKE_editmesh.h"
+#include "BKE_library.h"
+#include "BKE_mesh.h"
 
 #include "ED_mesh.h"
 
@@ -114,6 +116,72 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, DerivedMesh *dm, co
 	return 0;
 }
 
+/* mode is 's' start, or 'e' end, or 'u' use */
+/* if end, ob can be NULL */
+int ED_mesh_mirror_spatial_table__real_mesh(Object *ob, BMEditMesh *em, Mesh *mesh, const float co[3], char mode)
+{
+	if (mode == 'u') {        /* use table */
+		if (MirrKdStore.tree == NULL)
+			ED_mesh_mirror_spatial_table__real_mesh(ob, em, mesh, NULL, 's');
+
+		if (MirrKdStore.tree) {
+			KDTreeNearest nearest;
+			const int i = BLI_kdtree_find_nearest(MirrKdStore.tree, co, &nearest);
+
+			if (i != -1) {
+				if (nearest.dist < KD_THRESH) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	}
+	else if (mode == 's') {   /* start table */
+		Mesh *me = ob->data;
+		const bool use_em = (!mesh && em && me->edit_btmesh == em);
+		const int totvert = use_em ? em->bm->totvert : mesh ? mesh->totvert : me->totvert;
+
+		if (MirrKdStore.tree) /* happens when entering this call without ending it */
+			ED_mesh_mirror_spatial_table__real_mesh(ob, em, mesh, co, 'e');
+
+		MirrKdStore.tree = BLI_kdtree_new(totvert);
+
+		if (use_em) {
+			BMVert *eve;
+			BMIter iter;
+			int i;
+
+			/* this needs to be valid for index lookups later (callers need) */
+			BM_mesh_elem_table_ensure(em->bm, BM_VERT);
+
+			BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
+				BLI_kdtree_insert(MirrKdStore.tree, i, eve->co);
+			}
+		}
+		else {
+			MVert *mvert = mesh ? mesh->mvert : me->mvert;
+			int i;
+
+			for (i = 0; i < totvert; i++, mvert++) {
+				BLI_kdtree_insert(MirrKdStore.tree, i, mvert->co);
+			}
+		}
+
+		BLI_kdtree_balance(MirrKdStore.tree);
+	}
+	else if (mode == 'e') { /* end table */
+		if (MirrKdStore.tree) {
+			BLI_kdtree_free(MirrKdStore.tree);
+			MirrKdStore.tree = NULL;
+		}
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	return 0;
+}
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -141,8 +209,9 @@ static int mirrtopo_vert_sort(const void *v1, const void *v2)
 	return 0;
 }
 
-bool ED_mesh_mirrtopo_recalc_check(Mesh *me, DerivedMesh *dm, const int ob_mode, MirrTopoStore_t *mesh_topo_store)
+bool ED_mesh_mirrtopo_recalc_check(Mesh *me, DerivedMesh *dm, MirrTopoStore_t *mesh_topo_store)
 {
+	const bool is_editmode = (me->edit_btmesh != NULL);
 	int totvert;
 	int totedge;
 
@@ -160,7 +229,7 @@ bool ED_mesh_mirrtopo_recalc_check(Mesh *me, DerivedMesh *dm, const int ob_mode,
 	}
 
 	if ((mesh_topo_store->index_lookup == NULL) ||
-	    (mesh_topo_store->prev_ob_mode != ob_mode) ||
+	    (mesh_topo_store->prev_is_editmode != is_editmode) ||
 	    (totvert != mesh_topo_store->prev_vert_tot) ||
 	    (totedge != mesh_topo_store->prev_edge_tot))
 	{
@@ -171,10 +240,63 @@ bool ED_mesh_mirrtopo_recalc_check(Mesh *me, DerivedMesh *dm, const int ob_mode,
 	}
 
 }
+bool ED_mesh_mirrtopo_recalc_check__real_mesh(Mesh *me, Mesh *dm, MirrTopoStore_t *mesh_topo_store)
+{
+	const bool is_editmode = (me->edit_btmesh != NULL);
+	int totvert;
+	int totedge;
+
+	if (dm) {
+		totvert = dm->totvert;
+		totedge = dm->totedge;
+	}
+	else if (me->edit_btmesh) {
+		totvert = me->edit_btmesh->bm->totvert;
+		totedge = me->edit_btmesh->bm->totedge;
+	}
+	else {
+		totvert = me->totvert;
+		totedge = me->totedge;
+	}
+
+	if ((mesh_topo_store->index_lookup == NULL) ||
+	    (mesh_topo_store->prev_is_editmode != is_editmode) ||
+	    (totvert != mesh_topo_store->prev_vert_tot) ||
+	    (totedge != mesh_topo_store->prev_edge_tot))
+	{
+		return true;
+	}
+	else {
+		return false;
+	}
+
+}
+
+
+void ED_mesh_mirrtopo_init(
+        Mesh *me, DerivedMesh *dm, MirrTopoStore_t *mesh_topo_store,
+        const bool skip_em_vert_array_init)
+{
+	Mesh *fake_mesh = NULL;
+
+	if (dm != NULL) {
+		/* ED_real_mesh_mirrtopo_init() only uses the counts, not the actual data */
+		fake_mesh = BKE_mesh_new_nomain(dm->getNumVerts(dm), dm->getNumEdges(dm), dm->getNumTessFaces(dm),
+		                                dm->getNumLoops(dm), dm->getNumPolys(dm));
+	}
+
+	ED_mesh_mirrtopo_init__real_mesh(me, fake_mesh, mesh_topo_store, skip_em_vert_array_init);
+
+	if (dm != NULL) {
+		BKE_id_free(NULL, fake_mesh);
+	}
+}
 
-void ED_mesh_mirrtopo_init(Mesh *me, DerivedMesh *dm, const int ob_mode, MirrTopoStore_t *mesh_topo_store,
-                           const bool skip_em_vert_array_init)
+void ED_mesh_mirrtopo_init__real_mesh(
+        Mesh *me, Mesh *dm, MirrTopoStore_t *mesh_topo_store,
+        const bool skip_em_vert_array_init)
 {
+	const bool is_editmode = (me->edit_btmesh != NULL);
 	MEdge *medge = NULL, *med;
 	BMEditMesh *em = dm ?  NULL : me->edit_btmesh;
 
@@ -197,7 +319,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, DerivedMesh *dm, const int ob_mode, MirrTop
 	/* reallocate if needed */
 	ED_mesh_mirrtopo_free(mesh_topo_store);
 
-	mesh_topo_store->prev_ob_mode = ob_mode;
+	mesh_topo_store->prev_is_editmode = is_editmode;
 
 	if (em) {
 		BM_mesh_elem_index_ensure(em->bm, BM_VERT);
@@ -205,7 +327,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, DerivedMesh *dm, const int ob_mode, MirrTop
 		totvert = em->bm->totvert;
 	}
 	else {
-		totvert = dm ? dm->getNumVerts(dm) : me->totvert;
+		totvert = dm ? dm->totvert : me->totvert;
 	}
 
 	topo_hash = MEM_callocN(totvert * sizeof(MirrTopoHash_t), "TopoMirr");
@@ -221,8 +343,8 @@ void ED_mesh_mirrtopo_init(Mesh *me, DerivedMesh *dm, const int ob_mode, MirrTop
 		}
 	}
 	else {
-		totedge = dm ? dm->getNumEdges(dm) : me->totedge;
-		medge = dm ? dm->getEdgeArray(dm) : me->medge;
+		totedge = dm ? dm->totedge : me->totedge;
+		medge = dm ? dm->medge : me->medge;
 
 		for (a = 0, med = medge; a < totedge; a++, med++) {
 			const unsigned int i1 = med->v1, i2 = med->v2;
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 3c8e18027f4..b3c507affb7 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -77,12 +77,16 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_append(MESH_OT_primitive_monkey_add);
 	WM_operatortype_append(MESH_OT_primitive_uv_sphere_add);
 	WM_operatortype_append(MESH_OT_primitive_ico_sphere_add);
+
+	WM_operatortype_append(MESH_OT_primitive_cube_add_manipulator);
+
 	WM_operatortype_append(MESH_OT_duplicate);
 	WM_operatortype_append(MESH_OT_remove_doubles);
 	WM_operatortype_append(MESH_OT_spin);
 	WM_operatortype_append(MESH_OT_screw);
 
 	WM_operatortype_append(MESH_OT_extrude_region);
+	WM_operatortype_append(MESH_OT_extrude_context);
 	WM_operatortype_append(MESH_OT_extrude_faces_indiv);
 	WM_operatortype_append(MESH_OT_extrude_edges_indiv);
 	WM_operatortype_append(MESH_OT_extrude_verts_indiv);
@@ -141,13 +145,18 @@ void ED_operatortypes_mesh(void)
 #endif
 	WM_operatortype_append(MESH_OT_vertices_smooth);
 	WM_operatortype_append(MESH_OT_vertices_smooth_laplacian);
-	WM_operatortype_append(MESH_OT_noise);
 	WM_operatortype_append(MESH_OT_flip_normals);
 	WM_operatortype_append(MESH_OT_rip);
 	WM_operatortype_append(MESH_OT_rip_edge);
 	WM_operatortype_append(MESH_OT_blend_from_shape);
 	WM_operatortype_append(MESH_OT_shape_propagate_to_all);
 
+	/* editmesh_polybuild */
+	WM_operatortype_append(MESH_OT_polybuild_face_at_cursor);
+	WM_operatortype_append(MESH_OT_polybuild_split_at_cursor);
+	WM_operatortype_append(MESH_OT_polybuild_dissolve_at_cursor);
+	WM_operatortype_append(MESH_OT_polybuild_hover);
+
 	WM_operatortype_append(MESH_OT_uv_texture_add);
 	WM_operatortype_append(MESH_OT_uv_texture_remove);
 	WM_operatortype_append(MESH_OT_vertex_color_add);
@@ -191,14 +200,6 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_append(MESH_OT_bisect);
 	WM_operatortype_append(MESH_OT_symmetrize);
 	WM_operatortype_append(MESH_OT_symmetry_snap);
-
-#ifdef WITH_GAMEENGINE
-	WM_operatortype_append(MESH_OT_navmesh_make);
-	WM_operatortype_append(MESH_OT_navmesh_face_copy);
-	WM_operatortype_append(MESH_OT_navmesh_face_add);
-	WM_operatortype_append(MESH_OT_navmesh_reset);
-	WM_operatortype_append(MESH_OT_navmesh_clear);
-#endif
 }
 
 #if 0 /* UNUSED, remove? */
@@ -261,6 +262,13 @@ void ED_operatormacros_mesh(void)
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
 	RNA_boolean_set(otmacro->ptr, "mirror", false);
 
+	ot = WM_operatortype_append_macro("MESH_OT_extrude_context_move", "Extrude Region and Move",
+	                                  "Extrude context and move result", OPTYPE_UNDO | OPTYPE_REGISTER);
+	otmacro = WM_operatortype_macro_define(ot, "MESH_OT_extrude_context");
+	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
+	RNA_enum_set(otmacro->ptr, "proportional", 0);
+	RNA_boolean_set(otmacro->ptr, "mirror", false);
+
 	ot = WM_operatortype_append_macro("MESH_OT_extrude_region_shrink_fatten", "Extrude Region and Shrink/Fatten",
 	                                  "Extrude region and move result", OPTYPE_UNDO | OPTYPE_REGISTER);
 	otmacro = WM_operatortype_macro_define(ot, "MESH_OT_extrude_region");
@@ -288,6 +296,23 @@ void ED_operatormacros_mesh(void)
 	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
 	RNA_boolean_set(otmacro->ptr, "mirror", false);
+
+
+	ot = WM_operatortype_append_macro(
+	        "MESH_OT_polybuild_face_at_cursor_move", "Face At Cursor Move", "",
+	        OPTYPE_UNDO | OPTYPE_REGISTER);
+	WM_operatortype_macro_define(ot, "MESH_OT_polybuild_face_at_cursor");
+	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
+	RNA_enum_set(otmacro->ptr, "proportional", 0);
+	RNA_boolean_set(otmacro->ptr, "mirror", false);
+
+	ot = WM_operatortype_append_macro(
+	        "MESH_OT_polybuild_split_at_cursor_move", "Split At Cursor Move", "",
+	        OPTYPE_UNDO | OPTYPE_REGISTER);
+	WM_operatortype_macro_define(ot, "MESH_OT_polybuild_split_at_cursor");
+	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
+	RNA_enum_set(otmacro->ptr, "proportional", 0);
+	RNA_boolean_set(otmacro->ptr, "mirror", false);
 }
 
 /* note mesh keymap also for other space? */
@@ -358,9 +383,6 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
 
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_select_similar", GKEY, KM_PRESS, KM_SHIFT, 0);
 
-	/* selection mode */
-	WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_select_mode", TABKEY, KM_PRESS, KM_CTRL, 0);
-
 	/* hide */
 	kmi = WM_keymap_add_item(keymap, "MESH_OT_hide", HKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(kmi->ptr, "unselected", false);
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 6953473a792..786b27ee816 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -42,12 +42,12 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_deform.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_key.h"
@@ -60,6 +60,10 @@
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 #include "BKE_multires.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #include "ED_mesh.h"
 #include "ED_object.h"
@@ -76,7 +80,7 @@
  * return 0 if no join is made (error) and 1 if the join is done */
 
 static void join_mesh_single(
-        Main *bmain, Scene *scene,
+        Depsgraph *depsgraph, Main *bmain, Scene *scene,
         Object *ob_dst, Object *ob_src, float imat[4][4],
         MVert **mvert_pp, MEdge **medge_pp, MLoop **mloop_pp, MPoly **mpoly_pp,
         CustomData *vdata, CustomData *edata, CustomData *ldata, CustomData *pdata,
@@ -204,7 +208,7 @@ static void join_mesh_single(
 		if (ob_src != ob_dst) {
 			MultiresModifierData *mmd;
 
-			multiresModifier_prepare_join(scene, ob_src, ob_dst);
+			multiresModifier_prepare_join(depsgraph, scene, ob_src, ob_dst);
 
 			if ((mmd = get_multires_modifier(scene, ob_src, true))) {
 				ED_object_iter_other(bmain, ob_src, true,
@@ -278,7 +282,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	bDeformGroup *dg, *odg;
 	CustomData vdata, edata, fdata, ldata, pdata;
 
-	if (scene->obedit) {
+	if (ob->mode & OB_MODE_EDIT) {
 		BKE_report(op->reports, RPT_WARNING, "Cannot join while in edit mode");
 		return OPERATOR_CANCELLED;
 	}
@@ -289,6 +293,8 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	/* count & check */
 	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
@@ -483,7 +489,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	 * active mesh will remain first ones in new result of the merge, in same order for CD layers, etc. See also T50084.
 	 */
 	join_mesh_single(
-	            bmain, scene,
+	            depsgraph, bmain, scene,
 	            ob, ob, imat,
 	            &mvert, &medge, &mloop, &mpoly,
 	            &vdata, &edata, &ldata, &pdata,
@@ -500,7 +506,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 		/* only join if this is a mesh */
 		if (base->object->type == OB_MESH) {
 			join_mesh_single(
-			            bmain, scene,
+			            depsgraph, bmain, scene,
 			            ob, base->object, imat,
 			            &mvert, &medge, &mloop, &mpoly,
 			            &vdata, &edata, &ldata, &pdata,
@@ -511,7 +517,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 
 			/* free base, now that data is merged */
 			if (base->object != ob) {
-				ED_base_object_free_and_unlink(bmain, scene, base);
+				ED_object_base_free_and_unlink(bmain, scene, base->object);
 			}
 		}
 	}
@@ -582,9 +588,9 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	/* Due to dependnecy cycle some other object might access old derived data. */
 	BKE_object_free_derived_caches(ob);
 
-	DAG_relations_tag_update(bmain);   /* removed objects, need to rebuild dag */
+	DEG_relations_tag_update(bmain);   /* removed objects, need to rebuild dag */
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
@@ -600,6 +606,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Mesh *me = (Mesh *)ob->data;
 	Mesh *selme = NULL;
 	DerivedMesh *dm = NULL;
@@ -648,7 +655,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 			selme = (Mesh *)base->object->data;
 
 			if (selme->totvert == me->totvert) {
-				dm = mesh_get_derived_deform(scene, base->object, CD_MASK_BAREMESH);
+				dm = mesh_get_derived_deform(depsgraph, scene, base->object, CD_MASK_BAREMESH);
 
 				if (!dm) continue;
 
@@ -679,15 +686,40 @@ static MirrTopoStore_t mesh_topo_store = {NULL, -1. - 1, -1};
 /* mode is 's' start, or 'e' end, or 'u' use */
 /* if end, ob can be NULL */
 /* note, is supposed return -1 on error, which callers are currently checking for, but is not used so far */
-int ED_mesh_mirror_topo_table(Object *ob, DerivedMesh *dm, char mode)
+int ED_mesh_mirror_topo_table(
+        Object *ob, DerivedMesh *dm, char mode)
 {
 	if (mode == 'u') {        /* use table */
-		if (ED_mesh_mirrtopo_recalc_check(ob->data, dm, ob->mode, &mesh_topo_store)) {
+		if (ED_mesh_mirrtopo_recalc_check(ob->data, dm, &mesh_topo_store)) {
 			ED_mesh_mirror_topo_table(ob, dm, 's');
 		}
 	}
 	else if (mode == 's') { /* start table */
-		ED_mesh_mirrtopo_init(ob->data, dm, ob->mode, &mesh_topo_store, false);
+		ED_mesh_mirrtopo_init(ob->data, dm, &mesh_topo_store, false);
+	}
+	else if (mode == 'e') { /* end table */
+		ED_mesh_mirrtopo_free(&mesh_topo_store);
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	return 0;
+}
+
+/* mode is 's' start, or 'e' end, or 'u' use */
+/* if end, ob can be NULL */
+/* note, is supposed return -1 on error, which callers are currently checking for, but is not used so far */
+int ED_mesh_mirror_topo_table__real_mesh(
+        Object *ob, Mesh *mesh, char mode)
+{
+	if (mode == 'u') {        /* use table */
+		if (ED_mesh_mirrtopo_recalc_check__real_mesh(ob->data, mesh, &mesh_topo_store)) {
+			ED_mesh_mirror_topo_table__real_mesh(ob, mesh, 's');
+		}
+	}
+	else if (mode == 's') { /* start table */
+		ED_mesh_mirrtopo_init__real_mesh(ob->data, mesh, &mesh_topo_store, false);
 	}
 	else if (mode == 'e') { /* end table */
 		ED_mesh_mirrtopo_free(&mesh_topo_store);
@@ -734,6 +766,38 @@ int mesh_get_x_mirror_vert(Object *ob, DerivedMesh *dm, int index, const bool us
 	}
 }
 
+static int mesh_get_x_mirror_vert_spatial__real_mesh(Object *ob, Mesh *mesh, int index)
+{
+	Mesh *me = ob->data;
+	MVert *mvert = mesh ? mesh->mvert : me->mvert;
+	float vec[3];
+
+	mvert = &mvert[index];
+	vec[0] = -mvert->co[0];
+	vec[1] = mvert->co[1];
+	vec[2] = mvert->co[2];
+
+	return ED_mesh_mirror_spatial_table__real_mesh(ob, NULL, mesh, vec, 'u');
+}
+
+static int mesh_get_x_mirror_vert_topo__real_mesh(Object *ob, Mesh *mesh, int index)
+{
+	if (ED_mesh_mirror_topo_table__real_mesh(ob, mesh, 'u') == -1)
+		return -1;
+
+	return mesh_topo_store.index_lookup[index];
+}
+
+int mesh_get_x_mirror_vert__real_mesh(Object *ob, Mesh *mesh, int index, const bool use_topology)
+{
+	if (use_topology) {
+		return mesh_get_x_mirror_vert_topo__real_mesh(ob, mesh, index);
+	}
+	else {
+		return mesh_get_x_mirror_vert_spatial__real_mesh(ob, mesh, index);
+	}
+}
+
 static BMVert *editbmesh_get_x_mirror_vert_spatial(Object *ob, BMEditMesh *em, const float co[3])
 {
 	float vec[3];
@@ -987,6 +1051,66 @@ int *mesh_get_x_mirror_faces(Object *ob, BMEditMesh *em, DerivedMesh *dm)
 	return mirrorfaces;
 }
 
+/* This is a Mesh-based copy of mesh_get_x_mirror_faces() */
+int *mesh_get_x_mirror_faces__real_mesh(Object *ob, BMEditMesh *em, Mesh *mesh)
+{
+	Mesh *me = ob->data;
+	MVert *mv, *mvert;
+	MFace mirrormf, *mf, *hashmf, *mface;
+	GHash *fhash;
+	int *mirrorverts, *mirrorfaces;
+
+	BLI_assert(em == NULL);  /* Does not work otherwise, currently... */
+
+	const bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
+	const int totvert = mesh ? mesh->totvert : me->totvert;
+	const int totface = mesh ? mesh->totface : me->totface;
+	int a;
+
+	mirrorverts = MEM_callocN(sizeof(int) * totvert, "MirrorVerts");
+	mirrorfaces = MEM_callocN(sizeof(int) * 2 * totface, "MirrorFaces");
+
+	mvert = mesh ? mesh->mvert : me->mvert;
+	mface = mesh ? mesh->mface : me->mface;
+
+	ED_mesh_mirror_spatial_table__real_mesh(ob, em, mesh, NULL, 's');
+
+	for (a = 0, mv = mvert; a < totvert; a++, mv++)
+		mirrorverts[a] = mesh_get_x_mirror_vert__real_mesh(ob, mesh, a, use_topology);
+
+	ED_mesh_mirror_spatial_table__real_mesh(ob, em, mesh, NULL, 'e');
+
+	fhash = BLI_ghash_new_ex(mirror_facehash, mirror_facecmp, "mirror_facehash gh", me->totface);
+	for (a = 0, mf = mface; a < totface; a++, mf++)
+		BLI_ghash_insert(fhash, mf, mf);
+
+	for (a = 0, mf = mface; a < totface; a++, mf++) {
+		mirrormf.v1 = mirrorverts[mf->v3];
+		mirrormf.v2 = mirrorverts[mf->v2];
+		mirrormf.v3 = mirrorverts[mf->v1];
+		mirrormf.v4 = (mf->v4) ? mirrorverts[mf->v4] : 0;
+
+		/* make sure v4 is not 0 if a quad */
+		if (mf->v4 && mirrormf.v4 == 0) {
+			SWAP(unsigned int, mirrormf.v1, mirrormf.v3);
+			SWAP(unsigned int, mirrormf.v2, mirrormf.v4);
+		}
+
+		hashmf = BLI_ghash_lookup(fhash, &mirrormf);
+		if (hashmf) {
+			mirrorfaces[a * 2] = hashmf - mface;
+			mirrorfaces[a * 2 + 1] = mirror_facerotation(&mirrormf, hashmf);
+		}
+		else
+			mirrorfaces[a * 2] = -1;
+	}
+
+	BLI_ghash_free(fhash, NULL, NULL);
+	MEM_freeN(mirrorverts);
+
+	return mirrorfaces;
+}
+
 /* selection, vertex and face */
 /* returns 0 if not found, otherwise 1 */
 
@@ -1030,21 +1154,22 @@ bool ED_mesh_pick_face(bContext *C, Object *ob, const int mval[2], unsigned int
 static void ed_mesh_pick_face_vert__mpoly_find(
         /* context */
         struct ARegion *ar, const float mval[2],
-        /* mesh data */
-        DerivedMesh *dm, MPoly *mp, MLoop *mloop,
+        /* mesh data (evaluated) */
+        const MPoly *mp,
+        const MVert *mvert, const MLoop *mloop,
         /* return values */
         float *r_len_best, int *r_v_idx_best)
 {
 	const MLoop *ml;
 	int j = mp->totloop;
 	for (ml = &mloop[mp->loopstart]; j--; ml++) {
-		float co[3], sco[2], len;
+		float sco[2];
 		const int v_idx = ml->v;
-		dm->getVertCo(dm, v_idx, co);
+		const float *co = mvert[v_idx].co;
 		if (ED_view3d_project_float_object(ar, co, sco, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-			len = len_manhattan_v2v2(mval, sco);
-			if (len < *r_len_best) {
-				*r_len_best = len;
+			const float len_test = len_manhattan_v2v2(mval, sco);
+			if (len_test < *r_len_best) {
+				*r_len_best = len_test;
 				*r_v_idx_best = v_idx;
 			}
 		}
@@ -1056,6 +1181,7 @@ static void ed_mesh_pick_face_vert__mpoly_find(
  */
 bool ED_mesh_pick_face_vert(bContext *C, Object *ob, const int mval[2], unsigned int *index, int size)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	unsigned int poly_index;
 	Mesh *me = ob->data;
 
@@ -1066,7 +1192,7 @@ bool ED_mesh_pick_face_vert(bContext *C, Object *ob, const int mval[2], unsigned
 		struct ARegion *ar = CTX_wm_region(C);
 
 		/* derived mesh to find deformed locations */
-		DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
+		Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
 
 		int v_idx_best = ORIGINDEX_NONE;
 
@@ -1074,36 +1200,38 @@ bool ED_mesh_pick_face_vert(bContext *C, Object *ob, const int mval[2], unsigned
 		const float mval_f[2] = {UNPACK2(mval)};
 		float len_best = FLT_MAX;
 
-		MPoly *dm_mpoly;
-		MLoop *dm_mloop;
-		unsigned int dm_mpoly_tot;
+		MPoly *me_eval_mpoly;
+		MLoop *me_eval_mloop;
+		MVert *me_eval_mvert;
+		unsigned int me_eval_mpoly_len;
 		const int *index_mp_to_orig;
 
-		dm_mpoly = dm->getPolyArray(dm);
-		dm_mloop = dm->getLoopArray(dm);
+		me_eval_mpoly = me_eval->mpoly;
+		me_eval_mloop = me_eval->mloop;
+		me_eval_mvert = me_eval->mvert;
 
-		dm_mpoly_tot = dm->getNumPolys(dm);
+		me_eval_mpoly_len = me_eval->totpoly;
 
-		index_mp_to_orig = dm->getPolyDataArray(dm, CD_ORIGINDEX);
+		index_mp_to_orig = CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX);
 
 		/* tag all verts using this face */
 		if (index_mp_to_orig) {
 			unsigned int i;
 
-			for (i = 0; i < dm_mpoly_tot; i++) {
+			for (i = 0; i < me_eval_mpoly_len; i++) {
 				if (index_mp_to_orig[i] == poly_index) {
 					ed_mesh_pick_face_vert__mpoly_find(
 					        ar, mval_f,
-					        dm, &dm_mpoly[i], dm_mloop,
+					        &me_eval_mpoly[i], me_eval_mvert, me_eval_mloop,
 					        &len_best, &v_idx_best);
 				}
 			}
 		}
 		else {
-			if (poly_index < dm_mpoly_tot) {
+			if (poly_index < me_eval_mpoly_len) {
 				ed_mesh_pick_face_vert__mpoly_find(
 				        ar, mval_f,
-				        dm, &dm_mpoly[poly_index], dm_mloop,
+				        &me_eval_mpoly[poly_index], me_eval_mvert, me_eval_mloop,
 				        &len_best, &v_idx_best);
 			}
 		}
@@ -1111,15 +1239,12 @@ bool ED_mesh_pick_face_vert(bContext *C, Object *ob, const int mval[2], unsigned
 		/* map 'dm -> me' index if possible */
 		if (v_idx_best != ORIGINDEX_NONE) {
 			const int *index_mv_to_orig;
-
-			index_mv_to_orig = dm->getVertDataArray(dm, CD_ORIGINDEX);
+			index_mv_to_orig = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX);
 			if (index_mv_to_orig) {
 				v_idx_best = index_mv_to_orig[v_idx_best];
 			}
 		}
 
-		dm->release(dm);
-
 		if ((v_idx_best != ORIGINDEX_NONE) && (v_idx_best < me->totvert)) {
 			*index = v_idx_best;
 			return true;
@@ -1193,7 +1318,7 @@ bool ED_mesh_pick_vert(bContext *C, Object *ob, const int mval[2], unsigned int
 	}
 	else {
 		/* derived mesh to find deformed locations */
-		DerivedMesh *dm = mesh_get_derived_final(vc.scene, ob, CD_MASK_BAREMESH);
+		DerivedMesh *dm = mesh_get_derived_final(vc.depsgraph, vc.scene, ob, CD_MASK_BAREMESH);
 		ARegion *ar = vc.ar;
 		RegionView3D *rv3d = ar->regiondata;
 
@@ -1279,3 +1404,47 @@ MDeformVert *ED_mesh_active_dvert_get_only(Object *ob)
 		return NULL;
 	}
 }
+
+void EDBM_mesh_stats_multi(
+        struct Object **objects, const uint objects_len,
+        int totelem[3], int totelem_sel[3])
+{
+	if (totelem) {
+		totelem[0] = 0;
+		totelem[1] = 0;
+		totelem[2] = 0;
+	}
+	if (totelem_sel) {
+		totelem_sel[0] = 0;
+		totelem_sel[1] = 0;
+		totelem_sel[2] = 0;
+	}
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		if (totelem) {
+			totelem[0] += bm->totvert;
+			totelem[1] += bm->totedge;
+			totelem[2] += bm->totface;
+		}
+		if (totelem_sel) {
+			totelem_sel[0] += bm->totvertsel;
+			totelem_sel[1] += bm->totedgesel;
+			totelem_sel[2] += bm->totfacesel;
+		}
+	}
+}
+
+
+void EDBM_mesh_elem_index_ensure_multi(Object **objects, const uint objects_len, const char htype)
+{
+	int elem_offset[4] = {0, 0, 0, 0};
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+		BM_mesh_elem_index_ensure_ex(bm, htype, elem_offset);
+	}
+}
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index 7815240b7a4..b0ae3122727 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -22,10 +22,12 @@ set(INC
 	../include
 	../../blenkernel
 	../../blenlib
+	../../depsgraph
 	../../makesdna
 	../../makesrna
 	../../render/extern/include
 	../../windowmanager
+	../../../../intern/clog
 	../../../../intern/guardedalloc
 )
 
diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c
index dc64f61a916..7045025e227 100644
--- a/source/blender/editors/metaball/editmball_undo.c
+++ b/source/blender/editors/metaball/editmball_undo.c
@@ -27,6 +27,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "CLG_log.h"
+
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 #include "BLI_array_utils.h"
@@ -36,16 +38,22 @@
 #include "DNA_object_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
 #include "ED_mball.h"
+#include "ED_undo.h"
 #include "ED_util.h"
 
 #include "WM_types.h"
 #include "WM_api.h"
 
+/** We only need this locally. */
+static CLG_LogRef LOG = {"ed.undo.mball"};
+
 /* -------------------------------------------------------------------- */
 /** \name Undo Conversion
  * \{ */
@@ -129,13 +137,19 @@ static Object *editmball_object_from_context(bContext *C)
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
+ *
+ * \note This is similar for all edit-mode types.
  * \{ */
 
-typedef struct MBallUndoStep {
-	UndoStep step;
-	/* note: will split out into list for multi-object-editmode. */
+typedef struct MBallUndoStep_Elem {
 	UndoRefID_Object obedit_ref;
 	UndoMBall data;
+} MBallUndoStep_Elem;
+
+typedef struct MBallUndoStep {
+	UndoStep step;
+	MBallUndoStep_Elem *elems;
+	uint                elems_len;
 } MBallUndoStep;
 
 static bool mball_undosys_poll(bContext *C)
@@ -146,36 +160,74 @@ static bool mball_undosys_poll(bContext *C)
 static bool mball_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	MBallUndoStep *us = (MBallUndoStep *)us_p;
-	us->obedit_ref.ptr = editmball_object_from_context(C);
-	MetaBall *mb = us->obedit_ref.ptr->data;
-	editmball_from_undomball(&us->data, mb);
-	us->step.data_size = us->data.undo_size;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+	us->elems_len = objects_len;
+
+	for (uint i = 0; i < objects_len; i++) {
+		Object *ob = objects[i];
+		MBallUndoStep_Elem *elem = &us->elems[i];
+
+		elem->obedit_ref.ptr = ob;
+		MetaBall *mb = ob->data;
+		editmball_from_undomball(&elem->data, mb);
+		us->step.data_size += elem->data.undo_size;
+	}
+	MEM_freeN(objects);
 	return true;
 }
 
 static void mball_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNUSED(dir))
 {
+	/* TODO(campbell): undo_system: use low-level API to set mode. */
 	ED_object_mode_set(C, OB_MODE_EDIT);
+	BLI_assert(mball_undosys_poll(C));
 
 	MBallUndoStep *us = (MBallUndoStep *)us_p;
-	Object *obedit = us->obedit_ref.ptr;
-	MetaBall *mb = obedit->data;
-	undomball_to_editmball(&us->data, mb);
-	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MBallUndoStep_Elem *elem = &us->elems[i];
+		Object *obedit = elem->obedit_ref.ptr;
+		MetaBall *mb = obedit->data;
+		if (mb->editelems == NULL) {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid", us_p->name, obedit->id.name);
+			continue;
+		}
+		undomball_to_editmball(&elem->data, mb);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+	}
+
+	/* The first element is always active */
+	ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }
 
 static void mball_undosys_step_free(UndoStep *us_p)
 {
 	MBallUndoStep *us = (MBallUndoStep *)us_p;
-	undomball_free_data(&us->data);
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MBallUndoStep_Elem *elem = &us->elems[i];
+		undomball_free_data(&elem->data);
+	}
+	MEM_freeN(us->elems);
 }
 
 static void mball_undosys_foreach_ID_ref(
         UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
 {
 	MBallUndoStep *us = (MBallUndoStep *)us_p;
-	foreach_ID_ref_fn(user_data, ((UndoRefID *)&us->obedit_ref));
+
+	for (uint i = 0; i < us->elems_len; i++) {
+		MBallUndoStep_Elem *elem = &us->elems[i];
+		foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+	}
 }
 
 /* Export for ED_undo_sys. */
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index fa48462d2c7..65bf258f334 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -47,9 +47,11 @@
 #include "RNA_define.h"
 #include "RNA_access.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_context.h"
 #include "BKE_mball.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
 
 #include "ED_mball.h"
 #include "ED_screen.h"
@@ -366,32 +368,47 @@ void MBALL_OT_select_similar(wmOperatorType *ot)
 /* Random metaball selection */
 static int select_random_metaelems_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	MetaBall *mb = (MetaBall *)obedit->data;
-	MetaElem *ml;
 	const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
 	const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f;
 	const int seed = WM_operator_properties_select_random_seed_increment_get(op);
 
-	RNG *rng = BLI_rng_new_srandom(seed);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		MetaBall *mb = (MetaBall *)obedit->data;
+		if (!BKE_mball_is_any_unselected(mb)) {
+			continue;
+		}
+		int seed_iter = seed;
 
-	for (ml = mb->editelems->first; ml; ml = ml->next) {
-		if (BLI_rng_get_float(rng) < randfac) {
-			if (select)
-				ml->flag |= SELECT;
-			else
-				ml->flag &= ~SELECT;
+		/* This gives a consistent result regardless of object order. */
+		if (ob_index) {
+			seed_iter += BLI_ghashutil_strhash_p(obedit->id.name);
 		}
-	}
 
-	BLI_rng_free(rng);
+		RNG *rng = BLI_rng_new_srandom(seed_iter);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb);
+		for (MetaElem *ml = mb->editelems->first; ml; ml = ml->next) {
+			if (BLI_rng_get_float(rng) < randfac) {
+				if (select) {
+					ml->flag |= SELECT;
+				}
+				else {
+					ml->flag &= ~SELECT;
+				}
+			}
+		}
 
+		BLI_rng_free(rng);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb);
+	}
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }
 
-
 void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
 {
 	/* identifiers */
@@ -431,7 +448,7 @@ static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
 			ml = ml->prev;
 		}
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -473,7 +490,7 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
 			ml = next;
 		}
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -513,7 +530,7 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op)
 			ml = ml->next;
 		}
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
@@ -556,7 +573,7 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *op)
 	}
 	if (changed) {
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 	}
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 24740a3372b..305e3287029 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -24,11 +24,13 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../gpu
 	../../ikplugin
 	../../imbuf
 	../../makesdna
 	../../makesrna
+	../../modifiers
 	../../python
 	../../render/extern/include
 	../../windowmanager
@@ -46,9 +48,9 @@ set(SRC
 	object_bake_api.c
 	object_constraint.c
 	object_edit.c
+	object_facemap_ops.c
 	object_group.c
 	object_hook.c
-	object_lod.c
 	object_modes.c
 	object_modifier.c
 	object_ops.c
@@ -70,10 +72,6 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-if(WITH_GAMEENGINE)
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index cd163298642..d66a176ddfc 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -45,9 +45,9 @@
 #include "DNA_object_fluidsim_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
-#include "DNA_actuator_types.h"
 #include "DNA_gpencil_types.h"
 
 #include "BLI_utildefines.h"
@@ -63,17 +63,17 @@
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
 #include "BKE_camera.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_displist.h"
 #include "BKE_effect.h"
 #include "BKE_font.h"
-#include "BKE_group.h"
 #include "BKE_lamp.h"
 #include "BKE_lattice.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
@@ -86,11 +86,13 @@
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_report.h"
-#include "BKE_sca.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_speaker.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -112,8 +114,6 @@
 
 #include "UI_resources.h"
 
-#include "GPU_material.h"
-
 #include "object_intern.h"
 
 /* this is an exact copy of the define in rna_lamp.c
@@ -146,6 +146,16 @@ static const EnumPropertyItem field_type_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
+static EnumPropertyItem lightprobe_type_items[] = {
+	{LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_LIGHTPROBE_CUBEMAP, "Reflection Cubemap",
+     "Reflection probe with spherical or cubic attenuation"},
+	{LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_LIGHTPROBE_PLANAR, "Reflection Plane",
+     "Planar reflection probe"},
+	{LIGHTPROBE_TYPE_GRID, "GRID", ICON_LIGHTPROBE_GRID, "Irradiance Volume",
+     "Irradiance probe to capture diffuse indirect lighting"},
+	{0, NULL, 0, NULL, NULL}
+};
+
 /************************** Exported *****************************/
 
 void ED_object_location_from_view(bContext *C, float loc[3])
@@ -154,7 +164,7 @@ void ED_object_location_from_view(bContext *C, float loc[3])
 	Scene *scene = CTX_data_scene(C);
 	const float *cursor;
 
-	cursor = ED_view3d_cursor3d_get(scene, v3d);
+	cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	copy_v3_v3(loc, cursor);
 }
@@ -207,6 +217,7 @@ void ED_object_base_init_transform(bContext *C, Base *base, const float loc[3],
 {
 	Object *ob = base->object;
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	if (!scene) return;
 
@@ -216,7 +227,7 @@ void ED_object_base_init_transform(bContext *C, Base *base, const float loc[3],
 	if (rot)
 		copy_v3_v3(ob->rot, rot);
 
-	BKE_object_where_is_calc(scene, ob);
+	BKE_object_where_is_calc(depsgraph, scene, ob);
 }
 
 /* Uses context to figure out transform for primitive.
@@ -294,7 +305,7 @@ void ED_object_add_generic_props(wmOperatorType *ot, bool do_editmode)
 
 void ED_object_add_mesh_props(wmOperatorType *ot)
 {
-	RNA_def_boolean(ot->srna, "calc_uvs", false, "Generate UVs", "Generate a default UV map");
+	RNA_def_boolean(ot->srna, "calc_uvs", true, "Generate UVs", "Generate a default UV map");
 }
 
 bool ED_object_add_generic_get_opts(bContext *C, wmOperator *op, const char view_align_axis,
@@ -404,10 +415,11 @@ Object *ED_object_add_type(
         bContext *C,
         int type, const char *name,
         const float loc[3], const float rot[3],
-        bool enter_editmode, unsigned int layer)
+        bool enter_editmode, unsigned int UNUSED(layer))
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob;
 
 	/* for as long scene has editmode... */
@@ -416,24 +428,20 @@ Object *ED_object_add_type(
 	}
 
 	/* deselects all, sets scene->basact */
-	ob = BKE_object_add(bmain, scene, type, name);
-	BASACT->lay = ob->lay = layer;
+	ob = BKE_object_add(bmain, scene, view_layer, type, name);
 	/* editor level activate, notifiers */
-	ED_base_object_activate(C, BASACT);
+	ED_object_base_activate(C, view_layer->basact);
 
 	/* more editor stuff */
-	ED_object_base_init_transform(C, BASACT, loc, rot);
-
-	/* Ignore collisions by default for non-mesh objects */
-	if (type != OB_MESH) {
-		ob->body_type = OB_BODY_TYPE_NO_COLLISION;
-		ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_OCCLUDER | OB_DYNAMIC | OB_NAVMESH); /* copied from rna_object.c */
-	}
+	ED_object_base_init_transform(C, view_layer->basact, loc, rot);
 
-	DAG_id_type_tag(bmain, ID_OB);
-	DAG_relations_tag_update(bmain);
-	if (ob->data) {
-		ED_render_id_flush_update(bmain, ob->data);
+	/* TODO(sergey): This is weird to manually tag objects for update, better to
+	 * use DEG_id_tag_update here perhaps.
+	 */
+	DEG_id_type_tag(bmain, ID_OB);
+	DEG_relations_tag_update(bmain);
+	if (ob->data != NULL) {
+		DEG_id_tag_update_ex(bmain, (ID *)ob->data, DEG_TAG_EDITORS_UPDATE);
 	}
 
 	if (enter_editmode)
@@ -441,6 +449,9 @@ Object *ED_object_add_type(
 
 	WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
 
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(&scene->id, 0);
+
 	return ob;
 }
 
@@ -492,6 +503,79 @@ void OBJECT_OT_add(wmOperatorType *ot)
 	ED_object_add_generic_props(ot, true);
 }
 
+/********************** Add Probe Operator **********************/
+
+/* for object add operator */
+static int lightprobe_add_exec(bContext *C, wmOperator *op)
+{
+	Object *ob;
+	LightProbe *probe;
+	int type;
+	bool enter_editmode;
+	unsigned int layer;
+	float loc[3], rot[3];
+	float radius;
+
+	WM_operator_view3d_unit_defaults(C, op);
+	if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL))
+		return OPERATOR_CANCELLED;
+
+	type = RNA_enum_get(op->ptr, "type");
+	radius = RNA_float_get(op->ptr, "radius");
+
+	const char *name = CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Light Probe");
+	ob = ED_object_add_type(C, OB_LIGHTPROBE, name, loc, rot, false, layer);
+	BKE_object_obdata_size_init(ob, radius);
+
+	probe = (LightProbe *)ob->data;
+	probe->type = type;
+
+	switch (type) {
+		case LIGHTPROBE_TYPE_GRID:
+			probe->distinf = 0.3f;
+			probe->falloff = 1.0f;
+			probe->clipsta = 0.01f;
+			break;
+		case LIGHTPROBE_TYPE_PLANAR:
+			probe->distinf = 0.1f;
+			probe->falloff = 0.5f;
+			probe->clipsta = 0.001f;
+			ob->empty_drawsize = 0.5f;
+			break;
+		case LIGHTPROBE_TYPE_CUBE:
+			probe->attenuation_type = LIGHTPROBE_SHAPE_ELIPSOID;
+			break;
+		default:
+			BLI_assert(!"Lightprobe type not configured.");
+			break;
+	}
+
+	DEG_relations_tag_update(CTX_data_main(C));
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_lightprobe_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Light Probe";
+	ot->description = "Add a light probe object";
+	ot->idname = "OBJECT_OT_lightprobe_add";
+
+	/* api callbacks */
+	ot->exec = lightprobe_add_exec;
+	ot->poll = ED_operator_objectmode;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	ot->prop = RNA_def_enum(ot->srna, "type", lightprobe_type_items, 0, "Type", "");
+
+	ED_object_add_unit_props(ot);
+	ED_object_add_generic_props(ot, true);
+}
+
 /********************* Add Effector Operator ********************/
 
 /* for object add operator */
@@ -535,7 +619,7 @@ static int effector_add_exec(bContext *C, wmOperator *op)
 
 	ob->pd = object_add_collision_fields(type);
 
-	DAG_relations_tag_update(CTX_data_main(C));
+	DEG_relations_tag_update(CTX_data_main(C));
 
 	return OPERATOR_FINISHED;
 }
@@ -640,7 +724,7 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
 		newob = true;
 	}
 	else {
-		DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 	}
 
 	ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
@@ -744,7 +828,7 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
 		newob = true;
 	}
 	else {
-		DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 	}
 
 	if (obedit == NULL) {
@@ -932,7 +1016,7 @@ static int object_lamp_add_exec(bContext *C, wmOperator *op)
 	la = (Lamp *)ob->data;
 	la->type = type;
 
-	if (BKE_scene_use_new_shading_nodes(scene)) {
+	if (BKE_scene_uses_cycles(scene)) {
 		ED_node_shader_default(C, &la->id);
 		la->use_nodes = true;
 	}
@@ -963,12 +1047,12 @@ void OBJECT_OT_lamp_add(wmOperatorType *ot)
 	ED_object_add_generic_props(ot, false);
 }
 
-/********************* Add Group Instance Operator ********************/
+/********************* Add Collection Instance Operator ********************/
 
-static int group_instance_add_exec(bContext *C, wmOperator *op)
+static int collection_instance_add_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Group *group;
+	Collection *collection;
 	unsigned int layer;
 	float loc[3], rot[3];
 
@@ -976,7 +1060,7 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
 		char name[MAX_ID_NAME - 2];
 
 		RNA_string_get(op->ptr, "name", name);
-		group = (Group *)BKE_libblock_find_name(bmain, ID_GR, name);
+		collection = (Collection *)BKE_libblock_find_name(bmain, ID_GR, name);
 
 		if (0 == RNA_struct_property_is_set(op->ptr, "location")) {
 			const wmEvent *event = CTX_wm_window(C)->eventstate;
@@ -989,20 +1073,29 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
 		}
 	}
 	else
-		group = BLI_findlink(&CTX_data_main(C)->group, RNA_enum_get(op->ptr, "group"));
+		collection = BLI_findlink(&CTX_data_main(C)->collection, RNA_enum_get(op->ptr, "collection"));
 
 	if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, &layer, NULL))
 		return OPERATOR_CANCELLED;
 
-	if (group) {
+	if (collection) {
 		Scene *scene = CTX_data_scene(C);
-		Object *ob = ED_object_add_type(C, OB_EMPTY, group->id.name + 2, loc, rot, false, layer);
-		ob->dup_group = group;
-		ob->transflag |= OB_DUPLIGROUP;
-		id_us_plus(&group->id);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+
+		/* Avoid dependency cycles. */
+		LayerCollection *active_lc = BKE_layer_collection_get_active(view_layer);
+		while (BKE_collection_find_cycle(active_lc->collection, collection)) {
+			active_lc = BKE_layer_collection_activate_parent(view_layer, active_lc);
+		}
+
+		Object *ob = ED_object_add_type(C, OB_EMPTY, collection->id.name + 2, loc, rot, false, layer);
+		ob->dup_group = collection;
+		ob->transflag |= OB_DUPLICOLLECTION;
+		id_us_plus(&collection->id);
 
 		/* works without this except if you try render right after, see: 22027 */
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
+		DEG_id_tag_update(&collection->id, 0);
 
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
@@ -1013,27 +1106,27 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
 }
 
 /* only used as menu */
-void OBJECT_OT_group_instance_add(wmOperatorType *ot)
+void OBJECT_OT_collection_instance_add(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name = "Add Group Instance";
-	ot->description = "Add a dupligroup instance";
-	ot->idname = "OBJECT_OT_group_instance_add";
+	ot->name = "Add Collection Instance";
+	ot->description = "Add a collection instance";
+	ot->idname = "OBJECT_OT_collection_instance_add";
 
 	/* api callbacks */
 	ot->invoke = WM_enum_search_invoke;
-	ot->exec = group_instance_add_exec;
+	ot->exec = collection_instance_add_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_string(ot->srna, "name", "Group", MAX_ID_NAME - 2, "Name", "Group name to add");
-	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "");
-	RNA_def_enum_funcs(prop, RNA_group_itemf);
+	RNA_def_string(ot->srna, "name", "Collection", MAX_ID_NAME - 2, "Name", "Collection name to add");
+	prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "");
+	RNA_def_enum_funcs(prop, RNA_collection_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 	ED_object_add_generic_props(ot, false);
@@ -1096,35 +1189,22 @@ void OBJECT_OT_speaker_add(wmOperatorType *ot)
 
 /**************************** Delete Object *************************/
 
-static void object_delete_check_glsl_update(Object *ob)
-{
-	/* some objects could affect on GLSL shading, make sure GLSL settings
-	 * are being tagged to be updated when object is removing from scene
-	 */
-	if (ob->type == OB_LAMP) {
-		if (ob->gpulamp.first)
-			GPU_lamp_free(ob);
-	}
-}
-
 /* remove base from a specific scene */
 /* note: now unlinks constraints as well */
-void ED_base_object_free_and_unlink(Main *bmain, Scene *scene, Base *base)
+void ED_object_base_free_and_unlink(Main *bmain, Scene *scene, Object *ob)
 {
-	if (BKE_library_ID_is_indirectly_used(bmain, base->object) &&
-	    ID_REAL_USERS(base->object) <= 1 && ID_EXTRA_USERS(base->object) == 0)
+	if (BKE_library_ID_is_indirectly_used(bmain, ob) &&
+	    ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0)
 	{
 		/* We cannot delete indirectly used object... */
 		printf("WARNING, undeletable object '%s', should have been catched before reaching this function!",
-		       base->object->id.name + 2);
+		       ob->id.name + 2);
 		return;
 	}
 
-	BKE_scene_base_unlink(scene, base);
-	object_delete_check_glsl_update(base->object);
-	BKE_libblock_free_us(bmain, base->object);
-	MEM_freeN(base);
-	DAG_id_type_tag(bmain, ID_OB);
+	DEG_id_tag_update_ex(bmain, &ob->id, DEG_TAG_BASE_FLAGS_UPDATE);
+
+	BKE_scene_collections_object_remove(bmain, scene, ob, true);
 }
 
 static int object_delete_exec(bContext *C, wmOperator *op)
@@ -1139,18 +1219,18 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 	if (CTX_data_edit_object(C))
 		return OPERATOR_CANCELLED;
 
-	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
+	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 	{
-		const bool is_indirectly_used = BKE_library_ID_is_indirectly_used(bmain, base->object);
-		if (base->object->id.tag & LIB_TAG_INDIRECT) {
+		const bool is_indirectly_used = BKE_library_ID_is_indirectly_used(bmain, ob);
+		if (ob->id.tag & LIB_TAG_INDIRECT) {
 			/* Can this case ever happen? */
-			BKE_reportf(op->reports, RPT_WARNING, "Cannot delete indirectly linked object '%s'", base->object->id.name + 2);
+			BKE_reportf(op->reports, RPT_WARNING, "Cannot delete indirectly linked object '%s'", ob->id.name + 2);
 			continue;
 		}
-		else if (is_indirectly_used && ID_REAL_USERS(base->object) <= 1 && ID_EXTRA_USERS(base->object) == 0) {
+		else if (is_indirectly_used && ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0) {
 			BKE_reportf(op->reports, RPT_WARNING,
 			        "Cannot delete object '%s' from scene '%s', indirectly used objects need at least one user",
-			        base->object->id.name + 2, scene->id.name + 2);
+			        ob->id.name + 2, scene->id.name + 2);
 			continue;
 		}
 
@@ -1158,9 +1238,9 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 		 * custom scene/object/base handling, and use generic lib remap/query for that.
 		 * But this is for later (aka 2.8, once layers & co are settled and working).
 		 */
-		if (use_global && base->object->id.lib == NULL) {
+		if (use_global && ob->id.lib == NULL) {
 			/* We want to nuke the object, let's nuke it the easy way (not for linked data though)... */
-			BKE_libblock_delete(bmain, &base->object->id);
+			BKE_libblock_delete(bmain, &ob->id);
 			changed = true;
 			continue;
 		}
@@ -1171,38 +1251,28 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 		for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) {
 			for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 				if (gpl->parent != NULL) {
-					Object *ob = gpl->parent;
-					Object *curob = base->object;
-					if (ob == curob) {
+					if (gpl->parent == ob) {
 						gpl->parent = NULL;
 					}
 				}
 			}
 		}
 
-		/* deselect object -- it could be used in other scenes */
-		base->object->flag &= ~SELECT;
-
 		/* remove from current scene only */
-		ED_base_object_free_and_unlink(bmain, scene, base);
+		ED_object_base_free_and_unlink(bmain, scene, ob);
 		changed = true;
 
 		if (use_global) {
 			Scene *scene_iter;
-			Base *base_other;
-
 			for (scene_iter = bmain->scene.first; scene_iter; scene_iter = scene_iter->id.next) {
 				if (scene_iter != scene && !ID_IS_LINKED(scene_iter)) {
-					base_other = BKE_scene_base_find(scene_iter, base->object);
-					if (base_other) {
-						if (is_indirectly_used && ID_REAL_USERS(base->object) <= 1 && ID_EXTRA_USERS(base->object) == 0) {
-							BKE_reportf(op->reports, RPT_WARNING,
-							            "Cannot delete object '%s' from scene '%s', indirectly used objects need at least one user",
-							            base->object->id.name + 2, scene_iter->id.name + 2);
-							break;
-						}
-						ED_base_object_free_and_unlink(bmain, scene_iter, base_other);
+					if (is_indirectly_used && ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0) {
+						BKE_reportf(op->reports, RPT_WARNING,
+						            "Cannot delete object '%s' from scene '%s', indirectly used objects need at least one user",
+						            ob->id.name + 2, scene_iter->id.name + 2);
+						break;
 					}
+					ED_object_base_free_and_unlink(bmain, scene_iter, ob);
 				}
 			}
 		}
@@ -1216,12 +1286,12 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 	/* delete has to handle all open scenes */
 	BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, true);
 	for (win = wm->windows.first; win; win = win->next) {
-		scene = win->screen->scene;
+		scene = WM_window_get_active_scene(win);
 
 		if (scene->id.tag & LIB_TAG_DOIT) {
 			scene->id.tag &= ~LIB_TAG_DOIT;
 
-			DAG_relations_tag_update(bmain);
+			DEG_relations_tag_update(bmain);
 
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 			WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
@@ -1262,15 +1332,13 @@ static void copy_object_set_idnew(bContext *C)
 	}
 	CTX_DATA_END;
 
-	set_sca_new_poins();
-
 	BKE_main_id_clear_newpoins(bmain);
 }
 
 /********************* Make Duplicates Real ************************/
 
 /**
- * \note regarding hashing dupli-objects when using OB_DUPLIGROUP, skip the first member of #DupliObject.persistent_id
+ * \note regarding hashing dupli-objects when using OB_DUPLICOLLECTION, skip the first member of #DupliObject.persistent_id
  * since its a unique index and we only want to know if the group objects are from the same dupli-group instance.
  */
 static unsigned int dupliobject_group_hash(const void *ptr)
@@ -1285,7 +1353,7 @@ static unsigned int dupliobject_group_hash(const void *ptr)
 }
 
 /**
- * \note regarding hashing dupli-objects when NOT using OB_DUPLIGROUP, include the first member of #DupliObject.persistent_id
+ * \note regarding hashing dupli-objects when NOT using OB_DUPLICOLLECTION, include the first member of #DupliObject.persistent_id
  * since its the index of the vertex/face the object is instantiated on and we want to identify objects on the same vertex/face.
  */
 static unsigned int dupliobject_hash(const void *ptr)
@@ -1343,6 +1411,8 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                                        const bool use_hierarchy)
 {
 	Main *bmain = CTX_data_main(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ListBase *lb_duplis;
 	DupliObject *dob;
 	GHash *dupli_gh, *parent_gh = NULL;
@@ -1351,11 +1421,11 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 		return;
 	}
 
-	lb_duplis = object_duplilist(bmain->eval_ctx, scene, base->object);
+	lb_duplis = object_duplilist(depsgraph, scene, base->object);
 
 	dupli_gh = BLI_ghash_ptr_new(__func__);
 	if (use_hierarchy) {
-		if (base->object->transflag & OB_DUPLIGROUP) {
+		if (base->object->transflag & OB_DUPLICOLLECTION) {
 			parent_gh = BLI_ghash_new(dupliobject_group_hash, dupliobject_group_cmp, __func__);
 		}
 		else {
@@ -1375,12 +1445,11 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 			ob_dst->totcol = 0;
 		}
 
-		base_dst = MEM_dupallocN(base);
-		base_dst->flag &= ~(OB_FROMDUPLI | OB_FROMGROUP);
-		ob_dst->flag = base_dst->flag;
-		base_dst->lay = base->lay;
-		BLI_addhead(&scene->base, base_dst);   /* addhead: othwise eternal loop */
-		base_dst->object = ob_dst;
+		BKE_collection_object_add_from(bmain, scene, base->object, ob_dst);
+		base_dst = BKE_view_layer_base_find(view_layer, ob_dst);
+		BLI_assert(base_dst != NULL);
+
+		BKE_scene_object_base_flag_sync_from_base(base_dst);
 
 		/* make sure apply works */
 		BKE_animdata_free(&ob_dst->id, true);
@@ -1395,7 +1464,6 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 		BKE_constraints_free(&ob_dst->constraints);
 		ob_dst->curve_cache = NULL;
 		ob_dst->transflag &= ~OB_DUPLI;
-		ob_dst->lay = base->lay;
 
 		copy_m4_m4(ob_dst->obmat, dob->mat);
 		BKE_object_apply_mat4(ob_dst, ob_dst->obmat, false, false);
@@ -1417,9 +1485,8 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 
 		/* Remap new object to itself, and clear again newid pointer of orig object. */
 		BKE_libblock_relink_to_newid(&ob_dst->id);
-		set_sca_new_poins_ob(ob_dst);
 
-		DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 
 		if (use_hierarchy) {
 			/* original parents */
@@ -1432,7 +1499,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 				 * they won't be read, this is simply for a hash lookup. */
 				DupliObject dob_key;
 				dob_key.ob = ob_src_par;
-				if (base->object->transflag & OB_DUPLIGROUP) {
+				if (base->object->transflag & OB_DUPLICOLLECTION) {
 					memcpy(&dob_key.persistent_id[1],
 					       &dob->persistent_id[1],
 					       sizeof(dob->persistent_id[1]) * (MAX_DUPLI_RECUR - 1));
@@ -1473,16 +1540,16 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 			BKE_object_apply_mat4(ob_dst, dob->mat, false, true);
 
 			/* to set ob_dst->orig and in case theres any other discrepicies */
-			DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
 		}
 	}
 
-	if (base->object->transflag & OB_DUPLIGROUP && base->object->dup_group) {
+	if (base->object->transflag & OB_DUPLICOLLECTION && base->object->dup_group) {
 		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 			if (ob->proxy_group == base->object) {
 				ob->proxy = NULL;
 				ob->proxy_from = NULL;
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
 		}
 	}
@@ -1518,7 +1585,7 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_SCENE, scene);
 	WM_main_add_notifier(NC_OBJECT | ND_DRAW, NULL);
 
@@ -1552,46 +1619,43 @@ static const EnumPropertyItem convert_target_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-static void convert_ensure_curve_cache(Main *bmain, Scene *scene, Object *ob)
+static void convert_ensure_curve_cache(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
 	if (ob->curve_cache == NULL) {
 		/* Force creation. This is normally not needed but on operator
 		 * redo we might end up with an object which isn't evaluated yet.
 		 */
 		if (ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT)) {
-			BKE_displist_make_curveTypes(scene, ob, false);
+			BKE_displist_make_curveTypes(depsgraph, scene, ob, false);
 		}
 		else if (ob->type == OB_MBALL) {
-			BKE_displist_make_mball(bmain->eval_ctx, scene, ob);
+			BKE_displist_make_mball(depsgraph, scene, ob);
 		}
 	}
 }
 
-static void curvetomesh(Main *bmain, Scene *scene, Object *ob)
+static void curvetomesh(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
-	convert_ensure_curve_cache(bmain, scene, ob);
+	convert_ensure_curve_cache(depsgraph, scene, ob);
 	BKE_mesh_from_nurbs(ob); /* also does users */
 
 	if (ob->type == OB_MESH) {
 		BKE_object_free_modifiers(ob, 0);
-
-		/* Game engine defaults for mesh objects */
-		ob->body_type = OB_BODY_TYPE_STATIC;
-		ob->gameflag = OB_PROP | OB_COLLISION;
 	}
 }
 
 static int convert_poll(bContext *C)
 {
-	Object *obact = CTX_data_active_object(C);
 	Scene *scene = CTX_data_scene(C);
+	Base *base_act = CTX_data_active_base(C);
+	Object *obact = base_act ? base_act->object : NULL;
 
-	return (!ID_IS_LINKED(scene) && obact && scene->obedit != obact &&
-	        (obact->flag & SELECT) && !ID_IS_LINKED(obact));
+	return (!ID_IS_LINKED(scene) && obact && (BKE_object_is_in_editmode(obact) == false) &&
+	        (base_act->flag & BASE_SELECTED) && !ID_IS_LINKED(obact));
 }
 
 /* Helper for convert_exec */
-static Base *duplibase_for_convert(Main *bmain, Scene *scene, Base *base, Object *ob)
+static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, Object *ob)
 {
 	Object *obn;
 	Base *basen;
@@ -1601,26 +1665,23 @@ static Base *duplibase_for_convert(Main *bmain, Scene *scene, Base *base, Object
 	}
 
 	obn = BKE_object_copy(bmain, ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
-
-	basen = MEM_mallocN(sizeof(Base), "duplibase");
-	*basen = *base;
-	BLI_addhead(&scene->base, basen);   /* addhead: otherwise eternal loop */
-	basen->object = obn;
-	basen->flag |= SELECT;
-	obn->flag |= SELECT;
-	base->flag &= ~SELECT;
-	ob->flag &= ~SELECT;
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+	BKE_collection_object_add_from(bmain, scene, ob, obn);
 
+	basen = BKE_view_layer_base_find(view_layer, obn);
+	ED_object_base_select(basen, BA_SELECT);
+	ED_object_base_select(basen, BA_DESELECT);
 	return basen;
 }
 
 static int convert_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Base *basen = NULL, *basact = NULL;
-	Object *ob, *ob1, *newob, *obact = CTX_data_active_object(C);
+	Object *ob1, *newob, *obact = CTX_data_active_object(C);
 	DerivedMesh *dm;
 	Curve *cu;
 	Nurb *nu;
@@ -1633,10 +1694,8 @@ static int convert_exec(bContext *C, wmOperator *op)
 	/* don't forget multiple users! */
 
 	{
-		Base *base;
-
-		for (base = scene->base.first; base; base = base->next) {
-			ob = base->object;
+		FOREACH_SCENE_OBJECT_BEGIN(scene, ob)
+		{
 			ob->flag &= ~OB_DONE;
 
 			/* flag data thats not been edited (only needed for !keep_original) */
@@ -1648,13 +1707,14 @@ static int convert_exec(bContext *C, wmOperator *op)
 			if (ob->type == OB_MBALL && target == OB_MESH) {
 				if (BKE_mball_is_basis(ob) == false) {
 					Object *ob_basis;
-					ob_basis = BKE_mball_basis_find(bmain->eval_ctx, scene, ob);
+					ob_basis = BKE_mball_basis_find(scene, ob);
 					if (ob_basis) {
 						ob_basis->flag &= ~OB_DONE;
 					}
 				}
 			}
 		}
+		FOREACH_SCENE_OBJECT_END;
 	}
 
 	ListBase selected_editable_bases = CTX_data_collection_get(C, "selected_editable_bases");
@@ -1665,7 +1725,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 	{
 		for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) {
 			Base *base = link->ptr.data;
-			ob = base->object;
+			Object *ob = base->object;
 
 			/* The way object type conversion works currently (enforcing conversion of *all* objetcs using converted
 			 * obdata, even some un-selected/hidden/inother scene ones, sounds totally bad to me.
@@ -1678,18 +1738,18 @@ static int convert_exec(bContext *C, wmOperator *op)
 				            "Converting some linked object/object data, enforcing 'Keep Original' option to True");
 			}
 
-			DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 		}
 
 		uint64_t customdata_mask_prev = scene->customdata_mask;
 		scene->customdata_mask |= CD_MASK_MESH;
-		BKE_scene_update_tagged(bmain->eval_ctx, bmain, scene);
+		BKE_scene_graph_update_tagged(depsgraph, bmain);
 		scene->customdata_mask = customdata_mask_prev;
 	}
 
 	for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) {
 		Base *base = link->ptr.data;
-		ob = base->object;
+		Object *ob = base->object;
 
 		if (ob->flag & OB_DONE || !IS_TAGGED(ob->data)) {
 			if (ob->type != target) {
@@ -1710,7 +1770,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original mesh's usage count  */
@@ -1724,7 +1784,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 				newob = ob;
 			}
 
-			BKE_mesh_to_curve(scene, newob);
+			BKE_mesh_to_curve(depsgraph, scene, newob);
 
 			if (newob->type == OB_CURVE) {
 				BKE_object_free_modifiers(newob, 0);   /* after derivedmesh calls! */
@@ -1735,7 +1795,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original mesh's usage count  */
@@ -1747,14 +1807,14 @@ static int convert_exec(bContext *C, wmOperator *op)
 			}
 			else {
 				newob = ob;
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 			}
 
 			/* make new mesh data from the original copy */
 			/* note: get the mesh from the original, not from the copy in some
 			 * cases this doesnt give correct results (when MDEF is used for eg)
 			 */
-			dm = mesh_get_derived_final(scene, newob, CD_MASK_MESH);
+			dm = mesh_get_derived_final(depsgraph, scene, newob, CD_MASK_MESH);
 
 			DM_to_mesh(dm, newob->data, newob, CD_MASK_MESH, true);
 
@@ -1766,7 +1826,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original curve's usage count  */
@@ -1813,7 +1873,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 					for (ob1 = bmain->object.first; ob1; ob1 = ob1->id.next) {
 						if (ob1->data == ob->data) {
 							ob1->type = OB_CURVE;
-							DAG_id_tag_update(&ob1->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+							DEG_id_tag_update(&ob1->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 						}
 					}
 				}
@@ -1826,7 +1886,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			BKE_curve_curve_dimension_update(cu);
 
 			if (target == OB_MESH) {
-				curvetomesh(bmain, scene, newob);
+				curvetomesh(depsgraph, scene, newob);
 
 				/* meshes doesn't use displist */
 				BKE_object_free_curve_cache(newob);
@@ -1837,7 +1897,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 
 			if (target == OB_MESH) {
 				if (keep_original) {
-					basen = duplibase_for_convert(bmain, scene, base, NULL);
+					basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 					newob = basen->object;
 
 					/* decrement original curve's usage count  */
@@ -1850,7 +1910,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 					newob = ob;
 				}
 
-				curvetomesh(bmain, scene, newob);
+				curvetomesh(depsgraph, scene, newob);
 
 				/* meshes doesn't use displist */
 				BKE_object_free_curve_cache(newob);
@@ -1859,10 +1919,10 @@ static int convert_exec(bContext *C, wmOperator *op)
 		else if (ob->type == OB_MBALL && target == OB_MESH) {
 			Object *baseob;
 
-			base->flag &= ~SELECT;
-			ob->flag &= ~SELECT;
+			base->flag &= ~BASE_SELECTED;
+			ob->base_flag &= ~BASE_SELECTED;
 
-			baseob = BKE_mball_basis_find(bmain->eval_ctx, scene, ob);
+			baseob = BKE_mball_basis_find(scene, ob);
 
 			if (ob != baseob) {
 				/* if motherball is converting it would be marked as done later */
@@ -1872,7 +1932,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			if (!(baseob->flag & OB_DONE)) {
 				baseob->flag |= OB_DONE;
 
-				basen = duplibase_for_convert(bmain, scene, base, baseob);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, baseob);
 				newob = basen->object;
 
 				mb = newob->data;
@@ -1888,7 +1948,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 					for (a = 0; a < newob->totcol; a++) id_us_plus((ID *)me->mat[a]);
 				}
 
-				convert_ensure_curve_cache(bmain, scene, baseob);
+				convert_ensure_curve_cache(depsgraph, scene, baseob);
 				BKE_mesh_from_metaball(&baseob->curve_cache->disp, newob->data);
 
 				if (obact->type == OB_MBALL) {
@@ -1915,7 +1975,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 		}
 
 		if (!keep_original && (ob->flag & OB_DONE)) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			((ID *)ob->data)->tag &= ~LIB_TAG_DOIT; /* flag not to convert this datablock again */
 		}
 	}
@@ -1923,27 +1983,24 @@ static int convert_exec(bContext *C, wmOperator *op)
 
 	if (!keep_original) {
 		if (mballConverted) {
-			Base *base, *base_next;
-
-			for (base = scene->base.first; base; base = base_next) {
-				base_next = base->next;
-
-				ob = base->object;
-				if (ob->type == OB_MBALL) {
-					if (ob->flag & OB_DONE) {
+			FOREACH_SCENE_OBJECT_BEGIN(scene, ob_mball)
+			{
+				if (ob_mball->type == OB_MBALL) {
+					if (ob_mball->flag & OB_DONE) {
 						Object *ob_basis = NULL;
-						if (BKE_mball_is_basis(ob) ||
-						    ((ob_basis = BKE_mball_basis_find(bmain->eval_ctx, scene, ob)) && (ob_basis->flag & OB_DONE)))
+						if (BKE_mball_is_basis(ob_mball) ||
+						    ((ob_basis = BKE_mball_basis_find(scene, ob_mball)) && (ob_basis->flag & OB_DONE)))
 						{
-							ED_base_object_free_and_unlink(bmain, scene, base);
+							ED_object_base_free_and_unlink(bmain, scene, ob_mball);
 						}
 					}
 				}
 			}
+			FOREACH_SCENE_OBJECT_END;
 		}
 
 		/* delete object should renew depsgraph */
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 	}
 
 // XXX	ED_object_editmode_enter(C, 0);
@@ -1951,15 +2008,15 @@ static int convert_exec(bContext *C, wmOperator *op)
 
 	if (basact) {
 		/* active base was changed */
-		ED_base_object_activate(C, basact);
-		BASACT = basact;
+		ED_object_base_activate(C, basact);
+		BASACT(view_layer) = basact;
 	}
-	else if (BASACT->object->flag & OB_DONE) {
-		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT->object);
-		WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT->object);
+	else if (BASACT(view_layer)->object->flag & OB_DONE) {
+		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(view_layer)->object);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(view_layer)->object);
 	}
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, scene);
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
@@ -1998,39 +2055,43 @@ void OBJECT_OT_convert(wmOperatorType *ot)
 /* used below, assumes id.new is correct */
 /* leaves selection of base/object unaltered */
 /* Does set ID->newid pointers. */
-static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base, int dupflag)
+static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob, int dupflag)
 {
 #define ID_NEW_REMAP_US(a)	if (      (a)->id.newid) { (a) = (void *)(a)->id.newid;       (a)->id.us++; }
 #define ID_NEW_REMAP_US2(a)	if (((ID *)a)->newid)    { (a) = ((ID  *)a)->newid;     ((ID *)a)->us++;    }
 
-	Base *basen = NULL;
+	Base *base, *basen = NULL;
 	Material ***matarar;
-	Object *ob, *obn;
+	Object *obn;
 	ID *id;
 	int a, didit;
 
-	ob = base->object;
 	if (ob->mode & OB_MODE_POSE) {
 		; /* nothing? */
 	}
 	else {
 		obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
-		DAG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+		DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
 
-		basen = MEM_mallocN(sizeof(Base), "duplibase");
-		*basen = *base;
-		BLI_addhead(&scene->base, basen);   /* addhead: prevent eternal loop */
-		basen->object = obn;
+		base = BKE_view_layer_base_find(view_layer, ob);
+		if ((base != NULL) && (base->flag & BASE_VISIBLED)) {
+			BKE_collection_object_add_from(bmain, scene, ob, obn);
+		}
+		else {
+			LayerCollection *layer_collection = BKE_layer_collection_get_active(view_layer);
+			BKE_collection_object_add(bmain, layer_collection->collection, obn);
+		}
+		basen = BKE_view_layer_base_find(view_layer, obn);
 
-		/* 1) duplis should end up in same group as the original
-		 * 2) Rigid Body sim participants MUST always be part of a group...
+		/* 1) duplis should end up in same collection as the original
+		 * 2) Rigid Body sim participants MUST always be part of a collection...
 		 */
 		// XXX: is 2) really a good measure here?
-		if ((basen->flag & OB_FROMGROUP) || ob->rigidbody_object || ob->rigidbody_constraint) {
-			Group *group;
-			for (group = bmain->group.first; group; group = group->id.next) {
-				if (BKE_group_object_exists(group, ob))
-					BKE_group_object_add(group, obn, scene, basen);
+		if (ob->rigidbody_object || ob->rigidbody_constraint) {
+			Collection *collection;
+			for (collection = bmain->collection.first; collection; collection = collection->id.next) {
+				if (BKE_collection_has_object(collection, ob))
+					BKE_collection_object_add(bmain, collection, obn);
 			}
 		}
 
@@ -2139,7 +2200,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
 				}
 				break;
 			case OB_ARMATURE:
-				DAG_id_tag_update(&obn->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&obn->id, OB_RECALC_DATA);
 				if (obn->pose)
 					BKE_pose_tag_recalc(bmain, obn->pose);
 				if (dupflag & USER_DUP_ARM) {
@@ -2194,25 +2255,10 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
 			}
 
 			if (dupflag & USER_DUP_ACT) {
-				bActuator *act;
-
 				BKE_animdata_copy_id_action((ID *)obn->data, true);
 				if (key) {
 					BKE_animdata_copy_id_action((ID *)key, true);
 				}
-
-				/* Update the duplicated action in the action actuators */
-				/* XXX TODO this code is all wrong! actact->act is user-refcounted (see readfile.c),
-				 * and what about other ID pointers of other BGE logic bricks,
-				 * and since this is object-level, why is it only ran if obdata was duplicated??? -mont29 */
-				for (act = obn->actuators.first; act; act = act->next) {
-					if (act->type == ACT_ACTION) {
-						bActionActuator *actact = (bActionActuator *) act->data;
-						if (ob->adt && actact->act == ob->adt->action) {
-							actact->act = obn->adt->action;
-						}
-					}
-				}
 			}
 
 			if (dupflag & USER_DUP_MAT) {
@@ -2243,14 +2289,12 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
  * note: don't call this within a loop since clear_* funcs loop over the entire database.
  * note: caller must do DAG_relations_tag_update(bmain);
  *       this is not done automatic since we may duplicate many objects in a batch */
-Base *ED_object_add_duplicate(Main *bmain, Scene *scene, Base *base, int dupflag)
+Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, int dupflag)
 {
 	Base *basen;
 	Object *ob;
 
-	clear_sca_new_poins();  /* BGE logic */
-
-	basen = object_add_duplicate_internal(bmain, scene, base, dupflag);
+	basen = object_add_duplicate_internal(bmain, scene, view_layer, base->object, dupflag);
 	if (basen == NULL) {
 		return NULL;
 	}
@@ -2259,12 +2303,11 @@ Base *ED_object_add_duplicate(Main *bmain, Scene *scene, Base *base, int dupflag
 
 	/* link own references to the newly duplicated data [#26816] */
 	BKE_libblock_relink_to_newid(&ob->id);
-	set_sca_new_poins_ob(ob);
 
 	/* DAG_relations_tag_update(bmain); */ /* caller must do */
 
-	if (ob->data) {
-		ED_render_id_flush_update(bmain, ob->data);
+	if (ob->data != NULL) {
+		DEG_id_tag_update_ex(bmain, (ID *)ob->data, DEG_TAG_EDITORS_UPDATE);
 	}
 
 	BKE_main_id_clear_newpoins(bmain);
@@ -2277,29 +2320,29 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const bool linked = RNA_boolean_get(op->ptr, "linked");
 	int dupflag = (linked) ? 0 : U.dupflag;
 
-	clear_sca_new_poins();  /* BGE logic */
-
 	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
-		Base *basen = object_add_duplicate_internal(bmain, scene, base, dupflag);
+		Base *basen = object_add_duplicate_internal(bmain, scene, view_layer, base->object, dupflag);
 
 		/* note that this is safe to do with this context iterator,
 		 * the list is made in advance */
-		ED_base_object_select(base, BA_DESELECT);
+		ED_object_base_select(base, BA_DESELECT);
+		ED_object_base_select(basen, BA_SELECT);
 
 		if (basen == NULL) {
 			continue;
 		}
 
 		/* new object becomes active */
-		if (BASACT == base)
-			ED_base_object_activate(C, basen);
+		if (BASACT(view_layer) == base)
+			ED_object_base_activate(C, basen);
 
 		if (basen->object->data) {
-			DAG_id_tag_update(basen->object->data, 0);
+			DEG_id_tag_update(basen->object->data, 0);
 		}
 	}
 	CTX_DATA_END;
@@ -2308,7 +2351,9 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 
 	BKE_main_id_clear_newpoins(bmain);
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(&scene->id, 0);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
@@ -2344,9 +2389,9 @@ static int add_named_exec(bContext *C, wmOperator *op)
 	wmWindow *win = CTX_wm_window(C);
 	const wmEvent *event = win ? win->eventstate : NULL;
 	Main *bmain = CTX_data_main(C);
-	View3D *v3d = CTX_wm_view3d(C);  /* may be NULL */
 	Scene *scene = CTX_data_scene(C);
-	Base *basen, *base;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Base *basen;
 	Object *ob;
 	const bool linked = RNA_boolean_get(op->ptr, "linked");
 	int dupflag = (linked) ? 0 : U.dupflag;
@@ -2361,22 +2406,15 @@ static int add_named_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	base = MEM_callocN(sizeof(Base), "duplibase");
-	base->object = ob;
-	base->flag = ob->flag;
-
 	/* prepare dupli */
-	clear_sca_new_poins();  /* BGE logic */
-
-	basen = object_add_duplicate_internal(bmain, scene, base, dupflag);
+	basen = object_add_duplicate_internal(bmain, scene, view_layer, ob, dupflag);
 
 	if (basen == NULL) {
-		MEM_freeN(base);
 		BKE_report(op->reports, RPT_ERROR, "Object could not be duplicated");
 		return OPERATOR_CANCELLED;
 	}
 
-	basen->lay = basen->object->lay = BKE_screen_view3d_layer_active(v3d, scene);
+	BKE_scene_object_base_flag_sync_from_object(basen);
 	basen->object->restrictflag &= ~OB_RESTRICT_VIEW;
 
 	if (event) {
@@ -2387,16 +2425,15 @@ static int add_named_exec(bContext *C, wmOperator *op)
 		ED_view3d_cursor3d_position(C, basen->object->loc, mval);
 	}
 
-	ED_base_object_select(basen, BA_SELECT);
-	ED_base_object_activate(C, basen);
+	ED_object_base_select(basen, BA_SELECT);
+	ED_object_base_activate(C, basen);
 
 	copy_object_set_idnew(C);
 
 	BKE_main_id_clear_newpoins(bmain);
 
-	DAG_relations_tag_update(bmain);
-
-	MEM_freeN(base);
+	/* TODO(sergey): Only update relations for the current scene. */
+	DEG_relations_tag_update(bmain);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
@@ -2438,10 +2475,9 @@ static int join_poll(bContext *C)
 
 static int join_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 
-	if (scene->obedit) {
+	if (ob->mode & OB_MODE_EDIT) {
 		BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
 		return OPERATOR_CANCELLED;
 	}
@@ -2492,10 +2528,9 @@ static int join_shapes_poll(bContext *C)
 
 static int join_shapes_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 
-	if (scene->obedit) {
+	if (ob->mode & OB_MODE_EDIT) {
 		BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
 		return OPERATOR_CANCELLED;
 	}
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index ee0dfe14cd3..a8da5c038b4 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -52,15 +52,17 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_material.h"
 #include "BKE_multires.h"
 #include "BKE_report.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 #include "RE_multires_bake.h"
@@ -77,15 +79,37 @@
 
 #include "ED_object.h"
 #include "ED_screen.h"
+#include "ED_uvedit.h"
 
 #include "object_intern.h"
 
+static Image *bake_object_image_get(Object *ob, int mat_nr)
+{
+	Image *image = NULL;
+	ED_object_get_active_image(ob, mat_nr + 1, &image, NULL, NULL, NULL);
+	return image;
+}
+
+static Image **bake_object_image_get_array(Object *ob)
+{
+	Image **image_array = MEM_mallocN(sizeof(Material *) * ob->totcol, __func__);
+	for (int i = 0; i < ob->totcol; i++) {
+		image_array[i] = bake_object_image_get(ob, i);
+	}
+	return image_array;
+}
+
 /* ****************** multires BAKING ********************** */
 
 /* holder of per-object data needed for bake job
  * needed to make job totally thread-safe */
 typedef struct MultiresBakerJobData {
 	struct MultiresBakerJobData *next, *prev;
+	/* material aligned image array (for per-face bake image) */
+	struct {
+		Image **array;
+		int     len;
+	} ob_image;
 	DerivedMesh *lores_dm, *hires_dm;
 	bool simple;
 	int lvl, tot_lvl;
@@ -101,8 +125,6 @@ typedef struct {
 	bool use_lores_mesh;  /* Use low-resolution mesh when baking displacement maps */
 	int number_of_rays;   /* Number of rays to be cast when doing AO baking */
 	float bias;           /* Bias between object and start ray point when doing AO baking */
-	int raytrace_structure;  /* Optimization structure to be used for AO baking */
-	int octree_resolution;   /* Reslution of octotree when using octotree optimization structure */
 	int threads;             /* Number of threads to be used for baking */
 	float user_scale;          /* User scale used to scale displacement when baking derivative map. */
 } MultiresBakeJob;
@@ -152,7 +174,7 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
 			break;
 		}
 
-		if (!me->mtpoly) {
+		if (!me->mloopuv) {
 			BKE_report(op->reports, RPT_ERROR, "Mesh should be unwrapped before multires data baking");
 
 			ok = false;
@@ -160,7 +182,7 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
 		else {
 			a = me->totpoly;
 			while (ok && a--) {
-				Image *ima = me->mtpoly[a].tpage;
+				Image *ima = bake_object_image_get(ob, me->mpoly[a].mat_nr);
 
 				if (!ima) {
 					BKE_report(op->reports, RPT_ERROR, "You should have active texture to use multires baker");
@@ -283,20 +305,27 @@ static void clear_single_image(Image *image, ClearFlag flag)
 	}
 }
 
-static void clear_images_poly(MTexPoly *mtpoly, int totpoly, ClearFlag flag)
+static void clear_images_poly(Image **ob_image_array, int ob_image_array_len, ClearFlag flag)
 {
-	int a;
-
-	for (a = 0; a < totpoly; a++) {
-		mtpoly[a].tpage->id.tag &= ~LIB_TAG_DOIT;
+	for (int i = 0; i < ob_image_array_len; i++) {
+		Image *image = ob_image_array[i];
+		if (image) {
+			image->id.tag &= ~LIB_TAG_DOIT;
+		}
 	}
 
-	for (a = 0; a < totpoly; a++) {
-		clear_single_image(mtpoly[a].tpage, flag);
+	for (int i = 0; i < ob_image_array_len; i++) {
+		Image *image = ob_image_array[i];
+		if (image) {
+			clear_single_image(image, flag);
+		}
 	}
 
-	for (a = 0; a < totpoly; a++) {
-		mtpoly[a].tpage->id.tag &= ~LIB_TAG_DOIT;
+	for (int i = 0; i < ob_image_array_len; i++) {
+		Image *image = ob_image_array[i];
+		if (image) {
+			image->id.tag &= ~LIB_TAG_DOIT;
+		}
 	}
 }
 
@@ -312,20 +341,23 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 	if (scene->r.bake_flag & R_BAKE_CLEAR) {  /* clear images */
 		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
-			Mesh *me;
 			ClearFlag clear_flag = 0;
 
 			ob = base->object;
-			me = (Mesh *)ob->data;
+			// me = (Mesh *)ob->data;
 
 			if (scene->r.bake_mode == RE_BAKE_NORMALS) {
 				clear_flag = CLEAR_TANGENT_NORMAL;
 			}
-			else if (ELEM(scene->r.bake_mode, RE_BAKE_DISPLACEMENT, RE_BAKE_DERIVATIVE)) {
+			else if (scene->r.bake_mode == RE_BAKE_DISPLACEMENT) {
 				clear_flag = CLEAR_DISPLACEMENT;
 			}
 
-			clear_images_poly(me->mtpoly, me->totpoly, clear_flag);
+			{
+				Image **ob_image_array = bake_object_image_get_array(ob);
+				clear_images_poly(ob_image_array, ob->totcol, clear_flag);
+				MEM_freeN(ob_image_array);
+			}
 		}
 		CTX_DATA_END;
 	}
@@ -344,18 +376,21 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 		bkr.use_lores_mesh = scene->r.bake_flag & R_BAKE_LORES_MESH;
 		bkr.bias = scene->r.bake_biasdist;
 		bkr.number_of_rays = scene->r.bake_samples;
-		bkr.raytrace_structure = scene->r.raytrace_structure;
-		bkr.octree_resolution = scene->r.ocres;
 		bkr.threads = BKE_scene_num_threads(scene);
 		bkr.user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
 		//bkr.reports= op->reports;
 
 		/* create low-resolution DM (to bake to) and hi-resolution DM (to bake from) */
+		bkr.ob_image.array = bake_object_image_get_array(ob);
+		bkr.ob_image.len = ob->totcol;
+
 		bkr.hires_dm = multiresbake_create_hiresdm(scene, ob, &bkr.tot_lvl, &bkr.simple);
 		bkr.lores_dm = multiresbake_create_loresdm(scene, ob, &bkr.lvl);
 
 		RE_multires_bake_images(&bkr);
 
+		MEM_freeN(bkr.ob_image.array);
+
 		BLI_freelistN(&bkr.image);
 
 		bkr.lores_dm->release(bkr.lores_dm);
@@ -384,8 +419,6 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
 	bkj->bake_clear = scene->r.bake_flag & R_BAKE_CLEAR;
 	bkj->bias = scene->r.bake_biasdist;
 	bkj->number_of_rays = scene->r.bake_samples;
-	bkj->raytrace_structure = scene->r.raytrace_structure;
-	bkj->octree_resolution = scene->r.ocres;
 	bkj->threads = BKE_scene_num_threads(scene);
 	bkj->user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
 	//bkj->reports = op->reports;
@@ -401,6 +434,9 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
 
 		data = MEM_callocN(sizeof(MultiresBakerJobData), "multiresBaker derivedMesh_data");
 
+		data->ob_image.array = bake_object_image_get_array(ob);
+		data->ob_image.len = ob->totcol;
+
 		/* create low-resolution DM (to bake to) and hi-resolution DM (to bake from) */
 		data->hires_dm = multiresbake_create_hiresdm(scene, ob, &data->tot_lvl, &data->simple);
 		data->lores_dm = multiresbake_create_loresdm(scene, ob, &lvl);
@@ -421,18 +457,16 @@ static void multiresbake_startjob(void *bkv, short *stop, short *do_update, floa
 
 	if (bkj->bake_clear) {  /* clear images */
 		for (data = bkj->data.first; data; data = data->next) {
-			DerivedMesh *dm = data->lores_dm;
-			MTexPoly *mtexpoly = CustomData_get_layer(&dm->polyData, CD_MTEXPOLY);
 			ClearFlag clear_flag = 0;
 
 			if (bkj->mode == RE_BAKE_NORMALS) {
 				clear_flag = CLEAR_TANGENT_NORMAL;
 			}
-			else if (ELEM(bkj->mode, RE_BAKE_DISPLACEMENT, RE_BAKE_DERIVATIVE)) {
+			else if (bkj->mode == RE_BAKE_DISPLACEMENT) {
 				clear_flag = CLEAR_DISPLACEMENT;
 			}
 
-			clear_images_poly(mtexpoly, dm->getNumPolys(dm), clear_flag);
+			clear_images_poly(data->ob_image.array, data->ob_image.len, clear_flag);
 		}
 	}
 
@@ -445,6 +479,8 @@ static void multiresbake_startjob(void *bkv, short *stop, short *do_update, floa
 		bkr.use_lores_mesh = bkj->use_lores_mesh;
 		bkr.user_scale = bkj->user_scale;
 		//bkr.reports = bkj->reports;
+		bkr.ob_image.array = data->ob_image.array;
+		bkr.ob_image.len   = data->ob_image.len;
 
 		/* create low-resolution DM (to bake to) and hi-resolution DM (to bake from) */
 		bkr.lores_dm = data->lores_dm;
@@ -463,8 +499,6 @@ static void multiresbake_startjob(void *bkv, short *stop, short *do_update, floa
 
 		bkr.bias = bkj->bias;
 		bkr.number_of_rays = bkj->number_of_rays;
-		bkr.raytrace_structure = bkj->raytrace_structure;
-		bkr.octree_resolution = bkj->octree_resolution;
 		bkr.threads = bkj->threads;
 
 		RE_multires_bake_images(&bkr);
@@ -493,6 +527,8 @@ static void multiresbake_freejob(void *bkv)
 			GPU_free_image(ima);
 		}
 
+		MEM_freeN(data->ob_image.array);
+
 		BLI_freelistN(&data->images);
 
 		MEM_freeN(data);
@@ -539,201 +575,6 @@ static int multiresbake_image_exec(bContext *C, wmOperator *op)
 
 /* ****************** render BAKING ********************** */
 
-/* threaded break test */
-static int thread_break(void *UNUSED(arg))
-{
-	return G.is_break;
-}
-
-typedef struct BakeRender {
-	Render *re;
-	Main *main;
-	Scene *scene;
-	struct Object *actob;
-	int result, ready;
-
-	ReportList *reports;
-
-	short *stop;
-	short *do_update;
-	float *progress;
-
-	ListBase threads;
-
-	/* backup */
-	short prev_wo_amb_occ;
-	short prev_r_raytrace;
-
-	/* for redrawing */
-	ScrArea *sa;
-} BakeRender;
-
-/* use by exec and invoke */
-static int test_bake_internal(bContext *C, ReportList *reports)
-{
-	Scene *scene = CTX_data_scene(C);
-
-	if ((scene->r.bake_flag & R_BAKE_TO_ACTIVE) && CTX_data_active_object(C) == NULL) {
-		BKE_report(reports, RPT_ERROR, "No active object");
-	}
-	else if (scene->r.bake_mode == RE_BAKE_AO && scene->world == NULL) {
-		BKE_report(reports, RPT_ERROR, "No world set up");
-	}
-	else {
-		return 1;
-	}
-
-	return 0;
-}
-
-static void init_bake_internal(BakeRender *bkr, bContext *C)
-{
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	bScreen *sc = CTX_wm_screen(C);
-
-	/* get editmode results */
-	ED_object_editmode_load(bmain, CTX_data_edit_object(C));
-
-	bkr->sa = sc ? BKE_screen_find_big_area(sc, SPACE_IMAGE, 10) : NULL; /* can be NULL */
-	bkr->main = bmain;
-	bkr->scene = scene;
-	bkr->actob = (scene->r.bake_flag & R_BAKE_TO_ACTIVE) ? OBACT : NULL;
-	bkr->re = RE_NewRender("_Bake View_");
-
-	if (scene->r.bake_mode == RE_BAKE_AO) {
-		/* If raytracing or AO is disabled, switch it on temporarily for baking. */
-		bkr->prev_wo_amb_occ = (scene->world->mode & WO_AMB_OCC) != 0;
-		scene->world->mode |= WO_AMB_OCC;
-	}
-	if (scene->r.bake_mode == RE_BAKE_AO || bkr->actob) {
-		bkr->prev_r_raytrace = (scene->r.mode & R_RAYTRACE) != 0;
-		scene->r.mode |= R_RAYTRACE;
-	}
-}
-
-static void finish_bake_internal(BakeRender *bkr)
-{
-	Image *ima;
-
-	RE_Database_Free(bkr->re);
-
-	/* restore raytrace and AO */
-	if (bkr->scene->r.bake_mode == RE_BAKE_AO)
-		if (bkr->prev_wo_amb_occ == 0)
-			bkr->scene->world->mode &= ~WO_AMB_OCC;
-
-	if (bkr->scene->r.bake_mode == RE_BAKE_AO || bkr->actob)
-		if (bkr->prev_r_raytrace == 0)
-			bkr->scene->r.mode &= ~R_RAYTRACE;
-
-	/* force OpenGL reload and mipmap recalc */
-	if ((bkr->scene->r.bake_flag & R_BAKE_VCOL) == 0) {
-		for (ima = bkr->main->image.first; ima; ima = ima->id.next) {
-			ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);
-
-			/* some of the images could have been changed during bake,
-			 * so recreate mipmaps regardless bake result status
-			 */
-			if (ima->ok == IMA_OK_LOADED) {
-				if (ibuf) {
-					if (ibuf->userflags & IB_BITMAPDIRTY) {
-						GPU_free_image(ima);
-						imb_freemipmapImBuf(ibuf);
-					}
-
-					/* invalidate display buffers for changed images */
-					if (ibuf->userflags & IB_BITMAPDIRTY)
-						ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
-				}
-			}
-
-			/* freed when baking is done, but if its canceled we need to free here */
-			if (ibuf) {
-				if (ibuf->userdata) {
-					BakeImBufuserData *userdata = (BakeImBufuserData *) ibuf->userdata;
-					if (userdata->mask_buffer)
-						MEM_freeN(userdata->mask_buffer);
-					if (userdata->displacement_buffer)
-						MEM_freeN(userdata->displacement_buffer);
-					MEM_freeN(userdata);
-					ibuf->userdata = NULL;
-				}
-			}
-
-			BKE_image_release_ibuf(ima, ibuf, NULL);
-			DAG_id_tag_update(&ima->id, 0);
-		}
-	}
-
-	if (bkr->scene->r.bake_flag & R_BAKE_VCOL) {
-		/* update all tagged meshes */
-		Mesh *me;
-		BLI_assert(BLI_thread_is_main());
-		for (me = bkr->main->mesh.first; me; me = me->id.next) {
-			if (me->id.tag & LIB_TAG_DOIT) {
-				DAG_id_tag_update(&me->id, OB_RECALC_DATA);
-				BKE_mesh_tessface_clear(me);
-			}
-		}
-	}
-
-}
-
-static void *do_bake_render(void *bake_v)
-{
-	BakeRender *bkr = bake_v;
-
-	bkr->result = RE_bake_shade_all_selected(bkr->re, bkr->scene->r.bake_mode, bkr->actob, NULL, bkr->progress);
-	bkr->ready = 1;
-
-	return NULL;
-}
-
-static void bake_startjob(void *bkv, short *stop, short *do_update, float *progress)
-{
-	BakeRender *bkr = bkv;
-	Scene *scene = bkr->scene;
-	Main *bmain = bkr->main;
-
-	bkr->stop = stop;
-	bkr->do_update = do_update;
-	bkr->progress = progress;
-
-	RE_test_break_cb(bkr->re, NULL, thread_break);
-	G.is_break = false;   /* BKE_blender_test_break uses this global */
-
-	RE_Database_Baking(bkr->re, bmain, scene, scene->lay, scene->r.bake_mode, bkr->actob);
-
-	/* baking itself is threaded, cannot use test_break in threads. we also update optional imagewindow */
-	bkr->result = RE_bake_shade_all_selected(bkr->re, scene->r.bake_mode, bkr->actob, bkr->do_update, bkr->progress);
-}
-
-static void bake_update(void *bkv)
-{
-	BakeRender *bkr = bkv;
-
-	if (bkr->sa && bkr->sa->spacetype == SPACE_IMAGE) { /* in case the user changed while baking */
-		SpaceImage *sima = bkr->sa->spacedata.first;
-		if (sima)
-			sima->image = RE_bake_shade_get_image();
-	}
-}
-
-static void bake_freejob(void *bkv)
-{
-	BakeRender *bkr = bkv;
-	finish_bake_internal(bkr);
-
-	if (bkr->result == BAKE_RESULT_NO_OBJECTS)
-		BKE_report(bkr->reports, RPT_ERROR, "No objects or images found to bake to");
-	else if (bkr->result == BAKE_RESULT_FEEDBACK_LOOP)
-		BKE_report(bkr->reports, RPT_WARNING, "Circular reference in texture stack");
-
-	MEM_freeN(bkr);
-	G.is_rendering = false;
-}
-
 /* catch esc */
 static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
 {
@@ -751,7 +592,7 @@ static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const
 
 static bool is_multires_bake(Scene *scene)
 {
-	if (ELEM(scene->r.bake_mode, RE_BAKE_NORMALS, RE_BAKE_DISPLACEMENT, RE_BAKE_DERIVATIVE, RE_BAKE_AO))
+	if (ELEM(scene->r.bake_mode, RE_BAKE_NORMALS, RE_BAKE_DISPLACEMENT, RE_BAKE_AO))
 		return scene->r.bake_flag & R_BAKE_MULTIRES;
 
 	return 0;
@@ -762,44 +603,7 @@ static int objects_bake_render_invoke(bContext *C, wmOperator *op, const wmEvent
 	Scene *scene = CTX_data_scene(C);
 	int result = OPERATOR_CANCELLED;
 
-	if (is_multires_bake(scene)) {
-		result = multiresbake_image_exec(C, op);
-	}
-	else {
-		/* only one render job at a time */
-		if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE))
-			return OPERATOR_CANCELLED;
-
-		if (test_bake_internal(C, op->reports) == 0) {
-			return OPERATOR_CANCELLED;
-		}
-		else {
-			BakeRender *bkr = MEM_callocN(sizeof(BakeRender), "render bake");
-			wmJob *wm_job;
-
-			init_bake_internal(bkr, C);
-			bkr->reports = op->reports;
-
-			/* setup job */
-			wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Texture Bake",
-			                     WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE);
-			WM_jobs_customdata_set(wm_job, bkr, bake_freejob);
-			WM_jobs_timer(wm_job, 0.5, NC_IMAGE, 0); /* TODO - only draw bake image, can we enforce this */
-			WM_jobs_callbacks(wm_job, bake_startjob, NULL, bake_update, NULL);
-
-			G.is_break = false;
-			G.is_rendering = true;
-
-			WM_jobs_start(CTX_wm_manager(C), wm_job);
-
-			WM_cursor_wait(0);
-
-			/* add modal handler for ESC */
-			WM_event_add_modal_handler(C, op);
-		}
-
-		result = OPERATOR_RUNNING_MODAL;
-	}
+	result = multiresbake_image_exec(C, op);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
 
@@ -809,55 +613,15 @@ static int objects_bake_render_invoke(bContext *C, wmOperator *op, const wmEvent
 
 static int bake_image_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	int result = OPERATOR_CANCELLED;
 
-	if (is_multires_bake(scene)) {
-		result = multiresbake_image_exec_locked(C, op);
+	if (!is_multires_bake(scene)) {
+		BLI_assert(0);
+		return result;
 	}
-	else {
-		if (test_bake_internal(C, op->reports) == 0) {
-			return OPERATOR_CANCELLED;
-		}
-		else {
-			ListBase threads;
-			BakeRender bkr = {NULL};
-
-			init_bake_internal(&bkr, C);
-			bkr.reports = op->reports;
-
-			RE_test_break_cb(bkr.re, NULL, thread_break);
-			G.is_break = false;   /* BKE_blender_test_break uses this global */
-
-			RE_Database_Baking(bkr.re, bmain, scene, scene->lay, scene->r.bake_mode, (scene->r.bake_flag & R_BAKE_TO_ACTIVE) ? OBACT : NULL);
-
-			/* baking itself is threaded, cannot use test_break in threads  */
-			BLI_threadpool_init(&threads, do_bake_render, 1);
-			bkr.ready = 0;
-			BLI_threadpool_insert(&threads, &bkr);
 
-			while (bkr.ready == 0) {
-				PIL_sleep_ms(50);
-				if (bkr.ready)
-					break;
-
-				/* used to redraw in 2.4x but this is just for exec in 2.5 */
-				if (!G.background)
-					BKE_blender_test_break();
-			}
-			BLI_threadpool_end(&threads);
-
-			if (bkr.result == BAKE_RESULT_NO_OBJECTS)
-				BKE_report(op->reports, RPT_ERROR, "No valid images found to bake to");
-			else if (bkr.result == BAKE_RESULT_FEEDBACK_LOOP)
-				BKE_report(op->reports, RPT_ERROR, "Circular reference in texture stack");
-
-			finish_bake_internal(&bkr);
-
-			result = OPERATOR_FINISHED;
-		}
-	}
+	result = multiresbake_image_exec_locked(C, op);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
 
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 3e0f62154ac..677a98cf942 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -56,8 +56,11 @@
 #include "BKE_report.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
+#include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_depsgraph.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
@@ -84,6 +87,7 @@ typedef struct BakeAPIRender {
 	Object *ob;
 	Main *main;
 	Scene *scene;
+	ViewLayer *view_layer;
 	ReportList *reports;
 	ListBase selected_objects;
 
@@ -272,7 +276,7 @@ static void refresh_images(BakeImages *bake_images)
 		Image *ima = bake_images->data[i].image;
 		if (ima->ok == IMA_OK_LOADED) {
 			GPU_free_image(ima);
-			DAG_id_tag_update(&ima->id, 0);
+			DEG_id_tag_update(&ima->id, 0);
 		}
 	}
 }
@@ -619,11 +623,11 @@ static size_t initialize_internal_images(BakeImages *bake_images, ReportList *re
 }
 
 /* create new mesh with edit mode changes and modifiers applied */
-static Mesh *bake_mesh_new_from_object(Main *bmain, Scene *scene, Object *ob)
+static Mesh *bake_mesh_new_from_object(Depsgraph *depsgraph, Main *bmain, Scene *scene, Object *ob)
 {
 	ED_object_editmode_load(bmain, ob);
 
-	Mesh *me = BKE_mesh_new_from_object(bmain, scene, ob, 1, 2, 0, 0);
+	Mesh *me = BKE_mesh_new_from_object(depsgraph, bmain, scene, ob, 1, 0, 0);
 	if (me->flag & ME_AUTOSMOOTH) {
 		BKE_mesh_split_faces(me, true);
 	}
@@ -632,7 +636,8 @@ static Mesh *bake_mesh_new_from_object(Main *bmain, Scene *scene, Object *ob)
 }
 
 static int bake(
-        Render *re, Main *bmain, Scene *scene, Object *ob_low, ListBase *selected_objects, ReportList *reports,
+        Render *re, Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob_low, ListBase *selected_objects,
+        ReportList *reports,
         const eScenePassType pass_type, const int pass_filter, const int margin,
         const eBakeSaveMode save_mode, const bool is_clear, const bool is_split_materials,
         const bool is_automatic_name, const bool is_selected_to_active, const bool is_cage,
@@ -640,6 +645,8 @@ static int bake(
         const char *custom_cage, const char *filepath, const int width, const int height,
         const char *identifier, ScrArea *sa, const char *uv_layer)
 {
+	Depsgraph *depsgraph = DEG_graph_new(scene, view_layer, DAG_EVAL_RENDER);
+
 	int op_result = OPERATOR_CANCELLED;
 	bool ok = false;
 
@@ -781,8 +788,12 @@ static int bake(
 		}
 	}
 
+	/* Make sure depsgraph is up to date. */
+	DEG_graph_build_from_view_layer(depsgraph, bmain, scene, view_layer);
+	BKE_scene_graph_update_tagged(depsgraph, bmain);
+
 	/* get the mesh as it arrives in the renderer */
-	me_low = bake_mesh_new_from_object(bmain, scene, ob_low);
+	me_low = bake_mesh_new_from_object(depsgraph, bmain, scene, ob_low);
 
 	/* populate the pixel array with the face data */
 	if ((is_selected_to_active && (ob_cage == NULL) && is_cage) == false)
@@ -797,7 +808,7 @@ static int bake(
 
 		/* prepare cage mesh */
 		if (ob_cage) {
-			me_cage = bake_mesh_new_from_object(bmain, scene, ob_cage);
+			me_cage = bake_mesh_new_from_object(depsgraph, bmain, scene, ob_cage);
 			if ((me_low->totpoly != me_cage->totpoly) || (me_low->totloop != me_cage->totloop)) {
 				BKE_report(reports, RPT_ERROR,
 				           "Invalid cage object, the cage mesh must have the same number "
@@ -829,7 +840,7 @@ static int bake(
 			ob_low->modifiers = modifiers_tmp;
 
 			/* get the cage mesh as it arrives in the renderer */
-			me_cage = bake_mesh_new_from_object(bmain, scene, ob_low);
+			me_cage = bake_mesh_new_from_object(depsgraph, bmain, scene, ob_low);
 			RE_bake_pixels_populate(me_cage, pixel_array_low, num_pixels, &bake_images, uv_layer);
 		}
 
@@ -855,7 +866,7 @@ static int bake(
 			tmd->quad_method = MOD_TRIANGULATE_QUAD_FIXED;
 			tmd->ngon_method = MOD_TRIANGULATE_NGON_EARCLIP;
 
-			highpoly[i].me = bake_mesh_new_from_object(bmain, scene, highpoly[i].ob);
+			highpoly[i].me = bake_mesh_new_from_object(depsgraph, bmain, scene, highpoly[i].ob);
 			highpoly[i].ob->restrictflag &= ~OB_RESTRICT_RENDER;
 
 			/* lowpoly to highpoly transformation matrix */
@@ -882,7 +893,7 @@ static int bake(
 
 		/* the baking itself */
 		for (i = 0; i < tot_highpoly; i++) {
-			ok = RE_bake_engine(re, highpoly[i].ob, i, pixel_array_high,
+			ok = RE_bake_engine(re, depsgraph, highpoly[i].ob, i, pixel_array_high,
 			                    num_pixels, depth, pass_type, pass_filter, result);
 			if (!ok) {
 				BKE_reportf(reports, RPT_ERROR, "Error baking from object \"%s\"", highpoly[i].ob->id.name + 2);
@@ -909,7 +920,7 @@ cage_cleanup:
 		ob_low->restrictflag &= ~OB_RESTRICT_RENDER;
 
 		if (RE_bake_has_engine(re)) {
-			ok = RE_bake_engine(re, ob_low, 0, pixel_array_low, num_pixels, depth, pass_type, pass_filter, result);
+			ok = RE_bake_engine(re, depsgraph, ob_low, 0, pixel_array_low, num_pixels, depth, pass_type, pass_filter, result);
 		}
 		else {
 			BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
@@ -958,7 +969,7 @@ cage_cleanup:
 						md->mode &= ~eModifierMode_Render;
 					}
 
-					me_nores = bake_mesh_new_from_object(bmain, scene, ob_low);
+					me_nores = bake_mesh_new_from_object(depsgraph, bmain, scene, ob_low);
 					RE_bake_pixels_populate(me_nores, pixel_array_low, num_pixels, &bake_images, uv_layer);
 
 					RE_bake_normal_world_to_tangent(pixel_array_low, num_pixels, depth, result, me_nores, normal_swizzle, ob_low->obmat);
@@ -1109,6 +1120,8 @@ cleanup:
 	if (me_cage)
 		BKE_libblock_free(bmain, me_cage);
 
+	DEG_graph_free(depsgraph);
+
 	return op_result;
 }
 
@@ -1119,6 +1132,7 @@ static void bake_init_api_data(wmOperator *op, bContext *C, BakeAPIRender *bkr)
 
 	bkr->ob = CTX_data_active_object(C);
 	bkr->main = CTX_data_main(C);
+	bkr->view_layer = CTX_data_view_layer(C);
 	bkr->scene = CTX_data_scene(C);
 	bkr->sa = sc ? BKE_screen_find_big_area(sc, SPACE_IMAGE, 10) : NULL;
 
@@ -1202,7 +1216,7 @@ static int bake_exec(bContext *C, wmOperator *op)
 
 	if (bkr.is_selected_to_active) {
 		result = bake(
-		        bkr.render, bkr.main, bkr.scene, bkr.ob, &bkr.selected_objects, bkr.reports,
+		        bkr.render, bkr.main, bkr.scene, bkr.view_layer, bkr.ob, &bkr.selected_objects, bkr.reports,
 		        bkr.pass_type, bkr.pass_filter, bkr.margin, bkr.save_mode,
 		        bkr.is_clear, bkr.is_split_materials, bkr.is_automatic_name, true, bkr.is_cage,
 		        bkr.cage_extrusion, bkr.normal_space, bkr.normal_swizzle,
@@ -1215,7 +1229,7 @@ static int bake_exec(bContext *C, wmOperator *op)
 		for (link = bkr.selected_objects.first; link; link = link->next) {
 			Object *ob_iter = link->ptr.data;
 			result = bake(
-			        bkr.render, bkr.main, bkr.scene, ob_iter, NULL, bkr.reports,
+			        bkr.render, bkr.main, bkr.scene, bkr.view_layer, ob_iter, NULL, bkr.reports,
 			        bkr.pass_type, bkr.pass_filter, bkr.margin, bkr.save_mode,
 			        is_clear, bkr.is_split_materials, bkr.is_automatic_name, false, bkr.is_cage,
 			        bkr.cage_extrusion, bkr.normal_space, bkr.normal_swizzle,
@@ -1260,7 +1274,7 @@ static void bake_startjob(void *bkv, short *UNUSED(stop), short *do_update, floa
 
 	if (bkr->is_selected_to_active) {
 		bkr->result = bake(
-		        bkr->render, bkr->main, bkr->scene, bkr->ob, &bkr->selected_objects, bkr->reports,
+		        bkr->render, bkr->main, bkr->scene, bkr->view_layer, bkr->ob, &bkr->selected_objects, bkr->reports,
 		        bkr->pass_type, bkr->pass_filter, bkr->margin, bkr->save_mode,
 		        bkr->is_clear, bkr->is_split_materials, bkr->is_automatic_name, true, bkr->is_cage,
 		        bkr->cage_extrusion, bkr->normal_space, bkr->normal_swizzle,
@@ -1273,7 +1287,7 @@ static void bake_startjob(void *bkv, short *UNUSED(stop), short *do_update, floa
 		for (link = bkr->selected_objects.first; link; link = link->next) {
 			Object *ob_iter = link->ptr.data;
 			bkr->result = bake(
-			        bkr->render, bkr->main, bkr->scene, ob_iter, NULL, bkr->reports,
+			        bkr->render, bkr->main, bkr->scene, bkr->view_layer, ob_iter, NULL, bkr->reports,
 			        bkr->pass_type, bkr->pass_filter, bkr->margin, bkr->save_mode,
 			        is_clear, bkr->is_split_materials, bkr->is_automatic_name, false, bkr->is_cage,
 			        bkr->cage_extrusion, bkr->normal_space, bkr->normal_swizzle,
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index d0588806313..121a30c754a 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -53,7 +53,6 @@
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -62,6 +61,9 @@
 #include "BKE_tracking.h"
 #include "BIK_api.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
@@ -596,6 +598,11 @@ static int edit_constraint_poll_generic(bContext *C, StructRNA *rna_type)
 		return 0;
 	}
 
+	if (ID_IS_STATIC_OVERRIDE(ob)) {
+		CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints comming from static override");
+		return (((bConstraint *)ptr.data)->flag & CONSTRAINT_STATICOVERRIDE_LOCAL) != 0;
+	}
+
 	return 1;
 }
 
@@ -775,8 +782,10 @@ void CONSTRAINT_OT_limitdistance_reset(wmOperatorType *ot)
 
 /* ------------- Child-Of Constraint ------------------ */
 
-static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con, float invmat[4][4], const int owner)
+static void child_get_inverse_matrix(const bContext *C, Scene *scene, Object *ob, bConstraint *con, float invmat[4][4], const int owner)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	/* nullify inverse matrix first */
 	unit_m4(invmat);
 
@@ -802,7 +811,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con,
 			 * to use as baseline ("pmat") to derive delta from. This extra calc saves users
 			 * from having pressing "Clear Inverse" first
 			 */
-			BKE_pose_where_is(scene, ob);
+			BKE_pose_where_is(depsgraph, scene, ob);
 			copy_m4_m4(pmat, pchan->pose_mat);
 
 			/* 2. knock out constraints starting from this one */
@@ -819,7 +828,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con,
 			}
 
 			/* 3. solve pose without disabled constraints */
-			BKE_pose_where_is(scene, ob);
+			BKE_pose_where_is(depsgraph, scene, ob);
 
 			/* 4. determine effect of constraint by removing the newly calculated
 			 * pchan->pose_mat from the original pchan->pose_mat, thus determining
@@ -842,7 +851,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con,
 			}
 
 			/* 6. recalculate pose with new inv-mat applied */
-			BKE_pose_where_is(scene, ob);
+			BKE_pose_where_is(depsgraph, scene, ob);
 		}
 	}
 	if (owner == EDIT_CONSTRAINT_OWNER_OBJECT) {
@@ -853,7 +862,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con,
 			BLI_assert(BLI_findindex(&ob->constraints, con) != -1);
 
 			/* use BKE_object_workob_calc_parent to find inverse - just like for normal parenting */
-			BKE_object_workob_calc_parent(scene, ob, &workob);
+			BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 			invert_m4_m4(invmat, workob.obmat);
 		}
 	}
@@ -875,7 +884,7 @@ static int childof_set_inverse_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	child_get_inverse_matrix(scene, ob, con, data->invmat, owner);
+	child_get_inverse_matrix(C, scene, ob, con, data->invmat, owner);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
 
@@ -1097,7 +1106,7 @@ static int objectsolver_set_inverse_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	child_get_inverse_matrix(scene, ob, con, data->invmat, owner);
+	child_get_inverse_matrix(C, scene, ob, con, data->invmat, owner);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
 
@@ -1198,9 +1207,9 @@ void ED_object_constraint_update(Main *bmain, Object *ob)
 	object_test_constraints(bmain, ob);
 
 	if (ob->type == OB_ARMATURE)
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
 	else
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 static void object_pose_tag_update(Main *bmain, Object *ob)
@@ -1223,7 +1232,7 @@ void ED_object_constraint_dependency_update(Main *bmain, Object *ob)
 	if (ob->pose) {
 		object_pose_tag_update(bmain, ob);
 	}
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 }
 
 void ED_object_constraint_tag_update(Main *bmain, Object *ob, bConstraint *con)
@@ -1235,9 +1244,14 @@ void ED_object_constraint_tag_update(Main *bmain, Object *ob, bConstraint *con)
 	object_test_constraint(bmain, ob, con);
 
 	if (ob->type == OB_ARMATURE)
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
 	else
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
+
+	/* Do Copy-on-Write tag here too, otherwise constraint
+	 * influence/mute buttons in UI have no effect
+	 */
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 }
 
 void ED_object_constraint_dependency_tag_update(Main *bmain, Object *ob, bConstraint *con)
@@ -1247,7 +1261,7 @@ void ED_object_constraint_dependency_tag_update(Main *bmain, Object *ob, bConstr
 	if (ob->pose) {
 		object_pose_tag_update(bmain, ob);
 	}
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 }
 
 static int constraint_poll(bContext *C)
@@ -1272,7 +1286,7 @@ static int constraint_delete_exec(bContext *C, wmOperator *UNUSED(op))
 		ED_object_constraint_update(bmain, ob); /* needed to set the flags on posebones correctly */
 
 		/* relatiols */
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 
 		/* notifiers */
 		WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
@@ -1414,12 +1428,12 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	CTX_DATA_END;
 
 	/* force depsgraph to get recalculated since relationships removed */
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	/* note, calling BIK_clear_data() isn't needed here */
 
 	/* do updates */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1446,12 +1460,12 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
 		BKE_constraints_free(&ob->constraints);
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 	}
 	CTX_DATA_END;
 
 	/* force depsgraph to get recalculated since relationships removed */
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	/* do updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, NULL);
@@ -1499,13 +1513,13 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op)
 			chan->constflag |= pchan->constflag;
 
 			BKE_pose_tag_recalc(bmain, ob->pose);
-			DAG_id_tag_update((ID *)ob, OB_RECALC_DATA);
+			DEG_id_tag_update((ID *)ob, OB_RECALC_DATA);
 		}
 	}
 	BLI_freelistN(&lb);
 
 	/* force depsgraph to get recalculated since new relationships added */
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, NULL);
 
@@ -1538,13 +1552,13 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op))
 		/* if we're not handling the object we're copying from, copy all constraints over */
 		if (obact != ob) {
 			BKE_constraints_copy(&ob->constraints, &obact->constraints, true);
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 	CTX_DATA_END;
 
 	/* force depsgraph to get recalculated since new relationships added */
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_ADDED, NULL);
@@ -1614,11 +1628,6 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 			only_ob = true;
 			add = false;
 			break;
-
-		/* object only - add here is ok? */
-		case CONSTRAINT_TYPE_RIGIDBODYJOINT:
-			only_ob = true;
-			break;
 	}
 
 	/* if the active Object is Armature, and we can search for bones, do so... */
@@ -1685,14 +1694,15 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 	if ((found == false) && (add)) {
 		Main *bmain = CTX_data_main(C);
 		Scene *scene = CTX_data_scene(C);
-		Base *base = BASACT, *newbase = NULL;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Base *base = BASACT(view_layer), *newbase = NULL;
 		Object *obt;
 
 		/* add new target object */
-		obt = BKE_object_add(bmain, scene, OB_EMPTY, NULL);
+		obt = BKE_object_add(bmain, scene, view_layer, OB_EMPTY, NULL);
 
 		/* set layers OK */
-		newbase = BASACT;
+		newbase = BASACT(view_layer);
 		newbase->lay = base->lay;
 		obt->lay = newbase->lay;
 
@@ -1711,8 +1721,8 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 		}
 
 		/* restore, BKE_object_add sets active */
-		BASACT = base;
-		base->flag |= SELECT;
+		BASACT(view_layer) = base;
+		base->flag |= BASE_SELECTED;
 
 		/* make our new target the new object */
 		*tar_ob = obt;
@@ -1746,10 +1756,6 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 	if (type == CONSTRAINT_TYPE_NULL) {
 		return OPERATOR_CANCELLED;
 	}
-	if ((type == CONSTRAINT_TYPE_RIGIDBODYJOINT) && (list != &ob->constraints)) {
-		BKE_report(op->reports, RPT_ERROR, "Rigid Body Joint constraint can only be added to objects");
-		return OPERATOR_CANCELLED;
-	}
 	if ((type == CONSTRAINT_TYPE_KINEMATIC) && ((!pchan) || (list != &pchan->constraints))) {
 		BKE_report(op->reports, RPT_ERROR, "IK constraint can only be added to bones");
 		return OPERATOR_CANCELLED;
@@ -1820,7 +1826,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 
 
 	/* force depsgraph to get recalculated since new relationships added */
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	if ((ob->type == OB_ARMATURE) && (pchan)) {
 		BKE_pose_tag_recalc(bmain, ob->pose);  /* sort pose channels */
@@ -1830,10 +1836,10 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 			 * XXX Temp hack until new depsgraph hopefully solves this. */
 			ob->adt->recalc |= ADT_RECALC_ANIM;
 		}
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
 	}
 	else
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_ADDED, ob);
@@ -2073,7 +2079,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	CTX_DATA_END;
 
 	/* refresh depsgraph */
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 7845cfe1022..d4e8955b38e 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -40,13 +40,14 @@
 
 #include "BKE_context.h"
 #include "BKE_data_transfer.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -95,13 +96,14 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(
 {
 	EnumPropertyItem *item = NULL, tmp_item = {0};
 	int totitem = 0;
-
 	const int data_type = RNA_enum_get(ptr, "data_type");
 
 	if (!C) {  /* needed for docs and i18n tools */
 		return rna_enum_dt_layers_select_src_items;
 	}
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_ACTIVE_SRC);
 	RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_ALL_SRC);
 
@@ -135,19 +137,19 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(
 
 		if (ob_src) {
 			DerivedMesh *dm_src;
-			CustomData *pdata;
+			CustomData *ldata;
 			int num_data, i;
 
 			/* XXX Is this OK? */
-			dm_src = mesh_get_derived_final(scene, ob_src, CD_MASK_BAREMESH | CD_MTEXPOLY);
-			pdata = dm_src->getPolyDataLayout(dm_src);
-			num_data = CustomData_number_of_layers(pdata, CD_MTEXPOLY);
+			dm_src = mesh_get_derived_final(depsgraph, scene, ob_src, CD_MASK_BAREMESH | CD_MLOOPUV);
+			ldata = dm_src->getLoopDataLayout(dm_src);
+			num_data = CustomData_number_of_layers(ldata, CD_MLOOPUV);
 
 			RNA_enum_item_add_separator(&item, &totitem);
 
 			for (i = 0; i < num_data; i++) {
 				tmp_item.value = i;
-				tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(pdata, CD_MTEXPOLY, i);
+				tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(ldata, CD_MLOOPUV, i);
 				RNA_enum_item_add(&item, &totitem, &tmp_item);
 			}
 		}
@@ -162,7 +164,7 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(
 			int num_data, i;
 
 			/* XXX Is this OK? */
-			dm_src = mesh_get_derived_final(scene, ob_src, CD_MASK_BAREMESH | CD_MLOOPCOL);
+			dm_src = mesh_get_derived_final(depsgraph, scene, ob_src, CD_MASK_BAREMESH | CD_MLOOPCOL);
 			ldata = dm_src->getLoopDataLayout(dm_src);
 			num_data = CustomData_number_of_layers(ldata, CD_MLOOPCOL);
 
@@ -344,6 +346,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob_src = ED_object_active_context(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	ListBase ctx_objects;
 	CollectionPointerLink *ctx_ob_dst;
@@ -412,7 +415,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
 			}
 
 			if (BKE_object_data_transfer_mesh(
-			        scene, ob_src, ob_dst, data_type, use_create,
+			        depsgraph, scene, ob_src, ob_dst, data_type, use_create,
 			        map_vert_mode, map_edge_mode, map_loop_mode, map_poly_mode,
 			        space_transform, use_auto_transform,
 			        max_distance, ray_radius, islands_precision,
@@ -423,7 +426,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
 			}
 		}
 
-		DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 
 		if (reverse_transfer) {
 			SWAP(Object *, ob_src, ob_dst);
@@ -525,7 +528,7 @@ static void data_transfer_ui(bContext *C, wmOperator *op)
 	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 	/* Main auto-draw call */
-	uiDefAutoButsRNA(layout, &ptr, data_transfer_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, data_transfer_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 
 /* transfers weight from active to selected */
@@ -622,6 +625,7 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob_act = ED_object_active_context(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	DataTransferModifierData *dtmd;
 
 	dtmd = (DataTransferModifierData *)edit_modifier_property_get(op, ob_act, eModifierType_DataTransfer);
@@ -638,10 +642,10 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
 			return OPERATOR_CANCELLED;
 		}
 
-		BKE_object_data_transfer_layout(scene, ob_src, ob_dst, dtmd->data_types, use_delete,
+		BKE_object_data_transfer_layout(depsgraph, scene, ob_src, ob_dst, dtmd->data_types, use_delete,
 		                                dtmd->layers_select_src, dtmd->layers_select_dst);
 
-		DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 	}
 	else {
 		Object *ob_src = ob_act;
@@ -668,11 +672,11 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
 		for (ctx_ob_dst = ctx_objects.first; ctx_ob_dst; ctx_ob_dst = ctx_ob_dst->next) {
 			Object *ob_dst = ctx_ob_dst->ptr.data;
 			if (data_transfer_exec_is_object_valid(op, ob_src, ob_dst, false)) {
-				BKE_object_data_transfer_layout(scene, ob_src, ob_dst, data_type, use_delete,
+				BKE_object_data_transfer_layout(depsgraph, scene, ob_src, ob_dst, data_type, use_delete,
 				                                layers_select_src, layers_select_dst);
 			}
 
-			DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 		}
 
 		BLI_freelistN(&ctx_objects);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 2737ae5d92d..9bc01892ef0 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -51,7 +51,6 @@
 #include "DNA_group_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_property_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force_types.h"
@@ -59,15 +58,16 @@
 #include "DNA_vfont_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_workspace_types.h"
 
 #include "IMB_imbuf_types.h"
 
 #include "BKE_anim.h"
+#include "BKE_collection.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_effect.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_lattice.h"
@@ -77,15 +77,18 @@
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_pointcache.h"
-#include "BKE_property.h"
-#include "BKE_sca.h"
 #include "BKE_softbody.h"
 #include "BKE_modifier.h"
 #include "BKE_editlattice.h"
 #include "BKE_editmesh.h"
 #include "BKE_report.h"
-#include "BKE_undo_system.h"
+#include "BKE_workspace.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #include "ED_armature.h"
 #include "ED_curve.h"
@@ -93,6 +96,7 @@
 #include "ED_mball.h"
 #include "ED_lattice.h"
 #include "ED_object.h"
+#include "ED_outliner.h"
 #include "ED_screen.h"
 #include "ED_undo.h"
 #include "ED_image.h"
@@ -104,11 +108,19 @@
 /* for menu/popup icons etc etc*/
 
 #include "UI_interface.h"
+#include "UI_resources.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "object_intern.h"  // own include
 
+/* prototypes */
+typedef struct MoveToCollectionData MoveToCollectionData;
+static void move_to_collection_menus_items(struct uiLayout *layout, struct MoveToCollectionData *menu);
+
 /* ************* XXX **************** */
 static void error(const char *UNUSED(arg)) {}
 static void waitcursor(int UNUSED(val)) {}
@@ -135,192 +147,6 @@ Object *ED_object_active_context(bContext *C)
 }
 
 
-/* ********* clear/set restrict view *********/
-static int object_hide_view_clear_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = sa->spacedata.first;
-	Scene *scene = CTX_data_scene(C);
-	Base *base;
-	bool changed = false;
-	const bool select = RNA_boolean_get(op->ptr, "select");
-
-	/* XXX need a context loop to handle such cases */
-	for (base = FIRSTBASE; base; base = base->next) {
-		if ((base->lay & v3d->lay) && base->object->restrictflag & OB_RESTRICT_VIEW) {
-			if (!(base->object->restrictflag & OB_RESTRICT_SELECT)) {
-				SET_FLAG_FROM_TEST(base->flag, select, SELECT);
-			}
-			base->object->flag = base->flag;
-			base->object->restrictflag &= ~OB_RESTRICT_VIEW;
-			changed = true;
-		}
-	}
-	if (changed) {
-		DAG_id_type_tag(bmain, ID_OB);
-		DAG_relations_tag_update(bmain);
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-	}
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_hide_view_clear(wmOperatorType *ot)
-{
-
-	/* identifiers */
-	ot->name = "Clear Restrict View";
-	ot->description = "Reveal the object by setting the hide flag";
-	ot->idname = "OBJECT_OT_hide_view_clear";
-
-	/* api callbacks */
-	ot->exec = object_hide_view_clear_exec;
-	ot->poll = ED_operator_view3d_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	RNA_def_boolean(ot->srna, "select", true, "Select", "");
-}
-
-static int object_hide_view_set_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	bool changed = false;
-	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
-
-	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
-	{
-		if (!unselected) {
-			if (base->flag & SELECT) {
-				base->flag &= ~SELECT;
-				base->object->flag = base->flag;
-				base->object->restrictflag |= OB_RESTRICT_VIEW;
-				changed = true;
-				if (base == BASACT) {
-					ED_base_object_activate(C, NULL);
-				}
-			}
-		}
-		else {
-			if (!(base->flag & SELECT)) {
-				base->object->restrictflag |= OB_RESTRICT_VIEW;
-				changed = true;
-				if (base == BASACT) {
-					ED_base_object_activate(C, NULL);
-				}
-			}
-		}
-	}
-	CTX_DATA_END;
-
-	if (changed) {
-		DAG_id_type_tag(bmain, ID_OB);
-		DAG_relations_tag_update(bmain);
-
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-
-	}
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_hide_view_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Set Restrict View";
-	ot->description = "Hide the object by setting the hide flag";
-	ot->idname = "OBJECT_OT_hide_view_set";
-
-	/* api callbacks */
-	ot->exec = object_hide_view_set_exec;
-	ot->poll = ED_operator_view3d_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects");
-
-}
-
-/* 99% same as above except no need for scene refreshing (TODO, update render preview) */
-static int object_hide_render_clear_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	bool changed = false;
-
-	/* XXX need a context loop to handle such cases */
-	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
-	{
-		if (ob->restrictflag & OB_RESTRICT_RENDER) {
-			ob->restrictflag &= ~OB_RESTRICT_RENDER;
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-
-	if (changed)
-		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_OUTLINER, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_hide_render_clear(wmOperatorType *ot)
-{
-
-	/* identifiers */
-	ot->name = "Clear Restrict Render";
-	ot->description = "Reveal the render object by setting the hide render flag";
-	ot->idname = "OBJECT_OT_hide_render_clear";
-
-	/* api callbacks */
-	ot->exec = object_hide_render_clear_exec;
-	ot->poll = ED_operator_view3d_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-static int object_hide_render_set_exec(bContext *C, wmOperator *op)
-{
-	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
-
-	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
-	{
-		if (!unselected) {
-			if (base->flag & SELECT) {
-				base->object->restrictflag |= OB_RESTRICT_RENDER;
-			}
-		}
-		else {
-			if (!(base->flag & SELECT)) {
-				base->object->restrictflag |= OB_RESTRICT_RENDER;
-			}
-		}
-	}
-	CTX_DATA_END;
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_OUTLINER, NULL);
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_hide_render_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Set Restrict Render";
-	ot->description = "Hide the render object by setting the hide render flag";
-	ot->idname = "OBJECT_OT_hide_render_set";
-
-	/* api callbacks */
-	ot->exec = object_hide_render_set_exec;
-	ot->poll = ED_operator_view3d_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects");
-}
-
 /* ******************* toggle editmode operator  ***************** */
 
 static bool mesh_needs_keyindex(Main *bmain, const Mesh *me)
@@ -391,7 +217,7 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
 		 * to inform dependency graph about this. But is it really the
 		 * best place to do this?
 		 */
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 	}
 	else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
 		const Curve *cu = obedit->data;
@@ -455,8 +281,8 @@ bool ED_object_editmode_exit_ex(Scene *scene, Object *obedit, int flag)
 	if (ED_object_editmode_load_ex(G.main, obedit, freedata) == false) {
 		/* in rare cases (background mode) its possible active object
 		 * is flagged for editmode, without 'obedit' being set [#35489] */
-		if (UNLIKELY(scene->basact && (scene->basact->object->mode & OB_MODE_EDIT))) {
-			scene->basact->object->mode &= ~OB_MODE_EDIT;
+		if (UNLIKELY(obedit && obedit->mode & OB_MODE_EDIT)) {
+			obedit->mode &= ~OB_MODE_EDIT;
 		}
 		if (flag & EM_WAITCURSOR) waitcursor(0);
 		return true;
@@ -467,9 +293,6 @@ bool ED_object_editmode_exit_ex(Scene *scene, Object *obedit, int flag)
 		ListBase pidlist;
 		PTCacheID *pid;
 
-		/* for example; displist make is different in editmode */
-		scene->obedit = NULL; // XXX for context
-
 		/* flag object caches as outdated */
 		BKE_ptcache_ids_from_object(&pidlist, obedit, scene, 0);
 		for (pid = pidlist.first; pid; pid = pid->next) {
@@ -481,7 +304,7 @@ bool ED_object_editmode_exit_ex(Scene *scene, Object *obedit, int flag)
 		BKE_ptcache_object_reset(scene, obedit, PTCACHE_RESET_OUTDATED);
 
 		/* also flush ob recalc, doesn't take much overhead, but used for particles */
-		DAG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA);
+		DEG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_MODE_OBJECT, scene);
 
@@ -500,43 +323,14 @@ bool ED_object_editmode_exit(bContext *C, int flag)
 	return ED_object_editmode_exit_ex(scene, obedit, flag);
 }
 
-bool ED_object_editmode_enter(bContext *C, int flag)
+bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag)
 {
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	Base *base = NULL;
-	Object *ob;
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = NULL;
 	bool ok = false;
 
-	if (ID_IS_LINKED(scene)) {
-		return false;
-	}
-
-	if (sa && sa->spacetype == SPACE_VIEW3D)
-		v3d = sa->spacedata.first;
-
-	if ((flag & EM_IGNORE_LAYER) == 0) {
-		base = CTX_data_active_base(C); /* active layer checked here for view3d */
-
-		if ((base == NULL) ||
-		    (v3d && (base->lay & v3d->lay) == 0) ||
-		    (!v3d && (base->lay & scene->lay) == 0))
-		{
-			return false;
-		}
-	}
-	else {
-		base = scene->basact;
-	}
-
-	if (ELEM(NULL, base, base->object, base->object->data)) {
+	if (ELEM(NULL, ob, ob->data) || ID_IS_LINKED(ob)) {
 		return false;
 	}
 
-	ob = base->object;
-
 	/* this checks actual object->data, for cases when other scenes have it in editmode context */
 	if (BKE_object_is_in_editmode(ob)) {
 		return true;
@@ -551,17 +345,11 @@ bool ED_object_editmode_enter(bContext *C, int flag)
 
 	ob->restore_mode = ob->mode;
 
-	/* note, when switching scenes the object can have editmode data but
-	 * not be scene->obedit: bug 22954, this avoids calling self eternally */
-	if ((ob->restore_mode & OB_MODE_EDIT) == 0)
-		ED_object_mode_toggle(C, ob->mode);
-
 	ob->mode = OB_MODE_EDIT;
 
 	if (ob->type == OB_MESH) {
 		BMEditMesh *em;
 		ok = 1;
-		scene->obedit = ob;  /* context sees this */
 
 		const bool use_key_index = mesh_needs_keyindex(bmain, ob->data);
 
@@ -574,53 +362,49 @@ bool ED_object_editmode_enter(bContext *C, int flag)
 			BKE_editmesh_tessface_calc(em);
 		}
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_MESH, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_MESH, NULL);
 	}
 	else if (ob->type == OB_ARMATURE) {
 		ok = 1;
-		scene->obedit = ob;
 		ED_armature_to_edit(ob->data);
 		/* to ensure all goes in restposition and without striding */
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_ARMATURE, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_ARMATURE, scene);
 	}
 	else if (ob->type == OB_FONT) {
-		scene->obedit = ob; /* XXX for context */
 		ok = 1;
 		ED_curve_editfont_make(ob);
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_TEXT, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_TEXT, scene);
 	}
 	else if (ob->type == OB_MBALL) {
-		scene->obedit = ob; /* XXX for context */
 		ok = 1;
 		ED_mball_editmball_make(ob);
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_MBALL, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_MBALL, scene);
 	}
 	else if (ob->type == OB_LATTICE) {
-		scene->obedit = ob; /* XXX for context */
 		ok = 1;
 		BKE_editlattice_make(ob);
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_LATTICE, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_LATTICE, scene);
 	}
 	else if (ob->type == OB_SURF || ob->type == OB_CURVE) {
 		ok = 1;
-		scene->obedit = ob; /* XXX for context */
 		ED_curve_editnurb_make(ob);
 
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_CURVE, scene);
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_CURVE, scene);
 	}
 
 	if (ok) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
-		scene->obedit = NULL; /* XXX for context */
-		ob->mode &= ~OB_MODE_EDIT;
-		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, scene);
+		if ((flag & EM_NO_CONTEXT) == 0) {
+			ob->mode &= ~OB_MODE_EDIT;
+		}
+		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_MODE_OBJECT, scene);
 	}
 
 	if (flag & EM_WAITCURSOR) waitcursor(0);
@@ -628,27 +412,72 @@ bool ED_object_editmode_enter(bContext *C, int flag)
 	return (ob->mode & OB_MODE_EDIT) != 0;
 }
 
+bool ED_object_editmode_enter(bContext *C, int flag)
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob;
+
+	if ((flag & EM_IGNORE_LAYER) == 0) {
+		ob = CTX_data_active_object(C); /* active layer checked here for view3d */
+	}
+	else {
+		ob = view_layer->basact->object;
+	}
+	if ((ob == NULL) || ID_IS_LINKED(ob)) {
+		return false;
+	}
+	return ED_object_editmode_enter_ex(bmain, scene, ob, flag);
+}
+
 static int editmode_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
 	const int mode_flag = OB_MODE_EDIT;
 	const bool is_mode_set = (CTX_data_edit_object(C) != NULL);
+	Main *bmain = CTX_data_main(C);
 	Scene *scene =  CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *obact = OBACT(view_layer);
 
 	if (!is_mode_set) {
-		Object *ob = CTX_data_active_object(C);
-		if (!ED_object_mode_compat_set(C, ob, mode_flag, op->reports)) {
+		if (!ED_object_mode_compat_set(C, obact, mode_flag, op->reports)) {
 			return OPERATOR_CANCELLED;
 		}
 	}
 
 	if (!is_mode_set) {
 		ED_object_editmode_enter(C, EM_WAITCURSOR);
+		if (obact->mode & mode_flag) {
+			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
+			{
+				if ((ob != obact) && (ob->type == obact->type)) {
+					ED_object_editmode_enter_ex(bmain, scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT);
+				}
+			}
+			FOREACH_SELECTED_OBJECT_END;
+		}
 	}
 	else {
 		ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
+		if ((obact->mode & mode_flag) == 0) {
+			FOREACH_OBJECT_BEGIN(view_layer, ob)
+			{
+				if ((ob != obact) && (ob->type == obact->type)) {
+					ED_object_editmode_exit_ex(scene, ob, EM_FREEDATA | EM_WAITCURSOR);
+				}
+			}
+			FOREACH_OBJECT_END;
+		}
 	}
+
 	ED_space_image_uv_sculpt_update(CTX_wm_manager(C), scene);
 
+	WM_msg_publish_rna_prop(mbus, &obact->id, obact, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -661,8 +490,9 @@ static int editmode_toggle_poll(bContext *C)
 		return 0;
 
 	/* if hidden but in edit mode, we still display */
-	if ((ob->restrictflag & OB_RESTRICT_VIEW) && !(ob->mode & OB_MODE_EDIT))
+	if ((ob->restrictflag & OB_RESTRICT_VIEW) && !(ob->mode & OB_MODE_EDIT)) {
 		return 0;
+	}
 
 	return OB_TYPE_SUPPORT_EDITMODE(ob->type);
 }
@@ -687,34 +517,68 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 
 static int posemode_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
 	Base *base = CTX_data_active_base(C);
-	Object *ob = base->object;
+	Object *obact = base->object;
 	const int mode_flag = OB_MODE_POSE;
-	bool is_mode_set = (ob->mode & mode_flag) != 0;
+	bool is_mode_set = (obact->mode & mode_flag) != 0;
 
 	if (!is_mode_set) {
-		if (!ED_object_mode_compat_set(C, ob, mode_flag, op->reports)) {
+		if (!ED_object_mode_compat_set(C, obact, mode_flag, op->reports)) {
 			return OPERATOR_CANCELLED;
 		}
 	}
 
-	if (ob->type == OB_ARMATURE) {
-		if (ob == CTX_data_edit_object(C)) {
-			ED_object_editmode_exit(C, EM_FREEDATA);
-			is_mode_set = false;
-		}
+	if (obact->type != OB_ARMATURE) {
+		return OPERATOR_PASS_THROUGH;
+	}
 
-		if (is_mode_set) {
-			ED_object_posemode_exit(C, ob);
+	if (obact == CTX_data_edit_object(C)) {
+		ED_object_editmode_exit(C, EM_FREEDATA);
+		is_mode_set = false;
+	}
+
+	if (is_mode_set) {
+		bool ok = ED_object_posemode_exit(C, obact);
+		if (ok) {
+			struct Main *bmain = CTX_data_main(C);
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+			FOREACH_OBJECT_BEGIN(view_layer, ob)
+			{
+				if ((ob != obact) &&
+				    (ob->type == OB_ARMATURE) &&
+				    (ob->mode & mode_flag))
+				{
+					ED_object_posemode_exit_ex(bmain, ob);
+				}
+			}
+			FOREACH_OBJECT_END;
 		}
-		else {
-			ED_object_posemode_enter(C, ob);
+	}
+	else {
+		bool ok = ED_object_posemode_enter(C, obact);
+		if (ok) {
+			struct Main *bmain = CTX_data_main(C);
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
+			{
+				if ((ob != obact) &&
+				    (ob->type == OB_ARMATURE) &&
+				    (ob->mode == OB_MODE_OBJECT) &&
+				    (!ID_IS_LINKED(ob)))
+				{
+					ED_object_posemode_enter_ex(bmain, ob);
+				}
+			}
+			FOREACH_SELECTED_OBJECT_END;
 		}
-
-		return OPERATOR_FINISHED;
 	}
 
-	return OPERATOR_PASS_THROUGH;
+	WM_msg_publish_rna_prop(mbus, &obact->id, obact, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
+	return OPERATOR_FINISHED;
 }
 
 void OBJECT_OT_posemode_toggle(wmOperatorType *ot)
@@ -732,102 +596,6 @@ void OBJECT_OT_posemode_toggle(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static void copymenu_properties(Scene *scene, View3D *v3d, Object *ob)
-{
-//XXX no longer used - to be removed - replaced by game_properties_copy_exec
-	bProperty *prop;
-	Base *base;
-	int nr, tot = 0;
-	char *str;
-
-	prop = ob->prop.first;
-	while (prop) {
-		tot++;
-		prop = prop->next;
-	}
-
-	str = MEM_callocN(50 + 33 * tot, "copymenu prop");
-
-	if (tot)
-		strcpy(str, "Copy Property %t|Replace All|Merge All|%l");
-	else
-		strcpy(str, "Copy Property %t|Clear All (no properties on active)");
-
-	tot = 0;
-	prop = ob->prop.first;
-	while (prop) {
-		tot++;
-		strcat(str, "|");
-		strcat(str, prop->name);
-		prop = prop->next;
-	}
-
-	nr = pupmenu(str);
-
-	if (nr == 1 || nr == 2) {
-		for (base = FIRSTBASE; base; base = base->next) {
-			if ((base != BASACT) && (TESTBASELIB(v3d, base))) {
-				if (nr == 1) { /* replace */
-					BKE_bproperty_copy_list(&base->object->prop, &ob->prop);
-				}
-				else {
-					for (prop = ob->prop.first; prop; prop = prop->next) {
-						BKE_bproperty_object_set(base->object, prop);
-					}
-				}
-			}
-		}
-	}
-	else if (nr > 0) {
-		prop = BLI_findlink(&ob->prop, nr - 4); /* account for first 3 menu items & menu index starting at 1*/
-
-		if (prop) {
-			for (base = FIRSTBASE; base; base = base->next) {
-				if ((base != BASACT) && (TESTBASELIB(v3d, base))) {
-					BKE_bproperty_object_set(base->object, prop);
-				}
-			}
-		}
-	}
-	MEM_freeN(str);
-
-}
-
-static void copymenu_logicbricks(Scene *scene, View3D *v3d, Object *ob)
-{
-//XXX no longer used - to be removed - replaced by logicbricks_copy_exec
-	Base *base;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (base->object != ob) {
-			if (TESTBASELIB(v3d, base)) {
-
-				/* first: free all logic */
-				free_sensors(&base->object->sensors);
-				unlink_controllers(&base->object->controllers);
-				free_controllers(&base->object->controllers);
-				unlink_actuators(&base->object->actuators);
-				free_actuators(&base->object->actuators);
-
-				/* now copy it, this also works without logicbricks! */
-				clear_sca_new_poins_ob(ob);
-				copy_sensors(&base->object->sensors, &ob->sensors, 0);
-				copy_controllers(&base->object->controllers, &ob->controllers, 0);
-				copy_actuators(&base->object->actuators, &ob->actuators, 0);
-				set_sca_new_poins_ob(base->object);
-
-				/* some menu settings */
-				base->object->scavisflag = ob->scavisflag;
-				base->object->scaflag = ob->scaflag;
-
-				/* set the initial state */
-				base->object->state = ob->state;
-				base->object->init_state = ob->init_state;
-			}
-		}
-	}
-}
-
 /* both pointers should exist */
 static void copy_texture_space(Object *to, Object *ob)
 {
@@ -879,7 +647,7 @@ static void copy_texture_space(Object *to, Object *ob)
 }
 
 /* UNUSED, keep in case we want to copy functionality for use elsewhere */
-static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
+static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, short event)
 {
 	Object *ob;
 	Base *base;
@@ -889,30 +657,23 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 
 	if (ID_IS_LINKED(scene)) return;
 
-	if (!(ob = OBACT)) return;
+	if (!(ob = OBACT(view_layer))) return;
 
-	if (scene->obedit) { // XXX get from context
+	if (BKE_object_is_in_editmode(ob)) {
 		/* obedit_copymenu(); */
 		return;
 	}
-	if (event == 9) {
-		copymenu_properties(scene, v3d, ob);
-		return;
-	}
-	else if (event == 10) {
-		copymenu_logicbricks(scene, v3d, ob);
-		return;
-	}
-	else if (event == 24) {
+
+	if (event == 24) {
 		/* moved to BKE_object_link_modifiers */
 		/* copymenu_modifiers(bmain, scene, v3d, ob); */
 		return;
 	}
 
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (base != BASACT) {
-			if (TESTBASELIB(v3d, base)) {
-				DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
+		if (base != BASACT(view_layer)) {
+			if (TESTBASELIB(base)) {
+				DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 
 				if (event == 1) {  /* loc */
 					copy_v3_v3(base->object->loc, ob->loc);
@@ -951,30 +712,6 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 					if (ob->dup_group)
 						id_us_plus(&ob->dup_group->id);
 				}
-				else if (event == 7) {    /* mass */
-					base->object->mass = ob->mass;
-				}
-				else if (event == 8) {    /* damping */
-					base->object->damping = ob->damping;
-					base->object->rdamping = ob->rdamping;
-				}
-				else if (event == 11) {   /* all physical attributes */
-					base->object->gameflag = ob->gameflag;
-					base->object->inertia = ob->inertia;
-					base->object->formfactor = ob->formfactor;
-					base->object->damping = ob->damping;
-					base->object->rdamping = ob->rdamping;
-					base->object->min_vel = ob->min_vel;
-					base->object->max_vel = ob->max_vel;
-					base->object->min_angvel = ob->min_angvel;
-					base->object->max_angvel = ob->max_angvel;
-					if (ob->gameflag & OB_BOUNDS) {
-						base->object->collision_boundtype = ob->collision_boundtype;
-					}
-					base->object->margin = ob->margin;
-					base->object->bsoft = copy_bulletsoftbody(ob->bsoft, 0);
-
-				}
 				else if (event == 17) {   /* tex space */
 					copy_texture_space(base->object, ob);
 				}
@@ -1015,7 +752,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 
 						BLI_strncpy(cu1->family, cu->family, sizeof(cu1->family));
 
-						DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 					}
 				}
 				else if (event == 19) {   /* bevel settings */
@@ -1031,7 +768,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 						cu1->ext1 = cu->ext1;
 						cu1->ext2 = cu->ext2;
 
-						DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 					}
 				}
 				else if (event == 25) {   /* curve resolution */
@@ -1050,7 +787,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 							nu = nu->next;
 						}
 
-						DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 					}
 				}
 				else if (event == 21) {
@@ -1066,7 +803,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 							}
 
 							modifier_copyData(md, tmd);
-							DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+							DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 						}
 					}
 				}
@@ -1127,18 +864,18 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 	}
 
 	if (do_depgraph_update)
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 }
 
-static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLayer *view_layer, Object *obedit)
 {
 	Object *ob;
 	short event;
 	char str[512];
 
-	if (!(ob = OBACT)) return;
+	if (!(ob = OBACT(view_layer))) return;
 
-	if (scene->obedit) { /* XXX get from context */
+	if (obedit) {
 /*		if (ob->type == OB_MESH) */
 /* XXX			mesh_copy_menu(); */
 		return;
@@ -1184,7 +921,7 @@ static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, View3D *
 	event = pupmenu(str);
 	if (event <= 0) return;
 
-	copy_attr(bmain, scene, v3d, event);
+	copy_attr(bmain, scene, view_layer, event);
 }
 
 /* ******************* force field toggle operator ***************** */
@@ -1253,6 +990,8 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot)
  */
 void ED_objects_recalculate_paths(bContext *C, Scene *scene)
 {
+	struct Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ListBase targets = {NULL, NULL};
 
 	/* loop over objects in scene */
@@ -1265,8 +1004,17 @@ void ED_objects_recalculate_paths(bContext *C, Scene *scene)
 	CTX_DATA_END;
 
 	/* recalculate paths, then free */
-	animviz_calc_motionpaths(scene, &targets);
+	animviz_calc_motionpaths(depsgraph, bmain, scene, &targets);
 	BLI_freelistN(&targets);
+
+	/* tag objects for copy on write - so paths will draw/redraw */
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
+	{
+		if (ob->mpath) {
+			DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
+		}
+	}
+	CTX_DATA_END;
 }
 
 
@@ -1486,7 +1234,8 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 		if (ob->type == OB_MESH) {
 			BKE_mesh_smooth_flag_set(ob, !clear);
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 			done = true;
@@ -1499,7 +1248,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 				else nu->flag &= ~ME_SMOOTH;
 			}
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 			done = true;
@@ -1550,68 +1299,6 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot)
 
 /* ********************** */
 
-static void UNUSED_FUNCTION(image_aspect) (Scene *scene, View3D *v3d)
-{
-	/* all selected objects with an image map: scale in image aspect */
-	Base *base;
-	Object *ob;
-	Material *ma;
-	Tex *tex;
-	float x, y, space;
-	int a, b, done;
-
-	if (scene->obedit) return;  // XXX get from context
-	if (ID_IS_LINKED(scene)) return;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (TESTBASELIB(v3d, base)) {
-			ob = base->object;
-			done = false;
-
-			for (a = 1; a <= ob->totcol; a++) {
-				ma = give_current_material(ob, a);
-				if (ma) {
-					for (b = 0; b < MAX_MTEX; b++) {
-						if (ma->mtex[b] && ma->mtex[b]->tex) {
-							tex = ma->mtex[b]->tex;
-							if (tex->type == TEX_IMAGE && tex->ima) {
-								ImBuf *ibuf = BKE_image_acquire_ibuf(tex->ima, NULL, NULL);
-
-								/* texturespace */
-								space = 1.0;
-								if (ob->type == OB_MESH) {
-									float size[3];
-									BKE_mesh_texspace_get(ob->data, NULL, NULL, size);
-									space = size[0] / size[1];
-								}
-								else if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
-									float size[3];
-									BKE_curve_texspace_get(ob->data, NULL, NULL, size);
-									space = size[0] / size[1];
-								}
-
-								x = ibuf->x / space;
-								y = ibuf->y;
-
-								if (x > y) ob->size[0] = ob->size[1] * x / y;
-								else ob->size[1] = ob->size[0] * y / x;
-
-								done = true;
-								DAG_id_tag_update(&ob->id, OB_RECALC_OB);
-
-								BKE_image_release_ibuf(tex->ima, ibuf, NULL);
-							}
-						}
-						if (done) break;
-					}
-				}
-				if (done) break;
-			}
-		}
-	}
-
-}
-
 static const EnumPropertyItem *object_mode_set_itemsf(
         bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
 {
@@ -1677,12 +1364,28 @@ static int object_mode_set_poll(bContext *C)
 
 static int object_mode_set_exec(bContext *C, wmOperator *op)
 {
+	bool use_submode = STREQ(op->idname, "OBJECT_OT_mode_set_or_submode");
 	Object *ob = CTX_data_active_object(C);
 	bGPdata *gpd = CTX_data_gpencil_data(C);
 	eObjectMode mode = RNA_enum_get(op->ptr, "mode");
 	eObjectMode restore_mode = (ob) ? ob->mode : OB_MODE_OBJECT;
 	const bool toggle = RNA_boolean_get(op->ptr, "toggle");
 
+	if (use_submode) {
+		/* When not changing modes use submodes, see: T55162. */
+		if (toggle == false) {
+			if (mode == restore_mode) {
+				switch (mode) {
+					case OB_MODE_EDIT:
+						WM_menu_name_call(C, "VIEW3D_MT_edit_mesh_select_mode", WM_OP_INVOKE_REGION_WIN);
+						return OPERATOR_INTERFACE;
+					default:
+						break;
+				}
+			}
+		}
+	}
+
 	if (gpd) {
 		/* GP Mode is not bound to a specific object. Therefore,
 		 * we don't want it to be actually saved on any objects,
@@ -1757,453 +1460,413 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
-/************************ Game Properties ***********************/
-
-static int game_property_new_exec(bContext *C, wmOperator *op)
+void OBJECT_OT_mode_set_or_submode(wmOperatorType *ot)
 {
-	Object *ob = CTX_data_active_object(C);
-	bProperty *prop;
-	char name[MAX_NAME];
-	int type = RNA_enum_get(op->ptr, "type");
-
-	prop = BKE_bproperty_new(type);
-	BLI_addtail(&ob->prop, prop);
-
-	RNA_string_get(op->ptr, "name", name);
-	if (name[0] != '\0') {
-		BLI_strncpy(prop->name, name, sizeof(prop->name));
-	}
-
-	BLI_uniquename(&ob->prop, prop, DATA_("Property"), '.', offsetof(bProperty, name), sizeof(prop->name));
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-	return OPERATOR_FINISHED;
-}
-
+	PropertyRNA *prop;
 
-void OBJECT_OT_game_property_new(wmOperatorType *ot)
-{
 	/* identifiers */
-	ot->name = "New Game Property";
-	ot->description = "Create a new property available to the game engine";
-	ot->idname = "OBJECT_OT_game_property_new";
+	ot->name = "Set Object Mode or Submode";
+	ot->description = "Sets the object interaction mode";
+	ot->idname = "OBJECT_OT_mode_set_or_submode";
 
 	/* api callbacks */
-	ot->exec = game_property_new_exec;
-	ot->poll = ED_operator_object_active_editable;
+	ot->exec = object_mode_set_exec;
+
+	ot->poll = object_mode_set_poll; //ED_operator_object_active_editable;
 
 	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	ot->flag = 0; /* no register/undo here, leave it to operators being called */
+
+	ot->prop = RNA_def_enum(ot->srna, "mode", rna_enum_object_mode_items, OB_MODE_OBJECT, "Mode", "");
+	RNA_def_enum_funcs(ot->prop, object_mode_set_itemsf);
+	RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
 
-	RNA_def_enum(ot->srna, "type", rna_enum_gameproperty_type_items, GPROP_FLOAT, "Type", "Type of game property to add");
-	RNA_def_string(ot->srna, "name", NULL, MAX_NAME, "Name", "Name of the game property to add");
+	prop = RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
-static int game_property_remove_exec(bContext *C, wmOperator *op)
+bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_only, float r_center[3])
 {
-	Object *ob = CTX_data_active_object(C);
-	bProperty *prop;
-	int index = RNA_int_get(op->ptr, "index");
-
-	if (!ob)
-		return OPERATOR_CANCELLED;
+	switch (obedit->type) {
+		case OB_MESH:
+		{
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+			BMEditSelection ese;
 
-	prop = BLI_findlink(&ob->prop, index);
+			if (BM_select_history_active_get(em->bm, &ese)) {
+				BM_editselection_center(&ese, r_center);
+				return true;
+			}
+			break;
+		}
+		case OB_ARMATURE:
+		{
+			bArmature *arm = obedit->data;
+			EditBone *ebo = arm->act_edbone;
 
-	if (prop) {
-		BLI_remlink(&ob->prop, prop);
-		BKE_bproperty_free(prop);
+			if (ebo && (!select_only || (ebo->flag & (BONE_SELECTED | BONE_ROOTSEL)))) {
+				copy_v3_v3(r_center, ebo->head);
+				return true;
+			}
 
-		WM_event_add_notifier(C, NC_LOGIC, NULL);
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
-}
+			break;
+		}
+		case OB_CURVE:
+		case OB_SURF:
+		{
+			Curve *cu = obedit->data;
 
-void OBJECT_OT_game_property_remove(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Remove Game Property";
-	ot->description = "Remove game property";
-	ot->idname = "OBJECT_OT_game_property_remove";
+			if (ED_curve_active_center(cu, r_center)) {
+				return true;
+			}
+			break;
+		}
+		case OB_MBALL:
+		{
+			MetaBall *mb = obedit->data;
+			MetaElem *ml_act = mb->lastelem;
 
-	/* api callbacks */
-	ot->exec = game_property_remove_exec;
-	ot->poll = ED_operator_object_active_editable;
+			if (ml_act && (!select_only || (ml_act->flag & SELECT))) {
+				copy_v3_v3(r_center, &ml_act->x);
+				return true;
+			}
+			break;
+		}
+		case OB_LATTICE:
+		{
+			BPoint *actbp = BKE_lattice_active_point_get(obedit->data);
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+			if (actbp) {
+				copy_v3_v3(r_center, actbp->vec);
+				return true;
+			}
+			break;
+		}
+	}
 
-	RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to remove ", 0, INT_MAX);
+	return false;
 }
 
-#define GAME_PROPERTY_MOVE_UP    1
-#define GAME_PROPERTY_MOVE_DOWN -1
+#define COLLECTION_INVALID_INDEX -1
 
-static int game_property_move(bContext *C, wmOperator *op)
+static int move_to_collection_poll(bContext *C)
 {
-	Object *ob = CTX_data_active_object(C);
-	bProperty *prop;
-	bProperty *otherprop = NULL;
-	const int index = RNA_int_get(op->ptr, "index");
-	const int dir = RNA_enum_get(op->ptr, "direction");
+	if (CTX_wm_space_outliner(C) != NULL) {
+		return ED_outliner_collections_editor_poll(C);
+	}
+	else {
+		return ED_operator_object_active_editable(C);
+	}
+}
 
-	if (ob == NULL)
+static int move_to_collection_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	PropertyRNA *prop = RNA_struct_find_property(op->ptr, "collection_index");
+	const bool is_link = STREQ(op->idname, "OBJECT_OT_link_to_collection");
+	const bool is_new = RNA_boolean_get(op->ptr, "is_new");
+	Collection *collection;
+	ListBase objects = {NULL};
+
+	if (!RNA_property_is_set(op->ptr, prop)) {
+		BKE_report(op->reports, RPT_ERROR, "No collection selected");
 		return OPERATOR_CANCELLED;
+	}
 
-	prop = BLI_findlink(&ob->prop, index);
-	/* invalid index */
-	if (prop == NULL)
+	int collection_index = RNA_property_int_get(op->ptr, prop);
+	collection = BKE_collection_from_index(CTX_data_scene(C), collection_index);
+	if (collection == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Unexpected error, collection not found");
 		return OPERATOR_CANCELLED;
-
-	if (dir == GAME_PROPERTY_MOVE_UP) {
-		otherprop = prop->prev;
 	}
-	else if (dir == GAME_PROPERTY_MOVE_DOWN) {
-		otherprop = prop->next;
+
+	if (CTX_wm_space_outliner(C) != NULL) {
+		ED_outliner_selected_objects_get(C, &objects);
 	}
 	else {
-		BLI_assert(0);
+		CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+		{
+			BLI_addtail(&objects, BLI_genericNodeN(ob));
+		}
+		CTX_DATA_END;
 	}
 
-	if (prop && otherprop) {
-		BLI_listbase_swaplinks(&ob->prop, prop, otherprop);
-
-		WM_event_add_notifier(C, NC_LOGIC, NULL);
-		return OPERATOR_FINISHED;
+	if (is_new) {
+		char new_collection_name[MAX_NAME];
+		RNA_string_get(op->ptr, "new_collection_name", new_collection_name);
+		collection = BKE_collection_add(bmain, collection, new_collection_name);
 	}
-	else {
+
+	Object *single_object = BLI_listbase_is_single(&objects) ?
+	                            ((LinkData *)objects.first)->data : NULL;
+
+	if ((single_object != NULL) &&
+	    is_link &&
+	    BLI_findptr(&collection->gobject, single_object, offsetof(CollectionObject, ob)))
+	{
+		BKE_reportf(op->reports, RPT_ERROR, "%s already in %s", single_object->id.name + 2, collection->id.name + 2);
+		BLI_freelistN(&objects);
 		return OPERATOR_CANCELLED;
 	}
-}
-
-void OBJECT_OT_game_property_move(wmOperatorType *ot)
-{
-	static const EnumPropertyItem direction_property_move[] = {
-		{GAME_PROPERTY_MOVE_UP,   "UP",   0, "Up",   ""},
-		{GAME_PROPERTY_MOVE_DOWN, "DOWN", 0, "Down", ""},
-		{0, NULL, 0, NULL, NULL}
-	};
-	PropertyRNA *prop;
 
-	/* identifiers */
-	ot->name = "Move Game Property";
-	ot->description = "Move game property";
-	ot->idname = "OBJECT_OT_game_property_move";
+	for (LinkData *link = objects.first; link; link = link->next) {
+		Object *ob = link->data;
 
-	/* api callbacks */
-	ot->exec = game_property_move;
-	ot->poll = ED_operator_object_active_editable;
+		if (!is_link) {
+			BKE_collection_object_move(bmain, scene, collection, NULL, ob);
+		}
+		else {
+			BKE_collection_object_add(bmain, collection, ob);
+		}
+	}
+	BLI_freelistN(&objects);
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	BKE_reportf(op->reports,
+	            RPT_INFO,
+	            "%s %s to %s",
+	            (single_object != NULL) ? single_object->id.name + 2 : "Objects",
+	            is_link ? "linked" : "moved",
+	            collection->id.name + 2);
 
-	/* properties */
-	prop = RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to move", 0, INT_MAX);
-	RNA_def_property_flag(prop, PROP_HIDDEN);
-	RNA_def_enum(ot->srna, "direction", direction_property_move, 0, "Direction",
-	             "Direction for moving the property");
-}
+	DEG_relations_tag_update(CTX_data_main(C));
+	DEG_id_tag_update(&scene->id, 0);
 
-#undef GAME_PROPERTY_MOVE_UP
-#undef GAME_PROPERTY_MOVE_DOWN
+	WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
+	WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
+	WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
 
-#define COPY_PROPERTIES_REPLACE 1
-#define COPY_PROPERTIES_MERGE   2
-#define COPY_PROPERTIES_COPY    3
+	return OPERATOR_FINISHED;
+}
 
-static const EnumPropertyItem game_properties_copy_operations[] = {
-	{COPY_PROPERTIES_REPLACE, "REPLACE", 0, "Replace Properties", ""},
-	{COPY_PROPERTIES_MERGE, "MERGE", 0, "Merge Properties", ""},
-	{COPY_PROPERTIES_COPY, "COPY", 0, "Copy a Property", ""},
-	{0, NULL, 0, NULL, NULL}
+struct MoveToCollectionData {
+	struct MoveToCollectionData *next, *prev;
+	int index;
+	struct Collection *collection;
+	struct ListBase submenus;
+	PointerRNA ptr;
+	struct wmOperatorType *ot;
 };
 
-static const EnumPropertyItem *gameprops_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
+static int move_to_collection_menus_create(wmOperator *op, MoveToCollectionData *menu)
 {
-	Object *ob = ED_object_active_context(C);
-	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	EnumPropertyItem *item = NULL;
-	bProperty *prop;
-	int a, totitem = 0;
-
-	if (!ob)
-		return DummyRNA_NULL_items;
+	int index = menu->index;
+	for (CollectionChild *child = menu->collection->children.first;
+	     child != NULL;
+	     child = child->next)
+	{
+		Collection *collection = child->collection;
+		MoveToCollectionData *submenu = MEM_callocN(sizeof(MoveToCollectionData),
+		                                            "MoveToCollectionData submenu - expected memleak");
+		BLI_addtail(&menu->submenus, submenu);
+		submenu->collection = collection;
+		submenu->index = ++index;
+		index = move_to_collection_menus_create(op, submenu);
+		submenu->ot = op->type;
+	}
+	return index;
+}
 
-	for (a = 1, prop = ob->prop.first; prop; prop = prop->next, a++) {
-		tmp.value = a;
-		tmp.identifier = prop->name;
-		tmp.name = prop->name;
-		RNA_enum_item_add(&item, &totitem, &tmp);
+static void move_to_collection_menus_free_recursive(MoveToCollectionData *menu)
+{
+	for (MoveToCollectionData *submenu = menu->submenus.first;
+	     submenu != NULL;
+	     submenu = submenu->next)
+	{
+		move_to_collection_menus_free_recursive(submenu);
 	}
+	BLI_freelistN(&menu->submenus);
+}
 
-	RNA_enum_item_end(&item, &totitem);
-	*r_free = true;
+static void move_to_collection_menus_free(MoveToCollectionData **menu)
+{
+	if (*menu == NULL) {
+		return;
+	}
 
-	return item;
+	move_to_collection_menus_free_recursive(*menu);
+	MEM_freeN(*menu);
+	*menu = NULL;
 }
 
-static int game_property_copy_exec(bContext *C, wmOperator *op)
+static void move_to_collection_menu_create(bContext *UNUSED(C), uiLayout *layout, void *menu_v)
 {
-	Object *ob = ED_object_active_context(C);
-	bProperty *prop;
-	int type = RNA_enum_get(op->ptr, "operation");
-	int propid = RNA_enum_get(op->ptr, "property");
-
-	if (propid > 0) { /* copy */
-		prop = BLI_findlink(&ob->prop, propid - 1);
+	MoveToCollectionData *menu = menu_v;
+	const char *name;
 
-		if (prop) {
-			CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
-			{
-				if (ob != ob_iter)
-					BKE_bproperty_object_set(ob_iter, prop);
-			} CTX_DATA_END;
-		}
+	if (menu->collection->flag & COLLECTION_IS_MASTER) {
+		name = IFACE_("Scene Collection");
 	}
-
 	else {
-		CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
-		{
-			if (ob != ob_iter) {
-				if (type == COPY_PROPERTIES_REPLACE) {
-					BKE_bproperty_copy_list(&ob_iter->prop, &ob->prop);
-				}
-				else {
-					/* merge - the default when calling with no argument */
-					for (prop = ob->prop.first; prop; prop = prop->next) {
-						BKE_bproperty_object_set(ob_iter, prop);
-					}
-				}
-			}
-		}
-		CTX_DATA_END;
+		name = menu->collection->id.name + 2;
 	}
 
-	return OPERATOR_FINISHED;
-}
+	uiItemIntO(layout,
+	           name,
+	           ICON_NONE,
+	           menu->ot->idname,
+	           "collection_index",
+	           menu->index);
+	uiItemS(layout);
 
-void OBJECT_OT_game_property_copy(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-	/* identifiers */
-	ot->name = "Copy Game Property";
-	ot->idname = "OBJECT_OT_game_property_copy";
-	ot->description = "Copy/merge/replace a game property from active object to all selected objects";
+	for (MoveToCollectionData *submenu = menu->submenus.first;
+	     submenu != NULL;
+	     submenu = submenu->next)
+	{
+		move_to_collection_menus_items(layout, submenu);
+	}
 
-	/* api callbacks */
-	ot->exec = game_property_copy_exec;
-	ot->poll = ED_operator_object_active_editable;
+	uiItemS(layout);
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	WM_operator_properties_create_ptr(&menu->ptr, menu->ot);
+	RNA_int_set(&menu->ptr, "collection_index", menu->index);
+	RNA_boolean_set(&menu->ptr, "is_new", true);
 
-	RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, "Operation", "");
-	prop = RNA_def_enum(ot->srna, "property", DummyRNA_NULL_items, 0, "Property", "Properties to copy");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_ENUM_NO_TRANSLATE);
-	RNA_def_enum_funcs(prop, gameprops_itemf);
-	ot->prop = prop;
+	uiItemFullO_ptr(layout,
+	                menu->ot,
+	                "New Collection",
+	                ICON_ZOOMIN,
+	                menu->ptr.data,
+	                WM_OP_INVOKE_DEFAULT,
+	                0,
+	                NULL);
 }
 
-static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op))
+static void move_to_collection_menus_items(uiLayout *layout, MoveToCollectionData *menu)
 {
-	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
-	{
-		BKE_bproperty_free_list(&ob_iter->prop);
+	if (BLI_listbase_is_empty(&menu->submenus)) {
+		uiItemIntO(layout,
+		           menu->collection->id.name + 2,
+		           ICON_NONE,
+		           menu->ot->idname,
+		           "collection_index",
+		           menu->index);
+	}
+	else {
+		uiItemMenuF(layout,
+		            menu->collection->id.name + 2,
+		            ICON_NONE,
+		            move_to_collection_menu_create,
+		            menu);
 	}
-	CTX_DATA_END;
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-	return OPERATOR_FINISHED;
 }
-void OBJECT_OT_game_property_clear(wmOperatorType *ot)
+
+/* This is allocated statically because we need this available for the menus creation callback. */
+static MoveToCollectionData *master_collection_menu = NULL;
+
+static int move_to_collection_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
-	/* identifiers */
-	ot->name = "Clear Game Properties";
-	ot->idname = "OBJECT_OT_game_property_clear";
-	ot->description = "Remove all game properties from all selected objects";
+	Scene *scene = CTX_data_scene(C);
 
-	/* api callbacks */
-	ot->exec = game_property_clear_exec;
-	ot->poll = ED_operator_object_active_editable;
+	/* Reset the menus data for the current master collection, and free previously allocated data. */
+	move_to_collection_menus_free(&master_collection_menu);
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
+	PropertyRNA *prop;
+	prop = RNA_struct_find_property(op->ptr, "collection_index");
+	if (RNA_property_is_set(op->ptr, prop)) {
+		int collection_index = RNA_property_int_get(op->ptr, prop);
 
-/************************ Copy Logic Bricks ***********************/
+		if (RNA_boolean_get(op->ptr, "is_new")) {
+			prop = RNA_struct_find_property(op->ptr, "new_collection_name");
+			if (!RNA_property_is_set(op->ptr, prop)) {
+				char name[MAX_NAME];
+				Collection *collection;
 
-static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Object *ob = ED_object_active_context(C);
+				collection = BKE_collection_from_index(scene, collection_index);
+				BKE_collection_new_name_get(collection, name);
 
-	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
-	{
-		if (ob != ob_iter) {
-			/* first: free all logic */
-			free_sensors(&ob_iter->sensors);
-			unlink_controllers(&ob_iter->controllers);
-			free_controllers(&ob_iter->controllers);
-			unlink_actuators(&ob_iter->actuators);
-			free_actuators(&ob_iter->actuators);
-
-			/* now copy it, this also works without logicbricks! */
-			clear_sca_new_poins_ob(ob);
-			copy_sensors(&ob_iter->sensors, &ob->sensors, 0);
-			copy_controllers(&ob_iter->controllers, &ob->controllers, 0);
-			copy_actuators(&ob_iter->actuators, &ob->actuators, 0);
-			set_sca_new_poins_ob(ob_iter);
-
-			/* some menu settings */
-			ob_iter->scavisflag = ob->scavisflag;
-			ob_iter->scaflag = ob->scaflag;
-
-			/* set the initial state */
-			ob_iter->state = ob->state;
-			ob_iter->init_state = ob->init_state;
-
-			if (ob_iter->totcol == ob->totcol) {
-				ob_iter->actcol = ob->actcol;
-				WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter);
+				RNA_property_string_set(op->ptr, prop, name);
+				return WM_operator_props_dialog_popup(C, op, 10 * UI_UNIT_X, 5 * UI_UNIT_Y);
 			}
 		}
+		return move_to_collection_exec(C, op);
 	}
-	CTX_DATA_END;
 
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
+	Collection *master_collection = BKE_collection_master(scene);
 
-	return OPERATOR_FINISHED;
-}
+	/* We need the data to be allocated so it's available during menu drawing.
+	 * Technically we could use wmOperator->customdata. However there is no free callback
+	 * called to an operator that exit with OPERATOR_INTERFACE to launch a menu.
+	 *
+	 * So we are left with a memory that will necessarily leak. It's a small leak though.*/
+	if (master_collection_menu == NULL) {
+		master_collection_menu = MEM_callocN(sizeof(MoveToCollectionData),
+		                                     "MoveToCollectionData menu - expected eventual memleak");
+	}
 
-void OBJECT_OT_logic_bricks_copy(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Copy Logic Bricks to Selected";
-	ot->description = "Copy logic bricks to other selected objects";
-	ot->idname = "OBJECT_OT_logic_bricks_copy";
+	master_collection_menu->collection = master_collection;
+	master_collection_menu->ot = op->type;
+	move_to_collection_menus_create(op, master_collection_menu);
 
-	/* api callbacks */
-	ot->exec = logicbricks_copy_exec;
-	ot->poll = ED_operator_object_active_editable;
+	uiPopupMenu *pup;
+	uiLayout *layout;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
+	/* Build the menus. */
+	const char *title = CTX_IFACE_(op->type->translation_context, op->type->name);
+	pup = UI_popup_menu_begin(C, title, ICON_NONE);
+	layout = UI_popup_menu_layout(pup);
 
-static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Object *ob = ED_object_active_context(C);
+	uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT);
 
-	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
-	{
-		if (ob != ob_iter) {
-			ob_iter->gameflag = ob->gameflag;
-			ob_iter->gameflag2 = ob->gameflag2;
-			ob_iter->inertia = ob->inertia;
-			ob_iter->formfactor = ob->formfactor;
-			ob_iter->damping = ob->damping;
-			ob_iter->rdamping = ob->rdamping;
-			ob_iter->min_vel = ob->min_vel;
-			ob_iter->max_vel = ob->max_vel;
-			ob_iter->min_angvel = ob->min_angvel;
-			ob_iter->max_angvel = ob->max_angvel;
-			ob_iter->obstacleRad = ob->obstacleRad;
-			ob_iter->mass = ob->mass;
-			copy_v3_v3(ob_iter->anisotropicFriction, ob->anisotropicFriction);
-			ob_iter->collision_boundtype = ob->collision_boundtype;
-			ob_iter->margin = ob->margin;
-			ob_iter->bsoft = copy_bulletsoftbody(ob->bsoft, 0);
-			if (ob->restrictflag & OB_RESTRICT_RENDER)
-				ob_iter->restrictflag |= OB_RESTRICT_RENDER;
-			else
-				ob_iter->restrictflag &= ~OB_RESTRICT_RENDER;
-
-			ob_iter->col_group = ob->col_group;
-			ob_iter->col_mask = ob->col_mask;
-		}
-	}
-	CTX_DATA_END;
+	move_to_collection_menu_create(C, layout, master_collection_menu);
 
-	return OPERATOR_FINISHED;
+	UI_popup_menu_end(C, pup);
+
+	return OPERATOR_INTERFACE;
 }
 
-void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot)
+void OBJECT_OT_move_to_collection(wmOperatorType *ot)
 {
+	PropertyRNA *prop;
+
 	/* identifiers */
-	ot->name = "Copy Game Physics Properties to Selected";
-	ot->description = "Copy game physics properties to other selected objects";
-	ot->idname = "OBJECT_OT_game_physics_copy";
+	ot->name = "Move to Collection";
+	ot->description = "Move objects to a scene collection";
+	ot->idname = "OBJECT_OT_move_to_collection";
 
 	/* api callbacks */
-	ot->exec = game_physics_copy_exec;
-	ot->poll = ED_operator_object_active_editable;
+	ot->exec = move_to_collection_exec;
+	ot->invoke = move_to_collection_invoke;
+	ot->poll = move_to_collection_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
 
-/* generic utility function */
+	prop = RNA_def_int(ot->srna, "collection_index", COLLECTION_INVALID_INDEX, COLLECTION_INVALID_INDEX, INT_MAX,
+	                   "Collection Index", "Index of the collection to move to", 0, INT_MAX);
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+	prop = RNA_def_boolean(ot->srna, "is_new", false, "New", "Move objects to a new collection");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+	prop = RNA_def_string(ot->srna, "new_collection_name", NULL, MAX_NAME, "Name",
+	                      "Name of the newly added collection");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+}
 
-bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_only, float r_center[3])
+void OBJECT_OT_link_to_collection(wmOperatorType *ot)
 {
-	switch (obedit->type) {
-		case OB_MESH:
-		{
-			BMEditMesh *em = BKE_editmesh_from_object(obedit);
-			BMEditSelection ese;
-
-			if (BM_select_history_active_get(em->bm, &ese)) {
-				BM_editselection_center(&ese, r_center);
-				return true;
-			}
-			break;
-		}
-		case OB_ARMATURE:
-		{
-			bArmature *arm = obedit->data;
-			EditBone *ebo = arm->act_edbone;
-
-			if (ebo && (!select_only || (ebo->flag & (BONE_SELECTED | BONE_ROOTSEL)))) {
-				copy_v3_v3(r_center, ebo->head);
-				return true;
-			}
-
-			break;
-		}
-		case OB_CURVE:
-		case OB_SURF:
-		{
-			Curve *cu = obedit->data;
+	PropertyRNA *prop;
 
-			if (ED_curve_active_center(cu, r_center)) {
-				return true;
-			}
-			break;
-		}
-		case OB_MBALL:
-		{
-			MetaBall *mb = obedit->data;
-			MetaElem *ml_act = mb->lastelem;
+	/* identifiers */
+	ot->name = "Link to Collection";
+	ot->description = "Link objects to a collection";
+	ot->idname = "OBJECT_OT_link_to_collection";
 
-			if (ml_act && (!select_only || (ml_act->flag & SELECT))) {
-				copy_v3_v3(r_center, &ml_act->x);
-				return true;
-			}
-			break;
-		}
-		case OB_LATTICE:
-		{
-			BPoint *actbp = BKE_lattice_active_point_get(obedit->data);
+	/* api callbacks */
+	ot->exec = move_to_collection_exec;
+	ot->invoke = move_to_collection_invoke;
+	ot->poll = move_to_collection_poll;
 
-			if (actbp) {
-				copy_v3_v3(r_center, actbp->vec);
-				return true;
-			}
-			break;
-		}
-	}
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	return false;
+	prop = RNA_def_int(ot->srna, "collection_index", COLLECTION_INVALID_INDEX, COLLECTION_INVALID_INDEX, INT_MAX,
+	                   "Collection Index", "Index of the collection to move to", 0, INT_MAX);
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+	prop = RNA_def_boolean(ot->srna, "is_new", false, "New", "Move objects to a new collection");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+	prop = RNA_def_string(ot->srna, "new_collection_name", NULL, MAX_NAME, "Name",
+	                      "Name of the newly added collection");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
+
+#undef COLLECTION_INVALID_INDEX
diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c
new file mode 100644
index 00000000000..c5882560083
--- /dev/null
+++ b/source/blender/editors/object/object_facemap_ops.c
@@ -0,0 +1,498 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_listbase.h"
+
+#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_workspace_types.h"
+
+#include "BKE_context.h"
+#include "BKE_customdata.h"
+#include "BKE_editmesh.h"
+#include "BKE_object.h"
+#include "BKE_object_facemap.h"
+#include "BKE_object_deform.h"
+
+#include "DEG_depsgraph.h"
+
+#include "RNA_define.h"
+#include "RNA_access.h"
+
+#include "WM_types.h"
+#include "WM_api.h"
+
+#include "ED_mesh.h"
+#include "ED_object.h"
+
+#include "object_intern.h"
+
+/* called while not in editmode */
+void ED_object_facemap_face_add(Object *ob, bFaceMap *fmap, int facenum)
+{
+	int fmap_nr;
+	if (GS(((ID *)ob->data)->name) != ID_ME)
+		return;
+
+	/* get the face map number, exit if it can't be found */
+	fmap_nr = BLI_findindex(&ob->fmaps, fmap);
+
+	if (fmap_nr != -1) {
+		int *facemap;
+		Mesh *me = ob->data;
+
+		/* if there's is no facemap layer then create one */
+		if ((facemap = CustomData_get_layer(&me->pdata, CD_FACEMAP)) == NULL)
+			facemap = CustomData_add_layer(&me->pdata, CD_FACEMAP, CD_DEFAULT, NULL, me->totpoly);
+
+		facemap[facenum] = fmap_nr;
+	}
+}
+
+/* called while not in editmode */
+void ED_object_facemap_face_remove(Object *ob, bFaceMap *fmap, int facenum)
+{
+	int fmap_nr;
+	if (GS(((ID *)ob->data)->name) != ID_ME)
+		return;
+
+	/* get the face map number, exit if it can't be found */
+	fmap_nr = BLI_findindex(&ob->fmaps, fmap);
+
+	if (fmap_nr != -1) {
+		int *facemap;
+		Mesh *me = ob->data;
+
+		/* if there's is no facemap layer then create one */
+		if ((facemap = CustomData_get_layer(&me->pdata, CD_FACEMAP)) == NULL)
+			return;
+
+		facemap[facenum] = -1;
+	}
+}
+
+static void object_fmap_swap_edit_mode(Object *ob, int num1, int num2)
+{
+	if (ob->type == OB_MESH) {
+		Mesh *me = ob->data;
+
+		if (me->edit_btmesh) {
+			BMEditMesh *em = me->edit_btmesh;
+			const int cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
+
+			if (cd_fmap_offset != -1) {
+				BMFace *efa;
+				BMIter iter;
+				int *map;
+
+				BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+					map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
+
+					if (map) {
+						if (num1 != -1) {
+							if (*map == num1)
+								*map = num2;
+							else if (*map == num2)
+								*map = num1;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+static void object_fmap_swap_object_mode(Object *ob, int num1, int num2)
+{
+	if (ob->type == OB_MESH) {
+		Mesh *me = ob->data;
+
+		if (CustomData_has_layer(&me->pdata, CD_FACEMAP)) {
+			int *map = CustomData_get_layer(&me->pdata, CD_FACEMAP);
+			int i;
+
+			if (map) {
+				for (i = 0; i < me->totpoly; i++) {
+					if (num1 != -1) {
+						if (map[i] == num1)
+							map[i] = num2;
+						else if (map[i] == num2)
+							map[i] = num1;
+					}
+				}
+			}
+		}
+	}
+}
+
+static void object_facemap_swap(Object *ob, int num1, int num2)
+{
+	if (BKE_object_is_in_editmode(ob))
+		object_fmap_swap_edit_mode(ob, num1, num2);
+	else
+		object_fmap_swap_object_mode(ob, num1, num2);
+}
+
+static int face_map_supported_poll(bContext *C)
+{
+	Object *ob = ED_object_context(C);
+	ID *data = (ob) ? ob->data : NULL;
+	return (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib);
+}
+
+static int face_map_supported_edit_mode_poll(bContext *C)
+{
+	Object *ob = ED_object_context(C);
+	ID *data = (ob) ? ob->data : NULL;
+	if (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib) {
+		if (ob->mode == OB_MODE_EDIT) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static int face_map_add_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+
+	BKE_object_facemap_add(ob);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_add(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Face Map";
+	ot->idname = "OBJECT_OT_face_map_add";
+	ot->description = "Add a new face map to the active object";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_poll;
+	ot->exec = face_map_add_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int face_map_remove_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+
+	if (fmap) {
+		BKE_object_facemap_remove(ob, fmap);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	}
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_remove(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Remove Face Map";
+	ot->idname = "OBJECT_OT_face_map_remove";
+	ot->description = "Remove a face map from the active object";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_poll;
+	ot->exec = face_map_remove_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int face_map_assign_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+
+	if (fmap) {
+		Mesh *me = ob->data;
+		BMEditMesh *em = me->edit_btmesh;
+		BMFace *efa;
+		BMIter iter;
+		int *map;
+		int cd_fmap_offset;
+
+		if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP))
+			BM_data_layer_add(em->bm, &em->bm->pdata, CD_FACEMAP);
+
+		cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
+
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
+
+			if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
+				*map = ob->actfmap - 1;
+			}
+		}
+
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	}
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_assign(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Assign Face Map";
+	ot->idname = "OBJECT_OT_face_map_assign";
+	ot->description = "Assign faces to a face map";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_edit_mode_poll;
+	ot->exec = face_map_assign_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+
+	if (fmap) {
+		Mesh *me = ob->data;
+		BMEditMesh *em = me->edit_btmesh;
+		BMFace *efa;
+		BMIter iter;
+		int *map;
+		int cd_fmap_offset;
+		int mapindex = ob->actfmap - 1;
+
+		if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP))
+			return OPERATOR_CANCELLED;
+
+		cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
+
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
+
+			if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && *map == mapindex) {
+				*map = -1;
+			}
+		}
+
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	}
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Remove From Face Map";
+	ot->idname = "OBJECT_OT_face_map_remove_from";
+	ot->description = "Remove faces from a face map";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_edit_mode_poll;
+	ot->exec = face_map_remove_from_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static void fmap_select(Object *ob, bool select)
+{
+	Mesh *me = ob->data;
+	BMEditMesh *em = me->edit_btmesh;
+	BMFace *efa;
+	BMIter iter;
+	int *map;
+	int cd_fmap_offset;
+	int mapindex = ob->actfmap - 1;
+
+	if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP))
+		BM_data_layer_add(em->bm, &em->bm->pdata, CD_FACEMAP);
+
+	cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
+
+	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+		map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
+
+		if (*map == mapindex) {
+			BM_face_select_set(em->bm, efa, select);
+		}
+	}
+}
+
+static int face_map_select_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+
+	if (fmap) {
+		fmap_select(ob, true);
+
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	}
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_select(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Face Map Faces";
+	ot->idname = "OBJECT_OT_face_map_select";
+	ot->description = "Select faces belonging to a face map";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_edit_mode_poll;
+	ot->exec = face_map_select_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int face_map_deselect_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+
+	if (fmap) {
+		fmap_select(ob, false);
+
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	}
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_face_map_deselect(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Deselect Face Map Faces";
+	ot->idname = "OBJECT_OT_face_map_deselect";
+	ot->description = "Deselect faces belonging to a face map";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_edit_mode_poll;
+	ot->exec = face_map_deselect_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+
+static int face_map_move_exec(bContext *C, wmOperator *op)
+{
+	Object *ob = ED_object_context(C);
+	bFaceMap *fmap;
+	int dir = RNA_enum_get(op->ptr, "direction");
+	int pos1, pos2 = -1, count;
+
+	fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1);
+	if (!fmap) {
+		return OPERATOR_CANCELLED;
+	}
+
+	count = BLI_listbase_count(&ob->fmaps);
+	pos1 = BLI_findindex(&ob->fmaps, fmap);
+
+	if (dir == 1) { /*up*/
+		void *prev = fmap->prev;
+
+		if (prev) {
+			pos2 = pos1 - 1;
+		}
+		else {
+			pos2 = count - 1;
+		}
+
+		BLI_remlink(&ob->fmaps, fmap);
+		BLI_insertlinkbefore(&ob->fmaps, prev, fmap);
+	}
+	else { /*down*/
+		void *next = fmap->next;
+
+		if (next) {
+			pos2 = pos1 + 1;
+		}
+		else {
+			pos2 = 0;
+		}
+
+		BLI_remlink(&ob->fmaps, fmap);
+		BLI_insertlinkafter(&ob->fmaps, next, fmap);
+	}
+
+	/* iterate through mesh and substitute the indices as necessary */
+	object_facemap_swap(ob, pos2, pos1);
+
+	ob->actfmap = pos2 + 1;
+
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+
+void OBJECT_OT_face_map_move(wmOperatorType *ot)
+{
+	static EnumPropertyItem fmap_slot_move[] = {
+		{1, "UP", 0, "Up", ""},
+		{-1, "DOWN", 0, "Down", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	/* identifiers */
+	ot->name = "Move Face Map";
+	ot->idname = "OBJECT_OT_face_map_move";
+	ot->description = "Move the active face map up/down in the list";
+
+	/* api callbacks */
+	ot->poll = face_map_supported_poll;
+	ot->exec = face_map_move_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	RNA_def_enum(ot->srna, "direction", fmap_slot_move, 0, "Direction", "Direction to move, UP or DOWN");
+}
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index e5accee171a..debbe4bd379 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -39,15 +39,16 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
-#include "BKE_group.h"
 #include "BKE_library.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_object.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 
@@ -63,8 +64,9 @@
 /********************* 3d view operators ***********************/
 
 /* can be called with C == NULL */
-static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
+static const EnumPropertyItem *collection_object_active_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
 {
+	Main *bmain = CTX_data_main(C);
 	Object *ob;
 	EnumPropertyItem *item = NULL, item_tmp = {0};
 	int totitem = 0;
@@ -77,25 +79,25 @@ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA
 
 	/* check that the object exists */
 	if (ob) {
-		Group *group;
+		Collection *collection;
 		int i = 0, count = 0;
 
-		/* if 2 or more groups, add option to add to all groups */
-		group = NULL;
-		while ((group = BKE_group_object_find(group, ob)))
+		/* if 2 or more collections, add option to add to all collections */
+		collection = NULL;
+		while ((collection = BKE_collection_object_find(bmain, collection, ob)))
 			count++;
 
 		if (count >= 2) {
-			item_tmp.identifier = item_tmp.name = "All Groups";
+			item_tmp.identifier = item_tmp.name = "All Collections";
 			item_tmp.value = INT_MAX; /* this will give NULL on lookup */
 			RNA_enum_item_add(&item, &totitem, &item_tmp);
 			RNA_enum_item_add_separator(&item, &totitem);
 		}
 
-		/* add groups */
-		group = NULL;
-		while ((group = BKE_group_object_find(group, ob))) {
-			item_tmp.identifier = item_tmp.name = group->id.name + 2;
+		/* add collections */
+		collection = NULL;
+		while ((collection = BKE_collection_object_find(bmain, collection, ob))) {
+			item_tmp.identifier = item_tmp.name = collection->id.name + 2;
 			/* item_tmp.icon = ICON_ARMATURE_DATA; */
 			item_tmp.value = i;
 			RNA_enum_item_add(&item, &totitem, &item_tmp);
@@ -109,49 +111,48 @@ static const EnumPropertyItem *group_object_active_itemf(bContext *C, PointerRNA
 	return item;
 }
 
-/* get the group back from the enum index, quite awkward and UI specific */
-static Group *group_object_active_find_index(Object *ob, const int group_object_index)
+/* get the collection back from the enum index, quite awkward and UI specific */
+static Collection *collection_object_active_find_index(Main *bmain, Object *ob, const int collection_object_index)
 {
-	Group *group = NULL;
+	Collection *collection = NULL;
 	int i = 0;
-	while ((group = BKE_group_object_find(group, ob))) {
-		if (i == group_object_index) {
+	while ((collection = BKE_collection_object_find(bmain, collection, ob))) {
+		if (i == collection_object_index) {
 			break;
 		}
 		i++;
 	}
 
-	return group;
+	return collection;
 }
 
 static int objects_add_active_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = ED_object_context(C);
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	int single_group_index = RNA_enum_get(op->ptr, "group");
-	Group *single_group = group_object_active_find_index(ob, single_group_index);
-	Group *group;
+	int single_collection_index = RNA_enum_get(op->ptr, "collection");
+	Collection *single_collection = collection_object_active_find_index(bmain, ob, single_collection_index);
+	Collection *collection;
 	bool is_cycle = false;
 	bool updated = false;
 
 	if (ob == NULL)
 		return OPERATOR_CANCELLED;
 
-	/* now add all selected objects to the group(s) */
-	for (group = bmain->group.first; group; group = group->id.next) {
-		if (single_group && group != single_group)
+	/* now add all selected objects to the collection(s) */
+	for (collection = bmain->collection.first; collection; collection = collection->id.next) {
+		if (single_collection && collection != single_collection)
 			continue;
-		if (!BKE_group_object_exists(group, ob))
+		if (!BKE_collection_has_object(collection, ob))
 			continue;
 
 		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
-			if (BKE_group_object_exists(group, base->object))
+			if (BKE_collection_has_object(collection, base->object))
 				continue;
 
-			if (!BKE_group_object_cyclic_check(bmain, base->object, group)) {
-				BKE_group_object_add(group, base->object, scene, base);
+			if (!BKE_collection_object_cyclic_check(bmain, base->object, collection)) {
+				BKE_collection_object_add(bmain, collection, base->object);
 				updated = true;
 			}
 			else {
@@ -162,25 +163,25 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 	}
 
 	if (is_cycle)
-		BKE_report(op->reports, RPT_WARNING, "Skipped some groups because of cycle detected");
+		BKE_report(op->reports, RPT_WARNING, "Skipped some collections because of cycle detected");
 
 	if (!updated)
 		return OPERATOR_CANCELLED;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void GROUP_OT_objects_add_active(wmOperatorType *ot)
+void COLLECTION_OT_objects_add_active(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name = "Add Selected To Active Group";
-	ot->description = "Add the object to an object group that contains the active object";
-	ot->idname = "GROUP_OT_objects_add_active";
+	ot->name = "Add Selected To Active Collection";
+	ot->description = "Add the object to an object collection that contains the active object";
+	ot->idname = "COLLECTION_OT_objects_add_active";
 
 	/* api callbacks */
 	ot->exec = objects_add_active_exec;
@@ -191,8 +192,8 @@ void GROUP_OT_objects_add_active(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to add other selected objects to");
-	RNA_def_enum_funcs(prop, group_object_active_itemf);
+	prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "The collection to add other selected objects to");
+	RNA_def_enum_funcs(prop, collection_object_active_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 }
@@ -200,28 +201,28 @@ void GROUP_OT_objects_add_active(wmOperatorType *ot)
 static int objects_remove_active_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = OBACT;
-	int single_group_index = RNA_enum_get(op->ptr, "group");
-	Group *single_group = group_object_active_find_index(ob, single_group_index);
-	Group *group;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
+	int single_collection_index = RNA_enum_get(op->ptr, "collection");
+	Collection *single_collection = collection_object_active_find_index(bmain, ob, single_collection_index);
+	Collection *collection;
 	bool ok = false;
 
 	if (ob == NULL)
 		return OPERATOR_CANCELLED;
 
-	/* linking to same group requires its own loop so we can avoid
-	 * looking up the active objects groups each time */
+	/* linking to same collection requires its own loop so we can avoid
+	 * looking up the active objects collections each time */
 
-	for (group = bmain->group.first; group; group = group->id.next) {
-		if (single_group && group != single_group)
+	for (collection = bmain->collection.first; collection; collection = collection->id.next) {
+		if (single_collection && collection != single_collection)
 			continue;
 
-		if (BKE_group_object_exists(group, ob)) {
-			/* Remove groups from selected objects */
+		if (BKE_collection_has_object(collection, ob)) {
+			/* Remove collections from selected objects */
 			CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 			{
-				BKE_group_object_unlink(group, base->object, scene, base);
+				BKE_collection_object_remove(bmain, collection, base->object, false);
 				ok = 1;
 			}
 			CTX_DATA_END;
@@ -229,22 +230,22 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 	}
 
 	if (!ok)
-		BKE_report(op->reports, RPT_ERROR, "Active object contains no groups");
+		BKE_report(op->reports, RPT_ERROR, "Active object contains no collections");
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void GROUP_OT_objects_remove_active(wmOperatorType *ot)
+void COLLECTION_OT_objects_remove_active(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name = "Remove Selected From Active Group";
-	ot->description = "Remove the object from an object group that contains the active object";
-	ot->idname = "GROUP_OT_objects_remove_active";
+	ot->name = "Remove Selected From Active Collection";
+	ot->description = "Remove the object from an object collection that contains the active object";
+	ot->idname = "COLLECTION_OT_objects_remove_active";
 
 	/* api callbacks */
 	ot->exec = objects_remove_active_exec;
@@ -255,67 +256,65 @@ void GROUP_OT_objects_remove_active(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to remove other selected objects from");
-	RNA_def_enum_funcs(prop, group_object_active_itemf);
+	prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "The collection to remove other selected objects from");
+	RNA_def_enum_funcs(prop, collection_object_active_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 }
 
-static int group_objects_remove_all_exec(bContext *C, wmOperator *UNUSED(op))
+static int collection_objects_remove_all_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
 
 	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 	{
-		BKE_object_groups_clear(scene, base, base->object);
+		BKE_object_groups_clear(bmain, base->object);
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void GROUP_OT_objects_remove_all(wmOperatorType *ot)
+void COLLECTION_OT_objects_remove_all(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Remove From All Groups";
-	ot->description = "Remove selected objects from all groups";
-	ot->idname = "GROUP_OT_objects_remove_all";
+	ot->name = "Remove From All Unlinked Collections";
+	ot->description = "Remove selected objects from all collections not used in a scene";
+	ot->idname = "COLLECTION_OT_objects_remove_all";
 
 	/* api callbacks */
-	ot->exec = group_objects_remove_all_exec;
+	ot->exec = collection_objects_remove_all_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static int group_objects_remove_exec(bContext *C, wmOperator *op)
+static int collection_objects_remove_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = ED_object_context(C);
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	int single_group_index = RNA_enum_get(op->ptr, "group");
-	Group *single_group = group_object_active_find_index(ob, single_group_index);
-	Group *group;
+	int single_collection_index = RNA_enum_get(op->ptr, "collection");
+	Collection *single_collection = collection_object_active_find_index(bmain, ob, single_collection_index);
+	Collection *collection;
 	bool updated = false;
 
 	if (ob == NULL)
 		return OPERATOR_CANCELLED;
 
-	for (group = bmain->group.first; group; group = group->id.next) {
-		if (single_group && group != single_group)
+	for (collection = bmain->collection.first; collection; collection = collection->id.next) {
+		if (single_collection && collection != single_collection)
 			continue;
-		if (!BKE_group_object_exists(group, ob))
+		if (!BKE_collection_has_object(collection, ob))
 			continue;
 
-		/* now remove all selected objects from the group */
+		/* now remove all selected objects from the collection */
 		CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
 		{
-			BKE_group_object_unlink(group, base->object, scene, base);
+			BKE_collection_object_remove(bmain, collection, base->object, false);
 			updated = true;
 		}
 		CTX_DATA_END;
@@ -324,23 +323,23 @@ static int group_objects_remove_exec(bContext *C, wmOperator *op)
 	if (!updated)
 		return OPERATOR_CANCELLED;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void GROUP_OT_objects_remove(wmOperatorType *ot)
+void COLLECTION_OT_objects_remove(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name = "Remove From Group";
-	ot->description = "Remove selected objects from a group";
-	ot->idname = "GROUP_OT_objects_remove";
+	ot->name = "Remove From Collection";
+	ot->description = "Remove selected objects from a collection";
+	ot->idname = "COLLECTION_OT_objects_remove";
 
 	/* api callbacks */
-	ot->exec = group_objects_remove_exec;
+	ot->exec = collection_objects_remove_exec;
 	ot->invoke = WM_menu_invoke;
 	ot->poll = ED_operator_objectmode;
 
@@ -348,133 +347,128 @@ void GROUP_OT_objects_remove(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to remove this object from");
-	RNA_def_enum_funcs(prop, group_object_active_itemf);
+	prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "The collection to remove this object from");
+	RNA_def_enum_funcs(prop, collection_object_active_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 }
 
-static int group_create_exec(bContext *C, wmOperator *op)
+static int collection_create_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	Group *group = NULL;
 	char name[MAX_ID_NAME - 2]; /* id name */
 
 	RNA_string_get(op->ptr, "name", name);
 
-	group = BKE_group_add(bmain, name);
+	Collection *collection = BKE_collection_add(bmain, NULL, name);
 
 	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
-		BKE_group_object_add(group, base->object, scene, base);
+		BKE_collection_object_add(bmain, collection, base->object);
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void GROUP_OT_create(wmOperatorType *ot)
+void COLLECTION_OT_create(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Create New Group";
-	ot->description = "Create an object group from selected objects";
-	ot->idname = "GROUP_OT_create";
+	ot->name = "Create New Collection";
+	ot->description = "Create an object collection from selected objects";
+	ot->idname = "COLLECTION_OT_create";
 
 	/* api callbacks */
-	ot->exec = group_create_exec;
+	ot->exec = collection_create_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_string(ot->srna, "name", "Group", MAX_ID_NAME - 2, "Name", "Name of the new group");
+	RNA_def_string(ot->srna, "name", "Collection", MAX_ID_NAME - 2, "Name", "Name of the new collection");
 }
 
 /****************** properties window operators *********************/
 
-static int group_add_exec(bContext *C, wmOperator *UNUSED(op))
+static int collection_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_context(C);
 	Main *bmain = CTX_data_main(C);
-	Group *group;
 
 	if (ob == NULL)
 		return OPERATOR_CANCELLED;
 
-	group = BKE_group_add(bmain, "Group");
-	BKE_group_object_add(group, ob, scene, NULL);
+	Collection *collection = BKE_collection_add(bmain, NULL, "Collection");
+	BKE_collection_object_add(bmain, collection, ob);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_group_add(wmOperatorType *ot)
+void OBJECT_OT_collection_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Add to Group";
-	ot->idname = "OBJECT_OT_group_add";
-	ot->description = "Add an object to a new group";
+	ot->name = "Add to Collection";
+	ot->idname = "OBJECT_OT_collection_add";
+	ot->description = "Add an object to a new collection";
 
 	/* api callbacks */
-	ot->exec = group_add_exec;
+	ot->exec = collection_add_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static int group_link_exec(bContext *C, wmOperator *op)
+static int collection_link_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_context(C);
-	Group *group = BLI_findlink(&bmain->group, RNA_enum_get(op->ptr, "group"));
+	Collection *collection = BLI_findlink(&bmain->collection, RNA_enum_get(op->ptr, "collection"));
 
-	if (ELEM(NULL, ob, group))
+	if (ELEM(NULL, ob, collection))
 		return OPERATOR_CANCELLED;
 
-	/* Early return check, if the object is already in group
+	/* Early return check, if the object is already in collection
 	 * we could skip all the dependency check and just consider
 	 * operator is finished.
 	 */
-	if (BKE_group_object_exists(group, ob)) {
+	if (BKE_collection_has_object(collection, ob)) {
 		return OPERATOR_FINISHED;
 	}
 
-	/* Adding object to group which is used as dupligroup for self is bad idea.
+	/* Adding object to collection which is used as duplicollection for self is bad idea.
 	 *
-	 * It is also  bad idea to add object to group which is in group which
+	 * It is also  bad idea to add object to collection which is in collection which
 	 * contains our current object.
 	 */
-	if (BKE_group_object_cyclic_check(bmain, ob, group)) {
-		BKE_report(op->reports, RPT_ERROR, "Could not add the group because of dependency cycle detected");
+	if (BKE_collection_object_cyclic_check(bmain, ob, collection)) {
+		BKE_report(op->reports, RPT_ERROR, "Could not add the collection because of dependency cycle detected");
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_group_object_add(group, ob, scene, NULL);
+	BKE_collection_object_add(bmain, collection, ob);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_group_link(wmOperatorType *ot)
+void OBJECT_OT_collection_link(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name = "Link to Group";
-	ot->idname = "OBJECT_OT_group_link";
-	ot->description = "Add an object to an existing group";
+	ot->name = "Link to Collection";
+	ot->idname = "OBJECT_OT_collection_link";
+	ot->description = "Add an object to an existing collection";
 
 	/* api callbacks */
-	ot->exec = group_link_exec;
+	ot->exec = collection_link_exec;
 	ot->invoke = WM_enum_search_invoke;
 	ot->poll = ED_operator_objectmode;
 
@@ -482,37 +476,37 @@ void OBJECT_OT_group_link(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "");
-	RNA_def_enum_funcs(prop, RNA_group_local_itemf);
+	prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "");
+	RNA_def_enum_funcs(prop, RNA_collection_local_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 }
 
-static int group_remove_exec(bContext *C, wmOperator *UNUSED(op))
+static int collection_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
+	Main *bmain = CTX_data_main(C);
 	Object *ob = ED_object_context(C);
-	Group *group = CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
+	Collection *collection = CTX_data_pointer_get_type(C, "collection", &RNA_Collection).data;
 
-	if (!ob || !group)
+	if (!ob || !collection)
 		return OPERATOR_CANCELLED;
 
-	BKE_group_object_unlink(group, ob, scene, NULL); /* base will be used if found */
+	BKE_collection_object_remove(bmain, collection, ob, false);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_group_remove(wmOperatorType *ot)
+void OBJECT_OT_collection_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Remove Group";
-	ot->idname = "OBJECT_OT_group_remove";
-	ot->description = "Remove the active object from this group";
+	ot->name = "Remove Collection";
+	ot->idname = "OBJECT_OT_collection_remove";
+	ot->description = "Remove the active object from this collection";
 
 	/* api callbacks */
-	ot->exec = group_remove_exec;
+	ot->exec = collection_remove_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
@@ -520,47 +514,49 @@ void OBJECT_OT_group_remove(wmOperatorType *ot)
 }
 
 
-static int group_unlink_exec(bContext *C, wmOperator *UNUSED(op))
+static int collection_unlink_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
-	Group *group = CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
+	Collection *collection = CTX_data_pointer_get_type(C, "collection", &RNA_Collection).data;
 
-	if (!group)
+	if (!collection)
 		return OPERATOR_CANCELLED;
 
-	BKE_libblock_delete(bmain, group);
+	BKE_libblock_delete(bmain, collection);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
 
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_group_unlink(wmOperatorType *ot)
+void OBJECT_OT_collection_unlink(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Unlink Group";
-	ot->idname = "OBJECT_OT_group_unlink";
-	ot->description = "Unlink the group from all objects";
+	ot->name = "Unlink Collection";
+	ot->idname = "OBJECT_OT_collection_unlink";
+	ot->description = "Unlink the collection from all objects";
 
 	/* api callbacks */
-	ot->exec = group_unlink_exec;
+	ot->exec = collection_unlink_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static int select_grouped_exec(bContext *C, wmOperator *UNUSED(op))  /* Select objects in the same group as the active */
+static int select_grouped_exec(bContext *C, wmOperator *UNUSED(op))  /* Select objects in the same collection as the active */
 {
-	Group *group = CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
+	Collection *collection = CTX_data_pointer_get_type(C, "collection", &RNA_Collection).data;
 
-	if (!group)
+	if (!collection)
 		return OPERATOR_CANCELLED;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if (!(base->flag & SELECT) && BKE_group_object_exists(group, base->object)) {
-			ED_base_object_select(base, BA_SELECT);
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
+			if (BKE_collection_has_object_recursive(collection, base->object)) {
+				ED_object_base_select(base, BA_SELECT);
+			}
 		}
 	}
 	CTX_DATA_END;
@@ -570,12 +566,12 @@ static int select_grouped_exec(bContext *C, wmOperator *UNUSED(op))  /* Select o
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_grouped_select(wmOperatorType *ot)
+void OBJECT_OT_collection_objects_select(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Select Grouped";
-	ot->idname = "OBJECT_OT_grouped_select";
-	ot->description = "Select all objects in group";
+	ot->name = "Select Objects in Collection";
+	ot->idname = "OBJECT_OT_collection_objects_select";
+	ot->description = "Select all objects in collection";
 
 	/* api callbacks */
 	ot->exec = select_grouped_exec;
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 5963e4b769b..7687bd476b9 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -48,7 +48,7 @@
 
 #include "BKE_action.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
@@ -57,6 +57,9 @@
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -318,7 +321,7 @@ static bool object_hook_index_array(Scene *scene, Object *obedit,
 			EDBM_mesh_load(obedit);
 			EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
 
-			DAG_id_tag_update(obedit->data, 0);
+			DEG_id_tag_update(obedit->data, 0);
 
 			em = me->edit_btmesh;
 
@@ -445,26 +448,26 @@ static int hook_op_edit_poll(bContext *C)
 	return 0;
 }
 
-static Object *add_hook_object_new(Main *bmain, Scene *scene, Object *obedit)
+static Object *add_hook_object_new(Main *bmain, Scene *scene, ViewLayer *view_layer, Object *obedit)
 {
 	Base *base, *basedit;
 	Object *ob;
 
-	ob = BKE_object_add(bmain, scene, OB_EMPTY, NULL);
+	ob = BKE_object_add(bmain, scene, view_layer, OB_EMPTY, NULL);
 
-	basedit = BKE_scene_base_find(scene, obedit);
-	base = scene->basact;
+	basedit = BKE_view_layer_base_find(view_layer, obedit);
+	base = view_layer->basact;
 	base->lay = ob->lay = obedit->lay;
-	BLI_assert(scene->basact->object == ob);
+	BLI_assert(view_layer->basact->object == ob);
 
 	/* icky, BKE_object_add sets new base as active.
 	 * so set it back to the original edit object */
-	scene->basact = basedit;
+	view_layer->basact = basedit;
 
 	return ob;
 }
 
-static int add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *ob, int mode, ReportList *reports)
+static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, ViewLayer *view_layer, Object *obedit, Object *ob, int mode, ReportList *reports)
 {
 	ModifierData *md = NULL;
 	HookModifierData *hmd = NULL;
@@ -482,7 +485,7 @@ static int add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *ob
 
 	if (mode == OBJECT_ADDHOOK_NEWOB && !ob) {
 
-		ob = add_hook_object_new(bmain, scene, obedit);
+		ob = add_hook_object_new(bmain, scene, view_layer, obedit);
 
 		/* transform cent to global coords for loc */
 		mul_v3_m4v3(ob->loc, obedit->obmat, cent);
@@ -541,13 +544,13 @@ static int add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *ob
 	/* matrix calculus */
 	/* vert x (obmat x hook->imat) x hook->obmat x ob->imat */
 	/*        (parentinv         )                          */
-	BKE_object_where_is_calc(scene, ob);
+	BKE_object_where_is_calc(CTX_data_depsgraph(C), scene, ob);
 
 	invert_m4_m4(ob->imat, ob->obmat);
 	/* apparently this call goes from right to left... */
 	mul_m4_series(hmd->parentinv, pose_mat, ob->imat, obedit->obmat);
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	return true;
 }
@@ -556,6 +559,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obsel = NULL;
 	const bool use_bone = RNA_boolean_get(op->ptr, "use_bone");
@@ -580,7 +584,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	if (add_hook_object(bmain, scene, obedit, obsel, mode, op->reports)) {
+	if (add_hook_object(C, bmain, scene, view_layer, obedit, obsel, mode, op->reports)) {
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, obedit);
 		return OPERATOR_FINISHED;
 	}
@@ -611,9 +615,10 @@ static int object_add_hook_newob_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 
-	if (add_hook_object(bmain, scene, obedit, NULL, OBJECT_ADDHOOK_NEWOB, op->reports)) {
+	if (add_hook_object(C, bmain, scene, view_layer, obedit, NULL, OBJECT_ADDHOOK_NEWOB, op->reports)) {
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, obedit);
 		return OPERATOR_FINISHED;
@@ -655,7 +660,7 @@ static int object_hook_remove_exec(bContext *C, wmOperator *op)
 	BLI_remlink(&ob->modifiers, (ModifierData *)hmd);
 	modifier_free((ModifierData *)hmd);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -729,7 +734,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op)
 
 	BKE_object_modifier_hook_reset(ob, hmd);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -776,10 +781,10 @@ static int object_hook_recenter_exec(bContext *C, wmOperator *op)
 	copy_m3_m4(bmat, ob->obmat);
 	invert_m3_m3(imat, bmat);
 
-	sub_v3_v3v3(hmd->cent, scene->cursor, ob->obmat[3]);
+	sub_v3_v3v3(hmd->cent, scene->cursor.location, ob->obmat[3]);
 	mul_m3_v3(imat, hmd->cent);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -837,7 +842,7 @@ static int object_hook_assign_exec(bContext *C, wmOperator *op)
 	hmd->indexar = indexar;
 	hmd->totindex = tot;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 1be331d8ac4..18251a25b73 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -55,6 +55,7 @@ void OBJECT_OT_scale_clear(struct wmOperatorType *ot);
 void OBJECT_OT_origin_clear(struct wmOperatorType *ot);
 void OBJECT_OT_visual_transform_apply(struct wmOperatorType *ot);
 void OBJECT_OT_transform_apply(struct wmOperatorType *ot);
+void OBJECT_OT_transform_axis_target(struct wmOperatorType *ot);
 void OBJECT_OT_origin_set(struct wmOperatorType *ot);
 
 /* object_relations.c */
@@ -67,21 +68,18 @@ void OBJECT_OT_track_clear(struct wmOperatorType *ot);
 void OBJECT_OT_slow_parent_set(struct wmOperatorType *ot);
 void OBJECT_OT_slow_parent_clear(struct wmOperatorType *ot);
 void OBJECT_OT_make_local(struct wmOperatorType *ot);
+void OBJECT_OT_make_override_static(struct wmOperatorType *ot);
 void OBJECT_OT_make_single_user(struct wmOperatorType *ot);
 void OBJECT_OT_make_links_scene(struct wmOperatorType *ot);
 void OBJECT_OT_make_links_data(struct wmOperatorType *ot);
-void OBJECT_OT_move_to_layer(struct wmOperatorType *ot);
 void OBJECT_OT_drop_named_material(struct wmOperatorType *ot);
 void OBJECT_OT_unlink_data(struct wmOperatorType *ot);
 
 /* object_edit.c */
 void OBJECT_OT_mode_set(struct wmOperatorType *ot);
+void OBJECT_OT_mode_set_or_submode(struct wmOperatorType *ot);
 void OBJECT_OT_editmode_toggle(struct wmOperatorType *ot);
 void OBJECT_OT_posemode_toggle(struct wmOperatorType *ot);
-void OBJECT_OT_hide_view_set(struct wmOperatorType *ot);
-void OBJECT_OT_hide_view_clear(struct wmOperatorType *ot);
-void OBJECT_OT_hide_render_set(struct wmOperatorType *ot);
-void OBJECT_OT_hide_render_clear(struct wmOperatorType *ot);
 void OBJECT_OT_proxy_make(struct wmOperatorType *ot);
 void OBJECT_OT_shade_smooth(struct wmOperatorType *ot);
 void OBJECT_OT_shade_flat(struct wmOperatorType *ot);
@@ -90,13 +88,8 @@ void OBJECT_OT_paths_update(struct wmOperatorType *ot);
 void OBJECT_OT_paths_clear(struct wmOperatorType *ot);
 void OBJECT_OT_forcefield_toggle(struct wmOperatorType *ot);
 
-void OBJECT_OT_game_property_new(struct wmOperatorType *ot);
-void OBJECT_OT_game_property_remove(struct wmOperatorType *ot);
-void OBJECT_OT_game_property_copy(struct wmOperatorType *ot);
-void OBJECT_OT_game_property_clear(struct wmOperatorType *ot);
-void OBJECT_OT_game_property_move(struct wmOperatorType *ot);
-void OBJECT_OT_logic_bricks_copy(struct wmOperatorType *ot);
-void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot);
+void OBJECT_OT_move_to_collection(struct wmOperatorType *ot);
+void OBJECT_OT_link_to_collection(struct wmOperatorType *ot);
 
 /* object_select.c */
 void OBJECT_OT_select_all(struct wmOperatorType *ot);
@@ -108,7 +101,7 @@ void OBJECT_OT_select_grouped(struct wmOperatorType *ot);
 void OBJECT_OT_select_mirror(struct wmOperatorType *ot);
 void OBJECT_OT_select_more(struct wmOperatorType *ot);
 void OBJECT_OT_select_less(struct wmOperatorType *ot);
-void OBJECT_OT_select_same_group(struct wmOperatorType *ot);
+void OBJECT_OT_select_same_collection(struct wmOperatorType *ot);
 
 /* object_add.c */
 void OBJECT_OT_add(struct wmOperatorType *ot);
@@ -117,12 +110,13 @@ void OBJECT_OT_metaball_add(struct wmOperatorType *ot);
 void OBJECT_OT_text_add(struct wmOperatorType *ot);
 void OBJECT_OT_armature_add(struct wmOperatorType *ot);
 void OBJECT_OT_empty_add(struct wmOperatorType *ot);
+void OBJECT_OT_lightprobe_add(struct wmOperatorType *ot);
 void OBJECT_OT_drop_named_image(struct wmOperatorType *ot);
 void OBJECT_OT_lamp_add(struct wmOperatorType *ot);
 void OBJECT_OT_effector_add(struct wmOperatorType *ot);
 void OBJECT_OT_camera_add(struct wmOperatorType *ot);
 void OBJECT_OT_speaker_add(struct wmOperatorType *ot);
-void OBJECT_OT_group_instance_add(struct wmOperatorType *ot);
+void OBJECT_OT_collection_instance_add(struct wmOperatorType *ot);
 
 void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot);
 void OBJECT_OT_duplicate(struct wmOperatorType *ot);
@@ -141,11 +135,11 @@ void OBJECT_OT_hook_reset(struct wmOperatorType *ot);
 void OBJECT_OT_hook_recenter(struct wmOperatorType *ot);
 
 /* object_group.c */
-void GROUP_OT_create(struct wmOperatorType *ot);
-void GROUP_OT_objects_remove_all(struct wmOperatorType *ot);
-void GROUP_OT_objects_remove(struct wmOperatorType *ot);
-void GROUP_OT_objects_add_active(struct wmOperatorType *ot);
-void GROUP_OT_objects_remove_active(struct wmOperatorType *ot);
+void COLLECTION_OT_create(struct wmOperatorType *ot);
+void COLLECTION_OT_objects_remove_all(struct wmOperatorType *ot);
+void COLLECTION_OT_objects_remove(struct wmOperatorType *ot);
+void COLLECTION_OT_objects_add_active(struct wmOperatorType *ot);
+void COLLECTION_OT_objects_remove_active(struct wmOperatorType *ot);
 
 /* object_modifier.c */
 int edit_modifier_poll_generic(struct bContext *C, struct StructRNA *rna_type, int obtype_flag);
@@ -237,6 +231,15 @@ void OBJECT_OT_vertex_weight_set_active(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_weight_normalize_active_vertex(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_weight_copy(struct wmOperatorType *ot);
 
+/* object_facemap_ops.c */
+void OBJECT_OT_face_map_add(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_remove(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_assign(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_select(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_deselect(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_move(struct wmOperatorType *ot);
+
 /* object_warp.c */
 void TRANSFORM_OT_vertex_warp(struct wmOperatorType *ot);
 
@@ -249,20 +252,16 @@ void OBJECT_OT_shape_key_mirror(struct wmOperatorType *ot);
 void OBJECT_OT_shape_key_move(struct wmOperatorType *ot);
 
 /* object_group.c */
-void OBJECT_OT_group_add(struct wmOperatorType *ot);
-void OBJECT_OT_group_link(struct wmOperatorType *ot);
-void OBJECT_OT_group_remove(struct wmOperatorType *ot);
-void OBJECT_OT_group_unlink(struct wmOperatorType *ot);
-void OBJECT_OT_grouped_select(struct wmOperatorType *ot);
+void OBJECT_OT_collection_add(struct wmOperatorType *ot);
+void OBJECT_OT_collection_link(struct wmOperatorType *ot);
+void OBJECT_OT_collection_remove(struct wmOperatorType *ot);
+void OBJECT_OT_collection_unlink(struct wmOperatorType *ot);
+void OBJECT_OT_collection_objects_select(struct wmOperatorType *ot);
 
 /* object_bake.c */
 void OBJECT_OT_bake_image(wmOperatorType *ot);
 void OBJECT_OT_bake(wmOperatorType *ot);
 
-/* object_lod.c */
-void OBJECT_OT_lod_add(struct wmOperatorType *ot);
-void OBJECT_OT_lod_remove(struct wmOperatorType *ot);
-
 /* object_random.c */
 void TRANSFORM_OT_vertex_random(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/object/object_lod.c b/source/blender/editors/object/object_lod.c
deleted file mode 100644
index ced306178b8..00000000000
--- a/source/blender/editors/object/object_lod.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) Blender Foundation
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/object/object_lod.c
- *  \ingroup edobj
- */
-
-#include "DNA_object_types.h"
-
-#include "BKE_context.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "ED_screen.h"
-#include "ED_object.h"
-
-#ifdef WITH_GAMEENGINE
-#  include "BKE_object.h"
-
-#  include "RNA_enum_types.h"
-#endif
-
-#include "object_intern.h"
-
-static int object_lod_add_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Object *ob = ED_object_context(C);
-
-#ifdef WITH_GAMEENGINE
-	BKE_object_lod_add(ob);
-#else
-	(void)ob;
-#endif
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_lod_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Add Level of Detail";
-	ot->description = "Add a level of detail to this object";
-	ot->idname = "OBJECT_OT_lod_add";
-
-	/* api callbacks */
-	ot->exec = object_lod_add_exec;
-	ot->poll = ED_operator_object_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-static int object_lod_remove_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = ED_object_context(C);
-	int index = RNA_int_get(op->ptr, "index");
-
-#ifdef WITH_GAMEENGINE
-	if (!BKE_object_lod_remove(ob, index))
-		return OPERATOR_CANCELLED;
-#else
-	(void)ob;
-	(void)index;
-#endif
-
-	WM_event_add_notifier(C, NC_OBJECT | ND_LOD, CTX_wm_view3d(C));
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_lod_remove(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Remove Level of Detail";
-	ot->description = "Remove a level of detail from this object";
-	ot->idname = "OBJECT_OT_lod_remove";
-
-	/* api callbacks */
-	ot->exec = object_lod_remove_exec;
-	ot->poll = ED_operator_object_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_int(ot->srna, "index", 1, 1, INT_MAX, "Index", "", 1, INT_MAX);
-}
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c
index d70a69e30f8..66c2ad5fa9b 100644
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@ -29,16 +29,31 @@
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
+#include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_report.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_object.h"
+#include "RNA_access.h"
+
+#include "DEG_depsgraph.h"
+
+#include "ED_armature.h"
+#include "ED_screen.h"
+
+#include "ED_object.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+/** \name High Level Mode Operations
+ *
+ * \{ */
 
 static const char *object_mode_op_string(eObjectMode mode)
 {
@@ -102,7 +117,6 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode)
 	return false;
 }
 
-
 /**
  * Sets the mode to a compatible state (use before entering the mode).
  *
@@ -113,6 +127,7 @@ bool ED_object_mode_compat_set(bContext *C, Object *ob, eObjectMode mode, Report
 	bool ok;
 	if (!ELEM(ob->mode, mode, OB_MODE_OBJECT)) {
 		const char *opstring = object_mode_op_string(ob->mode);
+
 		WM_operator_name_call(C, opstring, WM_OP_EXEC_REGION_WIN, NULL);
 		ok = ELEM(ob->mode, mode, OB_MODE_OBJECT);
 		if (!ok) {
@@ -131,48 +146,127 @@ void ED_object_mode_toggle(bContext *C, eObjectMode mode)
 {
 	if (mode != OB_MODE_OBJECT) {
 		const char *opstring = object_mode_op_string(mode);
+
 		if (opstring) {
 			WM_operator_name_call(C, opstring, WM_OP_EXEC_REGION_WIN, NULL);
 		}
 	}
 }
 
+
 /* Wrapper for operator  */
 void ED_object_mode_set(bContext *C, eObjectMode mode)
 {
-#if 0
+	wmWindowManager *wm = CTX_wm_manager(C);
+	wm->op_undo_depth++;
+	/* needed so we don't do undo pushes. */
+	ED_object_mode_generic_enter(C, mode);
+	wm->op_undo_depth--;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Generic Mode Enter/Exit
+ *
+ * Supports exiting a mode without it being in the current context.
+ * This could be done for entering modes too if it's needed.
+ *
+ * \{ */
+
+bool ED_object_mode_generic_enter(
+        struct bContext *C, eObjectMode object_mode)
+{
+	Object *ob = CTX_data_active_object(C);
+	if (ob == NULL) {
+		return (object_mode == OB_MODE_OBJECT);
+	}
+	if (ob->mode == object_mode) {
+		return true;
+	}
 	wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_mode_set", false);
 	PointerRNA ptr;
-
 	WM_operator_properties_create_ptr(&ptr, ot);
-	RNA_enum_set(&ptr, "mode", mode);
-	RNA_boolean_set(&ptr, "toggle", false);
-	WM_operator_name_call_ptr(C, ot, WM_OP_EXEC_DEFAULT, &ptr);
+	RNA_enum_set(&ptr, "mode", object_mode);
+	WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &ptr);
 	WM_operator_properties_free(&ptr);
-#else
-	Object *ob = CTX_data_active_object(C);
-	if (ob == NULL) {
-		return;
+	return (ob->mode == object_mode);
+}
+
+/**
+ * Use for changing works-paces or changing active object.
+ * Caller can check #OB_MODE_ALL_MODE_DATA to test if this needs to be run.
+ */
+static bool ed_object_mode_generic_exit_ex(
+        struct Main *bmain,
+        struct Depsgraph *depsgraph,
+        struct Scene *scene, struct Object *ob,
+        bool only_test)
+{
+	BLI_assert((bmain == NULL) == only_test);
+	if (ob->mode & OB_MODE_EDIT) {
+		if (BKE_object_is_in_editmode(ob)) {
+			if (only_test) {
+				return true;
+			}
+			ED_object_editmode_exit_ex(scene, ob, EM_FREEDATA);
+		}
 	}
-	if (ob->mode == mode) {
-		/* pass */
+	else if (ob->mode & OB_MODE_VERTEX_PAINT) {
+		if (ob->sculpt && (ob->sculpt->mode_type == OB_MODE_VERTEX_PAINT)) {
+			if (only_test) {
+				return true;
+			}
+			ED_object_vpaintmode_exit_ex(ob);
+		}
+	}
+	else if (ob->mode & OB_MODE_WEIGHT_PAINT) {
+		if (ob->sculpt && (ob->sculpt->mode_type == OB_MODE_WEIGHT_PAINT)) {
+			if (only_test) {
+				return true;
+			}
+			ED_object_wpaintmode_exit_ex(ob);
+		}
+	}
+	else if (ob->mode & OB_MODE_SCULPT) {
+		if (ob->sculpt && (ob->sculpt->mode_type == OB_MODE_SCULPT)) {
+			if (only_test) {
+				return true;
+			}
+			ED_object_sculptmode_exit_ex(depsgraph, scene, ob);
+		}
 	}
-	else if (mode != OB_MODE_OBJECT) {
-		if (ob && (ob->mode & mode) == 0) {
-			/* needed so we don't do undo pushes. */
-			wmWindowManager *wm = CTX_wm_manager(C);
-			wm->op_undo_depth++;
-			ED_object_mode_toggle(C, mode);
-			wm->op_undo_depth--;
+	else if (ob->mode & OB_MODE_POSE) {
+		if (ob->pose != NULL) {
+			if (only_test) {
+				return true;
+			}
+			ED_object_posemode_exit_ex(bmain, ob);
 		}
 	}
 	else {
-		/* needed so we don't do undo pushes. */
-		wmWindowManager *wm = CTX_wm_manager(C);
-		wm->op_undo_depth++;
-		ED_object_mode_toggle(C, ob->mode);
-		wm->op_undo_depth--;
-
+		if (only_test) {
+			return false;
+		}
+		BLI_assert((ob->mode & OB_MODE_ALL_MODE_DATA) == 0);
 	}
-#endif
+
+	return false;
 }
+
+void ED_object_mode_generic_exit(
+        struct Main *bmain,
+        struct Depsgraph *depsgraph,
+        struct Scene *scene, struct Object *ob)
+{
+	ed_object_mode_generic_exit_ex(bmain, depsgraph, scene, ob, false);
+}
+
+bool ED_object_mode_generic_has_data(
+        struct Depsgraph *depsgraph,
+        struct Object *ob)
+{
+	return ed_object_mode_generic_exit_ex(NULL, depsgraph, NULL, ob, true);
+}
+
+/** \} */
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index c79be8ed223..28ab43d5def 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -54,7 +54,6 @@
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_displist.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_effect.h"
@@ -75,6 +74,10 @@
 #include "BKE_softbody.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -171,8 +174,8 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	DAG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
 
 	return new_md;
 }
@@ -253,7 +256,7 @@ bool ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v)
 	for (md = ob->modifiers.first; md; md = md->next) {
 		if (md->type == eModifierType_Multires) {
 			multires_set_tot_level(ob, (MultiresModifierData *)md, totlevel);
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 	return false;
@@ -320,7 +323,7 @@ static bool object_modifier_remove(Main *bmain, Object *ob, ModifierData *md,
 		ob->mode &= ~OB_MODE_PARTICLE_EDIT;
 	}
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);
@@ -341,8 +344,8 @@ bool ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, Mod
 		return 0;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	DAG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
 
 	return 1;
 }
@@ -365,8 +368,8 @@ void ED_object_modifier_clear(Main *bmain, Object *ob)
 		md = next_md;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	DAG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
 }
 
 int ED_object_modifier_move_up(ReportList *reports, Object *ob, ModifierData *md)
@@ -411,7 +414,7 @@ int ED_object_modifier_move_down(ReportList *reports, Object *ob, ModifierData *
 	return 1;
 }
 
-int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, Object *ob, ModifierData *md)
+int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob, ModifierData *md)
 {
 	Object *obn;
 	ParticleSystem *psys;
@@ -463,7 +466,7 @@ int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *
 	if (totvert == 0) return 0;
 
 	/* add new mesh */
-	obn = BKE_object_add(bmain, scene, OB_MESH, NULL);
+	obn = BKE_object_add(bmain, scene, view_layer, OB_MESH, NULL);
 	me = obn->data;
 
 	me->totvert = totvert;
@@ -515,12 +518,12 @@ int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *
 		}
 	}
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	return 1;
 }
 
-static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, ModifierData *md)
+static int modifier_apply_shape(ReportList *reports, Depsgraph *depsgraph, Scene *scene, Object *ob, ModifierData *md)
 {
 	const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
@@ -543,7 +546,7 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
 	 */
 
 	if (ob->type == OB_MESH) {
-		DerivedMesh *dm;
+		Mesh *mesh_applied;
 		Mesh *me = ob->data;
 		Key *key = me->key;
 		KeyBlock *kb;
@@ -553,8 +556,8 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
 			return 0;
 		}
 
-		dm = mesh_create_derived_for_modifier(scene, ob, md, 0);
-		if (!dm) {
+		mesh_applied = BKE_mesh_create_derived_for_modifier(depsgraph, scene, ob, md, 0);
+		if (!mesh_applied) {
 			BKE_report(reports, RPT_ERROR, "Modifier is disabled or returned error, skipping apply");
 			return 0;
 		}
@@ -569,9 +572,9 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
 		}
 
 		kb = BKE_keyblock_add(key, md->name);
-		DM_to_meshkey(dm, me, kb);
+		BKE_nomain_mesh_to_meshkey(mesh_applied, me, kb);
 
-		dm->release(dm);
+		BKE_id_free(NULL, mesh_applied);
 	}
 	else {
 		BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
@@ -580,7 +583,7 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
 	return 1;
 }
 
-static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, ModifierData *md)
+static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scene *scene, Object *ob, ModifierData *md)
 {
 	const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
@@ -592,7 +595,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 	}
 
 	if (ob->type == OB_MESH) {
-		DerivedMesh *dm;
+		Mesh *mesh_applied;
 		Mesh *me = ob->data;
 		MultiresModifierData *mmd = find_multires_modifier_before(scene, md);
 
@@ -606,19 +609,19 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 			multires_force_update(ob);
 
 		if (mmd && mmd->totlvl && mti->type == eModifierTypeType_OnlyDeform) {
-			if (!multiresModifier_reshapeFromDeformMod(scene, mmd, ob, md)) {
+			if (!multiresModifier_reshapeFromDeformMod(depsgraph, scene, mmd, ob, md)) {
 				BKE_report(reports, RPT_ERROR, "Multires modifier returned error, skipping apply");
 				return 0;
 			}
 		}
 		else {
-			dm = mesh_create_derived_for_modifier(scene, ob, md, 1);
-			if (!dm) {
+			mesh_applied = BKE_mesh_create_derived_for_modifier(depsgraph, scene, ob, md, 1);
+			if (!mesh_applied) {
 				BKE_report(reports, RPT_ERROR, "Modifier returned error, skipping apply");
 				return 0;
 			}
 
-			DM_to_mesh(dm, me, ob, CD_MASK_MESH, true);
+			BKE_nomain_mesh_to_mesh(mesh_applied, me, ob, CD_MASK_MESH, true);
 
 			if (md->type == eModifierType_Multires)
 				multires_customdata_delete(me);
@@ -628,6 +631,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 		Curve *cu;
 		int numVerts;
 		float (*vertexCos)[3];
+		ModifierEvalContext mectx = {depsgraph, ob, 0};
 
 		if (ELEM(mti->type, eModifierTypeType_Constructive, eModifierTypeType_Nonconstructive)) {
 			BKE_report(reports, RPT_ERROR, "Cannot apply constructive modifiers on curve");
@@ -638,12 +642,12 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 		BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices");
 
 		vertexCos = BKE_curve_nurbs_vertexCos_get(&cu->nurb, &numVerts);
-		mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0);
+		modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts);
 		BK_curve_nurbs_vertexCos_apply(&cu->nurb, vertexCos);
 
 		MEM_freeN(vertexCos);
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
@@ -660,18 +664,20 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 			if (psys->part->type != PART_HAIR)
 				continue;
 
-			psys_apply_hair_lattice(scene, ob, psys);
+			psys_apply_hair_lattice(depsgraph, scene, ob, psys);
 		}
 	}
 
 	return 1;
 }
 
-int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, ModifierData *md, int mode)
+int ED_object_modifier_apply(
+        ReportList *reports, Depsgraph *depsgraph,
+        Scene *scene, Object *ob, ModifierData *md, int mode)
 {
 	int prev_mode;
 
-	if (scene->obedit) {
+	if (BKE_object_is_in_editmode(ob)) {
 		BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in edit mode");
 		return 0;
 	}
@@ -695,13 +701,13 @@ int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, Modi
 	md->mode |= eModifierMode_Realtime;
 
 	if (mode == MODIFIER_APPLY_SHAPE) {
-		if (!modifier_apply_shape(reports, scene, ob, md)) {
+		if (!modifier_apply_shape(reports, depsgraph, scene, ob, md)) {
 			md->mode = prev_mode;
 			return 0;
 		}
 	}
 	else {
-		if (!modifier_apply_obdata(reports, scene, ob, md)) {
+		if (!modifier_apply_obdata(reports, depsgraph, scene, ob, md)) {
 			md->mode = prev_mode;
 			return 0;
 		}
@@ -819,10 +825,20 @@ int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", rna_type);
 	Object *ob = (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
 
+	if (!ptr.data) {
+		CTX_wm_operator_poll_msg_set(C, "Context missing 'modifier'");
+		return 0;
+	}
+
 	if (!ob || ID_IS_LINKED(ob)) return 0;
 	if (obtype_flag && ((1 << ob->type) & obtype_flag) == 0) return 0;
 	if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0;
 
+	if (ID_IS_STATIC_OVERRIDE(ob)) {
+		CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override");
+		return (((ModifierData *)ptr.data)->flag & eModifierFlag_StaticOverride_Local) != 0;
+	}
+
 	return 1;
 }
 
@@ -874,7 +890,7 @@ ModifierData *edit_modifier_property_get(wmOperator *op, Object *ob, int type)
 static int modifier_remove_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob = ED_object_active_context(C);
 	ModifierData *md = edit_modifier_property_get(op, ob, 0);
 	int mode_orig = ob->mode;
@@ -885,11 +901,13 @@ static int modifier_remove_exec(bContext *C, wmOperator *op)
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	/* if cloth/softbody was removed, particle mode could be cleared */
-	if (mode_orig & OB_MODE_PARTICLE_EDIT)
-		if ((ob->mode & OB_MODE_PARTICLE_EDIT) == 0)
-			if (scene->basact && scene->basact->object == ob)
+	if (mode_orig & OB_MODE_PARTICLE_EDIT) {
+		if ((ob->mode & OB_MODE_PARTICLE_EDIT) == 0) {
+			if (ob == OBACT(view_layer)) {
 				WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, NULL);
-
+			}
+		}
+	}
 	return OPERATOR_FINISHED;
 }
 
@@ -926,7 +944,7 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op)
 	if (!md || !ED_object_modifier_move_up(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -965,7 +983,7 @@ static int modifier_move_down_exec(bContext *C, wmOperator *op)
 	if (!md || !ED_object_modifier_move_down(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -998,16 +1016,17 @@ void OBJECT_OT_modifier_move_down(wmOperatorType *ot)
 
 static int modifier_apply_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_active_context(C);
 	ModifierData *md = edit_modifier_property_get(op, ob, 0);
 	int apply_as = RNA_enum_get(op->ptr, "apply_as");
 
-	if (!md || !ED_object_modifier_apply(op->reports, scene, ob, md, apply_as)) {
+	if (!md || !ED_object_modifier_apply(op->reports, depsgraph, scene, ob, md, apply_as)) {
 		return OPERATOR_CANCELLED;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1050,13 +1069,14 @@ static int modifier_convert_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob = ED_object_active_context(C);
 	ModifierData *md = edit_modifier_property_get(op, ob, 0);
 
-	if (!md || !ED_object_modifier_convert(op->reports, bmain, scene, ob, md))
+	if (!md || !ED_object_modifier_convert(op->reports, bmain, scene, view_layer, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1095,7 +1115,7 @@ static int modifier_copy_exec(bContext *C, wmOperator *op)
 	if (!md || !ED_object_modifier_copy(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1189,7 +1209,7 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
 	                     ED_object_multires_update_totlevels_cb,
 	                     &mmd->totlvl);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	if (ob->mode & OB_MODE_SCULPT) {
@@ -1227,6 +1247,7 @@ void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
 
 static int multires_reshape_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *ob = ED_object_active_context(C), *secondob = NULL;
 	Scene *scene = CTX_data_scene(C);
 	MultiresModifierData *mmd = (MultiresModifierData *)edit_modifier_property_get(op, ob, eModifierType_Multires);
@@ -1253,12 +1274,12 @@ static int multires_reshape_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	if (!multiresModifier_reshape(scene, mmd, ob, secondob)) {
+	if (!multiresModifier_reshape(depsgraph, scene, mmd, ob, secondob)) {
 		BKE_report(op->reports, RPT_ERROR, "Objects do not have the same number of vertices");
 		return OPERATOR_CANCELLED;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1407,7 +1428,7 @@ static int multires_base_apply_exec(bContext *C, wmOperator *op)
 
 	multiresModifier_base_apply(mmd, ob);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1513,7 +1534,7 @@ static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BLI_gset_free(visited, NULL);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1568,7 +1589,7 @@ static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1618,7 +1639,7 @@ static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1687,7 +1708,7 @@ static void skin_armature_bone_create(Object *skin_ob,
 	}
 }
 
-static Object *modifier_skin_armature_create(Main *bmain, Scene *scene, Object *skin_ob)
+static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, Scene *scene, Object *skin_ob)
 {
 	BLI_bitmap *edges_visited;
 	DerivedMesh *deform_dm;
@@ -1700,7 +1721,7 @@ static Object *modifier_skin_armature_create(Main *bmain, Scene *scene, Object *
 	int *emap_mem;
 	int v;
 
-	deform_dm = mesh_get_derived_deform(scene, skin_ob, CD_MASK_BAREMESH);
+	deform_dm = mesh_get_derived_deform(depsgraph, scene, skin_ob, CD_MASK_BAREMESH);
 	mvert = deform_dm->getVertArray(deform_dm);
 
 	/* add vertex weights to original mesh */
@@ -1710,7 +1731,8 @@ static Object *modifier_skin_armature_create(Main *bmain, Scene *scene, Object *
 	                     NULL,
 	                     me->totvert);
 
-	arm_ob = BKE_object_add(bmain, scene, OB_ARMATURE, NULL);
+	ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph);
+	arm_ob = BKE_object_add(bmain, scene, view_layer, OB_ARMATURE, NULL);
 	BKE_object_transform_copy(arm_ob, skin_ob);
 	arm = arm_ob->data;
 	arm->layer = 1;
@@ -1768,6 +1790,7 @@ static Object *modifier_skin_armature_create(Main *bmain, Scene *scene, Object *
 static int skin_armature_create_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C), *arm_ob;
 	Mesh *me = ob->data;
@@ -1780,7 +1803,7 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op)
 	}
 
 	/* create new armature */
-	arm_ob = modifier_skin_armature_create(bmain, scene, ob);
+	arm_ob = modifier_skin_armature_create(depsgraph, bmain, scene, ob);
 
 	/* add a modifier to connect the new armature to the mesh */
 	arm_md = (ArmatureModifierData *)modifier_new(eModifierType_Armature);
@@ -1790,8 +1813,8 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op)
 
 		arm_md->object = arm_ob;
 		arm_md->deformflag = ARM_DEF_VGROUP | ARM_DEF_QUATERNION;
-		DAG_relations_tag_update(bmain);
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_relations_tag_update(bmain);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
@@ -1858,7 +1881,7 @@ static int correctivesmooth_bind_exec(bContext *C, wmOperator *op)
 		csmd->bind_coords_num = (unsigned int)-1;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -1900,6 +1923,7 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_active_context(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	MeshDeformModifierData *mmd = (MeshDeformModifierData *)edit_modifier_property_get(op, ob, eModifierType_MeshDeform);
 
 	if (!mmd)
@@ -1927,7 +1951,7 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op)
 		mmd->totcagevert = 0;
 		mmd->totinfluence = 0;
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 	}
 	else {
@@ -1939,17 +1963,17 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op)
 		mmd->modifier.mode |= eModifierMode_Realtime;
 
 		if (ob->type == OB_MESH) {
-			dm = mesh_create_derived_view(scene, ob, 0);
+			dm = mesh_create_derived_view(depsgraph, scene, ob, 0);
 			dm->release(dm);
 		}
 		else if (ob->type == OB_LATTICE) {
-			BKE_lattice_modifiers_calc(scene, ob);
+			BKE_lattice_modifiers_calc(depsgraph, scene, ob);
 		}
 		else if (ob->type == OB_MBALL) {
-			BKE_displist_make_mball(CTX_data_main(C)->eval_ctx, scene, ob);
+			BKE_displist_make_mball(depsgraph, scene, ob);
 		}
 		else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
-			BKE_displist_make_curveTypes(scene, ob, 0);
+			BKE_displist_make_curveTypes(depsgraph, scene, ob, 0);
 		}
 
 		mmd->bindfunc = NULL;
@@ -2001,7 +2025,7 @@ static int explode_refresh_exec(bContext *C, wmOperator *op)
 
 	emd->flag |= eExplodeFlag_CalcFaces;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
@@ -2147,7 +2171,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op)
 
 	if (free) {
 		omd->refresh |= MOD_OCEAN_REFRESH_CLEAR_CACHE;
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 		return OPERATOR_FINISHED;
 	}
@@ -2175,11 +2199,11 @@ static int ocean_bake_exec(bContext *C, wmOperator *op)
 		 * this part of the process before a threaded job is created */
 
 		//scene->r.cfra = f;
-		//ED_update_for_newframe(bmain, scene, 1);
+		//ED_update_for_newframe(bmain, scene);
 
 		/* ok, this doesn't work with drivers, but is way faster.
 		 * let's use this for now and hope nobody wants to drive the time value... */
-		BKE_animsys_evaluate_animdata(scene, (ID *)ob, ob->adt, f, ADT_RECALC_ANIM);
+		BKE_animsys_evaluate_animdata(CTX_data_depsgraph(C), scene, (ID *)ob, ob->adt, f, ADT_RECALC_ANIM);
 
 		och->time[i] = omd->time;
 		i++;
@@ -2197,7 +2221,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op)
 
 	scene->r.cfra = cfra;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 #endif
 
@@ -2259,18 +2283,44 @@ static int laplaciandeform_poll(bContext *C)
 
 static int laplaciandeform_bind_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_active_context(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)edit_modifier_property_get(op, ob, eModifierType_LaplacianDeform);
 
 	if (!lmd)
 		return OPERATOR_CANCELLED;
 	if (lmd->flag & MOD_LAPLACIANDEFORM_BIND) {
+		/* Un-binding happens inside the modifier when it's evaluated. */
 		lmd->flag &= ~MOD_LAPLACIANDEFORM_BIND;
 	}
 	else {
+		DerivedMesh *dm;
+		int mode = lmd->modifier.mode;
+
+		/* Force modifier to run, it will call binding routine. */
+		/* TODO(Sybren): deduplicate the code below, it's used multiple times here. */
+		lmd->modifier.mode |= eModifierMode_Realtime;
 		lmd->flag |= MOD_LAPLACIANDEFORM_BIND;
+
+		if (ob->type == OB_MESH) {
+			dm = mesh_create_derived_view(depsgraph, scene, ob, 0);
+			dm->release(dm);
+		}
+		else if (ob->type == OB_LATTICE) {
+			BKE_lattice_modifiers_calc(depsgraph, scene, ob);
+		}
+		else if (ob->type == OB_MBALL) {
+			BKE_displist_make_mball(depsgraph, scene, ob);
+		}
+		else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
+			BKE_displist_make_curveTypes(depsgraph, scene, ob, 0);
+		}
+
+		lmd->modifier.mode = mode;
 	}
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 	return OPERATOR_FINISHED;
 }
@@ -2309,20 +2359,44 @@ static int surfacedeform_bind_poll(bContext *C)
 
 static int surfacedeform_bind_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_active_context(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)edit_modifier_property_get(op, ob, eModifierType_SurfaceDeform);
 
 	if (!smd)
 		return OPERATOR_CANCELLED;
 
 	if (smd->flags & MOD_SDEF_BIND) {
+		/* Un-binding happens inside the modifier when it's evaluated. */
 		smd->flags &= ~MOD_SDEF_BIND;
 	}
 	else if (smd->target) {
+		DerivedMesh *dm;
+		int mode = smd->modifier.mode;
+
+		/* Force modifier to run, it will call binding routine. */
+		smd->modifier.mode |= eModifierMode_Realtime;
 		smd->flags |= MOD_SDEF_BIND;
+
+		if (ob->type == OB_MESH) {
+			dm = mesh_create_derived_view(depsgraph, scene, ob, 0);
+			dm->release(dm);
+		}
+		else if (ob->type == OB_LATTICE) {
+			BKE_lattice_modifiers_calc(depsgraph, scene, ob);
+		}
+		else if (ob->type == OB_MBALL) {
+			BKE_displist_make_mball(depsgraph, scene, ob);
+		}
+		else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
+			BKE_displist_make_curveTypes(depsgraph, scene, ob, 0);
+		}
+
+		smd->modifier.mode = mode;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 9a0b37e6dab..915395f22e6 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -47,6 +47,8 @@
 #include "ED_screen.h"
 #include "ED_object.h"
 
+#include "DEG_depsgraph.h"
+
 #include "object_intern.h"
 
 
@@ -61,16 +63,14 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_origin_clear);
 	WM_operatortype_append(OBJECT_OT_visual_transform_apply);
 	WM_operatortype_append(OBJECT_OT_transform_apply);
+	WM_operatortype_append(OBJECT_OT_transform_axis_target);
 	WM_operatortype_append(OBJECT_OT_origin_set);
 
 	WM_operatortype_append(OBJECT_OT_mode_set);
+	WM_operatortype_append(OBJECT_OT_mode_set_or_submode);
 	WM_operatortype_append(OBJECT_OT_editmode_toggle);
 	WM_operatortype_append(OBJECT_OT_posemode_toggle);
 	WM_operatortype_append(OBJECT_OT_proxy_make);
-	WM_operatortype_append(OBJECT_OT_hide_view_clear);
-	WM_operatortype_append(OBJECT_OT_hide_view_set);
-	WM_operatortype_append(OBJECT_OT_hide_render_clear);
-	WM_operatortype_append(OBJECT_OT_hide_render_set);
 	WM_operatortype_append(OBJECT_OT_shade_smooth);
 	WM_operatortype_append(OBJECT_OT_shade_flat);
 	WM_operatortype_append(OBJECT_OT_paths_calculate);
@@ -87,32 +87,32 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_slow_parent_set);
 	WM_operatortype_append(OBJECT_OT_slow_parent_clear);
 	WM_operatortype_append(OBJECT_OT_make_local);
+	WM_operatortype_append(OBJECT_OT_make_override_static);
 	WM_operatortype_append(OBJECT_OT_make_single_user);
 	WM_operatortype_append(OBJECT_OT_make_links_scene);
 	WM_operatortype_append(OBJECT_OT_make_links_data);
-	WM_operatortype_append(OBJECT_OT_move_to_layer);
 
 	WM_operatortype_append(OBJECT_OT_select_random);
 	WM_operatortype_append(OBJECT_OT_select_all);
-	WM_operatortype_append(OBJECT_OT_select_same_group);
+	WM_operatortype_append(OBJECT_OT_select_same_collection);
 	WM_operatortype_append(OBJECT_OT_select_by_type);
-	WM_operatortype_append(OBJECT_OT_select_by_layer);
 	WM_operatortype_append(OBJECT_OT_select_linked);
 	WM_operatortype_append(OBJECT_OT_select_grouped);
 	WM_operatortype_append(OBJECT_OT_select_mirror);
 	WM_operatortype_append(OBJECT_OT_select_more);
 	WM_operatortype_append(OBJECT_OT_select_less);
 
-	WM_operatortype_append(GROUP_OT_create);
-	WM_operatortype_append(GROUP_OT_objects_remove_all);
-	WM_operatortype_append(GROUP_OT_objects_remove);
-	WM_operatortype_append(GROUP_OT_objects_add_active);
-	WM_operatortype_append(GROUP_OT_objects_remove_active);
+	WM_operatortype_append(COLLECTION_OT_create);
+	WM_operatortype_append(COLLECTION_OT_objects_remove_all);
+	WM_operatortype_append(COLLECTION_OT_objects_remove);
+	WM_operatortype_append(COLLECTION_OT_objects_add_active);
+	WM_operatortype_append(COLLECTION_OT_objects_remove_active);
 
 	WM_operatortype_append(OBJECT_OT_delete);
 	WM_operatortype_append(OBJECT_OT_text_add);
 	WM_operatortype_append(OBJECT_OT_armature_add);
 	WM_operatortype_append(OBJECT_OT_empty_add);
+	WM_operatortype_append(OBJECT_OT_lightprobe_add);
 	WM_operatortype_append(OBJECT_OT_drop_named_image);
 	WM_operatortype_append(OBJECT_OT_lamp_add);
 	WM_operatortype_append(OBJECT_OT_camera_add);
@@ -120,7 +120,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_add);
 	WM_operatortype_append(OBJECT_OT_add_named);
 	WM_operatortype_append(OBJECT_OT_effector_add);
-	WM_operatortype_append(OBJECT_OT_group_instance_add);
+	WM_operatortype_append(OBJECT_OT_collection_instance_add);
 	WM_operatortype_append(OBJECT_OT_metaball_add);
 	WM_operatortype_append(OBJECT_OT_duplicates_make_real);
 	WM_operatortype_append(OBJECT_OT_duplicate);
@@ -202,15 +202,18 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_vertex_weight_normalize_active_vertex);
 	WM_operatortype_append(OBJECT_OT_vertex_weight_copy);
 
+	WM_operatortype_append(OBJECT_OT_face_map_add);
+	WM_operatortype_append(OBJECT_OT_face_map_remove);
+	WM_operatortype_append(OBJECT_OT_face_map_assign);
+	WM_operatortype_append(OBJECT_OT_face_map_remove_from);
+	WM_operatortype_append(OBJECT_OT_face_map_select);
+	WM_operatortype_append(OBJECT_OT_face_map_deselect);
+	WM_operatortype_append(OBJECT_OT_face_map_move);
+
 	WM_operatortype_append(TRANSFORM_OT_vertex_warp);
 
-	WM_operatortype_append(OBJECT_OT_game_property_new);
-	WM_operatortype_append(OBJECT_OT_game_property_remove);
-	WM_operatortype_append(OBJECT_OT_game_property_copy);
-	WM_operatortype_append(OBJECT_OT_game_property_clear);
-	WM_operatortype_append(OBJECT_OT_game_property_move);
-	WM_operatortype_append(OBJECT_OT_logic_bricks_copy);
-	WM_operatortype_append(OBJECT_OT_game_physics_copy);
+	WM_operatortype_append(OBJECT_OT_move_to_collection);
+	WM_operatortype_append(OBJECT_OT_link_to_collection);
 
 	WM_operatortype_append(OBJECT_OT_shape_key_add);
 	WM_operatortype_append(OBJECT_OT_shape_key_remove);
@@ -219,11 +222,11 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_shape_key_mirror);
 	WM_operatortype_append(OBJECT_OT_shape_key_move);
 
-	WM_operatortype_append(OBJECT_OT_group_add);
-	WM_operatortype_append(OBJECT_OT_group_link);
-	WM_operatortype_append(OBJECT_OT_group_remove);
-	WM_operatortype_append(OBJECT_OT_group_unlink);
-	WM_operatortype_append(OBJECT_OT_grouped_select);
+	WM_operatortype_append(OBJECT_OT_collection_add);
+	WM_operatortype_append(OBJECT_OT_collection_link);
+	WM_operatortype_append(OBJECT_OT_collection_remove);
+	WM_operatortype_append(OBJECT_OT_collection_unlink);
+	WM_operatortype_append(OBJECT_OT_collection_objects_select);
 
 	WM_operatortype_append(OBJECT_OT_hook_add_selob);
 	WM_operatortype_append(OBJECT_OT_hook_add_newob);
@@ -239,9 +242,6 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_unlink_data);
 	WM_operatortype_append(OBJECT_OT_laplaciandeform_bind);
 
-	WM_operatortype_append(OBJECT_OT_lod_add);
-	WM_operatortype_append(OBJECT_OT_lod_remove);
-
 	WM_operatortype_append(TRANSFORM_OT_vertex_random);
 
 	WM_operatortype_append(OBJECT_OT_data_transfer);
@@ -284,27 +284,28 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 {
 	wmKeyMap *keymap;
 	wmKeyMapItem *kmi;
-	int i;
 
 	/* Objects, Regardless of Mode -------------------------------------------------- */
 	keymap = WM_keymap_find(keyconf, "Object Non-modal", 0, 0);
 
-	/* Note: this keymap works disregarding mode */
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0);
-	RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT);
-	RNA_boolean_set(kmi->ptr, "toggle", true);
-
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_enum_set(kmi->ptr, "mode", OB_MODE_POSE);
-	RNA_boolean_set(kmi->ptr, "toggle", true);
-
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", VKEY, KM_PRESS, 0, 0);
-	RNA_enum_set(kmi->ptr, "mode", OB_MODE_VERTEX_PAINT);
-	RNA_boolean_set(kmi->ptr, "toggle", true);
-
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_enum_set(kmi->ptr, "mode", OB_MODE_WEIGHT_PAINT);
-	RNA_boolean_set(kmi->ptr, "toggle", true);
+	/* modes */
+	{
+		short key_mode_pair[][2] = {
+			{ONEKEY, OB_MODE_OBJECT},
+			{TWOKEY, OB_MODE_EDIT},
+			{THREEKEY, OB_MODE_POSE},
+			{THREEKEY, OB_MODE_WEIGHT_PAINT},
+			{FOURKEY, OB_MODE_VERTEX_PAINT},
+			{FIVEKEY, OB_MODE_TEXTURE_PAINT},
+			{SIXKEY, OB_MODE_SCULPT},
+			{SEVENKEY, OB_MODE_PARTICLE_EDIT},
+		};
+
+		for (uint i = 0; i < ARRAY_SIZE(key_mode_pair); i++) {
+			kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set_or_submode", key_mode_pair[i][0], KM_PRESS, 0, 0);
+			RNA_enum_set(kmi->ptr, "mode", key_mode_pair[i][1]);
+		}
+	}
 
 	WM_keymap_add_item(keymap, "OBJECT_OT_origin_set", CKEY, KM_PRESS, KM_ALT | KM_SHIFT | KM_CTRL, 0);
 
@@ -317,9 +318,6 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	ED_keymap_proportional_cycle(keyconf, keymap);
 	ED_keymap_proportional_obmode(keyconf, keymap);
 
-	/* game-engine only, leave free for users to define */
-	WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0, 0);
-
 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_select_all", AKEY, KM_PRESS, 0, 0);
 	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
@@ -367,25 +365,6 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 
 	WM_keymap_verify_item(keymap, "OBJECT_OT_origin_clear", OKEY, KM_PRESS, KM_ALT, 0);
 
-	WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_clear", HKEY, KM_PRESS, KM_ALT, 0);
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, 0, 0);
-	RNA_boolean_set(kmi->ptr, "unselected", false);
-
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(kmi->ptr, "unselected", true);
-
-	/* same as above but for rendering */
-	WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_clear", HKEY, KM_PRESS, KM_ALT | KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_CTRL, 0);
-
-	/* conflicts, removing */
-#if 0
-	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)
-	      RNA_boolean_set(kmi->ptr, "unselected", true);
-#endif
-
-	WM_keymap_add_item(keymap, "OBJECT_OT_move_to_layer", MKEY, KM_PRESS, 0, 0);
-
 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(kmi->ptr, "use_global", false);
 
@@ -418,11 +397,11 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_delete_v3d", IKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_verify_item(keymap, "ANIM_OT_keying_set_active_set", IKEY, KM_PRESS, KM_CTRL | KM_SHIFT | KM_ALT, 0);
 
-	WM_keymap_verify_item(keymap, "GROUP_OT_create", GKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_all", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL | KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "COLLECTION_OT_create", GKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "COLLECTION_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "COLLECTION_OT_objects_remove_all", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL | KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "COLLECTION_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "COLLECTION_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
 
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_object_specials", WKEY, KM_PRESS, 0, 0);
 
@@ -430,10 +409,13 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	/* XXX No more available 'T' shortcuts... :/ */
 	/* WM_keymap_verify_item(keymap, "OBJECT_OT_datalayout_transfer", TKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0); */
 
-	for (i = 0; i <= 5; i++) {
+	for (int i = 0; i <= 5; i++) {
 		kmi = WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", ZEROKEY + i, KM_PRESS, KM_CTRL, 0);
 		RNA_int_set(kmi->ptr, "level", i);
 	}
+
+	WM_keymap_add_item(keymap, "OBJECT_OT_move_to_collection", MKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_link_to_collection", MKEY, KM_PRESS, KM_SHIFT, 0);
 }
 
 void ED_keymap_proportional_cycle(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap)
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 68bcdc59f4e..d417437ad99 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -63,21 +63,23 @@
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
 #include "BKE_camera.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
-#include "BKE_group.h"
 #include "BKE_fcurve.h"
 #include "BKE_idprop.h"
 #include "BKE_lamp.h"
 #include "BKE_lattice.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
+#include "BKE_library_override.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
+#include "BKE_lightprobe.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mball.h"
@@ -86,12 +88,14 @@
 #include "BKE_node.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
-#include "BKE_sca.h"
 #include "BKE_scene.h"
 #include "BKE_speaker.h"
 #include "BKE_texture.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -123,6 +127,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BMVert *eve;
 	BMIter iter;
@@ -142,7 +148,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 		EDBM_mesh_load(obedit);
 		EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
 
-		DAG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, 0);
 
 		em = me->edit_btmesh;
 
@@ -151,7 +157,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 
 		/* derivedMesh might be needed for solving parenting,
 		 * so re-create it here */
-		makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, false);
+		makeDerivedMesh(depsgraph, scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, false);
 
 		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
 			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
@@ -230,7 +236,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
 		if (ob != obedit) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 			par = obedit->parent;
 
 			if (BKE_object_parent_loop_check(par, ob)) {
@@ -239,7 +245,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 			else {
 				Object workob;
 
-				ob->parent = BASACT->object;
+				ob->parent = BASACT(view_layer)->object;
 				if (v3) {
 					ob->partype = PARVERT3;
 					ob->par1 = v1 - 1;
@@ -247,7 +253,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 					ob->par3 = v3 - 1;
 
 					/* inverse parent matrix */
-					BKE_object_workob_calc_parent(scene, ob, &workob);
+					BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 					invert_m4_m4(ob->parentinv, workob.obmat);
 				}
 				else {
@@ -255,7 +261,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 					ob->par1 = v1 - 1;
 
 					/* inverse parent matrix */
-					BKE_object_workob_calc_parent(scene, ob, &workob);
+					BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 					invert_m4_m4(ob->parentinv, workob.obmat);
 				}
 			}
@@ -263,7 +269,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 	WM_event_add_notifier(C, NC_OBJECT, NULL);
 
@@ -322,7 +328,7 @@ static int make_proxy_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	}
 	else {
 		/* error.. cannot continue */
-		BKE_report(op->reports, RPT_ERROR, "Can only make proxy for a referenced object or group");
+		BKE_report(op->reports, RPT_ERROR, "Can only make proxy for a referenced object or collection");
 		return OPERATOR_CANCELLED;
 	}
 
@@ -332,44 +338,42 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Object *ob, *gob = ED_object_active_context(C);
-	GroupObject *go;
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	if (gob->dup_group != NULL) {
-		go = BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "object"));
-		ob = go->ob;
+		const ListBase dup_group_objects = BKE_collection_object_cache_get(gob->dup_group);
+		Base *base = BLI_findlink(&dup_group_objects, RNA_enum_get(op->ptr, "object"));
+		ob = base->object;
 	}
 	else {
 		ob = gob;
-		gob = NULL;
 	}
 
 	if (ob) {
 		Object *newob;
-		Base *newbase, *oldbase = BASACT;
 		char name[MAX_ID_NAME + 4];
 
 		BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name + 2);
 
 		/* Add new object for the proxy */
-		newob = BKE_object_add(bmain, scene, OB_EMPTY, name);
+		newob = BKE_object_add_from(bmain, scene, view_layer, OB_EMPTY, name, gob ? gob : ob);
 
 		/* set layers OK */
-		newbase = BASACT;    /* BKE_object_add sets active... */
-		newbase->lay = oldbase->lay;
-		newob->lay = newbase->lay;
-
-		/* remove base, leave user count of object, it gets linked in BKE_object_make_proxy */
-		if (gob == NULL) {
-			BKE_scene_base_unlink(scene, oldbase);
-			MEM_freeN(oldbase);
-		}
-
 		BKE_object_make_proxy(newob, ob, gob);
 
+		/* Set back pointer immediately so dependency graph knows that this is
+		 * is a proxy and will act accordingly. Otherwise correctness of graph
+		 * will depend on order of bases.
+		 *
+		 * TODO(sergey): We really need to get rid of this bi-directional links
+		 * in proxies with something like static overrides.
+		 */
+		newob->proxy->proxy_from = newob;
+
 		/* depsgraph flushes are needed for the new data */
-		DAG_relations_tag_update(bmain);
-		DAG_id_tag_update(&newob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+		DEG_relations_tag_update(bmain);
+		DEG_id_tag_update(&newob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, newob);
 	}
 	else {
@@ -381,24 +385,25 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
 }
 
 /* Generic itemf's for operators that take library args */
-static const EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSED(ptr),
-                                                  PropertyRNA *UNUSED(prop), bool *r_free)
+static const EnumPropertyItem *proxy_collection_object_itemf(bContext *C, PointerRNA *UNUSED(ptr),
+                                                             PropertyRNA *UNUSED(prop), bool *r_free)
 {
 	EnumPropertyItem item_tmp = {0}, *item = NULL;
 	int totitem = 0;
 	int i = 0;
 	Object *ob = ED_object_active_context(C);
-	GroupObject *go;
 
 	if (!ob || !ob->dup_group)
 		return DummyRNA_DEFAULT_items;
 
 	/* find the object to affect */
-	for (go = ob->dup_group->gobject.first; go; go = go->next) {
-		item_tmp.identifier = item_tmp.name = go->ob->id.name + 2;
+	FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(ob->dup_group, object)
+	{
+		item_tmp.identifier = item_tmp.name = object->id.name + 2;
 		item_tmp.value = i++;
 		RNA_enum_item_add(&item, &totitem, &item_tmp);
 	}
+	FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 
 	RNA_enum_item_end(&item, &totitem);
 	*r_free = true;
@@ -426,8 +431,8 @@ void OBJECT_OT_proxy_make(wmOperatorType *ot)
 	/* properties */
 	/* XXX, relies on hard coded ID at the moment */
 	prop = RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0, "Proxy Object",
-	                    "Name of lib-linked/grouped object to make a proxy for");
-	RNA_def_enum_funcs(prop, proxy_group_object_itemf);
+	                    "Name of lib-linked/collection object to make a proxy for");
+	RNA_def_enum_funcs(prop, proxy_collection_object_itemf);
 	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
 	ot->prop = prop;
 }
@@ -524,7 +529,7 @@ void ED_object_parent_clear(Object *ob, const int type)
 	/* Always clear parentinv matrix for sake of consistency, see T41950. */
 	unit_m4(ob->parentinv);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 }
 
 /* note, poll should check for editable scene */
@@ -539,7 +544,7 @@ static int parent_clear_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 	return OPERATOR_FINISHED;
@@ -607,13 +612,15 @@ EnumPropertyItem prop_make_parent_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object *ob, Object *par,
+bool ED_object_parent_set(ReportList *reports, const bContext *C, Scene *scene, Object *ob, Object *par,
                           int partype, const bool xmirror, const bool keep_transform, const int vert_par[3])
 {
+	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	bPoseChannel *pchan = NULL;
 	const bool pararm = ELEM(partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
 
-	DAG_id_tag_update(&par->id, OB_RECALC_OB);
+	DEG_id_tag_update(&par->id, OB_RECALC_OB);
 
 	/* preconditions */
 	if (partype == PAR_FOLLOW || partype == PAR_PATH_CONST) {
@@ -624,7 +631,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 
 			if ((cu->flag & CU_PATH) == 0) {
 				cu->flag |= CU_PATH | CU_FOLLOW;
-				BKE_displist_make_curveTypes(scene, par, 0);  /* force creation of path data */
+				BKE_displist_make_curveTypes(depsgraph, scene, par, 0);  /* force creation of path data */
 			}
 			else {
 				cu->flag |= CU_FOLLOW;
@@ -710,7 +717,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 									((CurveModifierData *)md)->object = par;
 								}
 								if (par->curve_cache && par->curve_cache->path == NULL) {
-									DAG_id_tag_update(&par->id, OB_RECALC_DATA);
+									DEG_id_tag_update(&par->id, OB_RECALC_DATA);
 								}
 							}
 							break;
@@ -766,34 +773,36 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 				data = con->data;
 				data->tar = par;
 
-				BKE_constraint_target_matrix_get(scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
+				BKE_constraint_target_matrix_get(depsgraph, scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
 				sub_v3_v3v3(vec, ob->obmat[3], cmat[3]);
 
 				copy_v3_v3(ob->loc, vec);
 			}
 			else if (pararm && (ob->type == OB_MESH) && (par->type == OB_ARMATURE)) {
-				if (partype == PAR_ARMATURE_NAME)
-					ED_object_vgroup_calc_from_armature(reports, scene, ob, par, ARM_GROUPS_NAME, false);
-				else if (partype == PAR_ARMATURE_ENVELOPE)
-					ED_object_vgroup_calc_from_armature(reports, scene, ob, par, ARM_GROUPS_ENVELOPE, xmirror);
+				if (partype == PAR_ARMATURE_NAME) {
+					ED_object_vgroup_calc_from_armature(reports, depsgraph, scene, ob, par, ARM_GROUPS_NAME, false);
+				}
+				else if (partype == PAR_ARMATURE_ENVELOPE) {
+					ED_object_vgroup_calc_from_armature(reports, depsgraph, scene, ob, par, ARM_GROUPS_ENVELOPE, xmirror);
+				}
 				else if (partype == PAR_ARMATURE_AUTO) {
 					WM_cursor_wait(1);
-					ED_object_vgroup_calc_from_armature(reports, scene, ob, par, ARM_GROUPS_AUTO, xmirror);
+					ED_object_vgroup_calc_from_armature(reports, depsgraph, scene, ob, par, ARM_GROUPS_AUTO, xmirror);
 					WM_cursor_wait(0);
 				}
 				/* get corrected inverse */
 				ob->partype = PAROBJECT;
-				BKE_object_workob_calc_parent(scene, ob, &workob);
+				BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 
 				invert_m4_m4(ob->parentinv, workob.obmat);
 			}
 			else {
 				/* calculate inverse parent matrix */
-				BKE_object_workob_calc_parent(scene, ob, &workob);
+				BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
 				invert_m4_m4(ob->parentinv, workob.obmat);
 			}
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 		}
 	}
 
@@ -864,7 +873,7 @@ static int parent_set_exec(bContext *C, wmOperator *op)
 				parent_set_vert_find(tree, ob, vert_par, is_tri);
 			}
 
-			if (!ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, xmirror, keep_transform, vert_par_p)) {
+			if (!ED_object_parent_set(op->reports, C, scene, ob, par, partype, xmirror, keep_transform, vert_par_p)) {
 				ok = false;
 				break;
 			}
@@ -879,7 +888,7 @@ static int parent_set_exec(bContext *C, wmOperator *op)
 	if (!ok)
 		return OPERATOR_CANCELLED;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 
@@ -963,7 +972,7 @@ static void parent_set_ui(bContext *C, wmOperator *op)
 	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 	/* Main auto-draw call. */
-	uiDefAutoButsRNA(layout, &ptr, parent_set_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, parent_set_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 
 void OBJECT_OT_parent_set(wmOperatorType *ot)
@@ -996,7 +1005,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	Object *par = ED_object_active_context(C);
 
-	DAG_id_tag_update(&par->id, OB_RECALC_OB);
+	DEG_id_tag_update(&par->id, OB_RECALC_OB);
 
 	/* context iterator */
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -1011,7 +1020,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
 				memset(ob->loc, 0, 3 * sizeof(float));
 
 				/* set recalc flags */
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 				/* set parenting type for object - object only... */
 				ob->parent = par;
@@ -1021,7 +1030,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	return OPERATOR_FINISHED;
@@ -1047,6 +1056,7 @@ void OBJECT_OT_parent_no_inverse_set(wmOperatorType *ot)
 
 static int object_slow_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -1054,9 +1064,9 @@ static int object_slow_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
 		if (ob->parent) {
 			if (ob->partype & PARSLOW) {
 				ob->partype -= PARSLOW;
-				BKE_object_where_is_calc(scene, ob);
+				BKE_object_where_is_calc(depsgraph, scene, ob);
 				ob->partype |= PARSLOW;
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
 		}
 	}
@@ -1094,7 +1104,7 @@ static int object_slow_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 		if (ob->parent)
 			ob->partype |= PARSLOW;
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 	}
 	CTX_DATA_END;
 
@@ -1148,7 +1158,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
 
 		/* remove track-object for old track */
 		ob->track = NULL;
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 		/* also remove all tracking constraints */
 		for (con = ob->constraints.last; con; con = pcon) {
@@ -1162,7 +1172,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	return OPERATOR_FINISHED;
@@ -1222,7 +1232,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
 					data = con->data;
 					data->tar = obact;
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 					/* Lamp, Camera and Speaker track differently by default */
 					if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1245,7 +1255,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
 					data = con->data;
 					data->tar = obact;
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 					/* Lamp, Camera and Speaker track differently by default */
 					if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1269,7 +1279,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
 					data = con->data;
 					data->tar = obact;
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 					/* Lamp, Camera and Speaker track differently by default */
 					if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1283,7 +1293,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	return OPERATOR_FINISHED;
@@ -1309,119 +1319,6 @@ void OBJECT_OT_track_set(wmOperatorType *ot)
 	ot->prop = RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", "");
 }
 
-/************************** Move to Layer Operator *****************************/
-
-static unsigned int move_to_layer_init(bContext *C, wmOperator *op)
-{
-	int values[20], a;
-	unsigned int lay = 0;
-
-	if (!RNA_struct_property_is_set(op->ptr, "layers")) {
-		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
-		{
-			lay |= base->lay;
-		}
-		CTX_DATA_END;
-
-		for (a = 0; a < 20; a++)
-			values[a] = (lay & (1 << a)) != 0;
-
-		RNA_boolean_set_array(op->ptr, "layers", values);
-	}
-	else {
-		RNA_boolean_get_array(op->ptr, "layers", values);
-
-		for (a = 0; a < 20; a++)
-			if (values[a])
-				lay |= (1 << a);
-	}
-
-	return lay;
-}
-
-static int move_to_layer_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	View3D *v3d = CTX_wm_view3d(C);
-	if (v3d && v3d->localvd) {
-		return WM_operator_confirm_message(C, op, "Move out of Local View");
-	}
-	else {
-		move_to_layer_init(C, op);
-		return WM_operator_props_popup(C, op, event);
-	}
-}
-
-static int move_to_layer_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	View3D *v3d = CTX_wm_view3d(C);
-	unsigned int lay, local;
-	/* bool is_lamp = false; */ /* UNUSED */
-
-	lay = move_to_layer_init(C, op);
-	lay &= 0xFFFFFF;
-
-	if (lay == 0) return OPERATOR_CANCELLED;
-
-	if (v3d && v3d->localvd) {
-		/* now we can move out of localview. */
-		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
-		{
-			lay = base->lay & ~v3d->lay;
-			base->lay = lay;
-			base->object->lay = lay;
-			base->object->flag &= ~SELECT;
-			base->flag &= ~SELECT;
-			/* if (base->object->type == OB_LAMP) is_lamp = true; */
-		}
-		CTX_DATA_END;
-	}
-	else {
-		/* normal non localview operation */
-		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
-		{
-			/* upper byte is used for local view */
-			local = base->lay & 0xFF000000;
-			base->lay = lay + local;
-			base->object->lay = base->lay;
-			/* if (base->object->type == OB_LAMP) is_lamp = true; */
-		}
-		CTX_DATA_END;
-	}
-
-	/* warning, active object may be hidden now */
-
-	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, scene);
-	WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
-
-	DAG_relations_tag_update(bmain);
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_move_to_layer(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Move to Layer";
-	ot->description = "Move the object to different layers";
-	ot->idname = "OBJECT_OT_move_to_layer";
-
-	/* api callbacks */
-	ot->invoke = move_to_layer_invoke;
-	ot->exec = move_to_layer_exec;
-	ot->poll = ED_operator_objectmode;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", "");
-}
-
 /************************** Link to Scene Operator *****************************/
 
 #if 0
@@ -1444,23 +1341,10 @@ static void link_to_scene(Main *UNUSED(bmain), unsigned short UNUSED(nr))
 }
 #endif
 
-Base *ED_object_scene_link(Scene *scene, Object *ob)
-{
-	Base *base;
-
-	if (BKE_scene_base_find(scene, ob)) {
-		return NULL;
-	}
-
-	base = BKE_scene_base_add(scene, ob);
-	id_us_plus(&ob->id);
-
-	return base;
-}
-
 static int make_links_scene_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
+	Main *bmain = CTX_data_main(C);
+	Scene *scene_to = BLI_findlink(&bmain->scene, RNA_enum_get(op->ptr, "scene"));
 
 	if (scene_to == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Could not find scene");
@@ -1477,9 +1361,10 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
+	Collection *collection_to = BKE_collection_master(scene_to);
 	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
-		ED_object_scene_link(scene_to, base->object);
+		BKE_collection_object_add(bmain, collection_to, base->object);
 	}
 	CTX_DATA_END;
 
@@ -1495,7 +1380,7 @@ enum {
 	MAKE_LINKS_MATERIALS  = 2,
 	MAKE_LINKS_ANIMDATA   = 3,
 	MAKE_LINKS_GROUP      = 4,
-	MAKE_LINKS_DUPLIGROUP = 5,
+	MAKE_LINKS_DUPLICOLLECTION = 5,
 	MAKE_LINKS_MODIFIERS  = 6,
 	MAKE_LINKS_FONTS      = 7,
 };
@@ -1516,7 +1401,7 @@ static bool allow_make_links_data(const int type, Object *ob_src, Object *ob_dst
 			break;
 		case MAKE_LINKS_ANIMDATA:
 		case MAKE_LINKS_GROUP:
-		case MAKE_LINKS_DUPLIGROUP:
+		case MAKE_LINKS_DUPLICOLLECTION:
 			return true;
 		case MAKE_LINKS_MODIFIERS:
 			if (!ELEM(OB_EMPTY, ob_src->type, ob_dst->type)) {
@@ -1535,22 +1420,21 @@ static bool allow_make_links_data(const int type, Object *ob_src, Object *ob_dst
 static int make_links_data_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
 	const int type = RNA_enum_get(op->ptr, "type");
 	Object *ob_src;
 	ID *obdata_id;
 	int a;
 
-	/* group */
-	LinkNode *ob_groups = NULL;
+	/* collection */
+	LinkNode *ob_collections = NULL;
 	bool is_cycle = false;
 	bool is_lib = false;
 
 	ob_src = ED_object_active_context(C);
 
-	/* avoid searching all groups in source object each time */
+	/* avoid searching all collections in source object each time */
 	if (type == MAKE_LINKS_GROUP) {
-		ob_groups = BKE_object_groups(ob_src);
+		ob_collections = BKE_object_groups(bmain, ob_src);
 	}
 
 	CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases)
@@ -1572,7 +1456,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 						/* if amount of material indices changed: */
 						test_object_materials(bmain, ob_dst, ob_dst->data);
 
-						DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 						break;
 					case MAKE_LINKS_MATERIALS:
 						/* new approach, using functions from kernel */
@@ -1580,30 +1464,30 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 							Material *ma = give_current_material(ob_src, a + 1);
 							assign_material(bmain, ob_dst, ma, a + 1, BKE_MAT_ASSIGN_USERPREF); /* also works with ma==NULL */
 						}
-						DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 						break;
 					case MAKE_LINKS_ANIMDATA:
-						BKE_animdata_copy_id(bmain, (ID *)ob_dst, (ID *)ob_src, false);
+						BKE_animdata_copy_id(bmain, (ID *)ob_dst, (ID *)ob_src, false, true);
 						if (ob_dst->data && ob_src->data) {
 							if (ID_IS_LINKED(obdata_id)) {
 								is_lib = true;
 								break;
 							}
-							BKE_animdata_copy_id(bmain, (ID *)ob_dst->data, (ID *)ob_src->data, false);
+							BKE_animdata_copy_id(bmain, (ID *)ob_dst->data, (ID *)ob_src->data, false, true);
 						}
-						DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+						DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 						break;
 					case MAKE_LINKS_GROUP:
 					{
-						LinkNode *group_node;
+						LinkNode *collection_node;
 
-						/* first clear groups */
-						BKE_object_groups_clear(scene, base_dst, ob_dst);
+						/* first clear collections */
+						BKE_object_groups_clear(bmain, ob_dst);
 
-						/* now add in the groups from the link nodes */
-						for (group_node = ob_groups; group_node; group_node = group_node->next) {
-							if (ob_dst->dup_group != group_node->link) {
-								BKE_group_object_add(group_node->link, ob_dst, scene, base_dst);
+						/* now add in the collections from the link nodes */
+						for (collection_node = ob_collections; collection_node; collection_node = collection_node->next) {
+							if (ob_dst->dup_group != collection_node->link) {
+								BKE_collection_object_add(bmain, collection_node->link, ob_dst);
 							}
 							else {
 								is_cycle = true;
@@ -1611,16 +1495,16 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 						}
 						break;
 					}
-					case MAKE_LINKS_DUPLIGROUP:
+					case MAKE_LINKS_DUPLICOLLECTION:
 						ob_dst->dup_group = ob_src->dup_group;
 						if (ob_dst->dup_group) {
 							id_us_plus(&ob_dst->dup_group->id);
-							ob_dst->transflag |= OB_DUPLIGROUP;
+							ob_dst->transflag |= OB_DUPLICOLLECTION;
 						}
 						break;
 					case MAKE_LINKS_MODIFIERS:
 						BKE_object_link_modifiers(ob_dst, ob_src);
-						DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+						DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 						break;
 					case MAKE_LINKS_FONTS:
 					{
@@ -1649,7 +1533,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 						cu_dst->vfontbi = cu_src->vfontbi;
 						id_us_plus((ID *)cu_dst->vfontbi);
 
-						DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+						DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 						break;
 					}
 				}
@@ -1659,12 +1543,12 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 
 	if (type == MAKE_LINKS_GROUP) {
-		if (ob_groups) {
-			BLI_linklist_free(ob_groups, NULL);
+		if (ob_collections) {
+			BLI_linklist_free(ob_collections, NULL);
 		}
 
 		if (is_cycle) {
-			BKE_report(op->reports, RPT_WARNING, "Skipped some groups because of cycle detected");
+			BKE_report(op->reports, RPT_WARNING, "Skipped some collections because of cycle detected");
 		}
 	}
 
@@ -1672,7 +1556,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_WARNING, "Skipped editing library object data");
 	}
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
 	WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, CTX_wm_view3d(C));
 	WM_event_add_notifier(C, NC_OBJECT, NULL);
@@ -1712,7 +1596,7 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot)
 		{MAKE_LINKS_MATERIALS,  "MATERIAL", 0, "Materials", ""},
 		{MAKE_LINKS_ANIMDATA,   "ANIMATION", 0, "Animation Data", ""},
 		{MAKE_LINKS_GROUP,      "GROUPS", 0, "Group", ""},
-		{MAKE_LINKS_DUPLIGROUP, "DUPLIGROUP", 0, "DupliGroup", ""},
+		{MAKE_LINKS_DUPLICOLLECTION, "DUPLICOLLECTION", 0, "DupliGroup", ""},
 		{MAKE_LINKS_MODIFIERS,  "MODIFIERS", 0, "Modifiers", ""},
 		{MAKE_LINKS_FONTS,      "FONTS", 0, "Fonts", ""},
 		{0, NULL, 0, NULL, NULL}};
@@ -1736,101 +1620,120 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot)
 
 /**************************** Make Single User ********************************/
 
-/* Warning, sets ID->newid pointers of objects and groups, but does not clear them. */
-static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const int flag, const bool copy_groups)
+static Object *single_object_users_object(Main *bmain, Scene *scene, Object *ob)
 {
-	Base *base;
-	Object *ob, *obn;
-	Group *group, *groupn;
-	GroupObject *go;
+	/* base gets copy of object */
+	Object *obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
 
-	clear_sca_new_poins();  /* BGE logic */
+	/* remap gpencil parenting */
 
-	/* duplicate (must set newid) */
-	for (base = FIRSTBASE; base; base = base->next) {
-		ob = base->object;
+	if (scene->gpd) {
+		bGPdata *gpd = scene->gpd;
+		for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+			if (gpl->parent == ob) {
+				gpl->parent = obn;
+			}
+		}
+	}
+
+	id_us_plus(&obn->id);
+	id_us_min(&ob->id);
+	return obn;
+}
 
-		if ((base->flag & flag) == flag) {
+static void libblock_relink_collection(Collection *collection)
+{
+	for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+		BKE_libblock_relink_to_newid(&cob->ob->id);
+	}
+
+	for (CollectionChild *child = collection->children.first; child; child = child->next) {
+		libblock_relink_collection(child->collection);
+	}
+}
+
+static void single_object_users_collection(Main *bmain, Scene *scene, Collection *collection, const int flag, const bool copy_collections)
+{
+	for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+		Object *ob = cob->ob;
+		/* an object may be in more than one collection */
+		if ((ob->id.newid == NULL) && ((ob->flag & flag) == flag)) {
 			if (!ID_IS_LINKED(ob) && ob->id.us > 1) {
-				/* base gets copy of object */
-				base->object = obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
+				cob->ob = single_object_users_object(bmain, scene, cob->ob);
+			}
+		}
+	}
 
-				if (copy_groups) {
-					if (ob->flag & OB_FROMGROUP) {
-						obn->flag |= OB_FROMGROUP;
-					}
-				}
-				else {
-					/* copy already clears */
-				}
-				/* remap gpencil parenting */
+	for (CollectionChild *child = collection->children.first; child; child = child->next) {
+		single_object_users_collection(bmain, scene, child->collection, flag, copy_collections);
+	}
+}
 
-				if (scene->gpd) {
-					bGPdata *gpd = scene->gpd;
-					for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
-						if (gpl->parent == ob) {
-							gpl->parent = obn;
-						}
-					}
-				}
+/* Warning, sets ID->newid pointers of objects and collections, but does not clear them. */
+static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const int flag, const bool copy_collections)
+{
+	Collection *collection, *collectionn;
 
-				base->flag = obn->flag;
+	/* duplicate all the objects of the scene */
+	Collection *master_collection = BKE_collection_master(scene);
+	single_object_users_collection(bmain, scene, master_collection, flag, copy_collections);
 
-				id_us_min(&ob->id);
-			}
+	/* loop over ViewLayers and assign the pointers accordingly */
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			ID_NEW_REMAP(base->object);
 		}
 	}
 
-	/* duplicate groups that consist entirely of duplicated objects */
-	for (group = bmain->group.first; group; group = group->id.next) {
-		if (copy_groups && group->gobject.first) {
+	/* duplicate collections that consist entirely of duplicated objects */
+	for (collection = bmain->collection.first; collection; collection = collection->id.next) {
+		if (copy_collections) {
 			bool all_duplicated = true;
+			bool any_duplicated = false;
 
-			for (go = group->gobject.first; go; go = go->next) {
-				if (!(go->ob && (go->ob->id.newid))) {
+			for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+				any_duplicated = true;
+				if (cob->ob->id.newid == NULL) {
 					all_duplicated = false;
 					break;
 				}
 			}
 
-			if (all_duplicated) {
-				groupn = ID_NEW_SET(group, BKE_group_copy(bmain, group));
+			if (any_duplicated && all_duplicated) {
+				// TODO: test if this works, with child collections ..
+				collectionn = ID_NEW_SET(collection, BKE_collection_copy(bmain, NULL, collection));
 
-				for (go = groupn->gobject.first; go; go = go->next) {
-					go->ob = (Object *)go->ob->id.newid;
+				for (CollectionObject *cob = collectionn->gobject.first; cob; cob = cob->next) {
+					cob->ob = (Object *)cob->ob->id.newid;
 				}
 			}
 		}
 	}
 
-	/* group pointers in scene */
+	/* collection pointers in scene */
 	BKE_scene_groups_relink(scene);
 
 	ID_NEW_REMAP(scene->camera);
 	if (v3d) ID_NEW_REMAP(v3d->camera);
 
-	/* object and group pointers */
-	for (base = FIRSTBASE; base; base = base->next) {
-		BKE_libblock_relink_to_newid(&base->object->id);
-	}
-
-	set_sca_new_poins();
+	/* object and collection pointers */
+	libblock_relink_collection(master_collection);
 }
 
 /* not an especially efficient function, only added so the single user
  * button can be functional.*/
 void ED_object_single_user(Main *bmain, Scene *scene, Object *ob)
 {
-	Base *base;
-	const bool copy_groups = false;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (base->object == ob) base->flag |=  OB_DONE;
-		else base->flag &= ~OB_DONE;
+	FOREACH_SCENE_OBJECT_BEGIN(scene, ob_iter)
+	{
+		ob_iter->flag &= ~OB_DONE;
 	}
+	FOREACH_SCENE_OBJECT_END;
 
-	single_object_users(bmain, scene, NULL, OB_DONE, copy_groups);
+	/* tag only the one object */
+	ob->flag |= OB_DONE;
 
+	single_object_users(bmain, scene, NULL, OB_DONE, false);
 	BKE_main_id_clear_newpoins(bmain);
 }
 
@@ -1855,34 +1758,26 @@ static void new_id_matar(Main *bmain, Material **matar, const int totcol)
 	}
 }
 
-static void single_obdata_users(Main *bmain, Scene *scene, const int flag)
+static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *view_layer, const int flag)
 {
-	Object *ob;
 	Lamp *la;
 	Curve *cu;
 	/* Camera *cam; */
-	Base *base;
 	Mesh *me;
 	Lattice *lat;
 	ID *id;
-	int a;
 
-	for (base = FIRSTBASE; base; base = base->next) {
-		ob = base->object;
-		if (!ID_IS_LINKED(ob) && (base->flag & flag) == flag) {
+	FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, ob)
+	{
+		if (!ID_IS_LINKED(ob)) {
 			id = ob->data;
 
 			if (id && id->us > 1 && !ID_IS_LINKED(id)) {
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 				switch (ob->type) {
 					case OB_LAMP:
 						ob->data = la = ID_NEW_SET(ob->data, BKE_lamp_copy(bmain, ob->data));
-						for (a = 0; a < MAX_MTEX; a++) {
-							if (la->mtex[a]) {
-								ID_NEW_REMAP(la->mtex[a]->object);
-							}
-						}
 						break;
 					case OB_CAMERA:
 						ob->data = ID_NEW_SET(ob->data, BKE_camera_copy(bmain, ob->data));
@@ -1911,16 +1806,22 @@ static void single_obdata_users(Main *bmain, Scene *scene, const int flag)
 							BKE_animdata_copy_id_action((ID *)lat->key, false);
 						break;
 					case OB_ARMATURE:
-						DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 						ob->data = ID_NEW_SET(ob->data, BKE_armature_copy(bmain, ob->data));
 						BKE_pose_rebuild(ob, ob->data);
 						break;
 					case OB_SPEAKER:
 						ob->data = ID_NEW_SET(ob->data, BKE_speaker_copy(bmain, ob->data));
 						break;
+					case OB_LIGHTPROBE:
+						ob->data = ID_NEW_SET(ob->data, BKE_lightprobe_copy(bmain, ob->data));
+						break;
 					default:
-						if (G.debug & G_DEBUG)
-							printf("ERROR %s: can't copy %s\n", __func__, id->name);
+						printf("ERROR %s: can't copy %s\n", __func__, id->name);
+						BLI_assert(!"This should never happen.");
+
+						/* We need to end the FOREACH_OBJECT_FLAG_BEGIN iterator to prevent memory leak. */
+						BKE_scene_objects_iterator_end(&iter_macro);
 						return;
 				}
 
@@ -1935,6 +1836,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, const int flag)
 			}
 		}
 	}
+	FOREACH_OBJECT_FLAG_END;
 
 	me = bmain->mesh.first;
 	while (me) {
@@ -1943,31 +1845,26 @@ static void single_obdata_users(Main *bmain, Scene *scene, const int flag)
 	}
 }
 
-static void single_object_action_users(Scene *scene, const int flag)
+static void single_object_action_users(Scene *scene, ViewLayer *view_layer, const int flag)
 {
-	Object *ob;
-	Base *base;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		ob = base->object;
-		if (!ID_IS_LINKED(ob) && (flag == 0 || (base->flag & SELECT)) ) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, ob)
+	{
+		if (!ID_IS_LINKED(ob)) {
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			BKE_animdata_copy_id_action(&ob->id, false);
 		}
 	}
+	FOREACH_OBJECT_FLAG_END;
 }
 
-static void single_mat_users(Main *bmain, Scene *scene, const int flag, const bool do_textures)
+static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *view_layer, const int flag)
 {
-	Object *ob;
-	Base *base;
 	Material *ma, *man;
-	Tex *tex;
-	int a, b;
+	int a;
 
-	for (base = FIRSTBASE; base; base = base->next) {
-		ob = base->object;
-		if (!ID_IS_LINKED(ob) && (flag == 0 || (base->flag & SELECT)) ) {
+	FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, ob)
+	{
+		if (!ID_IS_LINKED(ob)) {
 			for (a = 1; a <= ob->totcol; a++) {
 				ma = give_current_material(ob, a);
 				if (ma) {
@@ -1979,84 +1876,12 @@ static void single_mat_users(Main *bmain, Scene *scene, const int flag, const bo
 
 						man->id.us = 0;
 						assign_material(bmain, ob, man, a, BKE_MAT_ASSIGN_USERPREF);
-
-						if (do_textures) {
-							for (b = 0; b < MAX_MTEX; b++) {
-								if (ma->mtex[b] && (tex = ma->mtex[b]->tex)) {
-									if (tex->id.us > 1) {
-										id_us_min(&tex->id);
-										tex = BKE_texture_copy(bmain, tex);
-										BKE_animdata_copy_id_action(&tex->id, false);
-										man->mtex[b]->tex = tex;
-									}
-								}
-							}
-						}
 					}
 				}
 			}
 		}
 	}
-}
-
-static void do_single_tex_user(Main *bmain, Tex **from)
-{
-	Tex *tex, *texn;
-
-	tex = *from;
-	if (tex == NULL) return;
-
-	if (tex->id.newid) {
-		*from = (Tex *)tex->id.newid;
-		id_us_plus(tex->id.newid);
-		id_us_min(&tex->id);
-	}
-	else if (tex->id.us > 1) {
-		texn = ID_NEW_SET(tex, BKE_texture_copy(bmain, tex));
-		BKE_animdata_copy_id_action(&texn->id, false);
-		tex->id.newid = (ID *)texn;
-		id_us_min(&tex->id);
-		*from = texn;
-	}
-}
-
-static void single_tex_users_expand(Main *bmain)
-{
-	/* only when 'parent' blocks are LIB_TAG_NEW */
-	Material *ma;
-	Lamp *la;
-	World *wo;
-	int b;
-
-	for (ma = bmain->mat.first; ma; ma = ma->id.next) {
-		if (ma->id.tag & LIB_TAG_NEW) {
-			for (b = 0; b < MAX_MTEX; b++) {
-				if (ma->mtex[b] && ma->mtex[b]->tex) {
-					do_single_tex_user(bmain, &(ma->mtex[b]->tex));
-				}
-			}
-		}
-	}
-
-	for (la = bmain->lamp.first; la; la = la->id.next) {
-		if (la->id.tag & LIB_TAG_NEW) {
-			for (b = 0; b < MAX_MTEX; b++) {
-				if (la->mtex[b] && la->mtex[b]->tex) {
-					do_single_tex_user(bmain, &(la->mtex[b]->tex));
-				}
-			}
-		}
-	}
-
-	for (wo = bmain->world.first; wo; wo = wo->id.next) {
-		if (wo->id.tag & LIB_TAG_NEW) {
-			for (b = 0; b < MAX_MTEX; b++) {
-				if (wo->mtex[b] && wo->mtex[b]->tex) {
-					do_single_tex_user(bmain, &(wo->mtex[b]->tex));
-				}
-			}
-		}
-	}
+	FOREACH_OBJECT_FLAG_END;
 }
 
 static void single_mat_users_expand(Main *bmain)
@@ -2066,8 +1891,6 @@ static void single_mat_users_expand(Main *bmain)
 	Mesh *me;
 	Curve *cu;
 	MetaBall *mb;
-	Material *ma;
-	int a;
 
 	for (ob = bmain->object.first; ob; ob = ob->id.next)
 		if (ob->id.tag & LIB_TAG_NEW)
@@ -2084,25 +1907,17 @@ static void single_mat_users_expand(Main *bmain)
 	for (mb = bmain->mball.first; mb; mb = mb->id.next)
 		if (mb->id.tag & LIB_TAG_NEW)
 			new_id_matar(bmain, mb->mat, mb->totcol);
-
-	/* material imats  */
-	for (ma = bmain->mat.first; ma; ma = ma->id.next)
-		if (ma->id.tag & LIB_TAG_NEW)
-			for (a = 0; a < MAX_MTEX; a++)
-				if (ma->mtex[a])
-					ID_NEW_REMAP(ma->mtex[a]->object);
 }
 
 /* used for copying scenes */
-void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bool copy_groups)
+void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bool copy_collections)
 {
-	single_object_users(bmain, scene, NULL, 0, copy_groups);
+	single_object_users(bmain, scene, NULL, 0, copy_collections);
 
 	if (full) {
-		single_obdata_users(bmain, scene, 0);
-		single_object_action_users(scene, 0);
+		single_obdata_users(bmain, scene, NULL, 0);
+		single_object_action_users(scene, NULL, 0);
 		single_mat_users_expand(bmain);
-		single_tex_users_expand(bmain);
 	}
 
 	/* Relink nodetrees' pointers that have been duplicated. */
@@ -2121,12 +1936,13 @@ void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bo
 	{
 		IDP_RelinkProperty(scene->id.properties);
 
-		for (Base *base = scene->base.first; base; base = base->next) {
-			Object *ob = base->object;
+		FOREACH_SCENE_OBJECT_BEGIN(scene, ob)
+		{
 			if (!ID_IS_LINKED(ob)) {
 				IDP_RelinkProperty(ob->id.properties);
 			}
 		}
+		FOREACH_SCENE_OBJECT_END;
 
 		if (scene->nodetree) {
 			IDP_RelinkProperty(scene->nodetree->id.properties);
@@ -2148,7 +1964,7 @@ void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bo
 		}
 	}
 	BKE_main_id_clear_newpoins(bmain);
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 }
 
 /******************************* Make Local ***********************************/
@@ -2215,7 +2031,7 @@ static void tag_localizable_objects(bContext *C, const int mode)
  * Instance indirectly referenced zero user objects,
  * otherwise they're lost on reload, see T40595.
  */
-static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene)
+static bool make_local_all__instance_indirect_unused(Main *bmain, ViewLayer *view_layer, Collection *collection)
 {
 	Object *ob;
 	bool changed = false;
@@ -2226,10 +2042,11 @@ static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene)
 
 			id_us_plus(&ob->id);
 
-			base = BKE_scene_base_add(scene, ob);
-			base->flag |= SELECT;
-			base->object->flag = base->flag;
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+			BKE_collection_object_add(bmain, collection, ob);
+			base = BKE_view_layer_base_find(view_layer, ob);
+			base->flag |= BASE_SELECTED;
+			BKE_scene_object_base_flag_sync_from_base(base);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 			changed = true;
 		}
@@ -2287,33 +2104,28 @@ static void make_local_material_tag(Material *ma)
 		make_local_animdata_tag(BKE_animdata_from_id(&ma->id));
 
 		/* About nodetrees: root one is made local together with material, others we keep linked for now... */
-
-		for (int a = 0; a < MAX_MTEX; a++) {
-			if (ma->mtex[a] && ma->mtex[a]->tex) {
-				ma->mtex[a]->tex->id.tag &= ~LIB_TAG_PRE_EXISTING;
-			}
-		}
 	}
 }
 
 static int make_local_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
 	ParticleSystem *psys;
 	Material *ma, ***matarar;
-	Lamp *la;
 	const int mode = RNA_enum_get(op->ptr, "type");
 	int a;
 
 	/* Note: we (ab)use LIB_TAG_PRE_EXISTING to cherry pick which ID to make local... */
 	if (mode == MAKE_LOCAL_ALL) {
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Collection *collection = CTX_data_collection(C);
+
 		BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
 
-		/* de-select so the user can differentiate newly instanced from existing objects */
-		BKE_scene_base_deselect_all(scene);
+		/* De-select so the user can differentiate newly instanced from existing objects. */
+		BKE_view_layer_base_deselect_all(view_layer);
 
-		if (make_local_all__instance_indirect_unused(bmain, scene)) {
+		if (make_local_all__instance_indirect_unused(bmain, view_layer, collection)) {
 			BKE_report(op->reports, RPT_INFO, "Orphan library objects added to the current scene to avoid loss");
 		}
 	}
@@ -2350,16 +2162,6 @@ static int make_local_exec(bContext *C, wmOperator *op)
 						}
 					}
 				}
-
-				if (ob->type == OB_LAMP) {
-					BLI_assert(ob->data != NULL);
-					la = ob->data;
-					for (a = 0; a < MAX_MTEX; a++) {
-						if (la->mtex[a] && la->mtex[a]->tex) {
-							la->id.tag &= ~LIB_TAG_PRE_EXISTING;
-						}
-					}
-				}
 			}
 
 			if (ELEM(mode, MAKE_LOCAL_SELECT_OBDATA, MAKE_LOCAL_SELECT_OBDATA_MATERIAL) && ob->data != NULL) {
@@ -2404,6 +2206,220 @@ void OBJECT_OT_make_local(wmOperatorType *ot)
 	ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
 }
 
+
+static void make_override_static_tag_object(Object *obact, Object *ob)
+{
+	if (ob == obact) {
+		return;
+	}
+
+	if (!ID_IS_LINKED(ob)) {
+		return;
+	}
+
+	/* Note: all this is very case-by-case bad handling, ultimately we'll want a real full 'automatic', generic
+	 * handling of all this, will probably require adding some override-aware stuff to library_query code... */
+
+	if (obact->type == OB_ARMATURE && ob->modifiers.first != NULL) {
+		for (ModifierData *md = ob->modifiers.first; md != NULL; md = md->next) {
+			if (md->type == eModifierType_Armature) {
+				ArmatureModifierData *amd = (ArmatureModifierData *)md;
+				if (amd->object == obact) {
+					ob->id.tag |= LIB_TAG_DOIT;
+					break;
+				}
+			}
+		}
+	}
+	else if (ob->parent == obact) {
+		ob->id.tag |= LIB_TAG_DOIT;
+	}
+
+	if (ob->id.tag & LIB_TAG_DOIT) {
+		printf("Indirectly overriding %s for %s\n", ob->id.name, obact->id.name);
+	}
+}
+
+/* Set the object to override. */
+static int make_override_static_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	Scene *scene = CTX_data_scene(C);
+	Object *obact = ED_object_active_context(C);
+
+	/* Sanity checks. */
+	if (!scene || ID_IS_LINKED(scene) || !obact) {
+		return OPERATOR_CANCELLED;
+	}
+
+	/* Get object to work on - use a menu if we need to... */
+	if (!ID_IS_LINKED(obact) && obact->dup_group != NULL && ID_IS_LINKED(obact->dup_group)) {
+		/* Gives menu with list of objects in group. */
+		WM_enum_search_invoke(C, op, event);
+		return OPERATOR_CANCELLED;
+	}
+	else if (ID_IS_LINKED(obact)) {
+		uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("OK?"), ICON_QUESTION);
+		uiLayout *layout = UI_popup_menu_layout(pup);
+
+		/* Create operator menu item with relevant properties filled in. */
+		PointerRNA opptr_dummy;
+		uiItemFullO_ptr(layout, op->type, op->type->name, ICON_NONE, NULL,
+		                WM_OP_EXEC_REGION_WIN, 0, &opptr_dummy);
+
+		/* Present the menu and be done... */
+		UI_popup_menu_end(C, pup);
+
+		/* This invoke just calls another instance of this operator... */
+		return OPERATOR_INTERFACE;
+	}
+	else {
+		/* Error.. cannot continue. */
+		BKE_report(op->reports, RPT_ERROR, "Can only make static override for a referenced object or collection");
+		return OPERATOR_CANCELLED;
+	}
+
+}
+
+static int make_override_static_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	Object *obact = CTX_data_active_object(C);
+
+	bool success = false;
+
+	if (!ID_IS_LINKED(obact) && obact->dup_group != NULL && ID_IS_LINKED(obact->dup_group)) {
+		const ListBase dup_collection_objects = BKE_collection_object_cache_get(obact->dup_group);
+		Base *base = BLI_findlink(&dup_collection_objects, RNA_enum_get(op->ptr, "object"));
+		Object *obcollection = obact;
+		obact = base->object;
+		Collection *collection = obcollection->dup_group;
+
+		/* First, we make a static override of the linked collection itself. */
+		collection->id.tag |= LIB_TAG_DOIT;
+
+		/* Then, we make static override of the whole set of objects in the Collection. */
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, ob)
+		{
+			ob->id.tag |= LIB_TAG_DOIT;
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
+
+		/* Then, we remove (untag) bone shape objects, you shall never want to override those (hopefully)... */
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, ob)
+		{
+			if (ob->type == OB_ARMATURE && ob->pose != NULL) {
+				for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan != NULL; pchan = pchan->next) {
+					if (pchan->custom != NULL) {
+						pchan->custom->id.tag &= ~ LIB_TAG_DOIT;
+					}
+				}
+			}
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
+
+		success = BKE_override_static_create_from_tag(bmain);
+
+		/* Intantiate our newly overridden objects in scene, if not yet done. */
+		Scene *scene = CTX_data_scene(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Collection *new_collection = (Collection *)collection->id.newid;
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(new_collection, new_ob)
+		{
+			if (new_ob != NULL && new_ob->id.override_static != NULL) {
+				if ((base = BKE_view_layer_base_find(view_layer, new_ob)) == NULL) {
+					BKE_collection_object_add_from(bmain, scene, obcollection, new_ob);
+					DEG_id_tag_update_ex(bmain, &new_ob->id, DEG_TAG_TRANSFORM | DEG_TAG_BASE_FLAGS_UPDATE);
+				}
+				/* parent to 'collection' empty */
+				if (new_ob->parent == NULL) {
+					new_ob->parent = obcollection;
+				}
+				if (new_ob == (Object *)obact->id.newid) {
+					BKE_view_layer_base_select(view_layer, base);
+				}
+				else {
+					/* Disable auto-override tags for non-active objects, will help with performaces... */
+					new_ob->id.override_static->flag &= ~STATICOVERRIDE_AUTO;
+				}
+				/* We still want to store all objects' current override status (i.e. change of parent). */
+				BKE_override_static_operations_create(&new_ob->id, true);
+			}
+		}
+		FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
+
+		/* obcollection is no more duplicollection-ing, it merely parents whole collection of overriding instantiated objects. */
+		obcollection->dup_group = NULL;
+
+		/* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */
+
+		DEG_id_tag_update(&scene->id, 0);
+
+		/* Cleanup. */
+		BKE_main_id_clear_newpoins(bmain);
+		BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, false);
+	}
+	/* Else, poll func ensures us that ID_IS_LINKED(obact) is true. */
+	else if (obact->type == OB_ARMATURE) {
+		BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
+
+		obact->id.tag |= LIB_TAG_DOIT;
+
+		for (Object *ob = bmain->object.first; ob != NULL; ob = ob->id.next) {
+			make_override_static_tag_object(obact, ob);
+		}
+
+		success = BKE_override_static_create_from_tag(bmain);
+
+		/* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */
+
+		/* Cleanup. */
+		BKE_main_id_clear_newpoins(bmain);
+		BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, false);
+	}
+	/* TODO: probably more cases where we want to do automated smart things in the future! */
+	else {
+		success = (BKE_override_static_create_from_id(bmain, &obact->id) != NULL);
+	}
+
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+
+	return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
+}
+
+static int make_override_static_poll(bContext *C)
+{
+	Object *obact = CTX_data_active_object(C);
+
+	/* Object must be directly linked to be overridable. */
+	return (ED_operator_objectmode(C) && obact != NULL &&
+	        ((ID_IS_LINKED(obact) && obact->id.tag & LIB_TAG_EXTERN) ||
+	         (!ID_IS_LINKED(obact) && obact->dup_group != NULL && ID_IS_LINKED(obact->dup_group))));
+}
+
+void OBJECT_OT_make_override_static(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Make Static Override";
+	ot->description = "Make local override of this library linked data-block";
+	ot->idname = "OBJECT_OT_make_override_static";
+
+	/* api callbacks */
+	ot->invoke = make_override_static_invoke;
+	ot->exec = make_override_static_exec;
+	ot->poll = make_override_static_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	PropertyRNA *prop;
+	prop = RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0, "Override Object",
+	                    "Name of lib-linked/collection object to make an override from");
+	RNA_def_enum_funcs(prop, proxy_collection_object_itemf);
+	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
+	ot->prop = prop;
+}
+
 enum {
 	MAKE_SINGLE_USER_ALL      = 1,
 	MAKE_SINGLE_USER_SELECTED = 2,
@@ -2413,32 +2429,35 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	View3D *v3d = CTX_wm_view3d(C); /* ok if this is NULL */
 	const int flag = (RNA_enum_get(op->ptr, "type") == MAKE_SINGLE_USER_SELECTED) ? SELECT : 0;
-	const bool copy_groups = false;
+	const bool copy_collections = false;
 	bool update_deps = false;
 
 	if (RNA_boolean_get(op->ptr, "object")) {
-		single_object_users(bmain, scene, v3d, flag, copy_groups);
+		if (flag == SELECT) {
+			BKE_view_layer_selected_objects_tag(view_layer, OB_DONE);
+			single_object_users(bmain, scene, v3d, OB_DONE, copy_collections);
+		}
+		else {
+			single_object_users(bmain, scene, v3d, 0, copy_collections);
+		}
 
 		/* needed since object relationships may have changed */
 		update_deps = true;
 	}
 
 	if (RNA_boolean_get(op->ptr, "obdata")) {
-		single_obdata_users(bmain, scene, flag);
+		single_obdata_users(bmain, scene, view_layer, flag);
 	}
 
 	if (RNA_boolean_get(op->ptr, "material")) {
-		single_mat_users(bmain, scene, flag, RNA_boolean_get(op->ptr, "texture"));
+		single_mat_users(bmain, scene, view_layer, flag);
 	}
 
-#if 0 /* can't do this separate from materials */
-	if (RNA_boolean_get(op->ptr, "texture"))
-		single_mat_users(scene, flag, true);
-#endif
 	if (RNA_boolean_get(op->ptr, "animation")) {
-		single_object_action_users(scene, flag);
+		single_object_action_users(scene, view_layer, flag);
 	}
 
 	BKE_main_id_clear_newpoins(bmain);
@@ -2446,7 +2465,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	if (update_deps) {
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 	}
 
 	return OPERATOR_FINISHED;
@@ -2478,8 +2497,6 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "object", 0, "Object", "Make single user objects");
 	RNA_def_boolean(ot->srna, "obdata", 0, "Object Data", "Make single user object data");
 	RNA_def_boolean(ot->srna, "material", 0, "Materials", "Make materials local to each data-block");
-	RNA_def_boolean(ot->srna, "texture", 0, "Textures",
-	                "Make textures local to each material (needs 'Materials' to be set too)");
 	RNA_def_boolean(ot->srna, "animation", 0, "Object Animation", "Make animation data local to each object");
 }
 
@@ -2497,7 +2514,7 @@ static int drop_named_material_invoke(bContext *C, wmOperator *op, const wmEvent
 
 	assign_material(CTX_data_main(C), base->object, ma, 1, BKE_MAT_ASSIGN_USERPREF);
 
-	DAG_id_tag_update(&base->object->id, OB_RECALC_OB);
+	DEG_id_tag_update(&base->object->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, base->object);
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 6b53807ce1c..bac1ba0e37d 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -37,10 +37,10 @@
 #include "DNA_group_types.h"
 #include "DNA_material_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_property_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_lamp_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
@@ -50,17 +50,22 @@
 
 #include "BLT_translation.h"
 
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_group.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
+#include "BKE_object.h"
 #include "BKE_particle.h"
-#include "BKE_property.h"
+#include "BKE_paint.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_workspace.h"
 #include "BKE_library.h"
 #include "BKE_deform.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -86,37 +91,44 @@
 /* Note: send a NC_SCENE|ND_OB_SELECT notifier yourself! (or
  * or a NC_SCENE|ND_OB_VISIBLE in case of visibility toggling */
 
-void ED_base_object_select(Base *base, short mode)
+void ED_object_base_select(Base *base, eObjectSelect_Mode mode)
 {
+	if (mode == BA_INVERT) {
+		mode = (base->flag & BASE_SELECTED) != 0 ? BA_DESELECT : BA_SELECT;
+	}
+
 	if (base) {
-		if (mode == BA_SELECT) {
-			if (!(base->object->restrictflag & OB_RESTRICT_SELECT))
-				base->flag |= SELECT;
-		}
-		else if (mode == BA_DESELECT) {
-			base->flag &= ~SELECT;
+		switch (mode) {
+			case BA_SELECT:
+				if ((base->flag & BASE_SELECTABLED) != 0) {
+					base->flag |= BASE_SELECTED;
+				}
+				break;
+			case BA_DESELECT:
+				base->flag &= ~BASE_SELECTED;
+				break;
+			case BA_INVERT:
+				/* Never happens. */
+				break;
 		}
-		base->object->flag = base->flag;
+		BKE_scene_object_base_flag_sync_from_base(base);
 	}
 }
 
-/* also to set active NULL */
-void ED_base_object_activate(bContext *C, Base *base)
+/**
+ * Change active base, it includes the notifier
+ */
+void ED_object_base_activate(bContext *C, Base *base)
 {
-	Scene *scene = CTX_data_scene(C);
-
-	/* sets scene->basact */
-	BASACT = base;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	view_layer->basact = base;
 
 	if (base) {
-
-		/* XXX old signals, remember to handle notifiers now! */
-		//		select_actionchannel_by_name(base->object->action, "Object", 1);
-
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, view_layer);
 	}
-	else
+	else {
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, NULL);
+	}
 }
 
 /********************** Selection Operators **********************/
@@ -147,7 +159,7 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op)
 	if (extend == 0) {
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
-			ED_base_object_select(base, BA_DESELECT);
+			ED_object_base_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
@@ -155,7 +167,7 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op)
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
 		if (base->object->type == obtype) {
-			ED_base_object_select(base, BA_SELECT);
+			ED_object_base_select(base, BA_SELECT);
 		}
 	}
 	CTX_DATA_END;
@@ -191,7 +203,6 @@ enum {
 	OBJECT_SELECT_LINKED_IPO = 1,
 	OBJECT_SELECT_LINKED_OBDATA,
 	OBJECT_SELECT_LINKED_MATERIAL,
-	OBJECT_SELECT_LINKED_TEXTURE,
 	OBJECT_SELECT_LINKED_DUPGROUP,
 	OBJECT_SELECT_LINKED_PARTICLE,
 	OBJECT_SELECT_LINKED_LIBRARY,
@@ -202,7 +213,6 @@ static const EnumPropertyItem prop_select_linked_types[] = {
 	//{OBJECT_SELECT_LINKED_IPO, "IPO", 0, "Object IPO", ""}, // XXX deprecated animation system stuff...
 	{OBJECT_SELECT_LINKED_OBDATA, "OBDATA", 0, "Object Data", ""},
 	{OBJECT_SELECT_LINKED_MATERIAL, "MATERIAL", 0, "Material", ""},
-	{OBJECT_SELECT_LINKED_TEXTURE, "TEXTURE", 0, "Texture", ""},
 	{OBJECT_SELECT_LINKED_DUPGROUP, "DUPGROUP", 0, "Dupligroup", ""},
 	{OBJECT_SELECT_LINKED_PARTICLE, "PARTICLE", 0, "Particle System", ""},
 	{OBJECT_SELECT_LINKED_LIBRARY, "LIBRARY", 0, "Library", ""},
@@ -210,38 +220,15 @@ static const EnumPropertyItem prop_select_linked_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-// XXX old animation system
-#if 0
-static int object_select_all_by_ipo(bContext *C, Ipo *ipo)
-{
-	bool changed = false;
-
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
-	{
-		if (base->object->ipo == ipo) {
-			base->flag |= SELECT;
-			base->object->flag = base->flag;
-
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-
-	return changed;
-}
-#endif
-
 static bool object_select_all_by_obdata(bContext *C, void *obdata)
 {
 	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (base->object->data == obdata) {
-				base->flag |= SELECT;
-				base->object->flag = base->flag;
-
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 		}
@@ -251,40 +238,25 @@ static bool object_select_all_by_obdata(bContext *C, void *obdata)
 	return changed;
 }
 
-static bool object_select_all_by_material_texture(bContext *C, int use_texture, Material *mat, Tex *tex)
+static bool object_select_all_by_material(bContext *C, Material *mat)
 {
 	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			Object *ob = base->object;
 			Material *mat1;
-			int a, b;
+			int a;
 
 			for (a = 1; a <= ob->totcol; a++) {
 				mat1 = give_current_material(ob, a);
 
-				if (!use_texture) {
-					if (mat1 == mat) {
-						base->flag |= SELECT;
-						changed = true;
-					}
-				}
-				else if (mat1 && use_texture) {
-					for (b = 0; b < MAX_MTEX; b++) {
-						if (mat1->mtex[b]) {
-							if (tex == mat1->mtex[b]->tex) {
-								base->flag |= SELECT;
-								changed = true;
-								break;
-							}
-						}
-					}
+				if (mat1 == mat) {
+					ED_object_base_select(base, BA_SELECT);
+					changed = true;
 				}
 			}
-
-			base->object->flag = base->flag;
 		}
 	}
 	CTX_DATA_END;
@@ -295,16 +267,14 @@ static bool object_select_all_by_material_texture(bContext *C, int use_texture,
 static bool object_select_all_by_dup_group(bContext *C, Object *ob)
 {
 	bool changed = false;
-	Group *dup_group = (ob->transflag & OB_DUPLIGROUP) ? ob->dup_group : NULL;
+	Collection *dup_group = (ob->transflag & OB_DUPLICOLLECTION) ? ob->dup_group : NULL;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
-			Group *dup_group_other = (base->object->transflag & OB_DUPLIGROUP) ? base->object->dup_group : NULL;
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
+			Collection *dup_group_other = (base->object->transflag & OB_DUPLICOLLECTION) ? base->object->dup_group : NULL;
 			if (dup_group == dup_group_other) {
-				base->flag |= SELECT;
-				base->object->flag = base->flag;
-
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 		}
@@ -321,23 +291,21 @@ static bool object_select_all_by_particle(bContext *C, Object *ob)
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			/* loop through other particles*/
 			ParticleSystem *psys;
 
 			for (psys = base->object->particlesystem.first; psys; psys = psys->next) {
 				if (psys->part == psys_act->part) {
-					base->flag |= SELECT;
+					ED_object_base_select(base, BA_SELECT);
 					changed = true;
 					break;
 				}
 
-				if (base->flag & SELECT) {
+				if (base->flag & BASE_SELECTED) {
 					break;
 				}
 			}
-
-			base->object->flag = base->flag;
 		}
 	}
 	CTX_DATA_END;
@@ -351,11 +319,9 @@ static bool object_select_all_by_library(bContext *C, Library *lib)
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (lib == base->object->id.lib) {
-				base->flag |= SELECT;
-				base->object->flag = base->flag;
-
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 		}
@@ -371,11 +337,9 @@ static bool object_select_all_by_library_obdata(bContext *C, Library *lib)
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if ((base->flag & SELECT) == 0) {
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 			if (base->object->data && lib == ((ID *)base->object->data)->lib) {
-				base->flag |= SELECT;
-				base->object->flag = base->flag;
-
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 		}
@@ -394,7 +358,7 @@ void ED_object_select_linked_by_id(bContext *C, ID *id)
 		changed = object_select_all_by_obdata(C, id);
 	}
 	else if (idtype == ID_MA) {
-		changed = object_select_all_by_material_texture(C, false, (Material *)id, NULL);
+		changed = object_select_all_by_material(C, (Material *)id);
 	}
 	else if (idtype == ID_LI) {
 		changed = object_select_all_by_library(C, (Library *) id);
@@ -408,6 +372,7 @@ void ED_object_select_linked_by_id(bContext *C, ID *id)
 static int object_select_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob;
 	int nr = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -417,12 +382,12 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	if (extend == 0) {
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
-			ED_base_object_select(base, BA_DESELECT);
+			ED_object_base_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
 
-	ob = OBACT;
+	ob = OBACT(view_layer);
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;
@@ -440,21 +405,13 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 
 		changed = object_select_all_by_obdata(C, ob->data);
 	}
-	else if (nr == OBJECT_SELECT_LINKED_MATERIAL || nr == OBJECT_SELECT_LINKED_TEXTURE) {
+	else if (nr == OBJECT_SELECT_LINKED_MATERIAL) {
 		Material *mat = NULL;
-		Tex *tex = NULL;
-		bool use_texture = false;
 
 		mat = give_current_material(ob, ob->actcol);
 		if (mat == NULL) return OPERATOR_CANCELLED;
-		if (nr == OBJECT_SELECT_LINKED_TEXTURE) {
-			use_texture = true;
 
-			if (mat->mtex[(int)mat->texact]) tex = mat->mtex[(int)mat->texact]->tex;
-			if (tex == NULL) return OPERATOR_CANCELLED;
-		}
-
-		changed = object_select_all_by_material_texture(C, use_texture, mat, tex);
+		changed = object_select_all_by_material(C, mat);
 	}
 	else if (nr == OBJECT_SELECT_LINKED_DUPGROUP) {
 		if (ob->dup_group == NULL)
@@ -517,14 +474,12 @@ enum {
 	OBJECT_GRPSEL_PARENT             =  2,
 	OBJECT_GRPSEL_SIBLINGS           =  3,
 	OBJECT_GRPSEL_TYPE               =  4,
-	OBJECT_GRPSEL_LAYER              =  5,
-	OBJECT_GRPSEL_GROUP              =  6,
+	OBJECT_GRPSEL_COLLECTION         =  5,
 	OBJECT_GRPSEL_HOOK               =  7,
 	OBJECT_GRPSEL_PASS               =  8,
 	OBJECT_GRPSEL_COLOR              =  9,
-	OBJECT_GRPSEL_PROPERTIES         = 10,
-	OBJECT_GRPSEL_KEYINGSET          = 11,
-	OBJECT_GRPSEL_LAMP_TYPE          = 12,
+	OBJECT_GRPSEL_KEYINGSET          = 10,
+	OBJECT_GRPSEL_LAMP_TYPE          = 11,
 };
 
 static const EnumPropertyItem prop_select_grouped_types[] = {
@@ -533,12 +488,10 @@ static const EnumPropertyItem prop_select_grouped_types[] = {
 	{OBJECT_GRPSEL_PARENT, "PARENT", 0, "Parent", ""},
 	{OBJECT_GRPSEL_SIBLINGS, "SIBLINGS", 0, "Siblings", "Shared Parent"},
 	{OBJECT_GRPSEL_TYPE, "TYPE", 0, "Type", "Shared object type"},
-	{OBJECT_GRPSEL_LAYER, "LAYER", 0, "Layer", "Shared layers"},
-	{OBJECT_GRPSEL_GROUP, "GROUP", 0, "Group", "Shared group"},
+	{OBJECT_GRPSEL_COLLECTION, "COLLECTION", 0, "Collection", "Shared collection"},
 	{OBJECT_GRPSEL_HOOK, "HOOK", 0, "Hook", ""},
 	{OBJECT_GRPSEL_PASS, "PASS", 0, "Pass", "Render pass Index"},
 	{OBJECT_GRPSEL_COLOR, "COLOR", 0, "Color", "Object Color"},
-	{OBJECT_GRPSEL_PROPERTIES, "PROPERTIES", 0, "Properties", "Game Properties"},
 	{OBJECT_GRPSEL_KEYINGSET, "KEYINGSET", 0, "Keying Set", "Objects included in active Keying Set"},
 	{OBJECT_GRPSEL_LAMP_TYPE, "LAMP_TYPE", 0, "Lamp Type", "Matching lamp types"},
 	{0, NULL, 0, NULL, NULL}
@@ -551,13 +504,14 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (ob == base->object->parent) {
-			if (!(base->flag & SELECT)) {
-				ED_base_object_select(base, BA_SELECT);
+			if ((base->flag & BASE_SELECTED) == 0) {
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 
-			if (recursive)
+			if (recursive) {
 				changed |= select_grouped_children(C, base->object, 1);
+			}
 		}
 	}
 	CTX_DATA_END;
@@ -566,51 +520,53 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv
 
 static bool select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */
 {
-	Scene *scene = CTX_data_scene(C);
-	View3D *v3d = CTX_wm_view3d(C);
-
-	bool changed = false;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Base *baspar, *basact = CTX_data_active_base(C);
+	bool changed = false;
 
-	if (!basact || !(basact->object->parent)) return 0;  /* we know OBACT is valid */
+	if (!basact || !(basact->object->parent)) {
+		return 0;  /* we know OBACT is valid */
+	}
 
-	baspar = BKE_scene_base_find(scene, basact->object->parent);
+	baspar = BKE_view_layer_base_find(view_layer, basact->object->parent);
 
 	/* can be NULL if parent in other scene */
-	if (baspar && BASE_SELECTABLE(v3d, baspar)) {
-		ED_base_object_select(baspar, BA_SELECT);
-		ED_base_object_activate(C, baspar);
+	if (baspar && BASE_SELECTABLE(baspar)) {
+		ED_object_base_select(baspar, BA_SELECT);
+		ED_object_base_activate(C, baspar);
 		changed = true;
 	}
 	return changed;
 }
 
 
-#define GROUP_MENU_MAX  24
-static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in the same group as the active */
+#define COLLECTION_MENU_MAX  24
+static bool select_grouped_collection(bContext *C, Object *ob)  /* Select objects in the same group as the active */
 {
 	bool changed = false;
-	Group *group, *ob_groups[GROUP_MENU_MAX];
-	int group_count = 0, i;
+	Collection *collection, *ob_collections[COLLECTION_MENU_MAX];
+	int collection_count = 0, i;
 	uiPopupMenu *pup;
 	uiLayout *layout;
 
-	for (group = CTX_data_main(C)->group.first; group && group_count < GROUP_MENU_MAX; group = group->id.next) {
-		if (BKE_group_object_exists(group, ob)) {
-			ob_groups[group_count] = group;
-			group_count++;
+	for (collection = CTX_data_main(C)->collection.first; collection && collection_count < COLLECTION_MENU_MAX; collection = collection->id.next) {
+		if (BKE_collection_has_object(collection, ob)) {
+			ob_collections[collection_count] = collection;
+			collection_count++;
 		}
 	}
 
-	if (!group_count)
+	if (!collection_count)
 		return 0;
-	else if (group_count == 1) {
-		group = ob_groups[0];
+	else if (collection_count == 1) {
+		collection = ob_collections[0];
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
-			if (!(base->flag & SELECT) && BKE_group_object_exists(group, base->object)) {
-				ED_base_object_select(base, BA_SELECT);
-				changed = true;
+			if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
+				if (BKE_collection_has_object(collection, base->object)) {
+					ED_object_base_select(base, BA_SELECT);
+					changed = true;
+				}
 			}
 		}
 		CTX_DATA_END;
@@ -618,12 +574,12 @@ static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 	}
 
 	/* build the menu. */
-	pup = UI_popup_menu_begin(C, IFACE_("Select Group"), ICON_NONE);
+	pup = UI_popup_menu_begin(C, IFACE_("Select Collection"), ICON_NONE);
 	layout = UI_popup_menu_layout(pup);
 
-	for (i = 0; i < group_count; i++) {
-		group = ob_groups[i];
-		uiItemStringO(layout, group->id.name + 2, 0, "OBJECT_OT_select_same_group", "group", group->id.name + 2);
+	for (i = 0; i < collection_count; i++) {
+		collection = ob_collections[i];
+		uiItemStringO(layout, collection->id.name + 2, 0, "OBJECT_OT_select_same_collection", "collection", collection->id.name + 2);
 	}
 
 	UI_popup_menu_end(C, pup);
@@ -632,8 +588,7 @@ static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 
 static bool select_grouped_object_hooks(bContext *C, Object *ob)
 {
-	Scene *scene = CTX_data_scene(C);
-	View3D *v3d = CTX_wm_view3d(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	bool changed = false;
 	Base *base;
@@ -643,10 +598,10 @@ static bool select_grouped_object_hooks(bContext *C, Object *ob)
 	for (md = ob->modifiers.first; md; md = md->next) {
 		if (md->type == eModifierType_Hook) {
 			hmd = (HookModifierData *) md;
-			if (hmd->object && !(hmd->object->flag & SELECT)) {
-				base = BKE_scene_base_find(scene, hmd->object);
-				if (base && (BASE_SELECTABLE(v3d, base))) {
-					ED_base_object_select(base, BA_SELECT);
+			if (hmd->object) {
+				base = BKE_view_layer_base_find(view_layer, hmd->object);
+				if (base && ((base->flag & BASE_SELECTED) == 0) && (BASE_SELECTABLE(base))) {
+					ED_object_base_select(base, BA_SELECT);
 					changed = true;
 				}
 			}
@@ -663,8 +618,8 @@ static bool select_grouped_siblings(bContext *C, Object *ob)
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
-		if ((base->object->parent == ob->parent) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
+		if ((base->object->parent == ob->parent) && ((base->flag & BASE_SELECTED) == 0)) {
+			ED_object_base_select(base, BA_SELECT);
 			changed = true;
 		}
 	}
@@ -681,8 +636,8 @@ static bool select_grouped_lamptype(bContext *C, Object *ob)
 	{
 		if (base->object->type == OB_LAMP) {
 			Lamp *la_test = base->object->data;
-			if ((la->type == la_test->type) && !(base->flag & SELECT)) {
-				ED_base_object_select(base, BA_SELECT);
+			if ((la->type == la_test->type) && ((base->flag & BASE_SELECTED) == 0)) {
+				ED_object_base_select(base, BA_SELECT);
 				changed = true;
 			}
 		}
@@ -696,23 +651,8 @@ static bool select_grouped_type(bContext *C, Object *ob)
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
-		if ((base->object->type == ob->type) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static bool select_grouped_layer(bContext *C, Object *ob)
-{
-	bool changed = false;
-
-	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
-	{
-		if ((base->lay & ob->lay) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
+		if ((base->object->type == ob->type) && ((base->flag & BASE_SELECTED) == 0)) {
+			ED_object_base_select(base, BA_SELECT);
 			changed = true;
 		}
 	}
@@ -726,8 +666,8 @@ static bool select_grouped_index_object(bContext *C, Object *ob)
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
-		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
+		if ((base->object->index == ob->index) && ((base->flag & BASE_SELECTED) == 0)) {
+			ED_object_base_select(base, BA_SELECT);
 			changed = true;
 		}
 	}
@@ -741,35 +681,8 @@ static bool select_grouped_color(bContext *C, Object *ob)
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
-		if (!(base->flag & SELECT) && (compare_v3v3(base->object->col, ob->col, 0.005f))) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static bool objects_share_gameprop(Object *a, Object *b)
-{
-	bProperty *prop;
-
-	for (prop = a->prop.first; prop; prop = prop->next) {
-		if (BKE_bproperty_object_get(b, prop->name)) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static bool select_grouped_gameprops(bContext *C, Object *ob)
-{
-	bool changed = false;
-
-	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
-	{
-		if (!(base->flag & SELECT) && (objects_share_gameprop(base->object, ob))) {
-			ED_base_object_select(base, BA_SELECT);
+		if (((base->flag & BASE_SELECTED) == 0) && (compare_v3v3(base->object->col, ob->col, 0.005f))) {
+			ED_object_base_select(base, BA_SELECT);
 			changed = true;
 		}
 	}
@@ -807,7 +720,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		/* only check for this object if it isn't selected already, to limit time wasted */
-		if ((base->flag & SELECT) == 0) {
+		if ((base->flag & BASE_SELECTED) == 0) {
 			KS_Path *ksp;
 
 			/* this is the slow way... we could end up with > 500 items here,
@@ -816,7 +729,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 			for (ksp = ks->paths.first; ksp; ksp = ksp->next) {
 				/* if id matches, select then stop looping (match found) */
 				if (ksp->id == (ID *)base->object) {
-					ED_base_object_select(base, BA_SELECT);
+					ED_object_base_select(base, BA_SELECT);
 					changed = true;
 					break;
 				}
@@ -831,6 +744,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 static int object_select_grouped_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob;
 	const int type = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -840,13 +754,13 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 	if (extend == 0) {
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
-			ED_base_object_select(base, BA_DESELECT);
+			ED_object_base_select(base, BA_DESELECT);
 			changed = true;
 		}
 		CTX_DATA_END;
 	}
 
-	ob = OBACT;
+	ob = OBACT(view_layer);
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;
@@ -868,11 +782,8 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 		case OBJECT_GRPSEL_TYPE:
 			changed |= select_grouped_type(C, ob);
 			break;
-		case OBJECT_GRPSEL_LAYER:
-			changed |= select_grouped_layer(C, ob);
-			break;
-		case OBJECT_GRPSEL_GROUP:
-			changed |= select_grouped_group(C, ob);
+		case OBJECT_GRPSEL_COLLECTION:
+			changed |= select_grouped_collection(C, ob);
 			break;
 		case OBJECT_GRPSEL_HOOK:
 			changed |= select_grouped_object_hooks(C, ob);
@@ -883,9 +794,6 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 		case OBJECT_GRPSEL_COLOR:
 			changed |= select_grouped_color(C, ob);
 			break;
-		case OBJECT_GRPSEL_PROPERTIES:
-			changed |= select_grouped_gameprops(C, ob);
-			break;
 		case OBJECT_GRPSEL_KEYINGSET:
 			changed |= select_grouped_keyingset(C, ob, op->reports);
 			break;
@@ -928,85 +836,6 @@ void OBJECT_OT_select_grouped(wmOperatorType *ot)
 	ot->prop = RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", "");
 }
 
-/************************* Select by Layer **********************/
-enum {
-	OB_SEL_LAYERMATCH_EXACT = 1,
-	OB_SEL_LAYERMATCH_SHARED = 2,
-};
-
-static int object_select_by_layer_exec(bContext *C, wmOperator *op)
-{
-	unsigned int layernum;
-	bool extend;
-	int match;
-
-	extend = RNA_boolean_get(op->ptr, "extend");
-	layernum = RNA_int_get(op->ptr, "layers");
-	match = RNA_enum_get(op->ptr, "match");
-
-	if (extend == false) {
-		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
-		{
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
-	{
-		bool ok = false;
-
-		switch (match) {
-			case OB_SEL_LAYERMATCH_EXACT:
-				/* Mask out bits used for local view, only work on real layer ones, see T45783. */
-				ok = ((base->lay & ((1 << 20) - 1)) == (1 << (layernum - 1)));
-				break;
-			case OB_SEL_LAYERMATCH_SHARED:
-				ok = (base->lay & (1 << (layernum - 1))) != 0;
-				break;
-			default:
-				break;
-		}
-
-		if (ok) {
-			ED_base_object_select(base, BA_SELECT);
-		}
-	}
-	CTX_DATA_END;
-
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_by_layer(wmOperatorType *ot)
-{
-	static const EnumPropertyItem match_items[] = {
-		{OB_SEL_LAYERMATCH_EXACT, "EXACT", 0, "Exact Match", ""},
-		{OB_SEL_LAYERMATCH_SHARED, "SHARED", 0, "Shared Layers", ""},
-		{0, NULL, 0, NULL, NULL}
-	};
-
-	/* identifiers */
-	ot->name = "Select by Layer";
-	ot->description = "Select all visible objects on a layer";
-	ot->idname = "OBJECT_OT_select_by_layer";
-
-	/* api callbacks */
-	/*ot->invoke = XXX - need a int grid popup*/
-	ot->exec = object_select_by_layer_exec;
-	ot->poll = objects_selectable_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_enum(ot->srna, "match", match_items, OB_SEL_LAYERMATCH_EXACT, "Match", "");
-	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend selection instead of deselecting everything first");
-	RNA_def_int(ot->srna, "layers", 1, 1, 20, "Layer", "", 1, 20);
-}
-
 /**************************** (De)select All ****************************/
 
 static int object_select_all_exec(bContext *C, wmOperator *op)
@@ -1020,7 +849,7 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 		action = SEL_SELECT;
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
-			if (base->flag & SELECT) {
+			if ((base->flag & BASE_SELECTED) != 0) {
 				action = SEL_DESELECT;
 				break;
 			}
@@ -1032,17 +861,17 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 	{
 		switch (action) {
 			case SEL_SELECT:
-				ED_base_object_select(base, BA_SELECT);
+				ED_object_base_select(base, BA_SELECT);
 				break;
 			case SEL_DESELECT:
-				ED_base_object_select(base, BA_DESELECT);
+				ED_object_base_select(base, BA_DESELECT);
 				break;
 			case SEL_INVERT:
-				if (base->flag & SELECT) {
-					ED_base_object_select(base, BA_DESELECT);
+				if ((base->flag & BASE_SELECTED) != 0) {
+					ED_object_base_select(base, BA_DESELECT);
 				}
 				else {
-					ED_base_object_select(base, BA_SELECT);
+					ED_object_base_select(base, BA_SELECT);
 				}
 				break;
 		}
@@ -1072,29 +901,32 @@ void OBJECT_OT_select_all(wmOperatorType *ot)
 	WM_operator_properties_select_all(ot);
 }
 
-/**************************** Select In The Same Group ****************************/
+/**************************** Select In The Same Collection ****************************/
 
-static int object_select_same_group_exec(bContext *C, wmOperator *op)
+static int object_select_same_collection_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Group *group;
-	char group_name[MAX_ID_NAME];
+	Collection *collection;
+	char collection_name[MAX_ID_NAME];
 
 	/* passthrough if no objects are visible */
 	if (CTX_DATA_COUNT(C, visible_bases) == 0) return OPERATOR_PASS_THROUGH;
 
-	RNA_string_get(op->ptr, "group", group_name);
+	RNA_string_get(op->ptr, "collection", collection_name);
 
-	group = (Group *)BKE_libblock_find_name(bmain, ID_GR, group_name);
+	collection = (Collection *)BKE_libblock_find_name(bmain, ID_GR, collection_name);
 
-	if (!group) {
+	if (!collection) {
 		return OPERATOR_PASS_THROUGH;
 	}
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if (!(base->flag & SELECT) && BKE_group_object_exists(group, base->object))
-			ED_base_object_select(base, BA_SELECT);
+		if (((base->flag & BASE_SELECTED) == 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
+			if (BKE_collection_has_object(collection, base->object)) {
+				ED_object_base_select(base, BA_SELECT);
+			}
+		}
 	}
 	CTX_DATA_END;
 
@@ -1103,22 +935,22 @@ static int object_select_same_group_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_select_same_group(wmOperatorType *ot)
+void OBJECT_OT_select_same_collection(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name = "Select Same Group";
-	ot->description = "Select object in the same group";
-	ot->idname = "OBJECT_OT_select_same_group";
+	ot->name = "Select Same Collection";
+	ot->description = "Select object in the same collection";
+	ot->idname = "OBJECT_OT_select_same_collection";
 
 	/* api callbacks */
-	ot->exec = object_select_same_group_exec;
+	ot->exec = object_select_same_collection_exec;
 	ot->poll = objects_selectable_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_string(ot->srna, "group", NULL, MAX_ID_NAME, "Group", "Name of the group to select");
+	RNA_def_string(ot->srna, "collection", NULL, MAX_ID_NAME, "Collection", "Name of the collection to select");
 }
 
 /**************************** Select Mirror ****************************/
@@ -1126,6 +958,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	bool extend;
 
 	extend = RNA_boolean_get(op->ptr, "extend");
@@ -1139,15 +972,15 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 		if (!STREQ(name_flip, primbase->object->id.name + 2)) {
 			Object *ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, name_flip);
 			if (ob) {
-				Base *secbase = BKE_scene_base_find(scene, ob);
+				Base *secbase = BKE_view_layer_base_find(view_layer, ob);
 
 				if (secbase) {
-					ED_base_object_select(secbase, BA_SELECT);
+					ED_object_base_select(secbase, BA_SELECT);
 				}
 			}
 		}
 
-		if (extend == false) ED_base_object_select(primbase, BA_DESELECT);
+		if (extend == false) ED_object_base_select(primbase, BA_DESELECT);
 
 	}
 	CTX_DATA_END;
@@ -1182,9 +1015,9 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot)
 
 static bool object_select_more_less(bContext *C, const bool select)
 {
-	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	for (Base *base = scene->base.first; base; base = base->next) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 		Object *ob = base->object;
 		ob->flag &= ~OB_DONE;
 		ob->id.tag &= ~LIB_TAG_DOIT;
@@ -1219,13 +1052,13 @@ static bool object_select_more_less(bContext *C, const bool select)
 
 	bool changed = false;
 	const short select_mode = select ? BA_SELECT : BA_DESELECT;
-	const short select_flag = select ? SELECT : 0;
+	const short select_flag = select ? BASE_SELECTED : 0;
 
 	for (ctx_base = ctx_base_list.first; ctx_base; ctx_base = ctx_base->next) {
 		Base *base = ctx_base->ptr.data;
 		Object *ob = base->object;
-		if ((ob->id.tag & LIB_TAG_DOIT) && ((ob->flag & SELECT) != select_flag)) {
-			ED_base_object_select(base, select_mode);
+		if ((ob->id.tag & LIB_TAG_DOIT) && ((base->flag & BASE_SELECTED) != select_flag)) {
+			ED_object_base_select(base, select_mode);
 			changed = true;
 		}
 	}
@@ -1307,7 +1140,7 @@ static int object_select_random_exec(bContext *C, wmOperator *op)
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (BLI_rng_get_float(rng) < randfac) {
-			ED_base_object_select(base, select);
+			ED_object_base_select(base, select);
 		}
 	}
 	CTX_DATA_END;
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 7d7130fdbc7..03fe6e9de65 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -51,7 +51,6 @@
 #include "DNA_object_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_key.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
@@ -59,6 +58,9 @@
 #include "BKE_lattice.h"
 #include "BKE_curve.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "BLI_sys_types.h" // for intptr_t support
 
 #include "ED_object.h"
@@ -213,7 +215,7 @@ static bool object_shape_key_mirror(bContext *C, Object *ob,
 	*r_totmirr = totmirr;
 	*r_totfail = totfail;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return 1;
@@ -264,8 +266,8 @@ static int shape_key_add_exec(bContext *C, wmOperator *op)
 
 	ED_object_shape_key_add(C, ob, from_mix);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	DAG_relations_tag_update(CTX_data_main(C));
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(CTX_data_main(C));
 
 	return OPERATOR_FINISHED;
 }
@@ -302,8 +304,8 @@ static int shape_key_remove_exec(bContext *C, wmOperator *op)
 	}
 
 	if (changed) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_relations_tag_update(CTX_data_main(C));
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 		return OPERATOR_FINISHED;
@@ -343,7 +345,7 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	for (kb = key->block.first; kb; kb = kb->next)
 		kb->curval = 0.0f;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
@@ -378,7 +380,7 @@ static int shape_key_retime_exec(bContext *C, wmOperator *UNUSED(op))
 	for (kb = key->block.first; kb; kb = kb->next)
 		kb->pos = (cfra += 0.1f);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
@@ -469,7 +471,7 @@ static int shape_key_move_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 19dad374696..cb609b2567b 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -44,10 +44,10 @@
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
+#include "BLI_array.h"
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_idcode.h"
 #include "BKE_mball.h"
@@ -60,6 +60,8 @@
 #include "BKE_lattice.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 
@@ -72,6 +74,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "object_intern.h"
 
 /*************************** Clear Transformation ****************************/
@@ -266,7 +270,7 @@ static int object_clear_transform_generic_exec(bContext *C, wmOperator *op,
 			ED_autokeyframe_object(C, scene, ob, ks);
 
 			/* tag for updates */
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 		}
 	}
 	CTX_DATA_END;
@@ -372,7 +376,7 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op))
 			mul_m3_v3(mat, v3);
 		}
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 	}
 	CTX_DATA_END;
 
@@ -400,16 +404,17 @@ void OBJECT_OT_origin_clear(wmOperatorType *ot)
 
 /* use this when the loc/size/rot of the parent has changed but the children
  * should stay in the same place, e.g. for apply-size-rot or object center */
-static void ignore_parent_tx(Main *bmain, Scene *scene, Object *ob)
+static void ignore_parent_tx(const bContext *C, Main *bmain, Scene *scene, Object *ob)
 {
 	Object workob;
 	Object *ob_child;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	/* a change was made, adjust the children to compensate */
 	for (ob_child = bmain->object.first; ob_child; ob_child = ob_child->id.next) {
 		if (ob_child->parent == ob) {
 			BKE_object_apply_mat4(ob_child, ob_child->obmat, true, false);
-			BKE_object_workob_calc_parent(scene, ob_child, &workob);
+			BKE_object_workob_calc_parent(depsgraph, scene, ob_child, &workob);
 			invert_m4_m4(ob_child->parentinv, workob.obmat);
 		}
 	}
@@ -422,6 +427,7 @@ static int apply_objects_internal(
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	float rsmat[3][3], obmat[3][3], iobmat[3][3], mat[4][4], scale;
 	bool changed = true;
 
@@ -538,7 +544,7 @@ static int apply_objects_internal(
 			Mesh *me = ob->data;
 
 			if (apply_scale)
-				multiresModifier_scale_disp(scene, ob);
+				multiresModifier_scale_disp(depsgraph, scene, ob);
 
 			/* adjust data */
 			BKE_mesh_transform(me, mat, true);
@@ -625,6 +631,10 @@ static int apply_objects_internal(
 				la->area_shape = LA_AREA_RECT;
 				la->area_sizey = la->area_size;
 			}
+			else if ((la->area_shape == LA_AREA_DISK) && !keeps_aspect_ratio) {
+				la->area_shape = LA_AREA_ELLIPSE;
+				la->area_sizey = la->area_size;
+			}
 
 			la->area_size *= rsmat[0][0];
 			la->area_sizey *= rsmat[1][1];
@@ -644,14 +654,14 @@ static int apply_objects_internal(
 			unit_axis_angle(ob->rotAxis, &ob->rotAngle);
 		}
 
-		BKE_object_where_is_calc(scene, ob);
+		BKE_object_where_is_calc(depsgraph, scene, ob);
 		if (ob->type == OB_ARMATURE) {
-			BKE_pose_where_is(scene, ob); /* needed for bone parents */
+			BKE_pose_where_is(depsgraph, scene, ob); /* needed for bone parents */
 		}
 
-		ignore_parent_tx(bmain, scene, ob);
+		ignore_parent_tx(C, bmain, scene, ob);
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 		changed = true;
 	}
@@ -669,16 +679,17 @@ static int apply_objects_internal(
 static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
-		BKE_object_where_is_calc(scene, ob);
+		BKE_object_where_is_calc(depsgraph, scene, ob);
 		BKE_object_apply_mat4(ob, ob->obmat, true, true);
-		BKE_object_where_is_calc(scene, ob);
+		BKE_object_where_is_calc(depsgraph, scene, ob);
 
 		/* update for any children that may get moved */
-		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 		changed = true;
 	}
@@ -759,6 +770,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	Object *obact = CTX_data_active_object(C);
 	Object *obedit = CTX_data_edit_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *tob;
 	float cursor[3], cent[3], cent_neg[3], centn[3];
 	int centermode = RNA_enum_get(op->ptr, "type");
@@ -778,9 +790,9 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 	else {
 		/* get the view settings if 'around' isn't set and the view is available */
 		View3D *v3d = CTX_wm_view3d(C);
-		copy_v3_v3(cursor, ED_view3d_cursor3d_get(scene, v3d));
+		copy_v3_v3(cursor, ED_view3d_cursor3d_get(scene, v3d)->location);
 		if (v3d && !RNA_struct_property_is_set(op->ptr, "center"))
-			around = v3d->around;
+			around = scene->toolsettings->transform_pivot_point;
 	}
 
 	zero_v3(cent);
@@ -822,7 +834,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 			EDBM_mesh_normals_update(em);
 			tot_change++;
-			DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 		}
 	}
 
@@ -871,7 +883,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 			if (ob->data == NULL) {
 				/* special support for dupligroups */
-				if ((ob->transflag & OB_DUPLIGROUP) && ob->dup_group && (ob->dup_group->id.tag & LIB_TAG_DOIT) == 0) {
+				if ((ob->transflag & OB_DUPLICOLLECTION) && ob->dup_group && (ob->dup_group->id.tag & LIB_TAG_DOIT) == 0) {
 					if (ID_IS_LINKED(ob->dup_group)) {
 						tot_lib_error++;
 					}
@@ -883,7 +895,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 							float min[3], max[3];
 							/* only bounds support */
 							INIT_MINMAX(min, max);
-							BKE_object_minmax_dupli(bmain, scene, ob, min, max, true);
+							BKE_object_minmax_dupli(depsgraph, scene, ob, min, max, true);
 							mid_v3_v3v3(cent, min, max);
 							invert_m4_m4(ob->imat, ob->obmat);
 							mul_m4_v3(ob->imat, cent);
@@ -947,7 +959,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 				if (obedit) {
 					if (centermode == GEOMETRY_TO_ORIGIN) {
-						DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 					}
 					break;
 				}
@@ -994,16 +1006,16 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 					/* Function to recenter armatures in editarmature.c
 					 * Bone + object locations are handled there.
 					 */
-					ED_armature_origin_set(scene, ob, cursor, centermode, around);
+					ED_armature_origin_set(ob, cursor, centermode, around);
 
 					tot_change++;
 					arm->id.tag |= LIB_TAG_DOIT;
 					/* do_inverse_offset = true; */ /* docenter_armature() handles this */
 
-					BKE_object_where_is_calc(scene, ob);
-					BKE_pose_where_is(scene, ob); /* needed for bone parents */
+					BKE_object_where_is_calc(depsgraph, scene, ob);
+					BKE_pose_where_is(depsgraph, scene, ob); /* needed for bone parents */
 
-					ignore_parent_tx(bmain, scene, ob);
+					ignore_parent_tx(C, bmain, scene, ob);
 
 					if (obedit)
 						break;
@@ -1025,7 +1037,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 				if (obedit) {
 					if (centermode == GEOMETRY_TO_ORIGIN) {
-						DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 					}
 					break;
 				}
@@ -1059,12 +1071,12 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 				add_v3_v3(ob->loc, centn);
 
-				BKE_object_where_is_calc(scene, ob);
+				BKE_object_where_is_calc(depsgraph, scene, ob);
 				if (ob->type == OB_ARMATURE) {
-					BKE_pose_where_is(scene, ob); /* needed for bone parents */
+					BKE_pose_where_is(depsgraph, scene, ob); /* needed for bone parents */
 				}
 
-				ignore_parent_tx(bmain, scene, ob);
+				ignore_parent_tx(C, bmain, scene, ob);
 
 				/* other users? */
 				//CTX_DATA_BEGIN (C, Object *, ob_other, selected_editable_objects)
@@ -1080,19 +1092,19 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 					if ((ob_other->flag & OB_DONE) == 0 &&
 					    ((ob->data && (ob->data == ob_other->data)) ||
 					     (ob->dup_group == ob_other->dup_group &&
-					      (ob->transflag | ob_other->transflag) & OB_DUPLIGROUP)))
+					      (ob->transflag | ob_other->transflag) & OB_DUPLICOLLECTION)))
 					{
 						ob_other->flag |= OB_DONE;
-						DAG_id_tag_update(&ob_other->id, OB_RECALC_OB | OB_RECALC_DATA);
+						DEG_id_tag_update(&ob_other->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 						mul_v3_mat3_m4v3(centn, ob_other->obmat, cent); /* omit translation part */
 						add_v3_v3(ob_other->loc, centn);
 
-						BKE_object_where_is_calc(scene, ob_other);
+						BKE_object_where_is_calc(depsgraph, scene, ob_other);
 						if (ob_other->type == OB_ARMATURE) {
-							BKE_pose_where_is(scene, ob_other); /* needed for bone parents */
+							BKE_pose_where_is(depsgraph, scene, ob_other); /* needed for bone parents */
 						}
-						ignore_parent_tx(bmain, scene, ob_other);
+						ignore_parent_tx(C, bmain, scene, ob_other);
 					}
 				}
 				//CTX_DATA_END;
@@ -1101,9 +1113,12 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 	}
 	BLI_freelistN(&ctx_data_list);
 
-	for (tob = bmain->object.first; tob; tob = tob->id.next)
-		if (tob->data && (((ID *)tob->data)->tag & LIB_TAG_DOIT))
-			DAG_id_tag_update(&tob->id, OB_RECALC_OB | OB_RECALC_DATA);
+	for (tob = bmain->object.first; tob; tob = tob->id.next) {
+		if (tob->data && (((ID *)tob->data)->tag & LIB_TAG_DOIT)) {
+			BKE_mesh_batch_cache_dirty(tob->data, BKE_MESH_BATCH_DIRTY_ALL);
+			DEG_id_tag_update(&tob->id, OB_RECALC_OB | OB_RECALC_DATA);
+		}
+	}
 
 	if (tot_change) {
 		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -1160,3 +1175,385 @@ void OBJECT_OT_origin_set(wmOperatorType *ot)
 	ot->prop = RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", "");
 	RNA_def_enum(ot->srna, "center", prop_set_bounds_types, V3D_AROUND_CENTER_MEAN, "Center", "");
 }
+
+/* -------------------------------------------------------------------- */
+
+/** \name Transform Axis Target
+ *
+ * Note this is an experemental operator to point lamps/cameras at objects.
+ * We may re-work how this behaves based on user feedback.
+ * - campbell.
+ * \{ */
+
+/* When using multiple objects, apply their relative rotational offset to the active object. */
+#define USE_RELATIVE_ROTATION
+
+struct XFormAxisItem {
+	Object *ob;
+	float rot_mat[3][3];
+	void *obtfm;
+	float xform_dist;
+
+#ifdef USE_RELATIVE_ROTATION
+	/* use when translating multiple */
+	float xform_rot_offset[3][3];
+#endif
+};
+
+struct XFormAxisData {
+	ViewContext vc;
+	struct {
+		float depth;
+		float normal[3];
+		bool is_depth_valid;
+		bool is_normal_valid;
+	} prev;
+
+	struct XFormAxisItem *object_data;
+	uint object_data_len;
+	bool is_translate;
+
+	int init_event;
+};
+
+static bool object_is_target_compat(const Object *ob)
+{
+	if (ob->type == OB_LAMP) {
+		const Lamp *la = ob->data;
+		if (ELEM(la->type, LA_SUN, LA_SPOT, LA_HEMI, LA_AREA)) {
+			return true;
+		}
+	}
+	/* We might want to enable this later, for now just lamps */
+#if 0
+	else if (ob->type == OB_CAMERA) {
+		return true;
+	}
+#endif
+	return false;
+}
+
+static void object_transform_axis_target_free_data(wmOperator *op)
+{
+	struct XFormAxisData *xfd = op->customdata;
+	struct XFormAxisItem *item = xfd->object_data;
+	for (int i = 0; i < xfd->object_data_len; i++, item++) {
+		MEM_freeN(item->obtfm);
+	}
+	MEM_freeN(xfd->object_data);
+	MEM_freeN(xfd);
+	op->customdata = NULL;
+}
+
+/* We may want to expose as alternative to: BKE_object_apply_rotation */
+static void object_apply_rotation(Object *ob, const float rmat[3][3])
+{
+	float size[3];
+	float loc[3];
+	float rmat4[4][4];
+	copy_m4_m3(rmat4, rmat);
+
+	copy_v3_v3(size, ob->size);
+	copy_v3_v3(loc, ob->loc);
+	BKE_object_apply_mat4(ob, rmat4, true, true);
+	copy_v3_v3(ob->size, size);
+	copy_v3_v3(ob->loc, loc);
+}
+/* We may want to extract this to: BKE_object_apply_location */
+static void object_apply_location(Object *ob, const float loc[3])
+{
+	/* quick but weak */
+	Object ob_prev = *ob;
+	float mat[4][4];
+	copy_m4_m4(mat, ob->obmat);
+	copy_v3_v3(mat[3], loc);
+	BKE_object_apply_mat4(ob, mat, true, true);
+	copy_v3_v3(mat[3], ob->loc);
+	*ob = ob_prev;
+	copy_v3_v3(ob->loc, mat[3]);
+}
+
+static void object_orient_to_location(
+        Object *ob, float rot_orig[3][3], const float axis[3], const float location[3])
+{
+	float delta[3];
+	sub_v3_v3v3(delta, ob->obmat[3], location);
+	if (normalize_v3(delta) != 0.0f) {
+		if (len_squared_v3v3(delta, axis) > FLT_EPSILON) {
+			float delta_rot[3][3];
+			float final_rot[3][3];
+			rotation_between_vecs_to_mat3(delta_rot, axis, delta);
+
+			mul_m3_m3m3(final_rot, delta_rot, rot_orig);
+
+			object_apply_rotation(ob, final_rot);
+
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB);
+		}
+	}
+}
+
+static void object_transform_axis_target_cancel(bContext *C, wmOperator *op)
+{
+	struct XFormAxisData *xfd = op->customdata;
+	struct XFormAxisItem *item = xfd->object_data;
+	for (int i = 0; i < xfd->object_data_len; i++, item++) {
+		BKE_object_tfm_restore(item->ob, item->obtfm);
+		DEG_id_tag_update(&item->ob->id, OB_RECALC_OB);
+		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
+	}
+
+	object_transform_axis_target_free_data(op);
+}
+
+static int object_transform_axis_target_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	ViewContext vc;
+	ED_view3d_viewcontext_init(C, &vc);
+
+	if (!object_is_target_compat(vc.obact)) {
+		/* Falls back to texture space transform. */
+		return OPERATOR_PASS_THROUGH;
+	}
+
+	ED_view3d_autodist_init(vc.depsgraph, vc.ar, vc.v3d, 0);
+
+	if (vc.rv3d->depths != NULL) {
+		vc.rv3d->depths->damaged = true;
+	}
+	ED_view3d_depth_update(vc.ar);
+
+	if (vc.rv3d->depths == NULL) {
+		BKE_report(op->reports, RPT_WARNING, "Unable to access depth buffer, using view plane");
+		return OPERATOR_CANCELLED;
+	}
+
+	ED_region_tag_redraw(vc.ar);
+
+	struct XFormAxisData *xfd;
+	xfd = op->customdata = MEM_callocN(sizeof(struct XFormAxisData), __func__);
+
+	/* Don't change this at runtime. */
+	xfd->vc = vc;
+	xfd->vc.mval[0] = event->mval[0];
+	xfd->vc.mval[1] = event->mval[1];
+
+	xfd->prev.depth = 1.0f;
+	xfd->prev.is_depth_valid = false;
+	xfd->prev.is_normal_valid = false;
+	xfd->is_translate = false;
+
+	xfd->init_event = WM_userdef_event_type_from_keymap_type(event->type);
+
+	{
+		struct XFormAxisItem *object_data = NULL;
+		BLI_array_declare(object_data);
+
+		struct XFormAxisItem *item = BLI_array_append_ret(object_data);
+		item->ob = xfd->vc.obact;
+
+		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+		{
+			if ((ob != xfd->vc.obact) && object_is_target_compat(ob)) {
+				item = BLI_array_append_ret(object_data);
+				item->ob = ob;
+			}
+		}
+		CTX_DATA_END;
+
+		xfd->object_data = object_data;
+		xfd->object_data_len = BLI_array_len(object_data);
+
+		if (xfd->object_data_len != BLI_array_len(object_data)) {
+			xfd->object_data = MEM_reallocN(xfd->object_data, xfd->object_data_len * sizeof(*xfd->object_data));
+		}
+	}
+
+	{
+		struct XFormAxisItem *item = xfd->object_data;
+		for (int i = 0; i < xfd->object_data_len; i++, item++) {
+			item->obtfm = BKE_object_tfm_backup(item->ob);
+			BKE_object_rot_to_mat3(item->ob, item->rot_mat, true);
+		}
+	}
+
+	WM_event_add_modal_handler(C, op);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int object_transform_axis_target_modal(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	struct XFormAxisData *xfd = op->customdata;
+	ARegion *ar = xfd->vc.ar;
+
+	view3d_operator_needs_opengl(C);
+
+	const bool is_translate = (event->ctrl != 0);
+	const bool is_translate_init = is_translate && (xfd->is_translate != is_translate);
+
+	if (event->type == MOUSEMOVE || is_translate_init) {
+		const ViewDepths *depths = xfd->vc.rv3d->depths;
+		if (depths &&
+		    ((unsigned int)event->mval[0] < depths->w) &&
+		    ((unsigned int)event->mval[1] < depths->h))
+		{
+			double depth = (double)ED_view3d_depth_read_cached(&xfd->vc, event->mval);
+			float location_world[3];
+			if (depth == 1.0f) {
+				if (xfd->prev.is_depth_valid) {
+					depth = (double)xfd->prev.depth;
+				}
+			}
+			if ((depth > depths->depth_range[0]) && (depth < depths->depth_range[1])) {
+				xfd->prev.depth = depth;
+				xfd->prev.is_depth_valid = true;
+				if (ED_view3d_depth_unproject(ar, event->mval, depth, location_world)) {
+					if (is_translate) {
+
+						float normal[3];
+						bool normal_found = false;
+						if (ED_view3d_depth_read_cached_normal(&xfd->vc, event->mval, normal)) {
+							normal_found = true;
+
+							/* cheap attempt to smooth normals out a bit! */
+							const uint ofs = 2;
+							for (uint x = -ofs; x <= ofs; x += ofs / 2) {
+								for (uint y = -ofs; y <= ofs; y += ofs / 2) {
+									if (x != 0 && y != 0) {
+										int mval_ofs[2] = {event->mval[0] + x, event->mval[1] + y};
+										float n[3];
+										if (ED_view3d_depth_read_cached_normal(
+										        &xfd->vc, mval_ofs, n))
+										{
+											add_v3_v3(normal, n);
+										}
+									}
+								}
+							}
+							normalize_v3(normal);
+						}
+						else if (xfd->prev.is_normal_valid) {
+							copy_v3_v3(normal, xfd->prev.normal);
+							normal_found = true;
+						}
+
+						if (normal_found) {
+#ifdef USE_RELATIVE_ROTATION
+							if (is_translate_init && xfd->object_data_len > 1) {
+								float xform_rot_offset_inv_first[3][3];
+								struct XFormAxisItem *item = xfd->object_data;
+								for (int i = 0; i < xfd->object_data_len; i++, item++) {
+									copy_m3_m4(item->xform_rot_offset, item->ob->obmat);
+									normalize_m3(item->xform_rot_offset);
+
+									if (i == 0) {
+										invert_m3_m3(xform_rot_offset_inv_first, xfd->object_data[0].xform_rot_offset);
+									}
+									else {
+										mul_m3_m3m3(item->xform_rot_offset,
+										            item->xform_rot_offset,
+										            xform_rot_offset_inv_first);
+									}
+								}
+							}
+
+#endif
+
+							struct XFormAxisItem *item = xfd->object_data;
+							for (int i = 0; i < xfd->object_data_len; i++, item++) {
+								if (is_translate_init) {
+									float ob_axis[3];
+									item->xform_dist = len_v3v3(item->ob->obmat[3], location_world);
+									normalize_v3_v3(ob_axis, item->ob->obmat[2]);
+									/* Scale to avoid adding distance when moving between surfaces. */
+									float scale = fabsf(dot_v3v3(ob_axis, normal));
+									item->xform_dist *= scale;
+								}
+
+								float target_normal[3];
+								copy_v3_v3(target_normal, normal);
+
+#ifdef USE_RELATIVE_ROTATION
+								if (i != 0) {
+									mul_m3_v3(item->xform_rot_offset, target_normal);
+								}
+#endif
+								{
+									float loc[3];
+
+									copy_v3_v3(loc, location_world);
+									madd_v3_v3fl(loc, target_normal, item->xform_dist);
+									object_apply_location(item->ob, loc);
+									copy_v3_v3(item->ob->obmat[3], loc);  /* so orient behaves as expected */
+								}
+
+								object_orient_to_location(item->ob, item->rot_mat, item->rot_mat[2], location_world);
+								WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
+							}
+							copy_v3_v3(xfd->prev.normal, normal);
+							xfd->prev.is_normal_valid = true;
+						}
+					}
+					else {
+						struct XFormAxisItem *item = xfd->object_data;
+						for (int i = 0; i < xfd->object_data_len; i++, item++) {
+							object_orient_to_location(item->ob, item->rot_mat, item->rot_mat[2], location_world);
+							WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
+						}
+						xfd->prev.is_normal_valid = false;
+					}
+				}
+			}
+		}
+		xfd->is_translate = is_translate;
+
+		ED_region_tag_redraw(xfd->vc.ar);
+	}
+
+	bool is_finished = false;
+
+	if (ISMOUSE(xfd->init_event)) {
+		if ((event->type == xfd->init_event) && (event->val == KM_RELEASE)) {
+			is_finished = true;
+		}
+	}
+	else {
+		if (ELEM(event->type, LEFTMOUSE, RETKEY, PADENTER)) {
+			is_finished = true;
+		}
+	}
+
+	if (is_finished) {
+		object_transform_axis_target_free_data(op);
+		return OPERATOR_FINISHED;
+	}
+	else if (ELEM(event->type, ESCKEY, RIGHTMOUSE)) {
+		object_transform_axis_target_cancel(C, op);
+		return OPERATOR_CANCELLED;
+	}
+
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+void OBJECT_OT_transform_axis_target(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Interactive Lamp Track to Cursor";
+	ot->description = "Interactively point cameras and lamps to a location (Ctrl translates)";
+	ot->idname = "OBJECT_OT_transform_axis_target";
+
+	/* api callbacks */
+	ot->invoke = object_transform_axis_target_invoke;
+	ot->cancel = object_transform_axis_target_cancel;
+	ot->modal = object_transform_axis_target_modal;
+	ot->poll = ED_operator_region_view3d_active;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
+}
+
+#undef USE_RELATIVE_ROTATION
+
+/** \} */
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index fcb2d45f73b..e39d889d9d9 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -43,6 +43,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_alloca.h"
 #include "BLI_array.h"
@@ -56,9 +57,9 @@
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
 #include "BKE_modifier.h"
 #include "BKE_report.h"
 #include "BKE_DerivedMesh.h"
@@ -66,6 +67,8 @@
 #include "BKE_object.h"
 #include "BKE_lattice.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_armature_types.h"
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -1270,9 +1273,9 @@ static void dm_deform_clear(DerivedMesh *dm, Object *ob)
 }
 
 /* recalculate the deformation */
-static DerivedMesh *dm_deform_recalc(Scene *scene, Object *ob)
+static DerivedMesh *dm_deform_recalc(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
-	return mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
+	return mesh_get_derived_deform(depsgraph, scene, ob, CD_MASK_BAREMESH);
 }
 
 /* by changing nonzero weights, try to move a vertex in me->mverts with index 'index' to
@@ -1285,7 +1288,7 @@ static DerivedMesh *dm_deform_recalc(Scene *scene, Object *ob)
  * coord is a point on the plane
  */
 static void moveCloserToDistanceFromPlane(
-        Scene *scene, Object *ob, Mesh *me, int index, float norm[3],
+        Depsgraph *depsgraph, Scene *scene, Object *ob, Mesh *me, int index, float norm[3],
         float coord[3], float d, float distToBe, float strength, float cp)
 {
 	DerivedMesh *dm;
@@ -1312,7 +1315,7 @@ static void moveCloserToDistanceFromPlane(
 	float originalDistToBe = distToBe;
 	do {
 		wasChange = false;
-		dm = dm_deform_recalc(scene, ob);
+		dm = dm_deform_recalc(depsgraph, scene, ob);
 		dm->getVert(dm, index, &m);
 		copy_v3_v3(oldPos, m.co);
 		distToStart = dot_v3v3(norm, oldPos) + d;
@@ -1350,7 +1353,7 @@ static void moveCloserToDistanceFromPlane(
 				if (dw->weight > 1) {
 					dw->weight = 1;
 				}
-				dm = dm_deform_recalc(scene, ob);
+				dm = dm_deform_recalc(depsgraph, scene, ob);
 				dm->getVert(dm, index, &m);
 				getVerticalAndHorizontalChange(norm, d, coord, oldPos, distToStart, m.co, changes, dists, i);
 				dw->weight = oldw;
@@ -1460,8 +1463,9 @@ static void moveCloserToDistanceFromPlane(
 
 /* this is used to try to smooth a surface by only adjusting the nonzero weights of a vertex
  * but it could be used to raise or lower an existing 'bump.' */
-static void vgroup_fix(Scene *scene, Object *ob, float distToBe, float strength, float cp)
+static void vgroup_fix(const bContext *C, Scene *scene, Object *ob, float distToBe, float strength, float cp)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	int i;
 
 	Mesh *me = ob->data;
@@ -1477,7 +1481,7 @@ static void vgroup_fix(Scene *scene, Object *ob, float distToBe, float strength,
 				MVert *p = MEM_callocN(sizeof(MVert) * (count), "deformedPoints");
 				int k;
 
-				DerivedMesh *dm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
+				DerivedMesh *dm = mesh_get_derived_deform(depsgraph, scene, ob, CD_MASK_BAREMESH);
 				k = count;
 				while (k--) {
 					dm->getVert(dm, verts[k], &m);
@@ -1495,7 +1499,7 @@ static void vgroup_fix(Scene *scene, Object *ob, float distToBe, float strength,
 					if (mag) { /* zeros fix */
 						d = -dot_v3v3(norm, coord);
 						/* dist = (dot_v3v3(norm, m.co) + d); */ /* UNUSED */
-						moveCloserToDistanceFromPlane(scene, ob, me, i, norm, coord, d, distToBe, strength, cp);
+						moveCloserToDistanceFromPlane(depsgraph, scene, ob, me, i, norm, coord, d, distToBe, strength, cp);
 					}
 				}
 
@@ -2635,7 +2639,7 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob = ED_object_context(C);
 
 	BKE_object_defgroup_add(ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
@@ -2668,7 +2672,7 @@ static int vertex_group_remove_exec(bContext *C, wmOperator *op)
 	else
 		vgroup_delete_active(ob);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
@@ -2703,7 +2707,7 @@ static int vertex_group_assign_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob = ED_object_context(C);
 
 	vgroup_assign_verts(ob, ts->vgroup_weight);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -2776,7 +2780,7 @@ static int vertex_group_remove_from_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -2865,7 +2869,7 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob = ED_object_context(C);
 
 	vgroup_duplicate(ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
 
@@ -2901,7 +2905,7 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op)
 	vgroup_levels_subset(ob, vgroup_validmap, vgroup_tot, subset_count, offset, gain);
 	MEM_freeN((void *)vgroup_validmap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -2935,7 +2939,7 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op))
 	changed = vgroup_normalize(ob);
 
 	if (changed) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -2974,7 +2978,7 @@ static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op)
 	MEM_freeN((void *)vgroup_validmap);
 
 	if (changed) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3027,9 +3031,9 @@ static int vertex_group_fix_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR_INVALID_CONTEXT, "This operator does not support an active mirror modifier");
 		return OPERATOR_CANCELLED;
 	}
-	vgroup_fix(scene, ob, distToBe, strength, cp);
+	vgroup_fix(C, scene, ob, distToBe, strength, cp);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3101,7 +3105,7 @@ static int vertex_group_invert_exec(bContext *C, wmOperator *op)
 	vgroup_invert_subset(ob, vgroup_validmap, vgroup_tot, subset_count, auto_assign, auto_remove);
 	MEM_freeN((void *)vgroup_validmap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3143,7 +3147,7 @@ static int vertex_group_smooth_exec(bContext *C, wmOperator *op)
 	vgroup_smooth_subset(ob, vgroup_validmap, vgroup_tot, subset_count, fac, repeat, fac_expand);
 	MEM_freeN((void *)vgroup_validmap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3185,7 +3189,7 @@ static int vertex_group_clean_exec(bContext *C, wmOperator *op)
 	vgroup_clean_subset(ob, vgroup_validmap, vgroup_tot, subset_count, limit, keep_single);
 	MEM_freeN((void *)vgroup_validmap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3226,7 +3230,7 @@ static int vertex_group_quantize_exec(bContext *C, wmOperator *op)
 	vgroup_quantize_subset(ob, vgroup_validmap, vgroup_tot, subset_count, steps);
 	MEM_freeN((void *)vgroup_validmap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3267,7 +3271,7 @@ static int vertex_group_limit_total_exec(bContext *C, wmOperator *op)
 	BKE_reportf(op->reports, remove_tot ? RPT_INFO : RPT_WARNING, "%d vertex weights limited", remove_tot);
 
 	if (remove_tot) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3313,7 +3317,7 @@ static int vertex_group_mirror_exec(bContext *C, wmOperator *op)
 
 	ED_mesh_report_mirror(op, totmirr, totfail);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3346,25 +3350,26 @@ void OBJECT_OT_vertex_group_mirror(wmOperatorType *ot)
 static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = ED_object_context(C);
-	Base *base;
+	Object *ob_active = ED_object_context(C);
 	int retval = OPERATOR_CANCELLED;
 
-	for (base = scene->base.first; base; base = base->next) {
-		if (base->object->type == ob->type) {
-			if (base->object != ob && base->object->data == ob->data) {
-				BLI_freelistN(&base->object->defbase);
-				BLI_duplicatelist(&base->object->defbase, &ob->defbase);
-				base->object->actdef = ob->actdef;
+	FOREACH_SCENE_OBJECT_BEGIN(scene, ob_iter)
+	{
+		if (ob_iter->type == ob_active->type) {
+			if (ob_iter != ob_active && ob_iter->data == ob_active->data) {
+				BLI_freelistN(&ob_iter->defbase);
+				BLI_duplicatelist(&ob_iter->defbase, &ob_active->defbase);
+				ob_iter->actdef = ob_active->actdef;
 
-				DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
-				WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, base->object);
-				WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, base->object->data);
+				DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+				WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter);
+				WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob_iter->data);
 
 				retval = OPERATOR_FINISHED;
 			}
 		}
 	}
+	FOREACH_SCENE_OBJECT_END;
 
 	return retval;
 }
@@ -3394,7 +3399,7 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
 	{
 		if (obact != ob) {
 			if (ED_vgroup_array_copy(ob, obact)) {
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 				WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 				changed_tot++;
 			}
@@ -3437,7 +3442,7 @@ static int set_active_group_exec(bContext *C, wmOperator *op)
 	BLI_assert(nr + 1 >= 0);
 	ob->actdef = nr + 1;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 
 	return OPERATOR_FINISHED;
@@ -3651,7 +3656,7 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
 	ret = vgroup_do_remap(ob, name_array, op);
 
 	if (ret != OPERATOR_CANCELLED) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 	}
 
@@ -3701,7 +3706,7 @@ static int vgroup_move_exec(bContext *C, wmOperator *op)
 		ret = vgroup_do_remap(ob, name_array, op);
 
 		if (ret != OPERATOR_CANCELLED) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 		}
 	}
@@ -3830,7 +3835,7 @@ static int vertex_weight_paste_exec(bContext *C, wmOperator *op)
 
 	vgroup_copy_active_to_sel_single(ob, def_nr);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
@@ -3867,7 +3872,7 @@ static int vertex_weight_delete_exec(bContext *C, wmOperator *op)
 
 	vgroup_remove_weight(ob, def_nr);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
@@ -3900,7 +3905,7 @@ static int vertex_weight_set_active_exec(bContext *C, wmOperator *op)
 
 	if (wg_index != -1) {
 		ob->actdef = wg_index + 1;
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	}
 
@@ -3937,7 +3942,7 @@ static int vertex_weight_normalize_active_vertex_exec(bContext *C, wmOperator *U
 	changed = vgroup_normalize_active_vertex(ob, subset_type);
 
 	if (changed) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 		return OPERATOR_FINISHED;
@@ -3970,7 +3975,7 @@ static int vertex_weight_copy_exec(bContext *C, wmOperator *UNUSED(op))
 
 	vgroup_copy_active_to_sel(ob, subset_type);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c
index 92b82e2a31b..008593739ba 100644
--- a/source/blender/editors/object/object_warp.c
+++ b/source/blender/editors/object/object_warp.c
@@ -227,7 +227,7 @@ static int object_warp_verts_exec(bContext *C, wmOperator *op)
 			View3D *v3d = CTX_wm_view3d(C);
 			const float *cursor;
 
-			cursor = ED_view3d_cursor3d_get(scene, v3d);
+			cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
 			copy_v3_v3(center, cursor);
 
 			RNA_property_float_set_array(op->ptr, prop_center, center);
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index a04ebb24d2c..3705ff9d41a 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -23,6 +23,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c
index d63c28bb0cf..f45ee050ef9 100644
--- a/source/blender/editors/physics/dynamicpaint_ops.c
+++ b/source/blender/editors/physics/dynamicpaint_ops.c
@@ -42,7 +42,6 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_object_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -50,6 +49,9 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_object.h"
@@ -135,7 +137,7 @@ static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	dynamicPaint_resetPreview(canvas);
-	DAG_id_tag_update(&obj_ctx->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&obj_ctx->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, obj_ctx);
 
 	return OPERATOR_FINISHED;
@@ -181,8 +183,8 @@ static int type_toggle_exec(bContext *C, wmOperator *op)
 	}
 
 	/* update dependency */
-	DAG_id_tag_update(&cObject->id, OB_RECALC_DATA);
-	DAG_relations_tag_update(CTX_data_main(C));
+	DEG_id_tag_update(&cObject->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(CTX_data_main(C));
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, cObject);
 
 	return OPERATOR_FINISHED;
@@ -286,6 +288,7 @@ typedef struct DynamicPaintBakeJob {
 
 	struct Main *bmain;
 	Scene *scene;
+	Depsgraph *depsgraph;
 	Object *ob;
 
 	DynamicPaintSurface *surface;
@@ -357,7 +360,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job)
 	frame = surface->start_frame;
 	orig_frame = scene->r.cfra;
 	scene->r.cfra = (int)frame;
-	ED_update_for_newframe(job->bmain, scene, 1);
+	ED_update_for_newframe(job->bmain, job->depsgraph);
 
 	/* Init surface */
 	if (!dynamicPaint_createUVSurface(scene, surface, job->progress, job->do_update)) {
@@ -383,8 +386,8 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job)
 
 		/* calculate a frame */
 		scene->r.cfra = (int)frame;
-		ED_update_for_newframe(job->bmain, scene, 1);
-		if (!dynamicPaint_calculateFrame(job->bmain->eval_ctx, surface, scene, cObject, frame)) {
+		ED_update_for_newframe(job->bmain, job->depsgraph);
+		if (!dynamicPaint_calculateFrame(surface, job->depsgraph, scene, cObject, frame)) {
 			job->success = 0;
 			return;
 		}
@@ -479,6 +482,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op)
 	DynamicPaintBakeJob *job = MEM_mallocN(sizeof(DynamicPaintBakeJob), "DynamicPaintBakeJob");
 	job->bmain = CTX_data_main(C);
 	job->scene = scene;
+	job->depsgraph = CTX_data_depsgraph(C);
 	job->ob = ob;
 	job->canvas = canvas;
 	job->surface = surface;
diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c
index 526eeb5d3ea..57b22991f94 100644
--- a/source/blender/editors/physics/particle_boids.c
+++ b/source/blender/editors/physics/particle_boids.c
@@ -39,10 +39,12 @@
 
 #include "BKE_boids.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_particle.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
 #include "RNA_define.h"
@@ -75,7 +77,7 @@ static int rule_add_exec(bContext *C, wmOperator *op)
 
 	BLI_addtail(&state->rules, rule);
 
-	DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+	DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 
 	return OPERATOR_FINISHED;
 }
@@ -121,8 +123,8 @@ static int rule_del_exec(bContext *C, wmOperator *UNUSED(op))
 	if (rule)
 		rule->flag |= BOIDRULE_CURRENT;
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 
 	return OPERATOR_FINISHED;
 }
@@ -158,7 +160,7 @@ static int rule_move_up_exec(bContext *C, wmOperator *UNUSED(op))
 			BLI_remlink(&state->rules, rule);
 			BLI_insertlinkbefore(&state->rules, rule->prev, rule);
 
-			DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+			DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 			break;
 		}
 	}
@@ -194,7 +196,7 @@ static int rule_move_down_exec(bContext *C, wmOperator *UNUSED(op))
 			BLI_remlink(&state->rules, rule);
 			BLI_insertlinkafter(&state->rules, rule->next, rule);
 
-			DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+			DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 			break;
 		}
 	}
@@ -277,8 +279,8 @@ static int state_del_exec(bContext *C, wmOperator *UNUSED(op))
 
 	state->flag |= BOIDSTATE_CURRENT;
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 
 	return OPERATOR_FINISHED;
 }
@@ -349,7 +351,7 @@ static int state_move_down_exec(bContext *C, wmOperator *UNUSED(op))
 		if (state->flag & BOIDSTATE_CURRENT && state->next) {
 			BLI_remlink(&boids->states, state);
 			BLI_insertlinkafter(&boids->states, state->next, state);
-			DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+			DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 			break;
 		}
 	}
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 2a15fb21fb8..c705434c509 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -46,15 +46,16 @@
 #include "BLI_math.h"
 #include "BLI_lasso_2d.h"
 #include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_kdtree.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
+#include "BKE_library.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
@@ -62,23 +63,32 @@
 #include "BKE_bvhutils.h"
 #include "BKE_pointcache.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_object.h"
 #include "ED_physics.h"
 #include "ED_mesh.h"
 #include "ED_particle.h"
+#include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+
 #include "UI_resources.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
 
+#include "DEG_depsgraph_query.h"
+
 #include "physics_intern.h"
 
 #include "particle_edit_utildefines.h"
@@ -90,9 +100,9 @@ int PE_poll(bContext *C)
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 
-	if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT))
+	if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 		return 0;
-
+	}
 	return (PE_get_current(scene, ob) != NULL);
 }
 
@@ -102,9 +112,9 @@ int PE_hair_poll(bContext *C)
 	Object *ob= CTX_data_active_object(C);
 	PTCacheEdit *edit;
 
-	if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT))
+	if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 		return 0;
-
+	}
 	edit= PE_get_current(scene, ob);
 
 	return (edit && edit->psys);
@@ -183,12 +193,30 @@ static float pe_brush_size_get(const Scene *UNUSED(scene), ParticleBrushData *br
 	return brush->size * U.pixelsize;
 }
 
+PTCacheEdit *PE_get_current_from_psys(ParticleSystem *psys)
+{
+	if (psys->part && psys->part->type == PART_HAIR) {
+		if ((psys->flag & PSYS_HAIR_DYNAMICS) != 0 &&
+		    (psys->pointcache->flag & PTCACHE_BAKED) != 0)
+		{
+			return psys->pointcache->edit;
+		}
+		else {
+			return psys->edit;
+		}
+	}
+	else if (psys->pointcache->flag & PTCACHE_BAKED) {
+		return psys->pointcache->edit;
+	}
+	return NULL;
+}
 
 /* always gets at least the first particlesystem even if PSYS_CURRENT flag is not set
  *
  * note: this function runs on poll, therefor it can runs many times a second
  * keep it fast! */
-static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
+static PTCacheEdit *pe_get_current(
+        Depsgraph *depsgraph, Scene *scene, Object *ob, int create)
 {
 	ParticleEditSettings *pset= PE_settings(scene);
 	PTCacheEdit *edit = NULL;
@@ -227,18 +255,22 @@ static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
 				if (psys->part && psys->part->type == PART_HAIR) {
 					if (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED) {
 						if (create && !psys->pointcache->edit)
-							PE_create_particle_edit(scene, ob, pid->cache, NULL);
+							PE_create_particle_edit(depsgraph, scene, ob, pid->cache, NULL);
 						edit = pid->cache->edit;
 					}
 					else {
-						if (create && !psys->edit && psys->flag & PSYS_HAIR_DONE)
-							PE_create_particle_edit(scene, ob, NULL, psys);
+						if (create && !psys->edit) {
+							ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
+							if (psys_eval->flag & PSYS_HAIR_DONE) {
+								PE_create_particle_edit(depsgraph, scene, ob, NULL, psys);
+							}
+						}
 						edit = psys->edit;
 					}
 				}
 				else {
 					if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
-						PE_create_particle_edit(scene, ob, pid->cache, psys);
+						PE_create_particle_edit(depsgraph, scene, ob, pid->cache, psys);
 					edit = pid->cache->edit;
 				}
 
@@ -249,7 +281,7 @@ static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
 			if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit) {
 				pset->flag |= PE_FADE_TIME;
 				// NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB;
-				PE_create_particle_edit(scene, ob, pid->cache, NULL);
+				PE_create_particle_edit(depsgraph, scene, ob, pid->cache, NULL);
 			}
 			edit = pid->cache->edit;
 			break;
@@ -258,7 +290,7 @@ static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
 			if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit) {
 				pset->flag |= PE_FADE_TIME;
 				// NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB;
-				PE_create_particle_edit(scene, ob, pid->cache, NULL);
+				PE_create_particle_edit(depsgraph, scene, ob, pid->cache, NULL);
 			}
 			edit = pid->cache->edit;
 			break;
@@ -275,18 +307,19 @@ static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
 
 PTCacheEdit *PE_get_current(Scene *scene, Object *ob)
 {
-	return pe_get_current(scene, ob, 0);
+	return pe_get_current(NULL, scene, ob, 0);
 }
 
-PTCacheEdit *PE_create_current(Scene *scene, Object *ob)
+PTCacheEdit *PE_create_current(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
-	return pe_get_current(scene, ob, 1);
+	return pe_get_current(depsgraph, scene, ob, 1);
 }
 
-void PE_current_changed(Scene *scene, Object *ob)
+void PE_current_changed(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
-	if (ob->mode == OB_MODE_PARTICLE_EDIT)
-		PE_create_current(scene, ob);
+	if (ob->mode == OB_MODE_PARTICLE_EDIT) {
+		PE_create_current(depsgraph, scene, ob);
+	}
 }
 
 void PE_hide_keys_time(Scene *scene, PTCacheEdit *edit, float cfra)
@@ -328,13 +361,15 @@ static int pe_x_mirror(Object *ob)
 
 typedef struct PEData {
 	ViewContext vc;
-	bglMats mats;
 
+	const bContext *context;
 	Scene *scene;
+	ViewLayer *view_layer;
 	Object *ob;
-	DerivedMesh *dm;
+	Mesh *mesh;
 	PTCacheEdit *edit;
 	BVHTreeFromMesh shape_bvh;
+	Depsgraph *depsgraph;
 
 	const int *mval;
 	rcti *rect;
@@ -364,9 +399,11 @@ static void PE_set_data(bContext *C, PEData *data)
 {
 	memset(data, 0, sizeof(*data));
 
-	data->scene= CTX_data_scene(C);
-	data->ob= CTX_data_active_object(C);
-	data->edit= PE_get_current(data->scene, data->ob);
+	data->scene = CTX_data_scene(C);
+	data->view_layer = CTX_data_view_layer(C);
+	data->ob = CTX_data_active_object(C);
+	data->depsgraph = CTX_data_depsgraph(C);
+	data->edit = PE_get_current(data->scene, data->ob);
 }
 
 static void PE_set_view3d_data(bContext *C, PEData *data)
@@ -374,8 +411,6 @@ static void PE_set_view3d_data(bContext *C, PEData *data)
 	PE_set_data(C, data);
 
 	ED_view3d_viewcontext_init(C, &data->vc);
-	/* note, the object argument means the modelview matrix does not account for the objects matrix, use viewmat rather than (obmat * viewmat) */
-	view3d_get_transformation(data->vc.ar, data->vc.rv3d, NULL, &data->mats);
 
 	if (V3D_IS_ZBUF(data->vc.v3d)) {
 		if (data->vc.v3d->flag & V3D_INVALID_BACKBUF) {
@@ -393,15 +428,15 @@ static void PE_set_view3d_data(bContext *C, PEData *data)
 
 static bool PE_create_shape_tree(PEData *data, Object *shapeob)
 {
-	DerivedMesh *dm = shapeob->derivedFinal;
+	Mesh *mesh = BKE_object_get_evaluated_mesh(data->depsgraph, shapeob);
 
 	memset(&data->shape_bvh, 0, sizeof(data->shape_bvh));
 
-	if (!dm) {
+	if (!mesh) {
 		return false;
 	}
 
-	return (bvhtree_from_mesh_get(&data->shape_bvh, dm, BVHTREE_FROM_LOOPTRI, 4) != NULL);
+	return (BKE_bvhtree_from_mesh_get(&data->shape_bvh, mesh, BVHTREE_FROM_LOOPTRI, 4) != NULL);
 }
 
 static void PE_free_shape_tree(PEData *data)
@@ -415,7 +450,6 @@ static bool key_test_depth(PEData *data, const float co[3], const int screen_co[
 {
 	View3D *v3d= data->vc.v3d;
 	ViewDepths *vd = data->vc.rv3d->depths;
-	double ux, uy, uz;
 	float depth;
 
 	/* nothing to do */
@@ -431,9 +465,6 @@ static bool key_test_depth(PEData *data, const float co[3], const int screen_co[
 	}
 #endif
 
-	gluProject(co[0], co[1], co[2], data->mats.modelview, data->mats.projection,
-	           (GLint *)data->mats.viewport, &ux, &uy, &uz);
-
 	/* check if screen_co is within bounds because brush_cut uses out of screen coords */
 	if (screen_co[0] >= 0 && screen_co[0] < vd->w && screen_co[1] >= 0 && screen_co[1] < vd->h) {
 		BLI_assert(vd && vd->depths);
@@ -443,7 +474,10 @@ static bool key_test_depth(PEData *data, const float co[3], const int screen_co[
 	else
 		return 0;
 
-	if ((float)uz - 0.00001f > depth)
+	float win[3];
+	ED_view3d_project(data->vc.ar, co, win);
+
+	if (win[2] - 0.00001f > depth)
 		return 0;
 	else
 		return 1;
@@ -609,9 +643,11 @@ static void foreach_mouse_hit_point(PEData *data, ForPointFunc func, int selecte
 
 static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected)
 {
+	Object *ob_eval = DEG_get_evaluated_object(data->depsgraph, data->ob);
 	PTCacheEdit *edit = data->edit;
 	ParticleSystem *psys = edit->psys;
 	ParticleSystemModifierData *psmd = NULL;
+	ParticleSystemModifierData *psmd_eval = NULL;
 	ParticleEditSettings *pset= PE_settings(data->scene);
 	POINT_P; KEY_K;
 	float mat[4][4], imat[4][4];
@@ -622,6 +658,10 @@ static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected
 	if (edit->psys)
 		psmd= psys_get_modifier(data->ob, edit->psys);
 
+	if (psmd != NULL) {
+		psmd_eval = (ParticleSystemModifierData *)modifiers_findByName(ob_eval, psmd->modifier.name);
+	}
+
 	/* all is selected in path mode */
 	if (pset->selectmode==SCE_SELECT_PATH)
 		selected= 0;
@@ -635,7 +675,7 @@ static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected
 				if (selected==0 || key->flag & PEK_SELECT) {
 					if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
 						if (edit->psys && !(edit->psys->flag & PSYS_GLOBAL_HAIR)) {
-							psys_mat_hair_to_global(data->ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
+							psys_mat_hair_to_global(data->ob, psmd_eval->mesh_final, psys->part->from, psys->particles + p, mat);
 							invert_m4_m4(imat, mat);
 						}
 
@@ -650,7 +690,7 @@ static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected
 				if (selected==0 || key->flag & PEK_SELECT) {
 					if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
 						if (edit->psys && !(edit->psys->flag & PSYS_GLOBAL_HAIR)) {
-							psys_mat_hair_to_global(data->ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
+							psys_mat_hair_to_global(data->ob, psmd_eval->mesh_final, psys->part->from, psys->particles + p, mat);
 							invert_m4_m4(imat, mat);
 						}
 
@@ -737,7 +777,7 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 	psmd= psys_get_modifier(ob, psys);
 	totpart= psys->totpart;
 
-	if (!psmd->dm_final)
+	if (!psmd->mesh_final)
 		return;
 
 	tree= BLI_kdtree_new(totpart);
@@ -745,7 +785,7 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 	/* insert particles into kd tree */
 	LOOP_PARTICLES {
 		key = pa->hair;
-		psys_mat_hair_to_orco(ob, psmd->dm_final, psys->part->from, pa, mat);
+		psys_mat_hair_to_orco(ob, psmd->mesh_final, psys->part->from, pa, mat);
 		copy_v3_v3(co, key->co);
 		mul_m4_v3(mat, co);
 		BLI_kdtree_insert(tree, p, co);
@@ -759,7 +799,7 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 
 	LOOP_PARTICLES {
 		key = pa->hair;
-		psys_mat_hair_to_orco(ob, psmd->dm_final, psys->part->from, pa, mat);
+		psys_mat_hair_to_orco(ob, psmd->mesh_final, psys->part->from, pa, mat);
 		copy_v3_v3(co, key->co);
 		mul_m4_v3(mat, co);
 		co[0] = -co[0];
@@ -785,7 +825,7 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 	BLI_kdtree_free(tree);
 }
 
-static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys, ParticleData *pa, ParticleData *mpa)
+static void PE_mirror_particle(Object *ob, Mesh *mesh, ParticleSystem *psys, ParticleData *pa, ParticleData *mpa)
 {
 	HairKey *hkey, *mhkey;
 	PTCacheEditPoint *point, *mpoint;
@@ -836,8 +876,8 @@ static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys
 	}
 
 	/* mirror positions and tags */
-	psys_mat_hair_to_orco(ob, dm, psys->part->from, pa, mat);
-	psys_mat_hair_to_orco(ob, dm, psys->part->from, mpa, mmat);
+	psys_mat_hair_to_orco(ob, mesh, psys->part->from, pa, mat);
+	psys_mat_hair_to_orco(ob, mesh, psys->part->from, mpa, mmat);
 	invert_m4_m4(immat, mmat);
 
 	hkey=pa->hair;
@@ -874,7 +914,7 @@ static void PE_apply_mirror(Object *ob, ParticleSystem *psys)
 	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
 
-	if (!psmd->dm_final)
+	if (!psmd->mesh_final)
 		return;
 
 	if (!edit->mirror_cache)
@@ -887,7 +927,7 @@ static void PE_apply_mirror(Object *ob, ParticleSystem *psys)
 	 * to avoid doing mirror twice */
 	LOOP_POINTS {
 		if (point->flag & PEP_EDIT_RECALC) {
-			PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
+			PE_mirror_particle(ob, psmd->mesh_final, psys, psys->particles + p, NULL);
 
 			if (edit->mirror_cache[p] != -1)
 				edit->points[edit->mirror_cache[p]].flag &= ~PEP_EDIT_RECALC;
@@ -922,11 +962,11 @@ static void pe_deflect_emitter(Scene *scene, Object *ob, PTCacheEdit *edit)
 	psys = edit->psys;
 	psmd = psys_get_modifier(ob, psys);
 
-	if (!psmd->dm_final)
+	if (!psmd->mesh_final)
 		return;
 
 	LOOP_EDITED_POINTS {
-		psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles + p, hairmat);
+		psys_mat_hair_to_object(ob, psmd->mesh_final, psys->part->from, psys->particles + p, hairmat);
 
 		LOOP_KEYS {
 			mul_m4_v3(hairmat, key->co);
@@ -1069,14 +1109,16 @@ void recalc_lengths(PTCacheEdit *edit)
 }
 
 /* calculate a tree for finding nearest emitter's vertice */
-void recalc_emitter_field(Object *ob, ParticleSystem *psys)
+void recalc_emitter_field(Depsgraph *depsgraph, Object *ob, ParticleSystem *psys)
 {
-	DerivedMesh *dm=psys_get_modifier(ob, psys)->dm_final;
-	PTCacheEdit *edit= psys->edit;
+	Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
+	ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
+	Mesh *mesh = psys_get_modifier(object_eval, psys_eval)->mesh_final;
+	PTCacheEdit *edit = psys->edit;
 	float *vec, *nor;
 	int i, totface /*, totvert*/;
 
-	if (!dm)
+	if (!mesh)
 		return;
 
 	if (edit->emitter_cosnos)
@@ -1084,7 +1126,7 @@ void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 
 	BLI_kdtree_free(edit->emitter_field);
 
-	totface=dm->getNumTessFaces(dm);
+	totface = mesh->totface;
 	/*totvert=dm->getNumVerts(dm);*/ /*UNSUED*/
 
 	edit->emitter_cosnos=MEM_callocN(totface*6*sizeof(float), "emitter cosnos");
@@ -1095,23 +1137,23 @@ void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 	nor=vec+3;
 
 	for (i=0; i<totface; i++, vec+=6, nor+=6) {
-		MFace *mface=dm->getTessFaceData(dm, i, CD_MFACE);
+		MFace *mface = &mesh->mface[i];
 		MVert *mvert;
 
-		mvert=dm->getVertData(dm, mface->v1, CD_MVERT);
+		mvert = &mesh->mvert[mface->v1];
 		copy_v3_v3(vec, mvert->co);
 		VECCOPY(nor, mvert->no);
 
-		mvert=dm->getVertData(dm, mface->v2, CD_MVERT);
+		mvert = &mesh->mvert[mface->v2];
 		add_v3_v3v3(vec, vec, mvert->co);
 		VECADD(nor, nor, mvert->no);
 
-		mvert=dm->getVertData(dm, mface->v3, CD_MVERT);
+		mvert = &mesh->mvert[mface->v3];
 		add_v3_v3v3(vec, vec, mvert->co);
 		VECADD(nor, nor, mvert->no);
 
 		if (mface->v4) {
-			mvert=dm->getVertData(dm, mface->v4, CD_MVERT);
+			mvert = &mesh->mvert[mface->v4];
 			add_v3_v3v3(vec, vec, mvert->co);
 			VECADD(nor, nor, mvert->no);
 
@@ -1128,9 +1170,9 @@ void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 	BLI_kdtree_balance(edit->emitter_field);
 }
 
-static void PE_update_selection(Scene *scene, Object *ob, int useflag)
+static void PE_update_selection(Depsgraph *depsgraph, Scene *scene, Object *ob, int useflag)
 {
-	PTCacheEdit *edit= PE_get_current(scene, ob);
+	PTCacheEdit *edit = PE_get_current(scene, ob);
 	HairKey *hkey;
 	POINT_P; KEY_K;
 
@@ -1149,27 +1191,37 @@ static void PE_update_selection(Scene *scene, Object *ob, int useflag)
 		}
 	}
 
-	psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
+	psys_cache_edit_paths(depsgraph, scene, ob, edit, CFRA, G.is_rendering);
 
 
 	/* disable update flag */
 	LOOP_POINTS
 		point->flag &= ~PEP_EDIT_RECALC;
+
+	DEG_id_tag_update(&ob->id, DEG_TAG_SELECT_UPDATE);
 }
 
-void update_world_cos(Object *ob, PTCacheEdit *edit)
+void update_world_cos(Depsgraph *depsgraph, Object *ob, PTCacheEdit *edit)
 {
+	Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 	ParticleSystem *psys = edit->psys;
-	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
+	ParticleSystem *psys_eval = NULL;
+	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
+	ParticleSystemModifierData *psmd_eval = NULL;
 	POINT_P; KEY_K;
 	float hairmat[4][4];
 
-	if (psys==0 || psys->edit==0 || psmd->dm_final==NULL)
+	if (psmd != NULL) {
+		psmd_eval = (ParticleSystemModifierData *)modifiers_findByName(ob_eval, psmd->modifier.name);
+		psys_eval = psmd_eval->psys;
+	}
+
+	if (psys == 0 || psys->edit == 0 || psmd_eval->mesh_final == NULL)
 		return;
 
 	LOOP_POINTS {
 		if (!(psys->flag & PSYS_GLOBAL_HAIR))
-			psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles+p, hairmat);
+			psys_mat_hair_to_global(ob_eval, psmd_eval->mesh_final, psys->part->from, psys_eval->particles+p, hairmat);
 
 		LOOP_KEYS {
 			copy_v3_v3(key->world_co, key->co);
@@ -1235,7 +1287,7 @@ static void update_velocities(PTCacheEdit *edit)
 	}
 }
 
-void PE_update_object(Scene *scene, Object *ob, int useflag)
+void PE_update_object(Depsgraph *depsgraph, Scene *scene, Object *ob, int useflag)
 {
 	/* use this to do partial particle updates, not usable when adding or
 	 * removing, then a full redo is necessary and calling this may crash */
@@ -1259,13 +1311,13 @@ void PE_update_object(Scene *scene, Object *ob, int useflag)
 	if (pe_x_mirror(ob))
 		PE_apply_mirror(ob, edit->psys);
 	if (edit->psys)
-		update_world_cos(ob, edit);
+		update_world_cos(depsgraph, ob, edit);
 	if (pset->flag & PE_AUTO_VELOCITY)
 		update_velocities(edit);
 	PE_hide_keys_time(scene, edit, CFRA);
 
 	/* regenerate path caches */
-	psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
+	psys_cache_edit_paths(depsgraph, scene, ob, edit, CFRA, G.is_rendering);
 
 	/* disable update flag */
 	LOOP_POINTS {
@@ -1375,6 +1427,7 @@ static void select_action_apply(PTCacheEditPoint *point, PTCacheEditKey *key, in
 static int pe_select_all_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *ob= CTX_data_active_object(C);
 	PTCacheEdit *edit= PE_get_current(scene, ob);
 	POINT_P; KEY_K;
@@ -1399,7 +1452,7 @@ static int pe_select_all_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1456,7 +1509,7 @@ int PE_mouse_particles(bContext *C, const int mval[2], bool extend, bool deselec
 	else
 		for_mouse_hit_keys(&data, toggle_key_select, 1);
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(data.depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1497,7 +1550,7 @@ static int select_roots_exec(bContext *C, wmOperator *op)
 	data.select_action = action;
 	foreach_point(&data, select_root);
 
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1562,7 +1615,7 @@ static int select_tips_exec(bContext *C, wmOperator *op)
 	data.select_action = action;
 	foreach_point(&data, select_tip);
 
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1646,7 +1699,7 @@ static int select_random_exec(bContext *C, wmOperator *op)
 
 	BLI_rng_free(rng);
 
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1690,7 +1743,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 	data.select= !RNA_boolean_get(op->ptr, "deselect");
 
 	for_mouse_hit_keys(&data, select_keys, 1);  /* nearest only */
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1754,7 +1807,7 @@ int PE_border_select(bContext *C, rcti *rect, bool select, bool extend)
 
 	for_mouse_hit_keys(&data, select_key, 0);
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(data.depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1779,7 +1832,7 @@ int PE_circle_select(bContext *C, int selecting, const int mval[2], float rad)
 
 	for_mouse_hit_keys(&data, select_key, 0);
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(data.depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1815,7 +1868,7 @@ int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, bool
 
 	LOOP_VISIBLE_POINTS {
 		if (edit->psys && !(psys->flag & PSYS_GLOBAL_HAIR))
-			psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
+			psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, psys->particles + p, mat);
 
 		if (pset->selectmode==SCE_SELECT_POINT) {
 			LOOP_KEYS {
@@ -1867,7 +1920,7 @@ int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, bool
 		}
 	}
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(data.depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1879,9 +1932,12 @@ static int hide_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
 	Scene *scene= CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	PTCacheEdit *edit= PE_get_current(scene, ob);
 	POINT_P; KEY_K;
 
+
 	if (RNA_enum_get(op->ptr, "unselected")) {
 		LOOP_UNSELECTED_POINTS {
 			point->flag |= PEP_HIDE;
@@ -1901,7 +1957,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -1931,7 +1987,8 @@ static int reveal_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
 	Scene *scene= CTX_data_scene(C);
-	PTCacheEdit *edit = PE_get_current(scene, ob);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	const bool select = RNA_boolean_get(op->ptr, "select");
 	POINT_P; KEY_K;
 
@@ -1946,7 +2003,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	PE_update_selection(scene, ob, 1);
+	PE_update_selection(depsgraph, scene, ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
 
 	return OPERATOR_FINISHED;
@@ -2008,7 +2065,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
 	PE_set_data(C, &data);
 	foreach_point(&data, select_less_keys);
 
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -2070,7 +2127,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op))
 	PE_set_data(C, &data);
 	foreach_point(&data, select_more_keys);
 
-	PE_update_selection(data.scene, data.ob, 1);
+	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -2106,9 +2163,10 @@ static void rekey_particle(PEData *data, int pa_index)
 	float dval, sta, end;
 	int k;
 
-	sim.scene= data->scene;
-	sim.ob= data->ob;
-	sim.psys= edit->psys;
+	sim.depsgraph = data->depsgraph;
+	sim.scene = data->scene;
+	sim.ob = data->ob;
+	sim.psys = edit->psys;
 
 	pa->flag |= PARS_REKEY;
 
@@ -2167,7 +2225,7 @@ static int rekey_exec(bContext *C, wmOperator *op)
 	foreach_selected_point(&data, rekey_particle);
 
 	recalc_lengths(data.edit);
-	PE_update_object(data.scene, data.ob, 1);
+	PE_update_object(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -2192,11 +2250,11 @@ void PARTICLE_OT_rekey(wmOperatorType *ot)
 	RNA_def_int(ot->srna, "keys_number", 2, 2, INT_MAX, "Number of Keys", "", 2, 100);
 }
 
-static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float path_time)
+static void rekey_particle_to_time(const bContext *C, Scene *scene, Object *ob, int pa_index, float path_time)
 {
 	PTCacheEdit *edit= PE_get_current(scene, ob);
 	ParticleSystem *psys;
-	ParticleSimulationData sim= {0};
+	ParticleSimulationData sim = {0};
 	ParticleData *pa;
 	ParticleKey state;
 	HairKey *new_keys, *key;
@@ -2207,9 +2265,10 @@ static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float
 
 	psys = edit->psys;
 
-	sim.scene= scene;
-	sim.ob= ob;
-	sim.psys= psys;
+	sim.depsgraph = CTX_data_depsgraph(C);
+	sim.scene = scene;
+	sim.ob = ob;
+	sim.psys = psys;
 
 	pa= psys->particles + pa_index;
 
@@ -2254,7 +2313,7 @@ static int remove_tagged_particles(Object *ob, ParticleSystem *psys, int mirror)
 		psmd= psys_get_modifier(ob, psys);
 
 		LOOP_TAGGED_POINTS {
-			PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
+			PE_mirror_particle(ob, psmd->mesh_final, psys, psys->particles + p, NULL);
 		}
 	}
 
@@ -2334,7 +2393,7 @@ static void remove_tagged_keys(Object *ob, ParticleSystem *psys)
 
 		LOOP_POINTS {
 			LOOP_TAGGED_KEYS {
-				PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
+				PE_mirror_particle(ob, psmd->mesh_final, psys, psys->particles + p, NULL);
 				break;
 			}
 		}
@@ -2424,9 +2483,10 @@ static void subdivide_particle(PEData *data, int pa_index)
 	short totnewkey=0;
 	float endtime;
 
-	sim.scene= data->scene;
-	sim.ob= data->ob;
-	sim.psys= edit->psys;
+	sim.depsgraph = data->depsgraph;
+	sim.scene = data->scene;
+	sim.ob = data->ob;
+	sim.psys = edit->psys;
 
 	for (k=0, ekey=point->keys; k<pa->totkey-1; k++, ekey++) {
 		if (ekey->flag&PEK_SELECT && (ekey+1)->flag&PEK_SELECT)
@@ -2498,7 +2558,7 @@ static int subdivide_exec(bContext *C, wmOperator *UNUSED(op))
 	foreach_point(&data, subdivide_particle);
 
 	recalc_lengths(data.edit);
-	PE_update_object(data.scene, data.ob, 1);
+	PE_update_object(data.depsgraph, data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -2548,7 +2608,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
 		/* insert particles into kd tree */
 		LOOP_SELECTED_POINTS {
-			psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
+			psys_mat_hair_to_object(ob, psmd->mesh_final, psys->part->from, psys->particles+p, mat);
 			copy_v3_v3(co, point->keys->co);
 			mul_m4_v3(mat, co);
 			BLI_kdtree_insert(tree, p, co);
@@ -2558,7 +2618,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
 		/* tag particles to be removed */
 		LOOP_SELECTED_POINTS {
-			psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
+			psys_mat_hair_to_object(ob, psmd->mesh_final, psys->part->from, psys->particles+p, mat);
 			copy_v3_v3(co, point->keys->co);
 			mul_m4_v3(mat, co);
 
@@ -2587,7 +2647,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
 	BKE_reportf(op->reports, RPT_INFO, "Removed %d double particles", totremoved);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
 	return OPERATOR_FINISHED;
@@ -2639,7 +2699,7 @@ static int weight_set_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
 	return OPERATOR_FINISHED;
@@ -2671,24 +2731,27 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
 	ParticleEditSettings *pset= PE_settings(scene);
 	ParticleBrushData *brush;
 
-	if (pset->brushtype < 0)
+	if (pset->brushtype < 0) {
 		return;
+	}
 
-	brush= &pset->brush[pset->brushtype];
+	brush = &pset->brush[pset->brushtype];
 
 	if (brush) {
-		glPushMatrix();
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		glTranslatef((float)x, (float)y, 0.0f);
+		immUniformColor4ub(255, 255, 255, 128);
 
-		glColor4ub(255, 255, 255, 128);
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
-		glutil_draw_lined_arc(0.0, M_PI*2.0, pe_brush_size_get(scene, brush), 40);
+
+		imm_draw_circle_wire_2d(pos, (float)x, (float)y, pe_brush_size_get(scene, brush), 40);
+
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
 
-		glPopMatrix();
+		immUnbindProgram();
 	}
 }
 
@@ -2745,7 +2808,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 		recalc_lengths(data.edit);
 	}
 
-	DAG_id_tag_update(&data.ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&data.ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -2772,11 +2835,12 @@ void PARTICLE_OT_delete(wmOperatorType *ot)
 
 /*************************** mirror operator **************************/
 
-static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
+static void PE_mirror_x(
+        Scene *scene, Object *ob, int tagged)
 {
 	Mesh *me= (Mesh *)(ob->data);
 	ParticleSystemModifierData *psmd;
-	PTCacheEdit *edit= PE_get_current(scene, ob);
+	PTCacheEdit *edit = PE_get_current(scene, ob);
 	ParticleSystem *psys = edit->psys;
 	ParticleData *pa, *newpa, *new_pars;
 	PTCacheEditPoint *newpoint, *new_points;
@@ -2789,17 +2853,17 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 		return;
 
 	psmd= psys_get_modifier(ob, psys);
-	if (!psmd->dm_final)
+	if (!psmd->mesh_final)
 		return;
 
-	const bool use_dm_final_indices = (psys->part->use_modifier_stack && !psmd->dm_final->deformedOnly);
+	const bool use_dm_final_indices = (psys->part->use_modifier_stack && !psmd->mesh_final->runtime.deformed_only);
 
 	/* NOTE: this is not nice to use tessfaces but hard to avoid since pa->num uses tessfaces */
 	BKE_mesh_tessface_ensure(me);
 
-	/* Note: In case psys uses DM tessface indices, we mirror final DM itself, not orig mesh. Avoids an (impossible)
-	 *       dm -> orig -> dm tessface indices conversion... */
-	mirrorfaces = mesh_get_x_mirror_faces(ob, NULL, use_dm_final_indices ? psmd->dm_final : NULL);
+	/* Note: In case psys uses Mesh tessface indices, we mirror final Mesh itself, not orig mesh. Avoids an (impossible)
+	 *       mesh -> orig -> mesh tessface indices conversion... */
+	mirrorfaces = mesh_get_x_mirror_faces__real_mesh(ob, NULL, use_dm_final_indices ? psmd->mesh_final : NULL);
 
 	if (!edit->mirror_cache)
 		PE_update_mirror_cache(ob, psys);
@@ -2813,7 +2877,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 			if (point_is_selected(point)) {
 				if (edit->mirror_cache[p] != -1) {
 					/* already has a mirror, don't need to duplicate */
-					PE_mirror_particle(ob, psmd->dm_final, psys, pa, NULL);
+					PE_mirror_particle(ob, psmd->mesh_final, psys, pa, NULL);
 					continue;
 				}
 				else
@@ -2826,7 +2890,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 	}
 
 	if (newtotpart != psys->totpart) {
-		MFace *mtessface = use_dm_final_indices ? psmd->dm_final->getTessFaceArray(psmd->dm_final) : me->mface;
+		MFace *mtessface = use_dm_final_indices ? psmd->mesh_final->mface : me->mface;
 
 		/* allocate new arrays and copy existing */
 		new_pars= MEM_callocN(newtotpart*sizeof(ParticleData), "ParticleData new");
@@ -2895,7 +2959,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 			}
 			else {
 				newpa->num_dmcache = psys_particle_dm_face_lookup(
-				                         psmd->dm_final, psmd->dm_deformed, newpa->num, newpa->fuv, NULL);
+				                         psmd->mesh_final, psmd->mesh_original, newpa->num, newpa->fuv, NULL);
 			}
 
 			/* update edit key pointers */
@@ -2906,7 +2970,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 			}
 
 			/* map key positions as mirror over x axis */
-			PE_mirror_particle(ob, psmd->dm_final, psys, pa, newpa);
+			PE_mirror_particle(ob, psmd->mesh_final, psys, pa, newpa);
 
 			newpa++;
 			newpoint++;
@@ -2928,9 +2992,9 @@ static int mirror_exec(bContext *C, wmOperator *UNUSED(op))
 
 	PE_mirror_x(scene, ob, 0);
 
-	update_world_cos(ob, edit);
+	update_world_cos(CTX_data_depsgraph(C), ob, edit);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -3063,7 +3127,7 @@ static void brush_cut(PEData *data, int pa_index)
 			edit->points[pa_index].flag |= PEP_TAG;
 		}
 		else {
-			rekey_particle_to_time(data->scene, ob, pa_index, cut_time);
+			rekey_particle_to_time(data->context, data->scene, ob, pa_index, cut_time);
 			edit->points[pa_index].flag |= PEP_EDIT_RECALC;
 		}
 	}
@@ -3116,7 +3180,7 @@ static void brush_puff(PEData *data, int point_index)
 	}
 
 	if (psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
-		psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, psys->particles + point_index, mat);
+		psys_mat_hair_to_global(data->ob, data->mesh, psys->part->from, psys->particles + point_index, mat);
 		invert_m4_m4(imat, mat);
 	}
 	else {
@@ -3311,34 +3375,39 @@ static void intersect_dm_quad_weights(const float v1[3], const float v2[3], cons
 }
 
 /* check intersection with a derivedmesh */
-static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm,
+static int particle_intersect_mesh(const bContext *C, Scene *scene, Object *ob, Mesh *mesh,
                                  float *vert_cos,
                                  const float co1[3], const float co2[3],
                                  float *min_d, int *min_face, float *min_w,
                                  float *face_minmax, float *pa_minmax,
                                  float radius, float *ipoint)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	MFace *mface= NULL;
 	MVert *mvert= NULL;
 	int i, totface, intersect=0;
 	float cur_d, cur_uv[2], v1[3], v2[3], v3[3], v4[3], min[3], max[3], p_min[3], p_max[3];
 	float cur_ipoint[3];
 
-	if (dm == NULL) {
+	if (mesh == NULL) {
 		psys_disable_all(ob);
 
-		dm=mesh_get_derived_final(scene, ob, 0);
+		/* TODO(Sybren): port to Mesh when we have decided how to handle derivedFinal and derivedDeform */
+		DerivedMesh *dm = mesh_get_derived_final(depsgraph, scene, ob, 0);
 		if (dm == NULL)
-			dm=mesh_get_derived_deform(scene, ob, 0);
+			dm = mesh_get_derived_deform(depsgraph, scene, ob, 0);
 
 		psys_enable_all(ob);
 
 		if (dm == NULL)
 			return 0;
+
+		mesh = BKE_id_new_nomain(ID_ME, NULL);
+		DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
 	}
 
 	/* BMESH_ONLY, deform dm may not have tessface */
-	DM_ensure_tessface(dm);
+	BKE_mesh_tessface_ensure(mesh);
 
 
 	if (pa_minmax==0) {
@@ -3351,9 +3420,9 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm,
 		copy_v3_v3(p_max, pa_minmax+3);
 	}
 
-	totface=dm->getNumTessFaces(dm);
-	mface=dm->getTessFaceDataArray(dm, CD_MFACE);
-	mvert=dm->getVertDataArray(dm, CD_MVERT);
+	totface = mesh->totface;
+	mface = mesh->mface;
+	mvert = mesh->mvert;
 
 	/* lets intersect the faces */
 	for (i=0; i<totface; i++, mface++) {
@@ -3442,11 +3511,12 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm,
 	return intersect;
 }
 
-static int brush_add(PEData *data, short number)
+static int brush_add(const bContext *C, PEData *data, short number)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene= data->scene;
 	Object *ob= data->ob;
-	DerivedMesh *dm;
+	Mesh *mesh;
 	PTCacheEdit *edit = data->edit;
 	ParticleSystem *psys= edit->psys;
 	ParticleData *add_pars;
@@ -3471,6 +3541,7 @@ static int brush_add(PEData *data, short number)
 
 	rng = BLI_rng_new_srandom(psys->seed+data->mval[0]+data->mval[1]);
 
+	sim.depsgraph = depsgraph;
 	sim.scene= scene;
 	sim.ob= ob;
 	sim.psys= psys;
@@ -3478,13 +3549,13 @@ static int brush_add(PEData *data, short number)
 
 	timestep= psys_get_timestep(&sim);
 
-	if (psys->part->use_modifier_stack || psmd->dm_final->deformedOnly) {
-		dm = psmd->dm_final;
+	if (psys->part->use_modifier_stack || psmd->mesh_final->runtime.deformed_only) {
+		mesh = psmd->mesh_final;
 	}
 	else {
-		dm = psmd->dm_deformed;
+		mesh = psmd->mesh_original;
 	}
-	BLI_assert(dm);
+	BLI_assert(mesh);
 
 	for (i=0; i<number; i++) {
 		if (number>1) {
@@ -3504,23 +3575,23 @@ static int brush_add(PEData *data, short number)
 
 		mco[0] = data->mval[0] + dmx;
 		mco[1] = data->mval[1] + dmy;
-		ED_view3d_win_to_segment(data->vc.ar, data->vc.v3d, mco, co1, co2, true);
+		ED_view3d_win_to_segment(depsgraph, data->vc.ar, data->vc.v3d, mco, co1, co2, true);
 
 		mul_m4_v3(imat, co1);
 		mul_m4_v3(imat, co2);
 		min_d=2.0;
 
 		/* warning, returns the derived mesh face */
-		if (particle_intersect_dm(scene, ob, dm, 0, co1, co2, &min_d, &add_pars[n].num_dmcache, add_pars[n].fuv, 0, 0, 0, 0)) {
-			if (psys->part->use_modifier_stack && !psmd->dm_final->deformedOnly) {
+		if (particle_intersect_mesh(C, scene, ob, mesh, 0, co1, co2, &min_d, &add_pars[n].num_dmcache, add_pars[n].fuv, 0, 0, 0, 0)) {
+			if (psys->part->use_modifier_stack && !psmd->mesh_final->runtime.deformed_only) {
 				add_pars[n].num = add_pars[n].num_dmcache;
 				add_pars[n].num_dmcache = DMCACHE_ISCHILD;
 			}
-			else if (dm == psmd->dm_deformed) {
+			else if (mesh == psmd->mesh_original) {
 				/* Final DM is not same topology as orig mesh, we have to map num_dmcache to real final dm. */
 				add_pars[n].num = add_pars[n].num_dmcache;
 				add_pars[n].num_dmcache = psys_particle_dm_face_lookup(
-				                              psmd->dm_final, psmd->dm_deformed,
+				                              psmd->mesh_final, psmd->mesh_original,
 				                              add_pars[n].num, add_pars[n].fuv, NULL);
 			}
 			else {
@@ -3562,7 +3633,7 @@ static int brush_add(PEData *data, short number)
 			tree=BLI_kdtree_new(psys->totpart);
 
 			for (i=0, pa=psys->particles; i<totpart; i++, pa++) {
-				psys_particle_on_dm(psmd->dm_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, cur_co, 0, 0, 0, 0, 0);
+				psys_particle_on_dm(psmd->mesh_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, cur_co, 0, 0, 0, 0);
 				BLI_kdtree_insert(tree, i, cur_co);
 			}
 
@@ -3606,7 +3677,7 @@ static int brush_add(PEData *data, short number)
 				int w, maxw;
 				float maxd, totw=0.0, weight[3];
 
-				psys_particle_on_dm(psmd->dm_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co1, 0, 0, 0, 0, 0);
+				psys_particle_on_dm(psmd->mesh_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co1, 0, 0, 0, 0);
 				maxw = BLI_kdtree_find_nearest_n(tree, co1, ptn, 3);
 
 				maxd= ptn[maxw-1].dist;
@@ -3671,7 +3742,7 @@ static int brush_add(PEData *data, short number)
 				}
 			}
 			for (k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
-				psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, pa, hairmat);
+				psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, pa, hairmat);
 				invert_m4_m4(imat, hairmat);
 				mul_m4_v3(imat, hkey->co);
 			}
@@ -3692,6 +3763,7 @@ static int brush_add(PEData *data, short number)
 
 typedef struct BrushEdit {
 	Scene *scene;
+	ViewLayer *view_layer;
 	Object *ob;
 	PTCacheEdit *edit;
 
@@ -3706,6 +3778,7 @@ typedef struct BrushEdit {
 static int brush_edit_init(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob= CTX_data_active_object(C);
 	ParticleEditSettings *pset= PE_settings(scene);
 	PTCacheEdit *edit= PE_get_current(scene, ob);
@@ -3718,7 +3791,7 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 
 	/* set the 'distance factor' for grabbing (used in comb etc) */
 	INIT_MINMAX(min, max);
-	PE_minmax(scene, min, max);
+	PE_minmax(scene, view_layer, min, max);
 	mid_v3_v3v3(min, min, max);
 
 	bedit= MEM_callocN(sizeof(BrushEdit), "BrushEdit");
@@ -3726,6 +3799,7 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 	op->customdata= bedit;
 
 	bedit->scene= scene;
+	bedit->view_layer = view_layer;
 	bedit->ob= ob;
 	bedit->edit= edit;
 
@@ -3740,6 +3814,7 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 {
 	BrushEdit *bedit= op->customdata;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene= bedit->scene;
 	Object *ob= bedit->ob;
 	PTCacheEdit *edit= bedit->edit;
@@ -3781,6 +3856,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 	     (sqrtf(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) || bedit->first)
 	{
 		PEData data= bedit->data;
+		data.context = C; // TODO(mai): why isnt this set in bedit->data?
 
 		view3d_operator_needs_opengl(C);
 		selected= (short)count_selected_keys(scene, edit);
@@ -3858,7 +3934,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 				case PE_BRUSH_PUFF:
 				{
 					if (edit->psys) {
-						data.dm= psmd->dm_final;
+						data.mesh = psmd->mesh_final;
 						data.mval= mval;
 						data.rad= pe_brush_size_get(scene, brush);
 						data.select= selected;
@@ -3881,7 +3957,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 					if (edit->psys && edit->psys->part->from==PART_FROM_FACE) {
 						data.mval= mval;
 
-						added= brush_add(&data, brush->count);
+						added= brush_add(C, &data, brush->count);
 
 						if (pset->flag & PE_KEEP_LENGTHS)
 							recalc_lengths(edit);
@@ -3914,7 +3990,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 				case PE_BRUSH_WEIGHT:
 				{
 					if (edit->psys) {
-						data.dm= psmd->dm_final;
+						data.mesh = psmd->mesh_final;
 						data.mval= mval;
 						data.rad= pe_brush_size_get(scene, brush);
 
@@ -3933,19 +4009,22 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 				if (pset->brushtype == PE_BRUSH_ADD && pe_x_mirror(ob))
 					PE_mirror_x(scene, ob, 1);
 
-				update_world_cos(ob, edit);
+				update_world_cos(depsgraph, ob, edit);
 				psys_free_path_cache(NULL, edit);
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+			else {
+				PE_update_object(depsgraph, scene, ob, 1);
 			}
-			else
-				PE_update_object(scene, ob, 1);
 		}
 
 		if (edit->psys) {
 			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
+			BKE_particle_batch_cache_dirty(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
+			DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 		}
 		else {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 		}
 
@@ -4153,7 +4232,7 @@ static void shape_cut(PEData *data, int pa_index)
 			edit->points[pa_index].flag |= PEP_TAG;
 		}
 		else {
-			rekey_particle_to_time(data->scene, ob, pa_index, cut_time);
+			rekey_particle_to_time(data->context, data->scene, ob, pa_index, cut_time);
 			edit->points[pa_index].flag |= PEP_EDIT_RECALC;
 		}
 	}
@@ -4161,6 +4240,7 @@ static void shape_cut(PEData *data, int pa_index)
 
 static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	ParticleEditSettings *pset = PE_settings(scene);
@@ -4195,18 +4275,21 @@ static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
 		recalc_lengths(edit);
 
 		if (removed) {
-			update_world_cos(ob, edit);
+			update_world_cos(depsgraph, ob, edit);
 			psys_free_path_cache(NULL, edit);
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		}
+		else {
+			PE_update_object(data.depsgraph, scene, ob, 1);
 		}
-		else
-			PE_update_object(scene, ob, 1);
 
 		if (edit->psys) {
 			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
+			BKE_particle_batch_cache_dirty(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
+			DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 		}
 		else {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 		}
 
@@ -4235,9 +4318,9 @@ void PARTICLE_OT_shape_cut(wmOperatorType *ot)
 
 /************************ utilities ******************************/
 
-int PE_minmax(Scene *scene, float min[3], float max[3])
+int PE_minmax(Scene *scene, ViewLayer *view_layer, float min[3], float max[3])
 {
-	Object *ob= OBACT;
+	Object *ob= OBACT(view_layer);
 	PTCacheEdit *edit= PE_get_current(scene, ob);
 	ParticleSystem *psys;
 	ParticleSystemModifierData *psmd = NULL;
@@ -4254,7 +4337,7 @@ int PE_minmax(Scene *scene, float min[3], float max[3])
 
 	LOOP_VISIBLE_POINTS {
 		if (psys)
-			psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
+			psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, psys->particles+p, mat);
 
 		LOOP_SELECTED_KEYS {
 			copy_v3_v3(co, key->co);
@@ -4275,17 +4358,24 @@ int PE_minmax(Scene *scene, float min[3], float max[3])
 /************************ particle edit toggle operator ************************/
 
 /* initialize needed data for bake edit */
-void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys)
+void PE_create_particle_edit(
+        Depsgraph *depsgraph, Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys)
 {
 	PTCacheEdit *edit;
+	Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 	ParticleSystemModifierData *psmd = (psys) ? psys_get_modifier(ob, psys) : NULL;
+	ParticleSystemModifierData *psmd_eval = NULL;
 	POINT_P; KEY_K;
 	ParticleData *pa = NULL;
 	HairKey *hkey;
 	int totpoint;
 
+	if (psmd != NULL) {
+		psmd_eval = (ParticleSystemModifierData *)modifiers_findByName(ob_eval, psmd->modifier.name);
+	}
+
 	/* no psmd->dm happens in case particle system modifier is not enabled */
-	if (!(psys && psmd && psmd->dm_final) && !cache)
+	if (!(psys && psmd_eval && psmd_eval->mesh_final) && !cache)
 		return;
 
 	if (cache && cache->flag & PTCACHE_DISK_CACHE)
@@ -4332,7 +4422,7 @@ void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, Partic
 				}
 				pa++;
 			}
-			update_world_cos(ob, edit);
+			update_world_cos(depsgraph, ob, edit);
 		}
 		else {
 			PTCacheMem *pm;
@@ -4375,8 +4465,9 @@ void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, Partic
 
 		recalc_lengths(edit);
 		if (psys && !cache)
-			recalc_emitter_field(ob, psys);
-		PE_update_object(scene, ob, 1);
+			recalc_emitter_field(depsgraph, ob, psys);
+
+		PE_update_object(depsgraph, scene, ob, 1);
 	}
 }
 
@@ -4398,6 +4489,8 @@ static int particle_edit_toggle_poll(bContext *C)
 
 static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	const int mode_flag = OB_MODE_PARTICLE_EDIT;
@@ -4411,13 +4504,14 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 
 	if (!is_mode_set) {
 		PTCacheEdit *edit;
+
 		ob->mode |= mode_flag;
-		edit= PE_create_current(scene, ob);
+		edit= PE_create_current(depsgraph, scene, ob);
 
 		/* mesh may have changed since last entering editmode.
 		 * note, this may have run before if the edit data was just created, so could avoid this and speed up a little */
 		if (edit && edit->psys)
-			recalc_emitter_field(ob, edit->psys);
+			recalc_emitter_field(depsgraph, ob, edit->psys);
 
 		toggle_particle_cursor(C, 1);
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_PARTICLE, NULL);
@@ -4428,7 +4522,13 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	// ED_workspace_object_mode_sync_from_object(wm, workspace, ob);
+
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA | DEG_TAG_COPY_ON_WRITE);
+
+	WM_msg_publish_rna_prop(mbus, &ob->id, ob, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
 
 	return OPERATOR_FINISHED;
 }
@@ -4469,7 +4569,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op))
 
 			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
 			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 	else { /* some operation might have protected hair from editing so let's clear the flag */
@@ -4477,7 +4577,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op))
 		psys->flag &= ~PSYS_GLOBAL_HAIR;
 		psys->flag &= ~PSYS_EDITED;
 		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
 	return OPERATOR_FINISHED;
@@ -4580,19 +4680,23 @@ static int unify_length_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = CTX_data_active_object(C);
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	PTCacheEdit *edit = PE_get_current(scene, ob);
 	float average_length = calculate_average_length(edit);
+
 	if (average_length == 0.0f) {
 		return OPERATOR_CANCELLED;
 	}
 	scale_points_to_length(edit, average_length);
 
-	PE_update_object(scene, ob, 1);
+
+	PE_update_object(depsgraph, scene, ob, 1);
 	if (edit->psys) {
 		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 	}
 	else {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	}
 
diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c
index ef0a2711fdd..6576d692f70 100644
--- a/source/blender/editors/physics/particle_edit_undo.c
+++ b/source/blender/editors/physics/particle_edit_undo.c
@@ -44,12 +44,13 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_context.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_object.h"
 #include "ED_particle.h"
 #include "ED_physics.h"
@@ -229,16 +230,19 @@ typedef struct ParticleUndoStep {
 static bool particle_undosys_poll(struct bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = OBACT;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
 	PTCacheEdit *edit = PE_get_current(scene, ob);
+
 	return (edit != NULL);
 }
 
 static bool particle_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 {
 	ParticleUndoStep *us = (ParticleUndoStep *)us_p;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	us->scene_ref.ptr = CTX_data_scene(C);
-	us->object_ref.ptr = us->scene_ref.ptr->basact->object;
+	us->object_ref.ptr = OBACT(view_layer);
 	PTCacheEdit *edit = PE_get_current(us->scene_ref.ptr, us->object_ref.ptr);
 	undoptcache_from_editcache(&us->data, edit);
 	return true;
@@ -256,7 +260,7 @@ static void particle_undosys_step_decode(struct bContext *C, UndoStep *us_p, int
 	PTCacheEdit *edit = PE_get_current(scene, ob);
 	if (edit) {
 		undoptcache_to_editcache(&us->data, edit);
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		BLI_assert(0);
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 8a363276c28..48a80cbbc1f 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -33,6 +33,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
@@ -43,18 +44,21 @@
 #include "BLI_string.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -110,6 +114,7 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = ED_object_context(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	int mode_orig;
 
 	if (!scene || !ob)
@@ -123,7 +128,7 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	 */
 	if (mode_orig & OB_MODE_PARTICLE_EDIT) {
 		if ((ob->mode & OB_MODE_PARTICLE_EDIT) == 0) {
-			if (scene->basact && scene->basact->object == ob) {
+			if (view_layer->basact && view_layer->basact->object == ob) {
 				WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
 			}
 		}
@@ -185,8 +190,8 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op))
 
 	psys_check_boid_data(psys);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
@@ -233,8 +238,8 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BLI_addtail(&psys->targets, pt);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
@@ -281,8 +286,8 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
 	if (pt)
 		pt->flag |= PTARGET_CURRENT;
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
@@ -321,7 +326,7 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op))
 			BLI_remlink(&psys->targets, pt);
 			BLI_insertlinkbefore(&psys->targets, pt->prev, pt);
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 			break;
 		}
@@ -359,7 +364,7 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op))
 			BLI_remlink(&psys->targets, pt);
 			BLI_insertlinkafter(&psys->targets, pt->next, pt);
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 			break;
 		}
@@ -542,7 +547,9 @@ void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot)
 
 /************************ connect/disconnect hair operators *********************/
 
-static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
+static void disconnect_hair(
+        Depsgraph *depsgraph, Scene *scene,
+        Object *ob, ParticleSystem *psys)
 {
 	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
 	ParticleEditSettings *pset= PE_settings(scene);
@@ -569,7 +576,7 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 			point++;
 		}
 
-		psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, pa, hairmat);
+		psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, pa, hairmat);
 
 		for (k=0, key=pa->hair; k<pa->totkey; k++, key++) {
 			mul_m4_v3(hairmat, key->co);
@@ -588,11 +595,12 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	if (ELEM(pset->brushtype, PE_BRUSH_ADD, PE_BRUSH_PUFF))
 		pset->brushtype = PE_BRUSH_NONE;
 
-	PE_update_object(scene, ob, 0);
+	PE_update_object(depsgraph, scene, ob, 0);
 }
 
 static int disconnect_hair_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= ED_object_context(C);
 	ParticleSystem *psys= NULL;
@@ -603,15 +611,15 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op)
 
 	if (all) {
 		for (psys=ob->particlesystem.first; psys; psys=psys->next) {
-			disconnect_hair(scene, ob, psys);
+			disconnect_hair(depsgraph, scene, ob, psys);
 		}
 	}
 	else {
 		psys = psys_get_current(ob);
-		disconnect_hair(scene, ob, psys);
+		disconnect_hair(depsgraph, scene, ob, psys);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
 	return OPERATOR_FINISHED;
@@ -634,9 +642,10 @@ void PARTICLE_OT_disconnect_hair(wmOperatorType *ot)
 /* from/to_world_space : whether from/to particles are in world or hair space
  * from/to_mat : additional transform for from/to particles (e.g. for using object space copying)
  */
-static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
-                               Object *target_ob, ParticleSystem *target_psys, PTCacheEdit *target_edit,
-                               float from_mat[4][4], float to_mat[4][4], bool from_global, bool to_global)
+static bool remap_hair_emitter(
+        Depsgraph *depsgraph, Scene *scene, Object *ob, ParticleSystem *psys,
+        Object *target_ob, ParticleSystem *target_psys, PTCacheEdit *target_edit,
+        float from_mat[4][4], float to_mat[4][4], bool from_global, bool to_global)
 {
 	ParticleSystemModifierData *target_psmd = psys_get_modifier(target_ob, target_psys);
 	ParticleData *pa, *tpa;
@@ -646,13 +655,13 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 	MFace *mface = NULL, *mf;
 	MEdge *medge = NULL, *me;
 	MVert *mvert;
-	DerivedMesh *dm, *target_dm;
+	Mesh *mesh, *target_mesh;
 	int numverts;
 	int i, k;
 	float from_ob_imat[4][4], to_ob_imat[4][4];
 	float from_imat[4][4], to_imat[4][4];
 
-	if (!target_psmd->dm_final)
+	if (!target_psmd->mesh_final)
 		return false;
 	if (!psys->part || psys->part->type != PART_HAIR)
 		return false;
@@ -666,40 +675,46 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 	invert_m4_m4(from_imat, from_mat);
 	invert_m4_m4(to_imat, to_mat);
 
-	if (target_psmd->dm_final->deformedOnly) {
+	if (target_psmd->mesh_final->runtime.deformed_only) {
 		/* we don't want to mess up target_psmd->dm when converting to global coordinates below */
-		dm = target_psmd->dm_final;
+		mesh = target_psmd->mesh_final;
 	}
 	else {
-		dm = target_psmd->dm_deformed;
+		mesh = target_psmd->mesh_original;
 	}
-	target_dm = target_psmd->dm_final;
-	if (dm == NULL) {
+	target_mesh = target_psmd->mesh_final;
+	if (mesh == NULL) {
 		return false;
 	}
 	/* don't modify the original vertices */
-	dm = CDDM_copy(dm);
+	BKE_id_copy_ex(
+	            NULL, &mesh->id, (ID **)&mesh,
+	            LIB_ID_CREATE_NO_MAIN |
+	            LIB_ID_CREATE_NO_USER_REFCOUNT |
+	            LIB_ID_CREATE_NO_DEG_TAG |
+	            LIB_ID_COPY_NO_PREVIEW,
+	            false);
 
 	/* BMESH_ONLY, deform dm may not have tessface */
-	DM_ensure_tessface(dm);
+	BKE_mesh_tessface_ensure(mesh);
 
-	numverts = dm->getNumVerts(dm);
-	mvert = dm->getVertArray(dm);
+	numverts = mesh->totvert;
+	mvert = mesh->mvert;
 
 	/* convert to global coordinates */
 	for (i=0; i<numverts; i++)
 		mul_m4_v3(to_mat, mvert[i].co);
 
-	if (dm->getNumTessFaces(dm) != 0) {
-		mface = dm->getTessFaceArray(dm);
-		bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES, 2);
+	if (mesh->totface != 0) {
+		mface = mesh->mface;
+		BKE_bvhtree_from_mesh_get(&bvhtree, mesh, BVHTREE_FROM_FACES, 2);
 	}
-	else if (dm->getNumEdges(dm) != 0) {
-		medge = dm->getEdgeArray(dm);
-		bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES, 2);
+	else if (mesh->totedge != 0) {
+		medge = mesh->medge;
+		BKE_bvhtree_from_mesh_get(&bvhtree, mesh, BVHTREE_FROM_EDGES, 2);
 	}
 	else {
-		dm->release(dm);
+		BKE_id_free(NULL, mesh);
 		return false;
 	}
 
@@ -744,7 +759,7 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 			tpa->foffset = 0.0f;
 
 			tpa->num = nearest.index;
-			tpa->num_dmcache = psys_particle_dm_face_lookup(target_dm, dm, tpa->num, tpa->fuv, NULL);
+			tpa->num_dmcache = psys_particle_dm_face_lookup(target_mesh, mesh, tpa->num, tpa->fuv, NULL);
 		}
 		else {
 			me = &medge[nearest.index];
@@ -770,7 +785,7 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 				copy_m4_m4(imat, target_ob->obmat);
 			else {
 				/* note: using target_dm here, which is in target_ob object space and has full modifiers */
-				psys_mat_hair_to_object(target_ob, target_dm, target_psys->part->from, tpa, hairmat);
+				psys_mat_hair_to_object(target_ob, target_mesh, target_psys->part->from, tpa, hairmat);
 				invert_m4_m4(imat, hairmat);
 			}
 			mul_m4_m4m4(imat, imat, to_imat);
@@ -816,23 +831,27 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
 	}
 
 	free_bvhtree_from_mesh(&bvhtree);
-	dm->release(dm);
+	BKE_id_free(NULL, mesh);
 
 	psys_free_path_cache(target_psys, target_edit);
 
-	PE_update_object(scene, target_ob, 0);
+	PE_update_object(depsgraph, scene, target_ob, 0);
 
 	return true;
 }
 
-static bool connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
+static bool connect_hair(
+        Depsgraph *depsgraph, Scene *scene,
+        Object *ob, ParticleSystem *psys)
 {
 	bool ok;
 
 	if (!psys)
 		return false;
 
-	ok = remap_hair_emitter(scene, ob, psys, ob, psys, psys->edit, ob->obmat, ob->obmat, psys->flag & PSYS_GLOBAL_HAIR, false);
+	ok = remap_hair_emitter(
+	         depsgraph, scene, ob, psys, ob, psys, psys->edit,
+	         ob->obmat, ob->obmat, psys->flag & PSYS_GLOBAL_HAIR, false);
 	psys->flag &= ~PSYS_GLOBAL_HAIR;
 
 	return ok;
@@ -840,6 +859,7 @@ static bool connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 
 static int connect_hair_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= ED_object_context(C);
 	ParticleSystem *psys= NULL;
@@ -851,12 +871,12 @@ static int connect_hair_exec(bContext *C, wmOperator *op)
 
 	if (all) {
 		for (psys=ob->particlesystem.first; psys; psys=psys->next) {
-			any_connected |= connect_hair(scene, ob, psys);
+			any_connected |= connect_hair(depsgraph, scene, ob, psys);
 		}
 	}
 	else {
 		psys = psys_get_current(ob);
-		any_connected |= connect_hair(scene, ob, psys);
+		any_connected |= connect_hair(depsgraph, scene, ob, psys);
 	}
 
 	if (!any_connected) {
@@ -865,7 +885,7 @@ static int connect_hair_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
 	return OPERATOR_FINISHED;
@@ -892,7 +912,9 @@ typedef enum eCopyParticlesSpace {
 	PAR_COPY_SPACE_WORLD    = 1,
 } eCopyParticlesSpace;
 
-static void copy_particle_edit(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystem *psys_from)
+static void copy_particle_edit(
+        Depsgraph *depsgraph, Scene *scene,
+        Object *ob, ParticleSystem *psys, ParticleSystem *psys_from)
 {
 	PTCacheEdit *edit_from = psys_from->edit, *edit;
 	ParticleData *pa;
@@ -932,14 +954,14 @@ static void copy_particle_edit(Scene *scene, Object *ob, ParticleSystem *psys, P
 
 		pa++;
 	}
-	update_world_cos(ob, edit);
+	update_world_cos(depsgraph, ob, edit);
 
 	UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
 	UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
 
 	recalc_lengths(edit);
-	recalc_emitter_field(ob, psys);
-	PE_update_object(scene, ob, true);
+	recalc_emitter_field(depsgraph, ob, psys);
+	PE_update_object(depsgraph, scene, ob, true);
 }
 
 static void remove_particle_systems_from_object(Object *ob_to)
@@ -967,7 +989,7 @@ static void remove_particle_systems_from_object(Object *ob_to)
 }
 
 /* single_psys_from is optional, if NULL all psys of ob_from are copied */
-static bool copy_particle_systems_to_object(Main *bmain,
+static bool copy_particle_systems_to_object(const bContext *C,
                                             Scene *scene,
                                             Object *ob_from,
                                             ParticleSystem *single_psys_from,
@@ -975,10 +997,12 @@ static bool copy_particle_systems_to_object(Main *bmain,
                                             int space,
                                             bool duplicate_settings)
 {
+	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ModifierData *md;
 	ParticleSystem *psys_start = NULL, *psys, *psys_from;
 	ParticleSystem **tmp_psys;
-	DerivedMesh *final_dm;
+	Mesh *final_mesh;
 	CustomDataMask cdmask;
 	int i, totpsys;
 
@@ -1020,7 +1044,10 @@ static bool copy_particle_systems_to_object(Main *bmain,
 	psys_start = totpsys > 0 ? tmp_psys[0] : NULL;
 
 	/* get the DM (psys and their modifiers have not been appended yet) */
-	final_dm = mesh_get_derived_final(scene, ob_to, cdmask);
+	/* TODO(Sybren): use mesh_eval instead */
+	DerivedMesh *final_dm = mesh_get_derived_final(depsgraph, scene, ob_to, cdmask);
+	final_mesh = BKE_id_new_nomain(ID_ME, NULL);
+	DM_to_mesh(final_dm, final_mesh, ob_to, CD_MASK_EVERYTHING, false);
 
 	/* now append psys to the object and make modifiers */
 	for (i = 0, psys_from = PSYS_FROM_FIRST;
@@ -1044,12 +1071,20 @@ static bool copy_particle_systems_to_object(Main *bmain,
 		modifier_unique_name(&ob_to->modifiers, (ModifierData *)psmd);
 
 		psmd->psys = psys;
-		psmd->dm_final = CDDM_copy(final_dm);
-		CDDM_calc_normals(psmd->dm_final);
-		DM_ensure_tessface(psmd->dm_final);
-
-		if (psys_from->edit)
-			copy_particle_edit(scene, ob_to, psys, psys_from);
+		BKE_id_copy_ex(
+		            NULL, &final_mesh->id, (ID **)&psmd->mesh_final,
+		            LIB_ID_CREATE_NO_MAIN |
+		            LIB_ID_CREATE_NO_USER_REFCOUNT |
+		            LIB_ID_CREATE_NO_DEG_TAG |
+		            LIB_ID_COPY_NO_PREVIEW,
+		            false);
+
+		BKE_mesh_calc_normals(psmd->mesh_final);
+		BKE_mesh_tessface_ensure(psmd->mesh_final);
+
+		if (psys_from->edit) {
+			copy_particle_edit(depsgraph, scene, ob_to, psys, psys_from);
+		}
 
 		if (duplicate_settings) {
 			id_us_min(&psys->part->id);
@@ -1083,7 +1118,9 @@ static bool copy_particle_systems_to_object(Main *bmain,
 				break;
 		}
 		if (ob_from != ob_to) {
-			remap_hair_emitter(scene, ob_from, psys_from, ob_to, psys, psys->edit, from_mat, to_mat, psys_from->flag & PSYS_GLOBAL_HAIR, psys->flag & PSYS_GLOBAL_HAIR);
+			remap_hair_emitter(
+			        depsgraph, scene, ob_from, psys_from, ob_to, psys, psys->edit,
+			        from_mat, to_mat, psys_from->flag & PSYS_GLOBAL_HAIR, psys->flag & PSYS_GLOBAL_HAIR);
 		}
 
 		/* tag for recalc */
@@ -1093,7 +1130,7 @@ static bool copy_particle_systems_to_object(Main *bmain,
 	#undef PSYS_FROM_FIRST
 	#undef PSYS_FROM_NEXT
 
-	DAG_id_tag_update(&ob_to->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob_to->id, OB_RECALC_DATA);
 	WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, ob_to);
 	return true;
 }
@@ -1116,7 +1153,6 @@ static int copy_particle_systems_exec(bContext *C, wmOperator *op)
 	const int space = RNA_enum_get(op->ptr, "space");
 	const bool remove_target_particles = RNA_boolean_get(op->ptr, "remove_target_particles");
 	const bool use_active = RNA_boolean_get(op->ptr, "use_active");
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob_from = ED_object_active_context(C);
 	ParticleSystem *psys_from = use_active ? CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data : NULL;
@@ -1132,7 +1168,7 @@ static int copy_particle_systems_exec(bContext *C, wmOperator *op)
 				remove_particle_systems_from_object(ob_to);
 				changed = true;
 			}
-			if (copy_particle_systems_to_object(bmain, scene, ob_from, psys_from, ob_to, space, false))
+			if (copy_particle_systems_to_object(C, scene, ob_from, psys_from, ob_to, space, false))
 				changed = true;
 			else
 				fail++;
@@ -1193,7 +1229,7 @@ static int duplicate_particle_systems_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = ED_object_active_context(C);
 	ParticleSystem *psys = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data;
-	copy_particle_systems_to_object(CTX_data_main(C), scene, ob, psys, ob,
+	copy_particle_systems_to_object(C, scene, ob, psys, ob,
 	                                PAR_COPY_SPACE_OBJECT, duplicate_settings);
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 4b9ce1ca210..130dcba060d 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -54,6 +54,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "LBM_fluidsim.h"
 
 #include "ED_screen.h"
@@ -245,7 +247,7 @@ static void set_channel(float *channel, float time, float *value, int i, int siz
 	}
 }
 
-static void set_vertex_channel(float *channel, float time, struct Scene *scene, struct FluidObject *fobj, int i)
+static void set_vertex_channel(Depsgraph *depsgraph, float *channel, float time, struct Scene *scene, struct FluidObject *fobj, int i)
 {
 	Object *ob = fobj->object;
 	FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
@@ -258,7 +260,7 @@ static void set_vertex_channel(float *channel, float time, struct Scene *scene,
 	if (channel == NULL)
 		return;
 
-	initElbeemMesh(scene, ob, &numVerts, &verts, &numTris, &tris, 1, modifierIndex);
+	initElbeemMesh(depsgraph, scene, ob, &numVerts, &verts, &numTris, &tris, 1, modifierIndex);
 
 	/* don't allow mesh to change number of verts in anim sequence */
 	if (numVerts != fobj->numVerts) {
@@ -330,6 +332,8 @@ static void free_all_fluidobject_channels(ListBase *fobjects)
 static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), FluidsimSettings *domainSettings, FluidAnimChannels *channels, ListBase *fobjects)
 {
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Base *base;
 	int i;
 	int length = channels->length;
@@ -344,7 +348,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
 	channels->DomainTime = MEM_callocN(length * (CHANNEL_FLOAT+1) * sizeof(float), "channel DomainTime");
 
 	/* allocate fluid objects */
-	for (base=scene->base.first; base; base= base->next) {
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
 		Object *ob = base->object;
 		FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
 
@@ -374,7 +378,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
 				float *verts=NULL;
 				int *tris=NULL, modifierIndex = BLI_findindex(&ob->modifiers, (ModifierData *)fluidmd);
 
-				initElbeemMesh(scene, ob, &fobj->numVerts, &verts, &fobj->numTris, &tris, 0, modifierIndex);
+				initElbeemMesh(depsgraph, scene, ob, &fobj->numVerts, &verts, &fobj->numTris, &tris, 0, modifierIndex);
 				fobj->VertexCache = MEM_callocN(length *((fobj->numVerts*CHANNEL_VEC)+1) * sizeof(float), "fluidobject VertexCache");
 
 				MEM_freeN(verts);
@@ -403,7 +407,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
 		/* Modifying the global scene isn't nice, but we can do it in
 		 * this part of the process before a threaded job is created */
 		scene->r.cfra = (int)eval_time;
-		ED_update_for_newframe(CTX_data_main(C), scene, 1);
+		ED_update_for_newframe(CTX_data_main(C), depsgraph);
 
 		/* now scene data should be current according to animation system, so we fill the channels */
 
@@ -462,14 +466,15 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
 			}
 
 			if (fluid_is_animated_mesh(fluidmd->fss)) {
-				set_vertex_channel(fobj->VertexCache, timeAtFrame, scene, fobj, i);
+				set_vertex_channel(depsgraph, fobj->VertexCache, timeAtFrame, scene, fobj, i);
 			}
 		}
 	}
 }
 
-static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
+static void export_fluid_objects(const bContext *C, ListBase *fobjects, Scene *scene, int length)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	FluidObject *fobj;
 
 	for (fobj=fobjects->first; fobj; fobj=fobj->next) {
@@ -492,7 +497,7 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
 		fsmesh.type = fluidmd->fss->type;
 		fsmesh.name = ob->id.name;
 
-		initElbeemMesh(scene, ob, &numVerts, &verts, &numTris, &tris, 0, modifierIndex);
+		initElbeemMesh(depsgraph, scene, ob, &numVerts, &verts, &numTris, &tris, 0, modifierIndex);
 
 		fsmesh.numVertices   = numVerts;
 		fsmesh.numTriangles  = numTris;
@@ -571,14 +576,14 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
 	}
 }
 
-static int fluid_validate_scene(ReportList *reports, Scene *scene, Object *fsDomain)
+static int fluid_validate_scene(ReportList *reports, ViewLayer *view_layer, Object *fsDomain)
 {
 	Base *base;
 	Object *newdomain = NULL;
 	int channelObjCount = 0;
 	int fluidInputCount = 0;
 
-	for (base=scene->base.first; base; base= base->next) {
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
 		Object *ob = base->object;
 		FluidsimModifierData *fluidmdtmp = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
 
@@ -837,7 +842,9 @@ static void fluidsim_delete_until_lastframe(FluidsimSettings *fss, const char *r
 static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, short do_job)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	int i;
 	FluidsimSettings *domainSettings;
 
@@ -884,7 +891,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
 	}
 
 	/* check scene for sane object/modifier settings */
-	if (!fluid_validate_scene(reports, scene, fsDomain)) {
+	if (!fluid_validate_scene(reports, view_layer, fsDomain)) {
 		fluidbake_free_data(channels, fobjects, fsset, fb);
 		return 0;
 	}
@@ -949,7 +956,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
 
 	/* reset to original current frame */
 	scene->r.cfra = origFrame;
-	ED_update_for_newframe(CTX_data_main(C), scene, 1);
+	ED_update_for_newframe(CTX_data_main(C), depsgraph);
 
 	/* ******** init domain object's matrix ******** */
 	copy_m4_m4(domainMat, fsDomain->obmat);
@@ -1036,7 +1043,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
 	elbeemAddDomain(fsset);
 
 	/* ******** export all fluid objects to elbeem ******** */
-	export_fluid_objects(fobjects, scene, channels->length);
+	export_fluid_objects(C, fobjects, scene, channels->length);
 
 	/* custom data for fluid bake job */
 	fb->settings = fsset;
diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h
index f3f3697caaa..e94f582141b 100644
--- a/source/blender/editors/physics/physics_intern.h
+++ b/source/blender/editors/physics/physics_intern.h
@@ -33,11 +33,13 @@
 #ifndef __PHYSICS_INTERN_H__
 #define __PHYSICS_INTERN_H__
 
+struct Depsgraph;
 struct Object;
 struct PTCacheEdit;
 struct ParticleSystem;
 struct PointCache;
 struct Scene;
+struct ViewLayer;
 struct wmOperatorType;
 
 /* particle_edit.c */
@@ -68,10 +70,12 @@ void PARTICLE_OT_edited_clear(struct wmOperatorType *ot);
 
 void PARTICLE_OT_unify_length(struct wmOperatorType *ot);
 
-void PE_create_particle_edit(struct Scene *scene, struct Object *ob, struct PointCache *cache, struct ParticleSystem *psys);
+void PE_create_particle_edit(
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        struct Object *ob, struct PointCache *cache, struct ParticleSystem *psys);
 void recalc_lengths(struct PTCacheEdit *edit);
-void recalc_emitter_field(struct Object *ob, struct ParticleSystem *psys);
-void update_world_cos(struct Object *ob, struct PTCacheEdit *edit);
+void recalc_emitter_field(struct Depsgraph *depsgraph, struct Object *ob, struct ParticleSystem *psys);
+void update_world_cos(struct Depsgraph *depsgraph, struct Object *ob, struct PTCacheEdit *edit);
 
 /* particle_object.c */
 void OBJECT_OT_particle_system_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c
index 7b86cb63f31..ffa73b41bd9 100644
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@ -137,23 +137,6 @@ static void keymap_particle(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0);
 	RNA_boolean_set(kmi->ptr, "unselected", true);
 
-	/* Shift+LMB behavior first, so it has priority over KM_ANY item below. */
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", true);
-	RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-	RNA_boolean_set(kmi->ptr, "use_accurate", true);
-
-	/* Using KM_ANY here to allow holding modifiers before starting to transform. */
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-	RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
 	WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
 
diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c
index dadd086a774..45172774d55 100644
--- a/source/blender/editors/physics/physics_pointcache.c
+++ b/source/blender/editors/physics/physics_pointcache.c
@@ -42,6 +42,7 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
@@ -165,6 +166,8 @@ static PTCacheBaker *ptcache_baker_create(bContext *C, wmOperator *op, bool all)
 
 	baker->main = CTX_data_main(C);
 	baker->scene = CTX_data_scene(C);
+	baker->view_layer = CTX_data_view_layer(C);
+	baker->depsgraph = CTX_data_depsgraph(C);
 	baker->bake = RNA_boolean_get(op->ptr, "bake");
 	baker->render = 0;
 	baker->anim_init = 0;
@@ -174,18 +177,7 @@ static PTCacheBaker *ptcache_baker_create(bContext *C, wmOperator *op, bool all)
 		PointerRNA ptr = CTX_data_pointer_get_type(C, "point_cache", &RNA_PointCache);
 		Object *ob = ptr.id.data;
 		PointCache *cache = ptr.data;
-
-		ListBase pidlist;
-		BKE_ptcache_ids_from_object(&pidlist, ob, baker->scene, MAX_DUPLI_RECUR);
-
-		for (PTCacheID *pid = pidlist.first; pid; pid = pid->next) {
-			if (pid->cache == cache) {
-				baker->pid = *pid;
-				break;
-			}
-		}
-
-		BLI_freelistN(&pidlist);
+		baker->pid = BKE_ptcache_id_find(ob, baker->scene, cache);
 	}
 
 	return baker;
@@ -253,22 +245,23 @@ static void ptcache_bake_cancel(bContext *C, wmOperator *op)
 
 static int ptcache_free_bake_all_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene= CTX_data_scene(C);
-	Base *base;
+	Scene *scene = CTX_data_scene(C);
 	PTCacheID *pid;
 	ListBase pidlist;
 
-	for (base=scene->base.first; base; base= base->next) {
-		BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR);
+	FOREACH_SCENE_OBJECT_BEGIN(scene, ob)
+	{
+		BKE_ptcache_ids_from_object(&pidlist, ob, scene, MAX_DUPLI_RECUR);
 
-		for (pid=pidlist.first; pid; pid=pid->next) {
+		for (pid = pidlist.first; pid; pid = pid->next) {
 			ptcache_free_bake(pid->cache);
 		}
 
 		BLI_freelistN(&pidlist);
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_POINTCACHE, base->object);
+		WM_event_add_notifier(C, NC_OBJECT|ND_POINTCACHE, ob);
 	}
+	FOREACH_SCENE_OBJECT_END;
 
 	WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
 
@@ -387,22 +380,14 @@ static int ptcache_add_new_exec(bContext *C, wmOperator *UNUSED(op))
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "point_cache", &RNA_PointCache);
 	Object *ob= ptr.id.data;
 	PointCache *cache= ptr.data;
-	PTCacheID *pid;
-	ListBase pidlist;
-
-	BKE_ptcache_ids_from_object(&pidlist, ob, scene, MAX_DUPLI_RECUR);
+	PTCacheID pid = BKE_ptcache_id_find(ob, scene, cache);
 
-	for (pid=pidlist.first; pid; pid=pid->next) {
-		if (pid->cache == cache) {
-			PointCache *cache_new = BKE_ptcache_add(pid->ptcaches);
-			cache_new->step = pid->default_step;
-			*(pid->cache_ptr) = cache_new;
-			break;
-		}
+	if (pid.cache) {
+		PointCache *cache_new = BKE_ptcache_add(pid.ptcaches);
+		cache_new->step = pid.default_step;
+		*(pid.cache_ptr) = cache_new;
 	}
 
-	BLI_freelistN(&pidlist);
-
 	WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
 	WM_event_add_notifier(C, NC_OBJECT|ND_POINTCACHE, ob);
 
@@ -414,26 +399,15 @@ static int ptcache_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= ptr.id.data;
 	PointCache *cache= ptr.data;
-	PTCacheID *pid;
-	ListBase pidlist;
-
-	BKE_ptcache_ids_from_object(&pidlist, ob, scene, MAX_DUPLI_RECUR);
+	PTCacheID pid = BKE_ptcache_id_find(ob, scene, cache);
 
-	for (pid=pidlist.first; pid; pid=pid->next) {
-		if (pid->cache == cache) {
-			if (pid->ptcaches->first == pid->ptcaches->last)
-				continue; /* don't delete last cache */
-
-			BLI_remlink(pid->ptcaches, pid->cache);
-			BKE_ptcache_free(pid->cache);
-			*(pid->cache_ptr) = pid->ptcaches->first;
-
-			break;
-		}
+	/* don't delete last cache */
+	if (pid.cache && pid.ptcaches->first != pid.ptcaches->last) {
+		BLI_remlink(pid.ptcaches, pid.cache);
+		BKE_ptcache_free(pid.cache);
+		*(pid.cache_ptr) = pid.ptcaches->first;
 	}
 
-	BLI_freelistN(&pidlist);
-
 	WM_event_add_notifier(C, NC_OBJECT|ND_POINTCACHE, ob);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/physics/rigidbody_constraint.c b/source/blender/editors/physics/rigidbody_constraint.c
index 412f9acf718..f62b72679d0 100644
--- a/source/blender/editors/physics/rigidbody_constraint.c
+++ b/source/blender/editors/physics/rigidbody_constraint.c
@@ -37,13 +37,15 @@
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
-#include "BKE_group.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -81,17 +83,17 @@ bool ED_rigidbody_constraint_add(Main *bmain, Scene *scene, Object *ob, int type
 	}
 	/* create constraint group if it doesn't already exits */
 	if (rbw->constraints == NULL) {
-		rbw->constraints = BKE_group_add(bmain, "RigidBodyConstraints");
+		rbw->constraints = BKE_collection_add(bmain, NULL, "RigidBodyConstraints");
 	}
 	/* make rigidbody constraint settings */
 	ob->rigidbody_constraint = BKE_rigidbody_create_constraint(scene, ob, type);
 	ob->rigidbody_constraint->flag |= RBC_FLAG_NEEDS_VALIDATE;
 
 	/* add constraint to rigid body constraint group */
-	BKE_group_object_add(rbw->constraints, ob, scene, NULL);
+	BKE_collection_object_add(bmain, rbw->constraints, ob);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 	return true;
 }
 
@@ -101,10 +103,10 @@ void ED_rigidbody_constraint_remove(Main *bmain, Scene *scene, Object *ob)
 
 	BKE_rigidbody_remove_constraint(scene, ob);
 	if (rbw)
-		BKE_group_object_unlink(rbw->constraints, ob, scene, NULL);
+		BKE_collection_object_remove(bmain, rbw->constraints, ob, false);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 /* ********************************************** */
@@ -116,8 +118,9 @@ static int rigidbody_con_add_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene);
-	Object *ob = (scene) ? OBACT : NULL;
+	Object *ob = OBACT(view_layer);
 	int type = RNA_enum_get(op->ptr, "type");
 	bool changed;
 
@@ -165,11 +168,8 @@ static int rigidbody_con_remove_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = (scene) ? OBACT : NULL;
-
-	/* sanity checks */
-	if (scene == NULL)
-		return OPERATOR_CANCELLED;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
 
 	/* apply to active object */
 	if (ELEM(NULL, ob, ob->rigidbody_constraint)) {
diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c
index b7083c29721..99976898ac1 100644
--- a/source/blender/editors/physics/rigidbody_object.c
+++ b/source/blender/editors/physics/rigidbody_object.c
@@ -42,13 +42,15 @@
 
 #include "BLT_translation.h"
 
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
-#include "BKE_group.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -107,7 +109,7 @@ bool ED_rigidbody_object_add(Main *bmain, Scene *scene, Object *ob, int type, Re
 		scene->rigidbody_world = rbw;
 	}
 	if (rbw->group == NULL) {
-		rbw->group = BKE_group_add(bmain, "RigidBodyWorld");
+		rbw->group = BKE_collection_add(bmain, NULL, "RigidBodyWorld");
 	}
 
 	/* make rigidbody object settings */
@@ -118,10 +120,10 @@ bool ED_rigidbody_object_add(Main *bmain, Scene *scene, Object *ob, int type, Re
 	ob->rigidbody_object->flag |= RBO_FLAG_NEEDS_VALIDATE;
 
 	/* add object to rigid body group */
-	BKE_group_object_add(rbw->group, ob, scene, NULL);
+	BKE_collection_object_add(bmain, rbw->group, ob);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 	return true;
 }
@@ -132,10 +134,10 @@ void ED_rigidbody_object_remove(Main *bmain, Scene *scene, Object *ob)
 
 	BKE_rigidbody_remove_object(scene, ob);
 	if (rbw)
-		BKE_group_object_unlink(rbw->group, ob, scene, NULL);
+		BKE_collection_object_remove(bmain, rbw->group, ob, false);
 
-	DAG_relations_tag_update(bmain);
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	DEG_relations_tag_update(bmain);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 /* ********************************************** */
@@ -344,7 +346,7 @@ static int rigidbody_objects_shape_change_exec(bContext *C, wmOperator *op)
 			RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
 			RNA_enum_set(&ptr, "collision_shape", shape);
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 			changed = true;
 		}
@@ -526,7 +528,7 @@ static int rigidbody_objects_calc_mass_exec(bContext *C, wmOperator *op)
 			RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
 			RNA_float_set(&ptr, "mass", mass);
 
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 			changed = true;
 		}
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index ec8bf3e955d..ed2e9747d1c 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -24,6 +24,8 @@ set(INC
 	../../blenlib
 	../../blenloader
 	../../blentranslation
+	../../depsgraph
+	../../draw
 	../../gpu
 	../../imbuf
 	../../bmesh
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index 2ffa6cadb3a..d7b92c00ed4 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -53,8 +53,8 @@ void WORLD_OT_new(struct wmOperatorType *ot);
 void MATERIAL_OT_copy(struct wmOperatorType *ot);
 void MATERIAL_OT_paste(struct wmOperatorType *ot);
 
-void SCENE_OT_render_layer_add(struct wmOperatorType *ot);
-void SCENE_OT_render_layer_remove(struct wmOperatorType *ot);
+void SCENE_OT_view_layer_add(struct wmOperatorType *ot);
+void SCENE_OT_view_layer_remove(struct wmOperatorType *ot);
 
 void SCENE_OT_render_view_add(struct wmOperatorType *ot);
 void SCENE_OT_render_view_remove(struct wmOperatorType *ot);
@@ -83,15 +83,10 @@ void SCENE_OT_freestyle_stroke_material_create(struct wmOperatorType *ot);
 void TEXTURE_OT_slot_copy(struct wmOperatorType *ot);
 void TEXTURE_OT_slot_paste(struct wmOperatorType *ot);
 void TEXTURE_OT_slot_move(struct wmOperatorType *ot);
-void TEXTURE_OT_envmap_save(struct wmOperatorType *ot);
-void TEXTURE_OT_envmap_clear(struct wmOperatorType *ot);
-void TEXTURE_OT_envmap_clear_all(struct wmOperatorType *ot);
 
 /* render_internal.c */
 void RENDER_OT_render(struct wmOperatorType *ot);
 void RENDER_OT_shutter_curve_preset(struct wmOperatorType *ot);
-void render_view3d_update(struct RenderEngine *engine, const struct bContext *C);
-void render_view3d_draw(struct RenderEngine *engine, const struct bContext *C);
 
 /* render_view.c */
 struct ScrArea *render_view_open(struct bContext *C, int mx, int my, struct ReportList *reports);
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 8a15179a46e..2d65b361f99 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -54,9 +54,9 @@
 #include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_colortools.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
@@ -66,6 +66,9 @@
 #include "BKE_screen.h"
 #include "BKE_scene.h"
 #include "BKE_undo_system.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -83,6 +86,7 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
 
+#include "GPU_shader.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
@@ -100,9 +104,13 @@ static int render_break(void *rjv);
 typedef struct RenderJob {
 	Main *main;
 	Scene *scene;
+	ViewLayer *single_layer;
 	Scene *current_scene;
+	/* TODO(sergey): Should not be needed once engine will have own
+	 * depsgraph and copy-on-write will be implemented.
+	 */
+	Depsgraph *depsgraph;
 	Render *re;
-	SceneRenderLayer *srl;
 	struct Object *camera_override;
 	int lay_override;
 	bool v3d_override;
@@ -255,7 +263,7 @@ static void image_buffer_rect_update(RenderJob *rj, RenderResult *rr, ImBuf *ibu
 /* set callbacks, exported to sequence render too.
  * Only call in foreground (UI) renders. */
 
-static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **scene, SceneRenderLayer **srl)
+static void screen_render_single_layer_set(wmOperator *op, Main *mainp, WorkSpace *workspace, Scene **scene, ViewLayer **single_layer)
 {
 	/* single layer re-render */
 	if (RNA_struct_property_is_set(op->ptr, "scene")) {
@@ -275,14 +283,17 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s
 	}
 
 	if (RNA_struct_property_is_set(op->ptr, "layer")) {
-		SceneRenderLayer *rl;
+		ViewLayer *rl;
 		char rl_name[RE_MAXNAME];
 
 		RNA_string_get(op->ptr, "layer", rl_name);
-		rl = (SceneRenderLayer *)BLI_findstring(&(*scene)->r.layers, rl_name, offsetof(SceneRenderLayer, name));
+		rl = (ViewLayer *)BLI_findstring(&(*scene)->view_layers, rl_name, offsetof(ViewLayer, name));
 
 		if (rl)
-			*srl = rl;
+			*single_layer = rl;
+	}
+	else if (((*scene)->r.scemode & R_SINGLE_LAYER) && workspace) {
+		*single_layer = BKE_view_layer_from_workspace_get(*scene, workspace);
 	}
 }
 
@@ -290,18 +301,25 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s
 static int screen_render_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = NULL;
+	RenderEngineType *re_type = RE_engines_find(scene->r.engine);
+	ViewLayer *single_layer = NULL;
 	Render *re;
 	Image *ima;
 	View3D *v3d = CTX_wm_view3d(C);
 	Main *mainp = CTX_data_main(C);
+	WorkSpace *workspace = CTX_wm_workspace(C);
 	unsigned int lay_override;
 	const bool is_animation = RNA_boolean_get(op->ptr, "animation");
 	const bool is_write_still = RNA_boolean_get(op->ptr, "write_still");
 	struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
 
+	/* Cannot do render if there is not this function. */
+	if (re_type->render == NULL) {
+		return OPERATOR_CANCELLED;
+	}
+
 	/* custom scene and single layer re-render */
-	screen_render_scene_layer_set(op, mainp, &scene, &srl);
+	screen_render_single_layer_set(op, mainp, workspace, &scene, &single_layer);
 
 	if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
 		BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
@@ -330,13 +348,13 @@ static int screen_render_exec(bContext *C, wmOperator *op)
 	if (is_animation)
 		RE_BlenderAnim(re, mainp, scene, camera_override, lay_override, scene->r.sfra, scene->r.efra, scene->r.frame_step);
 	else
-		RE_BlenderFrame(re, mainp, scene, srl, camera_override, lay_override, scene->r.cfra, is_write_still);
+		RE_BlenderFrame(re, mainp, scene, single_layer, camera_override, lay_override, scene->r.cfra, is_write_still);
 	BLI_threaded_malloc_end();
 
 	RE_SetReports(re, NULL);
 
 	// no redraw needed, we leave state as we entered it
-	ED_update_for_newframe(mainp, scene, 1);
+	ED_update_for_newframe(mainp, CTX_data_depsgraph(C));
 
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
 
@@ -492,8 +510,9 @@ static void render_image_update_pass_and_layer(RenderJob *rj, RenderResult *rr,
 	for (wm = rj->main->wm.first; wm && matched_sa == NULL; wm = wm->id.next) { /* only 1 wm */
 		wmWindow *win;
 		for (win = wm->windows.first; win && matched_sa == NULL; win = win->next) {
-			ScrArea *sa;
-			for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+			const bScreen *screen = WM_window_get_active_screen(win);
+
+			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				if (sa->spacetype == SPACE_IMAGE) {
 					SpaceImage *sima = sa->spacedata.first;
 					// sa->spacedata might be empty when toggling fullscreen mode.
@@ -604,7 +623,7 @@ static void render_startjob(void *rjv, short *stop, short *do_update, float *pro
 	if (rj->anim)
 		RE_BlenderAnim(rj->re, rj->main, rj->scene, rj->camera_override, rj->lay_override, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step);
 	else
-		RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->srl, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still);
+		RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->single_layer, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still);
 
 	RE_SetReports(rj->re, NULL);
 }
@@ -617,8 +636,9 @@ static void render_image_restore_layer(RenderJob *rj)
 	for (wm = rj->main->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
 		wmWindow *win;
 		for (win = wm->windows.first; win; win = win->next) {
-			ScrArea *sa;
-			for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+			const bScreen *screen = WM_window_get_active_screen(win);
+
+			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				if (sa == rj->sa) {
 					if (sa->spacetype == SPACE_IMAGE) {
 						SpaceImage *sima = sa->spacedata.first;
@@ -660,7 +680,7 @@ static void render_endjob(void *rjv)
 	if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
 		/* possible this fails of loading new file while rendering */
 		if (G.main->wm.first) {
-			ED_update_for_newframe(G.main, rj->scene, 1);
+			ED_update_for_newframe(G.main, rj->depsgraph);
 		}
 	}
 
@@ -670,7 +690,7 @@ static void render_endjob(void *rjv)
 	/* potentially set by caller */
 	rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE;
 
-	if (rj->srl) {
+	if (rj->single_layer) {
 		nodeUpdateID(rj->scene->nodetree, &rj->scene->id);
 		WM_main_add_notifier(NC_NODE | NA_EDITED, rj->scene);
 	}
@@ -700,7 +720,7 @@ static void render_endjob(void *rjv)
 	 * engine API, so lets use simple and robust way for now
 	 *                                          - sergey -
 	 */
-	if (rj->scene->r.layers.first != rj->scene->r.layers.last ||
+	if (rj->scene->view_layers.first != rj->scene->view_layers.last ||
 	    rj->image_outdated)
 	{
 		void *lock;
@@ -733,7 +753,7 @@ static void render_endjob(void *rjv)
 			scene->lay_updated = 0;
 		}
 
-		DAG_on_visible_update(G.main, false);
+		DEG_on_visible_update(G.main, false);
 	}
 }
 
@@ -797,33 +817,46 @@ static void screen_render_cancel(bContext *C, wmOperator *op)
 	WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_RENDER);
 }
 
-static void clean_viewport_memory(Main *bmain, Scene *scene, int renderlay)
+static void clean_viewport_memory_base(Base *base)
 {
-	Object *object;
-	Scene *sce_iter;
-	Base *base;
+	if ((base->flag & BASE_VISIBLED) == 0) {
+		return;
+	}
+
+	Object *object = base->object;
 
-	for (object = bmain->object.first; object; object = object->id.next) {
-		object->id.tag |= LIB_TAG_DOIT;
+	if (object->id.tag & LIB_TAG_DOIT) {
+		return;
 	}
 
-	for (SETLOOPER(scene, sce_iter, base)) {
-		if ((base->lay & renderlay) == 0) {
-			continue;
-		}
-		if (RE_allow_render_generic_object(base->object)) {
-			base->object->id.tag &= ~LIB_TAG_DOIT;
-		}
+	object->id.tag &= ~LIB_TAG_DOIT;
+	if (RE_allow_render_generic_object(object)) {
+		BKE_object_free_derived_caches(object);
 	}
+}
+
+static void clean_viewport_memory(Main *bmain, Scene *scene)
+{
+	Scene *sce_iter;
+	Base *base;
 
-	for (SETLOOPER(scene, sce_iter, base)) {
-		object = base->object;
-		if ((object->id.tag & LIB_TAG_DOIT) == 0) {
-			continue;
+	/* Tag all the available objects. */
+	BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true);
+
+	/* Go over all the visible objects. */
+	for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) {
+		for (wmWindow *win = wm->windows.first; win; win = win->next) {
+			WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
+			ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
+
+			for (base = view_layer->object_bases.first; base; base = base->next) {
+				clean_viewport_memory_base(base);
+			}
 		}
-		object->id.tag &= ~LIB_TAG_DOIT;
+	}
 
-		BKE_object_free_derived_caches(object);
+	for (SETLOOPER_SET_ONLY(scene, sce_iter, base)) {
+		clean_viewport_memory_base(base);
 	}
 }
 
@@ -831,9 +864,10 @@ static void clean_viewport_memory(Main *bmain, Scene *scene, int renderlay)
 static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	/* new render clears all callbacks */
-	Main *mainp;
+	Main *bmain = CTX_data_main(C);
+	ViewLayer *single_layer = NULL;
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = NULL;
+	RenderEngineType *re_type = RE_engines_find(scene->r.engine);
 	Render *re;
 	wmJob *wm_job;
 	RenderJob *rj;
@@ -843,18 +877,24 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	const bool is_write_still = RNA_boolean_get(op->ptr, "write_still");
 	const bool use_viewport = RNA_boolean_get(op->ptr, "use_viewport");
 	View3D *v3d = use_viewport ? CTX_wm_view3d(C) : NULL;
+	WorkSpace *workspace = CTX_wm_workspace(C);
 	struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
 	const char *name;
 	ScrArea *sa;
 
+	/* Cannot do render if there is not this function. */
+	if (re_type->render == NULL) {
+		return OPERATOR_CANCELLED;
+	}
+
+	/* custom scene and single layer re-render */
+	screen_render_single_layer_set(op, bmain, workspace, &scene, &single_layer);
+
 	/* only one render job at a time */
 	if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER))
 		return OPERATOR_CANCELLED;
 
-	if (RE_force_single_renderlayer(scene))
-		WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, NULL);
-
-	if (!RE_is_rendering_allowed(scene, camera_override, op->reports)) {
+	if (!RE_is_rendering_allowed(scene, single_layer, camera_override, op->reports)) {
 		return OPERATOR_CANCELLED;
 	}
 
@@ -866,15 +906,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	/* stop all running jobs, except screen one. currently previews frustrate Render */
 	WM_jobs_kill_all_except(CTX_wm_manager(C), CTX_wm_screen(C));
 
-	/* get main */
-	if (G.debug_value == 101) {
-		/* thread-safety experiment, copy main from the undo buffer */
-		struct MemFile *memfile = ED_undosys_stack_memfile_get_active(CTX_wm_manager(C)->undo_stack);
-		mainp = BLO_memfile_main_get(memfile, CTX_data_main(C), &scene);
-	}
-	else
-		mainp = CTX_data_main(C);
-
 	/* cancel animation playback */
 	if (ED_screen_animation_playing(CTX_wm_manager(C)))
 		ED_screen_animation_play(C, 0, 0);
@@ -900,18 +931,17 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 
 	jobflag = WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS;
 
-	/* custom scene and single layer re-render */
-	screen_render_scene_layer_set(op, mainp, &scene, &srl);
-
 	if (RNA_struct_property_is_set(op->ptr, "layer"))
 		jobflag |= WM_JOB_SUSPEND;
 
 	/* job custom data */
 	rj = MEM_callocN(sizeof(RenderJob), "render job");
-	rj->main = mainp;
+	rj->main = bmain;
 	rj->scene = scene;
 	rj->current_scene = rj->scene;
-	rj->srl = srl;
+	rj->single_layer = single_layer;
+	/* TODO(sergey): Render engine should be using own depsgraph. */
+	rj->depsgraph = CTX_data_depsgraph(C);
 	rj->camera_override = camera_override;
 	rj->lay_override = 0;
 	rj->anim = is_animation;
@@ -946,8 +976,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 
 	/* Lock the user interface depending on render settings. */
 	if (scene->r.use_lock_interface) {
-		int renderlay = rj->lay_override ? rj->lay_override : scene->lay;
-
 		WM_set_locked_interface(CTX_wm_manager(C), true);
 
 		/* Set flag interface need to be unlocked.
@@ -961,7 +989,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 		rj->interface_locked = true;
 
 		/* Clean memory used by viewport? */
-		clean_viewport_memory(rj->main, scene, renderlay);
+		clean_viewport_memory(rj->main, scene);
 	}
 
 	/* setup job */
@@ -1043,615 +1071,6 @@ void RENDER_OT_render(wmOperatorType *ot)
 }
 
 
-/* ************** preview for 3d viewport ***************** */
-
-#define PR_UPDATE_VIEW				1
-#define PR_UPDATE_RENDERSIZE		2
-#define PR_UPDATE_MATERIAL			4
-#define PR_UPDATE_DATABASE			8
-
-typedef struct RenderPreview {
-	/* from wmJob */
-	void *owner;
-	short *stop, *do_update;
-	wmJob *job;
-
-	Scene *scene;
-	ScrArea *sa;
-	ARegion *ar;
-	View3D *v3d;
-	RegionView3D *rv3d;
-	Main *bmain;
-	RenderEngine *engine;
-
-	float viewmat[4][4];
-
-	int start_resolution_divider;
-	int resolution_divider;
-	bool has_freestyle;
-} RenderPreview;
-
-static int render_view3d_disprect(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, rcti *disprect)
-{
-	/* copied code from view3d_draw.c */
-	rctf viewborder;
-	int draw_border;
-
-	if (rv3d->persp == RV3D_CAMOB)
-		draw_border = (scene->r.mode & R_BORDER) != 0;
-	else
-		draw_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0;
-
-	if (draw_border) {
-		if (rv3d->persp == RV3D_CAMOB) {
-			ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, false);
-
-			disprect->xmin = viewborder.xmin + scene->r.border.xmin * BLI_rctf_size_x(&viewborder);
-			disprect->ymin = viewborder.ymin + scene->r.border.ymin * BLI_rctf_size_y(&viewborder);
-			disprect->xmax = viewborder.xmin + scene->r.border.xmax * BLI_rctf_size_x(&viewborder);
-			disprect->ymax = viewborder.ymin + scene->r.border.ymax * BLI_rctf_size_y(&viewborder);
-		}
-		else {
-			disprect->xmin = v3d->render_border.xmin * ar->winx;
-			disprect->xmax = v3d->render_border.xmax * ar->winx;
-			disprect->ymin = v3d->render_border.ymin * ar->winy;
-			disprect->ymax = v3d->render_border.ymax * ar->winy;
-		}
-
-		return 1;
-	}
-
-	BLI_rcti_init(disprect, 0, 0, 0, 0);
-	return 0;
-}
-
-/* returns true if OK  */
-static bool render_view3d_get_rects(ARegion *ar, View3D *v3d, RegionView3D *rv3d, rctf *viewplane, RenderEngine *engine,
-                                    float *r_clipsta, float *r_clipend, float *r_pixsize, bool *r_ortho)
-{
-
-	if (ar->winx < 4 || ar->winy < 4) return false;
-
-	*r_ortho = ED_view3d_viewplane_get(v3d, rv3d, ar->winx, ar->winy, viewplane, r_clipsta, r_clipend, r_pixsize);
-
-	engine->resolution_x = ar->winx;
-	engine->resolution_y = ar->winy;
-
-	return true;
-}
-
-static bool render_view3d_is_valid(RenderPreview *rp)
-{
-	return (rp->rv3d->render_engine != NULL);
-}
-
-/* called by renderer, checks job value */
-static int render_view3d_break(void *rpv)
-{
-	RenderPreview *rp = rpv;
-
-	if (G.is_break)
-		return 1;
-
-	/* during render, rv3d->engine can get freed */
-	if (render_view3d_is_valid(rp) == false) {
-		*rp->stop = 1;
-	}
-
-	return *(rp->stop);
-}
-
-static void render_view3d_display_update(void *rpv, RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect))
-{
-	RenderPreview *rp = rpv;
-
-	*(rp->do_update) = true;
-}
-
-static void render_view3d_renderinfo_cb(void *rjp, RenderStats *rs)
-{
-	RenderPreview *rp = rjp;
-
-	/* during render, rv3d->engine can get freed */
-	if (rp->rv3d->render_engine == NULL) {
-		*rp->stop = 1;
-	}
-	else {
-		make_renderinfo_string(rs, rp->scene, false, NULL, rp->engine->text);
-
-		/* make jobs timer to send notifier */
-		*(rp->do_update) = true;
-	}
-}
-
-BLI_INLINE void rcti_scale_coords(rcti *scaled_rect, const rcti *rect,
-                                  const float scale)
-{
-	scaled_rect->xmin = rect->xmin * scale;
-	scaled_rect->ymin = rect->ymin * scale;
-	scaled_rect->xmax = rect->xmax * scale;
-	scaled_rect->ymax = rect->ymax * scale;
-}
-
-static void render_update_resolution(Render *re, const RenderPreview *rp,
-                                     bool use_border, const rcti *clip_rect)
-{
-	int winx = rp->ar->winx / rp->resolution_divider;
-	int winy = rp->ar->winy / rp->resolution_divider;
-	if (use_border) {
-		rcti scaled_cliprct;
-		rcti_scale_coords(&scaled_cliprct, clip_rect,
-		                  1.0f / rp->resolution_divider);
-		RE_ChangeResolution(re, winx, winy, &scaled_cliprct);
-	}
-	else {
-		RE_ChangeResolution(re, winx, winy, NULL);
-	}
-
-	if (rp->has_freestyle) {
-		if (rp->resolution_divider == BKE_render_preview_pixel_size(&rp->scene->r)) {
-			RE_ChangeModeFlag(re, R_EDGE_FRS, false);
-		}
-		else {
-			RE_ChangeModeFlag(re, R_EDGE_FRS, true);
-		}
-	}
-}
-
-static void render_view3d_startjob(void *customdata, short *stop, short *do_update, float *UNUSED(progress))
-{
-	RenderPreview *rp = customdata;
-	Render *re;
-	RenderStats *rstats;
-	rctf viewplane;
-	rcti cliprct;
-	float clipsta, clipend, pixsize;
-	bool orth, restore = 0;
-	char name[32];
-	int update_flag;
-	bool use_border;
-	int ob_inst_update_flag = 0;
-
-	update_flag = rp->engine->job_update_flag;
-	rp->engine->job_update_flag = 0;
-
-	//printf("ma %d res %d view %d db %d\n", update_flag & PR_UPDATE_MATERIAL, update_flag & PR_UPDATE_RENDERSIZE, update_flag & PR_UPDATE_VIEW, update_flag & PR_UPDATE_DATABASE);
-
-	G.is_break = false;
-
-	if (false == render_view3d_get_rects(rp->ar, rp->v3d, rp->rv3d, &viewplane, rp->engine, &clipsta, &clipend, &pixsize, &orth))
-		return;
-
-	rp->stop = stop;
-	rp->do_update = do_update;
-
-	// printf("Enter previewrender\n");
-
-	/* ok, are we rendering all over? */
-	sprintf(name, "View3dPreview %p", (void *)rp->ar);
-	re = rp->engine->re = RE_GetRender(name);
-
-	/* set this always, rp is different for each job */
-	RE_test_break_cb(re, rp, render_view3d_break);
-	RE_display_update_cb(re, rp, render_view3d_display_update);
-	RE_stats_draw_cb(re, rp, render_view3d_renderinfo_cb);
-
-	rstats = RE_GetStats(re);
-
-	if (update_flag & PR_UPDATE_VIEW) {
-		Object *object;
-		rp->resolution_divider = rp->start_resolution_divider;
-
-		/* Same as database_init_objects(), loop over all objects.
-		 * We might consider de-duplicating the code between this two cases.
-		 */
-		for (object = rp->bmain->object.first; object; object = object->id.next) {
-			float mat[4][4];
-			mul_m4_m4m4(mat, rp->viewmat, object->obmat);
-			invert_m4_m4(object->imat_ren, mat);
-		}
-	}
-
-	use_border = render_view3d_disprect(rp->scene, rp->ar, rp->v3d,
-	                                    rp->rv3d, &cliprct);
-
-	if ((update_flag & (PR_UPDATE_RENDERSIZE | PR_UPDATE_DATABASE | PR_UPDATE_VIEW)) || rstats->convertdone == 0) {
-		RenderData rdata;
-
-		/* no osa, blur, seq, layers, savebuffer etc for preview render */
-		rdata = rp->scene->r;
-		rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);
-		rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE | R_EXR_TILE_FILE | R_FULL_SAMPLE);
-		rdata.scemode |= R_VIEWPORT_PREVIEW;
-
-		/* we do use layers, but only active */
-		rdata.scemode |= R_SINGLE_LAYER;
-
-		/* initalize always */
-		if (use_border) {
-			rdata.mode |= R_BORDER;
-			RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, &cliprct);
-		}
-		else
-			RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, NULL);
-	}
-
-	if (orth)
-		RE_SetOrtho(re, &viewplane, clipsta, clipend);
-	else
-		RE_SetWindow(re, &viewplane, clipsta, clipend);
-
-	RE_SetPixelSize(re, pixsize);
-
-	if ((update_flag & PR_UPDATE_DATABASE) || rstats->convertdone == 0) {
-		unsigned int lay = rp->scene->lay;
-
-		/* allow localview render for objects with lights in normal layers */
-		if (rp->v3d->lay & 0xFF000000)
-			lay |= rp->v3d->lay;
-		else lay = rp->v3d->lay;
-
-		RE_SetView(re, rp->viewmat);
-
-		/* copying blender data while main thread is locked, to avoid crashes */
-		WM_job_main_thread_lock_acquire(rp->job);
-		RE_Database_Free(re);
-		RE_Database_FromScene(re, rp->bmain, rp->scene, lay, 0);		// 0= dont use camera view
-		WM_job_main_thread_lock_release(rp->job);
-
-		/* do preprocessing like building raytree, shadows, volumes, SSS */
-		RE_Database_Preprocess(re);
-
-		/* conversion not completed, need to do it again */
-		if (!rstats->convertdone) {
-			if (render_view3d_is_valid(rp)) {
-				rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
-			}
-		}
-
-		// printf("dbase update\n");
-	}
-	else {
-		// printf("dbase rotate\n");
-		RE_DataBase_IncrementalView(re, rp->viewmat, 0);
-		restore = 1;
-	}
-
-	RE_DataBase_ApplyWindow(re);
-
-	/* OK, can we enter render code? */
-	if (rstats->convertdone) {
-		bool first_time = true;
-
-		if (update_flag & PR_UPDATE_VIEW) {
-			ob_inst_update_flag |= RE_OBJECT_INSTANCES_UPDATE_VIEW;
-		}
-
-		RE_updateRenderInstances(re, ob_inst_update_flag);
-
-		for (;;) {
-			int pixel_size = BKE_render_preview_pixel_size(&rp->scene->r);
-			if (first_time == false) {
-				if (restore)
-					RE_DataBase_IncrementalView(re, rp->viewmat, 1);
-
-				rp->resolution_divider = MAX2(rp->resolution_divider / 2, pixel_size);
-				*do_update = 1;
-
-				render_update_resolution(re, rp, use_border, &cliprct);
-
-				RE_DataBase_IncrementalView(re, rp->viewmat, 0);
-				RE_DataBase_ApplyWindow(re);
-				restore = 1;
-			}
-			else {
-				render_update_resolution(re, rp, use_border, &cliprct);
-			}
-
-			RE_TileProcessor(re);
-
-			first_time = false;
-
-			if (*stop || rp->resolution_divider == pixel_size) {
-				break;
-			}
-		}
-
-		/* always rotate back */
-		if (restore)
-			RE_DataBase_IncrementalView(re, rp->viewmat, 1);
-	}
-}
-
-static void render_view3d_free(void *customdata)
-{
-	RenderPreview *rp = customdata;
-
-	MEM_freeN(rp);
-}
-
-static bool render_view3d_flag_changed(RenderEngine *engine, const bContext *C)
-{
-	Main *bmain = CTX_data_main(C);
-	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	View3D *v3d = CTX_wm_view3d(C);
-	ARegion *ar = CTX_wm_region(C);
-	Scene *scene = CTX_data_scene(C);
-	Render *re;
-	rctf viewplane;
-	rcti disprect;
-	float clipsta, clipend;
-	bool orth;
-	int job_update_flag = 0;
-	char name[32];
-
-	/* ensure render engine exists */
-	re = engine->re;
-
-	if (!re) {
-		sprintf(name, "View3dPreview %p", (void *)ar);
-		re = engine->re = RE_GetRender(name);
-		if (!re)
-			re = engine->re = RE_NewRender(name);
-
-		engine->update_flag |= RE_ENGINE_UPDATE_DATABASE;
-	}
-
-	/* check update_flag */
-	if (engine->update_flag & RE_ENGINE_UPDATE_MA)
-		job_update_flag |= PR_UPDATE_MATERIAL;
-
-	if (engine->update_flag & RE_ENGINE_UPDATE_OTHER)
-		job_update_flag |= PR_UPDATE_MATERIAL;
-
-	if (engine->update_flag & RE_ENGINE_UPDATE_DATABASE) {
-		job_update_flag |= PR_UPDATE_DATABASE;
-
-		/* load editmesh */
-		if (scene->obedit)
-			ED_object_editmode_load(bmain, scene->obedit);
-	}
-
-	engine->update_flag = 0;
-
-	/* check if viewport changed */
-	if (engine->last_winx != ar->winx || engine->last_winy != ar->winy) {
-		engine->last_winx = ar->winx;
-		engine->last_winy = ar->winy;
-		job_update_flag |= PR_UPDATE_RENDERSIZE;
-	}
-
-	if (compare_m4m4(engine->last_viewmat, rv3d->viewmat, 0.00001f) == 0) {
-		copy_m4_m4(engine->last_viewmat, rv3d->viewmat);
-		job_update_flag |= PR_UPDATE_VIEW;
-	}
-
-	render_view3d_get_rects(ar, v3d, rv3d, &viewplane, engine, &clipsta, &clipend, NULL, &orth);
-
-	if (BLI_rctf_compare(&viewplane, &engine->last_viewplane, 0.00001f) == 0) {
-		engine->last_viewplane = viewplane;
-		job_update_flag |= PR_UPDATE_VIEW;
-	}
-
-	render_view3d_disprect(scene, ar, v3d, rv3d, &disprect);
-	if (BLI_rcti_compare(&disprect, &engine->last_disprect) == 0) {
-		engine->last_disprect = disprect;
-		job_update_flag |= PR_UPDATE_RENDERSIZE;
-	}
-
-	/* any changes? go ahead and rerender */
-	if (job_update_flag) {
-		engine->job_update_flag |= job_update_flag;
-		return true;
-	}
-
-	return false;
-}
-
-static void render_view3d_do(RenderEngine *engine, const bContext *C)
-{
-	wmJob *wm_job;
-	RenderPreview *rp;
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar = CTX_wm_region(C);
-	int width = ar->winx, height = ar->winy;
-	int divider = BKE_render_preview_pixel_size(&scene->r);
-	int resolution_threshold = scene->r.preview_start_resolution *
-	                           scene->r.preview_start_resolution;
-
-	if (CTX_wm_window(C) == NULL)
-		return;
-	if (!render_view3d_flag_changed(engine, C))
-		return;
-
-	wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), CTX_wm_region(C), "Render Preview",
-	                     WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW);
-	rp = MEM_callocN(sizeof(RenderPreview), "render preview");
-	rp->job = wm_job;
-
-	while (width * height > resolution_threshold) {
-		width = max_ii(1, width / 2);
-		height = max_ii(1, height / 2);
-		divider *= 2;
-	}
-
-	/* customdata for preview thread */
-	rp->scene = scene;
-	rp->engine = engine;
-	rp->sa = CTX_wm_area(C);
-	rp->ar = CTX_wm_region(C);
-	rp->v3d = rp->sa->spacedata.first;
-	rp->rv3d = CTX_wm_region_view3d(C);
-	rp->bmain = CTX_data_main(C);
-	rp->resolution_divider = divider;
-	rp->start_resolution_divider = divider;
-	rp->has_freestyle = (scene->r.mode & R_EDGE_FRS) != 0;
-	copy_m4_m4(rp->viewmat, rp->rv3d->viewmat);
-
-	/* clear info text */
-	engine->text[0] = '\0';
-
-	/* setup job */
-	WM_jobs_customdata_set(wm_job, rp, render_view3d_free);
-	WM_jobs_timer(wm_job, 0.1, NC_SPACE | ND_SPACE_VIEW3D, NC_SPACE | ND_SPACE_VIEW3D);
-	WM_jobs_callbacks(wm_job, render_view3d_startjob, NULL, NULL, NULL);
-
-	WM_jobs_start(CTX_wm_manager(C), wm_job);
-
-	engine->flag &= ~RE_ENGINE_DO_UPDATE;
-}
-
-/* callback for render engine, on changes */
-void render_view3d_update(RenderEngine *engine, const bContext *C)
-{
-	/* this shouldn't be needed and causes too many database rebuilds, but we
-	 * aren't actually tracking updates for all relevant datablocks so this is
-	 * a catch-all for updates */
-	engine->update_flag |= RE_ENGINE_UPDATE_DATABASE;
-
-	render_view3d_do(engine, C);
-}
-
-void render_view3d_draw(RenderEngine *engine, const bContext *C)
-{
-	Render *re = engine->re;
-	RenderResult rres;
-	char name[32];
-
-	render_view3d_do(engine, C);
-
-	if (re == NULL) {
-		sprintf(name, "View3dPreview %p", (void *)CTX_wm_region(C));
-		re = RE_GetRender(name);
-
-		if (re == NULL) return;
-	}
-
-	/* Viewport render preview doesn't support multiview, view hardcoded to 0 */
-	RE_AcquireResultImage(re, &rres, 0);
-
-	if (rres.rectf) {
-		RegionView3D *rv3d = CTX_wm_region_view3d(C);
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		ARegion *ar = CTX_wm_region(C);
-		bool force_fallback = false;
-		bool need_fallback = true;
-		float dither = scene->r.dither_intensity;
-		float scale_x, scale_y;
-		rcti clip_rect;
-		int xof, yof;
-
-		if (render_view3d_disprect(scene, ar, v3d, rv3d, &clip_rect)) {
-			scale_x = (float) BLI_rcti_size_x(&clip_rect) / rres.rectx;
-			scale_y = (float) BLI_rcti_size_y(&clip_rect) / rres.recty;
-			xof = clip_rect.xmin;
-			yof = clip_rect.ymin;
-		}
-		else {
-			scale_x = (float) ar->winx / rres.rectx;
-			scale_y = (float) ar->winy / rres.recty;
-			xof = rres.xof;
-			yof = rres.yof;
-		}
-
-		/* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */
-		force_fallback |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL);
-
-		/* Try using GLSL display transform. */
-		if (force_fallback == false) {
-			if (IMB_colormanagement_setup_glsl_draw(&scene->view_settings, &scene->display_settings, dither, true)) {
-				glEnable(GL_BLEND);
-				glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-				glPixelZoom(scale_x, scale_y);
-				glaDrawPixelsTex(xof, yof, rres.rectx, rres.recty,
-				                 GL_RGBA, GL_FLOAT, GL_NEAREST, rres.rectf);
-				glPixelZoom(1.0f, 1.0f);
-				glDisable(GL_BLEND);
-
-				IMB_colormanagement_finish_glsl_draw();
-				need_fallback = false;
-			}
-		}
-
-		/* If GLSL failed, use old-school CPU-based transform. */
-		if (need_fallback) {
-			unsigned char *display_buffer = MEM_mallocN(4 * rres.rectx * rres.recty * sizeof(char),
-			                                            "render_view3d_draw");
-
-			IMB_colormanagement_buffer_make_display_space(rres.rectf, display_buffer, rres.rectx, rres.recty,
-			                                              4, dither, &scene->view_settings, &scene->display_settings);
-
-			glEnable(GL_BLEND);
-			glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-			glPixelZoom(scale_x, scale_y);
-			glaDrawPixelsAuto(xof, yof, rres.rectx, rres.recty,
-			                  GL_RGBA, GL_UNSIGNED_BYTE,
-			                  GL_NEAREST, display_buffer);
-			glPixelZoom(1.0f, 1.0f);
-			glDisable(GL_BLEND);
-
-			MEM_freeN(display_buffer);
-		}
-	}
-
-	RE_ReleaseResultImage(re);
-}
-
-void ED_viewport_render_kill_jobs(wmWindowManager *wm,
-                                  Main *bmain,
-                                  bool free_database)
-{
-	bScreen *sc;
-	ScrArea *sa;
-	ARegion *ar;
-
-	if (!wm)
-		return;
-
-	/* kill all actively running jobs */
-	WM_jobs_kill(wm, NULL, render_view3d_startjob);
-
-	/* loop over 3D view render engines */
-	for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-		for (sa = sc->areabase.first; sa; sa = sa->next) {
-			if (sa->spacetype != SPACE_VIEW3D)
-				continue;
-
-			for (ar = sa->regionbase.first; ar; ar = ar->next) {
-				RegionView3D *rv3d;
-
-				if (ar->regiontype != RGN_TYPE_WINDOW)
-					continue;
-
-				rv3d = ar->regiondata;
-
-				if (rv3d->render_engine) {
-					/* free render database now before we change data, because
-					 * RE_Database_Free will also loop over blender data */
-					if (free_database) {
-						char name[32];
-						Render *re;
-
-						sprintf(name, "View3dPreview %p", (void *)ar);
-						re = RE_GetRender(name);
-
-						if (re)
-							RE_Database_Free(re);
-
-						/* tag render engine to update entire database */
-						rv3d->render_engine->update_flag |= RE_ENGINE_UPDATE_DATABASE;
-					}
-					else {
-						/* quick shader update */
-						rv3d->render_engine->update_flag |= RE_ENGINE_UPDATE_MA;
-					}
-				}
-			}
-		}
-	}
-}
-
 Scene *ED_render_job_get_scene(const bContext *C)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
@@ -1673,6 +1092,7 @@ Scene *ED_render_job_get_current_scene(const bContext *C)
 	return NULL;
 }
 
+
 /* Motion blur curve preset */
 
 static int render_shutter_curve_preset_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index cdbfac06422..bb979087400 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -55,6 +55,10 @@
 #include "BKE_sequencer.h"
 #include "BKE_writeavi.h"
 
+#include "DEG_depsgraph.h"
+
+#include "DRW_engine.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -70,9 +74,9 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "GPU_glew.h"
-#include "GPU_compositing.h"
 #include "GPU_framebuffer.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
 
 #include "render_intern.h"
 
@@ -91,6 +95,9 @@ typedef struct OGLRender {
 	Main *bmain;
 	Render *re;
 	Scene *scene;
+	WorkSpace *workspace;
+	ViewLayer *view_layer;
+	Depsgraph *depsgraph;
 
 	View3D *v3d;
 	RegionView3D *rv3d;
@@ -114,7 +121,6 @@ typedef struct OGLRender {
 	GPUOffScreen *ofs;
 	int ofs_samples;
 	bool ofs_full_samples;
-	GPUFX *fx;
 	int sizex, sizey;
 	int write_still;
 
@@ -148,17 +154,6 @@ typedef struct OGLRender {
 #endif
 } OGLRender;
 
-/* added because v3d is not always valid */
-static unsigned int screen_opengl_layers(OGLRender *oglrender)
-{
-	if (oglrender->v3d) {
-		return oglrender->scene->lay | oglrender->v3d->lay;
-	}
-	else {
-		return oglrender->scene->lay;
-	}
-}
-
 static bool screen_opengl_is_multiview(OGLRender *oglrender)
 {
 	View3D *v3d = oglrender->v3d;
@@ -271,8 +266,9 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
 	RE_ReleaseResult(oglrender->re);
 }
 
-static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
+static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, RenderResult *rr)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = oglrender->scene;
 	ARegion *ar = oglrender->ar;
 	View3D *v3d = oglrender->v3d;
@@ -281,9 +277,8 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 	int sizex = oglrender->sizex;
 	int sizey = oglrender->sizey;
 	const short view_context = (v3d != NULL);
-	bool draw_bgpic = true;
 	bool draw_sky = (scene->r.alphamode == R_ADDSKY);
-	unsigned char *rect = NULL;
+	float *rectf = NULL;
 	const char *viewname = RE_GetActiveRenderView(oglrender->re);
 	ImBuf *ibuf_result = NULL;
 
@@ -324,13 +319,14 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 			unsigned char *gp_rect;
 			unsigned char *render_rect = (unsigned char *)RE_RenderViewGetById(rr, oglrender->view_id)->rect32;
 
+			DRW_opengl_context_enable();
 			GPU_offscreen_bind(oglrender->ofs, true);
 
 			glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 			wmOrtho2(0, sizex, 0, sizey);
-			glTranslatef(sizex / 2, sizey / 2, 0.0f);
+			gpuTranslate2f(sizex / 2, sizey / 2);
 
 			G.f |= G_RENDER_OGL;
 			ED_gpencil_draw_ex(scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ);
@@ -343,6 +339,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 				blend_color_mix_byte(&render_rect[i], &render_rect[i], &gp_rect[i]);
 			}
 			GPU_offscreen_unbind(oglrender->ofs, true);
+			DRW_opengl_context_disable();
 
 			MEM_freeN(gp_rect);
 		}
@@ -357,12 +354,11 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 		draw_flags |= (oglrender->ofs_full_samples) ? V3D_OFSDRAW_USE_FULL_SAMPLE : 0;
 
 		if (view_context) {
-			draw_flags |= (draw_bgpic) ? V3D_OFSDRAW_USE_BACKGROUND : 0;
-
 			ibuf_view = ED_view3d_draw_offscreen_imbuf(
-			       scene, v3d, ar, sizex, sizey,
-			       IB_rect, draw_flags, alpha_mode, oglrender->ofs_samples, viewname,
-			       oglrender->fx, oglrender->ofs, err_out);
+			       depsgraph, scene, v3d->drawtype,
+			       v3d, ar, sizex, sizey,
+			       IB_rectfloat, draw_flags, alpha_mode, oglrender->ofs_samples, viewname,
+			       oglrender->ofs, err_out);
 
 			/* for stamp only */
 			if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
@@ -370,18 +366,19 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 			}
 		}
 		else {
-			draw_flags |= (V3D_OFSDRAW_USE_GPENCIL | V3D_OFSDRAW_USE_BACKGROUND);
+			draw_flags |= V3D_OFSDRAW_USE_GPENCIL;
 			ibuf_view = ED_view3d_draw_offscreen_imbuf_simple(
-			        scene, scene->camera, oglrender->sizex, oglrender->sizey,
-			        IB_rect, draw_flags, OB_SOLID,
+			        depsgraph, scene, OB_SOLID,
+			        scene->camera, oglrender->sizex, oglrender->sizey,
+			        IB_rectfloat, draw_flags,
 			        alpha_mode, oglrender->ofs_samples, viewname,
-			        oglrender->fx, oglrender->ofs, err_out);
+			        oglrender->ofs, err_out);
 			camera = scene->camera;
 		}
 
 		if (ibuf_view) {
 			ibuf_result = ibuf_view;
-			rect = (unsigned char *)ibuf_view->rect;
+			rectf = (float *)ibuf_view->rect_float;
 		}
 		else {
 			fprintf(stderr, "%s: failed to get buffer, %s\n", __func__, err_out);
@@ -390,7 +387,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 
 	if (ibuf_result != NULL) {
 		if ((scene->r.stamp & R_STAMP_ALL) && (scene->r.stamp & R_STAMP_DRAW)) {
-			BKE_image_stamp_buf(scene, camera, NULL, rect, NULL, rr->rectx, rr->recty, 4);
+			BKE_image_stamp_buf(scene, camera, NULL, NULL, rectf, rr->rectx, rr->recty, 4);
 		}
 		RE_render_result_rect_from_ibuf(rr, &scene->r, ibuf_result, oglrender->view_id);
 		IMB_freeImBuf(ibuf_result);
@@ -435,7 +432,7 @@ static void addAlphaOverFloat(float dest[4], const float source[4])
 }
 
 /* add renderlayer and renderpass for each grease pencil layer for using in composition */
-static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, RenderView *rv)
+static void add_gpencil_renderpass(const bContext *C, OGLRender *oglrender, RenderResult *rr, RenderView *rv)
 {
 	bGPdata *gpd = oglrender->scene->gpd;
 	Scene *scene = oglrender->scene;
@@ -479,7 +476,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende
 		}
 
 		/* render this gp layer */
-		screen_opengl_render_doit(oglrender, rr);
+		screen_opengl_render_doit(C, oglrender, rr);
 
 		/* add RendePass composite */
 		RenderPass *rp = RE_create_gp_pass(rr, gpl->info, rv->name);
@@ -519,7 +516,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende
 	scene->r.alphamode = oldalphamode;
 }
 
-static void screen_opengl_render_apply(OGLRender *oglrender)
+static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender)
 {
 	RenderResult *rr;
 	RenderView *rv;
@@ -535,14 +532,13 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
 		int chanshown = sseq ? sseq->chanshown : 0;
 
 		BKE_sequencer_new_render_data(
-		        oglrender->bmain->eval_ctx, oglrender->bmain, scene,
-		        oglrender->sizex, oglrender->sizey, 100.0f,
+		        oglrender->bmain, oglrender->depsgraph, scene,
+		        oglrender->sizex, oglrender->sizey, 100.0f, false,
 		        &context);
 
 		for (view_id = 0; view_id < oglrender->views_len; view_id++) {
 			context.view_id = view_id;
 			context.gpu_offscreen = oglrender->ofs;
-			context.gpu_fx = oglrender->fx;
 			context.gpu_full_samples = oglrender->ofs_full_samples;
 
 			oglrender->seq_data.ibufs_arr[view_id] = BKE_sequencer_give_ibuf(&context, CFRA, chanshown);
@@ -557,10 +553,10 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
 		/* add grease pencil passes. For sequencer, the render does not include renderpasses
 		 * TODO: The sequencer render of grease pencil should be rethought */
 		if (!oglrender->is_sequencer) {
-			add_gpencil_renderpass(oglrender, rr, rv);
+			add_gpencil_renderpass(C, oglrender, rr, rv);
 		}
 		/* render composite */
-		screen_opengl_render_doit(oglrender, rr);
+		screen_opengl_render_doit(C, oglrender, rr);
 	}
 
 	RE_ReleaseResult(oglrender->re);
@@ -576,11 +572,30 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
 	}
 }
 
+static bool screen_opengl_fullsample_enabled(Scene *scene)
+{
+	if (scene->r.scemode & R_FULL_SAMPLE) {
+		return true;
+	}
+	else {
+		/* XXX TODO:
+		 * Technically if the hardware supports MSAA we could keep using Blender 2.7x approach.
+		 * However anti-aliasing without full_sample is not playing well even in 2.7x.
+		 *
+		 * For example, if you enable depth of field, there is aliasing, even if the viewport is fine.
+		 * For 2.8x this is more complicated because so many things rely on shader.
+		 * So until we fix the gpu_framebuffer anti-aliasing suupport we need to force full sample.
+		 */
+		return true;
+	}
+}
+
 static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 {
 	/* new render clears all callbacks */
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *win = CTX_wm_window(C);
+	WorkSpace *workspace = CTX_wm_workspace(C);
 
 	Scene *scene = CTX_data_scene(C);
 	ScrArea *prevsa = CTX_wm_area(C);
@@ -589,7 +604,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	OGLRender *oglrender;
 	int sizex, sizey;
 	const int samples = (scene->r.mode & R_OSA) ? scene->r.osa : 0;
-	const bool full_samples = (samples != 0) && (scene->r.scemode & R_FULL_SAMPLE);
+	const bool full_samples = (samples != 0) && screen_opengl_fullsample_enabled(scene);
 	bool is_view_context = RNA_boolean_get(op->ptr, "view_context");
 	const bool is_animation = RNA_boolean_get(op->ptr, "animation");
 	const bool is_sequencer = RNA_boolean_get(op->ptr, "sequencer");
@@ -634,7 +649,9 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	sizey = (scene->r.size * scene->r.ysch) / 100;
 
 	/* corrects render size with actual size, not every card supports non-power-of-two dimensions */
-	ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, err_out);
+	DRW_opengl_context_enable(); /* Offscreen creation needs to be done in DRW context. */
+	ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, true, true, err_out);
+	DRW_opengl_context_disable();
 
 	if (!ofs) {
 		BKE_reportf(op->reports, RPT_ERROR, "Failed to create OpenGL off-screen buffer, %s", err_out);
@@ -652,6 +669,9 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	oglrender->sizey = sizey;
 	oglrender->bmain = CTX_data_main(C);
 	oglrender->scene = scene;
+	oglrender->workspace = workspace;
+	oglrender->view_layer = CTX_data_view_layer(C);
+	oglrender->depsgraph = CTX_data_depsgraph(C);
 	oglrender->cfrao = scene->r.cfra;
 
 	oglrender->write_still = is_write_still && !is_animation;
@@ -679,19 +699,6 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 		/* apply immediately in case we're rendering from a script,
 		 * running notifiers again will overwrite */
 		oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal;
-
-		if (oglrender->v3d->fx_settings.fx_flag & (GPU_FX_FLAG_DOF | GPU_FX_FLAG_SSAO)) {
-			oglrender->fx = GPU_fx_compositor_create();
-		}
-	}
-	else if (is_sequencer) {
-		/* NOTE: We allow animation of DoF setting for flexibility in edits, so
-		 * we can't check in advance whether we need FX compositor or not.
-		 * We just always allocated it and make sure it doesn't add extra
-		 * overhead rather than memory allocation here if it's not really
-		 * needed.
-		 */
-		oglrender->fx = GPU_fx_compositor_create();
 	}
 
 	/* create render */
@@ -706,7 +713,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	oglrender->iuser.ok = 1;
 
 	/* create render result */
-	RE_InitState(oglrender->re, NULL, &scene->r, NULL, sizex, sizey, NULL);
+	RE_InitState(oglrender->re, NULL, &scene->r, &scene->view_layers, NULL, sizex, sizey, NULL);
 
 	/* create render views */
 	screen_opengl_views_setup(oglrender);
@@ -803,8 +810,9 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
 	}
 
 	if (oglrender->timer) { /* exec will not have a timer */
+		Depsgraph *depsgraph = oglrender->depsgraph;
 		scene->r.cfra = oglrender->cfrao;
-		BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, screen_opengl_layers(oglrender));
+		BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 
 		WM_event_remove_timer(oglrender->wm, oglrender->win, oglrender->timer);
 	}
@@ -813,10 +821,9 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
 
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
 
-	if (oglrender->fx)
-		GPU_fx_compositor_destroy(oglrender->fx);
-
+	DRW_opengl_context_enable();
 	GPU_offscreen_free(oglrender->ofs);
+	DRW_opengl_context_disable();
 
 	if (oglrender->is_sequencer) {
 		MEM_freeN(oglrender->seq_data.ibufs_arr);
@@ -1004,6 +1011,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	OGLRender *oglrender = op->customdata;
 	Scene *scene = oglrender->scene;
+	Depsgraph *depsgraph = oglrender->depsgraph;
 	char name[FILE_MAX];
 	bool ok = false;
 	const bool view_context = (oglrender->v3d != NULL);
@@ -1014,12 +1022,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 	if (CFRA < oglrender->nfra)
 		CFRA++;
 	while (CFRA < oglrender->nfra) {
-		unsigned int lay = screen_opengl_layers(oglrender);
-
-		if (lay & 0xFF000000)
-			lay &= 0xFF000000;
-
-		BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, lay);
+		BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 		CFRA++;
 	}
 
@@ -1041,11 +1044,11 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 
 	WM_cursor_time(oglrender->win, scene->r.cfra);
 
-	BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, screen_opengl_layers(oglrender));
+	BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 
 	if (view_context) {
 		if (oglrender->rv3d->persp == RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) {
-			/* since BKE_scene_update_for_newframe() is used rather
+			/* since BKE_scene_graph_update_for_newframe() is used rather
 			 * then ED_update_for_newframe() the camera needs to be set */
 			if (BKE_scene_camera_switch_update(scene)) {
 				oglrender->v3d->camera = scene->camera;
@@ -1057,7 +1060,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 	}
 
 	/* render into offscreen buffer */
-	screen_opengl_render_apply(oglrender);
+	screen_opengl_render_apply(C, oglrender);
 
 	/* save to disk */
 	rr = RE_AcquireResultRead(oglrender->re);
@@ -1107,7 +1110,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, const wmEvent
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
 
 	if (anim == 0) {
-		screen_opengl_render_apply(op->customdata);
+		screen_opengl_render_apply(C, op->customdata);
 		screen_opengl_render_end(C, op->customdata);
 		return OPERATOR_FINISHED;
 	}
@@ -1158,7 +1161,7 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op)
 
 	if (!is_animation) { /* same as invoke */
 		/* render image */
-		screen_opengl_render_apply(op->customdata);
+		screen_opengl_render_apply(C, op->customdata);
 		screen_opengl_render_end(C, op->customdata);
 
 		return OPERATOR_FINISHED;
@@ -1175,7 +1178,7 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op)
 	}
 
 	/* no redraw needed, we leave state as we entered it */
-//	ED_update_for_newframe(C, 1);
+//	ED_update_for_newframe(C);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, CTX_data_scene(C));
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c
index 9a2549fca81..dd5ed5b78f1 100644
--- a/source/blender/editors/render/render_ops.c
+++ b/source/blender/editors/render/render_ops.c
@@ -56,8 +56,8 @@ void ED_operatortypes_render(void)
 	WM_operatortype_append(MATERIAL_OT_copy);
 	WM_operatortype_append(MATERIAL_OT_paste);
 
-	WM_operatortype_append(SCENE_OT_render_layer_add);
-	WM_operatortype_append(SCENE_OT_render_layer_remove);
+	WM_operatortype_append(SCENE_OT_view_layer_add);
+	WM_operatortype_append(SCENE_OT_view_layer_remove);
 
 	WM_operatortype_append(SCENE_OT_render_view_add);
 	WM_operatortype_append(SCENE_OT_render_view_remove);
@@ -85,9 +85,6 @@ void ED_operatortypes_render(void)
 	WM_operatortype_append(TEXTURE_OT_slot_copy);
 	WM_operatortype_append(TEXTURE_OT_slot_paste);
 	WM_operatortype_append(TEXTURE_OT_slot_move);
-	WM_operatortype_append(TEXTURE_OT_envmap_save);
-	WM_operatortype_append(TEXTURE_OT_envmap_clear);
-	WM_operatortype_append(TEXTURE_OT_envmap_clear_all);
 
 	/* render_internal.c */
 	WM_operatortype_append(RENDER_OT_view_show);
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index dc79d5d9847..b3601226932 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -51,6 +51,7 @@
 
 #include "DNA_world_types.h"
 #include "DNA_camera_types.h"
+#include "DNA_group_types.h"
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -69,6 +70,7 @@
 #include "BKE_image.h"
 #include "BKE_icons.h"
 #include "BKE_lamp.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
@@ -78,6 +80,10 @@
 #include "BKE_texture.h"
 #include "BKE_world.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.h"
+
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_thumbs.h"
@@ -85,6 +91,7 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_shader.h"
 
 #include "RE_pipeline.h"
 #include "RE_engine.h"
@@ -94,6 +101,7 @@
 
 #include "ED_datafiles.h"
 #include "ED_render.h"
+#include "ED_screen.h"
 
 #ifndef NDEBUG
 /* Used for database init assert(). */
@@ -149,6 +157,7 @@ typedef struct ShaderPreview {
 	short *stop, *do_update;
 
 	Scene *scene;
+	Depsgraph *depsgraph;
 	ID *id;
 	ID *parent;
 	MTex *slot;
@@ -178,6 +187,7 @@ typedef struct IconPreviewSize {
 typedef struct IconPreview {
 	Main *bmain;
 	Scene *scene;
+	Depsgraph *depsgraph;
 	void *owner;
 	ID *id;
 	ListBase sizes;
@@ -236,52 +246,84 @@ void ED_preview_free_dbase(void)
 		BKE_main_free(G_pr_main_cycles);
 }
 
-static int preview_mat_has_sss(Material *mat, bNodeTree *ntree)
+static Scene *preview_get_scene(Main *pr_main)
 {
-	if (mat) {
-		if (mat->sss_flag & MA_DIFF_SSS)
-			return 1;
-		if (mat->nodetree)
-			if (preview_mat_has_sss(NULL, mat->nodetree))
-				return 1;
-	}
-	else if (ntree) {
-		bNode *node;
-		for (node = ntree->nodes.first; node; node = node->next) {
-			if (node->type == NODE_GROUP && node->id) {
-				if (preview_mat_has_sss(NULL, (bNodeTree *)node->id))
-					return 1;
-			}
-			else if (node->id && ELEM(node->type, SH_NODE_MATERIAL, SH_NODE_MATERIAL_EXT)) {
-				mat = (Material *)node->id;
-				if (mat->sss_flag & MA_DIFF_SSS)
-					return 1;
-			}
-		}
+	if (pr_main == NULL) return NULL;
+
+	return pr_main->scene.first;
+}
+
+static const char *preview_collection_name(const char pr_type)
+{
+	switch (pr_type) {
+		case MA_FLAT:
+			return "Flat";
+		case MA_SPHERE:
+			return "Sphere";
+		case MA_CUBE:
+			return "Cube";
+		case MA_MONKEY:
+			return "Monkey";
+		case MA_SPHERE_A:
+			return "World Sphere";
+		case MA_TEXTURE:
+			return "Texture";
+		case MA_LAMP:
+			return "Lamp";
+		case MA_SKY:
+			return "Sky";
+		case MA_HAIR:
+			return "Hair";
+		case MA_ATMOS:
+			return "Atmosphere";
+		default:
+			BLI_assert(!"Unknown preview type");
+			return "";
 	}
-	return 0;
 }
 
-static Scene *preview_get_scene(Main *pr_main)
+static void set_preview_collection(Scene *scene, ViewLayer *view_layer, char pr_type)
 {
-	if (pr_main == NULL) return NULL;
+	LayerCollection *lc = view_layer->layer_collections.first;
+	const char *collection_name = preview_collection_name(pr_type);
 
-	return pr_main->scene.first;
+	for (lc = lc->layer_collections.first; lc; lc = lc->next) {
+		if (STREQ(lc->collection->id.name + 2, collection_name)) {
+			lc->collection->flag &= ~COLLECTION_RESTRICT_RENDER;
+		}
+		else {
+			lc->collection->flag |= COLLECTION_RESTRICT_RENDER;
+		}
+	}
+
+	BKE_layer_collection_sync(scene, view_layer);
 }
 
+static World *preview_get_localized_world(ShaderPreview *sp, World *world)
+{
+	if (world == NULL) {
+		return NULL;
+	}
+	if (sp->worldcopy != NULL) {
+		return sp->worldcopy;
+	}
+	sp->worldcopy = BKE_world_localize(world);
+	BLI_addtail(&sp->pr_main->world, sp->worldcopy);
+	return sp->worldcopy;
+}
 
 /* call this with a pointer to initialize preview scene */
 /* call this with NULL to restore assigned ID pointers in preview scene */
 static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_type, ShaderPreview *sp)
 {
 	Scene *sce;
-	Base *base;
 	Main *pr_main = sp->pr_main;
 
 	memcpy(pr_main->name, bmain->name, sizeof(pr_main->name));
 
 	sce = preview_get_scene(pr_main);
 	if (sce) {
+		ViewLayer *view_layer = sce->view_layers.first;
 
 		/* this flag tells render to not execute depsgraph or ipos etc */
 		sce->r.scemode |= R_BUTS_PREVIEW;
@@ -320,7 +362,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 			 * seems commonly used render engines does not support
 			 * such kind of rendering.
 			 */
-			BLI_strncpy(sce->r.engine, RE_engine_id_BLENDER_RENDER, sizeof(sce->r.engine));
+			BLI_strncpy(sce->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(sce->r.engine));
 		}
 		else {
 			BLI_strncpy(sce->r.engine, scene->r.engine, sizeof(sce->r.engine));
@@ -335,77 +377,26 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				sp->matcopy = mat;
 				BLI_addtail(&pr_main->mat, mat);
 
-				if (!BKE_scene_use_new_shading_nodes(scene)) {
-					init_render_material(bmain, mat, 0, NULL);     /* call that retrieves mode_l */
-					end_render_material(mat);
-
-					/* un-useful option */
-					if (sp->pr_method == PR_ICON_RENDER)
-						mat->shade_flag &= ~MA_OBCOLOR;
-
-					/* turn on raytracing if needed */
-					if (mat->mode_l & MA_RAYMIRROR)
-						sce->r.mode |= R_RAYTRACE;
-					if (mat->material_type == MA_TYPE_VOLUME)
-						sce->r.mode |= R_RAYTRACE;
-					if ((mat->mode_l & MA_RAYTRANSP) && (mat->mode_l & MA_TRANSP))
-						sce->r.mode |= R_RAYTRACE;
-					if (preview_mat_has_sss(mat, NULL))
-						sce->r.mode |= R_SSS;
-
-					/* turn off fake shadows if needed */
-					/* this only works in a specific case where the preview.blend contains
-					 * an object starting with 'c' which has a material linked to it (not the obdata)
-					 * and that material has a fake shadow texture in the active texture slot */
-					for (base = sce->base.first; base; base = base->next) {
-						if (base->object->id.name[2] == 'c') {
-							Material *shadmat = give_current_material(base->object, base->object->actcol);
-							if (shadmat) {
-								if (mat->mode2 & MA_CASTSHADOW) shadmat->septex = 0;
-								else shadmat->septex |= 1;
-							}
-						}
-					}
-
-					/* turn off bounce lights for volume,
-					 * doesn't make much visual difference and slows it down too */
-					for (base = sce->base.first; base; base = base->next) {
-						if (base->object->type == OB_LAMP) {
-							/* if doesn't match 'Lamp.002' --> main key light */
-							if (!STREQ(base->object->id.name + 2, "Lamp.002")) {
-								if (mat->material_type == MA_TYPE_VOLUME)
-									base->object->restrictflag |= OB_RESTRICT_RENDER;
-								else
-									base->object->restrictflag &= ~OB_RESTRICT_RENDER;
-							}
-						}
-					}
+				/* use current scene world to light sphere */
+				if (mat->pr_type == MA_SPHERE_A && sp->pr_method == PR_BUTS_RENDER) {
+					/* Use current scene world to light sphere. */
+					sce->world = preview_get_localized_world(sp, scene->world);
 				}
-				else {
-					if (mat->pr_type == MA_SPHERE_A && sp->pr_method == PR_BUTS_RENDER) {
-						/* Use current scene world to light sphere. */
-						sce->world = scene->world;
-					}
-					else if (sce->world) {
-						/* Use a default world color. Using the current
-						 * scene world can be slow if it has big textures. */
-						sce->world->use_nodes = false;
-						sce->world->horr = 0.5f;
-						sce->world->horg = 0.5f;
-						sce->world->horb = 0.5f;
-					}
+				else if (sce->world) {
+					/* Use a default world color. Using the current
+					 * scene world can be slow if it has big textures. */
+					sce->world->use_nodes = false;
+					sce->world->horr = 0.5f;
+					sce->world->horg = 0.5f;
+					sce->world->horb = 0.5f;
 				}
 
 				if (sp->pr_method == PR_ICON_RENDER) {
-					if (mat->material_type == MA_TYPE_HALO) {
-						sce->lay = 1 << MA_FLAT;
-					}
-					else {
-						sce->lay = 1 << MA_SPHERE_A;
-					}
+					set_preview_collection(sce, view_layer, MA_SPHERE_A);
 				}
 				else {
-					sce->lay = 1 << mat->pr_type;
+					set_preview_collection(sce, view_layer, mat->pr_type);
+
 					if (mat->nodetree && sp->pr_method == PR_NODE_RENDER) {
 						/* two previews, they get copied by wmJob */
 						BKE_node_preview_init_tree(mat->nodetree, sp->sizex, sp->sizey, true);
@@ -414,11 +405,11 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				}
 			}
 			else {
-				sce->r.mode &= ~(R_OSA | R_RAYTRACE | R_SSS);
+				sce->r.mode &= ~(R_OSA);
 
 			}
 
-			for (base = sce->base.first; base; base = base->next) {
+			for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 				if (base->object->id.name[2] == 'p') {
 					/* copy over object color, in case material uses it */
 					copy_v4_v4(base->object->col, sp->col);
@@ -432,7 +423,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 							(*matar)[actcol] = mat;
 					}
 					else if (base->object->type == OB_LAMP) {
-						base->object->restrictflag &= ~OB_RESTRICT_RENDER;
+						base->flag |= BASE_VISIBLED;
 					}
 				}
 			}
@@ -445,30 +436,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				sp->texcopy = tex;
 				BLI_addtail(&pr_main->tex, tex);
 			}
-			sce->lay = 1 << MA_TEXTURE;
-
-			for (base = sce->base.first; base; base = base->next) {
-				if (base->object->id.name[2] == 't') {
-					Material *mat = give_current_material(base->object, base->object->actcol);
-					if (mat && mat->mtex[0]) {
-						mat->mtex[0]->tex = tex;
-
-						if (tex && sp->slot)
-							mat->mtex[0]->which_output = sp->slot->which_output;
-
-						mat->mtex[0]->mapto &= ~MAP_ALPHA;
-						mat->alpha = 1.0f;
-
-						/* show alpha in this case */
-						if (tex == NULL || (tex->flag & TEX_PRV_ALPHA)) {
-							if (!(tex && tex->type == TEX_IMAGE && (tex->imaflag & (TEX_USEALPHA | TEX_CALCALPHA)) == 0)) {
-								mat->mtex[0]->mapto |= MAP_ALPHA;
-								mat->alpha = 0.0f;
-							}
-						}
-					}
-				}
-			}
+			set_preview_collection(sce, view_layer, MA_TEXTURE);
 
 			if (tex && tex->nodetree && sp->pr_method == PR_NODE_RENDER) {
 				/* two previews, they get copied by wmJob */
@@ -486,30 +454,17 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				BLI_addtail(&pr_main->lamp, la);
 			}
 
-			sce->lay = 1 << MA_LAMP;
+			set_preview_collection(sce, view_layer, MA_LAMP);
 
-			if (!BKE_scene_use_new_shading_nodes(scene)) {
-				if (la && la->type == LA_SUN && (la->sun_effect_type & LA_SUN_EFFECT_SKY)) {
-					sce->lay = 1 << MA_ATMOS;
-					sce->world = scene->world;
-					sce->camera = (Object *)BLI_findstring(&pr_main->object, "CameraAtmo", offsetof(ID, name) + 2);
-				}
-				else {
-					sce->world = NULL;
-					sce->camera = (Object *)BLI_findstring(&pr_main->object, "Camera", offsetof(ID, name) + 2);
-				}
-			}
-			else {
-				if (sce->world) {
-					/* Only use lighting from the lamp. */
-					sce->world->use_nodes = false;
-					sce->world->horr = 0.0f;
-					sce->world->horg = 0.0f;
-					sce->world->horb = 0.0f;
-				}
+			if (sce->world) {
+				/* Only use lighting from the lamp. */
+				sce->world->use_nodes = false;
+				sce->world->horr = 0.0f;
+				sce->world->horg = 0.0f;
+				sce->world->horb = 0.0f;
 			}
 
-			for (base = sce->base.first; base; base = base->next) {
+			for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 				if (base->object->id.name[2] == 'p') {
 					if (base->object->type == OB_LAMP)
 						base->object->data = la;
@@ -531,7 +486,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				BLI_addtail(&pr_main->world, wrld);
 			}
 
-			sce->lay = 1 << MA_SKY;
+			set_preview_collection(sce, view_layer, MA_SKY);
 			sce->world = wrld;
 
 			if (wrld && wrld->nodetree && sp->pr_method == PR_NODE_RENDER) {
@@ -607,7 +562,9 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect,
 				if (re)
 					RE_AcquiredResultGet32(re, &rres, (unsigned int *)rect_byte, 0);
 
-				glaDrawPixelsSafe(fx, fy, rres.rectx, rres.recty, rres.rectx, GL_RGBA, GL_UNSIGNED_BYTE, rect_byte);
+				IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+				immDrawPixelsTex(&state, fx, fy, rres.rectx, rres.recty, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect_byte,
+				                 1.0f, 1.0f, NULL);
 
 				MEM_freeN(rect_byte);
 
@@ -728,6 +685,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
 	char name[32];
 	int sizex;
 	Main *pr_main = sp->pr_main;
+	ID *id_eval = DEG_get_evaluated_id(sp->depsgraph, id);
 
 	/* in case of split preview, use border render */
 	if (split) {
@@ -747,7 +705,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
 	}
 
 	/* get the stuff from the builtin preview dbase */
-	sce = preview_prepare_scene(sp->bmain, sp->scene, id, idtype, sp);
+	sce = preview_prepare_scene(sp->bmain, sp->scene, id_eval, idtype, sp);
 	if (sce == NULL) return;
 
 	if (!split || first) sprintf(name, "Preview %p", sp->owner);
@@ -1036,6 +994,12 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
 
 			*do_update = true;
 		}
+		else if (idtype == ID_SCR) {
+			bScreen *screen = (bScreen *)id;
+
+			ED_screen_preview_render(screen, sp->sizex, sp->sizey, sp->pr_rect);
+			*do_update = true;
+		}
 		else {
 			/* re-use shader job */
 			shader_preview_startjob(customdata, stop, do_update);
@@ -1045,12 +1009,6 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
 			if (idtype == ID_WO) {
 				set_alpha((char *)sp->pr_rect, sp->sizex, sp->sizey, 255);
 			}
-			else if (idtype == ID_MA) {
-				Material *ma = (Material *)id;
-
-				if (ma->material_type == MA_TYPE_HALO)
-					set_alpha((char *)sp->pr_rect, sp->sizex, sp->sizey, 255);
-			}
 		}
 	}
 }
@@ -1095,7 +1053,6 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short
 {
 	IconPreview *ip = (IconPreview *)customdata;
 	IconPreviewSize *cur_size;
-	const bool use_new_shading = BKE_scene_use_new_shading_nodes(ip->scene);
 
 	for (cur_size = ip->sizes.first; cur_size; cur_size = cur_size->next) {
 		PreviewImage *prv = ip->owner;
@@ -1110,6 +1067,7 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short
 
 		/* construct shader preview from image size and previewcustomdata */
 		sp->scene = ip->scene;
+		sp->depsgraph = ip->depsgraph;
 		sp->owner = ip->owner;
 		sp->sizex = cur_size->sizex;
 		sp->sizey = cur_size->sizey;
@@ -1120,19 +1078,14 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short
 
 		if (is_render) {
 			BLI_assert(ip->id);
-			if (use_new_shading) {
-				/* texture icon rendering is hardcoded to use BI,
-				 * so don't even think of using cycle's bmain for
-				 * texture icons
-				 */
-				if (GS(ip->id->name) != ID_TE)
-					sp->pr_main = G_pr_main_cycles;
-				else
-					sp->pr_main = G_pr_main;
-			}
-			else {
+			/* texture icon rendering is hardcoded to use the BI scene,
+			 * so don't even think of using cycle's bmain for
+			 * texture icons
+			 */
+			if (GS(ip->id->name) != ID_TE)
+				sp->pr_main = G_pr_main_cycles;
+			else
 				sp->pr_main = G_pr_main;
-			}
 		}
 
 		common_preview_startjob(sp, stop, do_update, progress);
@@ -1227,6 +1180,7 @@ void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int *r
 	/* customdata for preview thread */
 	ip->bmain = CTX_data_main(C);
 	ip->scene = CTX_data_scene(C);
+	ip->depsgraph = CTX_data_depsgraph(C);
 	ip->owner = owner;
 	ip->id = id;
 
@@ -1255,10 +1209,11 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 	ShaderPreview *sp;
 	Scene *scene = CTX_data_scene(C);
 	short id_type = GS(id->name);
-	bool use_new_shading = BKE_scene_use_new_shading_nodes(scene);
+
+	/* Use workspace render only for buttons Window, since the other previews are related to the datablock. */
 
 	/* Only texture node preview is supported with Cycles. */
-	if (use_new_shading && method == PR_NODE_RENDER && id_type != ID_TE) {
+	if (method == PR_NODE_RENDER && id_type != ID_TE) {
 		return;
 	}
 
@@ -1270,6 +1225,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 
 	/* customdata for preview thread */
 	sp->scene = scene;
+	sp->depsgraph = CTX_data_depsgraph(C);
 	sp->owner = owner;
 	sp->sizex = sizex;
 	sp->sizey = sizey;
@@ -1279,9 +1235,9 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 	sp->slot = slot;
 	sp->bmain = CTX_data_main(C);
 
-	/* hardcoded preview .blend for cycles/internal, this should be solved
+	/* hardcoded preview .blend for Eevee + Cycles, this should be solved
 	 * once with custom preview .blend path for external engines */
-	if ((method != PR_NODE_RENDER) && id_type != ID_TE && use_new_shading) {
+	if ((method != PR_NODE_RENDER) && id_type != ID_TE) {
 		sp->pr_main = G_pr_main_cycles;
 	}
 	else {
@@ -1299,11 +1255,9 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
 }
 
-void ED_preview_kill_jobs(wmWindowManager *wm, Main *bmain)
+void ED_preview_kill_jobs(wmWindowManager *wm, Main *UNUSED(bmain))
 {
 	if (wm)
 		WM_jobs_kill(wm, NULL, common_preview_startjob);
-
-	ED_viewport_render_kill_jobs(wm, bmain, false);
 }
 
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index fe87f8bdbb2..3f32242cd1b 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -50,10 +50,10 @@
 #include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_linestyle.h"
 #include "BKE_main.h"
@@ -62,10 +62,12 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
+#include "BKE_workspace.h"
 #include "BKE_world.h"
 #include "BKE_editmesh.h"
 
-
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #ifdef WITH_FREESTYLE
 #  include "BKE_freestyle.h"
@@ -83,6 +85,7 @@
 #include "ED_mesh.h"
 #include "ED_node.h"
 #include "ED_render.h"
+#include "ED_scene.h"
 #include "ED_screen.h"
 
 #include "RNA_define.h"
@@ -154,7 +157,7 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op)
 		WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, ob);
 	WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_PREVIEW, ob);
@@ -220,7 +223,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -361,7 +364,7 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op))
 
 			if (ob_iter->totcol == ob->totcol) {
 				ob_iter->actcol = ob->actcol;
-				DAG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
 				WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter);
 			}
 		}
@@ -426,7 +429,7 @@ static int material_slot_move_exec(bContext *C, wmOperator *op)
 
 	MEM_freeN(slot_remap);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob);
 
@@ -460,7 +463,6 @@ void OBJECT_OT_material_slot_move(wmOperatorType *ot)
 
 static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
 	Material *ma = CTX_data_pointer_get_type(C, "material", &RNA_Material).data;
 	Main *bmain = CTX_data_main(C);
 	PointerRNA ptr, idptr;
@@ -472,11 +474,8 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 	else {
 		ma = BKE_material_add(bmain, DATA_("Material"));
-
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			ED_node_shader_default(C, &ma->id);
-			ma->use_nodes = true;
-		}
+		ED_node_shader_default(C, &ma->id);
+		ma->use_nodes = true;
 	}
 
 	/* hook into UI */
@@ -536,14 +535,6 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op))
 		 * pointer use also increases user, so this compensates it */
 		id_us_min(&tex->id);
 
-		if (ptr.id.data && GS(((ID *)ptr.id.data)->name) == ID_MA &&
-		    RNA_property_pointer_get(&ptr, prop).id.data == NULL)
-		{
-			/* In case we are assigning new texture to a material, and active slot was empty, reset 'use' flag. */
-			Material *ma = (Material *)ptr.id.data;
-			ma->septex &= ~(1 << ma->texact);
-		}
-
 		RNA_id_pointer_create(&tex->id, &idptr);
 		RNA_property_pointer_set(&ptr, prop, idptr);
 		RNA_property_update(C, &ptr, prop);
@@ -572,7 +563,6 @@ void TEXTURE_OT_new(wmOperatorType *ot)
 
 static int new_world_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
 	World *wo = CTX_data_pointer_get_type(C, "world", &RNA_World).data;
 	Main *bmain = CTX_data_main(C);
 	PointerRNA ptr, idptr;
@@ -584,11 +574,8 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 	else {
 		wo = BKE_world_add(bmain, DATA_("World"));
-
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			ED_node_shader_default(C, &wo->id);
-			wo->use_nodes = true;
-		}
+		ED_node_shader_default(C, &wo->id);
+		wo->use_nodes = true;
 	}
 
 	/* hook into UI */
@@ -625,56 +612,61 @@ void WORLD_OT_new(wmOperatorType *ot)
 
 /********************** render layer operators *********************/
 
-static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op))
+static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	WorkSpace *workspace = CTX_wm_workspace(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = BKE_view_layer_add(scene, NULL);
 
-	BKE_scene_add_render_layer(scene, NULL);
-	scene->r.actlay = BLI_listbase_count(&scene->r.layers) - 1;
+	if (workspace) {
+		BKE_workspace_view_layer_set(workspace, view_layer, scene);
+	}
 
-	DAG_id_tag_update(&scene->id, 0);
-	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
+	DEG_id_tag_update(&scene->id, 0);
+	DEG_relations_tag_update(CTX_data_main(C));
+	WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 
 	return OPERATOR_FINISHED;
 }
 
-void SCENE_OT_render_layer_add(wmOperatorType *ot)
+void SCENE_OT_view_layer_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Add Render Layer";
-	ot->idname = "SCENE_OT_render_layer_add";
-	ot->description = "Add a render layer";
+	ot->name = "Add View Layer";
+	ot->idname = "SCENE_OT_view_layer_add";
+	ot->description = "Add a view layer";
 
 	/* api callbacks */
-	ot->exec = render_layer_add_exec;
+	ot->exec = view_layer_add_exec;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
 }
 
-static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op))
+static int view_layer_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *rl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if (!BKE_scene_remove_render_layer(CTX_data_main(C), scene, rl))
+	if (!ED_scene_view_layer_delete(bmain, scene, view_layer, NULL)) {
 		return OPERATOR_CANCELLED;
+	}
 
-	DAG_id_tag_update(&scene->id, 0);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
 	return OPERATOR_FINISHED;
 }
 
-void SCENE_OT_render_layer_remove(wmOperatorType *ot)
+void SCENE_OT_view_layer_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Remove Render Layer";
-	ot->idname = "SCENE_OT_render_layer_remove";
-	ot->description = "Remove the selected render layer";
+	ot->name = "Remove View Layer";
+	ot->idname = "SCENE_OT_view_layer_remove";
+	ot->description = "Remove the selected view layer";
 
 	/* api callbacks */
-	ot->exec = render_layer_remove_exec;
+	ot->exec = view_layer_remove_exec;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
@@ -771,9 +763,9 @@ static int freestyle_active_module_poll(bContext *C)
 static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	BKE_freestyle_module_add(&srl->freestyleConfig);
+	BKE_freestyle_module_add(&view_layer->freestyle_config);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
@@ -797,13 +789,13 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot)
 static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings);
 	FreestyleModuleConfig *module = ptr.data;
 
-	BKE_freestyle_module_delete(&srl->freestyleConfig, module);
+	BKE_freestyle_module_delete(&view_layer->freestyle_config, module);
 
-	DAG_id_tag_update(&scene->id, 0);
+	DEG_id_tag_update(&scene->id, 0);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
 	return OPERATOR_FINISHED;
@@ -827,13 +819,13 @@ void SCENE_OT_freestyle_module_remove(wmOperatorType *ot)
 static int freestyle_module_move_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings);
 	FreestyleModuleConfig *module = ptr.data;
 	int dir = RNA_enum_get(op->ptr, "direction");
 
-	if (BKE_freestyle_module_move(&srl->freestyleConfig, module, dir)) {
-		DAG_id_tag_update(&scene->id, 0);
+	if (BKE_freestyle_module_move(&view_layer->freestyle_config, module, dir)) {
+		DEG_id_tag_update(&scene->id, 0);
 		WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 	}
 
@@ -869,11 +861,11 @@ static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	BKE_freestyle_lineset_add(bmain, &srl->freestyleConfig, NULL);
+	BKE_freestyle_lineset_add(bmain, &view_layer->freestyle_config, NULL);
 
-	DAG_id_tag_update(&scene->id, 0);
+	DEG_id_tag_update(&scene->id, 0);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
 	return OPERATOR_FINISHED;
@@ -895,22 +887,20 @@ void SCENE_OT_freestyle_lineset_add(wmOperatorType *ot)
 
 static int freestyle_active_lineset_poll(bContext *C)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	if (!srl) {
+	if (!view_layer) {
 		return false;
 	}
 
-	return BKE_freestyle_lineset_get_active(&srl->freestyleConfig) != NULL;
+	return BKE_freestyle_lineset_get_active(&view_layer->freestyle_config) != NULL;
 }
 
 static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	FRS_copy_active_lineset(&srl->freestyleConfig);
+	FRS_copy_active_lineset(&view_layer->freestyle_config);
 
 	return OPERATOR_FINISHED;
 }
@@ -933,11 +923,11 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot)
 static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	FRS_paste_active_lineset(&srl->freestyleConfig);
+	FRS_paste_active_lineset(&view_layer->freestyle_config);
 
-	DAG_id_tag_update(&scene->id, 0);
+	DEG_id_tag_update(&scene->id, 0);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
 	return OPERATOR_FINISHED;
@@ -961,11 +951,11 @@ void SCENE_OT_freestyle_lineset_paste(wmOperatorType *ot)
 static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	FRS_delete_active_lineset(&srl->freestyleConfig);
+	FRS_delete_active_lineset(&view_layer->freestyle_config);
 
-	DAG_id_tag_update(&scene->id, 0);
+	DEG_id_tag_update(&scene->id, 0);
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
 	return OPERATOR_FINISHED;
@@ -989,11 +979,11 @@ void SCENE_OT_freestyle_lineset_remove(wmOperatorType *ot)
 static int freestyle_lineset_move_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	int dir = RNA_enum_get(op->ptr, "direction");
 
-	if (FRS_move_active_lineset(&srl->freestyleConfig, dir)) {
-		DAG_id_tag_update(&scene->id, 0);
+	if (FRS_move_active_lineset(&view_layer->freestyle_config, dir)) {
+		DEG_id_tag_update(&scene->id, 0);
 		WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 	}
 
@@ -1028,9 +1018,8 @@ void SCENE_OT_freestyle_lineset_move(wmOperatorType *ot)
 static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 
 	if (!lineset) {
 		BKE_report(op->reports, RPT_ERROR, "No active lineset to add a new line style to");
@@ -1043,7 +1032,7 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op)
 	else {
 		lineset->linestyle = BKE_linestyle_new(bmain, "LineStyle");
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1066,9 +1055,8 @@ void SCENE_OT_freestyle_linestyle_new(wmOperatorType *ot)
 
 static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	int type = RNA_enum_get(op->ptr, "type");
 
 	if (!freestyle_linestyle_check_report(lineset, op->reports)) {
@@ -1079,7 +1067,7 @@ static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "Unknown line color modifier type");
 		return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1106,9 +1094,8 @@ void SCENE_OT_freestyle_color_modifier_add(wmOperatorType *ot)
 
 static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	int type = RNA_enum_get(op->ptr, "type");
 
 	if (!freestyle_linestyle_check_report(lineset, op->reports)) {
@@ -1119,7 +1106,7 @@ static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "Unknown alpha transparency modifier type");
 		return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1146,9 +1133,8 @@ void SCENE_OT_freestyle_alpha_modifier_add(wmOperatorType *ot)
 
 static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	int type = RNA_enum_get(op->ptr, "type");
 
 	if (!freestyle_linestyle_check_report(lineset, op->reports)) {
@@ -1159,7 +1145,7 @@ static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "Unknown line thickness modifier type");
 		return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1186,9 +1172,8 @@ void SCENE_OT_freestyle_thickness_modifier_add(wmOperatorType *ot)
 
 static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	int type = RNA_enum_get(op->ptr, "type");
 
 	if (!freestyle_linestyle_check_report(lineset, op->reports)) {
@@ -1199,7 +1184,7 @@ static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "Unknown stroke geometry modifier type");
 		return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1239,9 +1224,8 @@ static int freestyle_get_modifier_type(PointerRNA *ptr)
 
 static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);
 	LineStyleModifier *modifier = ptr.data;
 
@@ -1266,7 +1250,7 @@ static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op)
 			BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
 			return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1289,9 +1273,8 @@ void SCENE_OT_freestyle_modifier_remove(wmOperatorType *ot)
 
 static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);
 	LineStyleModifier *modifier = ptr.data;
 
@@ -1316,7 +1299,7 @@ static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op)
 			BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
 			return OPERATOR_CANCELLED;
 	}
-	DAG_id_tag_update(&lineset->linestyle->id, 0);
+	DEG_id_tag_update(&lineset->linestyle->id, 0);
 	WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
 	return OPERATOR_FINISHED;
@@ -1339,9 +1322,8 @@ void SCENE_OT_freestyle_modifier_copy(wmOperatorType *ot)
 
 static int freestyle_modifier_move_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);
 	LineStyleModifier *modifier = ptr.data;
 	int dir = RNA_enum_get(op->ptr, "direction");
@@ -1370,7 +1352,7 @@ static int freestyle_modifier_move_exec(bContext *C, wmOperator *op)
 	}
 
 	if (changed) {
-		DAG_id_tag_update(&lineset->linestyle->id, 0);
+		DEG_id_tag_update(&lineset->linestyle->id, 0);
 		WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 	}
 
@@ -1405,8 +1387,8 @@ void SCENE_OT_freestyle_modifier_move(wmOperatorType *ot)
 static int freestyle_stroke_material_create_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	FreestyleLineStyle *linestyle = BKE_linestyle_active_from_scene(scene);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	FreestyleLineStyle *linestyle = BKE_linestyle_active_from_view_layer(view_layer);
 
 	if (!linestyle) {
 		BKE_report(op->reports, RPT_ERROR, "No active line style in the current scene");
@@ -1456,15 +1438,6 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op)
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act - 1, 0);
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0);
 
-				if (GS(id->name) == ID_MA) {
-					Material *ma = (Material *)id;
-					int mtexuse = ma->septex & (1 << act);
-					ma->septex &= ~(1 << act);
-					ma->septex |= (ma->septex & (1 << (act - 1))) << 1;
-					ma->septex &= ~(1 << (act - 1));
-					ma->septex |= mtexuse >> 1;
-				}
-
 				set_active_mtex(id, act - 1);
 			}
 		}
@@ -1478,20 +1451,11 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op)
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act + 1, 0);
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0);
 
-				if (GS(id->name) == ID_MA) {
-					Material *ma = (Material *)id;
-					int mtexuse = ma->septex & (1 << act);
-					ma->septex &= ~(1 << act);
-					ma->septex |= (ma->septex & (1 << (act + 1))) >> 1;
-					ma->septex &= ~(1 << (act + 1));
-					ma->septex |= mtexuse << 1;
-				}
-
 				set_active_mtex(id, act + 1);
 			}
 		}
 
-		DAG_id_tag_update(id, 0);
+		DEG_id_tag_update(id, 0);
 		WM_event_add_notifier(C, NC_TEXTURE, CTX_data_scene(C));
 	}
 
@@ -1522,180 +1486,6 @@ void TEXTURE_OT_slot_move(wmOperatorType *ot)
 
 
 
-/********************** environment map operators *********************/
-
-static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *path, const char imtype)
-{
-	PropertyRNA *prop;
-	float layout[12];
-
-	if ((prop = RNA_struct_find_property(op->ptr, "layout"))) {
-		RNA_property_float_get_array(op->ptr, prop, layout);
-	}
-	else {
-		memcpy(layout, default_envmap_layout, sizeof(layout));
-	}
-
-	if (RE_WriteEnvmapResult(op->reports, scene, env, path, imtype, layout)) {
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
-
-}
-
-static int envmap_save_exec(bContext *C, wmOperator *op)
-{
-	Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
-	Scene *scene = CTX_data_scene(C);
-	//int imtype = RNA_enum_get(op->ptr, "file_type");
-	char imtype = scene->r.im_format.imtype;
-	char path[FILE_MAX];
-
-	RNA_string_get(op->ptr, "filepath", path);
-
-	if (scene->r.scemode & R_EXTENSION) {
-		BKE_image_path_ensure_ext_from_imformat(path, &scene->r.im_format);
-	}
-
-	WM_cursor_wait(1);
-
-	save_envmap(op, scene, tex->env, path, imtype);
-
-	WM_cursor_wait(0);
-
-	WM_event_add_notifier(C, NC_TEXTURE, tex);
-
-	return OPERATOR_FINISHED;
-}
-
-static int envmap_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	//Scene *scene= CTX_data_scene(C);
-
-	if (RNA_struct_property_is_set(op->ptr, "filepath"))
-		return envmap_save_exec(C, op);
-
-	//RNA_enum_set(op->ptr, "file_type", scene->r.im_format.imtype);
-	RNA_string_set(op->ptr, "filepath", G.main->name);
-	WM_event_add_fileselect(C, op);
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static int envmap_save_poll(bContext *C)
-{
-	Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
-
-	if (!tex)
-		return 0;
-	if (!tex->env || !tex->env->ok)
-		return 0;
-	if (tex->env->cube[1] == NULL)
-		return 0;
-
-	return 1;
-}
-
-void TEXTURE_OT_envmap_save(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-	/* identifiers */
-	ot->name = "Save Environment Map";
-	ot->idname = "TEXTURE_OT_envmap_save";
-	ot->description = "Save the current generated Environment map to an image file";
-
-	/* api callbacks */
-	ot->exec = envmap_save_exec;
-	ot->invoke = envmap_save_invoke;
-	ot->poll = envmap_save_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_INTERNAL; /* no undo since this doesnt modify the env-map */
-
-	/* properties */
-	prop = RNA_def_float_array(ot->srna, "layout", 12, default_envmap_layout, 0.0f, 0.0f,
-	                           "File layout",
-	                           "Flat array describing the X,Y position of each cube face in the output image, "
-	                           "where 1 is the size of a face - order is [+Z -Z +Y -X -Y +X] "
-	                           "(use -1 to skip a face)", 0.0f, 0.0f);
-	RNA_def_property_flag(prop, PROP_HIDDEN);
-
-	WM_operator_properties_filesel(
-	        ot, FILE_TYPE_FOLDER | FILE_TYPE_IMAGE | FILE_TYPE_MOVIE, FILE_SPECIAL, FILE_SAVE,
-	        WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA);
-}
-
-static int envmap_clear_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
-
-	BKE_texture_envmap_free_data(tex->env);
-
-	WM_event_add_notifier(C, NC_TEXTURE | NA_EDITED, tex);
-
-	return OPERATOR_FINISHED;
-}
-
-static int envmap_clear_poll(bContext *C)
-{
-	Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
-
-	if (!tex)
-		return 0;
-	if (!tex->env || !tex->env->ok)
-		return 0;
-	if (tex->env->cube[1] == NULL)
-		return 0;
-
-	return 1;
-}
-
-void TEXTURE_OT_envmap_clear(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Clear Environment Map";
-	ot->idname = "TEXTURE_OT_envmap_clear";
-	ot->description = "Discard the environment map and free it from memory";
-
-	/* api callbacks */
-	ot->exec = envmap_clear_exec;
-	ot->poll = envmap_clear_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-}
-
-static int envmap_clear_all_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Main *bmain = CTX_data_main(C);
-	Tex *tex;
-
-	for (tex = bmain->tex.first; tex; tex = tex->id.next)
-		if (tex->env)
-			BKE_texture_envmap_free_data(tex->env);
-
-	WM_event_add_notifier(C, NC_TEXTURE | NA_EDITED, tex);
-
-	return OPERATOR_FINISHED;
-}
-
-void TEXTURE_OT_envmap_clear_all(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Clear All Environment Maps";
-	ot->idname = "TEXTURE_OT_envmap_clear_all";
-	ot->description = "Discard all environment maps in the .blend file and free them from memory";
-
-	/* api callbacks */
-	ot->exec = envmap_clear_all_exec;
-	ot->poll = envmap_clear_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
 /********************** material operators *********************/
 
 /* material copy/paste */
@@ -1767,17 +1557,6 @@ static void copy_mtex_copybuf(ID *id)
 	MTex **mtex = NULL;
 
 	switch (GS(id->name)) {
-		case ID_MA:
-			mtex = &(((Material *)id)->mtex[(int)((Material *)id)->texact]);
-			break;
-		case ID_LA:
-			mtex = &(((Lamp *)id)->mtex[(int)((Lamp *)id)->texact]);
-			// la->mtex[(int)la->texact] // TODO
-			break;
-		case ID_WO:
-			mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]);
-			// mtex= wrld->mtex[(int)wrld->texact]; // TODO
-			break;
 		case ID_PA:
 			mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]);
 			break;
@@ -1805,17 +1584,6 @@ static void paste_mtex_copybuf(ID *id)
 		return;
 
 	switch (GS(id->name)) {
-		case ID_MA:
-			mtex = &(((Material *)id)->mtex[(int)((Material *)id)->texact]);
-			break;
-		case ID_LA:
-			mtex = &(((Lamp *)id)->mtex[(int)((Lamp *)id)->texact]);
-			// la->mtex[(int)la->texact] // TODO
-			break;
-		case ID_WO:
-			mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]);
-			// mtex= wrld->mtex[(int)wrld->texact]; // TODO
-			break;
 		case ID_PA:
 			mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]);
 			break;
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index ceb4c0b27ba..b7e6508117e 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -38,9 +38,12 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_workspace_types.h"
 #include "DNA_world_types.h"
 #include "DNA_windowmanager_types.h"
 
+#include "DRW_engine.h"
+
 #include "BLI_listbase.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
@@ -48,14 +51,15 @@
 #include "BKE_context.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_icons.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
 #include "BKE_paint.h"
 #include "BKE_scene.h"
+#include "BKE_workspace.h"
 
 #include "GPU_material.h"
-#include "GPU_buffers.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
@@ -64,16 +68,23 @@
 #include "ED_render.h"
 #include "ED_view3d.h"
 
+#include "DEG_depsgraph.h"
+
+#include "WM_api.h"
+
 #include "render_intern.h"  // own include
 
 extern Material defmaterial;
 
 /***************************** Render Engines ********************************/
 
-void ED_render_scene_update(Main *bmain, Scene *scene, int updated)
+void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int updated)
 {
 	/* viewport rendering update on data changes, happens after depsgraph
 	 * updates if there was any change. context is set to the 3d view */
+	Main *bmain = update_ctx->bmain;
+	Scene *scene = update_ctx->scene;
+	ViewLayer *view_layer = update_ctx->view_layer;
 	bContext *C;
 	wmWindowManager *wm;
 	wmWindow *win;
@@ -102,26 +113,23 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated)
 	wm = bmain->wm.first;
 
 	for (win = wm->windows.first; win; win = win->next) {
-		bScreen *sc = win->screen;
+		bScreen *sc = WM_window_get_active_screen(win);
 		ScrArea *sa;
 		ARegion *ar;
 
 		CTX_wm_window_set(C, win);
 
 		for (sa = sc->areabase.first; sa; sa = sa->next) {
-			if (sa->spacetype != SPACE_VIEW3D)
+			if (sa->spacetype != SPACE_VIEW3D) {
 				continue;
-
+			}
+			View3D *v3d = sa->spacedata.first;
 			for (ar = sa->regionbase.first; ar; ar = ar->next) {
-				RegionView3D *rv3d;
-				RenderEngine *engine;
-
-				if (ar->regiontype != RGN_TYPE_WINDOW)
+				if (ar->regiontype != RGN_TYPE_WINDOW) {
 					continue;
-
-				rv3d = ar->regiondata;
-				engine = rv3d->render_engine;
-
+				}
+				RegionView3D *rv3d = ar->regiondata;
+				RenderEngine *engine = rv3d->render_engine;
 				/* call update if the scene changed, or if the render engine
 				 * tagged itself for update (e.g. because it was busy at the
 				 * time of the last update) */
@@ -133,6 +141,23 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated)
 
 					engine->flag &= ~RE_ENGINE_DO_UPDATE;
 					engine->type->view_update(engine, C);
+
+				}
+				else {
+					RenderEngineType *engine_type =
+					        ED_view3d_engine_type(scene, v3d->drawtype);
+					if (updated) {
+						DRW_notify_view_update(
+						        (&(DRWUpdateContext){
+						            .bmain = bmain,
+						            .depsgraph = update_ctx->depsgraph,
+						            .scene = scene,
+						            .view_layer = view_layer,
+						            .ar = ar,
+						            .v3d = (View3D *)sa->spacedata.first,
+						            .engine_type = engine_type
+						        }));
+					}
 				}
 			}
 		}
@@ -143,23 +168,6 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated)
 	recursive_check = false;
 }
 
-void ED_render_scene_update_pre(Main *bmain, Scene *scene, bool time)
-{
-	/* Blender internal might access to the data which is gonna to be freed
-	 * by the scene update functions. This applies for example to simulation
-	 * data like smoke and fire.
-	 */
-	if (time && !BKE_scene_use_new_shading_nodes(scene)) {
-		bScreen *sc;
-		ScrArea *sa;
-		for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-			for (sa = sc->areabase.first; sa; sa = sa->next) {
-				ED_render_engine_area_exit(bmain, sa);
-			}
-		}
-	}
-}
-
 void ED_render_engine_area_exit(Main *bmain, ScrArea *sa)
 {
 	/* clear all render engines in this area */
@@ -179,18 +187,23 @@ void ED_render_engine_area_exit(Main *bmain, ScrArea *sa)
 void ED_render_engine_changed(Main *bmain)
 {
 	/* on changing the render engine type, clear all running render engines */
-	bScreen *sc;
-	ScrArea *sa;
-	Scene *scene;
-
-	for (sc = bmain->screen.first; sc; sc = sc->id.next)
-		for (sa = sc->areabase.first; sa; sa = sa->next)
+	for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) {
+		for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
 			ED_render_engine_area_exit(bmain, sa);
-
+		}
+	}
 	RE_FreePersistentData();
-
-	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
-		ED_render_id_flush_update(bmain, &scene->id);
+	/* Inform all render engines and draw managers. */
+	DEGEditorUpdateContext update_ctx = {NULL};
+	update_ctx.bmain = bmain;
+	for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+		update_ctx.scene = scene;
+		LISTBASE_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
+			/* TDODO(sergey): Iterate over depsgraphs instead? */
+			update_ctx.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
+			update_ctx.view_layer = view_layer;
+			ED_render_id_flush_update(&update_ctx, &scene->id);
+		}
 		if (scene->nodetree) {
 			ntreeCompositUpdateRLayers(scene->nodetree);
 		}
@@ -198,7 +211,7 @@ void ED_render_engine_changed(Main *bmain)
 }
 
 /***************************** Updates ***********************************
- * ED_render_id_flush_update gets called from DAG_id_tag_update, to do   *
+ * ED_render_id_flush_update gets called from DEG_id_tag_update, to do   *
  * editor level updates when the ID changes. when these ID blocks are in *
  * the dependency graph, we can get rid of the manual dependency checks  */
 
@@ -228,209 +241,44 @@ static void render_engine_flag_changed(Main *bmain, int update_flag)
 	}
 }
 
-static int mtex_use_tex(MTex **mtex, int tot, Tex *tex)
-{
-	int a;
-
-	if (!mtex)
-		return 0;
-
-	for (a = 0; a < tot; a++)
-		if (mtex[a] && mtex[a]->tex == tex)
-			return 1;
-
-	return 0;
-}
-
-static int nodes_use_tex(bNodeTree *ntree, Tex *tex)
-{
-	bNode *node;
-
-	for (node = ntree->nodes.first; node; node = node->next) {
-		if (node->id) {
-			if (node->id == (ID *)tex) {
-				return 1;
-			}
-			else if (GS(node->id->name) == ID_MA) {
-				if (mtex_use_tex(((Material *)node->id)->mtex, MAX_MTEX, tex))
-					return 1;
-			}
-			else if (node->type == NODE_GROUP) {
-				if (nodes_use_tex((bNodeTree *)node->id, tex))
-					return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int nodes_use_material(bNodeTree *ntree, Material *ma)
+static void material_changed(Main *UNUSED(bmain), Material *ma)
 {
-	bNode *node;
-
-	for (node = ntree->nodes.first; node; node = node->next) {
-		if (node->id) {
-			if (node->id == (ID *)ma) {
-				return 1;
-			}
-			else if (node->type == NODE_GROUP) {
-				if (nodes_use_material((bNodeTree *)node->id, ma))
-					return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-static void material_changed(Main *bmain, Material *ma)
-{
-	Material *parent;
-	Object *ob;
-	Scene *scene;
-	int texture_draw = false;
-
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&ma->id));
 
 	/* glsl */
-	if (ma->gpumaterial.first)
-		GPU_material_free(&ma->gpumaterial);
-
-	/* find node materials using this */
-	for (parent = bmain->mat.first; parent; parent = parent->id.next) {
-		if (parent->use_nodes && parent->nodetree && nodes_use_material(parent->nodetree, ma)) {
-			/* pass */
-		}
-		else {
-			continue;
-		}
-
-		BKE_icon_changed(BKE_icon_id_ensure(&parent->id));
-
-		if (parent->gpumaterial.first)
-			GPU_material_free(&parent->gpumaterial);
-	}
-
-	/* find if we have a scene with textured display */
-	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
-		if (scene->customdata_mask & CD_MASK_MTFACE) {
-			texture_draw = true;
-			break;
-		}
-	}
-
-	/* find textured objects */
-	if (texture_draw) {
-		for (ob = bmain->object.first; ob; ob = ob->id.next) {
-			DerivedMesh *dm = ob->derivedFinal;
-			Material ***material = give_matarar(ob);
-			short a, *totmaterial = give_totcolp(ob);
-
-			if (dm && totmaterial && material) {
-				for (a = 0; a < *totmaterial; a++) {
-					if ((*material)[a] == ma) {
-						GPU_drawobject_free(dm);
-						break;
-					}
-				}
-			}
+	if (ma->id.recalc & ID_RECALC) {
+		if (!BLI_listbase_is_empty(&ma->gpumaterial)) {
+			GPU_material_free(&ma->gpumaterial);
 		}
 	}
-
 }
 
-static void lamp_changed(Main *bmain, Lamp *la)
+static void lamp_changed(Main *UNUSED(bmain), Lamp *la)
 {
-	Object *ob;
-	Material *ma;
-
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&la->id));
 
-	/* glsl */
-	for (ob = bmain->object.first; ob; ob = ob->id.next)
-		if (ob->data == la && ob->gpulamp.first)
-			GPU_lamp_free(ob);
-
-	for (ma = bmain->mat.first; ma; ma = ma->id.next)
-		if (ma->gpumaterial.first)
-			GPU_material_free(&ma->gpumaterial);
-
 	if (defmaterial.gpumaterial.first)
 		GPU_material_free(&defmaterial.gpumaterial);
 }
 
-static int material_uses_texture(Material *ma, Tex *tex)
-{
-	if (mtex_use_tex(ma->mtex, MAX_MTEX, tex))
-		return true;
-	else if (ma->use_nodes && ma->nodetree && nodes_use_tex(ma->nodetree, tex))
-		return true;
-
-	return false;
-}
-
 static void texture_changed(Main *bmain, Tex *tex)
 {
-	Material *ma;
-	Lamp *la;
-	World *wo;
 	Scene *scene;
-	Object *ob;
+	ViewLayer *view_layer;
 	bNode *node;
-	bool texture_draw = false;
 
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&tex->id));
 
 	/* paint overlays */
-	for (scene = bmain->scene.first; scene; scene = scene->id.next)
-		BKE_paint_invalidate_overlay_tex(scene, tex);
-
-	/* find materials */
-	for (ma = bmain->mat.first; ma; ma = ma->id.next) {
-		if (!material_uses_texture(ma, tex))
-			continue;
-
-		BKE_icon_changed(BKE_icon_id_ensure(&ma->id));
-
-		if (ma->gpumaterial.first)
-			GPU_material_free(&ma->gpumaterial);
-	}
-
-	/* find lamps */
-	for (la = bmain->lamp.first; la; la = la->id.next) {
-		if (mtex_use_tex(la->mtex, MAX_MTEX, tex)) {
-			lamp_changed(bmain, la);
-		}
-		else if (la->nodetree && nodes_use_tex(la->nodetree, tex)) {
-			lamp_changed(bmain, la);
-		}
-		else {
-			continue;
+	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
+		for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+			BKE_paint_invalidate_overlay_tex(scene, view_layer, tex);
 		}
 	}
 
-	/* find worlds */
-	for (wo = bmain->world.first; wo; wo = wo->id.next) {
-		if (mtex_use_tex(wo->mtex, MAX_MTEX, tex)) {
-			/* pass */
-		}
-		else if (wo->nodetree && nodes_use_tex(wo->nodetree, tex)) {
-			/* pass */
-		}
-		else {
-			continue;
-		}
-
-		BKE_icon_changed(BKE_icon_id_ensure(&wo->id));
-
-		if (wo->gpumaterial.first)
-			GPU_material_free(&wo->gpumaterial);
-	}
-
 	/* find compositing nodes */
 	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 		if (scene->use_nodes && scene->nodetree) {
@@ -439,52 +287,26 @@ static void texture_changed(Main *bmain, Tex *tex)
 					ED_node_tag_update_id(&scene->id);
 			}
 		}
-
-		if (scene->customdata_mask & CD_MASK_MTFACE)
-			texture_draw = true;
-	}
-
-	/* find textured objects */
-	if (texture_draw) {
-		for (ob = bmain->object.first; ob; ob = ob->id.next) {
-			DerivedMesh *dm = ob->derivedFinal;
-			Material ***material = give_matarar(ob);
-			short a, *totmaterial = give_totcolp(ob);
-
-			if (dm && totmaterial && material) {
-				for (a = 0; a < *totmaterial; a++) {
-					if (ob->matbits && ob->matbits[a])
-						ma = ob->mat[a];
-					else
-						ma = (*material)[a];
-
-					if (ma && material_uses_texture(ma, tex)) {
-						GPU_drawobject_free(dm);
-						break;
-					}
-				}
-			}
-		}
 	}
 }
 
-static void world_changed(Main *bmain, World *wo)
+static void world_changed(Main *UNUSED(bmain), World *wo)
 {
-	Material *ma;
-
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&wo->id));
 
-	/* glsl */
-	for (ma = bmain->mat.first; ma; ma = ma->id.next)
-		if (ma->gpumaterial.first)
-			GPU_material_free(&ma->gpumaterial);
-
-	if (defmaterial.gpumaterial.first)
-		GPU_material_free(&defmaterial.gpumaterial);
+	/* XXX temporary flag waiting for depsgraph proper tagging */
+	wo->update_flag = 1;
 
-	if (wo->gpumaterial.first)
-		GPU_material_free(&wo->gpumaterial);
+	/* glsl */
+	if (wo->id.recalc & ID_RECALC) {
+		if (!BLI_listbase_is_empty(&defmaterial.gpumaterial)) {
+			GPU_material_free(&defmaterial.gpumaterial);
+		}
+		if (!BLI_listbase_is_empty(&wo->gpumaterial)) {
+			GPU_material_free(&wo->gpumaterial);
+		}
+	}
 }
 
 static void image_changed(Main *bmain, Image *ima)
@@ -503,41 +325,26 @@ static void image_changed(Main *bmain, Image *ima)
 static void scene_changed(Main *bmain, Scene *scene)
 {
 	Object *ob;
-	Material *ma;
-	World *wo;
 
 	/* glsl */
 	for (ob = bmain->object.first; ob; ob = ob->id.next) {
-		if (ob->gpulamp.first)
-			GPU_lamp_free(ob);
-
 		if (ob->mode & OB_MODE_TEXTURE_PAINT) {
 			BKE_texpaint_slots_refresh_object(scene, ob);
 			BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
-			GPU_drawobject_free(ob->derivedFinal);
 		}
 	}
-
-	for (ma = bmain->mat.first; ma; ma = ma->id.next)
-		if (ma->gpumaterial.first)
-			GPU_material_free(&ma->gpumaterial);
-
-	for (wo = bmain->world.first; wo; wo = wo->id.next)
-		if (wo->gpumaterial.first)
-			GPU_material_free(&wo->gpumaterial);
-
-	if (defmaterial.gpumaterial.first)
-		GPU_material_free(&defmaterial.gpumaterial);
 }
 
-void ED_render_id_flush_update(Main *bmain, ID *id)
+void ED_render_id_flush_update(const DEGEditorUpdateContext *update_ctx, ID *id)
 {
 	/* this can be called from render or baking thread when a python script makes
 	 * changes, in that case we don't want to do any editor updates, and making
 	 * GPU changes is not possible because OpenGL only works in the main thread */
-	if (!BLI_thread_is_main())
+	if (!BLI_thread_is_main()) {
 		return;
-
+	}
+	Main *bmain = update_ctx->bmain;
+	/* Internal ID update handlers. */
 	switch (GS(id->name)) {
 		case ID_MA:
 			material_changed(bmain, (Material *)id);
@@ -563,15 +370,5 @@ void ED_render_id_flush_update(Main *bmain, ID *id)
 			render_engine_flag_changed(bmain, RE_ENGINE_UPDATE_OTHER);
 			break;
 	}
-
 }
 
-
-void ED_render_internal_init(void)
-{
-	RenderEngineType *ret = RE_engines_find(RE_engine_id_BLENDER_RENDER);
-
-	ret->view_update = render_view3d_update;
-	ret->view_draw = render_view3d_draw;
-
-}
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index de1194fe93d..a522817825a 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -90,8 +90,10 @@ static ScrArea *find_area_showing_r_result(bContext *C, Scene *scene, wmWindow *
 
 	/* find an imagewindow showing render result */
 	for (*win = wm->windows.first; *win; *win = (*win)->next) {
-		if ((*win)->screen->scene == scene) {
-			for (sa = (*win)->screen->areabase.first; sa; sa = sa->next) {
+		if (WM_window_get_active_scene(*win) == scene) {
+			const bScreen *screen = WM_window_get_active_screen(*win);
+
+			for (sa = screen->areabase.first; sa; sa = sa->next) {
 				if (sa->spacetype == SPACE_IMAGE) {
 					sima = sa->spacedata.first;
 					if (sima->image && sima->image->type == IMA_TYPE_R_RESULT)
@@ -246,7 +248,7 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	/* test if we have a temp screen in front */
-	if (win->screen->temp) {
+	if (WM_window_is_temp_screen(win)) {
 		wm_window_lower(win);
 		return OPERATOR_FINISHED;
 	}
@@ -292,7 +294,7 @@ static int render_view_show_invoke(bContext *C, wmOperator *op, const wmEvent *e
 	wmWindow *wincur = CTX_wm_window(C);
 
 	/* test if we have currently a temp screen active */
-	if (wincur->screen->temp) {
+	if (WM_window_is_temp_screen(wincur)) {
 		wm_window_lower(wincur);
 	}
 	else {
@@ -301,8 +303,9 @@ static int render_view_show_invoke(bContext *C, wmOperator *op, const wmEvent *e
 
 		/* is there another window on current scene showing result? */
 		for (win = CTX_wm_manager(C)->windows.first; win; win = win->next) {
-			bScreen *sc = win->screen;
-			if ((sc->temp && ((ScrArea *)sc->areabase.first)->spacetype == SPACE_IMAGE) ||
+			const bScreen *sc = WM_window_get_active_screen(win);
+
+			if ((WM_window_is_temp_screen(win) && ((ScrArea *)sc->areabase.first)->spacetype == SPACE_IMAGE) ||
 			    (win == winshow && winshow != wincur))
 			{
 				wm_window_raise(win);
diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt
new file mode 100644
index 00000000000..9fbebbc58cc
--- /dev/null
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -0,0 +1,44 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+	../include
+	../../blenkernel
+	../../blenlib
+	../../blentranslation
+	../../depsgraph
+	../../makesdna
+	../../makesrna
+	../../windowmanager
+)
+
+set(INC_SYS
+
+)
+
+set(SRC
+	scene_edit.c
+)
+
+if(WITH_INTERNATIONAL)
+	add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
+blender_add_lib(bf_editor_scene "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
new file mode 100644
index 00000000000..677fc0a068e
--- /dev/null
+++ b/source/blender/editors/scene/scene_edit.c
@@ -0,0 +1,289 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/scene/scene_edit.c
+ *  \ingroup edscene
+ */
+
+#include <stdio.h>
+
+#include "BLI_compiler_attrs.h"
+#include "BLI_listbase.h"
+
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_layer.h"
+#include "BKE_library_remap.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+#include "BKE_report.h"
+#include "BKE_scene.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
+#include "BLT_translation.h"
+
+#include "DNA_object_types.h"
+#include "DNA_workspace_types.h"
+
+#include "ED_object.h"
+#include "ED_render.h"
+#include "ED_scene.h"
+#include "ED_screen.h"
+#include "ED_util.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+
+Scene *ED_scene_add(Main *bmain, bContext *C, wmWindow *win, eSceneCopyMethod method)
+{
+	Scene *scene_new;
+
+	if (method == SCE_COPY_NEW) {
+		scene_new = BKE_scene_add(bmain, DATA_("Scene"));
+	}
+	else { /* different kinds of copying */
+		Scene *scene_old = WM_window_get_active_scene(win);
+
+		scene_new = BKE_scene_copy(bmain, scene_old, method);
+
+		/* these can't be handled in blenkernel currently, so do them here */
+		if (method == SCE_COPY_LINK_DATA) {
+			ED_object_single_users(bmain, scene_new, false, true);
+		}
+		else if (method == SCE_COPY_FULL) {
+			ED_editors_flush_edits(C, false);
+			ED_object_single_users(bmain, scene_new, true, true);
+		}
+	}
+
+	WM_window_change_active_scene(bmain, C, win, scene_new);
+
+	WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, scene_new);
+
+	return scene_new;
+}
+
+/**
+ * \note Only call outside of area/region loops
+ * \return true if successful
+ */
+bool ED_scene_delete(bContext *C, Main *bmain, wmWindow *win, Scene *scene)
+{
+	Scene *scene_new;
+
+	if (scene->id.prev)
+		scene_new = scene->id.prev;
+	else if (scene->id.next)
+		scene_new = scene->id.next;
+	else
+		return false;
+
+	WM_window_change_active_scene(bmain, C, win, scene_new);
+
+	BKE_libblock_remap(bmain, scene, scene_new, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE);
+
+	id_us_clear_real(&scene->id);
+	if (scene->id.us == 0) {
+		BKE_libblock_free(bmain, scene);
+	}
+
+	return true;
+}
+
+static ViewLayer *scene_change_get_new_view_layer(const WorkSpace *workspace, const Scene *scene_new)
+{
+	ViewLayer *layer_new = BKE_workspace_view_layer_exists(workspace, scene_new);
+	return layer_new ? layer_new : BKE_view_layer_default_view(scene_new);
+}
+
+void ED_scene_change_update(
+        Main *bmain, bContext *C,
+        wmWindow *win, const bScreen *screen, Scene *UNUSED(scene_old), Scene *scene_new)
+{
+	WorkSpace *workspace = CTX_wm_workspace(C);
+	ViewLayer *layer_new = scene_change_get_new_view_layer(workspace, scene_new);
+	Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene_new, layer_new, true);
+	Object *obact_new = OBACT(layer_new);
+	UNUSED_VARS(obact_new);
+
+#if 0
+	/* mode syncing */
+	eObjectMode object_mode_old = workspace->object_mode;
+	ViewLayer *layer_old = BKE_view_layer_from_workspace_get(scene_old, workspace);
+	Object *obact_old = OBACT(layer_old);
+	UNUSED_VARS(obact_old, object_mode_old);
+#endif
+
+	win->scene = scene_new;
+	CTX_data_scene_set(C, scene_new);
+	BKE_workspace_view_layer_set(workspace, layer_new, scene_new);
+	BKE_scene_set_background(bmain, scene_new);
+	DEG_graph_relations_update(depsgraph, bmain, scene_new, layer_new);
+	DEG_on_visible_update(bmain, false);
+
+	ED_screen_update_after_scene_change(screen, scene_new, layer_new);
+	ED_render_engine_changed(bmain);
+	ED_update_for_newframe(bmain, depsgraph);
+
+	/* complete redraw */
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+}
+
+static bool view_layer_remove_poll(
+        const Scene *scene, const ViewLayer *layer)
+{
+	const int act = BLI_findindex(&scene->view_layers, layer);
+
+	if (act == -1) {
+		return false;
+	}
+	else if ((scene->view_layers.first == scene->view_layers.last) &&
+	         (scene->view_layers.first == layer))
+	{
+		/* ensure 1 layer is kept */
+		return false;
+	}
+
+	return true;
+}
+
+static void view_layer_remove_unset_nodetrees(const Main *bmain, Scene *scene, ViewLayer *layer)
+{
+	int act_layer_index = BLI_findindex(&scene->view_layers, layer);
+
+	for (Scene *sce = bmain->scene.first; sce; sce = sce->id.next) {
+		if (sce->nodetree) {
+			BKE_nodetree_remove_layer_n(sce->nodetree, scene, act_layer_index);
+		}
+	}
+}
+
+bool ED_scene_view_layer_delete(
+        Main *bmain, Scene *scene, ViewLayer *layer,
+        ReportList *reports)
+{
+	if (view_layer_remove_poll(scene, layer) == false) {
+		if (reports) {
+			BKE_reportf(reports, RPT_ERROR, "View layer '%s' could not be removed from scene '%s'",
+			            layer->name, scene->id.name + 2);
+		}
+
+		return false;
+	}
+
+	/* We need to unset nodetrees before removing the layer, otherwise its index will be -1. */
+	view_layer_remove_unset_nodetrees(bmain, scene, layer);
+
+	BLI_remlink(&scene->view_layers, layer);
+	BLI_assert(BLI_listbase_is_empty(&scene->view_layers) == false);
+
+	ED_workspace_view_layer_unset(bmain, scene, layer, scene->view_layers.first);
+
+	BKE_view_layer_free(layer);
+
+	BKE_workspace_view_layer_remove(bmain, layer);
+
+	DEG_id_tag_update(&scene->id, 0);
+	DEG_relations_tag_update(bmain);
+	WM_main_add_notifier(NC_SCENE | ND_LAYER | NA_REMOVED, scene);
+
+	return true;
+}
+
+static int scene_new_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	wmWindow *win = CTX_wm_window(C);
+	int type = RNA_enum_get(op->ptr, "type");
+
+	ED_scene_add(bmain, C, win, type);
+
+	return OPERATOR_FINISHED;
+}
+
+static void SCENE_OT_new(wmOperatorType *ot)
+{
+	static EnumPropertyItem type_items[] = {
+		{SCE_COPY_NEW, "NEW", 0, "New", "Add new scene"},
+		{SCE_COPY_EMPTY, "EMPTY", 0, "Copy Settings", "Make a copy without any objects"},
+		{SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, "Link Objects", "Link to the objects from the current scene"},
+		{SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, "Link Object Data", "Copy objects linked to data from the current scene"},
+		{SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy", "Make a full copy of the current scene"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	/* identifiers */
+	ot->name = "New Scene";
+	ot->description = "Add new scene by type";
+	ot->idname = "SCENE_OT_new";
+
+	/* api callbacks */
+	ot->exec = scene_new_exec;
+	ot->invoke = WM_menu_invoke;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
+}
+
+static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+
+	if (ED_scene_delete(C, CTX_data_main(C), CTX_wm_window(C), scene) == false) {
+		return OPERATOR_CANCELLED;
+	}
+
+	if (G.debug & G_DEBUG)
+		printf("scene delete %p\n", scene);
+
+	WM_event_add_notifier(C, NC_SCENE | NA_REMOVED, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+static void SCENE_OT_delete(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Delete Scene";
+	ot->description = "Delete active scene";
+	ot->idname = "SCENE_OT_delete";
+
+	/* api callbacks */
+	ot->exec = scene_delete_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+void ED_operatortypes_scene(void)
+{
+	WM_operatortype_append(SCENE_OT_new);
+	WM_operatortype_append(SCENE_OT_delete);
+}
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 43e044b613a..29b9971eabb 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -23,8 +23,10 @@ set(INC
 	../../blenfont
 	../../blenkernel
 	../../blenlib
+	../../blenloader
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../gpu
 	../../imbuf
 	../../makesdna
@@ -46,6 +48,8 @@ set(SRC
 	screen_edit.c
 	screen_ops.c
 	screendump.c
+	workspace_edit.c
+	workspace_layout_edit.c
 
 	screen_intern.h
 )
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 3f365fc1500..9a70d6f23de 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -41,24 +41,28 @@
 #include "BLI_utildefines.h"
 #include "BLI_linklist_stack.h"
 
-
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_screen.h"
+#include "BKE_workspace.h"
 
 #include "RNA_access.h"
 #include "RNA_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
-#include "wm_subwindow.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "ED_screen.h"
 #include "ED_screen_types.h"
 #include "ED_space_api.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+#include "GPU_draw.h"
+
 #include "BLF_api.h"
 
 #include "IMB_imbuf.h"
@@ -72,11 +76,17 @@
 
 #include "screen_intern.h"
 
-extern void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3); /* xxx temp */
+enum RegionEmbossSide {
+	REGION_EMBOSS_LEFT   = (1 << 0),
+	REGION_EMBOSS_TOP    = (1 << 1),
+	REGION_EMBOSS_BOTTOM = (1 << 2),
+	REGION_EMBOSS_RIGHT  = (1 << 3),
+	REGION_EMBOSS_ALL    = REGION_EMBOSS_LEFT | REGION_EMBOSS_TOP | REGION_EMBOSS_RIGHT | REGION_EMBOSS_BOTTOM,
+};
 
 /* general area and region code */
 
-static void region_draw_emboss(const ARegion *ar, const rcti *scirct)
+static void region_draw_emboss(const ARegion *ar, const rcti *scirct, int sides)
 {
 	rcti rect;
 
@@ -88,35 +98,57 @@ static void region_draw_emboss(const ARegion *ar, const rcti *scirct)
 
 	/* set transp line */
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+	float color[4] = {0.0f, 0.0f, 0.0f, 0.25f};
+	UI_GetThemeColor3fv(TH_EDITOR_OUTLINE, color);
 
-	/* right  */
-	glColor4ub(0, 0, 0, 30);
-	sdrawline(rect.xmax, rect.ymin, rect.xmax, rect.ymax);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4fv(color);
 
-	/* bottom  */
-	glColor4ub(0, 0, 0, 30);
-	sdrawline(rect.xmin, rect.ymin, rect.xmax, rect.ymin);
+	immBeginAtMost(GWN_PRIM_LINES, 8);
 
-	/* top  */
-	glColor4ub(255, 255, 255, 30);
-	sdrawline(rect.xmin, rect.ymax, rect.xmax, rect.ymax);
+	/* right */
+	if (sides & REGION_EMBOSS_RIGHT) {
+		immVertex2f(pos, rect.xmax, rect.ymax);
+		immVertex2f(pos, rect.xmax, rect.ymin);
+	}
 
-	/* left  */
-	glColor4ub(255, 255, 255, 30);
-	sdrawline(rect.xmin, rect.ymin, rect.xmin, rect.ymax);
+	/* bottom */
+	if (sides & REGION_EMBOSS_BOTTOM) {
+		immVertex2f(pos, rect.xmax, rect.ymin);
+		immVertex2f(pos, rect.xmin, rect.ymin);
+	}
+
+	/* left */
+	if (sides & REGION_EMBOSS_LEFT) {
+		immVertex2f(pos, rect.xmin, rect.ymin);
+		immVertex2f(pos, rect.xmin, rect.ymax);
+	}
+
+	/* top */
+	if (sides & REGION_EMBOSS_TOP) {
+		immVertex2f(pos, rect.xmin, rect.ymax);
+		immVertex2f(pos, rect.xmax, rect.ymax);
+	}
+
+	immEnd();
+	immUnbindProgram();
 
 	glDisable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 void ED_region_pixelspace(ARegion *ar)
 {
 	wmOrtho2_region_pixelspace(ar);
-	glLoadIdentity();
+	gpuLoadIdentity();
 }
 
 /* only exported for WM */
-void ED_region_do_listen(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *note)
+void ED_region_do_listen(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *note, const Scene *scene)
 {
 	/* generic notes first */
 	switch (note->category) {
@@ -130,15 +162,15 @@ void ED_region_do_listen(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *note
 	}
 
 	if (ar->type && ar->type->listener)
-		ar->type->listener(sc, sa, ar, note);
+		ar->type->listener(sc, sa, ar, note, scene);
 }
 
 /* only exported for WM */
-void ED_area_do_listen(bScreen *sc, ScrArea *sa, wmNotifier *note)
+void ED_area_do_listen(bScreen *sc, ScrArea *sa, wmNotifier *note, Scene *scene, WorkSpace *workspace)
 {
 	/* no generic notes? */
 	if (sa->type && sa->type->listener) {
-		sa->type->listener(sc, sa, note);
+		sa->type->listener(sc, sa, note, scene, workspace);
 	}
 }
 
@@ -172,11 +204,29 @@ void ED_area_azones_update(ScrArea *sa, const int mouse_xy[2])
 				break;
 			}
 		}
+		else if (az->type == AZONE_REGION_SCROLL) {
+			/* only if mouse is not hovering the azone */
+			if (BLI_rcti_isect_pt_v(&az->rect, mouse_xy) == false) {
+				View2D *v2d = &az->ar->v2d;
+
+				if (az->direction == AZ_SCROLL_VERT) {
+					az->alpha = v2d->alpha_vert = 0;
+					changed = true;
+				}
+				else if (az->direction == AZ_SCROLL_HOR) {
+					az->alpha = v2d->alpha_hor = 0;
+					changed = true;
+				}
+				else {
+					BLI_assert(0);
+				}
+			}
+		}
 	}
 
 	if (changed) {
 		sa->flag &= ~AREA_FLAG_ACTIONZONES_UPDATE;
-		ED_area_tag_redraw(sa);
+		ED_area_tag_redraw_no_rebuild(sa);
 	}
 }
 
@@ -207,82 +257,35 @@ static void area_draw_azone_fullscreen(short x1, short y1, short x2, short y2, f
 	if (G.debug_value == 1) {
 		rcti click_rect;
 		float icon_size = UI_DPI_ICON_SIZE + 7 * UI_DPI_FAC;
-		char alpha_debug = 255 * alpha;
 
 		BLI_rcti_init(&click_rect, x, x + icon_size, y, y + icon_size);
 
-		glColor4ub(255, 0, 0, alpha_debug);
-		fdrawbox(click_rect.xmin, click_rect.ymin, click_rect.xmax, click_rect.ymax);
-		glColor4ub(0, 255, 255, alpha_debug);
-		fdrawline(click_rect.xmin, click_rect.ymin, click_rect.xmax, click_rect.ymax);
-		fdrawline(click_rect.xmin, click_rect.ymax, click_rect.xmax, click_rect.ymin);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformColor4f(1.0f, 0.0f, 0.0f, alpha);
+		imm_draw_box_wire_2d(pos, click_rect.xmin, click_rect.ymin, click_rect.xmax, click_rect.ymax);
+
+		immUniformColor4f(0.0f, 1.0f, 1.0f, alpha);
+		immBegin(GWN_PRIM_LINES, 4);
+		immVertex2f(pos, click_rect.xmin, click_rect.ymin);
+		immVertex2f(pos, click_rect.xmax, click_rect.ymax);
+		immVertex2f(pos, click_rect.xmin, click_rect.ymax);
+		immVertex2f(pos, click_rect.xmax, click_rect.ymin);
+		immEnd();
+
+		immUnbindProgram();
 	}
 }
 
 /**
  * \brief Corner widgets use for dragging and splitting the view.
  */
-static void area_draw_azone(short x1, short y1, short x2, short y2)
+static void area_draw_azone(short UNUSED(x1), short UNUSED(y1), short UNUSED(x2), short UNUSED(y2))
 {
-	int dx = x2 - x1;
-	int dy = y2 - y1;
-
-	dx = copysign(ceilf(0.3f * abs(dx)), dx);
-	dy = copysign(ceilf(0.3f * abs(dy)), dy);
-
-	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
-
-	glColor4ub(255, 255, 255, 180);
-	fdrawline(x1, y2, x2, y1);
-	glColor4ub(255, 255, 255, 130);
-	fdrawline(x1, y2 - dy, x2 - dx, y1);
-	glColor4ub(255, 255, 255, 80);
-	fdrawline(x1, y2 - 2 * dy, x2 - 2 * dx, y1);
-
-	glColor4ub(0, 0, 0, 210);
-	fdrawline(x1, y2 + 1, x2 + 1, y1);
-	glColor4ub(0, 0, 0, 180);
-	fdrawline(x1, y2 - dy + 1, x2 - dx + 1, y1);
-	glColor4ub(0, 0, 0, 150);
-	fdrawline(x1, y2 - 2 * dy + 1, x2 - 2 * dx + 1, y1);
-
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_BLEND);
-}
-
-static void region_draw_azone_icon(AZone *az)
-{
-	GLUquadricObj *qobj = NULL;
-	short midx = az->x1 + (az->x2 - az->x1) / 2;
-	short midy = az->y1 + (az->y2 - az->y1) / 2;
-
-	qobj = gluNewQuadric();
-
-	glPushMatrix();
-	glTranslatef(midx, midy, 0.0);
-
-	/* outlined circle */
-	glEnable(GL_LINE_SMOOTH);
-
-	glColor4f(1.f, 1.f, 1.f, 0.8f);
-
-	gluQuadricDrawStyle(qobj, GLU_FILL);
-	gluDisk(qobj, 0.0,  4.25f, 16, 1);
-
-	glColor4f(0.2f, 0.2f, 0.2f, 0.9f);
-
-	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-	gluDisk(qobj, 0.0,  4.25f, 16, 1);
-
-	glDisable(GL_LINE_SMOOTH);
-
-	glPopMatrix();
-	gluDeleteQuadric(qobj);
-
-	/* + */
-	sdrawline(midx, midy - 2, midx, midy + 3);
-	sdrawline(midx - 2, midy, midx + 3, midy);
+	/* No drawing needed since all corners are action zone, and visually distinguishable. */
 }
 
 static void draw_azone_plus(float x1, float y1, float x2, float y2)
@@ -290,9 +293,19 @@ static void draw_azone_plus(float x1, float y1, float x2, float y2)
 	float width = 0.1f * U.widget_unit;
 	float pad = 0.2f * U.widget_unit;
 
-	glRectf((x1 + x2 - width) * 0.5f, y1 + pad, (x1 + x2 + width) * 0.5f, y2 - pad);
-	glRectf(x1 + pad, (y1 + y2 - width) * 0.5f, (x1 + x2 - width) * 0.5f, (y1 + y2 + width) * 0.5f);
-	glRectf((x1 + x2 + width) * 0.5f, (y1 + y2 - width) * 0.5f, x2 - pad, (y1 + y2 + width) * 0.5f);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	glEnable(GL_BLEND);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4f(0.8f, 0.8f, 0.8f, 0.4f);
+
+	immRectf(pos, (x1 + x2 - width) * 0.5f, y1 + pad, (x1 + x2 + width) * 0.5f, y2 - pad);
+	immRectf(pos, x1 + pad, (y1 + y2 - width) * 0.5f, (x1 + x2 - width) * 0.5f, (y1 + y2 + width) * 0.5f);
+	immRectf(pos, (x1 + x2 + width) * 0.5f, (y1 + y2 - width) * 0.5f, x2 - pad, (y1 + y2 + width) * 0.5f);
+
+	immUnbindProgram();
+	glDisable(GL_BLEND);
 }
 
 static void region_draw_azone_tab_plus(AZone *az)
@@ -315,87 +328,10 @@ static void region_draw_azone_tab_plus(AZone *az)
 			break;
 	}
 
-	glColor4f(0.05f, 0.05f, 0.05f, 0.4f);
-	UI_draw_roundbox((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f);
+	float color[4] = {0.05f, 0.05f, 0.05f, 0.4f};
+	UI_draw_roundbox_aa(true, (float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f, color);
 
-	glEnable(GL_BLEND);
-
-	glColor4f(0.8f, 0.8f, 0.8f, 0.4f);
 	draw_azone_plus((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2);
-
-	glDisable(GL_BLEND);
-}
-
-static void region_draw_azone_tab(AZone *az)
-{
-	float col[3];
-
-	glEnable(GL_BLEND);
-	UI_GetThemeColor3fv(TH_HEADER, col);
-	glColor4f(col[0], col[1], col[2], 0.5f);
-
-	/* add code to draw region hidden as 'too small' */
-	switch (az->edge) {
-		case AE_TOP_TO_BOTTOMRIGHT:
-			UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_RB_ALPHA);
-
-			UI_draw_roundbox_shade_x(GL_POLYGON, (float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f, -0.3f, 0.05f);
-			glColor4ub(0, 0, 0, 255);
-			UI_draw_roundbox_unfilled((float)az->x1, 0.3f + (float)az->y1, (float)az->x2, 0.3f + (float)az->y2, 4.0f);
-			break;
-		case AE_BOTTOM_TO_TOPLEFT:
-			UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT | UI_RB_ALPHA);
-
-			UI_draw_roundbox_shade_x(GL_POLYGON, (float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f, -0.3f, 0.05f);
-			glColor4ub(0, 0, 0, 255);
-			UI_draw_roundbox_unfilled((float)az->x1, 0.3f + (float)az->y1, (float)az->x2, 0.3f + (float)az->y2, 4.0f);
-			break;
-		case AE_LEFT_TO_TOPRIGHT:
-			UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT | UI_RB_ALPHA);
-
-			UI_draw_roundbox_shade_x(GL_POLYGON, (float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f, -0.3f, 0.05f);
-			glColor4ub(0, 0, 0, 255);
-			UI_draw_roundbox_unfilled((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f);
-			break;
-		case AE_RIGHT_TO_TOPLEFT:
-			UI_draw_roundbox_corner_set(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_RB_ALPHA);
-
-			UI_draw_roundbox_shade_x(GL_POLYGON, (float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f, -0.3f, 0.05f);
-			glColor4ub(0, 0, 0, 255);
-			UI_draw_roundbox_unfilled((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f);
-			break;
-	}
-
-	glDisable(GL_BLEND);
-}
-
-static void region_draw_azone_tria(AZone *az)
-{
-	glEnable(GL_BLEND);
-	//UI_GetThemeColor3fv(TH_HEADER, col);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.35f);
-
-	/* add code to draw region hidden as 'too small' */
-	switch (az->edge) {
-		case AE_TOP_TO_BOTTOMRIGHT:
-			ui_draw_anti_tria((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y1, (float)(az->x1 + az->x2) / 2, (float)az->y2);
-			break;
-
-		case AE_BOTTOM_TO_TOPLEFT:
-			ui_draw_anti_tria((float)az->x1, (float)az->y2, (float)az->x2, (float)az->y2, (float)(az->x1 + az->x2) / 2, (float)az->y1);
-			break;
-
-		case AE_LEFT_TO_TOPRIGHT:
-			ui_draw_anti_tria((float)az->x2, (float)az->y1, (float)az->x2, (float)az->y2, (float)az->x1, (float)(az->y1 + az->y2) / 2);
-			break;
-
-		case AE_RIGHT_TO_TOPLEFT:
-			ui_draw_anti_tria((float)az->x1, (float)az->y1, (float)az->x1, (float)az->y2, (float)az->x2, (float)(az->y1 + az->y2) / 2);
-			break;
-
-	}
-
-	glDisable(GL_BLEND);
 }
 
 static void area_azone_tag_update(ScrArea *sa)
@@ -412,10 +348,10 @@ static void region_draw_azones(ScrArea *sa, ARegion *ar)
 
 	glLineWidth(1.0f);
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-	glPushMatrix();
-	glTranslatef(-ar->winrct.xmin, -ar->winrct.ymin, 0.0f);
+	gpuPushMatrix();
+	gpuTranslate2f(-ar->winrct.xmin, -ar->winrct.ymin);
 
 	for (az = sa->actionzones.first; az; az = az->next) {
 		/* test if action zone is over this region */
@@ -427,18 +363,10 @@ static void region_draw_azones(ScrArea *sa, ARegion *ar)
 				area_draw_azone(az->x1, az->y1, az->x2, az->y2);
 			}
 			else if (az->type == AZONE_REGION) {
-
 				if (az->ar) {
 					/* only display tab or icons when the region is hidden */
 					if (az->ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
-						if (G.debug_value == 3)
-							region_draw_azone_icon(az);
-						else if (G.debug_value == 2)
-							region_draw_azone_tria(az);
-						else if (G.debug_value == 1)
-							region_draw_azone_tab(az);
-						else
-							region_draw_azone_tab_plus(az);
+						region_draw_azone_tab_plus(az);
 					}
 				}
 			}
@@ -449,59 +377,84 @@ static void region_draw_azones(ScrArea *sa, ARegion *ar)
 					area_azone_tag_update(sa);
 				}
 			}
+			else if (az->type == AZONE_REGION_SCROLL) {
+				if (az->alpha != 0.0f) {
+					area_azone_tag_update(sa);
+				}
+				/* Don't draw this azone. */
+			}
 		}
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
 
 	glDisable(GL_BLEND);
 }
 
+/* Follow wmMsgNotifyFn spec */
+void ED_region_do_msg_notify_tag_redraw(
+        bContext *UNUSED(C), wmMsgSubscribeKey *UNUSED(msg_key), wmMsgSubscribeValue *msg_val)
+{
+	ARegion *ar = msg_val->owner;
+	ED_region_tag_redraw(ar);
+
+	/* This avoids _many_ situations where header/properties control display settings.
+	 * the common case is space properties in the header */
+	if (ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_UI)) {
+		while (ar && ar->prev) {
+			ar = ar->prev;
+		}
+		for (; ar; ar = ar->next) {
+			if (ELEM(ar->regiontype, RGN_TYPE_WINDOW, RGN_TYPE_CHANNELS)) {
+				ED_region_tag_redraw(ar);
+			}
+		}
+	}
+}
+/* Follow wmMsgNotifyFn spec */
+void ED_area_do_msg_notify_tag_refresh(
+        bContext *UNUSED(C), wmMsgSubscribeKey *UNUSED(msg_key), wmMsgSubscribeValue *msg_val)
+{
+	ScrArea *sa = msg_val->user_data;
+	ED_area_tag_refresh(sa);
+}
+
 /* only exported for WM */
-/* makes region ready for drawing, sets pixelspace */
-void ED_region_set(const bContext *C, ARegion *ar)
+void ED_region_do_layout(bContext *C, ARegion *ar)
 {
-	wmWindow *win = CTX_wm_window(C);
+	/* This is optional, only needed for dynamically sized regions. */
 	ScrArea *sa = CTX_wm_area(C);
+	ARegionType *at = ar->type;
 
-	ar->drawrct = ar->winrct;
+	if (!at->layout) {
+		return;
+	}
 
-	/* note; this sets state, so we can use wmOrtho and friends */
-	wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct, true);
+	if (at->do_lock) {
+		return;
+	}
 
-	UI_SetTheme(sa ? sa->spacetype : 0, ar->type ? ar->type->regionid : 0);
+	ar->do_draw |= RGN_DRAWING;
 
-	ED_region_pixelspace(ar);
+	UI_SetTheme(sa ? sa->spacetype : 0, at->regionid);
+	at->layout(C, ar);
 }
 
-
 /* only exported for WM */
 void ED_region_do_draw(bContext *C, ARegion *ar)
 {
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 	ARegionType *at = ar->type;
-	bool scissor_pad;
 
 	/* see BKE_spacedata_draw_locks() */
 	if (at->do_lock)
 		return;
 
-	/* if no partial draw rect set, full rect */
-	if (ar->drawrct.xmin == ar->drawrct.xmax) {
-		ar->drawrct = ar->winrct;
-		scissor_pad = true;
-	}
-	else {
-		/* extra clip for safety */
-		BLI_rcti_isect(&ar->winrct, &ar->drawrct, &ar->drawrct);
-		scissor_pad = false;
-	}
-
 	ar->do_draw |= RGN_DRAWING;
 
-	/* note; this sets state, so we can use wmOrtho and friends */
-	wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct, scissor_pad);
+	/* Set viewport, scissor, ortho and ar->drawrct. */
+	wmPartialViewport(&ar->drawrct, &ar->winrct, &ar->drawrct);
 
 	wmOrtho2_region_pixelspace(ar);
 
@@ -512,7 +465,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
 		UI_ThemeClearColor(TH_HEADER);
 		glClear(GL_COLOR_BUFFER_BIT);
 
-		UI_ThemeColor(TH_TEXT);
+		UI_FontThemeColor(BLF_default(), TH_TEXT);
 		BLF_draw_default(UI_UNIT_X, 0.4f * UI_UNIT_Y, 0.0f, ar->headerstr, BLF_DRAW_STR_DUMMY_MAX);
 	}
 	else if (at->draw) {
@@ -529,9 +482,13 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
 	/* for debugging unneeded area redraws and partial redraw */
 #if 0
 	glEnable(GL_BLEND);
-	glColor4f(drand48(), drand48(), drand48(), 0.1f);
-	glRectf(ar->drawrct.xmin - ar->winrct.xmin, ar->drawrct.ymin - ar->winrct.ymin,
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4f(drand48(), drand48(), drand48(), 0.1f);
+	immRectf(pos, ar->drawrct.xmin - ar->winrct.xmin, ar->drawrct.ymin - ar->winrct.ymin,
 	        ar->drawrct.xmax - ar->winrct.xmin, ar->drawrct.ymax - ar->winrct.ymin);
+	immUnbindProgram();
 	glDisable(GL_BLEND);
 #endif
 
@@ -540,12 +497,47 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
 	UI_blocklist_free_inactive(C, &ar->uiblocks);
 
 	if (sa) {
-		/* disable emboss when the area is full,
-		 * unless we need to see division between regions (quad-split for eg) */
-		if (((win->screen->state == SCREENFULL) && (ar->alignment == RGN_ALIGN_NONE)) == 0) {
-			region_draw_emboss(ar, &ar->winrct);
+		const bScreen *screen = WM_window_get_active_screen(win);
+
+		/* Only draw region emboss for top-bar and quad-view. */
+		if ((screen->state != SCREENFULL) && ED_area_is_global(sa)) {
+			region_draw_emboss(ar, &ar->winrct, (REGION_EMBOSS_LEFT | REGION_EMBOSS_RIGHT));
+		}
+		else if ((ar->regiontype == RGN_TYPE_WINDOW) && (ar->alignment == RGN_ALIGN_QSPLIT)) {
+			region_draw_emboss(ar, &ar->winrct, REGION_EMBOSS_ALL);
 		}
 	}
+
+	/* We may want to detach message-subscriptions from drawing. */
+	{
+		WorkSpace *workspace = CTX_wm_workspace(C);
+		wmWindowManager *wm = CTX_wm_manager(C);
+		bScreen *screen = WM_window_get_active_screen(win);
+		Scene *scene = CTX_data_scene(C);
+		struct wmMsgBus *mbus = wm->message_bus;
+		WM_msgbus_clear_by_owner(mbus, ar);
+
+		/* Cheat, always subscribe to this space type properties.
+		 *
+		 * This covers most cases and avoids copy-paste similar code for each space type.
+		 */
+		if (ELEM(ar->regiontype, RGN_TYPE_WINDOW, RGN_TYPE_CHANNELS, RGN_TYPE_UI, RGN_TYPE_TOOLS)) {
+			SpaceLink *sl = sa->spacedata.first;
+
+			PointerRNA ptr;
+			RNA_pointer_create(&screen->id, &RNA_Space, sl, &ptr);
+
+			wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+				.owner = ar,
+				.user_data = ar,
+				.notify = ED_region_do_msg_notify_tag_redraw,
+			};
+			/* All properties for this space type. */
+			WM_msg_subscribe_rna(mbus, &ptr, NULL, &msg_sub_value_region_tag_redraw, __func__);
+		}
+
+		ED_region_message_subscribe(C, workspace, scene, screen, sa, ar, mbus);
+	}
 }
 
 /* **********************************
@@ -559,7 +551,7 @@ void ED_region_tag_redraw(ARegion *ar)
 	 * but python scripts can cause this to happen indirectly */
 	if (ar && !(ar->do_draw & RGN_DRAWING)) {
 		/* zero region means full region redraw */
-		ar->do_draw &= ~RGN_DRAW_PARTIAL;
+		ar->do_draw &= ~(RGN_DRAW_PARTIAL | RGN_DRAW_NO_REBUILD);
 		ar->do_draw |= RGN_DRAW;
 		memset(&ar->drawrct, 0, sizeof(ar->drawrct));
 	}
@@ -571,6 +563,15 @@ void ED_region_tag_redraw_overlay(ARegion *ar)
 		ar->do_draw_overlay = RGN_DRAW;
 }
 
+void ED_region_tag_redraw_no_rebuild(ARegion *ar)
+{
+	if (ar && !(ar->do_draw & (RGN_DRAWING | RGN_DRAW))) {
+		ar->do_draw &= ~RGN_DRAW_PARTIAL;
+		ar->do_draw |= RGN_DRAW_NO_REBUILD;
+		memset(&ar->drawrct, 0, sizeof(ar->drawrct));
+	}
+}
+
 void ED_region_tag_refresh_ui(ARegion *ar)
 {
 	if (ar) {
@@ -581,7 +582,7 @@ void ED_region_tag_refresh_ui(ARegion *ar)
 void ED_region_tag_redraw_partial(ARegion *ar, const rcti *rct)
 {
 	if (ar && !(ar->do_draw & RGN_DRAWING)) {
-		if (!(ar->do_draw & (RGN_DRAW | RGN_DRAW_PARTIAL))) {
+		if (!(ar->do_draw & (RGN_DRAW | RGN_DRAW_NO_REBUILD | RGN_DRAW_PARTIAL))) {
 			/* no redraw set yet, set partial region */
 			ar->do_draw |= RGN_DRAW_PARTIAL;
 			ar->drawrct = *rct;
@@ -592,7 +593,7 @@ void ED_region_tag_redraw_partial(ARegion *ar, const rcti *rct)
 			BLI_rcti_union(&ar->drawrct, rct);
 		}
 		else {
-			BLI_assert((ar->do_draw & RGN_DRAW) != 0);
+			BLI_assert((ar->do_draw & (RGN_DRAW | RGN_DRAW_NO_REBUILD)) != 0);
 			/* Else, full redraw is already requested, nothing to do here. */
 		}
 	}
@@ -607,6 +608,15 @@ void ED_area_tag_redraw(ScrArea *sa)
 			ED_region_tag_redraw(ar);
 }
 
+void ED_area_tag_redraw_no_rebuild(ScrArea *sa)
+{
+	ARegion *ar;
+
+	if (sa)
+		for (ar = sa->regionbase.first; ar; ar = ar->next)
+			ED_region_tag_redraw_no_rebuild(ar);
+}
+
 void ED_area_tag_redraw_regiontype(ScrArea *sa, int regiontype)
 {
 	ARegion *ar;
@@ -656,7 +666,7 @@ void ED_area_headerprint(ScrArea *sa, const char *str)
 /* ************************************************************ */
 
 
-static void area_azone_initialize(wmWindow *win, bScreen *screen, ScrArea *sa)
+static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea *sa)
 {
 	AZone *az;
 
@@ -671,39 +681,62 @@ static void area_azone_initialize(wmWindow *win, bScreen *screen, ScrArea *sa)
 		return;
 	}
 
-	/* can't click on bottom corners on OS X, already used for resizing */
+	if (ED_area_is_global(sa)) {
+		return;
+	}
+
+	float coords[4][4] = {
+	    /* Bottom-left. */
+	    {sa->totrct.xmin,
+	     sa->totrct.ymin,
+	     sa->totrct.xmin + (AZONESPOT - 1),
+	     sa->totrct.ymin + (AZONESPOT - 1)},
+	    /* Bottom-right. */
+	    {sa->totrct.xmax,
+	     sa->totrct.ymin,
+	     sa->totrct.xmax - (AZONESPOT - 1),
+	     sa->totrct.ymin + (AZONESPOT - 1)},
+	    /* Top-left. */
+	    {sa->totrct.xmin,
+	     sa->totrct.ymax,
+	     sa->totrct.xmin + (AZONESPOT - 1),
+	     sa->totrct.ymax - (AZONESPOT - 1)},
+	    /* Top-right. */
+	    {sa->totrct.xmax,
+	     sa->totrct.ymax,
+	     sa->totrct.xmax - (AZONESPOT - 1),
+	     sa->totrct.ymax - (AZONESPOT - 1)}};
+
+	for (int i = 0; i < 4; i++) {
+		/* can't click on bottom corners on OS X, already used for resizing */
 #ifdef __APPLE__
-	if (!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win))
+		if (!WM_window_is_fullscreen(win) &&
+		    ((coords[i][0] == 0 && coords[i][1] == 0) ||
+		     (coords[i][0] == WM_window_pixels_x(win) && coords[i][1] == 0)))
+		{
+			continue;
+		}
 #else
-	(void)win;
+		(void)win;
 #endif
-	{
+
 		/* set area action zones */
 		az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
 		BLI_addtail(&(sa->actionzones), az);
 		az->type = AZONE_AREA;
-		az->x1 = sa->totrct.xmin;
-		az->y1 = sa->totrct.ymin;
-		az->x2 = sa->totrct.xmin + (AZONESPOT - 1);
-		az->y2 = sa->totrct.ymin + (AZONESPOT - 1);
+		az->x1 = coords[i][0];
+		az->y1 = coords[i][1];
+		az->x2 = coords[i][2];
+		az->y2 = coords[i][3];
 		BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 	}
-
-	az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
-	BLI_addtail(&(sa->actionzones), az);
-	az->type = AZONE_AREA;
-	az->x1 = sa->totrct.xmax;
-	az->y1 = sa->totrct.ymax;
-	az->x2 = sa->totrct.xmax - (AZONESPOT - 1);
-	az->y2 = sa->totrct.ymax - (AZONESPOT - 1);
-	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
 static void fullscreen_azone_initialize(ScrArea *sa, ARegion *ar)
 {
 	AZone *az;
 
-	if (ar->regiontype != RGN_TYPE_WINDOW)
+	if (ED_area_is_global(sa) || (ar->regiontype != RGN_TYPE_WINDOW))
 		return;
 
 	az = (AZone *)MEM_callocN(sizeof(AZone), "fullscreen action zone");
@@ -753,65 +786,6 @@ static void region_azone_edge(AZone *az, ARegion *ar)
 	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
-static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar)
-{
-	AZone *azt;
-	int tot = 0;
-
-	/* count how many actionzones with along same edge are available.
-	 * This allows for adding more action zones in the future without
-	 * having to worry about correct offset */
-	for (azt = sa->actionzones.first; azt; azt = azt->next) {
-		if (azt->edge == az->edge) tot++;
-	}
-
-	switch (az->edge) {
-		case AE_TOP_TO_BOTTOMRIGHT:
-			az->x1 = ar->winrct.xmax - tot * 2 * AZONEPAD_ICON;
-			az->y1 = ar->winrct.ymax + AZONEPAD_ICON;
-			az->x2 = ar->winrct.xmax - tot * AZONEPAD_ICON;
-			az->y2 = ar->winrct.ymax + 2 * AZONEPAD_ICON;
-			break;
-		case AE_BOTTOM_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmin + AZONEPAD_ICON;
-			az->y1 = ar->winrct.ymin - 2 * AZONEPAD_ICON;
-			az->x2 = ar->winrct.xmin + 2 * AZONEPAD_ICON;
-			az->y2 = ar->winrct.ymin - AZONEPAD_ICON;
-			break;
-		case AE_LEFT_TO_TOPRIGHT:
-			az->x1 = ar->winrct.xmin - 2 * AZONEPAD_ICON;
-			az->y1 = ar->winrct.ymax - tot * 2 * AZONEPAD_ICON;
-			az->x2 = ar->winrct.xmin - AZONEPAD_ICON;
-			az->y2 = ar->winrct.ymax - tot * AZONEPAD_ICON;
-			break;
-		case AE_RIGHT_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmax + AZONEPAD_ICON;
-			az->y1 = ar->winrct.ymax - tot * 2 * AZONEPAD_ICON;
-			az->x2 = ar->winrct.xmax + 2 * AZONEPAD_ICON;
-			az->y2 = ar->winrct.ymax - tot * AZONEPAD_ICON;
-			break;
-	}
-
-	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
-
-	/* if more azones on 1 spot, set offset */
-	for (azt = sa->actionzones.first; azt; azt = azt->next) {
-		if (az != azt) {
-			if (ABS(az->x1 - azt->x1) < 2 && ABS(az->y1 - azt->y1) < 2) {
-				if (az->edge == AE_TOP_TO_BOTTOMRIGHT || az->edge == AE_BOTTOM_TO_TOPLEFT) {
-					az->x1 += AZONESPOT;
-					az->x2 += AZONESPOT;
-				}
-				else {
-					az->y1 -= AZONESPOT;
-					az->y2 -= AZONESPOT;
-				}
-				BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
-			}
-		}
-	}
-}
-
 #define AZONEPAD_TAB_PLUSW  (0.7f * U.widget_unit)
 #define AZONEPAD_TAB_PLUSH  (0.7f * U.widget_unit)
 
@@ -856,143 +830,99 @@ static void region_azone_tab_plus(ScrArea *sa, AZone *az, ARegion *ar)
 	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
-
-#define AZONEPAD_TABW   (0.9f * U.widget_unit)
-#define AZONEPAD_TABH   (0.35f * U.widget_unit)
-
-/* region already made zero sized, in shape of edge */
-static void region_azone_tab(ScrArea *sa, AZone *az, ARegion *ar)
+static void region_azone_edge_initialize(ScrArea *sa, ARegion *ar, AZEdge edge, const bool is_fullscreen)
 {
-	AZone *azt;
-	int tot = 0, add;
+	AZone *az = NULL;
+	const bool is_hidden = (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL));
 
-	for (azt = sa->actionzones.first; azt; azt = azt->next) {
-		if (azt->edge == az->edge) tot++;
+	if (is_hidden && is_fullscreen) {
+		return;
 	}
 
-	switch (az->edge) {
-		case AE_TOP_TO_BOTTOMRIGHT:
-			add = (ar->winrct.ymax == sa->totrct.ymin) ? 1 : 0;
-			az->x1 = ar->winrct.xmax - 2 * AZONEPAD_TABW;
-			az->y1 = ar->winrct.ymax - add;
-			az->x2 = ar->winrct.xmax - AZONEPAD_TABW;
-			az->y2 = ar->winrct.ymax - add + AZONEPAD_TABH;
-			break;
-		case AE_BOTTOM_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmin + AZONEPAD_TABW;
-			az->y1 = ar->winrct.ymin - AZONEPAD_TABH;
-			az->x2 = ar->winrct.xmin + 2 * AZONEPAD_TABW;
-			az->y2 = ar->winrct.ymin;
-			break;
-		case AE_LEFT_TO_TOPRIGHT:
-			az->x1 = ar->winrct.xmin + 1 - AZONEPAD_TABH;
-			az->y1 = ar->winrct.ymax - 2 * AZONEPAD_TABW;
-			az->x2 = ar->winrct.xmin + 1;
-			az->y2 = ar->winrct.ymax - AZONEPAD_TABW;
-			break;
-		case AE_RIGHT_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmax - 1;
-			az->y1 = ar->winrct.ymax - 2 * AZONEPAD_TABW;
-			az->x2 = ar->winrct.xmax - 1 + AZONEPAD_TABH;
-			az->y2 = ar->winrct.ymax - AZONEPAD_TABW;
-			break;
+	az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
+	BLI_addtail(&(sa->actionzones), az);
+	az->type = AZONE_REGION;
+	az->ar = ar;
+	az->edge = edge;
+
+	if (is_hidden) {
+		region_azone_tab_plus(sa, az, ar);
+	}
+	else if (!is_hidden && (ar->regiontype != RGN_TYPE_HEADER)) {
+		region_azone_edge(az, ar);
 	}
-	/* rect needed for mouse pointer test */
-	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
-#define AZONEPAD_TRIAW  (0.8f * U.widget_unit)
-#define AZONEPAD_TRIAH  (0.45f * U.widget_unit)
-
-
-/* region already made zero sized, in shape of edge */
-static void region_azone_tria(ScrArea *sa, AZone *az, ARegion *ar)
+static void region_azone_scrollbar_initialize(ScrArea *sa, ARegion *ar, AZScrollDirection direction)
 {
-	AZone *azt;
-	int tot = 0, add;
+	rcti scroller_vert = (direction == AZ_SCROLL_VERT) ? ar->v2d.vert : ar->v2d.hor;
+	AZone *az = MEM_callocN(sizeof(*az), __func__);
 
-	for (azt = sa->actionzones.first; azt; azt = azt->next) {
-		if (azt->edge == az->edge) tot++;
-	}
+	BLI_addtail(&sa->actionzones, az);
+	az->type = AZONE_REGION_SCROLL;
+	az->ar = ar;
+	az->direction = direction;
 
-	switch (az->edge) {
-		case AE_TOP_TO_BOTTOMRIGHT:
-			add = (ar->winrct.ymax == sa->totrct.ymin) ? 1 : 0;
-			az->x1 = ar->winrct.xmax - 2 * AZONEPAD_TRIAW;
-			az->y1 = ar->winrct.ymax - add;
-			az->x2 = ar->winrct.xmax - AZONEPAD_TRIAW;
-			az->y2 = ar->winrct.ymax - add + AZONEPAD_TRIAH;
-			break;
-		case AE_BOTTOM_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmin + AZONEPAD_TRIAW;
-			az->y1 = ar->winrct.ymin - AZONEPAD_TRIAH;
-			az->x2 = ar->winrct.xmin + 2 * AZONEPAD_TRIAW;
-			az->y2 = ar->winrct.ymin;
-			break;
-		case AE_LEFT_TO_TOPRIGHT:
-			az->x1 = ar->winrct.xmin + 1 - AZONEPAD_TRIAH;
-			az->y1 = ar->winrct.ymax - 2 * AZONEPAD_TRIAW;
-			az->x2 = ar->winrct.xmin + 1;
-			az->y2 = ar->winrct.ymax - AZONEPAD_TRIAW;
-			break;
-		case AE_RIGHT_TO_TOPLEFT:
-			az->x1 = ar->winrct.xmax - 1;
-			az->y1 = ar->winrct.ymax - 2 * AZONEPAD_TRIAW;
-			az->x2 = ar->winrct.xmax - 1 + AZONEPAD_TRIAH;
-			az->y2 = ar->winrct.ymax - AZONEPAD_TRIAW;
-			break;
+	if (direction == AZ_SCROLL_VERT) {
+		az->ar->v2d.alpha_vert = 0;
 	}
-	/* rect needed for mouse pointer test */
+	else if (direction == AZ_SCROLL_HOR) {
+		az->ar->v2d.alpha_hor = 0;
+	}
+
+	BLI_rcti_translate(&scroller_vert, ar->winrct.xmin, ar->winrct.ymin);
+	az->x1 = scroller_vert.xmin - AZONEFADEIN;
+	az->y1 = scroller_vert.ymin - AZONEFADEIN;
+	az->x2 = scroller_vert.xmax + AZONEFADEIN;
+	az->y2 = scroller_vert.ymax + AZONEFADEIN;
+
 	BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
-
-static void region_azone_initialize(ScrArea *sa, ARegion *ar, AZEdge edge, const bool is_fullscreen)
+static void region_azones_scrollbars_initialize(ScrArea *sa, ARegion *ar)
 {
-	AZone *az = NULL;
-	const bool is_hidden = (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) == 0;
-
-	if (is_hidden || !is_fullscreen) {
-		az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
-		BLI_addtail(&(sa->actionzones), az);
-		az->type = AZONE_REGION;
-		az->ar = ar;
-		az->edge = edge;
-	}
+	const View2D *v2d = &ar->v2d;
 
-	if (!is_hidden) {
-		if (!is_fullscreen) {
-			if (G.debug_value == 3)
-				region_azone_icon(sa, az, ar);
-			else if (G.debug_value == 2)
-				region_azone_tria(sa, az, ar);
-			else if (G.debug_value == 1)
-				region_azone_tab(sa, az, ar);
-			else
-				region_azone_tab_plus(sa, az, ar);
-		}
+	if ((v2d->scroll & V2D_SCROLL_VERTICAL)   && ((v2d->scroll & V2D_SCROLL_SCALE_VERTICAL)   == 0)) {
+		region_azone_scrollbar_initialize(sa, ar, AZ_SCROLL_VERT);
 	}
-	else {
-		region_azone_edge(az, ar);
+	if ((v2d->scroll & V2D_SCROLL_HORIZONTAL) && ((v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) == 0)) {
+		region_azone_scrollbar_initialize(sa, ar, AZ_SCROLL_HOR);
 	}
-
 }
 
 
 /* *************************************************************** */
 
-static void region_azone_add(ScrArea *sa, ARegion *ar, const int alignment, const bool is_fullscreen)
+static void region_azones_add(const bScreen *screen, ScrArea *sa, ARegion *ar, const int alignment)
 {
+	const bool is_fullscreen = screen->state == SCREENFULL;
+
 	/* edge code (t b l r) is along which area edge azone will be drawn */
 
-	if (alignment == RGN_ALIGN_TOP)
-		region_azone_initialize(sa, ar, AE_BOTTOM_TO_TOPLEFT, is_fullscreen);
+	if (ar->regiontype == RGN_TYPE_HEADER && ar->winy + 6 > sa->winy) {
+		/* The logic for this is: when the header takes up the full area,
+		 * disallow hiding it to view the main window.
+		 *
+		 * Without this, you can drag down the file selectors header and hide it
+		 * by accident very easily (highly annoying!), the value 6 is arbitrary
+		 * but accounts for small common rounding problems when scaling the UI,
+		 * must be minimum '4' */
+	}
+	else if (alignment == RGN_ALIGN_TOP)
+		region_azone_edge_initialize(sa, ar, AE_BOTTOM_TO_TOPLEFT, is_fullscreen);
 	else if (alignment == RGN_ALIGN_BOTTOM)
-		region_azone_initialize(sa, ar, AE_TOP_TO_BOTTOMRIGHT, is_fullscreen);
+		region_azone_edge_initialize(sa, ar, AE_TOP_TO_BOTTOMRIGHT, is_fullscreen);
 	else if (alignment == RGN_ALIGN_RIGHT)
-		region_azone_initialize(sa, ar, AE_LEFT_TO_TOPRIGHT, is_fullscreen);
+		region_azone_edge_initialize(sa, ar, AE_LEFT_TO_TOPRIGHT, is_fullscreen);
 	else if (alignment == RGN_ALIGN_LEFT)
-		region_azone_initialize(sa, ar, AE_RIGHT_TO_TOPLEFT, is_fullscreen);
+		region_azone_edge_initialize(sa, ar, AE_RIGHT_TO_TOPLEFT, is_fullscreen);
+
+	if (is_fullscreen) {
+		fullscreen_azone_initialize(sa, ar);
+	}
+
+	region_azones_scrollbars_initialize(sa, ar);
 }
 
 /* dir is direction to check, not the splitting edge direction! */
@@ -1018,6 +948,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar)
 
 	/* find overlapping previous region on same place */
 	for (ar1 = ar->prev; ar1; ar1 = ar1->prev) {
+		if (ar1->flag & (RGN_FLAG_HIDDEN)) {
+			continue;
+		}
+
 		if (ar1->overlap && ((ar1->alignment & RGN_SPLIT_PREV) == 0)) {
 			align1 = ar1->alignment;
 			if (BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) {
@@ -1057,6 +991,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar)
 	/* At this point, 'ar' is in its final position and still open.
 	 * Make a final check it does not overlap any previous 'other side' region. */
 	for (ar1 = ar->prev; ar1; ar1 = ar1->prev) {
+		if (ar1->flag & (RGN_FLAG_HIDDEN)) {
+			continue;
+		}
+
 		if (ar1->overlap && (ar1->alignment & RGN_SPLIT_PREV) == 0) {
 			if ((ar1->alignment != align) && BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) {
 				/* Left overlapping right or vice-versa, forbid this! */
@@ -1068,16 +1006,19 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar)
 }
 
 /* overlapping regions only in the following restricted cases */
-static bool region_is_overlap(wmWindow *win, ScrArea *sa, ARegion *ar)
+bool ED_region_is_overlap(int spacetype, int regiontype)
 {
 	if (U.uiflag2 & USER_REGION_OVERLAP) {
-		if (WM_is_draw_triple(win)) {
-			if (ELEM(sa->spacetype, SPACE_VIEW3D, SPACE_SEQ)) {
-				if (ELEM(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS))
+		if (ELEM(spacetype, SPACE_VIEW3D, SPACE_SEQ, SPACE_IMAGE)) {
+			if (ELEM(regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS))
+				return 1;
+
+			if (ELEM(spacetype, SPACE_VIEW3D, SPACE_IMAGE)) {
+				if (regiontype == RGN_TYPE_HEADER)
 					return 1;
 			}
-			else if (sa->spacetype == SPACE_IMAGE) {
-				if (ELEM(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS, RGN_TYPE_PREVIEW))
+			else if (spacetype == SPACE_SEQ) {
+				if (regiontype == RGN_TYPE_PREVIEW)
 					return 1;
 			}
 		}
@@ -1086,7 +1027,7 @@ static bool region_is_overlap(wmWindow *win, ScrArea *sa, ARegion *ar)
 	return 0;
 }
 
-static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti *remainder, int quad)
+static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti *remainder, rcti *overlap_remainder, int quad)
 {
 	rcti *remainder_prev = remainder;
 	int prefsizex, prefsizey;
@@ -1106,7 +1047,7 @@ static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti
 	alignment = ar->alignment & ~RGN_SPLIT_PREV;
 
 	/* set here, assuming userpref switching forces to call this again */
-	ar->overlap = region_is_overlap(win, sa, ar);
+	ar->overlap = ED_region_is_overlap(sa->spacetype, ar->regiontype);
 
 	/* clear state flags first */
 	ar->flag &= ~RGN_FLAG_TOO_SMALL;
@@ -1114,12 +1055,15 @@ static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti
 	if (ar->next == NULL && alignment != RGN_ALIGN_QSPLIT)
 		alignment = RGN_ALIGN_NONE;
 
-	/* prefsize, for header we stick to exception (prevent dpi rounding error) */
-	prefsizex = UI_DPI_FAC * (ar->sizex > 1 ? ar->sizex + 0.5f : ar->type->prefsizex);
+	/* prefsize, taking into account DPI */
+	prefsizex = UI_DPI_FAC * ((ar->sizex > 1) ? ar->sizex + 0.5f : ar->type->prefsizex);
 
 	if (ar->regiontype == RGN_TYPE_HEADER) {
 		prefsizey = ED_area_headersize();
 	}
+	else if (ED_area_is_global(sa)) {
+		prefsizey = ED_region_global_size_y();
+	}
 	else if (ar->regiontype == RGN_TYPE_UI && sa->spacetype == SPACE_FILE) {
 		prefsizey = UI_UNIT_Y * 2 + (UI_UNIT_Y / 2);
 	}
@@ -1144,50 +1088,50 @@ static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti
 		BLI_rcti_init(remainder, 0, 0, 0, 0);
 	}
 	else if (alignment == RGN_ALIGN_TOP || alignment == RGN_ALIGN_BOTTOM) {
+		rcti *winrct = (ar->overlap) ? overlap_remainder : remainder;
 
-		if (rct_fits(remainder, 'v', prefsizey) < 0) {
+		if (rct_fits(winrct, 'v', prefsizey) < 0) {
 			ar->flag |= RGN_FLAG_TOO_SMALL;
 		}
 		else {
-			int fac = rct_fits(remainder, 'v', prefsizey);
+			int fac = rct_fits(winrct, 'v', prefsizey);
 
 			if (fac < 0)
 				prefsizey += fac;
 
-			ar->winrct = *remainder;
+			ar->winrct = *winrct;
 
 			if (alignment == RGN_ALIGN_TOP) {
 				ar->winrct.ymin = ar->winrct.ymax - prefsizey + 1;
-				remainder->ymax = ar->winrct.ymin - 1;
+				winrct->ymax = ar->winrct.ymin - 1;
 			}
 			else {
 				ar->winrct.ymax = ar->winrct.ymin + prefsizey - 1;
-				remainder->ymin = ar->winrct.ymax + 1;
+				winrct->ymin = ar->winrct.ymax + 1;
 			}
 		}
 	}
 	else if (ELEM(alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
+		rcti *winrct = (ar->overlap) ? overlap_remainder : remainder;
 
-		if (rct_fits(remainder, 'h', prefsizex) < 0) {
+		if (rct_fits(winrct, 'h', prefsizex) < 0) {
 			ar->flag |= RGN_FLAG_TOO_SMALL;
 		}
 		else {
-			int fac = rct_fits(remainder, 'h', prefsizex);
+			int fac = rct_fits(winrct, 'h', prefsizex);
 
 			if (fac < 0)
 				prefsizex += fac;
 
-			ar->winrct = *remainder;
+			ar->winrct = *winrct;
 
 			if (alignment == RGN_ALIGN_RIGHT) {
 				ar->winrct.xmin = ar->winrct.xmax - prefsizex + 1;
-				if (ar->overlap == 0)
-					remainder->xmax = ar->winrct.xmin - 1;
+				winrct->xmax = ar->winrct.xmin - 1;
 			}
 			else {
 				ar->winrct.xmax = ar->winrct.xmin + prefsizex - 1;
-				if (ar->overlap == 0)
-					remainder->xmin = ar->winrct.xmax + 1;
+				winrct->xmin = ar->winrct.xmax + 1;
 			}
 		}
 	}
@@ -1271,12 +1215,13 @@ static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti
 	if (ar->winy > 1) ar->sizey = (ar->winy + 0.5f) /  UI_DPI_FAC;
 
 	/* exception for multiple overlapping regions on same spot */
-	if (ar->overlap)
+	if (ar->overlap) {
 		region_overlap_fix(sa, ar);
+	}
 
 	/* set winrect for azones */
 	if (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
-		ar->winrct = *remainder;
+		ar->winrct = (ar->overlap) ? *overlap_remainder : *remainder;
 
 		switch (alignment) {
 			case RGN_ALIGN_TOP:
@@ -1305,42 +1250,46 @@ static void region_rect_recursive(wmWindow *win, ScrArea *sa, ARegion *ar, rcti
 		}
 	}
 
-	/* in end, add azones, where appropriate */
-	if (ar->regiontype == RGN_TYPE_HEADER && ar->winy + 6 > sa->winy) {
-		/* The logic for this is: when the header takes up the full area,
-		 * disallow hiding it to view the main window.
-		 *
-		 * Without this, you can drag down the file selectors header and hide it
-		 * by accident very easily (highly annoying!), the value 6 is arbitrary
-		 * but accounts for small common rounding problems when scaling the UI,
-		 * must be minimum '4' */
-	}
-	else {
-		if (ELEM(win->screen->state, SCREENNORMAL, SCREENMAXIMIZED)) {
-			region_azone_add(sa, ar, alignment, false);
-		}
-		else {
-			region_azone_add(sa, ar, alignment, true);
-			fullscreen_azone_initialize(sa, ar);
-		}
+	/* After non-overlapping region, all following overlapping regions
+	 * fit within the remaining space again. */
+	if (!ar->overlap) {
+		*overlap_remainder = *remainder;
 	}
 
-	region_rect_recursive(win, sa, ar->next, remainder, quad);
+	region_rect_recursive(win, sa, ar->next, remainder, overlap_remainder, quad);
 }
 
-static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
+static void area_calc_totrct(ScrArea *sa, const rcti *window_rect)
 {
-	short rt = (short) U.pixelsize;
+	short px = (short)U.pixelsize;
 
-	if (sa->v1->vec.x > 0) sa->totrct.xmin = sa->v1->vec.x + rt;
-	else sa->totrct.xmin = sa->v1->vec.x;
-	if (sa->v4->vec.x < sizex - 1) sa->totrct.xmax = sa->v4->vec.x - rt;
-	else sa->totrct.xmax = sa->v4->vec.x;
+	sa->totrct.xmin = sa->v1->vec.x;
+	sa->totrct.xmax = sa->v4->vec.x;
+	sa->totrct.ymin = sa->v1->vec.y;
+	sa->totrct.ymax = sa->v2->vec.y;
 
-	if (sa->v1->vec.y > 0) sa->totrct.ymin = sa->v1->vec.y + rt;
-	else sa->totrct.ymin = sa->v1->vec.y;
-	if (sa->v2->vec.y < sizey - 1) sa->totrct.ymax = sa->v2->vec.y - rt;
-	else sa->totrct.ymax = sa->v2->vec.y;
+	/* scale down totrct by 1 pixel on all sides not matching window borders */
+	if (sa->totrct.xmin > window_rect->xmin) {
+		sa->totrct.xmin += px;
+	}
+	if (sa->totrct.xmax < (window_rect->xmax - 1)) {
+		sa->totrct.xmax -= px;
+	}
+	if (sa->totrct.ymin > window_rect->ymin) {
+		sa->totrct.ymin += px;
+	}
+	if (sa->totrct.ymax < (window_rect->ymax - 1)) {
+		sa->totrct.ymax -= px;
+	}
+	/* Although the following asserts are correct they lead to a very unstable Blender.
+	 * And the asserts would fail even in 2.7x (they were added in 2.8x as part of the top-bar commit).
+	 * For more details see T54864. */
+#if 0
+	BLI_assert(sa->totrct.xmin >= 0);
+	BLI_assert(sa->totrct.xmax >= 0);
+	BLI_assert(sa->totrct.ymin >= 0);
+	BLI_assert(sa->totrct.ymax >= 0);
+#endif
 
 	/* for speedup */
 	sa->winx = BLI_rcti_size_x(&sa->totrct) + 1;
@@ -1349,24 +1298,14 @@ static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
 
 
 /* used for area initialize below */
-static void region_subwindow(wmWindow *win, ARegion *ar, bool activate)
+static void region_subwindow(ARegion *ar)
 {
 	bool hidden = (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) != 0;
 
 	if ((ar->alignment & RGN_SPLIT_PREV) && ar->prev)
 		hidden = hidden || (ar->prev->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL));
 
-	if (hidden) {
-		if (ar->swinid)
-			wm_subwindow_close(win, ar->swinid);
-		ar->swinid = 0;
-	}
-	else if (ar->swinid == 0) {
-		ar->swinid = wm_subwindow_open(win, &ar->winrct, activate);
-	}
-	else {
-		wm_subwindow_position(win, ar->swinid, &ar->winrct, activate);
-	}
+	ar->visible = !hidden;
 }
 
 static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *handlers, int flag)
@@ -1390,19 +1329,15 @@ static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *hand
 		/* time-markers */
 		wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Markers", 0, 0);
 
-		/* time space only has this keymap, the others get a boundbox restricted map */
-		if (sa->spacetype != SPACE_TIME) {
-			ARegion *ar;
-			/* same local check for all areas */
-			static rcti rect = {0, 10000, 0, -1};
-			rect.ymax = UI_MARKER_MARGIN_Y;
-			ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
-			if (ar) {
-				WM_event_add_keymap_handler_bb(handlers, keymap, &rect, &ar->winrct);
-			}
+		/* use a boundbox restricted map */
+		ARegion *ar;
+		/* same local check for all areas */
+		static rcti rect = {0, 10000, 0, -1};
+		rect.ymax = UI_MARKER_MARGIN_Y;
+		ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
+		if (ar) {
+			WM_event_add_keymap_handler_bb(handlers, keymap, &rect, &ar->winrct);
 		}
-		else
-			WM_event_add_keymap_handler(handlers, keymap);
 	}
 	if (flag & ED_KEYMAP_ANIMATION) {
 		/* frame changing and timeline operators (for time spaces) */
@@ -1436,18 +1371,55 @@ static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *hand
 	}
 }
 
+void ED_area_update_region_sizes(wmWindowManager *wm, wmWindow *win, ScrArea *area)
+{
+	rcti rect, overlap_rect;
+	rcti window_rect;
+
+	if (!(area->flag & AREA_FLAG_REGION_SIZE_UPDATE)) {
+		return;
+	}
+
+	WM_window_rect_calc(win, &window_rect);
+	area_calc_totrct(area, &window_rect);
+
+	/* region rect sizes */
+	rect = area->totrct;
+	overlap_rect = rect;
+	region_rect_recursive(win, area, area->regionbase.first, &rect, &overlap_rect, 0);
+
+	for (ARegion *ar = area->regionbase.first; ar; ar = ar->next) {
+		region_subwindow(ar);
+
+		/* region size may have changed, init does necessary adjustments */
+		if (ar->type->init) {
+			ar->type->init(wm, ar);
+		}
+	}
+
+	area->flag &= ~AREA_FLAG_REGION_SIZE_UPDATE;
+}
 
 /* called in screen_refresh, or screens_init, also area size changes */
 void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
 {
+	WorkSpace *workspace = WM_window_get_active_workspace(win);
+	const bScreen *screen = BKE_workspace_active_screen_get(win->workspace_hook);
+	Scene *scene = WM_window_get_active_scene(win);
 	ARegion *ar;
-	rcti rect;
+	rcti rect, overlap_rect;
+	rcti window_rect;
+
+	if (ED_area_is_global(sa) && (sa->global->flag & GLOBAL_AREA_IS_HIDDEN)) {
+		return;
+	}
+	WM_window_rect_calc(win, &window_rect);
 
 	/* set typedefinitions */
 	sa->type = BKE_spacetype_from_id(sa->spacetype);
 
 	if (sa->type == NULL) {
-		sa->butspacetype = sa->spacetype = SPACE_VIEW3D;
+		sa->spacetype = SPACE_VIEW3D;
 		sa->type = BKE_spacetype_from_id(sa->spacetype);
 	}
 
@@ -1455,14 +1427,13 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
 		ar->type = BKE_regiontype_from_id(sa->type, ar->regiontype);
 
 	/* area sizes */
-	area_calc_totrct(sa, WM_window_pixels_x(win), WM_window_pixels_y(win));
-
-	/* clear all azones, add the area triange widgets */
-	area_azone_initialize(win, win->screen, sa);
+	area_calc_totrct(sa, &window_rect);
 
 	/* region rect sizes */
 	rect = sa->totrct;
-	region_rect_recursive(win, sa, sa->regionbase.first, &rect, 0);
+	overlap_rect = rect;
+	region_rect_recursive(win, sa, sa->regionbase.first, &rect, &overlap_rect, 0);
+	sa->flag &= ~AREA_FLAG_REGION_SIZE_UPDATE;
 
 	/* default area handlers */
 	ed_default_handlers(wm, sa, &sa->handlers, sa->type->keymapflag);
@@ -1470,22 +1441,31 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
 	if (sa->type->init)
 		sa->type->init(wm, sa);
 
+	/* clear all azones, add the area triange widgets */
+	area_azone_initialize(win, screen, sa);
+
 	/* region windows, default and own handlers */
 	for (ar = sa->regionbase.first; ar; ar = ar->next) {
-		region_subwindow(win, ar, false);
+		region_subwindow(ar);
 
-		if (ar->swinid) {
+		if (ar->visible) {
 			/* default region handlers */
 			ed_default_handlers(wm, sa, &ar->handlers, ar->type->keymapflag);
 			/* own handlers */
-			if (ar->type->init)
+			if (ar->type->init) {
 				ar->type->init(wm, ar);
+			}
 		}
 		else {
 			/* prevent uiblocks to run */
 			UI_blocklist_free(NULL, &ar->uiblocks);
 		}
+
+		/* Some AZones use View2D data which is only updated in region init, so call that first! */
+		region_azones_add(screen, sa, ar, ar->alignment & ~RGN_SPLIT_PREV);
 	}
+
+	WM_toolsystem_refresh_screen_area(workspace, scene, sa);
 }
 
 static void region_update_rect(ARegion *ar)
@@ -1500,22 +1480,16 @@ static void region_update_rect(ARegion *ar)
 /**
  * Call to move a popup window (keep OpenGL context free!)
  */
-void ED_region_update_rect(bContext *C, ARegion *ar)
+void ED_region_update_rect(bContext *UNUSED(C), ARegion *ar)
 {
-	wmWindow *win = CTX_wm_window(C);
-
-	wm_subwindow_rect_set(win, ar->swinid, &ar->winrct);
-
 	region_update_rect(ar);
 }
 
 /* externally called for floating regions like menus */
-void ED_region_init(bContext *C, ARegion *ar)
+void ED_region_init(bContext *UNUSED(C), ARegion *ar)
 {
-//	ARegionType *at = ar->type;
-
 	/* refresh can be called before window opened */
-	region_subwindow(CTX_wm_window(C), ar, false);
+	region_subwindow(ar);
 
 	region_update_rect(ar);
 }
@@ -1526,10 +1500,25 @@ void ED_region_cursor_set(wmWindow *win, ScrArea *sa, ARegion *ar)
 		ar->type->cursor(win, sa, ar);
 	}
 	else {
+		if (WM_cursor_set_from_tool(win, sa, ar)) {
+			return;
+		}
 		WM_cursor_set(win, CURSOR_STD);
 	}
 }
 
+/* for use after changing visiblity of regions */
+void ED_region_visibility_change_update(bContext *C, ARegion *ar)
+{
+	ScrArea *sa = CTX_wm_area(C);
+
+	if (ar->flag & RGN_FLAG_HIDDEN)
+		WM_event_remove_handlers(C, &ar->handlers);
+
+	ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
+	ED_area_tag_redraw(sa);
+}
+
 /* for quick toggle, can skip fades */
 void region_toggle_hidden(bContext *C, ARegion *ar, const bool do_fade)
 {
@@ -1542,11 +1531,7 @@ void region_toggle_hidden(bContext *C, ARegion *ar, const bool do_fade)
 		region_blend_start(C, sa, ar);
 	}
 	else {
-		if (ar->flag & RGN_FLAG_HIDDEN)
-			WM_event_remove_handlers(C, &ar->handlers);
-
-		ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
-		ED_area_tag_redraw(sa);
+		ED_region_visibility_change_update(C, ar);
 	}
 }
 
@@ -1566,10 +1551,8 @@ void ED_area_data_copy(ScrArea *sa_dst, ScrArea *sa_src, const bool do_free)
 	const char spacetype = sa_dst->spacetype;
 	const short flag_copy = HEADER_NO_PULLDOWN;
 
-	sa_dst->headertype = sa_src->headertype;
 	sa_dst->spacetype = sa_src->spacetype;
 	sa_dst->type = sa_src->type;
-	sa_dst->butspacetype = sa_src->butspacetype;
 
 	sa_dst->flag = (sa_dst->flag & ~flag_copy) | (sa_src->flag & flag_copy);
 
@@ -1597,10 +1580,8 @@ void ED_area_data_copy(ScrArea *sa_dst, ScrArea *sa_src, const bool do_free)
 
 void ED_area_data_swap(ScrArea *sa_dst, ScrArea *sa_src)
 {
-	SWAP(short, sa_dst->headertype, sa_src->headertype);
 	SWAP(char, sa_dst->spacetype, sa_src->spacetype);
 	SWAP(SpaceType *, sa_dst->type, sa_src->type);
-	SWAP(char, sa_dst->butspacetype, sa_src->butspacetype);
 
 
 	SWAP(ListBase, sa_dst->spacedata, sa_src->spacedata);
@@ -1639,12 +1620,15 @@ void ED_area_swapspace(bContext *C, ScrArea *sa1, ScrArea *sa2)
  */
 void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exit)
 {
+	wmWindow *win = CTX_wm_window(C);
+
 	if (sa->spacetype != type) {
 		SpaceType *st;
 		SpaceLink *slold;
 		SpaceLink *sl;
 		/* store sa->type->exit callback */
 		void *sa_exit = sa->type ? sa->type->exit : NULL;
+		int header_alignment = ED_area_header_alignment(sa);
 
 		/* in some cases (opening temp space) we don't want to
 		 * call area exit callback, so we temporarily unset it */
@@ -1663,9 +1647,12 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
 		slold = sa->spacedata.first;
 
 		sa->spacetype = type;
-		sa->butspacetype = type;
 		sa->type = st;
 
+		/* If st->new may be called, don't use context until then. The
+		 * sa->type->context() callback has changed but data may be invalid
+		 * (e.g. with properties editor) until space-data is properly created */
+
 		/* check previously stored space */
 		for (sl = sa->spacedata.first; sl; sl = sl->next)
 			if (sl->spacetype == type)
@@ -1690,11 +1677,22 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
 			/* put in front of list */
 			BLI_remlink(&sa->spacedata, sl);
 			BLI_addhead(&sa->spacedata, sl);
+
+
+			/* Sync header alignment. */
+			for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+				if (ar->regiontype == RGN_TYPE_HEADER) {
+					ar->alignment = header_alignment;
+					break;
+				}
+			}
 		}
 		else {
 			/* new space */
 			if (st) {
-				sl = st->new(C);
+				/* Don't get scene from context here which may depend on space-data. */
+				Scene *scene = WM_window_get_active_scene(win);
+				sl = st->new(sa, scene);
 				BLI_addhead(&sa->spacedata, sl);
 
 				/* swap regions */
@@ -1705,7 +1703,7 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
 			}
 		}
 
-		ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
+		ED_area_initialize(CTX_wm_manager(C), win, sa);
 
 		/* tell WM to refresh, cursor types etc */
 		WM_event_add_mousemove(C);
@@ -1755,28 +1753,155 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco)
 	RNA_pointer_create(&(scr->id), &RNA_Area, sa, &areaptr);
 
 	uiDefButR(block, UI_BTYPE_MENU, 0, "", xco, yco, 1.6 * U.widget_unit, U.widget_unit,
-	          &areaptr, "type", 0, 0.0f, 0.0f, 0.0f, 0.0f, "");
+	          &areaptr, "ui_type", 0, 0.0f, 0.0f, 0.0f, 0.0f, "");
 
 	return xco + 1.7 * U.widget_unit;
 }
 
 /************************ standard UI regions ************************/
 
-void ED_region_panels(const bContext *C, ARegion *ar, const char *context, int contextnr, const bool vertical)
+static ThemeColorID region_background_color_id(const bContext *C, const ARegion *region)
+{
+	ScrArea *area = CTX_wm_area(C);
+
+	switch (region->regiontype) {
+		case RGN_TYPE_HEADER:
+			if (ED_screen_area_active(C) || ED_area_is_global(area)) {
+				return TH_HEADER;
+			}
+			else {
+				return TH_HEADERDESEL;
+			}
+		case RGN_TYPE_PREVIEW:
+			return TH_PREVIEW_BACK;
+		default:
+			return TH_BACK;
+	}
+}
+
+static void region_clear_color(const bContext *C, const ARegion *ar, ThemeColorID colorid)
+{
+	if (ar->overlap) {
+		/* view should be in pixelspace */
+		UI_view2d_view_restore(C);
+
+		float back[4];
+		UI_GetThemeColor4fv(colorid, back);
+		glClearColor(back[3] * back[0], back[3] * back[1], back[3] * back[2], back[3]);
+		glClear(GL_COLOR_BUFFER_BIT);
+	}
+	else {
+		UI_ThemeClearColor(colorid);
+		glClear(GL_COLOR_BUFFER_BIT);
+	}
+}
+
+BLI_INLINE bool streq_array_any(const char *s, const char *arr[])
+{
+	for (uint i = 0; arr[i]; i++) {
+		if (STREQ(arr[i], s)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static void ed_panel_draw(const bContext *C,
+                          ScrArea *sa,
+                          ARegion *ar,
+                          ListBase *lb,
+                          PanelType *pt,
+                          Panel *panel,
+                          int w,
+                          int em,
+                          bool vertical)
 {
-	ScrArea *sa = CTX_wm_area(C);
 	uiStyle *style = UI_style_get_dpi();
-	uiBlock *block;
+
+	/* draw panel */
+	uiBlock *block = UI_block_begin(C, ar, pt->idname, UI_EMBOSS);
+
+	bool open;
+	panel = UI_panel_begin(sa, ar, lb, block, pt, panel, &open);
+
+	/* bad fixed values */
+	int triangle = (int)(UI_UNIT_Y * 1.1f);
+	int xco, yco, h = 0;
+
+	if (pt->draw_header && !(pt->flag & PNL_NO_HEADER) && (open || vertical)) {
+		/* for enabled buttons */
+		panel->layout = UI_block_layout(
+		        block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
+		        triangle, (UI_UNIT_Y * 1.1f) + style->panelspace, UI_UNIT_Y, 1, 0, style);
+
+		pt->draw_header(C, panel);
+
+		UI_block_layout_resolve(block, &xco, &yco);
+		panel->labelofs = xco - triangle;
+		panel->layout = NULL;
+	}
+	else {
+		panel->labelofs = 0;
+	}
+
+	if (open) {
+		short panelContext;
+
+		/* panel context can either be toolbar region or normal panels region */
+		if (ar->regiontype == RGN_TYPE_TOOLS)
+			panelContext = UI_LAYOUT_TOOLBAR;
+		else
+			panelContext = UI_LAYOUT_PANEL;
+
+		panel->layout = UI_block_layout(
+		        block, UI_LAYOUT_VERTICAL, panelContext,
+		        style->panelspace, 0, w - 2 * style->panelspace, em, 0, style);
+
+		pt->draw(C, panel);
+
+		UI_block_layout_resolve(block, &xco, &yco);
+		panel->layout = NULL;
+
+		if (yco != 0) {
+			h = -yco + 2 * style->panelspace;
+		}
+	}
+
+	UI_block_end(C, block);
+
+	/* Draw child panels. */
+	if (open) {
+		for (LinkData *link = pt->children.first; link; link = link->next) {
+			PanelType *child_pt = link->data;
+			Panel *child_panel = UI_panel_find_by_type(&panel->children, child_pt);
+
+			if (child_pt->draw && (!child_pt->poll || child_pt->poll(C, child_pt))) {
+				ed_panel_draw(C, sa, ar, &panel->children, child_pt, child_panel, w, em, vertical);
+			}
+		}
+	}
+
+	UI_panel_end(block, w, h);
+}
+
+/**
+ * \param contexts: A NULL terminated array of context strings to match against.
+ * Matching against any of these strings will draw the panel.
+ * Can be NULL to skip context checks.
+ */
+void ED_region_panels(const bContext *C, ARegion *ar, const char *contexts[], int contextnr, const bool vertical)
+{
+	const WorkSpace *workspace = CTX_wm_workspace(C);
+	ScrArea *sa = CTX_wm_area(C);
 	PanelType *pt;
-	Panel *panel;
 	View2D *v2d = &ar->v2d;
 	View2DScrollers *scrollers;
-	int x, y, xco, yco, w, em, triangle;
+	int x, y, w, em;
 	bool is_context_new = 0;
-	int redo;
 	int scroll;
 
-	bool use_category_tabs = (ELEM(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI));  /* XXX, should use some better check? */
+	/* XXX, should use some better check? */
+	bool use_category_tabs = (ELEM(ar->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_WINDOW));
 	/* offset panels for small vertical tab area */
 	const char *category = NULL;
 	const int category_tabs_width = UI_PANEL_CATEGORY_MARGIN_WIDTH;
@@ -1809,8 +1934,18 @@ void ED_region_panels(const bContext *C, ARegion *ar, const char *context, int c
 
 	/* collect panels to draw */
 	for (pt = ar->type->paneltypes.last; pt; pt = pt->prev) {
+		/* Only draw top level panels. */
+		if (pt->parent) {
+			continue;
+		}
+
 		/* verify context */
-		if (context && pt->context[0] && !STREQ(context, pt->context)) {
+		if (contexts && pt->context[0] && !streq_array_any(pt->context, contexts)) {
+			continue;
+		}
+
+		/* If we're tagged, only use compatible. */
+		if (pt->owner_id[0] && BKE_workspace_owner_id_check(workspace, pt->owner_id) == false) {
 			continue;
 		}
 
@@ -1846,155 +1981,83 @@ void ED_region_panels(const bContext *C, ARegion *ar, const char *context, int c
 	}
 
 
-	/* sortof hack - but we cannot predict the height of panels, until it's being generated */
-	/* the layout engine works with fixed width (from v2d->cur), which is being set at end of the loop */
-	/* in case scroller settings (hide flags) differ from previous, the whole loop gets done again */
-	for (redo = 2; redo > 0; redo--) {
-
-		if (vertical) {
-			w = BLI_rctf_size_x(&v2d->cur);
-			em = (ar->type->prefsizex) ? 10 : 20; /* works out to 10*UI_UNIT_X or 20*UI_UNIT_X */
-		}
-		else {
-			w = UI_PANEL_WIDTH;
-			em = (ar->type->prefsizex) ? 10 : 20;
-		}
-
-		w -= margin_x;
+	if (vertical) {
+		w = BLI_rctf_size_x(&v2d->cur);
+		em = (ar->type->prefsizex) ? 10 : 20; /* works out to 10*UI_UNIT_X or 20*UI_UNIT_X */
+	}
+	else {
+		w = UI_PANEL_WIDTH;
+		em = (ar->type->prefsizex) ? 10 : 20;
+	}
 
-		/* create panels */
-		UI_panels_begin(C, ar);
+	w -= margin_x;
 
-		/* set view2d view matrix  - UI_block_begin() stores it */
-		UI_view2d_view_ortho(v2d);
+	/* create panels */
+	UI_panels_begin(C, ar);
 
-		BLI_SMALLSTACK_ITER_BEGIN(pt_stack, pt)
-		{
-			bool open;
+	/* set view2d view matrix  - UI_block_begin() stores it */
+	UI_view2d_view_ortho(v2d);
 
-			panel = UI_panel_find_by_type(ar, pt);
+	BLI_SMALLSTACK_ITER_BEGIN(pt_stack, pt)
+	{
+		Panel *panel = UI_panel_find_by_type(&ar->panels, pt);
 
-			if (use_category_tabs && pt->category[0] && !STREQ(category, pt->category)) {
-				if ((panel == NULL) || ((panel->flag & PNL_PIN) == 0)) {
-					continue;
-				}
+		if (use_category_tabs && pt->category[0] && !STREQ(category, pt->category)) {
+			if ((panel == NULL) || ((panel->flag & PNL_PIN) == 0)) {
+				continue;
 			}
+		}
 
-			/* draw panel */
-			block = UI_block_begin(C, ar, pt->idname, UI_EMBOSS);
-			panel = UI_panel_begin(sa, ar, block, pt, panel, &open);
-
-			/* bad fixed values */
-			triangle = (int)(UI_UNIT_Y * 1.1f);
-
-			if (pt->draw_header && !(pt->flag & PNL_NO_HEADER) && (open || vertical)) {
-				/* for enabled buttons */
-				panel->layout = UI_block_layout(
-				        block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
-				        triangle, (UI_UNIT_Y * 1.1f) + style->panelspace, UI_UNIT_Y, 1, 0, style);
+		ed_panel_draw(C, sa, ar, &ar->panels, pt, panel, w, em, vertical);
+	}
+	BLI_SMALLSTACK_ITER_END;
 
-				pt->draw_header(C, panel);
+	/* align panels and return size */
+	UI_panels_end(C, ar, &x, &y);
 
-				UI_block_layout_resolve(block, &xco, &yco);
-				panel->labelofs = xco - triangle;
-				panel->layout = NULL;
+	/* before setting the view */
+	if (vertical) {
+		/* we always keep the scroll offset - so the total view gets increased with the scrolled away part */
+		if (v2d->cur.ymax < -FLT_EPSILON) {
+			/* Clamp to lower view boundary */
+			if (v2d->tot.ymin < -v2d->winy) {
+				y = min_ii(y, 0);
 			}
 			else {
-				panel->labelofs = 0;
+				y = min_ii(y, v2d->cur.ymin);
 			}
+		}
 
-			if (open) {
-				short panelContext;
-
-				/* panel context can either be toolbar region or normal panels region */
-				if (ar->regiontype == RGN_TYPE_TOOLS)
-					panelContext = UI_LAYOUT_TOOLBAR;
-				else
-					panelContext = UI_LAYOUT_PANEL;
-
-				panel->layout = UI_block_layout(
-				        block, UI_LAYOUT_VERTICAL, panelContext,
-				        style->panelspace, 0, w - 2 * style->panelspace, em, 0, style);
-
-				pt->draw(C, panel);
-
-				UI_block_layout_resolve(block, &xco, &yco);
-				panel->layout = NULL;
-
-				yco -= 2 * style->panelspace;
-				UI_panel_end(block, w, -yco);
+		y = -y;
+	}
+	else {
+		/* don't jump back when panels close or hide */
+		if (!is_context_new) {
+			if (v2d->tot.xmax > v2d->winx) {
+				x = max_ii(x, 0);
 			}
 			else {
-				yco = 0;
-				UI_panel_end(block, w, 0);
+				x = max_ii(x, v2d->cur.xmax);
 			}
-
-			UI_block_end(C, block);
 		}
-		BLI_SMALLSTACK_ITER_END;
-
-		/* align panels and return size */
-		UI_panels_end(C, ar, &x, &y);
-
-		/* before setting the view */
-		if (vertical) {
-			/* we always keep the scroll offset - so the total view gets increased with the scrolled away part */
-			if (v2d->cur.ymax < -FLT_EPSILON) {
-				/* Clamp to lower view boundary */
-				if (v2d->tot.ymin < -v2d->winy) {
-					y = min_ii(y, 0);
-				}
-				else {
-					y = min_ii(y, v2d->cur.ymin);
-				}
-			}
 
-			y = -y;
-		}
-		else {
-			/* don't jump back when panels close or hide */
-			if (!is_context_new) {
-				if (v2d->tot.xmax > v2d->winx) {
-					x = max_ii(x, 0);
-				}
-				else {
-					x = max_ii(x, v2d->cur.xmax);
-				}
-			}
-
-			y = -y;
-		}
+		y = -y;
+	}
 
-		/* this also changes the 'cur' */
-		UI_view2d_totRect_set(v2d, x, y);
+	/* this also changes the 'cur' */
+	UI_view2d_totRect_set(v2d, x, y);
 
-		if (scroll != v2d->scroll) {
-			/* Note: this code scales fine, but because of rounding differences, positions of elements
-			 * flip +1 or -1 pixel compared to redoing the entire layout again.
-			 * Leaving in commented code for future tests */
+	if (scroll != v2d->scroll) {
+		/* Note: this code scales fine, but because of rounding differences, positions of elements
+		 * flip +1 or -1 pixel compared to redoing the entire layout again.
+		 * Leaving in commented code for future tests */
 #if 0
-			UI_panels_scale(ar, BLI_rctf_size_x(&v2d->cur));
-			break;
+		UI_panels_scale(ar, BLI_rctf_size_x(&v2d->cur));
+		break;
 #endif
-		}
-		else {
-			break;
-		}
 	}
 
-	/* clear */
-	if (ar->overlap) {
-		/* view should be in pixelspace */
-		UI_view2d_view_restore(C);
-		glEnable(GL_BLEND);
-		UI_ThemeColor4((ar->type->regionid == RGN_TYPE_PREVIEW) ? TH_PREVIEW_BACK : TH_BACK);
-		glRecti(0, 0, BLI_rcti_size_x(&ar->winrct), BLI_rcti_size_y(&ar->winrct) + 1);
-		glDisable(GL_BLEND);
-	}
-	else {
-		UI_ThemeClearColor((ar->type->regionid == RGN_TYPE_PREVIEW) ? TH_PREVIEW_BACK : TH_BACK);
-		glClear(GL_COLOR_BUFFER_BIT);
-	}
+	region_clear_color(C, ar, (ar->type->regionid == RGN_TYPE_PREVIEW) ? TH_PREVIEW_BACK : TH_BACK);
 
 	/* reset line width for drawing tabs */
 	glLineWidth(1.0f);
@@ -2028,7 +2091,7 @@ void ED_region_panels_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 }
 
-void ED_region_header(const bContext *C, ARegion *ar)
+void ED_region_header_layout(const bContext *C, ARegion *ar)
 {
 	uiStyle *style = UI_style_get_dpi();
 	uiBlock *block;
@@ -2037,16 +2100,20 @@ void ED_region_header(const bContext *C, ARegion *ar)
 	Header header = {NULL};
 	int maxco, xco, yco;
 	int headery = ED_area_headersize();
-
-	/* clear */
-	UI_ThemeClearColor((ED_screen_area_active(C)) ? TH_HEADER : TH_HEADERDESEL);
-	glClear(GL_COLOR_BUFFER_BIT);
+	const int start_ofs = 0.4f * UI_UNIT_X;
+	bool region_layout_based = ar->flag & RGN_FLAG_DYNAMIC_SIZE;
 
 	/* set view2d view matrix for scrolling (without scrollers) */
 	UI_view2d_view_ortho(&ar->v2d);
 
-	xco = maxco = 0.4f * UI_UNIT_X;
-	yco = headery - floor(0.2f * UI_UNIT_Y);
+	xco = maxco = start_ofs;
+	yco = headery + (ar->winy - headery) / 2 - floor(0.2f * UI_UNIT_Y);
+
+	/* XXX workaround for 1 px alignment issue. Not sure what causes it... Would prefer a proper fix - Julian */
+	if (CTX_wm_area(C)->spacetype == SPACE_TOPBAR) {
+		xco += 1;
+		yco += 1;
+	}
 
 	/* draw all headers types */
 	for (ht = ar->type->headertypes.first; ht; ht = ht->next) {
@@ -2070,17 +2137,50 @@ void ED_region_header(const bContext *C, ARegion *ar)
 		if (xco > maxco)
 			maxco = xco;
 
+		int new_sizex = (maxco + start_ofs) / UI_DPI_FAC;
+
+		if (region_layout_based && (ar->sizex != new_sizex)) {
+			/* region size is layout based and needs to be updated */
+			ScrArea *sa = CTX_wm_area(C);
+
+			ar->sizex = new_sizex;
+			sa->flag |= AREA_FLAG_REGION_SIZE_UPDATE;
+		}
+
 		UI_block_end(C, block);
-		UI_block_draw(C, block);
 	}
 
 	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, maxco + UI_UNIT_X + 80, headery);
+	UI_view2d_totRect_set(&ar->v2d, maxco + (region_layout_based ? 0 : UI_UNIT_X + 80), headery);
 
-	/* restore view matrix? */
+	/* restore view matrix */
 	UI_view2d_view_restore(C);
 }
 
+void ED_region_header_draw(const bContext *C, ARegion *ar)
+{
+	UI_view2d_view_ortho(&ar->v2d);
+
+	/* clear */
+	region_clear_color(C, ar, region_background_color_id(C, ar));
+
+	/* View2D matrix might have changed due to dynamic sized regions. */
+	UI_blocklist_update_window_matrix(C, &ar->uiblocks);
+
+	/* draw blocks */
+	UI_blocklist_draw(C, &ar->uiblocks);
+
+	/* restore view matrix */
+	UI_view2d_view_restore(C);
+}
+
+void ED_region_header(const bContext *C, ARegion *ar)
+{
+	/* TODO: remove? */
+	ED_region_header_layout(C, ar);
+	ED_region_header_draw(C, ar);
+}
+
 void ED_region_header_init(ARegion *ar)
 {
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
@@ -2092,42 +2192,132 @@ int ED_area_headersize(void)
 	return (int)(HEADERY * UI_DPI_FAC);
 }
 
-void ED_region_info_draw(ARegion *ar, const char *text, float fill_color[4], const bool full_redraw)
+
+int ED_area_header_alignment(const ScrArea *area)
+{
+	for (ARegion *ar = area->regionbase.first; ar; ar = ar->next) {
+		if (ar->regiontype == RGN_TYPE_HEADER) {
+			return ar->alignment;
+		}
+	}
+
+	return RGN_ALIGN_TOP;
+}
+
+/**
+ * \return the final height of a global \a area, accounting for DPI.
+ */
+int ED_area_global_size_y(const ScrArea *area)
+{
+	BLI_assert(ED_area_is_global(area));
+	return round_fl_to_int(area->global->cur_fixed_height * UI_DPI_FAC);
+}
+
+bool ED_area_is_global(const ScrArea *area)
+{
+	return area->global != NULL;
+}
+
+ScrArea *ED_screen_areas_iter_first(const wmWindow *win, const bScreen *screen)
+{
+	ScrArea *global_area = win->global_areas.areabase.first;
+
+	if (!global_area) {
+		return screen->areabase.first;
+	}
+	else if ((global_area->global->flag & GLOBAL_AREA_IS_HIDDEN) == 0) {
+		return global_area;
+	}
+	/* Find next visible area. */
+	return ED_screen_areas_iter_next(screen, global_area);
+}
+ScrArea *ED_screen_areas_iter_next(const bScreen *screen, const ScrArea *area)
+{
+	if (area->global) {
+		for (ScrArea *area_iter = area->next; area_iter; area_iter = area_iter->next) {
+			if ((area_iter->global->flag & GLOBAL_AREA_IS_HIDDEN) == 0) {
+				return area_iter;
+			}
+		}
+		/* No visible next global area found, start iterating over layout areas. */
+		return screen->areabase.first;
+	}
+
+	return area->next;
+}
+
+/**
+ * For now we just assume all global areas are made up out of horizontal bars
+ * with the same size. A fixed size could be stored in ARegion instead if needed.
+ *
+ * \return the DPI aware height of a single bar/region in global areas.
+ */
+int ED_region_global_size_y(void)
+{
+	return ED_area_headersize(); /* same size as header */
+}
+
+void ED_region_info_draw_multiline(ARegion *ar, const char *text_array[], float fill_color[4], const bool full_redraw)
 {
 	const int header_height = UI_UNIT_Y;
 	uiStyle *style = UI_style_get_dpi();
 	int fontid = style->widget.uifont_id;
 	GLint scissor[4];
 	rcti rect;
+	int num_lines = 0;
 
 	/* background box */
 	ED_region_visible_rect(ar, &rect);
-	rect.ymin = BLI_rcti_size_y(&ar->winrct) - header_height;
 
-	/* box fill entire width or just around text */
-	if (!full_redraw)
-		rect.xmax = min_ii(rect.xmax, rect.xmin + BLF_width(fontid, text, BLF_DRAW_STR_DUMMY_MAX) + 1.2f * U.widget_unit);
+	/* Box fill entire width or just around text. */
+	if (!full_redraw) {
+		const char **text = &text_array[0];
+		while (*text) {
+			rect.xmax = min_ii(rect.xmax, rect.xmin + BLF_width(fontid, *text, BLF_DRAW_STR_DUMMY_MAX) + 1.2f * U.widget_unit);
+			text++;
+			num_lines++;
+		}
+	}
+	/* Just count the line number. */
+	else {
+		const char **text = &text_array[0];
+		while (*text) {
+			text++;
+			num_lines++;
+		}
+	}
 
-	rect.ymax = BLI_rcti_size_y(&ar->winrct);
+	rect.ymin = rect.ymax - header_height * num_lines;
 
 	/* setup scissor */
 	glGetIntegerv(GL_SCISSOR_BOX, scissor);
-	glScissor(ar->winrct.xmin + rect.xmin, ar->winrct.ymin + rect.ymin,
+	glScissor(rect.xmin, rect.ymin,
 	          BLI_rcti_size_x(&rect) + 1, BLI_rcti_size_y(&rect) + 1);
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glColor4fv(fill_color);
-	glRecti(rect.xmin, rect.ymin, rect.xmax + 1, rect.ymax + 1);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4fv(fill_color);
+	immRecti(pos, rect.xmin, rect.ymin, rect.xmax + 1, rect.ymax + 1);
+	immUnbindProgram();
 	glDisable(GL_BLEND);
 
 	/* text */
-	UI_ThemeColor(TH_TEXT_HI);
+	UI_FontThemeColor(fontid, TH_TEXT_HI);
 	BLF_clipping(fontid, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 	BLF_enable(fontid, BLF_CLIPPING);
-	BLF_position(fontid, rect.xmin + 0.6f * U.widget_unit, rect.ymin + 0.3f * U.widget_unit, 0.0f);
-
-	BLF_draw(fontid, text, BLF_DRAW_STR_DUMMY_MAX);
+	int offset = num_lines - 1;
+	{
+		const char **text = &text_array[0];
+		while (*text) {
+			BLF_position(fontid, rect.xmin + 0.6f * U.widget_unit, rect.ymin + 0.3f * U.widget_unit + offset * header_height, 0.0f);
+			BLF_draw(fontid, *text, BLF_DRAW_STR_DUMMY_MAX);
+			text++;
+			offset--;
+		}
+	}
 
 	BLF_disable(fontid, BLF_CLIPPING);
 
@@ -2135,6 +2325,11 @@ void ED_region_info_draw(ARegion *ar, const char *text, float fill_color[4], con
 	glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
 }
 
+void ED_region_info_draw(ARegion *ar, const char *text, float fill_color[4], const bool full_redraw)
+{
+	ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw);
+}
+
 #define MAX_METADATA_STR    1024
 
 static const char *meta_data_list[] =
@@ -2303,11 +2498,11 @@ void ED_region_image_metadata_draw(int x, int y, ImBuf *ibuf, const rctf *frame,
 		return;
 
 	/* find window pixel coordinates of origin */
-	glPushMatrix();
+	gpuPushMatrix();
 
 	/* offset and zoom using ogl */
-	glTranslatef(x, y, 0.0f);
-	glScalef(zoomx, zoomy, 1.0f);
+	gpuTranslate2f(x, y);
+	gpuScale2f(zoomx, zoomy);
 
 	BLF_size(blf_mono_font, style->widgetlabel.points * 1.5f * U.pixelsize, U.dpi);
 
@@ -2317,17 +2512,20 @@ void ED_region_image_metadata_draw(int x, int y, ImBuf *ibuf, const rctf *frame,
 	box_y = metadata_box_height_get(ibuf, blf_mono_font, true);
 
 	if (box_y) {
-		UI_ThemeColor(TH_METADATA_BG);
-
 		/* set up rect */
 		BLI_rctf_init(&rect, frame->xmin, frame->xmax, frame->ymax, frame->ymax + box_y);
 		/* draw top box */
-		glRectf(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_METADATA_BG);
+		immRectf(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		immUnbindProgram();
 
 		BLF_clipping(blf_mono_font, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 		BLF_enable(blf_mono_font, BLF_CLIPPING);
 
-		UI_ThemeColor(TH_METADATA_TEXT);
+		UI_FontThemeColor(blf_mono_font, TH_METADATA_TEXT);
 		metadata_draw_imbuf(ibuf, &rect, blf_mono_font, true);
 
 		BLF_disable(blf_mono_font, BLF_CLIPPING);
@@ -2339,23 +2537,26 @@ void ED_region_image_metadata_draw(int x, int y, ImBuf *ibuf, const rctf *frame,
 	box_y = metadata_box_height_get(ibuf, blf_mono_font, false);
 
 	if (box_y) {
-		UI_ThemeColor(TH_METADATA_BG);
-
 		/* set up box rect */
 		BLI_rctf_init(&rect, frame->xmin, frame->xmax, frame->ymin - box_y, frame->ymin);
 		/* draw top box */
-		glRectf(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_METADATA_BG);
+		immRectf(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		immUnbindProgram();
 
 		BLF_clipping(blf_mono_font, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 		BLF_enable(blf_mono_font, BLF_CLIPPING);
 
-		UI_ThemeColor(TH_METADATA_TEXT);
+		UI_FontThemeColor(blf_mono_font, TH_METADATA_TEXT);
 		metadata_draw_imbuf(ibuf, &rect, blf_mono_font, false);
 
 		BLF_disable(blf_mono_font, BLF_CLIPPING);
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
 }
 
 void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy)
@@ -2365,11 +2566,16 @@ void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy)
 	int x1, y1, x2, y2;
 
 	/* the image is located inside (0, 0), (1, 1) as set by view2d */
-	UI_ThemeColorShade(TH_BACK, 20);
-
 	UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x1, &y1);
 	UI_view2d_view_to_region(&ar->v2d, 1.0f, 1.0f, &x2, &y2);
-	glRectf(x1, y1, x2, y2);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShade(TH_BACK, 20);
+	immRectf(pos, x1, y1, x2, y2);
+	immUnbindProgram();
 
 	/* gridsize adapted to zoom level */
 	gridsize = 0.5f * (zoomx + zoomy);
@@ -2389,33 +2595,58 @@ void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy)
 		}
 	}
 
-	/* the fine resolution level */
 	blendfac = 0.25f * gridsize - floorf(0.25f * gridsize);
 	CLAMP(blendfac, 0.0f, 1.0f);
-	UI_ThemeColorShade(TH_BACK, (int)(20.0f * (1.0f - blendfac)));
 
-	fac = 0.0f;
-	glBegin(GL_LINES);
-	while (fac < 1.0f) {
-		glVertex2f(x1, y1 * (1.0f - fac) + y2 * fac);
-		glVertex2f(x2, y1 * (1.0f - fac) + y2 * fac);
-		glVertex2f(x1 * (1.0f - fac) + x2 * fac, y1);
-		glVertex2f(x1 * (1.0f - fac) + x2 * fac, y2);
-		fac += gridstep;
-	}
+	int count_fine = 1.0f / gridstep;
+	int count_large = 1.0f / (4.0f * gridstep);
+
+	if (count_fine > 0) {
+		GWN_vertformat_clear(format);
+		pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+		immBegin(GWN_PRIM_LINES, 4 * count_fine + 4 * count_large);
+
+		float theme_color[3];
+		UI_GetThemeColorShade3fv(TH_BACK, (int)(20.0f * (1.0f - blendfac)), theme_color);
+		fac = 0.0f;
+
+		/* the fine resolution level */
+		for (int i = 0; i < count_fine; i++) {
+			immAttrib3fv(color, theme_color);
+			immVertex2f(pos, x1, y1 * (1.0f - fac) + y2 * fac);
+			immAttrib3fv(color, theme_color);
+			immVertex2f(pos, x2, y1 * (1.0f - fac) + y2 * fac);
+			immAttrib3fv(color, theme_color);
+			immVertex2f(pos, x1 * (1.0f - fac) + x2 * fac, y1);
+			immAttrib3fv(color, theme_color);
+			immVertex2f(pos, x1 * (1.0f - fac) + x2 * fac, y2);
+			fac += gridstep;
+		}
 
-	/* the large resolution level */
-	UI_ThemeColor(TH_BACK);
+		if (count_large > 0) {
+			UI_GetThemeColor3fv(TH_BACK, theme_color);
+			fac = 0.0f;
+
+			/* the large resolution level */
+			for (int i = 0; i < count_large; i++) {
+				immAttrib3fv(color, theme_color);
+				immVertex2f(pos, x1, y1 * (1.0f - fac) + y2 * fac);
+				immAttrib3fv(color, theme_color);
+				immVertex2f(pos, x2, y1 * (1.0f - fac) + y2 * fac);
+				immAttrib3fv(color, theme_color);
+				immVertex2f(pos, x1 * (1.0f - fac) + x2 * fac, y1);
+				immAttrib3fv(color, theme_color);
+				immVertex2f(pos, x1 * (1.0f - fac) + x2 * fac, y2);
+				fac += 4.0f * gridstep;
+			}
+		}
 
-	fac = 0.0f;
-	while (fac < 1.0f) {
-		glVertex2f(x1, y1 * (1.0f - fac) + y2 * fac);
-		glVertex2f(x2, y1 * (1.0f - fac) + y2 * fac);
-		glVertex2f(x1 * (1.0f - fac) + x2 * fac, y1);
-		glVertex2f(x1 * (1.0f - fac) + x2 * fac, y2);
-		fac += 4.0f * gridstep;
+		immEnd();
+		immUnbindProgram();
 	}
-	glEnd();
 }
 
 /* If the area has overlapping regions, it returns visible rect for Region *ar */
@@ -2434,14 +2665,29 @@ void ED_region_visible_rect(ARegion *ar, rcti *rect)
 	for (; arn; arn = arn->next) {
 		if (ar != arn && arn->overlap) {
 			if (BLI_rcti_isect(rect, &arn->winrct, NULL)) {
+				if (ELEM(arn->alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
+					/* Overlap left, also check 1 pixel offset (2 regions on one side). */
+					if (ABS(rect->xmin - arn->winrct.xmin) < 2) {
+						rect->xmin = arn->winrct.xmax;
+					}
 
-				/* overlap left, also check 1 pixel offset (2 regions on one side) */
-				if (ABS(rect->xmin - arn->winrct.xmin) < 2)
-					rect->xmin = arn->winrct.xmax;
-
-				/* overlap right */
-				if (ABS(rect->xmax - arn->winrct.xmax) < 2)
-					rect->xmax = arn->winrct.xmin;
+					/* Overlap right. */
+					if (ABS(rect->xmax - arn->winrct.xmax) < 2) {
+						rect->xmax = arn->winrct.xmin;
+					}
+				}
+				else if (ELEM(arn->alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
+					/* Same logic as above for vertical regions. */
+					if (ABS(rect->ymin - arn->winrct.ymin) < 2) {
+						rect->ymin = arn->winrct.ymax;
+					}
+					if (ABS(rect->ymax - arn->winrct.ymax) < 2) {
+						rect->ymax = arn->winrct.ymin;
+					}
+				}
+				else {
+					BLI_assert(!"Region overlap with unknown alignment");
+				}
 			}
 		}
 	}
@@ -2452,8 +2698,11 @@ void ED_region_visible_rect(ARegion *ar, rcti *rect)
 
 void ED_region_cache_draw_background(const ARegion *ar)
 {
-	glColor4ub(128, 128, 255, 64);
-	glRecti(0, 0, ar->winx, 8 * UI_DPI_FAC);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4ub(128, 128, 255, 64);
+	immRecti(pos, 0, 0, ar->winx, 8 * UI_DPI_FAC);
+	immUnbindProgram();
 }
 
 void ED_region_cache_draw_curfra_label(const int framenr, const float x, const float y)
@@ -2469,9 +2718,13 @@ void ED_region_cache_draw_curfra_label(const int framenr, const float x, const f
 
 	BLF_width_and_height(fontid, numstr, sizeof(numstr), &font_dims[0], &font_dims[1]);
 
-	glRecti(x, y, x + font_dims[0] + 6.0f, y + font_dims[1] + 4.0f);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColor(TH_CFRAME);
+	immRecti(pos, x, y, x + font_dims[0] + 6.0f, y + font_dims[1] + 4.0f);
+	immUnbindProgram();
 
-	UI_ThemeColor(TH_TEXT);
+	UI_FontThemeColor(fontid, TH_TEXT);
 	BLF_position(fontid, x + 2.0f, y + 2.0f, 0.0f);
 	BLF_draw(fontid, numstr, sizeof(numstr));
 }
@@ -2479,17 +2732,73 @@ void ED_region_cache_draw_curfra_label(const int framenr, const float x, const f
 void ED_region_cache_draw_cached_segments(const ARegion *ar, const int num_segments, const int *points, const int sfra, const int efra)
 {
 	if (num_segments) {
-		int a;
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4ub(128, 128, 255, 128);
 
-		glColor4ub(128, 128, 255, 128);
+		for (int a = 0; a < num_segments; a++) {
+			float x1 = (float)(points[a * 2] - sfra) / (efra - sfra + 1) * ar->winx;
+			float x2 = (float)(points[a * 2 + 1] - sfra + 1) / (efra - sfra + 1) * ar->winx;
 
-		for (a = 0; a < num_segments; a++) {
-			float x1, x2;
+			immRecti(pos, x1, 0, x2, 8 * UI_DPI_FAC);
+			/* TODO(merwin): use primitive restart to draw multiple rects more efficiently */
+		}
 
-			x1 = (float)(points[a * 2] - sfra) / (efra - sfra + 1) * ar->winx;
-			x2 = (float)(points[a * 2 + 1] - sfra + 1) / (efra - sfra + 1) * ar->winx;
+		immUnbindProgram();
+	}
+}
 
-			glRecti(x1, 0, x2, 8 * UI_DPI_FAC);
+/**
+ * Generate subscriptions for this region.
+ */
+void ED_region_message_subscribe(
+        bContext *C,
+        struct WorkSpace *workspace, struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	if (ar->manipulator_map != NULL) {
+		WM_manipulatormap_message_subscribe(C, ar->manipulator_map, ar, mbus);
+	}
+
+	if (BLI_listbase_is_empty(&ar->uiblocks)) {
+		UI_region_message_subscribe(ar, mbus);
+	}
+
+	if (ar->type->message_subscribe != NULL) {
+		ar->type->message_subscribe(C, workspace, scene, screen, sa, ar, mbus);
+	}
+}
+
+int ED_region_snap_size_test(const ARegion *ar)
+{
+	/* Use a larger value because toggling scrollbars can jump in size. */
+	const int snap_match_threshold = 16;
+	if (ar->type->snap_size != NULL) {
+		return ((((ar->sizex - ar->type->snap_size(ar, ar->sizex, 0)) <= snap_match_threshold) << 0) |
+		        (((ar->sizey - ar->type->snap_size(ar, ar->sizey, 1)) <= snap_match_threshold) << 1));
+	}
+	return 0;
+}
+
+bool ED_region_snap_size_apply(ARegion *ar, int snap_flag)
+{
+	bool changed = false;
+	if (ar->type->snap_size != NULL) {
+		if (snap_flag & (1 << 0)) {
+			short snap_size = ar->type->snap_size(ar, ar->sizex, 0);
+			if (snap_size != ar->sizex) {
+				ar->sizex = snap_size;
+				changed = true;
+			}
+		}
+		if (snap_flag & (1 << 1)) {
+			short snap_size = ar->type->snap_size(ar, ar->sizey, 1);
+			if (snap_size != ar->sizey) {
+				ar->sizey = snap_size;
+				changed = true;
+			}
 		}
 	}
+	return changed;
 }
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 6e9a580e403..1d73566e5a8 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -49,133 +49,11 @@
 #include "IMB_imbuf_types.h"
 
 #include "GPU_basic_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "UI_interface.h"
 
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE                        0x812F
-#endif
-
-/* UNUSED */
-#if 0
-void fdrawbezier(float vec[4][3])
-{
-	float dist;
-	float curve_res = 24, spline_step = 0.0f;
-
-	dist = 0.5f * fabsf(vec[0][0] - vec[3][0]);
-
-	/* check direction later, for top sockets */
-	vec[1][0] = vec[0][0] + dist;
-	vec[1][1] = vec[0][1];
-
-	vec[2][0] = vec[3][0] - dist;
-	vec[2][1] = vec[3][1];
-	/* we can reuse the dist variable here to increment the GL curve eval amount */
-	dist = 1.0f / curve_res;
-
-	cpack(0x0);
-	glMap1f(GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, vec[0]);
-	glBegin(GL_LINE_STRIP);
-	while (spline_step < 1.000001f) {
-#if 0
-		if (do_shaded)
-			UI_ThemeColorBlend(th_col1, th_col2, spline_step);
-#endif
-		glEvalCoord1f(spline_step);
-		spline_step += dist;
-	}
-	glEnd();
-}
-#endif
-
-void fdrawline(float x1, float y1, float x2, float y2)
-{
-	glBegin(GL_LINES);
-	glVertex2f(x1, y1);
-	glVertex2f(x2, y2);
-	glEnd();
-}
-
-void fdrawbox(float x1, float y1, float x2, float y2)
-{
-	glBegin(GL_LINE_LOOP);
-
-	glVertex2f(x1, y1);
-	glVertex2f(x1, y2);
-	glVertex2f(x2, y2);
-	glVertex2f(x2, y1);
-
-	glEnd();
-}
-
-void fdrawcheckerboard(float x1, float y1, float x2, float y2)
-{
-	unsigned char col1[4] = {40, 40, 40}, col2[4] = {50, 50, 50};
-
-	glColor3ubv(col1);
-	glRectf(x1, y1, x2, y2);
-	glColor3ubv(col2);
-
-	GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-	GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_CHECKER_8PX);
-	glRectf(x1, y1, x2, y2);
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-}
-
-void sdrawline(int x1, int y1, int x2, int y2)
-{
-	glBegin(GL_LINES);
-	glVertex2i(x1, y1);
-	glVertex2i(x2, y2);
-	glEnd();
-}
-
-/* UNUSED */
-#if 0
-/*
- *     x1,y2
- *     |  \
- *     |   \
- *     |    \
- *     x1,y1-- x2,y1
- */
-
-static void sdrawtripoints(int x1, int y1, int x2, int y2)
-{
-	glVertex2i(x1, y1);
-	glVertex2i(x1, y2);
-	glVertex2i(x2, y1);
-}
-
-void sdrawtri(int x1, int y1, int x2, int y2)
-{
-	glBegin(GL_LINE_STRIP);
-	sdrawtripoints(x1, y1, x2, y2);
-	glEnd();
-}
-
-void sdrawtrifill(int x1, int y1, int x2, int y2)
-{
-	glBegin(GL_TRIANGLES);
-	sdrawtripoints(x1, y1, x2, y2);
-	glEnd();
-}
-#endif
-
-void sdrawbox(int x1, int y1, int x2, int y2)
-{
-	glBegin(GL_LINE_LOOP);
-
-	glVertex2i(x1, y1);
-	glVertex2i(x1, y2);
-	glVertex2i(x2, y2);
-	glVertex2i(x2, y1);
-
-	glEnd();
-}
-
-
 /* ******************************************** */
 
 void setlinestyle(int nr)
@@ -204,122 +82,6 @@ void set_inverted_drawing(int enable)
 	GL_TOGGLE(GL_DITHER, !enable);
 }
 
-/* UNUSED */
-#if 0
-void sdrawXORline(int x0, int y0, int x1, int y1)
-{
-	if (x0 == x1 && y0 == y1) return;
-
-	set_inverted_drawing(1);
-
-	glBegin(GL_LINES);
-	glVertex2i(x0, y0);
-	glVertex2i(x1, y1);
-	glEnd();
-
-	set_inverted_drawing(0);
-}
-
-void sdrawXORline4(int nr, int x0, int y0, int x1, int y1)
-{
-	static int old[4][2][2];
-	static char flags[4] = {0, 0, 0, 0};
-
-	/* with builtin memory, max 4 lines */
-
-	set_inverted_drawing(1);
-
-	glBegin(GL_LINES);
-	if (nr == -1) { /* flush */
-		for (nr = 0; nr < 4; nr++) {
-			if (flags[nr]) {
-				glVertex2iv(old[nr][0]);
-				glVertex2iv(old[nr][1]);
-				flags[nr] = 0;
-			}
-		}
-	}
-	else {
-		if (nr >= 0 && nr < 4) {
-			if (flags[nr]) {
-				glVertex2iv(old[nr][0]);
-				glVertex2iv(old[nr][1]);
-			}
-
-			old[nr][0][0] = x0;
-			old[nr][0][1] = y0;
-			old[nr][1][0] = x1;
-			old[nr][1][1] = y1;
-
-			flags[nr] = 1;
-		}
-
-		glVertex2i(x0, y0);
-		glVertex2i(x1, y1);
-	}
-	glEnd();
-
-	set_inverted_drawing(0);
-}
-
-void fdrawXORellipse(float xofs, float yofs, float hw, float hh)
-{
-	if (hw == 0) return;
-
-	set_inverted_drawing(1);
-
-	glPushMatrix();
-	glTranslatef(xofs, yofs, 0.0f);
-	glScalef(1.0f, hh / hw, 1.0f);
-	glutil_draw_lined_arc(0.0, M_PI * 2.0, hw, 20);
-	glPopMatrix();
-
-	set_inverted_drawing(0);
-}
-
-#endif
-
-void fdrawXORcirc(float xofs, float yofs, float rad)
-{
-	set_inverted_drawing(1);
-
-	glPushMatrix();
-	glTranslatef(xofs, yofs, 0.0);
-	glutil_draw_lined_arc(0.0, M_PI * 2.0, rad, 20);
-	glPopMatrix();
-
-	set_inverted_drawing(0);
-}
-
-void glutil_draw_filled_arc(float start, float angle, float radius, int nsegments)
-{
-	int i;
-
-	glBegin(GL_TRIANGLE_FAN);
-	glVertex2f(0.0, 0.0);
-	for (i = 0; i < nsegments; i++) {
-		float t = (float) i / (nsegments - 1);
-		float cur = start + t * angle;
-
-		glVertex2f(cosf(cur) * radius, sinf(cur) * radius);
-	}
-	glEnd();
-}
-
-void glutil_draw_lined_arc(float start, float angle, float radius, int nsegments)
-{
-	int i;
-
-	glBegin(GL_LINE_STRIP);
-	for (i = 0; i < nsegments; i++) {
-		float t = (float) i / (nsegments - 1);
-		float cur = start + t * angle;
-
-		glVertex2f(cosf(cur) * radius, sinf(cur) * radius);
-	}
-	glEnd();
-}
-
 float glaGetOneFloat(int param)
 {
 	GLfloat v;
@@ -375,25 +137,68 @@ static int get_cached_work_texture(int *r_w, int *r_h)
 	return texid;
 }
 
-void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h,
+static void immDrawPixelsTexSetupAttributes(IMMDrawPixelsTexState *state)
+{
+	Gwn_VertFormat *vert_format = immVertexFormat();
+	state->pos = GWN_vertformat_attr_add(vert_format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	state->texco = GWN_vertformat_attr_add(vert_format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+}
+
+/* To be used before calling immDrawPixelsTex
+ * Default shader is GPU_SHADER_2D_IMAGE_COLOR
+ * You can still set uniforms with :
+ * GPU_shader_uniform_int(shader, GPU_shader_get_uniform(shader, "name"), 0);
+ * */
+IMMDrawPixelsTexState immDrawPixelsTexSetup(int builtin)
+{
+	IMMDrawPixelsTexState state;
+	immDrawPixelsTexSetupAttributes(&state);
+
+	state.shader = GPU_shader_get_builtin_shader(builtin);
+
+	/* Shader will be unbind by immUnbindProgram in immDrawPixelsTexScaled_clipping */
+	immBindBuiltinProgram(builtin);
+	immUniform1i("image", 0);
+	state.do_shader_unbind = true;
+
+	return state;
+}
+
+/* Use the currently bound shader.
+ *
+ * Use immDrawPixelsTexSetup to bind the shader you
+ * want before calling immDrawPixelsTex.
+ *
+ * If using a special shader double check it uses the same
+ * attributes "pos" "texCoord" and uniform "image".
+ *
+ * If color is NULL then use white by default
+ *
+ * Be also aware that this function unbinds the shader when
+ * it's finished.
+ * */
+void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state,
+                                     float x, float y, int img_w, int img_h,
                                      int format, int type, int zoomfilter, void *rect,
                                      float scaleX, float scaleY,
                                      float clip_min_x, float clip_min_y,
-                                     float clip_max_x, float clip_max_y)
+                                     float clip_max_x, float clip_max_y,
+                                     float xzoom, float yzoom, float color[4])
 {
 	unsigned char *uc_rect = (unsigned char *) rect;
 	const float *f_rect = (float *)rect;
-	float xzoom = glaGetOneFloat(GL_ZOOM_X), yzoom = glaGetOneFloat(GL_ZOOM_Y);
 	int subpart_x, subpart_y, tex_w, tex_h;
 	int seamless, offset_x, offset_y, nsubparts_x, nsubparts_y;
 	int texid = get_cached_work_texture(&tex_w, &tex_h);
 	int components;
 	const bool use_clipping = ((clip_min_x < clip_max_x) && (clip_min_y < clip_max_y));
+	float white[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+	GLint unpack_row_length;
+	glGetIntegerv(GL_UNPACK_ROW_LENGTH, &unpack_row_length);
 
-	/* Specify the color outside this function, and tex will modulate it.
-	 * This is useful for changing alpha without using glPixelTransferf()
-	 */
 	glPixelStorei(GL_UNPACK_ROW_LENGTH, img_w);
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, texid);
 
 	/* don't want nasty border artifacts */
@@ -401,12 +206,6 @@ void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h,
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, zoomfilter);
 
-#if defined(__APPLE__) && 0
-	/* [merwin] disable this workaround and see if anyone is affected. If not scrap it! Also at end of this function */
-	/* workaround for os x 10.5/10.6 driver bug: http://lists.apple.com/archives/Mac-opengl/2008/Jul/msg00117.html */
-	glPixelZoom(1.0f, 1.0f);
-#endif
-
 	/* setup seamless 2=on, 0=off */
 	seamless = ((tex_w < img_w || tex_h < img_h) && tex_w > 2 && tex_h > 2) ? 2 : 0;
 
@@ -420,7 +219,7 @@ void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h,
 		components = 4;
 	else if (format == GL_RGB)
 		components = 3;
-	else if (ELEM(format, GL_LUMINANCE, GL_ALPHA))
+	else if (format == GL_RED)
 		components = 1;
 	else {
 		BLI_assert(!"Incompatible format passed to glaDrawPixelsTexScaled");
@@ -429,20 +228,23 @@ void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h,
 
 	if (type == GL_FLOAT) {
 		/* need to set internal format to higher range float */
-
-		/* NOTE: this could fail on some drivers, like mesa,
-		 *       but currently this code is only used by color
-		 *       management stuff which already checks on whether
-		 *       it's possible to use GL_RGBA16F_ARB
-		 */
-
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, tex_w, tex_h, 0, format, GL_FLOAT, NULL);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, tex_w, tex_h, 0, format, GL_FLOAT, NULL);
 	}
 	else {
 		/* switch to 8bit RGBA for byte buffer */
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_w, tex_h, 0, format, GL_UNSIGNED_BYTE, NULL);
 	}
 
+	unsigned int pos = state->pos, texco = state->texco;
+
+	/* optional */
+	/* NOTE: Shader could be null for GLSL OCIO drawing, it is fine, since
+	 * it does not need color.
+	 */
+	if (state->shader != NULL && GPU_shader_get_uniform(state->shader, "color") != -1) {
+		immUniformColor4fv((color) ? color : white);
+	}
+
 	for (subpart_y = 0; subpart_y < nsubparts_y; subpart_y++) {
 		for (subpart_x = 0; subpart_x < nsubparts_x; subpart_x++) {
 			int remainder_x = img_w - subpart_x * offset_x;
@@ -494,325 +296,55 @@ void glaDrawPixelsTexScaled_clipping(float x, float y, int img_w, int img_h,
 					glTexSubImage2D(GL_TEXTURE_2D, 0, subpart_w, subpart_h, 1, 1, format, GL_UNSIGNED_BYTE, &uc_rect[(((size_t)subpart_y) * offset_y + subpart_h - 1) * img_w * components + (subpart_x * offset_x + subpart_w - 1) * components]);
 			}
 
-			GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
-			glBegin(GL_QUADS);
-			glTexCoord2f((float)(0 + offset_left) / tex_w, (float)(0 + offset_bot) / tex_h);
-			glVertex2f(rast_x + (float)offset_left * xzoom, rast_y + (float)offset_bot * yzoom);
+			immBegin(GWN_PRIM_TRI_FAN, 4);
+			immAttrib2f(texco, (float)(0 + offset_left) / tex_w, (float)(0 + offset_bot) / tex_h);
+			immVertex2f(pos, rast_x + (float)offset_left * xzoom, rast_y + (float)offset_bot * yzoom);
 
-			glTexCoord2f((float)(subpart_w - offset_right) / tex_w, (float)(0 + offset_bot) / tex_h);
-			glVertex2f(rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)offset_bot * yzoom);
+			immAttrib2f(texco, (float)(subpart_w - offset_right) / tex_w, (float)(0 + offset_bot) / tex_h);
+			immVertex2f(pos, rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)offset_bot * yzoom);
 
-			glTexCoord2f((float)(subpart_w - offset_right) / tex_w, (float)(subpart_h - offset_top) / tex_h);
-			glVertex2f(rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)(subpart_h - offset_top) * yzoom * scaleY);
+			immAttrib2f(texco, (float)(subpart_w - offset_right) / tex_w, (float)(subpart_h - offset_top) / tex_h);
+			immVertex2f(pos, rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)(subpart_h - offset_top) * yzoom * scaleY);
 
-			glTexCoord2f((float)(0 + offset_left) / tex_w, (float)(subpart_h - offset_top) / tex_h);
-			glVertex2f(rast_x + (float)offset_left * xzoom, rast_y + (float)(subpart_h - offset_top) * yzoom * scaleY);
-			glEnd();
-			GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+			immAttrib2f(texco, (float)(0 + offset_left) / tex_w, (float)(subpart_h - offset_top) / tex_h);
+			immVertex2f(pos, rast_x + (float)offset_left * xzoom, rast_y + (float)(subpart_h - offset_top) * yzoom * scaleY);
+			immEnd();
 		}
 	}
 
-	glBindTexture(GL_TEXTURE_2D, 0);
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	if (state->do_shader_unbind) {
+		immUnbindProgram();
+	}
 
-#if defined(__APPLE__) && 0
-	/* workaround for os x 10.5/10.6 driver bug (above) */
-	glPixelZoom(xzoom, yzoom);
-#endif
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH, unpack_row_length);
 }
 
-void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h,
+void immDrawPixelsTexScaled(IMMDrawPixelsTexState *state,
+                            float x, float y, int img_w, int img_h,
                             int format, int type, int zoomfilter, void *rect,
-                            float scaleX, float scaleY)
+                            float scaleX, float scaleY, float xzoom, float yzoom, float color[4])
 {
-	glaDrawPixelsTexScaled_clipping(x, y, img_w, img_h, format, type, zoomfilter, rect,
-	                                scaleX, scaleY, 0.0f, 0.0f, 0.0f, 0.0f);
+	immDrawPixelsTexScaled_clipping(state, x, y, img_w, img_h, format, type, zoomfilter, rect,
+	                                scaleX, scaleY, 0.0f, 0.0f, 0.0f, 0.0f, xzoom, yzoom, color);
 }
 
-void glaDrawPixelsTex(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect)
+void immDrawPixelsTex(IMMDrawPixelsTexState *state,
+                      float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect,
+                      float xzoom, float yzoom, float color[4])
 {
-	glaDrawPixelsTexScaled_clipping(x, y, img_w, img_h, format, type, zoomfilter, rect, 1.0f, 1.0f,
-	                                0.0f, 0.0f, 0.0f, 0.0f);
+	immDrawPixelsTexScaled_clipping(state, x, y, img_w, img_h, format, type, zoomfilter, rect, 1.0f, 1.0f,
+	                                0.0f, 0.0f, 0.0f, 0.0f, xzoom, yzoom, color);
 }
 
-void glaDrawPixelsTex_clipping(float x, float y, int img_w, int img_h,
+void immDrawPixelsTex_clipping(IMMDrawPixelsTexState *state,
+                               float x, float y, int img_w, int img_h,
                                int format, int type, int zoomfilter, void *rect,
-                               float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y)
-{
-	glaDrawPixelsTexScaled_clipping(x, y, img_w, img_h, format, type, zoomfilter, rect, 1.0f, 1.0f,
-	                                clip_min_x, clip_min_y, clip_max_x, clip_max_y);
-}
-
-void glaDrawPixelsSafe(float x, float y, int img_w, int img_h, int row_w, int format, int type, void *rect)
-{
-	float xzoom = glaGetOneFloat(GL_ZOOM_X);
-	float yzoom = glaGetOneFloat(GL_ZOOM_Y);
-
-	/* The pixel space coordinate of the intersection of
-	 * the [zoomed] image with the origin.
-	 */
-	float ix = -x / xzoom;
-	float iy = -y / yzoom;
-
-	/* The maximum pixel amounts the image can be cropped
-	 * at the lower left without exceeding the origin.
-	 */
-	int off_x = floor(max_ff(ix, 0.0f));
-	int off_y = floor(max_ff(iy, 0.0f));
-
-	/* The zoomed space coordinate of the raster position
-	 * (starting at the lower left most unclipped pixel).
-	 */
-	float rast_x = x + off_x * xzoom;
-	float rast_y = y + off_y * yzoom;
-
-	GLfloat viewport[4];
-	int draw_w, draw_h;
-
-	/* Determine the smallest number of pixels we need to draw
-	 * before the image would go off the upper right corner.
-	 *
-	 * It may seem this is just an optimization but some graphics
-	 * cards (ATI) freak out if there is a large zoom factor and
-	 * a large number of pixels off the screen (probably at some
-	 * level the number of image pixels to draw is getting multiplied
-	 * by the zoom and then clamped). Making sure we draw the
-	 * fewest pixels possible keeps everyone mostly happy (still
-	 * fails if we zoom in on one really huge pixel so that it
-	 * covers the entire screen).
-	 */
-	glGetFloatv(GL_VIEWPORT, viewport);
-	draw_w = min_ii(img_w - off_x, ceil((viewport[2] - rast_x) / xzoom));
-	draw_h = min_ii(img_h - off_y, ceil((viewport[3] - rast_y) / yzoom));
-
-	if (draw_w > 0 && draw_h > 0) {
-
-		int bound_options;
-		GPU_BASIC_SHADER_DISABLE_AND_STORE(bound_options);
-
-		/* Don't use safe RasterPos (slower) if we can avoid it. */
-		if (rast_x >= 0 && rast_y >= 0) {
-			glRasterPos2f(rast_x, rast_y);
-		}
-		else {
-			glaRasterPosSafe2f(rast_x, rast_y, 0, 0);
-		}
-
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, row_w);
-		if (format == GL_LUMINANCE || format == GL_RED) {
-			if (type == GL_FLOAT) {
-				const float *f_rect = (float *)rect;
-				glDrawPixels(draw_w, draw_h, format, type, f_rect + (off_y * row_w + off_x));
-			}
-			else if (type == GL_INT || type == GL_UNSIGNED_INT) {
-				const int *i_rect = (int *)rect;
-				glDrawPixels(draw_w, draw_h, format, type, i_rect + (off_y * row_w + off_x));
-			}
-		}
-		else { /* RGBA */
-			if (type == GL_FLOAT) {
-				const float *f_rect = (float *)rect;
-				glDrawPixels(draw_w, draw_h, format, type, f_rect + (off_y * row_w + off_x) * 4);
-			}
-			else if (type == GL_UNSIGNED_BYTE) {
-				unsigned char *uc_rect = (unsigned char *) rect;
-				glDrawPixels(draw_w, draw_h, format, type, uc_rect + (off_y * row_w + off_x) * 4);
-			}
-		}
-
-		glPixelStorei(GL_UNPACK_ROW_LENGTH,  0);
-
-		GPU_BASIC_SHADER_ENABLE_AND_RESTORE(bound_options);
-	}
-}
-
-/* uses either DrawPixelsSafe or DrawPixelsTex, based on user defined maximum */
-void glaDrawPixelsAuto_clipping(float x, float y, int img_w, int img_h,
-                                int format, int type, int zoomfilter, void *rect,
-                                float clip_min_x, float clip_min_y,
-                                float clip_max_x, float clip_max_y)
-{
-	if (U.image_draw_method != IMAGE_DRAW_METHOD_DRAWPIXELS) {
-		glColor4f(1.0, 1.0, 1.0, 1.0);
-		glaDrawPixelsTex_clipping(x, y, img_w, img_h, format, type, zoomfilter, rect,
-		                          clip_min_x, clip_min_y, clip_max_x, clip_max_y);
-	}
-	else {
-		glaDrawPixelsSafe(x, y, img_w, img_h, img_w, format, type, rect);
-	}
-}
-
-void glaDrawPixelsAuto(float x, float y, int img_w, int img_h, int format, int type, int zoomfilter, void *rect)
-{
-	glaDrawPixelsAuto_clipping(x, y, img_w, img_h, format, type, zoomfilter, rect,
-	                           0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-/* 2D Drawing Assistance */
-
-void glaDefine2DArea(rcti *screen_rect)
-{
-	const int sc_w = BLI_rcti_size_x(screen_rect) + 1;
-	const int sc_h = BLI_rcti_size_y(screen_rect) + 1;
-
-	glViewport(screen_rect->xmin, screen_rect->ymin, sc_w, sc_h);
-	glScissor(screen_rect->xmin, screen_rect->ymin, sc_w, sc_h);
-
-	/* The GLA_PIXEL_OFS magic number is to shift the matrix so that
-	 * both raster and vertex integer coordinates fall at pixel
-	 * centers properly. For a longer discussion see the OpenGL
-	 * Programming Guide, Appendix H, Correctness Tips.
-	 */
-
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0.0, sc_w, 0.0, sc_h, -1, 1);
-	glTranslatef(GLA_PIXEL_OFS, GLA_PIXEL_OFS, 0.0);
-
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-}
-
-#if 0 /* UNUSED */
-
-struct gla2DDrawInfo {
-	int orig_vp[4], orig_sc[4];
-	float orig_projmat[16], orig_viewmat[16];
-
-	rcti screen_rect;
-	rctf world_rect;
-
-	float wo_to_sc[2];
-};
-
-void gla2DGetMap(gla2DDrawInfo *di, rctf *rect)
-{
-	*rect = di->world_rect;
-}
-
-void gla2DSetMap(gla2DDrawInfo *di, rctf *rect)
-{
-	int sc_w, sc_h;
-	float wo_w, wo_h;
-
-	di->world_rect = *rect;
-
-	sc_w = BLI_rcti_size_x(&di->screen_rect);
-	sc_h = BLI_rcti_size_y(&di->screen_rect);
-	wo_w = BLI_rcti_size_x(&di->world_rect);
-	wo_h = BLI_rcti_size_y(&di->world_rect);
-
-	di->wo_to_sc[0] = sc_w / wo_w;
-	di->wo_to_sc[1] = sc_h / wo_h;
-}
-
-/** Save the current OpenGL state and initialize OpenGL for 2D
- * rendering. glaEnd2DDraw should be called on the returned structure
- * to free it and to return OpenGL to its previous state. The
- * scissor rectangle is set to match the viewport.
- *
- * See glaDefine2DArea for an explanation of why this function uses integers.
- *
- * \param screen_rect The screen rectangle to be used for 2D drawing.
- * \param world_rect The world rectangle that the 2D area represented
- * by \a screen_rect is supposed to represent. If NULL it is assumed the
- * world has a 1 to 1 mapping to the screen.
- */
-gla2DDrawInfo *glaBegin2DDraw(rcti *screen_rect, rctf *world_rect)
+                               float clip_min_x, float clip_min_y, float clip_max_x, float clip_max_y,
+                               float xzoom, float yzoom, float color[4])
 {
-	gla2DDrawInfo *di = MEM_mallocN(sizeof(*di), "gla2DDrawInfo");
-	int sc_w, sc_h;
-	float wo_w, wo_h;
-
-	glGetIntegerv(GL_VIEWPORT, (GLint *)di->orig_vp);
-	glGetIntegerv(GL_SCISSOR_BOX, (GLint *)di->orig_sc);
-	glGetFloatv(GL_PROJECTION_MATRIX, (GLfloat *)di->orig_projmat);
-	glGetFloatv(GL_MODELVIEW_MATRIX, (GLfloat *)di->orig_viewmat);
-
-	di->screen_rect = *screen_rect;
-	if (world_rect) {
-		di->world_rect = *world_rect;
-	}
-	else {
-		di->world_rect.xmin = di->screen_rect.xmin;
-		di->world_rect.ymin = di->screen_rect.ymin;
-		di->world_rect.xmax = di->screen_rect.xmax;
-		di->world_rect.ymax = di->screen_rect.ymax;
-	}
-
-	sc_w = BLI_rcti_size_x(&di->screen_rect);
-	sc_h = BLI_rcti_size_y(&di->screen_rect);
-	wo_w = BLI_rcti_size_x(&di->world_rect);
-	wo_h = BLI_rcti_size_y(&di->world_rect);
-
-	di->wo_to_sc[0] = sc_w / wo_w;
-	di->wo_to_sc[1] = sc_h / wo_h;
-
-	glaDefine2DArea(&di->screen_rect);
-
-	return di;
-}
-
-/**
- * Translate the (\a wo_x, \a wo_y) point from world coordinates into screen space.
- */
-void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *r_sc_x, int *r_sc_y)
-{
-	*r_sc_x = (wo_x - di->world_rect.xmin) * di->wo_to_sc[0];
-	*r_sc_y = (wo_y - di->world_rect.ymin) * di->wo_to_sc[1];
-}
-
-/**
- * Translate the \a world point from world coordinates into screen space.
- */
-void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int r_screen[2])
-{
-	screen_r[0] = (world[0] - di->world_rect.xmin) * di->wo_to_sc[0];
-	screen_r[1] = (world[1] - di->world_rect.ymin) * di->wo_to_sc[1];
-}
-
-/**
- * Restores the previous OpenGL state and frees the auxiliary gla data.
- */
-void glaEnd2DDraw(gla2DDrawInfo *di)
-{
-	glViewport(di->orig_vp[0], di->orig_vp[1], di->orig_vp[2], di->orig_vp[3]);
-	glScissor(di->orig_vp[0], di->orig_vp[1], di->orig_vp[2], di->orig_vp[3]);
-	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(di->orig_projmat);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadMatrixf(di->orig_viewmat);
-
-	MEM_freeN(di);
-}
-#endif
-
-
-/* Uses current OpenGL state to get view matrices for gluProject/gluUnProject */
-void bgl_get_mats(bglMats *mats)
-{
-	const double badvalue = 1.0e-6;
-
-	glGetDoublev(GL_MODELVIEW_MATRIX, mats->modelview);
-	glGetDoublev(GL_PROJECTION_MATRIX, mats->projection);
-	glGetIntegerv(GL_VIEWPORT, (GLint *)mats->viewport);
-
-	/* Very strange code here - it seems that certain bad values in the
-	 * modelview matrix can cause gluUnProject to give bad results. */
-	if (mats->modelview[0] < badvalue &&
-	    mats->modelview[0] > -badvalue)
-	{
-		mats->modelview[0] = 0;
-	}
-	if (mats->modelview[5] < badvalue &&
-	    mats->modelview[5] > -badvalue)
-	{
-		mats->modelview[5] = 0;
-	}
-
-	/* Set up viewport so that gluUnProject will give correct values */
-	mats->viewport[0] = 0;
-	mats->viewport[1] = 0;
+	immDrawPixelsTexScaled_clipping(state, x, y, img_w, img_h, format, type, zoomfilter, rect, 1.0f, 1.0f,
+	                                clip_min_x, clip_min_y, clip_max_x, clip_max_y, xzoom, yzoom, color);
 }
 
 /* *************** glPolygonOffset hack ************* */
@@ -831,8 +363,7 @@ void bglPolygonOffset(float viewdist, float dist)
 		// glPolygonOffset(-1.0, -1.0);
 
 		/* hack below is to mimic polygon offset */
-		glMatrixMode(GL_PROJECTION);
-		glGetFloatv(GL_PROJECTION_MATRIX, (float *)winmat);
+		gpuGetProjectionMatrix(winmat);
 
 		/* dist is from camera to center point */
 
@@ -863,17 +394,13 @@ void bglPolygonOffset(float viewdist, float dist)
 
 		winmat[14] -= offs;
 		offset += offs;
-
-		glLoadMatrixf(winmat);
-		glMatrixMode(GL_MODELVIEW);
 	}
 	else {
-		glMatrixMode(GL_PROJECTION);
 		winmat[14] += offset;
 		offset = 0.0;
-		glLoadMatrixf(winmat);
-		glMatrixMode(GL_MODELVIEW);
 	}
+
+	gpuLoadProjectionMatrix(winmat);
 }
 
 /* **** Color management helper functions for GLSL display/transform ***** */
@@ -883,7 +410,8 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
                                 ColorManagedViewSettings *view_settings,
                                 ColorManagedDisplaySettings *display_settings,
                                 float clip_min_x, float clip_min_y,
-                                float clip_max_x, float clip_max_y)
+                                float clip_max_x, float clip_max_y,
+                                float zoom_x, float zoom_y)
 {
 	bool force_fallback = false;
 	bool need_fallback = true;
@@ -902,6 +430,11 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
 	if (force_fallback == false) {
 		int ok;
 
+		IMMDrawPixelsTexState state = {0};
+		/* We want GLSL state to be fully handled by OCIO. */
+		state.do_shader_unbind = false;
+		immDrawPixelsTexSetupAttributes(&state);
+
 		if (ibuf->rect_float) {
 			if (ibuf->float_colorspace) {
 				ok = IMB_colormanagement_setup_glsl_draw_from_space(view_settings, display_settings,
@@ -920,8 +453,6 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
 		}
 
 		if (ok) {
-			glColor4f(1.0, 1.0, 1.0, 1.0);
-
 			if (ibuf->rect_float) {
 				int format = 0;
 
@@ -933,16 +464,20 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
 					BLI_assert(!"Incompatible number of channels for GLSL display");
 
 				if (format != 0) {
-					glaDrawPixelsTex_clipping(x, y, ibuf->x, ibuf->y, format, GL_FLOAT,
+					immDrawPixelsTex_clipping(&state,
+					                          x, y, ibuf->x, ibuf->y, format, GL_FLOAT,
 					                          zoomfilter, ibuf->rect_float,
-					                          clip_min_x, clip_min_y, clip_max_x, clip_max_y);
+					                          clip_min_x, clip_min_y, clip_max_x, clip_max_y,
+					                          zoom_x, zoom_y, NULL);
 				}
 			}
 			else if (ibuf->rect) {
 				/* ibuf->rect is always RGBA */
-				glaDrawPixelsTex_clipping(x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE,
+				immDrawPixelsTex_clipping(&state,
+				                          x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE,
 				                          zoomfilter, ibuf->rect,
-				                          clip_min_x, clip_min_y, clip_max_x, clip_max_y);
+				                          clip_min_x, clip_min_y, clip_max_x, clip_max_y,
+				                          zoom_x, zoom_y, NULL);
 			}
 
 			IMB_colormanagement_finish_glsl_draw();
@@ -959,9 +494,12 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
 		display_buffer = IMB_display_buffer_acquire(ibuf, view_settings, display_settings, &cache_handle);
 
 		if (display_buffer) {
-			glaDrawPixelsAuto_clipping(x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE,
-			                           zoomfilter, display_buffer,
-			                           clip_min_x, clip_min_y, clip_max_x, clip_max_y);
+			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+			immDrawPixelsTex_clipping(&state,
+			                          x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE,
+			                          zoomfilter, display_buffer,
+			                          clip_min_x, clip_min_y, clip_max_x, clip_max_y,
+			                          zoom_x, zoom_y, NULL);
 		}
 
 		IMB_display_buffer_release(cache_handle);
@@ -970,10 +508,11 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter,
 
 void glaDrawImBuf_glsl(ImBuf *ibuf, float x, float y, int zoomfilter,
                        ColorManagedViewSettings *view_settings,
-                       ColorManagedDisplaySettings *display_settings)
+                       ColorManagedDisplaySettings *display_settings,
+                       float zoom_x, float zoom_y)
 {
 	glaDrawImBuf_glsl_clipping(ibuf, x, y, zoomfilter, view_settings, display_settings,
-	                           0.0f, 0.0f, 0.0f, 0.0f);
+	                           0.0f, 0.0f, 0.0f, 0.0f, zoom_x, zoom_y);
 }
 
 void glaDrawImBuf_glsl_ctx_clipping(const bContext *C,
@@ -981,7 +520,8 @@ void glaDrawImBuf_glsl_ctx_clipping(const bContext *C,
                                     float x, float y,
                                     int zoomfilter,
                                     float clip_min_x, float clip_min_y,
-                                    float clip_max_x, float clip_max_y)
+                                    float clip_max_x, float clip_max_y,
+                                    float zoom_x, float zoom_y)
 {
 	ColorManagedViewSettings *view_settings;
 	ColorManagedDisplaySettings *display_settings;
@@ -989,22 +529,19 @@ void glaDrawImBuf_glsl_ctx_clipping(const bContext *C,
 	IMB_colormanagement_display_settings_from_ctx(C, &view_settings, &display_settings);
 
 	glaDrawImBuf_glsl_clipping(ibuf, x, y, zoomfilter, view_settings, display_settings,
-	                           clip_min_x, clip_min_y, clip_max_x, clip_max_y);
-}
-
-void glaDrawImBuf_glsl_ctx(const bContext *C, ImBuf *ibuf, float x, float y, int zoomfilter)
-{
-	glaDrawImBuf_glsl_ctx_clipping(C, ibuf, x, y, zoomfilter, 0.0f, 0.0f, 0.0f, 0.0f);
+	                           clip_min_x, clip_min_y, clip_max_x, clip_max_y,
+	                           zoom_x, zoom_y);
 }
 
-void cpack(unsigned int x)
+void glaDrawImBuf_glsl_ctx(const bContext *C, ImBuf *ibuf, float x, float y, int zoomfilter,
+                           float zoom_x, float zoom_y)
 {
-	glColor3ub(( (x)        & 0xFF),
-	           (((x) >>  8) & 0xFF),
-	           (((x) >> 16) & 0xFF));
+	glaDrawImBuf_glsl_ctx_clipping(C, ibuf, x, y, zoomfilter, 0.0f, 0.0f, 0.0f, 0.0f, zoom_x, zoom_y);
 }
 
-void glaDrawBorderCorners(const rcti *border, float zoomx, float zoomy)
+/* don't move to GPU_immediate_util.h because this uses user-prefs
+ * and isn't very low level */
+void immDrawBorderCorners(unsigned int pos, const rcti *border, float zoomx, float zoomy)
 {
 	float delta_x = 4.0f * UI_DPI_FAC / zoomx;
 	float delta_y = 4.0f * UI_DPI_FAC / zoomy;
@@ -1013,30 +550,30 @@ void glaDrawBorderCorners(const rcti *border, float zoomx, float zoomy)
 	delta_y = min_ff(delta_y, border->ymax - border->ymin);
 
 	/* left bottom corner */
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(border->xmin, border->ymin + delta_y);
-	glVertex2f(border->xmin, border->ymin);
-	glVertex2f(border->xmin + delta_x, border->ymin);
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, border->xmin, border->ymin + delta_y);
+	immVertex2f(pos, border->xmin, border->ymin);
+	immVertex2f(pos, border->xmin + delta_x, border->ymin);
+	immEnd();
 
 	/* left top corner */
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(border->xmin, border->ymax - delta_y);
-	glVertex2f(border->xmin, border->ymax);
-	glVertex2f(border->xmin + delta_x, border->ymax);
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, border->xmin, border->ymax - delta_y);
+	immVertex2f(pos, border->xmin, border->ymax);
+	immVertex2f(pos, border->xmin + delta_x, border->ymax);
+	immEnd();
 
 	/* right bottom corner */
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(border->xmax - delta_x, border->ymin);
-	glVertex2f(border->xmax, border->ymin);
-	glVertex2f(border->xmax, border->ymin + delta_y);
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, border->xmax - delta_x, border->ymin);
+	immVertex2f(pos, border->xmax, border->ymin);
+	immVertex2f(pos, border->xmax, border->ymin + delta_y);
+	immEnd();
 
 	/* right top corner */
-	glBegin(GL_LINE_STRIP);
-	glVertex2f(border->xmax - delta_x, border->ymax);
-	glVertex2f(border->xmax, border->ymax);
-	glVertex2f(border->xmax, border->ymax - delta_y);
-	glEnd();
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2f(pos, border->xmax - delta_x, border->ymax);
+	immVertex2f(pos, border->xmax, border->ymax);
+	immVertex2f(pos, border->xmax, border->ymax - delta_y);
+	immEnd();
 }
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index b90430f27e2..864150be9da 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_object_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_gpencil_types.h"
@@ -38,17 +40,21 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_utildefines.h"
 
-
 #include "BKE_context.h"
 #include "BKE_object.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_gpencil.h"
+#include "BKE_layer.h"
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph.h"
 
 #include "RNA_access.h"
 
@@ -61,20 +67,8 @@
 
 #include "screen_intern.h"
 
-static unsigned int context_layers(bScreen *sc, Scene *scene, ScrArea *sa_ctx)
-{
-	/* needed for 'USE_ALLSELECT' define, otherwise we end up editing off-screen layers. */
-	if (sc && sa_ctx && (sa_ctx->spacetype == SPACE_BUTS)) {
-		const unsigned int lay = BKE_screen_view3d_layer_all(sc);
-		if (lay) {
-			return lay;
-		}
-	}
-	return scene->lay;
-}
-
 const char *screen_context_dir[] = {
-	"scene", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
+	"scene", "view_layer", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
 	"selected_objects", "selected_bases",
 	"editable_objects", "editable_bases",
 	"selected_editable_objects", "selected_editable_bases",
@@ -93,20 +87,14 @@ const char *screen_context_dir[] = {
 
 int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result)
 {
+	wmWindow *win = CTX_wm_window(C);
 	bScreen *sc = CTX_wm_screen(C);
 	ScrArea *sa = CTX_wm_area(C);
-	Scene *scene = sc->scene;
-	Base *base;
-
-#if 0  /* Using the context breaks adding objects in the UI. Need to find out why - campbell */
-	Object *obact = CTX_data_active_object(C);
-	Object *obedit = CTX_data_edit_object(C);
-	base = CTX_data_active_base(C);
-#else
-	Object *obedit = scene->obedit;
-	Object *obact = OBACT;
-	base = BASACT;
-#endif
+	Scene *scene = WM_window_get_active_scene(win);
+	WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
+	ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
+	Object *obact = (view_layer && view_layer->basact) ? view_layer->basact->object : NULL;
+	Object *obedit = view_layer ? OBEDIT_FROM_VIEW_LAYER(view_layer) : NULL;
 
 	if (CTX_data_dir(member)) {
 		CTX_data_dir_set(result, screen_context_dir);
@@ -116,84 +104,100 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		CTX_data_id_pointer_set(result, &scene->id);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "visible_objects") || CTX_data_equals(member, "visible_bases")) {
-		const unsigned int lay = context_layers(sc, scene, sa);
-		const bool visible_objects = CTX_data_equals(member, "visible_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) && (base->lay & lay)) {
-				if (visible_objects)
-					CTX_data_id_list_add(result, &base->object->id);
-				else
-					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+	else if (CTX_data_equals(member, "visible_objects")) {
+		FOREACH_VISIBLE_OBJECT_BEGIN(view_layer, ob)
+		{
+			CTX_data_id_list_add(result, &ob->id);
+		}
+		FOREACH_VISIBLE_BASE_END;
+		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
+		return 1;
+	}
+	else if (CTX_data_equals(member, "selectable_objects")) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if (((base->flag & BASE_VISIBLED) != 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
+				CTX_data_id_list_add(result, &base->object->id);
 			}
 		}
 		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "selectable_objects") || CTX_data_equals(member, "selectable_bases")) {
-		const unsigned int lay = context_layers(sc, scene, sa);
-		const bool selectable_objects = CTX_data_equals(member, "selectable_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & lay) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0 && (base->object->restrictflag & OB_RESTRICT_SELECT) == 0) {
-					if (selectable_objects)
-						CTX_data_id_list_add(result, &base->object->id);
-					else
-						CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-				}
+	else if (CTX_data_equals(member, "selected_objects")) {
+		FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
+		{
+			CTX_data_id_list_add(result, &ob->id);
+		}
+		FOREACH_SELECTED_OBJECT_END;
+		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
+		return 1;
+	}
+	else if (CTX_data_equals(member, "selected_editable_objects")) {
+		FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
+		{
+			if (0 == BKE_object_is_libdata(ob)) {
+				CTX_data_id_list_add(result, &ob->id);
 			}
 		}
+		FOREACH_SELECTED_OBJECT_END;
 		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) {
-		const unsigned int lay = context_layers(sc, scene, sa);
-		const bool selected_objects = CTX_data_equals(member, "selected_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if ((base->flag & SELECT) && (base->lay & lay)) {
-				if (selected_objects)
-					CTX_data_id_list_add(result, &base->object->id);
-				else
-					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+	else if (CTX_data_equals(member, "editable_objects")) {
+		/* Visible + Editable, but not necessarily selected */
+		FOREACH_VISIBLE_OBJECT_BEGIN(view_layer, ob)
+		{
+			if (0 == BKE_object_is_libdata(ob)) {
+				CTX_data_id_list_add(result, &ob->id);
 			}
 		}
+		FOREACH_VISIBLE_OBJECT_END;
 		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "selected_editable_objects") || CTX_data_equals(member, "selected_editable_bases")) {
-		const unsigned int lay = context_layers(sc, scene, sa);
-		const bool selected_editable_objects = CTX_data_equals(member, "selected_editable_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if ((base->flag & SELECT) && (base->lay & lay)) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) {
-					if (0 == BKE_object_is_libdata(base->object)) {
-						if (selected_editable_objects)
-							CTX_data_id_list_add(result, &base->object->id);
-						else
-							CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-					}
+	else if ( CTX_data_equals(member, "visible_bases")) {
+		FOREACH_VISIBLE_BASE_BEGIN(view_layer, base)
+		{
+			CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+		}
+		FOREACH_VISIBLE_BASE_END;
+		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
+		return 1;
+	}
+	else if (CTX_data_equals(member, "selectable_bases")) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if ((base->flag & BASE_SELECTABLED) != 0) {
+				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+			}
+		}
+		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
+		return 1;
+	}
+	else if (CTX_data_equals(member, "selected_bases")) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if ((base->flag & BASE_SELECTED) != 0) {
+				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+			}
+		}
+		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
+		return 1;
+	}
+	else if (CTX_data_equals(member, "selected_editable_bases")) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if ((base->flag & BASE_SELECTED) != 0) {
+				if (0 == BKE_object_is_libdata(base->object)) {
+					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 				}
 			}
 		}
 		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "editable_objects") || CTX_data_equals(member, "editable_bases")) {
-		const unsigned int lay = context_layers(sc, scene, sa);
-		const bool editable_objects = CTX_data_equals(member, "editable_objects");
-
+	else if (CTX_data_equals(member, "editable_bases")) {
 		/* Visible + Editable, but not necessarily selected */
-		for (base = scene->base.first; base; base = base->next) {
-			if (((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) && (base->lay & lay)) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if ((base->flag & BASE_VISIBLED) != 0) {
 				if (0 == BKE_object_is_libdata(base->object)) {
-					if (editable_objects)
-						CTX_data_id_list_add(result, &base->object->id);
-					else
-						CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
+					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 				}
 			}
 		}
@@ -206,38 +210,47 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		const bool editable_bones = CTX_data_equals(member, "editable_bones");
 
 		if (arm && arm->edbo) {
-			/* Attention: X-Axis Mirroring is also handled here... */
-			for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
-				/* first and foremost, bone must be visible and selected */
-				if (EBONE_VISIBLE(arm, ebone)) {
-					/* Get 'x-axis mirror equivalent' bone if the X-Axis Mirroring option is enabled
-					 * so that most users of this data don't need to explicitly check for it themselves.
-					 *
-					 * We need to make sure that these mirrored copies are not selected, otherwise some
-					 * bones will be operated on twice.
-					 */
-					if (arm->flag & ARM_MIRROR_EDIT)
-						flipbone = ED_armature_ebone_get_mirrored(arm->edbo, ebone);
-
-					/* if we're filtering for editable too, use the check for that instead, as it has selection check too */
-					if (editable_bones) {
-						/* only selected + editable */
-						if (EBONE_EDITABLE(ebone)) {
+			uint objects_len;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+			for (uint i = 0; i < objects_len; i++) {
+				Object *ob = objects[i];
+				arm = ob->data;
+
+				/* Attention: X-Axis Mirroring is also handled here... */
+				for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+					/* first and foremost, bone must be visible and selected */
+					if (EBONE_VISIBLE(arm, ebone)) {
+						/* Get 'x-axis mirror equivalent' bone if the X-Axis Mirroring option is enabled
+						 * so that most users of this data don't need to explicitly check for it themselves.
+						 *
+						 * We need to make sure that these mirrored copies are not selected, otherwise some
+						 * bones will be operated on twice.
+						 */
+						if (arm->flag & ARM_MIRROR_EDIT)
+							flipbone = ED_armature_ebone_get_mirrored(arm->edbo, ebone);
+
+						/* if we're filtering for editable too, use the check for that instead, as it has selection check too */
+						if (editable_bones) {
+							/* only selected + editable */
+							if (EBONE_EDITABLE(ebone)) {
+								CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
+
+								if ((flipbone) && !(flipbone->flag & BONE_SELECTED))
+									CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
+							}
+						}
+						else {
+							/* only include bones if visible */
 							CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
 
-							if ((flipbone) && !(flipbone->flag & BONE_SELECTED))
+							if ((flipbone) && EBONE_VISIBLE(arm, flipbone) == 0)
 								CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
 						}
 					}
-					else {
-						/* only include bones if visible */
-						CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
-
-						if ((flipbone) && EBONE_VISIBLE(arm, flipbone) == 0)
-							CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
-					}
 				}
 			}
+			MEM_freeN(objects);
+
 			CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 			return 1;
 		}
@@ -248,53 +261,65 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		const bool selected_editable_bones = CTX_data_equals(member, "selected_editable_bones");
 
 		if (arm && arm->edbo) {
-			/* Attention: X-Axis Mirroring is also handled here... */
-			for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
-				/* first and foremost, bone must be visible and selected */
-				if (EBONE_VISIBLE(arm, ebone) && (ebone->flag & BONE_SELECTED)) {
-					/* Get 'x-axis mirror equivalent' bone if the X-Axis Mirroring option is enabled
-					 * so that most users of this data don't need to explicitly check for it themselves.
-					 *
-					 * We need to make sure that these mirrored copies are not selected, otherwise some
-					 * bones will be operated on twice.
-					 */
-					if (arm->flag & ARM_MIRROR_EDIT)
-						flipbone = ED_armature_ebone_get_mirrored(arm->edbo, ebone);
-
-					/* if we're filtering for editable too, use the check for that instead, as it has selection check too */
-					if (selected_editable_bones) {
-						/* only selected + editable */
-						if (EBONE_EDITABLE(ebone)) {
+			uint objects_len;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+			for (uint i = 0; i < objects_len; i++) {
+				Object *ob = objects[i];
+				arm = ob->data;
+
+				/* Attention: X-Axis Mirroring is also handled here... */
+				for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+					/* first and foremost, bone must be visible and selected */
+					if (EBONE_VISIBLE(arm, ebone) && (ebone->flag & BONE_SELECTED)) {
+						/* Get 'x-axis mirror equivalent' bone if the X-Axis Mirroring option is enabled
+						 * so that most users of this data don't need to explicitly check for it themselves.
+						 *
+						 * We need to make sure that these mirrored copies are not selected, otherwise some
+						 * bones will be operated on twice.
+						 */
+						if (arm->flag & ARM_MIRROR_EDIT)
+							flipbone = ED_armature_ebone_get_mirrored(arm->edbo, ebone);
+
+						/* if we're filtering for editable too, use the check for that instead, as it has selection check too */
+						if (selected_editable_bones) {
+							/* only selected + editable */
+							if (EBONE_EDITABLE(ebone)) {
+								CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
+
+								if ((flipbone) && !(flipbone->flag & BONE_SELECTED))
+									CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
+							}
+						}
+						else {
+							/* only include bones if selected */
 							CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
 
 							if ((flipbone) && !(flipbone->flag & BONE_SELECTED))
 								CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
 						}
 					}
-					else {
-						/* only include bones if selected */
-						CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
-
-						if ((flipbone) && !(flipbone->flag & BONE_SELECTED))
-							CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
-					}
 				}
 			}
+			MEM_freeN(objects);
+
 			CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 			return 1;
 		}
 	}
 	else if (CTX_data_equals(member, "visible_pose_bones")) {
 		Object *obpose = BKE_object_pose_armature_get(obact);
-		bArmature *arm = (obpose) ? obpose->data : NULL;
-		bPoseChannel *pchan;
-
-		if (obpose && obpose->pose && arm) {
-			for (pchan = obpose->pose->chanbase.first; pchan; pchan = pchan->next) {
-				/* ensure that PoseChannel is on visible layer and is not hidden in PoseMode */
-				if (PBONE_VISIBLE(arm, pchan->bone)) {
+		if (obpose && obpose->pose && obpose->data) {
+			if (obpose != obact) {
+				FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN (obpose, pchan) {
 					CTX_data_list_add(result, &obpose->id, &RNA_PoseBone, pchan);
-				}
+				} FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
+			}
+			else if (obact->mode & OB_MODE_POSE) {
+				FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob_iter) {
+					FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN (ob_iter, pchan) {
+						CTX_data_list_add(result, &ob_iter->id, &RNA_PoseBone, pchan);
+					} FOREACH_PCHAN_VISIBLE_IN_OBJECT_END;
+				} FOREACH_OBJECT_IN_MODE_END;
 			}
 			CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 			return 1;
@@ -302,16 +327,18 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	}
 	else if (CTX_data_equals(member, "selected_pose_bones")) {
 		Object *obpose = BKE_object_pose_armature_get(obact);
-		bArmature *arm = (obpose) ? obpose->data : NULL;
-		bPoseChannel *pchan;
-
-		if (obpose && obpose->pose && arm) {
-			for (pchan = obpose->pose->chanbase.first; pchan; pchan = pchan->next) {
-				/* ensure that PoseChannel is on visible layer and is not hidden in PoseMode */
-				if (PBONE_VISIBLE(arm, pchan->bone)) {
-					if (pchan->bone->flag & BONE_SELECTED)
-						CTX_data_list_add(result, &obpose->id, &RNA_PoseBone, pchan);
-				}
+		if (obpose && obpose->pose && obpose->data) {
+			if (obpose != obact) {
+				FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (obpose, pchan) {
+					CTX_data_list_add(result, &obpose->id, &RNA_PoseBone, pchan);
+				} FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
+			}
+			else if (obact->mode & OB_MODE_POSE) {
+				FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, OB_MODE_POSE, ob_iter) {
+					FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob_iter, pchan) {
+						CTX_data_list_add(result, &ob_iter->id, &RNA_PoseBone, pchan);
+					} FOREACH_PCHAN_SELECTED_IN_OBJECT_END;
+				} FOREACH_OBJECT_IN_MODE_END;
 			}
 			CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 			return 1;
@@ -345,8 +372,8 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		}
 	}
 	else if (CTX_data_equals(member, "active_base")) {
-		if (base)
-			CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, base);
+		if (view_layer->basact)
+			CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, view_layer->basact);
 
 		return 1;
 	}
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c
index 12f45faee94..fec39ade110 100644
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/screen/screen_draw.c
@@ -22,18 +22,26 @@
  *  \ingroup edscr
  */
 
-#include "BIF_gl.h"
+#include "ED_screen.h"
+
+#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
+#include "BLI_math.h"
 
 #include "WM_api.h"
+#include "WM_types.h"
 
-#include "ED_screen.h"
+#include "UI_interface.h"
+#include "UI_resources.h"
 
 #include "screen_intern.h"
 
 /**
  * Draw horizontal shape visualizing future joining (left as well right direction of future joining).
  */
-static void draw_horizontal_join_shape(ScrArea *sa, char dir)
+static void draw_horizontal_join_shape(ScrArea *sa, char dir, unsigned int pos)
 {
 	vec2f points[10];
 	short i;
@@ -90,24 +98,31 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir)
 		}
 	}
 
-	glBegin(GL_POLYGON);
-	for (i = 0; i < 5; i++)
-		glVertex2f(points[i].x, points[i].y);
-	glEnd();
-	glBegin(GL_POLYGON);
-	for (i = 4; i < 8; i++)
-		glVertex2f(points[i].x, points[i].y);
-	glVertex2f(points[0].x, points[0].y);
-	glEnd();
-
-	glRectf(points[2].x, points[2].y, points[8].x, points[8].y);
-	glRectf(points[6].x, points[6].y, points[9].x, points[9].y);
+	immBegin(GWN_PRIM_TRI_FAN, 5);
+
+	for (i = 0; i < 5; i++) {
+		immVertex2f(pos, points[i].x, points[i].y);
+	}
+
+	immEnd();
+
+	immBegin(GWN_PRIM_TRI_FAN, 5);
+
+	for (i = 4; i < 8; i++) {
+		immVertex2f(pos, points[i].x, points[i].y);
+	}
+
+	immVertex2f(pos, points[0].x, points[0].y);
+	immEnd();
+
+	immRectf(pos, points[2].x, points[2].y, points[8].x, points[8].y);
+	immRectf(pos, points[6].x, points[6].y, points[9].x, points[9].y);
 }
 
 /**
  * Draw vertical shape visualizing future joining (up/down direction).
  */
-static void draw_vertical_join_shape(ScrArea *sa, char dir)
+static void draw_vertical_join_shape(ScrArea *sa, char dir, unsigned int pos)
 {
 	vec2f points[10];
 	short i;
@@ -164,93 +179,252 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir)
 		}
 	}
 
-	glBegin(GL_POLYGON);
-	for (i = 0; i < 5; i++)
-		glVertex2f(points[i].x, points[i].y);
-	glEnd();
-	glBegin(GL_POLYGON);
-	for (i = 4; i < 8; i++)
-		glVertex2f(points[i].x, points[i].y);
-	glVertex2f(points[0].x, points[0].y);
-	glEnd();
-
-	glRectf(points[2].x, points[2].y, points[8].x, points[8].y);
-	glRectf(points[6].x, points[6].y, points[9].x, points[9].y);
+	immBegin(GWN_PRIM_TRI_FAN, 5);
+
+	for (i = 0; i < 5; i++) {
+		immVertex2f(pos, points[i].x, points[i].y);
+	}
+
+	immEnd();
+
+	immBegin(GWN_PRIM_TRI_FAN, 5);
+
+	for (i = 4; i < 8; i++) {
+		immVertex2f(pos, points[i].x, points[i].y);
+	}
+
+	immVertex2f(pos, points[0].x, points[0].y);
+	immEnd();
+
+	immRectf(pos, points[2].x, points[2].y, points[8].x, points[8].y);
+	immRectf(pos, points[6].x, points[6].y, points[9].x, points[9].y);
 }
 
 /**
  * Draw join shape due to direction of joining.
  */
-static void draw_join_shape(ScrArea *sa, char dir)
+static void draw_join_shape(ScrArea *sa, char dir, unsigned int pos)
 {
 	if (dir == 'u' || dir == 'd') {
-		draw_vertical_join_shape(sa, dir);
+		draw_vertical_join_shape(sa, dir, pos);
+	}
+	else {
+		draw_horizontal_join_shape(sa, dir, pos);
+	}
+}
+
+#define CORNER_RESOLUTION 10
+static void drawscredge_corner_geometry(
+        int sizex, int sizey,
+        int corner_x, int corner_y,
+        int center_x, int center_y,
+        double angle_offset,
+        const float *color)
+{
+	const int radius = ABS(corner_x - center_x);
+	const int line_thickness = U.pixelsize;
+
+	if (corner_x < center_x) {
+		if (corner_x > 0.0f) {
+			/* Left (internal) edge. */
+			corner_x += line_thickness;
+			center_x += line_thickness;
+		}
 	}
 	else {
-		draw_horizontal_join_shape(sa, dir);
+		/* Right (internal) edge. */
+		if (corner_x < sizex - 1) {
+			corner_x += 1 - line_thickness;
+			center_x += 1 - line_thickness;
+		}
+		else {
+			/* Corner case, extreme right edge. */
+			corner_x += 1;
+			center_x += 1;
+		}
+	}
+
+	if (corner_y < center_y) {
+		if (corner_y > 0.0f) {
+			/* Bottom (internal) edge. */
+			corner_y += line_thickness;
+			center_y += line_thickness;
+		}
+	}
+	else {
+		/* Top (internal) edge. */
+		if (corner_y < sizey) {
+			corner_y += 1 - line_thickness;
+			center_y += 1 - line_thickness;
+		}
 	}
+
+	float tri_array[CORNER_RESOLUTION + 1][2];
+
+	tri_array[0][0] = corner_x;
+	tri_array[0][1] = corner_y;
+
+	for (int i = 0; i < CORNER_RESOLUTION; i++) {
+		double angle = angle_offset + (M_PI_2 * ((float)i / (CORNER_RESOLUTION - 1)));
+		float x = center_x + (radius * cos(angle));
+		float y = center_y + (radius * sin(angle));
+		tri_array[i + 1][0] = x;
+		tri_array[i + 1][1] = y;
+	}
+
+	UI_draw_anti_fan(tri_array, CORNER_RESOLUTION + 1, color);
+}
+
+#undef CORNER_RESOLUTION
+
+static void drawscredge_corner(ScrArea *sa, int sizex, int sizey)
+{
+	int size = 10 * U.pixelsize;
+	float color[4] = {0};
+	UI_GetThemeColor4fv(TH_EDITOR_OUTLINE, color);
+
+	/* Bottom-Left. */
+	drawscredge_corner_geometry(sizex, sizey,
+	                            sa->v1->vec.x,
+	                            sa->v1->vec.y,
+	                            sa->v1->vec.x + size,
+	                            sa->v1->vec.y + size,
+	                            M_PI_2 * 2.0f,
+	                            color);
+
+	/* Top-Left. */
+	drawscredge_corner_geometry(sizex, sizey,
+	                            sa->v2->vec.x,
+	                            sa->v2->vec.y,
+	                            sa->v2->vec.x + size,
+	                            sa->v2->vec.y - size,
+	                            M_PI_2,
+	                            color);
+
+	/* Top-Right. */
+	drawscredge_corner_geometry(sizex, sizey,
+	                            sa->v3->vec.x,
+	                            sa->v3->vec.y,
+	                            sa->v3->vec.x - size,
+	                            sa->v3->vec.y - size,
+	                            0.0f,
+	                            color);
+
+	/* Bottom-Right. */
+	drawscredge_corner_geometry(sizex, sizey,
+	                            sa->v4->vec.x,
+	                            sa->v4->vec.y,
+	                            sa->v4->vec.x - size,
+	                            sa->v4->vec.y + size,
+	                            M_PI_2 * 3.0f,
+	                            color);
+
+	/* Wrap up the corners with a nice embossing. */
+	rcti rect = sa->totrct;
+
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4fv(color);
+	immBeginAtMost(GWN_PRIM_LINES, 8);
+
+	/* Right. */
+	immVertex2f(pos, rect.xmax, rect.ymax);
+	immVertex2f(pos, rect.xmax, rect.ymin);
+
+	/* Bottom. */
+	immVertex2f(pos, rect.xmax, rect.ymin);
+	immVertex2f(pos, rect.xmin, rect.ymin);
+
+	/* Left. */
+	immVertex2f(pos, rect.xmin, rect.ymin);
+	immVertex2f(pos, rect.xmin, rect.ymax);
+
+	/* Top. */
+	immVertex2f(pos, rect.xmin, rect.ymax);
+	immVertex2f(pos, rect.xmax, rect.ymax);
+
+	immEnd();
+	immUnbindProgram();
 }
 
 /**
  * Draw screen area darker with arrow (visualization of future joining).
  */
-static void scrarea_draw_shape_dark(ScrArea *sa, char dir)
+static void scrarea_draw_shape_dark(ScrArea *sa, char dir, unsigned int pos)
 {
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glColor4ub(0, 0, 0, 50);
-	draw_join_shape(sa, dir);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	immUniformColor4ub(0, 0, 0, 50);
+
+	draw_join_shape(sa, dir, pos);
 }
 
 /**
  * Draw screen area ligher with arrow shape ("eraser" of previous dark shape).
  */
-static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir))
+static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir), unsigned int pos)
 {
 	glBlendFunc(GL_DST_COLOR, GL_SRC_ALPHA);
 	/* value 181 was hardly computed: 181~105 */
-	glColor4ub(255, 255, 255, 50);
+	immUniformColor4ub(255, 255, 255, 50);
 	/* draw_join_shape(sa, dir); */
-	glRecti(sa->v1->vec.x, sa->v1->vec.y, sa->v3->vec.x, sa->v3->vec.y);
+
+	immRectf(pos, sa->v1->vec.x, sa->v1->vec.y, sa->v3->vec.x, sa->v3->vec.y);
 }
 
-static void drawscredge_area_draw(int sizex, int sizey, short x1, short y1, short x2, short y2)
+static void drawscredge_area_draw(int sizex, int sizey, short x1, short y1, short x2, short y2, unsigned int pos)
 {
+	int count = 0;
+
+	if (x2 < sizex - 1) count += 2;
+	if (x1 > 0) count += 2;
+	if (y2 < sizey - 1) count += 2;
+	if (y1 > 0) count += 2;
+
+	if (count == 0) {
+		return;
+	}
+
+	immBegin(GWN_PRIM_LINES, count);
+
 	/* right border area */
 	if (x2 < sizex - 1) {
-		glVertex2s(x2, y1);
-		glVertex2s(x2, y2);
+		immVertex2f(pos, x2, y1);
+		immVertex2f(pos, x2, y2);
 	}
 
 	/* left border area */
 	if (x1 > 0) { /* otherwise it draws the emboss of window over */
-		glVertex2s(x1, y1);
-		glVertex2s(x1, y2);
+		immVertex2f(pos, x1, y1);
+		immVertex2f(pos, x1, y2);
 	}
 
 	/* top border area */
 	if (y2 < sizey - 1) {
-		glVertex2s(x1, y2);
-		glVertex2s(x2, y2);
+		immVertex2f(pos, x1, y2);
+		immVertex2f(pos, x2, y2);
 	}
 
 	/* bottom border area */
 	if (y1 > 0) {
-		glVertex2s(x1, y1);
-		glVertex2s(x2, y1);
+		immVertex2f(pos, x1, y1);
+		immVertex2f(pos, x2, y1);
 	}
+
+	immEnd();
 }
 
 /**
  * \brief Screen edges drawing.
  */
-static void drawscredge_area(ScrArea *sa, int sizex, int sizey)
+static void drawscredge_area(ScrArea *sa, int sizex, int sizey, unsigned int pos)
 {
 	short x1 = sa->v1->vec.x;
 	short y1 = sa->v1->vec.y;
 	short x2 = sa->v3->vec.x;
 	short y2 = sa->v3->vec.y;
 
-	drawscredge_area_draw(sizex, sizey, x1, y1, x2, y2);
+	drawscredge_area_draw(sizex, sizey, x1, y1, x2, y2, pos);
 }
 
 /**
@@ -258,33 +432,40 @@ static void drawscredge_area(ScrArea *sa, int sizex, int sizey)
  */
 void ED_screen_draw_edges(wmWindow *win)
 {
+	bScreen *screen = WM_window_get_active_screen(win);
 	const int winsize_x = WM_window_pixels_x(win);
 	const int winsize_y = WM_window_pixels_y(win);
 
 	ScrArea *sa;
 
-	wmSubWindowSet(win, win->screen->mainwin);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* Note: first loop only draws if U.pixelsize > 1, skip otherwise */
 	if (U.pixelsize > 1.0f) {
 		/* FIXME: doesn't our glLineWidth already scale by U.pixelsize? */
 		glLineWidth((2.0f * U.pixelsize) - 1);
-		glColor3ub(0x50, 0x50, 0x50);
-		glBegin(GL_LINES);
-		for (sa = win->screen->areabase.first; sa; sa = sa->next)
-			drawscredge_area(sa, winsize_x, winsize_y);
-		glEnd();
+		immUniformThemeColor(TH_EDITOR_OUTLINE);
+
+		for (sa = screen->areabase.first; sa; sa = sa->next) {
+			drawscredge_area(sa, winsize_x, winsize_y, pos);
+		}
 	}
 
 	glLineWidth(1);
-	glColor3ub(0, 0, 0);
-	glBegin(GL_LINES);
-	for (sa = win->screen->areabase.first; sa; sa = sa->next) {
-		drawscredge_area(sa, winsize_x, winsize_y);
+	immUniformThemeColor(TH_EDITOR_OUTLINE);
+
+	for (sa = screen->areabase.first; sa; sa = sa->next) {
+		drawscredge_area(sa, winsize_x, winsize_y, pos);
+	}
+
+	immUnbindProgram();
+
+	for (sa = screen->areabase.first; sa; sa = sa->next) {
+		drawscredge_corner(sa, winsize_x, winsize_y);
 	}
-	glEnd();
 
-	win->screen->do_draw = false;
+	screen->do_draw = false;
 }
 
 /**
@@ -295,6 +476,9 @@ void ED_screen_draw_edges(wmWindow *win)
  */
 void ED_screen_draw_join_shape(ScrArea *sa1, ScrArea *sa2)
 {
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	glLineWidth(1);
 
 	/* blended join arrow */
@@ -319,37 +503,155 @@ void ED_screen_draw_join_shape(ScrArea *sa1, ScrArea *sa2)
 				dira = 'd';
 				break;
 		}
+
 		glEnable(GL_BLEND);
-		scrarea_draw_shape_dark(sa2, dir);
-		scrarea_draw_shape_light(sa1, dira);
+
+		scrarea_draw_shape_dark(sa2, dir, pos);
+		scrarea_draw_shape_light(sa1, dira, pos);
+
 		glDisable(GL_BLEND);
 	}
+
+	immUnbindProgram();
 }
 
 void ED_screen_draw_split_preview(ScrArea *sa, const int dir, const float fac)
 {
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* splitpoint */
 	glEnable(GL_BLEND);
-	glBegin(GL_LINES);
-	glColor4ub(255, 255, 255, 100);
+	immUniformColor4ub(255, 255, 255, 100);
+
+	immBegin(GWN_PRIM_LINES, 2);
 
 	if (dir == 'h') {
 		const float y = (1 - fac) * sa->totrct.ymin + fac * sa->totrct.ymax;
-		glVertex2s(sa->totrct.xmin, y);
-		glVertex2s(sa->totrct.xmax, y);
-		glColor4ub(0, 0, 0, 100);
-		glVertex2s(sa->totrct.xmin, y + 1);
-		glVertex2s(sa->totrct.xmax, y + 1);
+
+		immVertex2f(pos, sa->totrct.xmin, y);
+		immVertex2f(pos, sa->totrct.xmax, y);
+
+		immEnd();
+
+		immUniformColor4ub(0, 0, 0, 100);
+
+		immBegin(GWN_PRIM_LINES, 2);
+
+		immVertex2f(pos, sa->totrct.xmin, y + 1);
+		immVertex2f(pos, sa->totrct.xmax, y + 1);
+
+		immEnd();
 	}
 	else {
+		BLI_assert(dir == 'v');
 		const float x = (1 - fac) * sa->totrct.xmin + fac * sa->totrct.xmax;
-		glVertex2s(x, sa->totrct.ymin);
-		glVertex2s(x, sa->totrct.ymax);
-		glColor4ub(0, 0, 0, 100);
-		glVertex2s(x + 1, sa->totrct.ymin);
-		glVertex2s(x + 1, sa->totrct.ymax);
+
+		immVertex2f(pos, x, sa->totrct.ymin);
+		immVertex2f(pos, x, sa->totrct.ymax);
+
+		immEnd();
+
+		immUniformColor4ub(0, 0, 0, 100);
+
+		immBegin(GWN_PRIM_LINES, 2);
+
+		immVertex2f(pos, x + 1, sa->totrct.ymin);
+		immVertex2f(pos, x + 1, sa->totrct.ymax);
+
+		immEnd();
 	}
-	glEnd();
+
 	glDisable(GL_BLEND);
+
+	immUnbindProgram();
 }
 
+
+/* -------------------------------------------------------------------- */
+/* Screen Thumbnail Preview */
+
+/**
+ * Calculates a scale factor to squash the preview for \a screen into a rectangle of given size and aspect.
+ */
+static void screen_preview_scale_get(
+        const bScreen *screen, float size_x, float size_y,
+        const float asp[2],
+        float r_scale[2])
+{
+	float max_x = 0, max_y = 0;
+
+	for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+		max_x = MAX2(max_x, sa->totrct.xmax);
+		max_y = MAX2(max_y, sa->totrct.ymax);
+	}
+	r_scale[0] = (size_x * asp[0]) / max_x;
+	r_scale[1] = (size_y * asp[1]) / max_y;
+}
+
+static void screen_preview_draw_areas(const bScreen *screen, const float scale[2], const float col[4],
+                                      const float ofs_between_areas)
+{
+	const float ofs_h = ofs_between_areas * 0.5f;
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor4fv(col);
+
+	for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+		rctf rect = {
+			.xmin = sa->totrct.xmin * scale[0] + ofs_h,
+			.xmax = sa->totrct.xmax * scale[0] - ofs_h,
+			.ymin = sa->totrct.ymin * scale[1] + ofs_h,
+			.ymax = sa->totrct.ymax * scale[1] - ofs_h
+		};
+
+		immBegin(GWN_PRIM_TRI_FAN, 4);
+		immVertex2f(pos, rect.xmin, rect.ymin);
+		immVertex2f(pos, rect.xmax, rect.ymin);
+		immVertex2f(pos, rect.xmax, rect.ymax);
+		immVertex2f(pos, rect.xmin, rect.ymax);
+		immEnd();
+	}
+
+	immUnbindProgram();
+}
+
+static void screen_preview_draw(const bScreen *screen, int size_x, int size_y)
+{
+	const float asp[2] = {1.0f, 0.8f}; /* square previews look a bit ugly */
+	/* could use theme color (tui.wcol_menu_item.text), but then we'd need to regenerate all previews when changing */
+	const float col[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	float scale[2];
+
+	wmOrtho2(0.0f, size_x, 0.0f, size_y);
+	/* center */
+	gpuPushMatrix();
+	gpuLoadIdentity();
+	gpuTranslate2f(size_x * (1.0f - asp[0]) * 0.5f, size_y * (1.0f - asp[1]) * 0.5f);
+
+	screen_preview_scale_get(screen, size_x, size_y, asp, scale);
+	screen_preview_draw_areas(screen, scale, col, 1.5f);
+
+	gpuPopMatrix();
+}
+
+/**
+ * Render the preview for a screen layout in \a screen.
+ */
+void ED_screen_preview_render(const bScreen *screen, int size_x, int size_y, unsigned int *r_rect)
+{
+	char err_out[256] = "unknown";
+	GPUOffScreen *offscreen = GPU_offscreen_create(size_x, size_y, 0, true, false, err_out);
+
+	GPU_offscreen_bind(offscreen, true);
+	glClearColor(0.0, 0.0, 0.0, 0.0);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	screen_preview_draw(screen, size_x, size_y);
+
+	GPU_offscreen_read_pixels(offscreen, GL_UNSIGNED_BYTE, r_rect);
+	GPU_offscreen_unbind(offscreen, true);
+
+	GPU_offscreen_free(offscreen);
+}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index ec1c5511ae8..06735eb8689 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -33,7 +33,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_workspace_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BLI_math.h"
@@ -41,18 +43,17 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_screen.h"
 #include "BKE_scene.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "BKE_workspace.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -66,198 +67,43 @@
 
 #include "UI_interface.h"
 
-/* XXX actually should be not here... solve later */
-#include "wm_subwindow.h"
+#include "WM_message.h"
+
+#include "DEG_depsgraph_query.h"
 
 #include "screen_intern.h"  /* own module include */
 
 
 /* ******************* screen vert, edge, area managing *********************** */
 
-static ScrVert *screen_addvert(bScreen *sc, short x, short y)
+static ScrVert *screen_addvert_ex(ScrAreaMap *area_map, short x, short y)
 {
 	ScrVert *sv = MEM_callocN(sizeof(ScrVert), "addscrvert");
 	sv->vec.x = x;
 	sv->vec.y = y;
 
-	BLI_addtail(&sc->vertbase, sv);
+	BLI_addtail(&area_map->vertbase, sv);
 	return sv;
 }
-
-static void sortscrvert(ScrVert **v1, ScrVert **v2)
+static ScrVert *screen_addvert(bScreen *sc, short x, short y)
 {
-	ScrVert *tmp;
-
-	if (*v1 > *v2) {
-		tmp = *v1;
-		*v1 = *v2;
-		*v2 = tmp;
-	}
+	return screen_addvert_ex(AREAMAP_FROM_SCREEN(sc), x, y);
 }
 
-static ScrEdge *screen_addedge(bScreen *sc, ScrVert *v1, ScrVert *v2)
+static ScrEdge *screen_addedge_ex(ScrAreaMap *area_map, ScrVert *v1, ScrVert *v2)
 {
 	ScrEdge *se = MEM_callocN(sizeof(ScrEdge), "addscredge");
 
-	sortscrvert(&v1, &v2);
+	BKE_screen_sort_scrvert(&v1, &v2);
 	se->v1 = v1;
 	se->v2 = v2;
 
-	BLI_addtail(&sc->edgebase, se);
+	BLI_addtail(&area_map->edgebase, se);
 	return se;
 }
-
-
-ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2)
-{
-	ScrEdge *se;
-
-	sortscrvert(&v1, &v2);
-	for (se = sc->edgebase.first; se; se = se->next)
-		if (se->v1 == v1 && se->v2 == v2)
-			return se;
-
-	return NULL;
-}
-
-void removedouble_scrverts(bScreen *sc)
-{
-	ScrVert *v1, *verg;
-	ScrEdge *se;
-	ScrArea *sa;
-
-	verg = sc->vertbase.first;
-	while (verg) {
-		if (verg->newv == NULL) { /* !!! */
-			v1 = verg->next;
-			while (v1) {
-				if (v1->newv == NULL) {   /* !?! */
-					if (v1->vec.x == verg->vec.x && v1->vec.y == verg->vec.y) {
-						/* printf("doublevert\n"); */
-						v1->newv = verg;
-					}
-				}
-				v1 = v1->next;
-			}
-		}
-		verg = verg->next;
-	}
-
-	/* replace pointers in edges and faces */
-	se = sc->edgebase.first;
-	while (se) {
-		if (se->v1->newv) se->v1 = se->v1->newv;
-		if (se->v2->newv) se->v2 = se->v2->newv;
-		/* edges changed: so.... */
-		sortscrvert(&(se->v1), &(se->v2));
-		se = se->next;
-	}
-	sa = sc->areabase.first;
-	while (sa) {
-		if (sa->v1->newv) sa->v1 = sa->v1->newv;
-		if (sa->v2->newv) sa->v2 = sa->v2->newv;
-		if (sa->v3->newv) sa->v3 = sa->v3->newv;
-		if (sa->v4->newv) sa->v4 = sa->v4->newv;
-		sa = sa->next;
-	}
-
-	/* remove */
-	verg = sc->vertbase.first;
-	while (verg) {
-		v1 = verg->next;
-		if (verg->newv) {
-			BLI_remlink(&sc->vertbase, verg);
-			MEM_freeN(verg);
-		}
-		verg = v1;
-	}
-
-}
-
-void removenotused_scrverts(bScreen *sc)
-{
-	ScrVert *sv, *svn;
-	ScrEdge *se;
-
-	/* we assume edges are ok */
-
-	se = sc->edgebase.first;
-	while (se) {
-		se->v1->flag = 1;
-		se->v2->flag = 1;
-		se = se->next;
-	}
-
-	sv = sc->vertbase.first;
-	while (sv) {
-		svn = sv->next;
-		if (sv->flag == 0) {
-			BLI_remlink(&sc->vertbase, sv);
-			MEM_freeN(sv);
-		}
-		else {
-			sv->flag = 0;
-		}
-		sv = svn;
-	}
-}
-
-void removedouble_scredges(bScreen *sc)
-{
-	ScrEdge *verg, *se, *sn;
-
-	/* compare */
-	verg = sc->edgebase.first;
-	while (verg) {
-		se = verg->next;
-		while (se) {
-			sn = se->next;
-			if (verg->v1 == se->v1 && verg->v2 == se->v2) {
-				BLI_remlink(&sc->edgebase, se);
-				MEM_freeN(se);
-			}
-			se = sn;
-		}
-		verg = verg->next;
-	}
-}
-
-void removenotused_scredges(bScreen *sc)
+static ScrEdge *screen_addedge(bScreen *sc, ScrVert *v1, ScrVert *v2)
 {
-	ScrEdge *se, *sen;
-	ScrArea *sa;
-	int a = 0;
-
-	/* sets flags when edge is used in area */
-	sa = sc->areabase.first;
-	while (sa) {
-		se = screen_findedge(sc, sa->v1, sa->v2);
-		if (se == NULL) printf("error: area %d edge 1 doesn't exist\n", a);
-		else se->flag = 1;
-		se = screen_findedge(sc, sa->v2, sa->v3);
-		if (se == NULL) printf("error: area %d edge 2 doesn't exist\n", a);
-		else se->flag = 1;
-		se = screen_findedge(sc, sa->v3, sa->v4);
-		if (se == NULL) printf("error: area %d edge 3 doesn't exist\n", a);
-		else se->flag = 1;
-		se = screen_findedge(sc, sa->v4, sa->v1);
-		if (se == NULL) printf("error: area %d edge 4 doesn't exist\n", a);
-		else se->flag = 1;
-		sa = sa->next;
-		a++;
-	}
-	se = sc->edgebase.first;
-	while (se) {
-		sen = se->next;
-		if (se->flag == 0) {
-			BLI_remlink(&sc->edgebase, se);
-			MEM_freeN(se);
-		}
-		else {
-			se->flag = 0;
-		}
-		se = sen;
-	}
+	return screen_addedge_ex(AREAMAP_FROM_SCREEN(sc), v1, v2);
 }
 
 bool scredge_is_horizontal(ScrEdge *se)
@@ -265,19 +111,21 @@ bool scredge_is_horizontal(ScrEdge *se)
 	return (se->v1->vec.y == se->v2->vec.y);
 }
 
-/* need win size to make sure not to include edges along screen edge */
-ScrEdge *screen_find_active_scredge(bScreen *sc,
-                                    const int winsize_x, const int winsize_y,
-                                    const int mx, const int my)
+/**
+ * \param bounds_rect: Either window or screen bounds. Used to exclude edges along window/screen edges.
+ */
+ScrEdge *screen_area_map_find_active_scredge(
+        const ScrAreaMap *area_map,
+        const rcti *bounds_rect,
+        const int mx, const int my)
 {
-	ScrEdge *se;
 	int safety = U.widget_unit / 10;
 
-	if (safety < 2) safety = 2;
+	CLAMP_MIN(safety, 2);
 
-	for (se = sc->edgebase.first; se; se = se->next) {
+	for (ScrEdge *se = area_map->edgebase.first; se; se = se->next) {
 		if (scredge_is_horizontal(se)) {
-			if (se->v1->vec.y > 0 && se->v1->vec.y < winsize_y - 1) {
+			if ((se->v1->vec.y > bounds_rect->ymin) && (se->v1->vec.y < (bounds_rect->ymax - 1))) {
 				short min, max;
 				min = MIN2(se->v1->vec.x, se->v2->vec.x);
 				max = MAX2(se->v1->vec.x, se->v2->vec.x);
@@ -287,7 +135,7 @@ ScrEdge *screen_find_active_scredge(bScreen *sc,
 			}
 		}
 		else {
-			if (se->v1->vec.x > 0 && se->v1->vec.x < winsize_x - 1) {
+			if ((se->v1->vec.x > bounds_rect->xmin) && (se->v1->vec.x < (bounds_rect->xmax - 1))) {
 				short min, max;
 				min = MIN2(se->v1->vec.y, se->v2->vec.y);
 				max = MAX2(se->v1->vec.y, se->v2->vec.y);
@@ -301,23 +149,55 @@ ScrEdge *screen_find_active_scredge(bScreen *sc,
 	return NULL;
 }
 
+/* need win size to make sure not to include edges along screen edge */
+ScrEdge *screen_find_active_scredge(
+        const wmWindow *win, const bScreen *screen,
+        const int mx, const int my)
+{
+	/* Use layout size (screen excluding global areas) for screen-layout area edges */
+	rcti screen_rect;
+	ScrEdge *se;
+
+	WM_window_screen_rect_calc(win, &screen_rect);
+	se = screen_area_map_find_active_scredge(AREAMAP_FROM_SCREEN(screen), &screen_rect, mx, my);
+
+	if (!se) {
+		/* Use entire window size (screen including global areas) for global area edges */
+		rcti win_rect;
+		WM_window_rect_calc(win, &win_rect);
+		se = screen_area_map_find_active_scredge(&win->global_areas, &win_rect, mx, my);
+	}
+	return se;
+}
+
 
 
 /* adds no space data */
-static ScrArea *screen_addarea(bScreen *sc, ScrVert *v1, ScrVert *v2, ScrVert *v3, ScrVert *v4, short headertype, short spacetype)
+static ScrArea *screen_addarea_ex(
+        ScrAreaMap *area_map,
+        ScrVert *bottom_left, ScrVert *top_left, ScrVert *top_right, ScrVert *bottom_right,
+        short spacetype)
 {
 	ScrArea *sa = MEM_callocN(sizeof(ScrArea), "addscrarea");
-	sa->v1 = v1;
-	sa->v2 = v2;
-	sa->v3 = v3;
-	sa->v4 = v4;
-	sa->headertype = headertype;
-	sa->spacetype = sa->butspacetype = spacetype;
 
-	BLI_addtail(&sc->areabase, sa);
+	sa->v1 = bottom_left;
+	sa->v2 = top_left;
+	sa->v3 = top_right;
+	sa->v4 = bottom_right;
+	sa->spacetype = spacetype;
+
+	BLI_addtail(&area_map->areabase, sa);
 
 	return sa;
 }
+static ScrArea *screen_addarea(
+        bScreen *sc,
+        ScrVert *left_bottom, ScrVert *left_top, ScrVert *right_top, ScrVert *right_bottom,
+        short spacetype)
+{
+	return screen_addarea_ex(AREAMAP_FROM_SCREEN(sc), left_bottom, left_top, right_top, right_bottom,
+	                         spacetype);
+}
 
 static void screen_delarea(bContext *C, bScreen *sc, ScrArea *sa)
 {
@@ -346,24 +226,24 @@ static short testsplitpoint(ScrArea *sa, char dir, float fac)
 	CLAMP(fac, 0.0f, 1.0f);
 
 	if (dir == 'h') {
-		y = sa->v1->vec.y + fac * (sa->v2->vec.y - sa->v1->vec.y);
+		y = sa->v1->vec.y +
+		        round_fl_to_short(fac * (float)(sa->v2->vec.y - sa->v1->vec.y));
 
 		if (y - sa->v1->vec.y < area_min_y)
 			y = sa->v1->vec.y + area_min_y;
 		else if (sa->v2->vec.y - y < area_min_y)
 			y = sa->v2->vec.y - area_min_y;
-		else y -= (y % AREAGRID);
 
 		return y;
 	}
 	else {
-		x = sa->v1->vec.x + fac * (sa->v4->vec.x - sa->v1->vec.x);
+		x = sa->v1->vec.x +
+		        round_fl_to_short(fac * (float)(sa->v4->vec.x - sa->v1->vec.x));
 
 		if (x - sa->v1->vec.x < area_min_x)
 			x = sa->v1->vec.x + area_min_x;
 		else if (sa->v4->vec.x - x < area_min_x)
 			x = sa->v4->vec.x - area_min_x;
-		else x -= (x % AREAGRID);
 
 		return x;
 	}
@@ -398,7 +278,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge)
 
 		if (fac > 0.5f) {
 			/* new areas: top */
-			newa = screen_addarea(sc, sv1, sa->v2, sa->v3, sv2, sa->headertype, sa->spacetype);
+			newa = screen_addarea(sc, sv1, sa->v2, sa->v3, sv2, sa->spacetype);
 
 			/* area below */
 			sa->v2 = sv1;
@@ -406,7 +286,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge)
 		}
 		else {
 			/* new areas: bottom */
-			newa = screen_addarea(sc, sa->v1, sv1, sv2, sa->v4, sa->headertype, sa->spacetype);
+			newa = screen_addarea(sc, sa->v1, sv1, sv2, sa->v4, sa->spacetype);
 
 			/* area above */
 			sa->v1 = sv1;
@@ -430,7 +310,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge)
 
 		if (fac > 0.5f) {
 			/* new areas: right */
-			newa = screen_addarea(sc, sv1, sv2, sa->v3, sa->v4, sa->headertype, sa->spacetype);
+			newa = screen_addarea(sc, sv1, sv2, sa->v3, sa->v4, sa->spacetype);
 
 			/* area left */
 			sa->v3 = sv2;
@@ -438,7 +318,7 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge)
 		}
 		else {
 			/* new areas: left */
-			newa = screen_addarea(sc, sa->v1, sa->v2, sv2, sv1, sa->headertype, sa->spacetype);
+			newa = screen_addarea(sc, sa->v1, sa->v2, sv2, sv1, sa->spacetype);
 
 			/* area right */
 			sa->v1 = sv1;
@@ -450,33 +330,29 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge)
 
 	/* remove double vertices en edges */
 	if (merge)
-		removedouble_scrverts(sc);
-	removedouble_scredges(sc);
-	removenotused_scredges(sc);
+		BKE_screen_remove_double_scrverts(sc);
+	BKE_screen_remove_double_scredges(sc);
+	BKE_screen_remove_unused_scredges(sc);
 
 	return newa;
 }
 
-/* empty screen, with 1 dummy area without spacedata */
-/* uses window size */
-bScreen *ED_screen_add(wmWindow *win, Scene *scene, const char *name)
+/**
+ * Empty screen, with 1 dummy area without spacedata. Uses window size.
+ */
+bScreen *screen_add(const char *name, const rcti *rect)
 {
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
-
 	bScreen *sc;
 	ScrVert *sv1, *sv2, *sv3, *sv4;
 
 	sc = BKE_libblock_alloc(G.main, ID_SCR, name, 0);
-	sc->scene = scene;
 	sc->do_refresh = true;
 	sc->redraws_flag = TIME_ALL_3D_WIN | TIME_ALL_ANIM_WIN;
-	sc->winid = win->winid;
 
-	sv1 = screen_addvert(sc, 0, 0);
-	sv2 = screen_addvert(sc, 0, winsize_y - 1);
-	sv3 = screen_addvert(sc, winsize_x - 1, winsize_y - 1);
-	sv4 = screen_addvert(sc, winsize_x - 1, 0);
+	sv1 = screen_addvert(sc, rect->xmin,     rect->ymin);
+	sv2 = screen_addvert(sc, rect->xmin,     rect->ymax - 1);
+	sv3 = screen_addvert(sc, rect->xmax - 1, rect->ymax - 1);
+	sv4 = screen_addvert(sc, rect->xmax - 1, rect->ymin);
 
 	screen_addedge(sc, sv1, sv2);
 	screen_addedge(sc, sv2, sv3);
@@ -484,12 +360,12 @@ bScreen *ED_screen_add(wmWindow *win, Scene *scene, const char *name)
 	screen_addedge(sc, sv4, sv1);
 
 	/* dummy type, no spacedata */
-	screen_addarea(sc, sv1, sv2, sv3, sv4, HEADERDOWN, SPACE_EMPTY);
+	screen_addarea(sc, sv1, sv2, sv3, sv4, SPACE_EMPTY);
 
 	return sc;
 }
 
-static void screen_copy(bScreen *to, bScreen *from)
+void screen_data_copy(bScreen *to, bScreen *from)
 {
 	ScrVert *s1, *s2;
 	ScrEdge *se;
@@ -511,7 +387,7 @@ static void screen_copy(bScreen *to, bScreen *from)
 	for (se = to->edgebase.first; se; se = se->next) {
 		se->v1 = se->v1->newv;
 		se->v2 = se->v2->newv;
-		sortscrvert(&(se->v1), &(se->v2));
+		BKE_screen_sort_scrvert(&(se->v1), &(se->v2));
 	}
 
 	saf = from->areabase.first;
@@ -532,7 +408,16 @@ static void screen_copy(bScreen *to, bScreen *from)
 	/* put at zero (needed?) */
 	for (s1 = from->vertbase.first; s1; s1 = s1->next)
 		s1->newv = NULL;
+}
 
+/**
+ * Prepare a newly created screen for initializing it as active screen.
+ */
+void screen_new_activate_prepare(const wmWindow *win, bScreen *screen_new)
+{
+	screen_new->winid = win->winid;
+	screen_new->do_refresh = true;
+	screen_new->do_draw = true;
 }
 
 
@@ -611,15 +496,17 @@ int screen_area_join(bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2)
 	}
 
 	screen_delarea(C, scr, sa2);
-	removedouble_scrverts(scr);
+	BKE_screen_remove_double_scrverts(scr);
+	/* Update preview thumbnail */
+	BKE_icon_changed(scr->id.icon_id);
 
 	return 1;
 }
 
-void select_connected_scredge(bScreen *sc, ScrEdge *edge)
+void select_connected_scredge(const wmWindow *win, ScrEdge *edge)
 {
+	bScreen *sc = WM_window_get_active_screen(win);
 	ScrEdge *se;
-	ScrVert *sv;
 	int oneselected;
 	char dir;
 
@@ -629,10 +516,8 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge)
 	if (edge->v1->vec.x == edge->v2->vec.x) dir = 'v';
 	else dir = 'h';
 
-	sv = sc->vertbase.first;
-	while (sv) {
+	ED_screen_verts_iter(win, sc, sv) {
 		sv->flag = 0;
-		sv = sv->next;
 	}
 
 	edge->v1->flag = 1;
@@ -662,18 +547,24 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge)
 	}
 }
 
-/* test if screen vertices should be scaled */
-static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
+/**
+ * Test if screen vertices should be scaled and do if needed.
+ */
+static void screen_vertices_scale(
+        const wmWindow *win, bScreen *sc,
+        const rcti *window_rect, const rcti *screen_rect)
 {
 	/* clamp Y size of header sized areas when expanding windows
 	 * avoids annoying empty space around file menu */
 #define USE_HEADER_SIZE_CLAMP
 
 	const int headery_init = ED_area_headersize();
+	const int screen_size_x = BLI_rcti_size_x(screen_rect);
+	const int screen_size_y = BLI_rcti_size_y(screen_rect);
 	ScrVert *sv = NULL;
 	ScrArea *sa;
-	int winsize_x_prev, winsize_y_prev;
-	float facx, facy, tempf, min[2], max[2];
+	int screen_size_x_prev, screen_size_y_prev;
+	float min[2], max[2];
 
 	/* calculate size */
 	min[0] = min[1] = 20000.0f;
@@ -684,14 +575,8 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 		minmax_v2v2_v2(min, max, fv);
 	}
 
-	/* always make 0.0 left under */
-	for (sv = sc->vertbase.first; sv; sv = sv->next) {
-		sv->vec.x -= min[0];
-		sv->vec.y -= min[1];
-	}
-
-	winsize_x_prev = (max[0] - min[0]) + 1;
-	winsize_y_prev = (max[1] - min[1]) + 1;
+	screen_size_x_prev = (max[0] - min[0]) + 1;
+	screen_size_y_prev = (max[1] - min[1]) + 1;
 
 
 #ifdef USE_HEADER_SIZE_CLAMP
@@ -699,19 +584,19 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 #define TEMP_TOP 2
 
 	/* if the window's Y axis grows, clamp header sized areas */
-	if (winsize_y_prev < winsize_y) {  /* growing? */
+	if (screen_size_y_prev < screen_size_y) {  /* growing? */
 		const int headery_margin_max = headery_init + 4;
 		for (sa = sc->areabase.first; sa; sa = sa->next) {
 			ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
 			sa->temp = 0;
 
 			if (ar && !(ar->flag & RGN_FLAG_HIDDEN)) {
-				if (sa->v2->vec.y == winsize_y_prev - 1) {
+				if (sa->v2->vec.y == max[1]) {
 					if ((sa->v2->vec.y - sa->v1->vec.y) < headery_margin_max) {
 						sa->temp = TEMP_TOP;
 					}
 				}
-				else if (sa->v1->vec.y == 0) {
+				else if (sa->v1->vec.y == min[1]) {
 					if ((sa->v2->vec.y - sa->v1->vec.y) < headery_margin_max) {
 						sa->temp = TEMP_BOTTOM;
 					}
@@ -722,33 +607,23 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 #endif
 
 
-	if (winsize_x_prev != winsize_x || winsize_y_prev != winsize_y) {
-		facx = ((float)winsize_x - 1) / ((float)winsize_x_prev - 1);
-		facy = ((float)winsize_y - 1) / ((float)winsize_y_prev - 1);
+	if (screen_size_x_prev != screen_size_x || screen_size_y_prev != screen_size_y) {
+		const float facx = ((float)screen_size_x - 1) / ((float)screen_size_x_prev - 1);
+		const float facy = ((float)screen_size_y - 1) / ((float)screen_size_y_prev - 1);
 
 		/* make sure it fits! */
 		for (sv = sc->vertbase.first; sv; sv = sv->next) {
-			/* FIXME, this re-sizing logic is no good when re-sizing the window + redrawing [#24428]
-			 * need some way to store these as floats internally and re-apply from there. */
-			tempf = ((float)sv->vec.x) * facx;
-			sv->vec.x = (short)(tempf + 0.5f);
-			//sv->vec.x += AREAGRID - 1;
-			//sv->vec.x -=  (sv->vec.x % AREAGRID);
+			sv->vec.x = screen_rect->xmin + round_fl_to_short((sv->vec.x - min[0]) * facx);
+			CLAMP(sv->vec.x, screen_rect->xmin, screen_rect->xmax - 1);
 
-			CLAMP(sv->vec.x, 0, winsize_x - 1);
-
-			tempf = ((float)sv->vec.y) * facy;
-			sv->vec.y = (short)(tempf + 0.5f);
-			//sv->vec.y += AREAGRID - 1;
-			//sv->vec.y -=  (sv->vec.y % AREAGRID);
-
-			CLAMP(sv->vec.y, 0, winsize_y - 1);
+			sv->vec.y = screen_rect->ymin + round_fl_to_short((sv->vec.y - min[1]) * facy);
+			CLAMP(sv->vec.y, screen_rect->ymin, screen_rect->ymax - 1);
 		}
 	}
 
 
 #ifdef USE_HEADER_SIZE_CLAMP
-	if (winsize_y_prev < winsize_y) {  /* growing? */
+	if (screen_size_y_prev < screen_size_y) {  /* growing? */
 		for (sa = sc->areabase.first; sa; sa = sa->next) {
 			ScrEdge *se = NULL;
 
@@ -762,9 +637,9 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 			if (sa->temp == TEMP_TOP) {
 				/* lower edge */
 				const int yval = sa->v2->vec.y - headery_init;
-				se = screen_findedge(sc, sa->v4, sa->v1);
+				se = BKE_screen_find_edge(sc, sa->v4, sa->v1);
 				if (se != NULL) {
-					select_connected_scredge(sc, se);
+					select_connected_scredge(win, se);
 				}
 				for (sv = sc->vertbase.first; sv; sv = sv->next) {
 					if (sv != sa->v2 && sv != sa->v3) {
@@ -777,9 +652,9 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 			else {
 				/* upper edge */
 				const int yval = sa->v1->vec.y + headery_init;
-				se = screen_findedge(sc, sa->v2, sa->v3);
+				se = BKE_screen_find_edge(sc, sa->v2, sa->v3);
 				if (se != NULL) {
-					select_connected_scredge(sc, se);
+					select_connected_scredge(win, se);
 				}
 				for (sv = sc->vertbase.first; sv; sv = sv->next) {
 					if (sv != sa->v1 && sv != sa->v4) {
@@ -806,21 +681,20 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 		int headery = headery_init;
 
 		/* adjust headery if verts are along the edge of window */
-		if (sa->v1->vec.y > 0)
+		if (sa->v1->vec.y > window_rect->ymin)
 			headery += U.pixelsize;
-		if (sa->v2->vec.y < winsize_y - 1)
+		if (sa->v2->vec.y < window_rect->ymax)
 			headery += U.pixelsize;
 
 		if (sa->v2->vec.y - sa->v1->vec.y + 1 < headery) {
 			/* lower edge */
-			ScrEdge *se = screen_findedge(sc, sa->v4, sa->v1);
+			ScrEdge *se = BKE_screen_find_edge(sc, sa->v4, sa->v1);
 			if (se && sa->v1 != sa->v2) {
-				int yval;
+				const int yval = sa->v2->vec.y - headery + 1;
 
-				select_connected_scredge(sc, se);
+				select_connected_scredge(win, se);
 
 				/* all selected vertices get the right offset */
-				yval = sa->v2->vec.y - headery + 1;
 				for (sv = sc->vertbase.first; sv; sv = sv->next) {
 					/* if is a collapsed area */
 					if (sv != sa->v2 && sv != sa->v3) {
@@ -833,31 +707,45 @@ static void screen_test_scale(bScreen *sc, int winsize_x, int winsize_y)
 		}
 	}
 
+	/* Global areas have a fixed size that only changes with the DPI. Here we ensure that exactly this size is set. */
+	for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) {
+		if (area->global->flag & GLOBAL_AREA_IS_HIDDEN) {
+			continue;
+		}
+		/* width */
+		area->v1->vec.x = area->v2->vec.x = window_rect->xmin;
+		area->v3->vec.x = area->v4->vec.x = window_rect->xmax - 1;
+		/* height */
+		area->v1->vec.y = area->v4->vec.y = window_rect->ymin;
+		area->v2->vec.y = area->v3->vec.y = window_rect->ymax - 1;
+		switch (area->global->align) {
+			case GLOBAL_AREA_ALIGN_TOP:
+				area->v1->vec.y = area->v4->vec.y = area->v2->vec.y - ED_area_global_size_y(area);
+				break;
+			case GLOBAL_AREA_ALIGN_BOTTOM:
+				area->v2->vec.y = area->v3->vec.y = area->v1->vec.y + ED_area_global_size_y(area);
+				break;
+		}
+	}
 }
 
+
 /* ****************** EXPORTED API TO OTHER MODULES *************************** */
 
-bScreen *ED_screen_duplicate(wmWindow *win, bScreen *sc)
+/* screen sets cursor based on active region */
+static void region_cursor_set(wmWindow *win, bool swin_changed)
 {
-	bScreen *newsc;
-
-	if (sc->state != SCREENNORMAL) return NULL;  /* XXX handle this case! */
+	bScreen *screen = WM_window_get_active_screen(win);
 
-	/* make new empty screen: */
-	newsc = ED_screen_add(win, sc->scene, sc->id.name + 2);
-	/* copy all data */
-	screen_copy(newsc, sc);
-
-	return newsc;
-}
-
-/* screen sets cursor based on swinid */
-static void region_cursor_set(wmWindow *win, int swinid, int swin_changed)
-{
-	for (ScrArea *sa = win->screen->areabase.first; sa; sa = sa->next) {
+	ED_screen_areas_iter(win, screen, sa) {
 		for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
-			if (ar->swinid == swinid) {
+			if (ar == screen->active_region) {
 				if (swin_changed || (ar->type && ar->type->event_cursor)) {
+					if (ar->manipulator_map != NULL) {
+						if (WM_manipulatormap_cursor_set(ar->manipulator_map, win)) {
+							return;
+						}
+					}
 					ED_region_cursor_set(win, sa, ar);
 				}
 				return;
@@ -869,23 +757,24 @@ static void region_cursor_set(wmWindow *win, int swinid, int swin_changed)
 void ED_screen_do_listen(bContext *C, wmNotifier *note)
 {
 	wmWindow *win = CTX_wm_window(C);
+	bScreen *screen = CTX_wm_screen(C);
 
 	/* generic notes */
 	switch (note->category) {
 		case NC_WM:
 			if (note->data == ND_FILEREAD)
-				win->screen->do_draw = true;
+				screen->do_draw = true;
 			break;
 		case NC_WINDOW:
-			win->screen->do_draw = true;
+			screen->do_draw = true;
 			break;
 		case NC_SCREEN:
 			if (note->action == NA_EDITED)
-				win->screen->do_draw = win->screen->do_refresh = true;
+				screen->do_draw = screen->do_refresh = true;
 			break;
 		case NC_SCENE:
 			if (note->data == ND_MODE)
-				region_cursor_set(win, note->swinid, true);
+				region_cursor_set(win, true);
 			break;
 	}
 }
@@ -906,48 +795,40 @@ static void screen_refresh_headersizes(void)
 /* for file read and first use, for scaling window, area moves */
 void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
 {
+	bScreen *screen = WM_window_get_active_screen(win);
+
 	/* exception for bg mode, we only need the screen context */
 	if (!G.background) {
-		const int winsize_x = WM_window_pixels_x(win);
-		const int winsize_y = WM_window_pixels_y(win);
-		ScrArea *sa;
-		rcti winrct;
-
-		winrct.xmin = 0;
-		winrct.xmax = winsize_x - 1;
-		winrct.ymin = 0;
-		winrct.ymax = winsize_y - 1;
+		rcti window_rect, screen_rect;
 
 		/* header size depends on DPI, let's verify */
 		WM_window_set_dpi(win);
 		screen_refresh_headersizes();
 
-		screen_test_scale(win->screen, winsize_x, winsize_y);
+		WM_window_rect_calc(win, &window_rect);
+		WM_window_screen_rect_calc(win, &screen_rect); /* Get screen bounds __after__ updating window DPI! */
 
-		if (win->screen->mainwin == 0) {
-			win->screen->mainwin = wm_subwindow_open(win, &winrct, false);
-		}
-		else {
-			wm_subwindow_position(win, win->screen->mainwin, &winrct, false);
-		}
+		screen_vertices_scale(win, screen, &window_rect, &screen_rect);
 
-		for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+		ED_screen_areas_iter(win, screen, area) {
 			/* set spacetype and region callbacks, calls init() */
 			/* sets subwindows for regions, adds handlers */
-			ED_area_initialize(wm, win, sa);
+			ED_area_initialize(wm, win, area);
 		}
 
 		/* wake up animtimer */
-		if (win->screen->animtimer)
-			WM_event_timer_sleep(wm, win, win->screen->animtimer, false);
+		if (screen->animtimer)
+			WM_event_timer_sleep(wm, win, screen->animtimer, false);
 	}
 
 	if (G.debug & G_DEBUG_EVENTS) {
 		printf("%s: set screen\n", __func__);
 	}
-	win->screen->do_refresh = false;
+	screen->do_refresh = false;
+	/* prevent multiwin errors */
+	screen->winid = win->winid;
 
-	win->screen->context = ed_screen_context;
+	screen->context = ed_screen_context;
 }
 
 /* file read, set all screens, ... */
@@ -956,10 +837,23 @@ void ED_screens_initialize(wmWindowManager *wm)
 	wmWindow *win;
 
 	for (win = wm->windows.first; win; win = win->next) {
+		if (WM_window_get_active_workspace(win) == NULL) {
+			WM_window_set_active_workspace(win, G.main->workspaces.first);
+		}
 
-		if (win->screen == NULL)
-			win->screen = G.main->screen.first;
+		if (BLI_listbase_is_empty(&win->global_areas.areabase)) {
+			ED_screen_global_areas_create(win);
+		}
+		ED_screen_refresh(wm, win);
+		if (win->eventstate) {
+			ED_screen_set_active_region(NULL, win, &win->eventstate->x);
+		}
+	}
+}
 
+void ED_screen_ensure_updated(wmWindowManager *wm, wmWindow *win, bScreen *screen)
+{
+	if (screen->do_refresh) {
 		ED_screen_refresh(wm, win);
 	}
 }
@@ -970,17 +864,17 @@ void ED_screens_initialize(wmWindowManager *wm)
 void ED_region_exit(bContext *C, ARegion *ar)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
+	wmWindow *win = CTX_wm_window(C);
 	ARegion *prevar = CTX_wm_region(C);
 
 	if (ar->type && ar->type->exit)
 		ar->type->exit(wm, ar);
 
 	CTX_wm_region_set(C, ar);
+
 	WM_event_remove_handlers(C, &ar->handlers);
-	if (ar->swinid) {
-		wm_subwindow_close(CTX_wm_window(C), ar->swinid);
-		ar->swinid = 0;
-	}
+	WM_event_modal_handler_region_replace(win, ar, NULL);
+	WM_draw_region_free(ar);
 
 	if (ar->headerstr) {
 		MEM_freeN(ar->headerstr);
@@ -988,16 +882,19 @@ void ED_region_exit(bContext *C, ARegion *ar)
 	}
 
 	if (ar->regiontimer) {
-		WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), ar->regiontimer);
+		WM_event_remove_timer(wm, win, ar->regiontimer);
 		ar->regiontimer = NULL;
 	}
 
+	WM_msgbus_clear_by_owner(wm->message_bus, ar);
+
 	CTX_wm_region_set(C, prevar);
 }
 
 void ED_area_exit(bContext *C, ScrArea *sa)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
+	wmWindow *win = CTX_wm_window(C);
 	ScrArea *prevsa = CTX_wm_area(C);
 	ARegion *ar;
 
@@ -1005,10 +902,13 @@ void ED_area_exit(bContext *C, ScrArea *sa)
 		sa->type->exit(wm, sa);
 
 	CTX_wm_area_set(C, sa);
+
 	for (ar = sa->regionbase.first; ar; ar = ar->next)
 		ED_region_exit(C, ar);
 
 	WM_event_remove_handlers(C, &sa->handlers);
+	WM_event_modal_handler_area_replace(win, sa, NULL);
+
 	CTX_wm_area_set(C, prevsa);
 }
 
@@ -1016,8 +916,6 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *prevwin = CTX_wm_window(C);
-	ScrArea *sa;
-	ARegion *ar;
 
 	CTX_wm_window_set(C, window);
 
@@ -1026,21 +924,23 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen)
 	screen->animtimer = NULL;
 	screen->scrubbing = false;
 
-	if (screen->mainwin)
-		wm_subwindow_close(window, screen->mainwin);
-	screen->mainwin = 0;
-	screen->subwinactive = 0;
+	screen->active_region = NULL;
 
-	for (ar = screen->regionbase.first; ar; ar = ar->next)
+	for (ARegion *ar = screen->regionbase.first; ar; ar = ar->next) {
 		ED_region_exit(C, ar);
-
-	for (sa = screen->areabase.first; sa; sa = sa->next)
+	}
+	for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+		ED_area_exit(C, sa);
+	}
+	/* Don't use ED_screen_areas_iter here, it skips hidden areas. */
+	for (ScrArea *sa = window->global_areas.areabase.first; sa; sa = sa->next) {
 		ED_area_exit(C, sa);
+	}
 
 	/* mark it available for use for other windows */
 	screen->winid = 0;
 
-	if (prevwin->screen->temp == 0) {
+	if (!WM_window_is_temp_screen(prevwin)) {
 		/* use previous window if possible */
 		CTX_wm_window_set(C, prevwin);
 	}
@@ -1054,16 +954,14 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen)
 /* *********************************** */
 
 /* case when on area-edge or in azones, or outside window */
-static void screen_cursor_set(wmWindow *win, const wmEvent *event)
+static void screen_cursor_set(wmWindow *win, const int xy[2])
 {
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
-
+	const bScreen *screen = WM_window_get_active_screen(win);
 	AZone *az = NULL;
 	ScrArea *sa;
 
-	for (sa = win->screen->areabase.first; sa; sa = sa->next)
-		if ((az = is_in_area_actionzone(sa, &event->x)))
+	for (sa = screen->areabase.first; sa; sa = sa->next)
+		if ((az = is_in_area_actionzone(sa, xy)))
 			break;
 
 	if (sa) {
@@ -1077,7 +975,7 @@ static void screen_cursor_set(wmWindow *win, const wmEvent *event)
 		}
 	}
 	else {
-		ScrEdge *actedge = screen_find_active_scredge(win->screen, winsize_x, winsize_y, event->x, event->y);
+		ScrEdge *actedge = screen_find_active_scredge(win, screen, xy[0], xy[1]);
 
 		if (actedge) {
 			if (scredge_is_horizontal(actedge))
@@ -1093,68 +991,77 @@ static void screen_cursor_set(wmWindow *win, const wmEvent *event)
 
 /* called in wm_event_system.c. sets state vars in screen, cursors */
 /* event type is mouse move */
-void ED_screen_set_subwinactive(bContext *C, const wmEvent *event)
+void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
 {
-	wmWindow *win = CTX_wm_window(C);
+	bScreen *scr = WM_window_get_active_screen(win);
 
-	if (win->screen) {
-		bScreen *scr = win->screen;
-		ScrArea *sa;
+	if (scr) {
+		ScrArea *sa = NULL;
 		ARegion *ar;
-		int oldswin = scr->subwinactive;
+		ARegion *old_ar = scr->active_region;
 
-		for (sa = scr->areabase.first; sa; sa = sa->next) {
-			if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax)
-				if (event->y > sa->totrct.ymin && event->y < sa->totrct.ymax)
-					if (NULL == is_in_area_actionzone(sa, &event->x))
+		ED_screen_areas_iter(win, scr, area_iter) {
+			if (xy[0] > area_iter->totrct.xmin && xy[0] < area_iter->totrct.xmax) {
+				if (xy[1] > area_iter->totrct.ymin && xy[1] < area_iter->totrct.ymax) {
+					if (is_in_area_actionzone(area_iter, xy) == NULL) {
+						sa = area_iter;
 						break;
+					}
+				}
+			}
 		}
 		if (sa) {
 			/* make overlap active when mouse over */
 			for (ar = sa->regionbase.first; ar; ar = ar->next) {
-				if (BLI_rcti_isect_pt_v(&ar->winrct, &event->x)) {
-					scr->subwinactive = ar->swinid;
+				if (BLI_rcti_isect_pt_v(&ar->winrct, xy)) {
+					scr->active_region = ar;
 					break;
 				}
 			}
 		}
 		else
-			scr->subwinactive = scr->mainwin;
+			scr->active_region = NULL;
 
 		/* check for redraw headers */
-		if (oldswin != scr->subwinactive) {
+		if (old_ar != scr->active_region) {
 
-			for (sa = scr->areabase.first; sa; sa = sa->next) {
+			ED_screen_areas_iter(win, scr, area_iter) {
 				bool do_draw = false;
 
-				for (ar = sa->regionbase.first; ar; ar = ar->next)
-					if (ar->swinid == oldswin || ar->swinid == scr->subwinactive)
+				for (ar = area_iter->regionbase.first; ar; ar = ar->next) {
+					if (ar == old_ar || ar == scr->active_region) {
 						do_draw = true;
+					}
+				}
 
 				if (do_draw) {
-					for (ar = sa->regionbase.first; ar; ar = ar->next)
-						if (ar->regiontype == RGN_TYPE_HEADER)
-							ED_region_tag_redraw(ar);
+					for (ar = area_iter->regionbase.first; ar; ar = ar->next) {
+						if (ar->regiontype == RGN_TYPE_HEADER) {
+							ED_region_tag_redraw_no_rebuild(ar);
+						}
+					}
 				}
 			}
 		}
 
 		/* cursors, for time being set always on edges, otherwise aregion doesnt switch */
-		if (scr->subwinactive == scr->mainwin) {
-			screen_cursor_set(win, event);
+		if (scr->active_region == NULL) {
+			screen_cursor_set(win, xy);
 		}
 		else {
 			/* notifier invokes freeing the buttons... causing a bit too much redraws */
-			if (oldswin != scr->subwinactive) {
-				region_cursor_set(win, scr->subwinactive, true);
+			if (old_ar != scr->active_region) {
+				region_cursor_set(win, true);
 
 				/* this used to be a notifier, but needs to be done immediate
 				 * because it can undo setting the right button as active due
 				 * to delayed notifier handling */
-				UI_screen_free_active_but(C, win->screen);
+				if (C) {
+					UI_screen_free_active_but(C, scr);
+				}
 			}
 			else
-				region_cursor_set(win, scr->subwinactive, false);
+				region_cursor_set(win, false);
 		}
 	}
 }
@@ -1173,183 +1080,199 @@ int ED_screen_area_active(const bContext *C)
 			return 1;
 
 		for (ar = sa->regionbase.first; ar; ar = ar->next)
-			if (ar->swinid == sc->subwinactive)
+			if (ar == sc->active_region)
 				return 1;
 	}
 	return 0;
 }
 
 /**
- * operator call, WM + Window + screen already existed before
- *
- * \warning Do NOT call in area/region queues!
- * \returns success.
+ * Add an area and geometry (screen-edges and -vertices) for it to \a area_map,
+ * with coordinates/dimensions matching \a rect.
  */
-bool ED_screen_set(bContext *C, bScreen *sc)
+static ScrArea *screen_area_create_with_geometry(
+        ScrAreaMap *area_map, const rcti *rect,
+        short spacetype)
 {
-	Main *bmain = CTX_data_main(C);
-	wmWindowManager *wm = CTX_wm_manager(C);
-	wmWindow *win = CTX_wm_window(C);
-	bScreen *oldscreen = CTX_wm_screen(C);
+	ScrVert *bottom_left  = screen_addvert_ex(area_map, rect->xmin, rect->ymin);
+	ScrVert *top_left     = screen_addvert_ex(area_map, rect->xmin, rect->ymax);
+	ScrVert *top_right    = screen_addvert_ex(area_map, rect->xmax, rect->ymax);
+	ScrVert *bottom_right = screen_addvert_ex(area_map, rect->xmax, rect->ymin);
 
-	/* validate screen, it's called with notifier reference */
-	if (BLI_findindex(&bmain->screen, sc) == -1) {
-		return true;
+	screen_addedge_ex(area_map, bottom_left, top_left);
+	screen_addedge_ex(area_map, top_left, top_right);
+	screen_addedge_ex(area_map, top_right, bottom_right);
+	screen_addedge_ex(area_map, bottom_right, bottom_left);
+
+	return screen_addarea_ex(area_map, bottom_left, top_left, top_right, bottom_right, spacetype);
+}
+
+static void screen_global_area_create(
+        wmWindow *win, eSpace_Type space_type, GlobalAreaAlign align, const rcti *rect,
+        const short height_cur, const short height_min, const short height_max)
+{
+	ScrArea *area = screen_area_create_with_geometry(&win->global_areas, rect, space_type);
+	SpaceType *stype = BKE_spacetype_from_id(space_type);
+	SpaceLink *slink = stype->new(area, WM_window_get_active_scene(win));
+
+	area->regionbase = slink->regionbase;
+
+	/* Data specific to global areas. */
+	area->global = MEM_callocN(sizeof(*area->global), __func__);
+	area->global->cur_fixed_height = height_cur;
+	area->global->size_max = height_max;
+	area->global->size_min = height_min;
+	area->global->align = align;
+
+	BLI_addhead(&area->spacedata, slink);
+	BLI_listbase_clear(&slink->regionbase);
+}
+
+static void screen_global_topbar_area_create(wmWindow *win)
+{
+	const short size_y = 2.25 * HEADERY;
+	rcti rect;
+
+	BLI_rcti_init(&rect, 0, WM_window_pixels_x(win) - 1, 0, WM_window_pixels_y(win) - 1);
+	rect.ymin = rect.ymax - size_y;
+
+	screen_global_area_create(win, SPACE_TOPBAR, GLOBAL_AREA_ALIGN_TOP, &rect, size_y, HEADERY, size_y);
+}
+
+static void screen_global_statusbar_area_create(wmWindow *win)
+{
+	const short size_y = HEADERY;
+	rcti rect;
+
+	BLI_rcti_init(&rect, 0, WM_window_pixels_x(win) - 1, 0, WM_window_pixels_y(win) - 1);
+	rect.ymax = rect.ymin + size_y;
+
+	screen_global_area_create(win, SPACE_STATUSBAR, GLOBAL_AREA_ALIGN_BOTTOM, &rect, size_y, size_y, size_y);
+}
+
+void ED_screen_global_areas_create(wmWindow *win)
+{
+	bScreen *screen = BKE_workspace_active_screen_get(win->workspace_hook);
+	if (screen->temp == 0) {
+		screen_global_topbar_area_create(win);
+		screen_global_statusbar_area_create(win);
 	}
+}
 
-	if (ELEM(sc->state, SCREENMAXIMIZED, SCREENFULL)) {
-		/* find associated full */
-		bScreen *sc1;
-		for (sc1 = bmain->screen.first; sc1; sc1 = sc1->id.next) {
-			ScrArea *sa = sc1->areabase.first;
-			if (sa->full == sc) {
-				sc = sc1;
-				break;
-			}
+
+/* -------------------------------------------------------------------- */
+/* Screen changing */
+
+static bScreen *screen_fullscreen_find_associated_normal_screen(const Main *bmain, bScreen *screen)
+{
+	for (bScreen *screen_iter = bmain->screen.first; screen_iter; screen_iter = screen_iter->id.next) {
+		ScrArea *sa = screen_iter->areabase.first;
+		if (sa && sa->full == screen) {
+			return screen_iter;
 		}
 	}
 
+	return screen;
+}
+
+/**
+ * \return the screen to activate.
+ * \warning The returned screen may not always equal \a screen_new!
+ */
+bScreen *screen_change_prepare(bScreen *screen_old, bScreen *screen_new, Main *bmain, bContext *C, wmWindow *win)
+{
+	/* validate screen, it's called with notifier reference */
+	if (BLI_findindex(&bmain->screen, screen_new) == -1) {
+		return NULL;
+	}
+
+	if (ELEM(screen_new->state, SCREENMAXIMIZED, SCREENFULL)) {
+		screen_new = screen_fullscreen_find_associated_normal_screen(bmain, screen_new);
+	}
+
 	/* check for valid winid */
-	if (sc->winid != 0 && sc->winid != win->winid) {
-		return false;
+	if (!(screen_new->winid == 0 || screen_new->winid == win->winid)) {
+		return NULL;
 	}
 
-	if (oldscreen != sc) {
-		wmTimer *wt = oldscreen->animtimer;
-		ScrArea *sa;
-		Scene *oldscene = oldscreen->scene;
+	if (screen_old != screen_new) {
+		wmTimer *wt = screen_old->animtimer;
 
 		/* remove handlers referencing areas in old screen */
-		for (sa = oldscreen->areabase.first; sa; sa = sa->next) {
+		for (ScrArea *sa = screen_old->areabase.first; sa; sa = sa->next) {
 			WM_event_remove_area_handler(&win->modalhandlers, sa);
 		}
 
 		/* we put timer to sleep, so screen_exit has to think there's no timer */
-		oldscreen->animtimer = NULL;
+		screen_old->animtimer = NULL;
 		if (wt) {
-			WM_event_timer_sleep(wm, win, wt, true);
+			WM_event_timer_sleep(CTX_wm_manager(C), win, wt, true);
 		}
-
-		ED_screen_exit(C, win, oldscreen);
+		ED_screen_exit(C, win, screen_old);
 
 		/* Same scene, "transfer" playback to new screen. */
 		if (wt) {
-			if (oldscene == sc->scene) {
-				sc->animtimer = wt;
-			}
-			/* Else, stop playback. */
-			else {
-				oldscreen->animtimer = wt;
-				ED_screen_animation_play(C, 0, 0);
-			}
-		}
-
-		win->screen = sc;
-		CTX_wm_window_set(C, win);  // stores C->wm.screen... hrmf
-
-		/* prevent multiwin errors */
-		sc->winid = win->winid;
-
-		ED_screen_refresh(CTX_wm_manager(C), CTX_wm_window(C));
-		WM_event_add_notifier(C, NC_WINDOW, NULL);
-		WM_event_add_notifier(C, NC_SCREEN | ND_SCREENSET, sc);
-
-		/* makes button hilites work */
-		WM_event_add_mousemove(C);
-
-		/* Needed to make sure all the derivedMeshes are
-		 * up-to-date before viewport starts acquiring this.
-		 *
-		 * This is needed in cases when, for example, boolean
-		 * modifier uses operant from invisible layer.
-		 * Without this trick boolean wouldn't apply correct.
-		 *
-		 * Quite the same happens when setting screen's scene,
-		 * so perhaps this is in fact correct thing to do.
-		 */
-		if (oldscene != sc->scene) {
-			BKE_scene_set_background(bmain, sc->scene);
+			screen_new->animtimer = wt;
 		}
 
-		/* Always do visible update since it's possible new screen will
-		 * have different layers visible in 3D view-ports.
-		 * This is possible because of view3d.lock_camera_and_layers option.
-		 */
-		DAG_on_visible_update(bmain, false);
+		return screen_new;
 	}
 
-	return true;
+	return NULL;
 }
 
-static bool ed_screen_used(wmWindowManager *wm, bScreen *sc)
+void screen_change_update(bContext *C, wmWindow *win, bScreen *sc)
 {
-	wmWindow *win;
+	Scene *scene = WM_window_get_active_scene(win);
+	WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
+	WorkSpaceLayout *layout = BKE_workspace_layout_find(workspace, sc);
 
-	for (win = wm->windows.first; win; win = win->next) {
-		if (win->screen == sc) {
-			return true;
-		}
+	CTX_wm_window_set(C, win);  /* stores C->wm.screen... hrmf */
 
-		if (ELEM(win->screen->state, SCREENMAXIMIZED, SCREENFULL)) {
-			ScrArea *sa = win->screen->areabase.first;
-			if (sa->full == sc) {
-				return true;
-			}
-		}
-	}
+	ED_screen_refresh(CTX_wm_manager(C), win);
 
-	return false;
+	BKE_screen_view3d_scene_sync(sc, scene); /* sync new screen with scene data */
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+	WM_event_add_notifier(C, NC_SCREEN | ND_LAYOUTSET, layout);
+
+	/* makes button hilites work */
+	WM_event_add_mousemove(C);
 }
 
-/* only call outside of area/region loops */
-bool ED_screen_delete(bContext *C, bScreen *sc)
+
+/**
+ * \brief Change the active screen.
+ *
+ * Operator call, WM + Window + screen already existed before
+ *
+ * \warning Do NOT call in area/region queues!
+ * \returns if screen changing was successful.
+ */
+bool ED_screen_change(bContext *C, bScreen *sc)
 {
 	Main *bmain = CTX_data_main(C);
-	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *win = CTX_wm_window(C);
-	bScreen *newsc;
-
-	/* don't allow deleting temp fullscreens for now */
-	if (ELEM(sc->state, SCREENMAXIMIZED, SCREENFULL)) {
-		return false;
-	}
-
-	/* screen can only be in use by one window at a time, so as
-	 * long as we are able to find a screen that is unused, we
-	 * can safely assume ours is not in use anywhere an delete it */
-
-	for (newsc = sc->id.prev; newsc; newsc = newsc->id.prev)
-		if (!ed_screen_used(wm, newsc) && !newsc->temp)
-			break;
-
-	if (!newsc) {
-		for (newsc = sc->id.next; newsc; newsc = newsc->id.next)
-			if (!ed_screen_used(wm, newsc) && !newsc->temp)
-				break;
-	}
+	bScreen *screen_old = CTX_wm_screen(C);
+	bScreen *screen_new = screen_change_prepare(screen_old, sc, bmain, C, win);
 
-	if (!newsc) {
-		return false;
-	}
-
-	ED_screen_set(C, newsc);
+	if (screen_new) {
+		WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
+		WM_window_set_active_screen(win, workspace, sc);
+		screen_change_update(C, win, screen_new);
 
-	if (win->screen != sc) {
-		BKE_libblock_free(bmain, sc);
 		return true;
 	}
-	else {
-		return false;
-	}
+
+	return false;
 }
 
-static void ed_screen_set_3dview_camera(Scene *scene, bScreen *sc, ScrArea *sa, View3D *v3d)
+static void screen_set_3dview_camera(Scene *scene, ViewLayer *view_layer, ScrArea *sa, View3D *v3d)
 {
 	/* fix any cameras that are used in the 3d view but not in the scene */
 	BKE_screen_view3d_sync(v3d, scene);
 
-	if (!v3d->camera || !BKE_scene_base_find(scene, v3d->camera)) {
-		v3d->camera = BKE_scene_camera_find(sc->scene);
+	if (!v3d->camera || !BKE_view_layer_base_find(view_layer, v3d->camera)) {
+		v3d->camera = BKE_view_layer_camera_find(view_layer);
 		// XXX if (sc == curscreen) handle_view3d_lock();
 		if (!v3d->camera) {
 			ARegion *ar;
@@ -1373,100 +1296,21 @@ static void ed_screen_set_3dview_camera(Scene *scene, bScreen *sc, ScrArea *sa,
 	}
 }
 
-/* only call outside of area/region loops */
-void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene)
+void ED_screen_update_after_scene_change(const bScreen *screen, Scene *scene_new, ViewLayer *view_layer)
 {
-	Main *bmain = CTX_data_main(C);
-	bScreen *sc;
-
-	if (screen == NULL)
-		return;
-
-	if (ed_screen_used(CTX_wm_manager(C), screen)) {
-		ED_object_editmode_exit(C, EM_FREEDATA);
-	}
-
-	for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-		if ((U.flag & USER_SCENEGLOBAL) || sc == screen) {
-
-			if (scene != sc->scene) {
-				/* all areas endlocalview */
-				// XXX	ScrArea *sa = sc->areabase.first;
-				//	while (sa) {
-				//		endlocalview(sa);
-				//		sa = sa->next;
-				//	}
-				sc->scene = scene;
+	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) {
+				View3D *v3d = (View3D *)sl;
+				screen_set_3dview_camera(scene_new, view_layer, sa, v3d);
 			}
-
 		}
 	}
-
-	//  copy_view3d_lock(0);	/* space.c */
-
-	/* are there cameras in the views that are not in the scene? */
-	for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-		if ((U.flag & USER_SCENEGLOBAL) || sc == screen) {
-			ScrArea *sa = sc->areabase.first;
-			while (sa) {
-				SpaceLink *sl = sa->spacedata.first;
-				while (sl) {
-					if (sl->spacetype == SPACE_VIEW3D) {
-						View3D *v3d = (View3D *) sl;
-						ed_screen_set_3dview_camera(scene, sc, sa, v3d);
-
-					}
-					sl = sl->next;
-				}
-				sa = sa->next;
-			}
-		}
-	}
-
-	CTX_data_scene_set(C, scene);
-	BKE_scene_set_background(bmain, scene);
-	DAG_on_visible_update(bmain, false);
-
-	ED_render_engine_changed(bmain);
-	ED_update_for_newframe(bmain, scene, 1);
-
-	/* complete redraw */
-	WM_event_add_notifier(C, NC_WINDOW, NULL);
-
-}
-
-/**
- * \note Only call outside of area/region loops
- * \return true if successful
- */
-bool ED_screen_delete_scene(bContext *C, Scene *scene)
-{
-	Main *bmain = CTX_data_main(C);
-	Scene *newscene;
-
-	if (scene->id.prev)
-		newscene = scene->id.prev;
-	else if (scene->id.next)
-		newscene = scene->id.next;
-	else
-		return false;
-
-	ED_screen_set_scene(C, CTX_wm_screen(C), newscene);
-
-	BKE_libblock_remap(bmain, scene, newscene, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE);
-
-	id_us_clear_real(&scene->id);
-	if (scene->id.us == 0) {
-		BKE_libblock_free(bmain, scene);
-	}
-
-	return true;
 }
 
 ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type)
 {
 	wmWindow *win = CTX_wm_window(C);
-	bScreen *screen = CTX_wm_screen(C);
 	ScrArea *newsa = NULL;
 
 	if (!sa || sa->full == NULL) {
@@ -1474,18 +1318,7 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type)
 	}
 
 	if (!newsa) {
-		if (sa->full && (screen->state == SCREENMAXIMIZED)) {
-			/* if this has been called from the temporary info header generated in
-			 * temp fullscreen layouts, find the correct fullscreen area to change
-			 * to create a new space inside */
-			for (newsa = screen->areabase.first; newsa; newsa = newsa->next) {
-				if (!(sa->flag & AREA_TEMP_INFO))
-					break;
-			}
-		}
-		else {
-			newsa = sa;
-		}
+		newsa = sa;
 	}
 
 	BLI_assert(newsa);
@@ -1567,6 +1400,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa)
 ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const short state)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
+	WorkSpace *workspace = WM_window_get_active_workspace(win);
 	bScreen *sc, *oldscreen;
 	ARegion *ar;
 
@@ -1588,9 +1422,10 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 	}
 
 	if (sa && sa->full) {
+		WorkSpaceLayout *layout_old = WM_window_get_active_layout(win);
 		/* restoring back to SCREENNORMAL */
 		sc = sa->full;       /* the old screen to restore */
-		oldscreen = win->screen; /* the one disappearing */
+		oldscreen = WM_window_get_active_screen(win); /* the one disappearing */
 
 		sc->state = SCREENNORMAL;
 
@@ -1604,10 +1439,8 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 
 			/* clear full screen state */
 			old->full = NULL;
-			old->flag &= ~AREA_TEMP_INFO;
 		}
 
-		sa->flag &= ~AREA_TEMP_INFO;
 		sa->full = NULL;
 
 		if (fullsa == NULL) {
@@ -1617,6 +1450,10 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 		}
 
 		if (state == SCREENFULL) {
+			/* unhide global areas */
+			for (ScrArea *glob_area = win->global_areas.areabase.first; glob_area; glob_area = glob_area->next) {
+				glob_area->global->flag &= ~GLOBAL_AREA_IS_HIDDEN;
+			}
 			/* restore the old side panels/header visibility */
 			for (ar = sa->regionbase.first; ar; ar = ar->next) {
 				ar->flag = ar->flagfullscreen;
@@ -1629,9 +1466,9 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 		sc->animtimer = oldscreen->animtimer;
 		oldscreen->animtimer = NULL;
 
-		ED_screen_set(C, sc);
+		ED_screen_change(C, sc);
 
-		BKE_libblock_free(CTX_data_main(C), oldscreen);
+		BKE_workspace_layout_remove(CTX_data_main(C), workspace, layout_old);
 
 		/* After we've restored back to SCREENNORMAL, we have to wait with
 		 * screen handling as it uses the area coords which aren't updated yet.
@@ -1641,14 +1478,20 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 	}
 	else {
 		/* change from SCREENNORMAL to new state */
+		WorkSpaceLayout *layout_new;
 		ScrArea *newa;
 		char newname[MAX_ID_NAME - 2];
 
-		oldscreen = win->screen;
+		BLI_assert(ELEM(state, SCREENMAXIMIZED, SCREENFULL));
+
+		oldscreen = WM_window_get_active_screen(win);
 
 		oldscreen->state = state;
 		BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name + 2, "nonnormal");
-		sc = ED_screen_add(win, oldscreen->scene, newname);
+
+		layout_new = ED_workspace_layout_add(workspace, win, newname);
+
+		sc = BKE_workspace_layout_screen_get(layout_new);
 		sc->state = state;
 		sc->redraws_flag = oldscreen->redraws_flag;
 		sc->temp = oldscreen->temp;
@@ -1659,51 +1502,35 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 
 		/* use random area when we have no active one, e.g. when the
 		 * mouse is outside of the window and we open a file browser */
-		if (!sa)
+		if (!sa) {
 			sa = oldscreen->areabase.first;
-
-		if (state == SCREENMAXIMIZED) {
-			/* returns the top small area */
-			newa = area_split(sc, (ScrArea *)sc->areabase.first, 'h', 0.99f, 1);
-			ED_area_newspace(C, newa, SPACE_INFO, false);
-
-			/* copy area */
-			newa = newa->prev;
-			ED_area_data_swap(newa, sa);
-			sa->flag |= AREA_TEMP_INFO;
-
-			sa->full = oldscreen;
-			newa->full = oldscreen;
-			newa->next->full = oldscreen; // XXX
 		}
-		else if (state == SCREENFULL) {
-			newa = (ScrArea *)sc->areabase.first;
 
-			/* copy area */
-			ED_area_data_swap(newa, sa);
-			newa->flag = sa->flag; /* mostly for AREA_FLAG_WASFULLSCREEN */
+		newa = (ScrArea *)sc->areabase.first;
+
+		/* copy area */
+		ED_area_data_swap(newa, sa);
+		newa->flag = sa->flag; /* mostly for AREA_FLAG_WASFULLSCREEN */
 
+		if (state == SCREENFULL) {
+			/* temporarily hide global areas */
+			for (ScrArea *glob_area = win->global_areas.areabase.first; glob_area; glob_area = glob_area->next) {
+				glob_area->global->flag |= GLOBAL_AREA_IS_HIDDEN;
+			}
 			/* temporarily hide the side panels/header */
 			for (ar = newa->regionbase.first; ar; ar = ar->next) {
 				ar->flagfullscreen = ar->flag;
 
-				if (ELEM(ar->regiontype,
-				         RGN_TYPE_UI,
-				         RGN_TYPE_HEADER,
-				         RGN_TYPE_TOOLS))
-				{
+				if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_HEADER, RGN_TYPE_TOOLS)) {
 					ar->flag |= RGN_FLAG_HIDDEN;
 				}
 			}
-
-			sa->full = oldscreen;
-			newa->full = oldscreen;
-		}
-		else {
-			BLI_assert(false);
 		}
 
-		ED_screen_set(C, sc);
+		sa->full = oldscreen;
+		newa->full = oldscreen;
+
+		ED_screen_change(C, sc);
 	}
 
 	/* XXX bad code: setscreen() ends with first area active. fullscreen render assumes this too */
@@ -1790,7 +1617,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync,
 		if (sa)
 			spacetype = sa->spacetype;
 
-		sad->from_anim_edit = (ELEM(spacetype, SPACE_IPO, SPACE_ACTION, SPACE_NLA, SPACE_TIME));
+		sad->from_anim_edit = (ELEM(spacetype, SPACE_IPO, SPACE_ACTION, SPACE_NLA));
 
 		screen->animtimer->customdata = sad;
 
@@ -1838,13 +1665,10 @@ void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh)
 	}
 }
 
-/* results in fully updated anim system
- * screen can be NULL */
-void ED_update_for_newframe(Main *bmain, Scene *scene, int UNUSED(mute))
+/* results in fully updated anim system */
+void ED_update_for_newframe(Main *bmain, Depsgraph *depsgraph)
 {
-	wmWindowManager *wm = bmain->wm.first;
-	wmWindow *window;
-	int layers = 0;
+	Scene *scene = DEG_get_input_scene(depsgraph);
 
 #ifdef DURIAN_CAMERA_SWITCH
 	void *camera = BKE_scene_camera_switch_find(scene);
@@ -1853,19 +1677,15 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, int UNUSED(mute))
 		scene->camera = camera;
 		/* are there cameras in the views that are not in the scene? */
 		for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-			BKE_screen_view3d_scene_sync(sc);
+			BKE_screen_view3d_scene_sync(sc, scene);
 		}
 	}
 #endif
 
 	ED_clip_update_frame(bmain, scene->r.cfra);
 
-	/* get layers from all windows */
-	for (window = wm->windows.first; window; window = window->next)
-		layers |= BKE_screen_visible_layers(window->screen, scene);
-
 	/* this function applies the changes too */
-	BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, layers);
+	BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 
 	/* composite */
 	if (scene->use_nodes && scene->nodetree)
@@ -1886,11 +1706,10 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, int UNUSED(mute))
 /*
  * return true if any active area requires to see in 3D
  */
-bool ED_screen_stereo3d_required(bScreen *screen)
+bool ED_screen_stereo3d_required(const bScreen *screen, const Scene *scene)
 {
 	ScrArea *sa;
-	Scene *sce = screen->scene;
-	const bool is_multiview = (sce->r.scemode & R_MULTIVIEW) != 0;
+	const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
 
 	for (sa = screen->areabase.first; sa; sa = sa->next) {
 		switch (sa->spacetype) {
@@ -1965,3 +1784,40 @@ bool ED_screen_stereo3d_required(bScreen *screen)
 
 	return false;
 }
+
+/**
+ * Find the scene displayed in \a screen.
+ * \note Assumes \a screen to be visible/active!
+ */
+
+Scene *ED_screen_scene_find_with_window(const bScreen *screen, const wmWindowManager *wm, struct wmWindow **r_window)
+{
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		if (WM_window_get_active_screen(win) == screen) {
+			if (r_window) {
+				*r_window = win;
+			}
+			return WM_window_get_active_scene(win);
+		}
+	}
+
+	BLI_assert(0);
+	return NULL;
+}
+
+
+Scene *ED_screen_scene_find(const bScreen *screen, const wmWindowManager *wm)
+{
+	return ED_screen_scene_find_with_window(screen, wm, NULL);
+}
+
+
+wmWindow *ED_screen_window_find(const bScreen *screen, const wmWindowManager *wm)
+{
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		if (WM_window_get_active_screen(win) == screen) {
+			return win;
+		}
+	}
+	return NULL;
+}
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index 436fa9bcd05..adfd7b185ab 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -33,6 +33,7 @@
 
 struct bContext;
 struct bContextDataResult;
+struct Main;
 
 /* internal exports only */
 
@@ -43,23 +44,28 @@ struct bContextDataResult;
 /* area.c */
 void        ED_area_data_copy(ScrArea *sa_dst, ScrArea *sa_src, const bool do_free);
 void        ED_area_data_swap(ScrArea *sa1, ScrArea *sa2);
-void		region_toggle_hidden(struct bContext *C, ARegion *ar, const bool do_fade);
+void        screen_area_update_region_sizes(wmWindowManager *wm, wmWindow *win, ScrArea *area);
+void        region_toggle_hidden(struct bContext *C, ARegion *ar, const bool do_fade);
 
 /* screen_edit.c */
-ScrEdge    *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2);
+bScreen    *screen_add(const char *name, const rcti *rect);
+void        screen_data_copy(bScreen *to, bScreen *from);
+void        screen_new_activate_prepare(const wmWindow *win, bScreen *screen_new);
+void        screen_change_update(struct bContext *C, wmWindow *win, bScreen *sc);
+bScreen    *screen_change_prepare(bScreen *screen_old, bScreen *screen_new, struct Main *bmain, struct bContext *C, wmWindow *win);
 ScrArea    *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge);
 int         screen_area_join(struct bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2);
 int         area_getorientation(ScrArea *sa, ScrArea *sb);
-void        select_connected_scredge(bScreen *sc, ScrEdge *edge);
+void        select_connected_scredge(const wmWindow *win, ScrEdge *edge);
 
-void        removenotused_scrverts(bScreen *sc);
-void        removedouble_scrverts(bScreen *sc);
-void        removedouble_scredges(bScreen *sc);
-void        removenotused_scredges(bScreen *sc);
 bool        scredge_is_horizontal(ScrEdge *se);
-ScrEdge    *screen_find_active_scredge(bScreen *sc,
-                                       const int winsize_x, const int winsize_y,
-                                       const int mx, const int my);
+ScrEdge     *screen_area_map_find_active_scredge(
+        const struct ScrAreaMap *area_map,
+        const rcti *bounds_rect,
+        const int mx, const int my);
+ScrEdge    *screen_find_active_scredge(
+        const wmWindow *win, const bScreen *screen,
+        const int mx, const int my);
 
 struct AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]);
 
@@ -76,5 +82,8 @@ void	SCREEN_OT_screencast(struct wmOperatorType *ot);
 /* screen_ops.c */
 void	region_blend_start(struct bContext *C, struct ScrArea *sa, struct ARegion *ar);
 
+/* workspace_layout_edit.c */
+bool workspace_layout_set_poll(const struct WorkSpaceLayout *layout);
+
 
 #endif /* __SCREEN_INTERN_H__ */
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index b3e788a9a13..e504a116384 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -39,6 +39,7 @@
 
 #include "BLT_translation.h"
 
+#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_object_types.h"
@@ -48,11 +49,14 @@
 #include "DNA_meta_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_node_types.h"
+#include "DNA_workspace_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
+#include "BKE_fcurve.h"
 #include "BKE_global.h"
+#include "BKE_icons.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
@@ -61,10 +65,14 @@
 #include "BKE_editmesh.h"
 #include "BKE_sound.h"
 #include "BKE_mask.h"
+#include "BKE_workspace.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "DEG_depsgraph.h"
+
+#include "ED_anim_api.h"
 #include "ED_armature.h"
 #include "ED_clip.h"
 #include "ED_image.h"
@@ -134,7 +142,7 @@ int ED_operator_screen_mainwinactive(bContext *C)
 	if (CTX_wm_window(C) == NULL) return 0;
 	screen = CTX_wm_screen(C);
 	if (screen == NULL) return 0;
-	if (screen->subwinactive != screen->mainwin) return 0;
+	if (screen->active_region != NULL) return 0;
 	return 1;
 }
 
@@ -200,7 +208,7 @@ int ED_operator_animview_active(bContext *C)
 {
 	if (ED_operator_areaactive(C)) {
 		SpaceLink *sl = (SpaceLink *)CTX_wm_space_data(C);
-		if (sl && (ELEM(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME)))
+		if (sl && (ELEM(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO)))
 			return true;
 	}
 
@@ -208,11 +216,6 @@ int ED_operator_animview_active(bContext *C)
 	return 0;
 }
 
-int ED_operator_timeline_active(bContext *C)
-{
-	return ed_spacetype_test(C, SPACE_TIME);
-}
-
 int ED_operator_outliner_active(bContext *C)
 {
 	return ed_spacetype_test(C, SPACE_OUTLINER);
@@ -291,11 +294,6 @@ int ED_operator_nla_active(bContext *C)
 	return ed_spacetype_test(C, SPACE_NLA);
 }
 
-int ED_operator_logic_active(bContext *C)
-{
-	return ed_spacetype_test(C, SPACE_LOGIC);
-}
-
 int ED_operator_info_active(bContext *C)
 {
 	return ed_spacetype_test(C, SPACE_INFO);
@@ -552,8 +550,8 @@ int ED_operator_mask(bContext *C)
 			case SPACE_IMAGE:
 			{
 				SpaceImage *sima = sa->spacedata.first;
-				Scene *scene = CTX_data_scene(C);
-				return ED_space_image_check_show_maskedit(scene, sima);
+				ViewLayer *view_layer = CTX_data_view_layer(C);
+				return ED_space_image_check_show_maskedit(sima, view_layer);
 			}
 		}
 	}
@@ -561,6 +559,12 @@ int ED_operator_mask(bContext *C)
 	return false;
 }
 
+int ED_operator_camera(bContext *C)
+{
+	struct Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
+	return (cam != NULL);
+}
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -714,9 +718,62 @@ AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2])
 				}
 
 				/* XXX force redraw to show/hide the action zone */
-				ED_area_tag_redraw(sa);
+				ED_area_tag_redraw_no_rebuild(sa);
 				break;
 			}
+			else if (az->type == AZONE_REGION_SCROLL) {
+				ARegion *ar = az->ar;
+				View2D *v2d = &ar->v2d;
+				const short isect_value = UI_view2d_mouse_in_scrollers(ar, v2d, xy[0], xy[1]);
+				bool redraw = false;
+
+				if (isect_value == 'h') {
+					if (az->direction == AZ_SCROLL_HOR) {
+						az->alpha = 1.0f;
+						v2d->alpha_hor = 255;
+						v2d->size_hor = V2D_SCROLL_HEIGHT;
+						redraw = true;
+					}
+				}
+				else if (isect_value == 'v') {
+					if (az->direction == AZ_SCROLL_VERT) {
+						az->alpha = 1.0f;
+						v2d->alpha_vert = 255;
+						v2d->size_vert = V2D_SCROLL_WIDTH;
+						redraw = true;
+					}
+				}
+				else {
+					const int local_xy[2] = {xy[0] - ar->winrct.xmin, xy[1] - ar->winrct.ymin};
+					float dist_fac = 0.0f, alpha = 0.0f;
+
+					if (az->direction == AZ_SCROLL_HOR) {
+						dist_fac = BLI_rcti_length_y(&v2d->hor, local_xy[1]) / AZONEFADEIN;
+						CLAMP(dist_fac, 0.0f, 1.0f);
+						alpha = 1.0f - dist_fac;
+
+						v2d->alpha_hor = alpha * 255;
+						v2d->size_hor = round_fl_to_int(V2D_SCROLL_HEIGHT -
+						                                ((V2D_SCROLL_HEIGHT - V2D_SCROLL_HEIGHT_MIN) * dist_fac));
+					}
+					else if (az->direction == AZ_SCROLL_VERT) {
+						dist_fac = BLI_rcti_length_x(&v2d->vert, local_xy[0]) / AZONEFADEIN;
+						CLAMP(dist_fac, 0.0f, 1.0f);
+						alpha = 1.0f - dist_fac;
+
+						v2d->alpha_vert = alpha * 255;
+						v2d->size_vert = round_fl_to_int(V2D_SCROLL_WIDTH -
+						                                 ((V2D_SCROLL_WIDTH - V2D_SCROLL_WIDTH_MIN) * dist_fac));
+					}
+					az->alpha = alpha;
+					redraw = true;
+				}
+
+				if (redraw) {
+					ED_area_tag_redraw_no_rebuild(sa);
+				}
+				/* Don't return! */
+			}
 		}
 	}
 
@@ -779,6 +836,9 @@ static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		actionzone_exit(op);
 		return OPERATOR_FINISHED;
 	}
+	else if (ELEM(sad->az->type, AZONE_REGION_SCROLL)) {
+		return OPERATOR_PASS_THROUGH;
+	}
 	else {
 		/* add modal handler */
 		WM_event_add_modal_handler(C, op);
@@ -790,11 +850,8 @@ static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	wmWindow *win = CTX_wm_window(C);
 	bScreen *sc = CTX_wm_screen(C);
 	sActionzoneData *sad = op->customdata;
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
 
 	switch (event->type) {
 		case MOUSEMOVE:
@@ -815,10 +872,15 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				sad->gesture_dir = 'w';
 
 			if (sad->az->type == AZONE_AREA) {
+				const wmWindow *win = CTX_wm_window(C);
+				rcti screen_rect;
+
+				WM_window_screen_rect_calc(win, &screen_rect);
 				/* once we drag outside the actionzone, register a gesture
 				 * check we're not on an edge so join finds the other area */
 				is_gesture = ((is_in_area_actionzone(sad->sa1, &event->x) != sad->az) &&
-				              (screen_find_active_scredge(sc, winsize_x, winsize_y, event->x, event->y) == NULL));
+				              (screen_area_map_find_active_scredge(
+				                   AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL));
 			}
 			else {
 				const int delta_min = 1;
@@ -1007,13 +1069,17 @@ static void SCREEN_OT_area_swap(wmOperatorType *ot)
 /* operator callback */
 static int area_dupli_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	wmWindow *newwin, *win;
-	bScreen *newsc, *sc;
+	wmWindow *newwin, *win = CTX_wm_window(C);
+	Scene *scene;
+	WorkSpace *workspace = WM_window_get_active_workspace(win);
+	WorkSpaceLayout *layout_old = WM_window_get_active_layout(win);
+	WorkSpaceLayout *layout_new;
+	bScreen *newsc;
 	ScrArea *sa;
 	rcti rect;
 
 	win = CTX_wm_window(C);
-	sc = CTX_wm_screen(C);
+	scene = CTX_data_scene(C);
 	sa = CTX_wm_area(C);
 
 	/* XXX hrmf! */
@@ -1040,9 +1106,13 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 	*newwin->stereo3d_format = *win->stereo3d_format;
 
+	newwin->scene = scene;
+
+	WM_window_set_active_workspace(newwin, workspace);
 	/* allocs new screen and adds to newly created window, using window size */
-	newsc = ED_screen_add(newwin, CTX_data_scene(C), sc->id.name + 2);
-	newwin->screen = newsc;
+	layout_new = ED_workspace_layout_add(workspace, newwin, BKE_workspace_layout_name_get(layout_old));
+	newsc = BKE_workspace_layout_screen_get(layout_new);
+	WM_window_set_active_layout(newwin, workspace, layout_new);
 
 	/* copy area to new screen */
 	ED_area_data_copy((ScrArea *)newsc->areabase.first, sa, true);
@@ -1110,32 +1180,82 @@ static void SCREEN_OT_area_dupli(wmOperatorType *ot)
  */
 
 typedef struct sAreaMoveData {
-	int bigger, smaller, origval;
+	int bigger, smaller, origval, step;
 	char dir;
-	bool do_snap;
+	enum AreaMoveSnapType {
+		/* Snapping disabled */
+		SNAP_NONE = 0,
+		/* Snap to an invisible grid with a unit defined in AREAGRID */
+		SNAP_AREAGRID,
+		/* Snap to mid-point and adjacent edges. */
+		SNAP_MIDPOINT_AND_ADJACENT,
+		/* Snap to either bigger or smaller, nothing in-between (used for
+		 * global areas). This has priority over other snap types, if it is
+		 * used, toggling SNAP_MIDPOINT_AND_ADJACENT doesn't work. */
+		SNAP_BIGGER_SMALLER_ONLY,
+	} snap_type;
 } sAreaMoveData;
 
 /* helper call to move area-edge, sets limits
- * need window size in order to get correct limits */
-static void area_move_set_limits(bScreen *sc, int dir,
-                                 const int winsize_x, const int winsize_y,
-                                 int *bigger, int *smaller)
+ * need window bounds in order to get correct limits */
+static void area_move_set_limits(
+        wmWindow *win, bScreen *sc, int dir,
+        const rcti *screen_rect,
+        int *bigger, int *smaller,
+        bool *use_bigger_smaller_snap)
 {
-	ScrArea *sa;
 	int areaminy = ED_area_headersize();
 	int areamin;
 
 	/* we check all areas and test for free space with MINSIZE */
 	*bigger = *smaller = 100000;
 
-	for (sa = sc->areabase.first; sa; sa = sa->next) {
+	if (use_bigger_smaller_snap != NULL) {
+		*use_bigger_smaller_snap = false;
+		for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) {
+			const int size_min = round_fl_to_int(area->global->size_min * UI_DPI_FAC);
+			const int size_max = round_fl_to_int(area->global->size_max * UI_DPI_FAC);
+
+			/* logic here is only tested for lower edge :) */
+			/* left edge */
+			if ((area->v1->editflag && area->v2->editflag)) {
+				*smaller = area->v4->vec.x - size_max;
+				*bigger  = area->v4->vec.x - size_min;
+				*use_bigger_smaller_snap = true;
+				return;
+			}
+			/* top edge */
+			else if ((area->v2->editflag && area->v3->editflag)) {
+				*smaller = area->v1->vec.y + size_min;
+				*bigger  = area->v1->vec.y + size_max;
+				*use_bigger_smaller_snap = true;
+				return;
+			}
+			/* right edge */
+			else if ((area->v3->editflag && area->v4->editflag)) {
+				*smaller = area->v1->vec.x + size_min;
+				*bigger  = area->v1->vec.x + size_max;
+				*use_bigger_smaller_snap = true;
+				return;
+			}
+			/* lower edge */
+			else if ((area->v4->editflag && area->v1->editflag)) {
+				*smaller = area->v2->vec.y - size_max;
+				*bigger  = area->v2->vec.y - size_min;
+				*use_bigger_smaller_snap = true;
+				return;
+			}
+		}
+	}
+
+	for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
 		if (dir == 'h') {
 			int y1;
 			areamin = areaminy;
 
-			if (sa->v1->vec.y > 0)
+			if (sa->v1->vec.y > screen_rect->ymin)
 				areamin += U.pixelsize;
-			if (sa->v2->vec.y < winsize_y - 1)
+			if (sa->v2->vec.y < (screen_rect->ymax - 1))
 				areamin += U.pixelsize;
 
 			y1 = sa->v2->vec.y - sa->v1->vec.y + 1 - areamin;
@@ -1150,9 +1270,9 @@ static void area_move_set_limits(bScreen *sc, int dir,
 			int x1;
 			areamin = AREAMINX;
 
-			if (sa->v1->vec.x > 0)
+			if (sa->v1->vec.x > screen_rect->xmin)
 				areamin += U.pixelsize;
-			if (sa->v4->vec.x < winsize_x - 1)
+			if (sa->v4->vec.x < (screen_rect->xmax - 1))
 				areamin += U.pixelsize;
 
 			x1 = sa->v4->vec.x - sa->v1->vec.x + 1 - areamin;
@@ -1174,9 +1294,7 @@ static int area_move_init(bContext *C, wmOperator *op)
 	wmWindow *win = CTX_wm_window(C);
 	ScrEdge *actedge;
 	sAreaMoveData *md;
-	ScrVert *v1;
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
+	rcti screen_rect;
 	int x, y;
 
 	/* required properties */
@@ -1184,7 +1302,7 @@ static int area_move_init(bContext *C, wmOperator *op)
 	y = RNA_int_get(op->ptr, "y");
 
 	/* setup */
-	actedge = screen_find_active_scredge(sc, winsize_x, winsize_y, x, y);
+	actedge = screen_find_active_scredge(win, sc, x, y);
 	if (actedge == NULL) return 0;
 
 	md = MEM_callocN(sizeof(sAreaMoveData), "sAreaMoveData");
@@ -1194,42 +1312,67 @@ static int area_move_init(bContext *C, wmOperator *op)
 	if (md->dir == 'h') md->origval = actedge->v1->vec.y;
 	else md->origval = actedge->v1->vec.x;
 
-	select_connected_scredge(sc, actedge);
-	/* now all vertices with 'flag==1' are the ones that can be moved. Move this to editflag */
-	for (v1 = sc->vertbase.first; v1; v1 = v1->next)
+	select_connected_scredge(win, actedge);
+	/* now all vertices with 'flag == 1' are the ones that can be moved. Move this to editflag */
+	ED_screen_verts_iter(win, sc, v1) {
 		v1->editflag = v1->flag;
+	}
+
+	WM_window_screen_rect_calc(win, &screen_rect);
 
-	area_move_set_limits(sc, md->dir, winsize_x, winsize_y, &md->bigger, &md->smaller);
+	bool use_bigger_smaller_snap = false;
+	area_move_set_limits(win, sc, md->dir, &screen_rect,
+	                     &md->bigger, &md->smaller,
+	                     &use_bigger_smaller_snap);
+
+	md->snap_type = use_bigger_smaller_snap ? SNAP_BIGGER_SMALLER_ONLY : SNAP_AREAGRID;
 
 	return 1;
 }
 
 static int area_snap_calc_location(
-        const bScreen *sc, const int delta,
-        const int origval, const int dir,
+        const bScreen *sc, const enum AreaMoveSnapType snap_type,
+        const int delta, const int origval, const int dir,
         const int bigger, const int smaller)
 {
+	BLI_assert(snap_type != SNAP_NONE);
 	int final_loc = -1;
-
 	const int m_loc = origval + delta;
-	const int axis = (dir == 'v') ? 0 : 1;
-	int snap_dist;
-	int dist;
-	{
-		/* Test the snap to middle. */
-		int middle = origval + (bigger - smaller) / 2;
-		middle -= (middle % AREAGRID);
 
-		snap_dist = abs(m_loc - middle);
-		final_loc = middle;
-	}
+	switch (snap_type) {
+		case SNAP_AREAGRID:
+			final_loc = m_loc;
+			if (delta != bigger && delta != -smaller) {
+				final_loc -= (m_loc % AREAGRID);
+			}
+			break;
 
-	for (const ScrVert *v1 = sc->vertbase.first; v1; v1 = v1->next) {
-		if (v1->editflag) {
-			const int v_loc = (&v1->vec.x)[!axis];
+		case SNAP_BIGGER_SMALLER_ONLY:
+			final_loc = (m_loc >= bigger) ? bigger : smaller;
+			break;
 
-			for (const ScrVert *v2 = sc->vertbase.first; v2; v2 = v2->next) {
-				if (!v2->editflag) {
+		case SNAP_MIDPOINT_AND_ADJACENT:
+		{
+			const int axis = (dir == 'v') ? 0 : 1;
+			int snap_dist;
+			int dist;
+			{
+				/* Test the snap to middle. */
+				int middle = origval + (bigger - smaller) / 2;
+				snap_dist = abs(m_loc - middle);
+				final_loc = middle;
+			}
+
+			for (const ScrVert *v1 = sc->vertbase.first; v1; v1 = v1->next) {
+				if (!v1->editflag) {
+					continue;
+				}
+				const int v_loc = (&v1->vec.x)[!axis];
+
+				for (const ScrVert *v2 = sc->vertbase.first; v2; v2 = v2->next) {
+					if (v2->editflag) {
+						continue;
+					}
 					if (v_loc == (&v2->vec.x)[!axis]) {
 						const int v_loc2 = (&v2->vec.x)[axis];
 						/* Do not snap to the vertices at the ends. */
@@ -1243,7 +1386,10 @@ static int area_snap_calc_location(
 					}
 				}
 			}
+			break;
 		}
+		case SNAP_NONE:
+			break;
 	}
 
 	return final_loc;
@@ -1254,29 +1400,26 @@ static void area_move_apply_do(
         const bContext *C, int delta,
         const int origval, const int dir,
         const int bigger, const int smaller,
-        const bool do_snap)
+        const enum AreaMoveSnapType snap_type)
 {
+	wmWindow *win = CTX_wm_window(C);
 	bScreen *sc = CTX_wm_screen(C);
-	ScrVert *v1;
 	bool doredraw = false;
 	CLAMP(delta, -smaller, bigger);
 
 	short final_loc = -1;
 
-	if (do_snap) {
-		final_loc = area_snap_calc_location(sc, delta, origval, dir, bigger, smaller);
+	if (snap_type == SNAP_NONE) {
+		final_loc = origval + delta;
 	}
 	else {
-		final_loc = origval + delta;
-		if (delta != bigger && delta != -smaller) {
-			final_loc -= (final_loc % AREAGRID);
-		}
+		final_loc = area_snap_calc_location(sc, snap_type, delta, origval, dir, bigger, smaller);
 	}
 
 	BLI_assert(final_loc != -1);
 	short axis = (dir == 'v') ? 0 : 1;
 
-	for (v1 = sc->vertbase.first; v1; v1 = v1->next) {
+	ED_screen_verts_iter(win, sc, v1) {
 		if (v1->editflag) {
 			short oldval = (&v1->vec.x)[axis];
 			(&v1->vec.x)[axis] = final_loc;
@@ -1291,12 +1434,26 @@ static void area_move_apply_do(
 
 	/* only redraw if we actually moved a screen vert, for AREAGRID */
 	if (doredraw) {
-		for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
+		bool redraw_all = false;
+		ED_screen_areas_iter(win, sc, sa) {
 			if (sa->v1->editflag || sa->v2->editflag || sa->v3->editflag || sa->v4->editflag) {
+				if (ED_area_is_global(sa)) {
+					sa->global->cur_fixed_height = round_fl_to_int((sa->v2->vec.y - sa->v1->vec.y) / UI_DPI_FAC);
+					sc->do_refresh = true;
+					redraw_all = true;
+				}
+				ED_area_tag_redraw(sa);
+			}
+		}
+		if (redraw_all) {
+			ED_screen_areas_iter(win, sc, sa) {
 				ED_area_tag_redraw(sa);
 			}
 		}
+
 		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL); /* redraw everything */
+		/* Update preview thumbnail */
+		BKE_icon_changed(sc->id.icon_id);
 	}
 }
 
@@ -1305,7 +1462,7 @@ static void area_move_apply(bContext *C, wmOperator *op)
 	sAreaMoveData *md = op->customdata;
 	int delta = RNA_int_get(op->ptr, "delta");
 
-	area_move_apply_do(C, delta, md->origval, md->dir, md->bigger, md->smaller, md->do_snap);
+	area_move_apply_do(C, delta, md->origval, md->dir, md->bigger, md->smaller, md->snap_type);
 }
 
 static void area_move_exit(bContext *C, wmOperator *op)
@@ -1315,8 +1472,8 @@ static void area_move_exit(bContext *C, wmOperator *op)
 	op->customdata = NULL;
 
 	/* this makes sure aligned edges will result in aligned grabbing */
-	removedouble_scrverts(CTX_wm_screen(C));
-	removedouble_scredges(CTX_wm_screen(C));
+	BKE_screen_remove_double_scrverts(CTX_wm_screen(C));
+	BKE_screen_remove_double_scredges(CTX_wm_screen(C));
 }
 
 static int area_move_exec(bContext *C, wmOperator *op)
@@ -1384,10 +1541,15 @@ static int area_move_modal(bContext *C, wmOperator *op, const wmEvent *event)
 					return OPERATOR_CANCELLED;
 
 				case KM_MODAL_SNAP_ON:
-					md->do_snap = true;
+					if (md->snap_type != SNAP_BIGGER_SMALLER_ONLY) {
+						md->snap_type = SNAP_MIDPOINT_AND_ADJACENT;
+					}
 					break;
+
 				case KM_MODAL_SNAP_OFF:
-					md->do_snap = false;
+					if (md->snap_type != SNAP_BIGGER_SMALLER_ONLY) {
+						md->snap_type = SNAP_AREAGRID;
+					}
 					break;
 			}
 			break;
@@ -1506,7 +1668,7 @@ static int area_split_init(bContext *C, wmOperator *op)
 {
 	ScrArea *sa = CTX_wm_area(C);
 	sAreaSplitData *sd;
-	int areaminy = ED_area_headersize() + 1;
+	int areaminy = ED_area_headersize();
 	int dir;
 
 	/* required context */
@@ -1524,8 +1686,14 @@ static int area_split_init(bContext *C, wmOperator *op)
 	op->customdata = sd;
 
 	sd->sarea = sa;
-	sd->origsize = dir == 'v' ? sa->winx : sa->winy;
-	sd->origmin = dir == 'v' ? sa->totrct.xmin : sa->totrct.ymin;
+	if (dir == 'v') {
+		sd->origmin = sa->v1->vec.x;
+		sd->origsize = sa->v4->vec.x - sd->origmin;
+	}
+	else {
+		sd->origmin = sa->v1->vec.y;
+		sd->origsize = sa->v2->vec.y - sd->origmin;
+	}
 
 	return 1;
 }
@@ -1544,16 +1712,16 @@ static ScrEdge *area_findsharededge(bScreen *screen, ScrArea *sa, ScrArea *sb)
 	ScrVert *sbv4 = sb->v4;
 
 	if (sav1 == sbv4 && sav2 == sbv3) { /* sa to right of sb = W */
-		return screen_findedge(screen, sav1, sav2);
+		return BKE_screen_find_edge(screen, sav1, sav2);
 	}
 	else if (sav2 == sbv1 && sav3 == sbv4) { /* sa to bottom of sb = N */
-		return screen_findedge(screen, sav2, sav3);
+		return BKE_screen_find_edge(screen, sav2, sav3);
 	}
 	else if (sav3 == sbv2 && sav4 == sbv1) { /* sa to left of sb = E */
-		return screen_findedge(screen, sav3, sav4);
+		return BKE_screen_find_edge(screen, sav3, sav4);
 	}
 	else if (sav1 == sbv2 && sav4 == sbv3) { /* sa on top of sb = S*/
-		return screen_findedge(screen, sav1, sav4);
+		return BKE_screen_find_edge(screen, sav1, sav4);
 	}
 
 	return NULL;
@@ -1592,6 +1760,8 @@ static int area_split_apply(bContext *C, wmOperator *op)
 		ED_area_tag_redraw(sd->narea);
 
 		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+		/* Update preview thumbnail */
+		BKE_icon_changed(sc->id.icon_id);
 
 		return 1;
 	}
@@ -1617,8 +1787,8 @@ static void area_split_exit(bContext *C, wmOperator *op)
 	WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
 
 	/* this makes sure aligned edges will result in aligned grabbing */
-	removedouble_scrverts(CTX_wm_screen(C));
-	removedouble_scredges(CTX_wm_screen(C));
+	BKE_screen_remove_double_scrverts(CTX_wm_screen(C));
+	BKE_screen_remove_double_scredges(CTX_wm_screen(C));
 }
 
 static void area_split_preview_update_cursor(bContext *C, wmOperator *op)
@@ -1634,14 +1804,15 @@ static int area_split_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	wmWindow *win = CTX_wm_window(C);
 	bScreen *sc = CTX_wm_screen(C);
 	sAreaSplitData *sd;
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
+	rcti screen_rect;
 	int dir;
 
 	/* no full window splitting allowed */
 	if (sc->state != SCREENNORMAL)
 		return OPERATOR_CANCELLED;
 
+	WM_window_screen_rect_calc(win, &screen_rect);
+
 	if (event->type == EVT_ACTIONZONE_AREA) {
 		sActionzoneData *sad = event->customdata;
 
@@ -1688,7 +1859,7 @@ static int area_split_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		else
 			y = event->x;
 
-		actedge = screen_find_active_scredge(sc, winsize_x, winsize_y, x, y);
+		actedge = screen_area_map_find_active_scredge(AREAMAP_FROM_SCREEN(sc), &screen_rect, x, y);
 		if (actedge == NULL)
 			return OPERATOR_CANCELLED;
 
@@ -1708,7 +1879,7 @@ static int area_split_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 		/* do the split */
 		if (area_split_apply(C, op)) {
-			area_move_set_limits(sc, dir, winsize_x, winsize_y, &sd->bigger, &sd->smaller);
+			area_move_set_limits(win, sc, dir, &screen_rect, &sd->bigger, &sd->smaller, NULL);
 
 			/* add temp handler for edge move or cancel */
 			WM_event_add_modal_handler(C, op);
@@ -1826,10 +1997,11 @@ static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event)
 		if (sd->previewmode == 0) {
 			if (sd->do_snap) {
 				const int snap_loc = area_snap_calc_location(
-				        CTX_wm_screen(C), sd->delta, sd->origval, dir, sd->bigger, sd->smaller);
+				        CTX_wm_screen(C), SNAP_MIDPOINT_AND_ADJACENT, sd->delta, sd->origval, dir,
+				        sd->bigger, sd->smaller);
 				sd->delta = snap_loc - sd->origval;
 			}
-			area_move_apply_do(C, sd->delta, sd->origval, dir, sd->bigger, sd->smaller, false);
+			area_move_apply_do(C, sd->delta, sd->origval, dir, sd->bigger, sd->smaller, SNAP_NONE);
 		}
 		else {
 			if (sd->sarea) {
@@ -1841,19 +2013,20 @@ static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			if (sd->sarea) {
 				ScrArea *sa = sd->sarea;
 				if (dir == 'v') {
-					sd->origsize = sa->winx;
-					sd->origmin = sa->totrct.xmin;
+					sd->origmin = sa->v1->vec.x;
+					sd->origsize = sa->v4->vec.x - sd->origmin;
 				}
 				else {
-					sd->origsize = sa->winy;
-					sd->origmin = sa->totrct.ymin;
+					sd->origmin = sa->v1->vec.y;
+					sd->origsize = sa->v2->vec.y - sd->origmin;
 				}
 
 				if (sd->do_snap) {
 					sa->v1->editflag = sa->v2->editflag = sa->v3->editflag = sa->v4->editflag = 1;
 
 					const int snap_loc = area_snap_calc_location(
-					        CTX_wm_screen(C), sd->delta, sd->origval, dir, sd->origmin + sd->origsize, -sd->origmin);
+					        CTX_wm_screen(C), SNAP_MIDPOINT_AND_ADJACENT, sd->delta, sd->origval, dir,
+					        sd->origmin + sd->origsize, -sd->origmin);
 
 					sa->v1->editflag = sa->v2->editflag = sa->v3->editflag = sa->v4->editflag = 0;
 					sd->delta = snap_loc - sd->origval;
@@ -1862,7 +2035,7 @@ static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				ED_area_tag_redraw(sd->sarea);
 			}
 
-			CTX_wm_window(C)->screen->do_draw = true;
+			CTX_wm_screen(C)->do_draw = true;
 		}
 
 		float fac = (float)(sd->delta + sd->origval - sd->origmin) / sd->origsize;
@@ -2031,7 +2204,8 @@ static int region_scale_get_maxsize(RegionMoveData *rmd)
 	if (rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS) {
 		/* this calculation seems overly verbose
 		 * can someone explain why this method is necessary? - campbell */
-		maxsize = rmd->maxsize - ((rmd->sa->headertype == HEADERTOP) ? UI_UNIT_Y * 2 : UI_UNIT_Y) - (UI_UNIT_Y / 4);
+		const bool top_header = ED_area_header_alignment(rmd->sa) == RGN_ALIGN_TOP;
+		maxsize = rmd->maxsize - ((top_header) ? UI_UNIT_Y * 2 : UI_UNIT_Y) - (UI_UNIT_Y / 4);
 	}
 
 	return maxsize;
@@ -2075,7 +2249,9 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
 	/* execute the events */
 	switch (event->type) {
 		case MOUSEMOVE:
-
+		{
+			const float aspect = BLI_rctf_size_x(&rmd->ar->v2d.cur) / (BLI_rcti_size_x(&rmd->ar->v2d.mask) + 1);
+			const int snap_size_threshold = (U.widget_unit * 3) / aspect;
 			if (rmd->edge == AE_LEFT_TO_TOPRIGHT || rmd->edge == AE_RIGHT_TO_TOPLEFT) {
 				delta = event->x - rmd->origx;
 				if (rmd->edge == AE_LEFT_TO_TOPRIGHT) delta = -delta;
@@ -2084,6 +2260,13 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				delta /= UI_DPI_FAC;
 
 				rmd->ar->sizex = rmd->origval + delta;
+
+				if (rmd->ar->type->snap_size) {
+					short sizex_test = rmd->ar->type->snap_size(rmd->ar, rmd->ar->sizex, 0);
+					if (ABS(rmd->ar->sizex - sizex_test) < snap_size_threshold) {
+						rmd->ar->sizex = sizex_test;
+					}
+				}
 				CLAMP(rmd->ar->sizex, 0, rmd->maxsize);
 
 				if (rmd->ar->sizex < UI_UNIT_X) {
@@ -2103,6 +2286,13 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				delta /= UI_DPI_FAC;
 
 				rmd->ar->sizey = rmd->origval + delta;
+
+				if (rmd->ar->type->snap_size) {
+					short sizey_test = rmd->ar->type->snap_size(rmd->ar, rmd->ar->sizey, 1);
+					if (ABS(rmd->ar->sizey - sizey_test) < snap_size_threshold) {
+						rmd->ar->sizey = sizey_test;
+					}
+				}
 				CLAMP(rmd->ar->sizey, 0, rmd->maxsize);
 
 				/* note, 'UI_UNIT_Y/4' means you need to drag the header almost
@@ -2122,7 +2312,7 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
 
 			break;
-
+		}
 		case LEFTMOUSE:
 			if (event->val == KM_RELEASE) {
 
@@ -2185,16 +2375,15 @@ static void areas_do_frame_follow(bContext *C, bool middle)
 	bScreen *scr = CTX_wm_screen(C);
 	Scene *scene = CTX_data_scene(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
-	wmWindow *window;
-	for (window = wm->windows.first; window; window = window->next) {
-		ScrArea *sa;
-		for (sa = window->screen->areabase.first; sa; sa = sa->next) {
-			ARegion *ar;
-			for (ar = sa->regionbase.first; ar; ar = ar->next) {
+	for (wmWindow *window = wm->windows.first; window; window = window->next) {
+		const bScreen *screen = WM_window_get_active_screen(window);
+
+		for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+			for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
 				/* do follow here if editor type supports it */
 				if ((scr->redraws_flag & TIME_FOLLOW)) {
 					if ((ar->regiontype == RGN_TYPE_WINDOW &&
-					     ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
+					     ELEM(sa->spacetype, SPACE_SEQ, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
 					    (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
 					{
 						float w = BLI_rctf_size_x(&ar->v2d.cur);
@@ -2505,64 +2694,16 @@ static void SCREEN_OT_marker_jump(wmOperatorType *ot)
 /** \name Set Screen Operator
  * \{ */
 
-static bool screen_set_is_ok(bScreen *screen, bScreen *screen_prev)
-{
-	return ((screen->winid == 0) &&
-	        /* in typical usage these should have a nonzero winid
-	         * (all temp screens should be used, or closed & freed). */
-	        (screen->temp == false) &&
-	        (screen->state == SCREENNORMAL) &&
-	        (screen != screen_prev) &&
-	        (screen->id.name[2] != '.' || !(U.uiflag & USER_HIDE_DOT)));
-}
-
 /* function to be called outside UI context, or for redo */
 static int screen_set_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
-	bScreen *screen = CTX_wm_screen(C);
-	bScreen *screen_prev = screen;
-
-	ScrArea *sa = CTX_wm_area(C);
-	int tot = BLI_listbase_count(&bmain->screen);
+	WorkSpace *workspace = CTX_wm_workspace(C);
 	int delta = RNA_int_get(op->ptr, "delta");
 
-	/* temp screens are for userpref or render display */
-	if (screen->temp || (sa && sa->full && sa->full->temp)) {
-		return OPERATOR_CANCELLED;
-	}
-
-	if (delta == 1) {
-		while (tot--) {
-			screen = screen->id.next;
-			if (screen == NULL) screen = bmain->screen.first;
-			if (screen_set_is_ok(screen, screen_prev)) {
-				break;
-			}
-		}
-	}
-	else if (delta == -1) {
-		while (tot--) {
-			screen = screen->id.prev;
-			if (screen == NULL) screen = bmain->screen.last;
-			if (screen_set_is_ok(screen, screen_prev)) {
-				break;
-			}
-		}
-	}
-	else {
-		screen = NULL;
-	}
-
-	if (screen && screen_prev != screen) {
-		/* return to previous state before switching screens */
-		if (sa && sa->full) {
-			ED_screen_full_restore(C, sa); /* may free 'screen_prev' */
-		}
-
-		ED_screen_set(C, screen);
+	if (ED_workspace_layout_cycle(workspace, delta, C)) {
 		return OPERATOR_FINISHED;
 	}
+
 	return OPERATOR_CANCELLED;
 }
 
@@ -2618,6 +2759,15 @@ static int screen_maximize_area_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
+static int screen_maximize_area_poll(bContext *C)
+{
+	const bScreen *screen = CTX_wm_screen(C);
+	const ScrArea *area = CTX_wm_area(C);
+	return ED_operator_areaactive(C) &&
+	        /* Don't allow maximizing global areas but allow minimizing from them. */
+	       ((screen->state != SCREENNORMAL) || !ED_area_is_global(area));
+}
+
 static void SCREEN_OT_screen_full_area(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
@@ -2627,7 +2777,7 @@ static void SCREEN_OT_screen_full_area(wmOperatorType *ot)
 	ot->idname = "SCREEN_OT_screen_full_area";
 
 	ot->exec = screen_maximize_area_exec;
-	ot->poll = ED_operator_areaactive;
+	ot->poll = screen_maximize_area_poll;
 	ot->flag = 0;
 
 	prop = RNA_def_boolean(ot->srna, "use_hide_panels", false, "Hide Panels", "Hide all the panels");
@@ -2760,9 +2910,9 @@ static void area_join_exit(bContext *C, wmOperator *op)
 	}
 
 	/* this makes sure aligned edges will result in aligned grabbing */
-	removedouble_scredges(CTX_wm_screen(C));
-	removenotused_scredges(CTX_wm_screen(C));
-	removenotused_scrverts(CTX_wm_screen(C));
+	BKE_screen_remove_double_scredges(CTX_wm_screen(C));
+	BKE_screen_remove_unused_scredges(CTX_wm_screen(C));
+	BKE_screen_remove_unused_scrverts(CTX_wm_screen(C));
 }
 
 static int area_join_exec(bContext *C, wmOperator *op)
@@ -2931,16 +3081,16 @@ static void SCREEN_OT_area_join(wmOperatorType *ot)
 
 static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	wmWindow *win = CTX_wm_window(C);
-	bScreen *sc = CTX_wm_screen(C);
+	const wmWindow *win = CTX_wm_window(C);
+	const bScreen *sc = CTX_wm_screen(C);
 	uiPopupMenu *pup;
 	uiLayout *layout;
 	PointerRNA ptr;
 	ScrEdge *actedge;
-	const int winsize_x = WM_window_pixels_x(win);
-	const int winsize_y = WM_window_pixels_y(win);
+	rcti screen_rect;
 
-	actedge = screen_find_active_scredge(sc, winsize_x, winsize_y, event->x, event->y);
+	WM_window_screen_rect_calc(win, &screen_rect);
+	actedge = screen_area_map_find_active_scredge(AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y);
 
 	if (actedge == NULL) return OPERATOR_CANCELLED;
 
@@ -3344,6 +3494,18 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
+static int region_flip_poll(bContext *C)
+{
+	ScrArea *area = CTX_wm_area(C);
+
+	/* don't flip anything around in topbar */
+	if (area->spacetype == SPACE_TOPBAR) {
+		CTX_wm_operator_poll_msg_set(C, "Flipping regions in the Top-bar is not allowed");
+		return 0;
+	}
+
+	return ED_operator_areaactive(C);
+}
 
 static void SCREEN_OT_region_flip(wmOperatorType *ot)
 {
@@ -3354,7 +3516,7 @@ static void SCREEN_OT_region_flip(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = region_flip_exec;
-	ot->poll = ED_operator_areaactive;
+	ot->poll = region_flip_poll;
 	ot->flag = 0;
 }
 
@@ -3437,6 +3599,8 @@ void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UN
 	ARegion *ar = CTX_wm_region(C);
 	const char *but_flip_str = (ar->alignment == RGN_ALIGN_TOP) ? IFACE_("Flip to Bottom") : IFACE_("Flip to Top");
 
+	uiItemO(layout, IFACE_("Toggle Header"), ICON_NONE, "SCREEN_OT_header");
+
 	/* default is WM_OP_INVOKE_REGION_WIN, which we don't want here. */
 	uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT);
 
@@ -3447,12 +3611,11 @@ void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UN
 
 	uiItemS(layout);
 
-	/* file browser should be fullscreen all the time, but other regions can be maximized/restored... */
-	if (sa->spacetype != SPACE_FILE) {
-		if (sa->full)
-			uiItemO(layout, IFACE_("Tile Area"), ICON_NONE, "SCREEN_OT_screen_full_area");
-		else
-			uiItemO(layout, IFACE_("Maximize Area"), ICON_NONE, "SCREEN_OT_screen_full_area");
+	/* file browser should be fullscreen all the time, topbar should
+	 * never be. But other regions can be maximized/restored... */
+	if (!ELEM(sa->spacetype, SPACE_FILE, SPACE_TOPBAR)) {
+		const char *but_str = sa->full ? IFACE_("Tile Area") : IFACE_("Maximize Area");
+		uiItemO(layout, but_str, ICON_NONE, "SCREEN_OT_screen_full_area");
 	}
 }
 
@@ -3512,13 +3675,14 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws,
 					return 1;
 				break;
 			case SPACE_IPO:
-			case SPACE_ACTION:
 			case SPACE_NLA:
 				if ((redraws & TIME_ALL_ANIM_WIN) || from_anim_edit)
 					return 1;
 				break;
-			case SPACE_TIME:
-				/* if only 1 window or 3d windows, we do timeline too */
+			case SPACE_ACTION:
+				/* if only 1 window or 3d windows, we do timeline too
+				 * NOTE: Now we do do action editor in all these cases, since timeline is here
+				 */
 				if ((redraws & (TIME_ALL_ANIM_WIN | TIME_REGION | TIME_ALL_3D_WIN)) || from_anim_edit)
 					return 1;
 				break;
@@ -3569,7 +3733,7 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws,
 			return 1;
 	}
 	else if (regiontype == RGN_TYPE_HEADER) {
-		if (spacetype == SPACE_TIME)
+		if (spacetype == SPACE_ACTION)
 			return 1;
 	}
 	else if (regiontype == RGN_TYPE_PREVIEW) {
@@ -3599,6 +3763,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
 	if (screen->animtimer && screen->animtimer == event->customdata) {
 		Main *bmain = CTX_data_main(C);
 		Scene *scene = CTX_data_scene(C);
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		wmTimer *wt = screen->animtimer;
 		ScreenAnimData *sad = wt->customdata;
 		wmWindowManager *wm = CTX_wm_manager(C);
@@ -3709,10 +3874,12 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
 		}
 
 		/* since we follow drawflags, we can't send notifier but tag regions ourselves */
-		ED_update_for_newframe(bmain, scene, 1);
+		ED_update_for_newframe(bmain, depsgraph);
 
 		for (window = wm->windows.first; window; window = window->next) {
-			for (sa = window->screen->areabase.first; sa; sa = sa->next) {
+			const bScreen *win_screen = WM_window_get_active_screen(window);
+
+			for (sa = win_screen->areabase.first; sa; sa = sa->next) {
 				ARegion *ar;
 				for (ar = sa->regionbase.first; ar; ar = ar->next) {
 					bool redraw = false;
@@ -3728,7 +3895,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
 						/* do follow here if editor type supports it */
 						if ((sad->redraws & TIME_FOLLOW)) {
 							if ((ar->regiontype == RGN_TYPE_WINDOW &&
-							     ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
+							     ELEM(sa->spacetype, SPACE_SEQ, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
 							    (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
 							{
 								float w = BLI_rctf_size_x(&ar->v2d.cur);
@@ -3792,11 +3959,11 @@ static void SCREEN_OT_animation_step(wmOperatorType *ot)
 /* find window that owns the animation timer */
 bScreen *ED_screen_animation_playing(const wmWindowManager *wm)
 {
-	wmWindow *win;
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		bScreen *screen = WM_window_get_active_screen(win);
 
-	for (win = wm->windows.first; win; win = win->next) {
-		if (win->screen->animtimer || win->screen->scrubbing) {
-			return win->screen;
+		if (screen->animtimer || screen->scrubbing) {
+			return screen;
 		}
 	}
 
@@ -3805,11 +3972,11 @@ bScreen *ED_screen_animation_playing(const wmWindowManager *wm)
 
 bScreen *ED_screen_animation_no_scrub(const wmWindowManager *wm)
 {
-	wmWindow *win;
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		bScreen *screen = WM_window_get_active_screen(win);
 
-	for (win = wm->windows.first; win; win = win->next) {
-		if (win->screen->animtimer) {
-			return win->screen;
+		if (screen->animtimer) {
+			return screen;
 		}
 	}
 
@@ -3831,7 +3998,7 @@ int ED_screen_animation_play(bContext *C, int sync, int mode)
 		WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
 	}
 	else {
-		int refresh = SPACE_TIME; /* these settings are currently only available from a menu in the TimeLine */
+		int refresh = SPACE_ACTION; /* these settings are currently only available from a menu in the TimeLine */
 
 		if (mode == 1)  /* XXX only play audio forwards!? */
 			BKE_sound_play_scene(scene);
@@ -4033,7 +4200,7 @@ static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot)
 static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	int sizex = 800 * UI_DPI_FAC;
-	int sizey = 480 * UI_DPI_FAC;
+	int sizey = 500 * UI_DPI_FAC;
 
 	/* changes context! */
 	if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_USERPREFS) != NULL) {
@@ -4061,117 +4228,100 @@ static void SCREEN_OT_userpref_show(struct wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name New Screen Operator
+/** \name Show Drivers Editor Operator
  * \{ */
 
-static int screen_new_exec(bContext *C, wmOperator *UNUSED(op))
+static int drivers_editor_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	wmWindow *win = CTX_wm_window(C);
-	bScreen *sc = CTX_wm_screen(C);
+	PointerRNA ptr = {{NULL}};
+	PropertyRNA *prop = NULL;
+	int index = -1;
+	uiBut *but = NULL;
 
-	sc = ED_screen_duplicate(win, sc);
-	WM_event_add_notifier(C, NC_SCREEN | ND_SCREENBROWSE, sc);
+	int sizex = 900 * UI_DPI_FAC;
+	int sizey = 580 * UI_DPI_FAC;
 
-	return OPERATOR_FINISHED;
-}
+	/* Get active property to show driver for
+	 * - Need to grab it first, or else this info disappears
+	 *   after we've created the window
+	 */
+	but = UI_context_active_but_prop_get(C, &ptr, &prop, &index);
 
-static void SCREEN_OT_new(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "New Screen";
-	ot->description = "Add a new screen";
-	ot->idname = "SCREEN_OT_new";
+	/* changes context! */
+	if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_DRIVERS) != NULL) {
+		/* activate driver F-Curve for the property under the cursor */
+		if (but) {
+			FCurve *fcu;
+			bool driven, special;
+
+			fcu = rna_get_fcurve_context_ui(C,
+			                                &ptr, prop, index,
+			                                NULL, NULL, &driven, &special);
+			if (fcu) {
+				/* Isolate this F-Curve... */
+				bAnimContext ac;
+				if (ANIM_animdata_get_context(C, &ac)) {
+					int filter = ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS;
+					ANIM_deselect_anim_channels(&ac, ac.data, ac.datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+					ANIM_set_active_channel(&ac, ac.data, ac.datatype, filter, fcu, ANIMTYPE_FCURVE);
+				}
+				else {
+					/* Just blindly isolate... This isn't the best, and shouldn't happen, but may be enough... */
+					fcu->flag |= (FCURVE_ACTIVE | FCURVE_SELECTED);
+				}
+			}
+		}
 
-	/* api callbacks */
-	ot->exec = screen_new_exec;
-	ot->poll = WM_operator_winactive;
+		return OPERATOR_FINISHED;
+	}
+	else {
+		BKE_report(op->reports, RPT_ERROR, "Failed to open window!");
+		return OPERATOR_CANCELLED;
+	}
 }
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Delete Screen Operator
- * \{ */
 
-static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	bScreen *sc = CTX_wm_screen(C);
-
-	WM_event_add_notifier(C, NC_SCREEN | ND_SCREENDELETE, sc);
-
-	return OPERATOR_FINISHED;
-}
-
-static void SCREEN_OT_delete(wmOperatorType *ot)
+static void SCREEN_OT_drivers_editor_show(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Delete Screen";
-	ot->description = "Delete active screen";
-	ot->idname = "SCREEN_OT_delete";
+	ot->name = "Show Drivers Editor";
+	ot->description = "Show drivers editor in a separate window";
+	ot->idname = "SCREEN_OT_drivers_editor_show";
 
 	/* api callbacks */
-	ot->exec = screen_delete_exec;
+	ot->invoke = drivers_editor_show_invoke;
+	ot->poll = ED_operator_screenactive;
 }
 
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name New Scene Operator
+/** \name New Screen Operator
  * \{ */
 
-static int scene_new_exec(bContext *C, wmOperator *op)
+static int screen_new_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *newscene, *scene = CTX_data_scene(C);
-	Main *bmain = CTX_data_main(C);
-	int type = RNA_enum_get(op->ptr, "type");
-
-	if (type == SCE_COPY_NEW) {
-		newscene = BKE_scene_add(bmain, DATA_("Scene"));
-	}
-	else { /* different kinds of copying */
-		newscene = BKE_scene_copy(bmain, scene, type);
-
-		/* these can't be handled in blenkernel currently, so do them here */
-		if (type == SCE_COPY_LINK_DATA) {
-			ED_object_single_users(bmain, newscene, false, true);
-		}
-		else if (type == SCE_COPY_FULL) {
-			ED_editors_flush_edits(C, false);
-			ED_object_single_users(bmain, newscene, true, true);
-		}
-	}
-
-	ED_screen_set_scene(C, CTX_wm_screen(C), newscene);
+	wmWindow *win = CTX_wm_window(C);
+	WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
+	WorkSpaceLayout *layout_old = BKE_workspace_active_layout_get(win->workspace_hook);
+	WorkSpaceLayout *layout_new;
 
-	WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, newscene);
+	layout_new = ED_workspace_layout_duplicate(workspace, layout_old, win);
+	WM_event_add_notifier(C, NC_SCREEN | ND_LAYOUTBROWSE, layout_new);
 
 	return OPERATOR_FINISHED;
 }
 
-static void SCENE_OT_new(wmOperatorType *ot)
+static void SCREEN_OT_new(wmOperatorType *ot)
 {
-	static const EnumPropertyItem type_items[] = {
-		{SCE_COPY_NEW, "NEW", 0, "New", "Add new scene"},
-		{SCE_COPY_EMPTY, "EMPTY", 0, "Copy Settings", "Make a copy without any objects"},
-		{SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, "Link Objects", "Link to the objects from the current scene"},
-		{SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, "Link Object Data", "Copy objects linked to data from the current scene"},
-		{SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy", "Make a full copy of the current scene"},
-		{0, NULL, 0, NULL, NULL}};
-
 	/* identifiers */
-	ot->name = "New Scene";
-	ot->description = "Add new scene by type";
-	ot->idname = "SCENE_OT_new";
+	ot->name = "New Screen";
+	ot->description = "Add a new screen";
+	ot->idname = "SCREEN_OT_new";
 
 	/* api callbacks */
-	ot->exec = scene_new_exec;
-	ot->invoke = WM_menu_invoke;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
+	ot->exec = screen_new_exec;
+	ot->poll = WM_operator_winactive;
 }
 
 /** \} */
@@ -4180,34 +4330,26 @@ static void SCENE_OT_new(wmOperatorType *ot)
 /** \name Delete Screen Operator
  * \{ */
 
-static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op))
+static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Scene *scene = CTX_data_scene(C);
-
-	if (ED_screen_delete_scene(C, scene) == false) {
-		return OPERATOR_CANCELLED;
-	}
-
-	if (G.debug & G_DEBUG)
-		printf("scene delete %p\n", scene);
+	bScreen *sc = CTX_wm_screen(C);
+	WorkSpace *workspace = CTX_wm_workspace(C);
+	WorkSpaceLayout *layout = BKE_workspace_layout_find(workspace, sc);
 
-	WM_event_add_notifier(C, NC_SCENE | NA_REMOVED, scene);
+	WM_event_add_notifier(C, NC_SCREEN | ND_LAYOUTDELETE, layout);
 
 	return OPERATOR_FINISHED;
 }
 
-static void SCENE_OT_delete(wmOperatorType *ot)
+static void SCREEN_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Delete Scene";
-	ot->description = "Delete active scene";
-	ot->idname = "SCENE_OT_delete";
+	ot->name = "Delete Screen";
+	ot->description = "Delete active screen";
+	ot->idname = "SCREEN_OT_delete";
 
 	/* api callbacks */
-	ot->exec = scene_delete_exec;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	ot->exec = screen_delete_exec;
 }
 
 /** \} */
@@ -4229,7 +4371,7 @@ typedef struct RegionAlphaInfo {
 #define TIMEOUT		0.2f
 #define TIMESTEP	0.04f
 
-float ED_region_blend_factor(ARegion *ar)
+float ED_region_blend_alpha(ARegion *ar)
 {
 	/* check parent too */
 	if (ar->regiontimer == NULL && (ar->alignment & RGN_SPLIT_PREV) && ar->prev) {
@@ -4415,11 +4557,10 @@ static int space_context_cycle_invoke(bContext *C, wmOperator *op, const wmEvent
 	PointerRNA ptr;
 	PropertyRNA *prop;
 	context_cycle_prop_get(CTX_wm_screen(C), CTX_wm_area(C), &ptr, &prop);
-
 	const int old_context = RNA_property_enum_get(&ptr, prop);
 	const int new_context = RNA_property_enum_step(
-	                  C, &ptr, prop, old_context,
-	                  direction == SPACE_CONTEXT_CYCLE_PREV ? -1 : 1);
+	        C, &ptr, prop, old_context,
+	        direction == SPACE_CONTEXT_CYCLE_PREV ? -1 : 1);
 	RNA_property_enum_set(&ptr, prop, new_context);
 	RNA_property_update(C, &ptr, prop);
 
@@ -4446,6 +4587,51 @@ static void SCREEN_OT_space_context_cycle(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
+/** \name Workspace Cycle Operator
+ * \{ */
+
+static int space_workspace_cycle_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+{
+	wmWindow *win = CTX_wm_window(C);
+	if (WM_window_is_temp_screen(win)) {
+		return OPERATOR_CANCELLED;
+	}
+
+	Main *bmain = CTX_data_main(C);
+	const int direction = RNA_enum_get(op->ptr, "direction");
+	WorkSpace *workspace_src = WM_window_get_active_workspace(win);
+	WorkSpace *workspace_dst = (direction == SPACE_CONTEXT_CYCLE_PREV) ? workspace_src->id.prev : workspace_src->id.next;
+	if (workspace_dst == NULL) {
+		workspace_dst = (direction == SPACE_CONTEXT_CYCLE_PREV) ? bmain->workspaces.last : bmain->workspaces.first;
+	}
+	if (workspace_src != workspace_dst) {
+		win->workspace_hook->temp_workspace_store = workspace_dst;
+		WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace_dst);
+		win->workspace_hook->temp_workspace_store = NULL;
+	}
+	return OPERATOR_FINISHED;
+}
+
+static void SCREEN_OT_workspace_cycle(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Cycle Workspace";
+	ot->description = "Cycle through workspaces";
+	ot->idname = "SCREEN_OT_workspace_cycle";
+
+	/* api callbacks */
+	ot->invoke = space_workspace_cycle_invoke;
+	ot->poll = ED_operator_screenactive;;
+
+	ot->flag = 0;
+
+	RNA_def_enum(ot->srna, "direction", space_context_cycle_direction, SPACE_CONTEXT_CYCLE_NEXT, "Direction",
+	             "Direction to cycle through");
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
 /** \name Assigning Operator Types
  * \{ */
 
@@ -4478,8 +4664,10 @@ void ED_operatortypes_screen(void)
 	WM_operatortype_append(SCREEN_OT_screenshot);
 	WM_operatortype_append(SCREEN_OT_screencast);
 	WM_operatortype_append(SCREEN_OT_userpref_show);
+	WM_operatortype_append(SCREEN_OT_drivers_editor_show);
 	WM_operatortype_append(SCREEN_OT_region_blend);
 	WM_operatortype_append(SCREEN_OT_space_context_cycle);
+	WM_operatortype_append(SCREEN_OT_workspace_cycle);
 
 	/*frame changes*/
 	WM_operatortype_append(SCREEN_OT_frame_offset);
@@ -4494,8 +4682,6 @@ void ED_operatortypes_screen(void)
 	/* new/delete */
 	WM_operatortype_append(SCREEN_OT_new);
 	WM_operatortype_append(SCREEN_OT_delete);
-	WM_operatortype_append(SCENE_OT_new);
-	WM_operatortype_append(SCENE_OT_delete);
 
 	/* tools shared by more space types */
 	WM_operatortype_append(ED_OT_undo);
@@ -4601,10 +4787,8 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
 
 	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1);
 	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1);
-	WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", UPARROWKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", DOWNARROWKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", SPACEKEY, KM_PRESS, KM_SHIFT, 0);
-	kmi = WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", F10KEY, KM_PRESS, KM_ALT, 0);
+	kmi = WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", SPACEKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
 	RNA_boolean_set(kmi->ptr, "use_hide_panels", true);
 
 	WM_keymap_add_item(keymap, "SCREEN_OT_screenshot", F3KEY, KM_PRESS, KM_CTRL, 0);
@@ -4615,6 +4799,11 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "SCREEN_OT_space_context_cycle", TABKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
 	RNA_enum_set(kmi->ptr, "direction", SPACE_CONTEXT_CYCLE_PREV);
 
+	kmi = WM_keymap_add_item(keymap, "SCREEN_OT_workspace_cycle", TABKEY, KM_PRESS, KM_CTRL, 0);
+	RNA_enum_set(kmi->ptr, "direction", SPACE_CONTEXT_CYCLE_NEXT);
+	kmi = WM_keymap_add_item(keymap, "SCREEN_OT_workspace_cycle", TABKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
+	RNA_enum_set(kmi->ptr, "direction", SPACE_CONTEXT_CYCLE_PREV);
+
 	/* tests */
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_quadview", QKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 8274ca68d7e..63b9fe4043c 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -54,7 +54,9 @@
 #include "BKE_writeavi.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -273,7 +275,7 @@ static void screenshot_draw(bContext *UNUSED(C), wmOperator *op)
 
 	/* main draw call */
 	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
-	uiDefAutoButsRNA(layout, &ptr, screenshot_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, screenshot_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 
 static int screenshot_poll(bContext *C)
@@ -451,25 +453,24 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
 /* Helper callback for drawing the cursor itself */
 static void screencast_draw_cursor(bContext *UNUSED(C), int x, int y, void *UNUSED(p_ptr))
 {
+	glEnable(GL_LINE_SMOOTH);
+	glEnable(GL_BLEND);
 
-	glPushMatrix();
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	glTranslatef((float)x, (float)y, 0.0f);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
+	immUniformColor4ub(0, 0, 0, 32);
+	imm_draw_circle_fill_2d(pos, (float)x, (float)y, 20, 40);
 
-	glEnable(GL_LINE_SMOOTH);
-	glEnable(GL_BLEND);
-
-	glColor4ub(0, 0, 0, 32);
-	glutil_draw_filled_arc(0.0, M_PI * 2.0, 20, 40);
+	immUniformColor4ub(255, 255, 255, 128);
+	imm_draw_circle_wire_2d(pos, (float)x, (float)y, 20, 40);
 
-	glColor4ub(255, 255, 255, 128);
-	glutil_draw_lined_arc(0.0, M_PI * 2.0, 20, 40);
+	immUnbindProgram();
 
 	glDisable(GL_BLEND);
 	glDisable(GL_LINE_SMOOTH);
-
-	glPopMatrix();
 }
 
 /* Turn brush cursor in 3D view on/off */
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
new file mode 100644
index 00000000000..d54996bad59
--- /dev/null
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -0,0 +1,508 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/screen/workspace_edit.c
+ *  \ingroup edscr
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "BLI_utildefines.h"
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+
+#include "BKE_appdir.h"
+#include "BKE_blendfile.h"
+#include "BKE_context.h"
+#include "BKE_idcode.h"
+#include "BKE_main.h"
+#include "BKE_layer.h"
+#include "BKE_library.h"
+#include "BKE_report.h"
+#include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_workspace.h"
+
+#include "BLO_readfile.h"
+
+#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_windowmanager_types.h"
+#include "DNA_workspace_types.h"
+
+#include "ED_object.h"
+#include "ED_screen.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "DEG_depsgraph.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_toolsystem.h"
+
+#include "screen_intern.h"
+
+
+/** \name Workspace API
+ *
+ * \brief API for managing workspaces and their data.
+ * \{ */
+
+WorkSpace *ED_workspace_add(
+        Main *bmain, const char *name, Scene *scene,
+        ViewLayer *act_view_layer)
+{
+	WorkSpace *workspace = BKE_workspace_add(bmain, name);
+
+	BKE_workspace_view_layer_set(workspace, act_view_layer, scene);
+
+	return workspace;
+}
+
+/**
+ * Changes the object mode (if needed) to the one set in \a workspace_new.
+ * Object mode is still stored on object level. In future it should all be workspace level instead.
+ */
+static void workspace_change_update_mode(
+        const WorkSpace *workspace_old, const WorkSpace *workspace_new,
+        bContext *C, Object *ob_act, ReportList *reports)
+{
+	UNUSED_VARS(workspace_old, workspace_new, C, ob_act, reports);
+#if 0
+	eObjectMode mode_old = workspace_old->object_mode;
+	eObjectMode mode_new = workspace_new->object_mode;
+
+	if (mode_old != mode_new) {
+		ED_object_mode_compat_set(C, ob_act, mode_new, reports);
+		ED_object_mode_toggle(C, mode_new);
+	}
+#endif
+}
+
+static void workspace_change_update_view_layer(
+        WorkSpace *workspace_new, const WorkSpace *workspace_old,
+        Scene *scene)
+{
+	if (!BKE_workspace_view_layer_exists(workspace_new, scene)) {
+		BKE_workspace_view_layer_set(workspace_new, BKE_workspace_view_layer_get(workspace_old, scene), scene);
+	}
+}
+
+static void workspace_change_update(
+        WorkSpace *workspace_new, const WorkSpace *workspace_old,
+        bContext *C, wmWindowManager *wm)
+{
+	/* needs to be done before changing mode! (to ensure right context) */
+	workspace_change_update_view_layer(workspace_new, workspace_old, CTX_data_scene(C));
+	workspace_change_update_mode(workspace_old, workspace_new, C, CTX_data_active_object(C), &wm->reports);
+}
+
+static bool workspace_change_find_new_layout_cb(const WorkSpaceLayout *layout, void *UNUSED(arg))
+{
+	/* return false to stop the iterator if we've found a layout that can be activated */
+	return workspace_layout_set_poll(layout) ? false : true;
+}
+
+static WorkSpaceLayout *workspace_change_get_new_layout(
+        WorkSpace *workspace_new, wmWindow *win)
+{
+	/* ED_workspace_duplicate may have stored a layout to activate once the workspace gets activated. */
+	WorkSpaceLayout *layout_new;
+	bScreen *screen_new;
+
+	if (win->workspace_hook->temp_workspace_store) {
+		layout_new = win->workspace_hook->temp_layout_store;
+	}
+	else {
+		layout_new = BKE_workspace_hook_layout_for_workspace_get(win->workspace_hook, workspace_new);
+		if (!layout_new) {
+			layout_new = BKE_workspace_layouts_get(workspace_new)->first;
+		}
+	}
+	screen_new = BKE_workspace_layout_screen_get(layout_new);
+
+	if (screen_new->winid) {
+		/* screen is already used, try to find a free one */
+		WorkSpaceLayout *layout_temp = BKE_workspace_layout_iter_circular(
+		                                   workspace_new, layout_new, workspace_change_find_new_layout_cb,
+		                                   NULL, false);
+		if (!layout_temp) {
+			/* fallback solution: duplicate layout */
+			layout_temp = ED_workspace_layout_duplicate(workspace_new, layout_new, win);
+		}
+		layout_new = layout_temp;
+	}
+
+	return layout_new;
+}
+
+/**
+ * \brief Change the active workspace.
+ *
+ * Operator call, WM + Window + screen already existed before
+ * Pretty similar to #ED_screen_change since changing workspace also changes screen.
+ *
+ * \warning Do NOT call in area/region queues!
+ * \returns if workspace changing was successful.
+ */
+bool ED_workspace_change(
+        WorkSpace *workspace_new, bContext *C, wmWindowManager *wm, wmWindow *win)
+{
+	Main *bmain = CTX_data_main(C);
+	WorkSpace *workspace_old = WM_window_get_active_workspace(win);
+	WorkSpaceLayout *layout_new = workspace_change_get_new_layout(workspace_new, win);
+	bScreen *screen_new = BKE_workspace_layout_screen_get(layout_new);
+	bScreen *screen_old = BKE_workspace_active_screen_get(win->workspace_hook);
+
+	win->workspace_hook->temp_layout_store = NULL;
+	if (workspace_old == workspace_new) {
+		/* Could also return true, everything that needs to be done was done (nothing :P), but nothing changed */
+		return false;
+	}
+
+	screen_new = screen_change_prepare(screen_old, screen_new, bmain, C, win);
+	BLI_assert(BKE_workspace_layout_screen_get(layout_new) == screen_new);
+
+	if (screen_new) {
+		WM_window_set_active_layout(win, workspace_new, layout_new);
+		WM_window_set_active_workspace(win, workspace_new);
+
+		/* update screen *after* changing workspace - which also causes the
+		 * actual screen change and updates context (including CTX_wm_workspace) */
+		screen_change_update(C, win, screen_new);
+		workspace_change_update(workspace_new, workspace_old, C, wm);
+
+		BLI_assert(BKE_workspace_view_layer_exists(workspace_new, CTX_data_scene(C)) != NULL);
+		BLI_assert(CTX_wm_workspace(C) == workspace_new);
+
+		WM_toolsystem_unlink_all(C, workspace_old);
+		WM_toolsystem_reinit_all(C, win);
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Duplicate a workspace including its layouts. Does not activate the workspace, but
+ * it stores the screen-layout to be activated (BKE_workspace_temp_layout_store)
+ */
+WorkSpace *ED_workspace_duplicate(
+        WorkSpace *workspace_old, Main *bmain, wmWindow *win)
+{
+	WorkSpaceLayout *layout_active_old = BKE_workspace_active_layout_get(win->workspace_hook);
+	ListBase *layouts_old = BKE_workspace_layouts_get(workspace_old);
+	Scene *scene = WM_window_get_active_scene(win);
+	WorkSpace *workspace_new = ED_workspace_add(
+	        bmain, workspace_old->id.name + 2, scene,
+	        BKE_workspace_view_layer_get(workspace_old, scene));
+
+	/* TODO(campbell): tools */
+
+	for (WorkSpaceLayout *layout_old = layouts_old->first; layout_old; layout_old = layout_old->next) {
+		WorkSpaceLayout *layout_new = ED_workspace_layout_duplicate(workspace_new, layout_old, win);
+
+		if (layout_active_old == layout_old) {
+			win->workspace_hook->temp_layout_store = layout_new;
+		}
+	}
+	return workspace_new;
+}
+
+/**
+ * \return if succeeded.
+ */
+bool ED_workspace_delete(
+        WorkSpace *workspace, Main *bmain, bContext *C, wmWindowManager *wm)
+{
+	ID *workspace_id = (ID *)workspace;
+
+	if (BLI_listbase_is_single(&bmain->workspaces)) {
+		return false;
+	}
+
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		WorkSpace *prev = workspace_id->prev;
+		WorkSpace *next = workspace_id->next;
+
+		ED_workspace_change((prev != NULL) ? prev : next, C, wm, win);
+	}
+	BKE_libblock_free(bmain, workspace_id);
+
+	return true;
+}
+
+/**
+ * Some editor data may need to be synced with scene data (3D View camera and layers).
+ * This function ensures data is synced for editors in active layout of \a workspace.
+ */
+void ED_workspace_scene_data_sync(
+        WorkSpaceInstanceHook *hook, Scene *scene)
+{
+	bScreen *screen = BKE_workspace_active_screen_get(hook);
+	BKE_screen_view3d_scene_sync(screen, scene);
+}
+
+void ED_workspace_view_layer_unset(
+        const Main *bmain, Scene *scene,
+        const ViewLayer *layer_unset, ViewLayer *layer_new)
+{
+	for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
+		if (BKE_workspace_view_layer_get(workspace, scene) == layer_unset) {
+			BKE_workspace_view_layer_set(workspace, layer_new, scene);
+		}
+	}
+}
+
+/** \} Workspace API */
+
+
+/** \name Workspace Operators
+ *
+ * \{ */
+
+static int workspace_new_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Main *bmain = CTX_data_main(C);
+	wmWindow *win = CTX_wm_window(C);
+	WorkSpace *workspace = ED_workspace_duplicate(WM_window_get_active_workspace(win), bmain, win);
+
+	WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace);
+
+	return OPERATOR_FINISHED;
+}
+
+static void WORKSPACE_OT_workspace_duplicate(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "New Workspace";
+	ot->description = "Add a new workspace";
+	ot->idname = "WORKSPACE_OT_workspace_duplicate";
+
+	/* api callbacks */
+	ot->exec = workspace_new_exec;
+	ot->poll = WM_operator_winactive;
+}
+
+static int workspace_delete_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	wmWindow *win = CTX_wm_window(C);
+
+	WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_DELETE, WM_window_get_active_workspace(win));
+
+	return OPERATOR_FINISHED;
+}
+
+static void WORKSPACE_OT_workspace_delete(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Delete Workspace";
+	ot->description = "Delete the active workspace";
+	ot->idname = "WORKSPACE_OT_workspace_delete";
+
+	/* api callbacks */
+	ot->exec = workspace_delete_exec;
+}
+
+static int workspace_append_activate_poll(bContext *C)
+{
+	wmOperatorType *ot = WM_operatortype_find("WM_OT_append", false);
+	return WM_operator_poll(C, ot);
+}
+
+static int workspace_append(bContext *C, const char *directory, const char *idname)
+{
+	wmOperatorType *ot = WM_operatortype_find("WM_OT_append", false);
+	PointerRNA opptr;
+	int retval;
+
+	WM_operator_properties_create_ptr(&opptr, ot);
+	RNA_string_set(&opptr, "directory", directory);
+	RNA_string_set(&opptr, "filename", idname);
+	RNA_boolean_set(&opptr, "autoselect", false);
+
+	retval = WM_operator_name_call_ptr(C, ot, WM_OP_EXEC_DEFAULT, &opptr);
+
+	WM_operator_properties_free(&opptr);
+
+	return retval;
+}
+
+static int workspace_append_activate_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	char idname[MAX_ID_NAME - 2], directory[FILE_MAX];
+
+	if (!RNA_struct_property_is_set(op->ptr, "idname") ||
+	    !RNA_struct_property_is_set(op->ptr, "directory"))
+	{
+		return OPERATOR_CANCELLED;
+	}
+	RNA_string_get(op->ptr, "idname", idname);
+	RNA_string_get(op->ptr, "directory", directory);
+
+	if (workspace_append(C, directory, idname) != OPERATOR_CANCELLED) {
+		WorkSpace *appended_workspace = BLI_findstring(&bmain->workspaces, idname, offsetof(ID, name) + 2);
+
+		BLI_assert(appended_workspace != NULL);
+		/* Changing workspace changes context. Do delayed! */
+		WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, appended_workspace);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+static void WORKSPACE_OT_append_activate(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Append and Activate Workspace";
+	ot->description = "Append a workspace and make it the active one in the current window";
+	ot->idname = "WORKSPACE_OT_append_activate";
+
+	/* api callbacks */
+	ot->exec = workspace_append_activate_exec;
+	ot->poll = workspace_append_activate_poll;
+
+	RNA_def_string(ot->srna, "idname", NULL, MAX_ID_NAME - 2, "Identifier",
+	               "Name of the workspace to append and activate");
+	RNA_def_string(ot->srna, "directory", NULL, FILE_MAX, "Directory",
+	               "Path to the library");
+}
+
+static void workspace_config_file_path_from_folder_id(
+        const Main *bmain, int folder_id, char *r_path)
+{
+	const char *app_template = U.app_template[0] ? U.app_template : NULL;
+	const char * const cfgdir = BKE_appdir_folder_id(folder_id, app_template);
+
+	if (cfgdir) {
+		BLI_make_file_string(bmain->name, r_path, cfgdir, BLENDER_WORKSPACES_FILE);
+	}
+	else {
+		r_path[0] = '\0';
+	}
+}
+
+ATTR_NONNULL(1)
+static WorkspaceConfigFileData *workspace_config_file_read(
+        const Main *bmain, ReportList *reports)
+{
+	char workspace_config_path[FILE_MAX];
+	bool has_path = false;
+
+	workspace_config_file_path_from_folder_id(bmain, BLENDER_USER_CONFIG, workspace_config_path);
+	if (BLI_exists(workspace_config_path)) {
+		has_path = true;
+	}
+	else {
+		workspace_config_file_path_from_folder_id(bmain, BLENDER_DATAFILES, workspace_config_path);
+		if (BLI_exists(workspace_config_path)) {
+			has_path = true;
+		}
+	}
+
+	return has_path ? BKE_blendfile_workspace_config_read(workspace_config_path, reports) : NULL;
+}
+
+static void workspace_append_button(
+        uiLayout *layout, wmOperatorType *ot_append, const WorkSpace *workspace, const Main *from_main)
+{
+	const ID *id = (ID *)workspace;
+	PointerRNA opptr;
+	char lib_path[FILE_MAX_LIBEXTRA];
+
+	BLI_path_join(
+	        lib_path, sizeof(lib_path), from_main->name, BKE_idcode_to_name(GS(id->name)), NULL);
+
+	BLI_assert(STREQ(ot_append->idname, "WORKSPACE_OT_append_activate"));
+	uiItemFullO_ptr(
+	        layout, ot_append, workspace->id.name + 2, ICON_NONE, NULL,
+	        WM_OP_EXEC_DEFAULT, 0, &opptr);
+	RNA_string_set(&opptr, "idname", id->name + 2);
+	RNA_string_set(&opptr, "directory", lib_path);
+}
+
+ATTR_NONNULL(1, 2)
+static void workspace_config_file_append_buttons(
+        uiLayout *layout, const Main *bmain, ReportList *reports)
+{
+	WorkspaceConfigFileData *workspace_config = workspace_config_file_read(bmain, reports);
+
+	if (workspace_config) {
+		wmOperatorType *ot_append = WM_operatortype_find("WORKSPACE_OT_append_activate", true);
+
+		for (WorkSpace *workspace = workspace_config->workspaces.first; workspace; workspace = workspace->id.next) {
+			workspace_append_button(layout, ot_append, workspace, workspace_config->main);
+		}
+
+		BKE_blendfile_workspace_config_data_free(workspace_config);
+	}
+}
+
+static int workspace_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+{
+	const Main *bmain = CTX_data_main(C);
+
+	uiPopupMenu *pup = UI_popup_menu_begin(C, op->type->name, ICON_NONE);
+	uiLayout *layout = UI_popup_menu_layout(pup);
+
+	uiItemO(layout, "Duplicate Current", ICON_NONE, "WORKSPACE_OT_workspace_duplicate");
+	uiItemS(layout);
+	workspace_config_file_append_buttons(layout, bmain, op->reports);
+
+	UI_popup_menu_end(C, pup);
+
+	return OPERATOR_INTERFACE;
+}
+
+static void WORKSPACE_OT_workspace_add_menu(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Workspace";
+	ot->description = "Add a new workspace by duplicating the current one or appending one "
+	                  "from the user configuration";
+	ot->idname = "WORKSPACE_OT_workspace_add_menu";
+
+	/* api callbacks */
+	ot->invoke = workspace_add_invoke;
+}
+
+void ED_operatortypes_workspace(void)
+{
+	WM_operatortype_append(WORKSPACE_OT_workspace_duplicate);
+	WM_operatortype_append(WORKSPACE_OT_workspace_delete);
+	WM_operatortype_append(WORKSPACE_OT_workspace_add_menu);
+	WM_operatortype_append(WORKSPACE_OT_append_activate);
+}
+
+/** \} Workspace Operators */
diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c
new file mode 100644
index 00000000000..6285f031836
--- /dev/null
+++ b/source/blender/editors/screen/workspace_layout_edit.c
@@ -0,0 +1,197 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/screen/workspace_layout_edit.c
+ *  \ingroup edscr
+ */
+
+#include <stdlib.h>
+
+#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+
+#include "DNA_screen_types.h"
+#include "DNA_workspace_types.h"
+
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_screen.h"
+#include "BKE_workspace.h"
+
+#include "WM_api.h"
+
+#include "ED_screen.h"
+
+#include "screen_intern.h"
+
+/**
+ * Empty screen, with 1 dummy area without spacedata. Uses window size.
+ */
+WorkSpaceLayout *ED_workspace_layout_add(
+        WorkSpace *workspace,
+        wmWindow *win,
+        const char *name)
+{
+	bScreen *screen;
+	rcti screen_rect;
+
+	WM_window_screen_rect_calc(win, &screen_rect);
+	screen = screen_add(name, &screen_rect);
+
+	return BKE_workspace_layout_add(workspace, screen, name);
+}
+
+WorkSpaceLayout *ED_workspace_layout_duplicate(
+        WorkSpace *workspace, const WorkSpaceLayout *layout_old,
+        wmWindow *win)
+{
+	bScreen *screen_old = BKE_workspace_layout_screen_get(layout_old);
+	const char *name = BKE_workspace_layout_name_get(layout_old);
+	bScreen *screen_new;
+	WorkSpaceLayout *layout_new;
+
+	if (BKE_screen_is_fullscreen_area(screen_old)) {
+		return NULL; /* XXX handle this case! */
+	}
+
+	layout_new = ED_workspace_layout_add(workspace, win, name);
+	screen_new = BKE_workspace_layout_screen_get(layout_new);
+	screen_data_copy(screen_new, screen_old);
+
+	return layout_new;
+}
+
+static bool workspace_layout_delete_doit(
+        WorkSpace *workspace, WorkSpaceLayout *layout_old, WorkSpaceLayout *layout_new,
+        bContext *C)
+{
+	Main *bmain = CTX_data_main(C);
+	wmWindow *win = CTX_wm_window(C);
+	bScreen *screen_new = BKE_workspace_layout_screen_get(layout_new);
+
+	ED_screen_change(C, screen_new);
+
+	if (BKE_workspace_active_layout_get(win->workspace_hook) != layout_old) {
+		BKE_workspace_layout_remove(bmain, workspace, layout_old);
+		return true;
+	}
+
+	return false;
+}
+
+bool workspace_layout_set_poll(const WorkSpaceLayout *layout)
+{
+	const bScreen *screen = BKE_workspace_layout_screen_get(layout);
+
+	return ((BKE_screen_is_used(screen) == false) &&
+	        /* in typical usage temp screens should have a nonzero winid
+	         * (all temp screens should be used, or closed & freed). */
+	        (screen->temp == false) &&
+	        (BKE_screen_is_fullscreen_area(screen) == false) &&
+	        (screen->id.name[2] != '.' || !(U.uiflag & USER_HIDE_DOT)));
+}
+
+static WorkSpaceLayout *workspace_layout_delete_find_new(const WorkSpaceLayout *layout_old)
+{
+	for (WorkSpaceLayout *layout_new = layout_old->prev; layout_new; layout_new = layout_new->next) {
+		if (workspace_layout_set_poll(layout_new)) {
+			return layout_new;
+		}
+	}
+
+	for (WorkSpaceLayout *layout_new = layout_old->next; layout_new; layout_new = layout_new->next) {
+		if (workspace_layout_set_poll(layout_new)) {
+			return layout_new;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * \warning Only call outside of area/region loops!
+ * \return true if succeeded.
+ */
+bool ED_workspace_layout_delete(
+        WorkSpace *workspace, WorkSpaceLayout *layout_old,
+        bContext *C)
+{
+	const bScreen *screen_old = BKE_workspace_layout_screen_get(layout_old);
+	WorkSpaceLayout *layout_new;
+
+	BLI_assert(BLI_findindex(BKE_workspace_layouts_get(workspace), layout_old) != -1);
+
+	/* don't allow deleting temp fullscreens for now */
+	if (BKE_screen_is_fullscreen_area(screen_old)) {
+		return false;
+	}
+
+	/* A layout/screen can only be in use by one window at a time, so as
+	 * long as we are able to find a layout/screen that is unused, we
+	 * can safely assume ours is not in use anywhere an delete it. */
+
+	layout_new = workspace_layout_delete_find_new(layout_old);
+
+	if (layout_new) {
+		return workspace_layout_delete_doit(workspace, layout_old, layout_new, C);
+	}
+
+	return false;
+}
+
+static bool workspace_layout_cycle_iter_cb(const WorkSpaceLayout *layout, void *UNUSED(arg))
+{
+	/* return false to stop iterator when we have found a layout to activate */
+	return !workspace_layout_set_poll(layout);
+}
+
+bool ED_workspace_layout_cycle(
+        WorkSpace *workspace, const short direction, bContext *C)
+{
+	wmWindow *win = CTX_wm_window(C);
+	WorkSpaceLayout *old_layout = BKE_workspace_active_layout_get(win->workspace_hook);
+	WorkSpaceLayout *new_layout;
+	const bScreen *old_screen = BKE_workspace_layout_screen_get(old_layout);
+	ScrArea *sa = CTX_wm_area(C);
+
+	if (old_screen->temp || (sa && sa->full && sa->full->temp)) {
+		return false;
+	}
+
+	BLI_assert(ELEM(direction, 1, -1));
+	new_layout = BKE_workspace_layout_iter_circular(workspace, old_layout, workspace_layout_cycle_iter_cb,
+	                                                NULL, (direction == -1) ? true : false);
+
+	if (new_layout && (old_layout != new_layout)) {
+		bScreen *new_screen = BKE_workspace_layout_screen_get(new_layout);
+
+		if (sa && sa->full) {
+			/* return to previous state before switching screens */
+			ED_screen_full_restore(C, sa); /* may free screen of old_layout */
+		}
+
+		ED_screen_change(C, new_screen);
+
+		return true;
+	}
+
+	return false;
+}
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 9527dc4fe83..80c58e5b91d 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -25,6 +25,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../gpu
 	../../imbuf
 	../../makesdna
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 3c3b9e91ab9..848d12bcfaa 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -54,14 +54,14 @@
 
 #include "WM_api.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
 #include "IMB_imbuf_types.h"
 
 #include "ED_view3d.h"
 
-#include "GPU_basic_shader.h"
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "UI_resources.h"
 
@@ -338,11 +338,12 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima
 		size = target->old_size;
 	}
 
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, target->overlay_texture);
 
 	if (refresh) {
-		GLenum format = col ? GL_RGBA : GL_ALPHA;
-		GLenum internalformat = col ? GL_RGBA8 : GL_ALPHA8;
+		GLenum format = col ? GL_RGBA : GL_RED;
+		GLenum internalformat = col ? GL_RGBA8 : GL_R8;
 
 		if (!init || (target->old_col != col)) {
 			glTexImage2D(GL_TEXTURE_2D, 0, internalformat, size, size, 0, format, GL_UNSIGNED_BYTE, buffer);
@@ -357,8 +358,6 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima
 		target->old_col = col;
 	}
 
-	GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
-
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
@@ -466,22 +465,21 @@ static int load_tex_cursor(Brush *br, ViewContext *vc, float zoom)
 		size = cursor_snap.size;
 	}
 
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, cursor_snap.overlay_texture);
 
 	if (refresh) {
 		if (!init) {
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA8, size, size, 0, GL_ALPHA, GL_UNSIGNED_BYTE, buffer);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, size, size, 0, GL_RED, GL_UNSIGNED_BYTE, buffer);
 		}
 		else {
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, size, size, GL_ALPHA, GL_UNSIGNED_BYTE, buffer);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, size, size, GL_RED, GL_UNSIGNED_BYTE, buffer);
 		}
 
 		if (buffer)
 			MEM_freeN(buffer);
 	}
 
-	GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
-
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
@@ -615,26 +613,27 @@ static void paint_draw_tex_overlay(UnifiedPaintSettings *ups, Brush *brush,
 		glDepthMask(GL_FALSE);
 		glDepthFunc(GL_ALWAYS);
 
-		glMatrixMode(GL_TEXTURE);
-		glPushMatrix();
-		glLoadIdentity();
-
 		if (mtex->brush_map_mode == MTEX_MAP_MODE_VIEW) {
+			gpuPushMatrix();
+
 			/* brush rotation */
-			glTranslatef(0.5, 0.5, 0);
-			glRotatef((double)RAD2DEGF((primary) ? ups->brush_rotation : ups->brush_rotation_sec),
-			          0.0, 0.0, 1.0);
-			glTranslatef(-0.5f, -0.5f, 0);
+			gpuTranslate2f(x, y);
+			gpuRotate2D(-RAD2DEGF(primary ? ups->brush_rotation : ups->brush_rotation_sec));
+			gpuTranslate2f(-x, -y);
 
 			/* scale based on tablet pressure */
 			if (primary && ups->stroke_active && BKE_brush_use_size_pressure(vc->scene, brush)) {
-				glTranslatef(0.5f, 0.5f, 0);
-				glScalef(1.0f / ups->size_pressure_value, 1.0f / ups->size_pressure_value, 1);
-				glTranslatef(-0.5f, -0.5f, 0);
+				const float scale = ups->size_pressure_value;
+				gpuTranslate2f(x, y);
+				gpuScale2f(scale, scale);
+				gpuTranslate2f(-x, -y);
 			}
 
 			if (ups->draw_anchored) {
-				const float *aim = ups->anchored_initial_mouse;
+				float aim[2] = {
+				    ups->anchored_initial_mouse[0] + vc->ar->winrct.xmin,
+				    ups->anchored_initial_mouse[1] + vc->ar->winrct.ymin,
+				};
 				quad.xmin = aim[0] - ups->anchored_size;
 				quad.ymin = aim[1] - ups->anchored_size;
 				quad.xmax = aim[0] + ups->anchored_size;
@@ -668,41 +667,46 @@ static void paint_draw_tex_overlay(UnifiedPaintSettings *ups, Brush *brush,
 				quad.xmax = brush->mask_stencil_dimension[0];
 				quad.ymax = brush->mask_stencil_dimension[1];
 			}
-			glMatrixMode(GL_MODELVIEW);
-			glPushMatrix();
+			gpuPushMatrix();
 			if (primary)
-				glTranslate2fv(brush->stencil_pos);
+				gpuTranslate2fv(brush->stencil_pos);
 			else
-				glTranslate2fv(brush->mask_stencil_pos);
-			glRotatef(RAD2DEGF(mtex->rot), 0, 0, 1);
-			glMatrixMode(GL_TEXTURE);
+				gpuTranslate2fv(brush->mask_stencil_pos);
+			gpuRotate2D(RAD2DEGF(mtex->rot));
 		}
 
 		/* set quad color. Colored overlay does not get blending */
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned int texCoord = GWN_vertformat_attr_add(format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
 		if (col) {
-			glColor4f(1.0, 1.0, 1.0, overlay_alpha / 100.0f);
+			immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
+			immUniformColor4f(1.0f, 1.0f, 1.0f, overlay_alpha * 0.01f);
 		}
 		else {
-			glColor4f(UNPACK3(U.sculpt_paint_overlay_col), overlay_alpha / 100.0f);
+			immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_ALPHA_COLOR);
+			immUniformColor3fvAlpha(U.sculpt_paint_overlay_col, overlay_alpha * 0.01f);
 		}
 
 		/* draw textured quad */
-		glBegin(GL_QUADS);
-		glTexCoord2f(0, 0);
-		glVertex2f(quad.xmin, quad.ymin);
-		glTexCoord2f(1, 0);
-		glVertex2f(quad.xmax, quad.ymin);
-		glTexCoord2f(1, 1);
-		glVertex2f(quad.xmax, quad.ymax);
-		glTexCoord2f(0, 1);
-		glVertex2f(quad.xmin, quad.ymax);
-		glEnd();
-
-		glPopMatrix();
-
-		if (mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) {
-			glMatrixMode(GL_MODELVIEW);
-			glPopMatrix();
+		immUniform1i("image", GL_TEXTURE0);
+
+		immBegin(GWN_PRIM_TRI_FAN, 4);
+		immAttrib2f(texCoord, 0.0f, 0.0f);
+		immVertex2f(pos, quad.xmin, quad.ymin);
+		immAttrib2f(texCoord, 1.0f, 0.0f);
+		immVertex2f(pos, quad.xmax, quad.ymin);
+		immAttrib2f(texCoord, 1.0f, 1.0f);
+		immVertex2f(pos, quad.xmax, quad.ymax);
+		immAttrib2f(texCoord, 0.0f, 1.0f);
+		immVertex2f(pos, quad.xmin, quad.ymax);
+		immEnd();
+
+		immUnbindProgram();
+
+		if (ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_VIEW)) {
+			gpuPopMatrix();
 		}
 	}
 }
@@ -729,7 +733,10 @@ static void paint_draw_cursor_overlay(UnifiedPaintSettings *ups, Brush *brush,
 		glDepthFunc(GL_ALWAYS);
 
 		if (ups->draw_anchored) {
-			const float *aim = ups->anchored_initial_mouse;
+			float aim[2] = {
+			    ups->anchored_initial_mouse[0] + vc->ar->winrct.xmin,
+			    ups->anchored_initial_mouse[1] + vc->ar->winrct.ymin,
+			};
 			copy_v2_v2(center, aim);
 			quad.xmin = aim[0] - ups->anchored_size;
 			quad.ymin = aim[1] - ups->anchored_size;
@@ -750,32 +757,41 @@ static void paint_draw_cursor_overlay(UnifiedPaintSettings *ups, Brush *brush,
 		/* scale based on tablet pressure */
 		if (ups->stroke_active && BKE_brush_use_size_pressure(vc->scene, brush)) {
 			do_pop = true;
-			glPushMatrix();
-			glLoadIdentity();
-			glTranslate2fv(center);
-			glScalef(ups->size_pressure_value, ups->size_pressure_value, 1);
-			glTranslatef(-center[0], -center[1], 0);
+			gpuPushMatrix();
+			gpuLoadIdentity();
+			gpuTranslate2fv(center);
+			gpuScaleUniform(ups->size_pressure_value);
+			gpuTranslate2f(-center[0], -center[1]);
 		}
 
-		glColor4f(U.sculpt_paint_overlay_col[0],
-		        U.sculpt_paint_overlay_col[1],
-		        U.sculpt_paint_overlay_col[2],
-		        brush->cursor_overlay_alpha / 100.0f);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned int texCoord = GWN_vertformat_attr_add(format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
+
+		immUniformColor3fvAlpha(U.sculpt_paint_overlay_col, brush->cursor_overlay_alpha * 0.01f);
+
+		/* draw textured quad */
 
 		/* draw textured quad */
-		glBegin(GL_QUADS);
-		glTexCoord2f(0, 0);
-		glVertex2f(quad.xmin, quad.ymin);
-		glTexCoord2f(1, 0);
-		glVertex2f(quad.xmax, quad.ymin);
-		glTexCoord2f(1, 1);
-		glVertex2f(quad.xmax, quad.ymax);
-		glTexCoord2f(0, 1);
-		glVertex2f(quad.xmin, quad.ymax);
-		glEnd();
+		immUniform1i("image", 0);
+
+		immBegin(GWN_PRIM_TRI_FAN, 4);
+		immAttrib2f(texCoord, 0.0f, 0.0f);
+		immVertex2f(pos, quad.xmin, quad.ymin);
+		immAttrib2f(texCoord, 1.0f, 0.0f);
+		immVertex2f(pos, quad.xmax, quad.ymin);
+		immAttrib2f(texCoord, 1.0f, 1.0f);
+		immVertex2f(pos, quad.xmax, quad.ymax);
+		immAttrib2f(texCoord, 0.0f, 1.0f);
+		immVertex2f(pos, quad.xmin, quad.ymax);
+		immEnd();
+
+		immUnbindProgram();
 
 		if (do_pop)
-			glPopMatrix();
+			gpuPopMatrix();
 	}
 }
 
@@ -785,19 +801,7 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush,
 	/* color means that primary brush texture is colured and secondary is used for alpha/mask control */
 	bool col = ELEM(mode, ePaintTextureProjective, ePaintTexture2D, ePaintVertex) ? true : false;
 	eOverlayControlFlags flags = BKE_paint_get_overlay_flags();
-	/* save lots of GL state
-	 * TODO: check on whether all of these are needed? */
-	glPushAttrib(GL_COLOR_BUFFER_BIT |
-	             GL_CURRENT_BIT |
-	             GL_DEPTH_BUFFER_BIT |
-	             GL_ENABLE_BIT |
-	             GL_LINE_BIT |
-	             GL_POLYGON_BIT |
-	             GL_STENCIL_BUFFER_BIT |
-	             GL_TRANSFORM_BIT |
-	             GL_VIEWPORT_BIT |
-	             GL_TEXTURE_BIT);
-
+	gpuPushAttrib(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT);
 
 	/* coloured overlay should be drawn separately */
 	if (col) {
@@ -815,86 +819,98 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush,
 			paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
 	}
 
-	glPopAttrib();
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+	gpuPopAttrib();
 }
 
 
-BLI_INLINE void draw_tri_point(float *co, float width, bool selected)
+BLI_INLINE void draw_tri_point(
+        unsigned int pos, float sel_col[4], float pivot_col[4],
+        float *co, float width, bool selected)
 {
+	immUniformColor4fv(selected ? sel_col : pivot_col);
+
+	glLineWidth(3.0f);
+
 	float w = width / 2.0f;
-	if (selected)
-		UI_ThemeColor4(TH_VERTEX_SELECT);
-	else
-		UI_ThemeColor4(TH_PAINT_CURVE_PIVOT);
-
-	glLineWidth(3.0);
-
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(co[0], co[1] + w);
-	glVertex2f(co[0] - w, co[1] - w);
-	glVertex2f(co[0] + w, co[1] - w);
-	glEnd();
-
-	glColor4f(1.0, 1.0, 1.0, 0.5);
-	glLineWidth(1.0);
-
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(co[0], co[1] + w);
-	glVertex2f(co[0] - w, co[1] - w);
-	glVertex2f(co[0] + w, co[1] - w);
-	glEnd();
+	float tri[3][2] = {
+		{co[0], co[1] + w},
+		{co[0] - w, co[1] - w},
+		{co[0] + w, co[1] - w},
+	};
+
+	immBegin(GWN_PRIM_LINE_LOOP, 3);
+	immVertex2fv(pos, tri[0]);
+	immVertex2fv(pos, tri[1]);
+	immVertex2fv(pos, tri[2]);
+	immEnd();
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+	glLineWidth(1.0f);
+
+	immBegin(GWN_PRIM_LINE_LOOP, 3);
+	immVertex2fv(pos, tri[0]);
+	immVertex2fv(pos, tri[1]);
+	immVertex2fv(pos, tri[2]);
+	immEnd();
 }
 
-BLI_INLINE void draw_rect_point(float *co, float width, bool selected)
+BLI_INLINE void draw_rect_point(
+        unsigned int pos, float sel_col[4], float handle_col[4],
+        float *co, float width, bool selected)
 {
+	immUniformColor4fv(selected ? sel_col : handle_col);
+
+	glLineWidth(3.0f);
+
 	float w = width / 2.0f;
-	if (selected)
-		UI_ThemeColor4(TH_VERTEX_SELECT);
-	else
-		UI_ThemeColor4(TH_PAINT_CURVE_HANDLE);
-	glLineWidth(3.0);
-
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(co[0] + w, co[1] + w);
-	glVertex2f(co[0] - w, co[1] + w);
-	glVertex2f(co[0] - w, co[1] - w);
-	glVertex2f(co[0] + w, co[1] - w);
-	glEnd();
-
-	glColor4f(1.0, 1.0, 1.0, 0.5);
-	glLineWidth(1.0);
-
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(co[0] + w, co[1] + w);
-	glVertex2f(co[0] - w, co[1] + w);
-	glVertex2f(co[0] - w, co[1] - w);
-	glVertex2f(co[0] + w, co[1] - w);
-	glEnd();
+	float minx = co[0] - w;
+	float miny = co[1] - w;
+	float maxx = co[0] + w;
+	float maxy = co[1] + w;
+
+	imm_draw_box_wire_2d(pos, minx, miny, maxx, maxy);
+
+	immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+	glLineWidth(1.0f);
+
+	imm_draw_box_wire_2d(pos, minx, miny, maxx, maxy);
 }
 
 
-BLI_INLINE void draw_bezier_handle_lines(BezTriple *bez)
+BLI_INLINE void draw_bezier_handle_lines(unsigned int pos, float sel_col[4], BezTriple *bez)
 {
-	short line1[] = {0, 1};
-	short line2[] = {1, 2};
-
-	glVertexPointer(2, GL_FLOAT, 3 * sizeof(float), bez->vec);
-	glColor4f(0.0, 0.0, 0.0, 0.5);
-	glLineWidth(3.0);
-	glDrawArrays(GL_LINE_STRIP, 0, 3);
-
-	glLineWidth(1.0);
-	if (bez->f1 || bez->f2)
-		UI_ThemeColor4(TH_VERTEX_SELECT);
-	else
-		glColor4f(1.0, 1.0, 1.0, 0.5);
-	glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, line1);
-	if (bez->f3 || bez->f2)
-		UI_ThemeColor4(TH_VERTEX_SELECT);
-	else
-		glColor4f(1.0, 1.0, 1.0, 0.5);
-	glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, line2);
+	immUniformColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+	glLineWidth(3.0f);
+
+	immBegin(GWN_PRIM_LINE_STRIP, 3);
+	immVertex2fv(pos, bez->vec[0]);
+	immVertex2fv(pos, bez->vec[1]);
+	immVertex2fv(pos, bez->vec[2]);
+	immEnd();
+
+	glLineWidth(1.0f);
+
+	if (bez->f1 || bez->f2) {
+		immUniformColor4fv(sel_col);
+	}
+	else {
+		immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+	}
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2fv(pos, bez->vec[0]);
+	immVertex2fv(pos, bez->vec[1]);
+	immEnd();
+
+	if (bez->f3 || bez->f2) {
+		immUniformColor4fv(sel_col);
+	}
+	else {
+		immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+	}
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2fv(pos, bez->vec[1]);
+	immVertex2fv(pos, bez->vec[2]);
+	immEnd();
 }
 
 static void paint_draw_curve_cursor(Brush *brush)
@@ -906,18 +922,26 @@ static void paint_draw_curve_cursor(Brush *brush)
 
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
-		glEnableClientState(GL_VERTEX_ARRAY);
 
 		/* draw the bezier handles and the curve segment between the current and next point */
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		float selec_col[4], handle_col[4], pivot_col[4];
+		UI_GetThemeColor4fv(TH_VERTEX_SELECT, selec_col);
+		UI_GetThemeColor4fv(TH_PAINT_CURVE_HANDLE, handle_col);
+		UI_GetThemeColor4fv(TH_PAINT_CURVE_PIVOT, pivot_col);
+
 		for (i = 0; i < pc->tot_points - 1; i++, cp++) {
 			int j;
 			PaintCurvePoint *cp_next = cp + 1;
 			float data[(PAINT_CURVE_NUM_SEGMENTS + 1) * 2];
 			/* use color coding to distinguish handles vs curve segments  */
-			draw_bezier_handle_lines(&cp->bez);
-			draw_tri_point(&cp->bez.vec[1][0], 10.0, cp->bez.f2);
-			draw_rect_point(&cp->bez.vec[0][0], 8.0, cp->bez.f1 || cp->bez.f2);
-			draw_rect_point(&cp->bez.vec[2][0], 8.0, cp->bez.f3 || cp->bez.f2);
+			draw_bezier_handle_lines(pos, selec_col, &cp->bez);
+			draw_tri_point(pos, selec_col, pivot_col, &cp->bez.vec[1][0], 10.0f, cp->bez.f2);
+			draw_rect_point(pos, selec_col, handle_col, &cp->bez.vec[0][0], 8.0f, cp->bez.f1 || cp->bez.f2);
+			draw_rect_point(pos, selec_col, handle_col, &cp->bez.vec[2][0], 8.0f, cp->bez.f3 || cp->bez.f2);
 
 			for (j = 0; j < 2; j++)
 				BKE_curve_forward_diff_bezier(
@@ -927,25 +951,35 @@ static void paint_draw_curve_cursor(Brush *brush)
 				        cp_next->bez.vec[1][j],
 				        data + j, PAINT_CURVE_NUM_SEGMENTS, sizeof(float[2]));
 
-			glVertexPointer(2, GL_FLOAT, 0, data);
-			glLineWidth(3.0);
-			glColor4f(0.0, 0.0, 0.0, 0.5);
-			glDrawArrays(GL_LINE_STRIP, 0, PAINT_CURVE_NUM_SEGMENTS + 1);
+			float (*v)[2] = (float(*)[2])data;
+
+			immUniformColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+			glLineWidth(3.0f);
+			immBegin(GWN_PRIM_LINE_STRIP, PAINT_CURVE_NUM_SEGMENTS + 1);
+			for (j = 0; j <= PAINT_CURVE_NUM_SEGMENTS; j++) {
+				immVertex2fv(pos, v[j]);
+			}
+			immEnd();
 
-			glLineWidth(1.0);
-			glColor4f(0.9, 0.9, 1.0, 0.5);
-			glDrawArrays(GL_LINE_STRIP, 0, PAINT_CURVE_NUM_SEGMENTS + 1);
+			immUniformColor4f(0.9f, 0.9f, 1.0f, 0.5f);
+			glLineWidth(1.0f);
+			immBegin(GWN_PRIM_LINE_STRIP, PAINT_CURVE_NUM_SEGMENTS + 1);
+			for (j = 0; j <= PAINT_CURVE_NUM_SEGMENTS; j++) {
+				immVertex2fv(pos, v[j]);
+			}
+			immEnd();
 		}
 
 		/* draw last line segment */
-		draw_bezier_handle_lines(&cp->bez);
-		draw_tri_point(&cp->bez.vec[1][0], 10.0, cp->bez.f2);
-		draw_rect_point(&cp->bez.vec[0][0], 8.0, cp->bez.f1 || cp->bez.f2);
-		draw_rect_point(&cp->bez.vec[2][0], 8.0, cp->bez.f3 || cp->bez.f2);
+		draw_bezier_handle_lines(pos, selec_col, &cp->bez);
+		draw_tri_point(pos, selec_col, pivot_col, &cp->bez.vec[1][0], 10.0f, cp->bez.f2);
+		draw_rect_point(pos, selec_col, handle_col, &cp->bez.vec[0][0], 8.0f, cp->bez.f1 || cp->bez.f2);
+		draw_rect_point(pos, selec_col, handle_col, &cp->bez.vec[2][0], 8.0f, cp->bez.f3 || cp->bez.f2);
 
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
-		glDisableClientState(GL_VERTEX_ARRAY);
+
+		immUnbindProgram();
 	}
 }
 
@@ -995,15 +1029,11 @@ static bool ommit_cursor_drawing(Paint *paint, ePaintMode mode, Brush *brush)
 static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 {
 	Scene *scene = CTX_data_scene(C);
+	ARegion *ar = CTX_wm_region(C);
 	UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
 	Paint *paint = BKE_paint_get_active_from_context(C);
 	Brush *brush = BKE_paint_brush(paint);
 	ePaintMode mode = BKE_paintmode_get_active_from_context(C);
-	ViewContext vc;
-	float final_radius;
-	float translation[2];
-	float outline_alpha, *outline_col;
-	float zoomx, zoomy;
 
 	/* check that brush drawing is enabled */
 	if (ommit_cursor_drawing(paint, mode, brush))
@@ -1011,6 +1041,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 
 	/* can't use stroke vc here because this will be called during
 	 * mouse over too, not just during a stroke */
+	ViewContext vc;
 	ED_view3d_viewcontext_init(C, &vc);
 
 	if (vc.rv3d && (vc.rv3d->rflag & RV3D_NAVIGATING)) {
@@ -1023,15 +1054,15 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 		return;
 	}
 
+	float zoomx, zoomy;
 	get_imapaint_zoom(C, &zoomx, &zoomy);
 	zoomx = max_ff(zoomx, zoomy);
 
 	/* set various defaults */
-	translation[0] = x;
-	translation[1] = y;
-	outline_alpha = 0.5;
-	outline_col = brush->add_col;
-	final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
+	const float *outline_col = brush->add_col;
+	const float outline_alpha = 0.5f;
+	float translation[2] = { x, y };
+	float final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
 
 	/* don't calculate rake angles while a stroke is active because the rake variables are global and
 	 * we may get interference with the stroke itself. For line strokes, such interference is visible */
@@ -1047,10 +1078,9 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 	if ((mode == ePaintSculpt) && vc.obact->sculpt) {
 		float location[3];
 		int pixel_radius;
-		bool hit;
 
 		/* test if brush is over the mesh */
-		hit = sculpt_get_brush_geometry(C, &vc, x, y, &pixel_radius, location, ups);
+		bool hit = sculpt_get_brush_geometry(C, &vc, x, y, &pixel_radius, location, ups);
 
 		if (BKE_brush_use_locked_size(scene, brush))
 			BKE_brush_size_set(scene, brush, pixel_radius);
@@ -1071,30 +1101,32 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 
 	if (ups->draw_anchored) {
 		final_radius = ups->anchored_size;
-		translation[0] = ups->anchored_initial_mouse[0];
-		translation[1] = ups->anchored_initial_mouse[1];
+		copy_v2_fl2(translation,
+		            ups->anchored_initial_mouse[0] + ar->winrct.xmin,
+		            ups->anchored_initial_mouse[1] + ar->winrct.ymin);
 	}
 
 	/* make lines pretty */
 	glLineWidth(1.0f);
-	glEnable(GL_BLEND);
+	glEnable(GL_BLEND); /* TODO: also set blend mode? */
 	glEnable(GL_LINE_SMOOTH);
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* set brush color */
-	glColor4f(outline_col[0], outline_col[1], outline_col[2], outline_alpha);
+	immUniformColor3fvAlpha(outline_col, outline_alpha);
 
 	/* draw brush outline */
-	glTranslate2fv(translation);
-
-	/* draw an inner brush */
 	if (ups->stroke_active && BKE_brush_use_size_pressure(scene, brush)) {
 		/* inner at full alpha */
-		glutil_draw_lined_arc(0.0, M_PI * 2.0, final_radius * ups->size_pressure_value, 40);
+		imm_draw_circle_wire_2d(pos, translation[0], translation[1], final_radius * ups->size_pressure_value, 40);
 		/* outer at half alpha */
-		glColor4f(outline_col[0], outline_col[1], outline_col[2], outline_alpha * 0.5f);
+		immUniformColor3fvAlpha(outline_col, outline_alpha * 0.5f);
 	}
-	glutil_draw_lined_arc(0.0, M_PI * 2.0, final_radius, 40);
-	glTranslatef(-translation[0], -translation[1], 0);
+	imm_draw_circle_wire_2d(pos, translation[0], translation[1], final_radius, 40);
+
+	immUnbindProgram();
 
 	/* restore GL state */
 	glDisable(GL_BLEND);
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c
index 44abdc34ffb..af0b828ae39 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -39,6 +39,8 @@
 #include "BKE_main.h"
 #include "BKE_paint.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_view3d.h"
 #include "ED_paint.h"
 
diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c
index 0bec71f0566..3d4f6c05ff4 100644
--- a/source/blender/editors/sculpt_paint/paint_hide.c
+++ b/source/blender/editors/sculpt_paint/paint_hide.c
@@ -52,7 +52,7 @@
 #include "BKE_paint.h"
 #include "BKE_subsurf.h"
 
-#include "BIF_glutil.h"
+#include "DEG_depsgraph.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -323,12 +323,10 @@ static void clip_planes_from_rect(bContext *C,
 {
 	ViewContext vc;
 	BoundBox bb;
-	bglMats mats = {{0}};
 
 	view3d_operator_needs_opengl(C);
 	ED_view3d_viewcontext_init(C, &vc);
-	view3d_get_transformation(vc.ar, vc.rv3d, vc.obact, &mats);
-	ED_view3d_clipping_calc(&bb, clip_planes, &mats, rect);
+	ED_view3d_clipping_calc(&bb, clip_planes, vc.ar, vc.obact, rect);
 	negate_m4(clip_planes);
 }
 
@@ -364,6 +362,7 @@ static int hide_show_exec(bContext *C, wmOperator *op)
 {
 	ARegion *ar = CTX_wm_region(C);
 	Object *ob = CTX_data_active_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Mesh *me = ob->data;
 	PartialVisAction action;
 	PartialVisArea area;
@@ -382,7 +381,7 @@ static int hide_show_exec(bContext *C, wmOperator *op)
 
 	clip_planes_from_rect(C, clip_planes, &rect);
 
-	dm = mesh_get_derived_final(CTX_data_scene(C), ob, CD_MASK_BAREMESH);
+	dm = mesh_get_derived_final(depsgraph, CTX_data_scene(C), ob, CD_MASK_BAREMESH);
 	pbvh = dm->getPBVH(ob, dm);
 	ob->sculpt->pbvh = pbvh;
 
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index c2b1fcaf460..2921faf8a5a 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -51,7 +51,6 @@
 
 #include "BKE_colorband.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_brush.h"
 #include "BKE_main.h"
@@ -61,6 +60,8 @@
 #include "BKE_undo_system.h"
 
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 #include "UI_view2d.h"
 
@@ -72,15 +73,16 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
 
 #include "GPU_draw.h"
-#include "GPU_buffers.h"
+#include "GPU_immediate.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "IMB_colormanagement.h"
 
@@ -264,7 +266,7 @@ static Brush *image_paint_brush(bContext *C)
 	return BKE_paint_brush(&settings->imapaint.paint);
 }
 
-static int image_paint_poll(bContext *C)
+static int image_paint_poll_ex(bContext *C, bool check_tool)
 {
 	Object *obact;
 
@@ -273,7 +275,9 @@ static int image_paint_poll(bContext *C)
 
 	obact = CTX_data_active_object(C);
 	if ((obact && obact->mode & OB_MODE_TEXTURE_PAINT) && CTX_wm_region_view3d(C)) {
-		return 1;
+		if (!check_tool || WM_toolsystem_active_tool_is_brush(C)) {
+			return 1;
+		}
 	}
 	else {
 		SpaceImage *sima = CTX_wm_space_image(C);
@@ -290,6 +294,16 @@ static int image_paint_poll(bContext *C)
 	return 0;
 }
 
+static int image_paint_poll(bContext *C)
+{
+	return image_paint_poll_ex(C, true);
+}
+
+static int image_paint_ignore_tool_poll(bContext *C)
+{
+	return image_paint_poll_ex(C, false);
+}
+
 static int image_paint_2d_clone_poll(bContext *C)
 {
 	Brush *brush = image_paint_brush(C);
@@ -401,12 +415,28 @@ static void gradient_draw_line(bContext *UNUSED(C), int x, int y, void *customda
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
 
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		glLineWidth(4.0);
-		glColor4ub(0, 0, 0, 255);
-		sdrawline(x, y, pop->startmouse[0], pop->startmouse[1]);
+		immUniformColor4ub(0, 0, 0, 255);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2i(pos, x, y);
+		immVertex2i(pos, pop->startmouse[0], pop->startmouse[1]);
+		immEnd();
+
 		glLineWidth(2.0);
-		glColor4ub(255, 255, 255, 255);
-		sdrawline(x, y, pop->startmouse[0], pop->startmouse[1]);
+		immUniformColor4ub(255, 255, 255, 255);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2i(pos, x, y);
+		immVertex2i(pos, pop->startmouse[0], pop->startmouse[1]);
+		immEnd();
+
+		immUnbindProgram();
 
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
@@ -428,7 +458,8 @@ static PaintOperation *texture_paint_init(bContext *C, wmOperator *op, const flo
 
 	/* initialize from context */
 	if (CTX_wm_region_view3d(C)) {
-		Object *ob = OBACT;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Object *ob = OBACT(view_layer);
 		bool uvs, mat, tex, stencil;
 		if (!BKE_paint_proj_mesh_data_check(scene, ob, &uvs, &mat, &tex, &stencil)) {
 			BKE_paint_data_warning(op->reports, uvs, mat, tex, stencil);
@@ -711,16 +742,20 @@ static void toggle_paint_cursor(bContext *C, int enable)
 void ED_space_image_paint_update(wmWindowManager *wm, Scene *scene)
 {
 	ToolSettings *settings = scene->toolsettings;
-	wmWindow *win;
-	ScrArea *sa;
 	ImagePaintSettings *imapaint = &settings->imapaint;
 	bool enabled = false;
 
-	for (win = wm->windows.first; win; win = win->next)
-		for (sa = win->screen->areabase.first; sa; sa = sa->next)
-			if (sa->spacetype == SPACE_IMAGE)
-				if (((SpaceImage *)sa->spacedata.first)->mode == SI_MODE_PAINT)
+	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+		bScreen *screen = WM_window_get_active_screen(win);
+
+		for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+			if (sa->spacetype == SPACE_IMAGE) {
+				if (((SpaceImage *)sa->spacedata.first)->mode == SI_MODE_PAINT) {
 					enabled = true;
+				}
+			}
+		}
+	}
 
 	if (enabled) {
 		BKE_paint_init(scene, ePaintTexture2D, PAINT_CURSOR_TEXTURE_PAINT);
@@ -976,11 +1011,6 @@ static int sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-static int sample_color_poll(bContext *C)
-{
-	return (image_paint_poll(C) || vertex_paint_poll(C));
-}
-
 void PAINT_OT_sample_color(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -992,7 +1022,7 @@ void PAINT_OT_sample_color(wmOperatorType *ot)
 	ot->exec = sample_color_exec;
 	ot->invoke = sample_color_invoke;
 	ot->modal = sample_color_modal;
-	ot->poll = sample_color_poll;
+	ot->poll = image_paint_ignore_tool_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1024,6 +1054,7 @@ static int texture_paint_toggle_poll(bContext *C)
 
 static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	const int mode_flag = OB_MODE_TEXTURE_PAINT;
@@ -1076,8 +1107,10 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 						if (sl->spacetype == SPACE_IMAGE) {
 							SpaceImage *sima = (SpaceImage *)sl;
 
-							if (!sima->pin)
-								ED_space_image_set(bmain, sima, scene, scene->obedit, ima);
+							if (!sima->pin) {
+								Object *obedit = CTX_data_edit_object(C);
+								ED_space_image_set(sima, scene, obedit, ima);
+							}
 						}
 					}
 				}
@@ -1095,9 +1128,12 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 		toggle_paint_cursor(C, 1);
 	}
 
-	GPU_drawobject_free(ob->derivedFinal);
 	WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
 
+	WM_msg_publish_rna_prop(mbus, &ob->id, ob, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -1121,8 +1157,8 @@ static int brush_colors_flip_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	UnifiedPaintSettings *ups = &CTX_data_tool_settings(C)->unified_paint_settings;
 
-	Brush *br;
 	Object *ob = CTX_data_active_object(C);
+	Brush *br;
 	if (!(ob && (ob->mode & OB_MODE_VERTEX_PAINT))) {
 		br = image_paint_brush(C);
 	}
@@ -1191,7 +1227,7 @@ void ED_imapaint_bucket_fill(struct bContext *C, float color[3], wmOperator *op)
 
 	BKE_undosys_step_push(wm->undo_stack, C, op->type->name);
 
-	DAG_id_tag_update(&ima->id, 0);
+	DEG_id_tag_update(&ima->id, 0);
 }
 
 
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index ec1a6ebf7ed..a75d6344849 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -46,12 +46,13 @@
 
 #include "BKE_colorband.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_brush.h"
 #include "BKE_image.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_paint.h"
 #include "ED_screen.h"
 
@@ -1367,7 +1368,7 @@ void paint_2d_redraw(const bContext *C, void *ps, bool final)
 
 		/* compositor listener deals with updating */
 		WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, s->image);
-		DAG_id_tag_update(&s->image->id, 0);
+		DEG_id_tag_update(&s->image->id, 0);
 	}
 	else {
 		if (!s->sima || !s->sima->lock)
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 8e1d47db61a..0e48596ca1a 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -65,7 +65,6 @@
 #include "BKE_colorband.h"
 #include "BKE_context.h"
 #include "BKE_colortools.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_idprop.h"
 #include "BKE_brush.h"
@@ -81,6 +80,9 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "UI_interface.h"
 
 #include "ED_mesh.h"
@@ -226,6 +228,7 @@ typedef struct ProjPaintState {
 	View3D *v3d;
 	RegionView3D *rv3d;
 	ARegion *ar;
+	Depsgraph *depsgraph;
 	Scene *scene;
 	int source; /* PROJ_SRC_**** */
 
@@ -281,7 +284,6 @@ typedef struct ProjPaintState {
 	bool  do_backfacecull;          /* ignore faces with normals pointing away, skips a lot of raycasts if your normals are correctly flipped */
 	bool  do_mask_normal;           /* mask out pixels based on their normals */
 	bool  do_mask_cavity;           /* mask out pixels based on cavity */
-	bool  do_new_shading_nodes;     /* cache BKE_scene_use_new_shading_nodes value */
 	float normal_angle;             /* what angle to mask at */
 	float normal_angle__cos;         /* cos(normal_angle), faster to compare */
 	float normal_angle_inner;
@@ -2490,8 +2492,7 @@ static bool IsectPoly2Df_twoside(const float pt[2], float uv[][2], const int tot
 static void project_paint_face_init(
         const ProjPaintState *ps,
         const int thread_index, const int bucket_index, const int tri_index, const int image_index,
-        const rctf *clip_rect, const rctf *bucket_bounds, ImBuf *ibuf, ImBuf **tmpibuf,
-        const bool clamp_u, const bool clamp_v)
+        const rctf *clip_rect, const rctf *bucket_bounds, ImBuf *ibuf, ImBuf **tmpibuf)
 {
 	/* Projection vars, to get the 3D locations into screen space  */
 	MemArena *arena = ps->arena_mt[thread_index];
@@ -2598,17 +2599,6 @@ static void project_paint_face_init(
 #endif
 
 		if (pixel_bounds_array(uv_clip, &bounds_px, ibuf->x, ibuf->y, uv_clip_tot)) {
-
-			if (clamp_u) {
-				CLAMP(bounds_px.xmin, 0, ibuf->x);
-				CLAMP(bounds_px.xmax, 0, ibuf->x);
-			}
-
-			if (clamp_v) {
-				CLAMP(bounds_px.ymin, 0, ibuf->y);
-				CLAMP(bounds_px.ymax, 0, ibuf->y);
-			}
-
 #if 0
 			project_paint_undo_tiles_init(&bounds_px, ps->projImages + image_index, tmpibuf,
 			                              tile_width, threaded, ps->do_masking);
@@ -2925,19 +2915,16 @@ static void project_bucket_init(
 	int tri_index, image_index = 0;
 	ImBuf *ibuf = NULL;
 	Image *tpage_last = NULL, *tpage;
-	Image *ima = NULL;
 	ImBuf *tmpibuf = NULL;
 
 	if (ps->image_tot == 1) {
 		/* Simple loop, no context switching */
 		ibuf = ps->projImages[0].ibuf;
-		ima = ps->projImages[0].ima;
 
 		for (node = ps->bucketFaces[bucket_index]; node; node = node->next) {
 			project_paint_face_init(
 			        ps, thread_index, bucket_index, GET_INT_FROM_POINTER(node->link), 0,
-			        clip_rect, bucket_bounds, ibuf, &tmpibuf,
-			        (ima->tpageflag & IMA_CLAMP_U) != 0, (ima->tpageflag & IMA_CLAMP_V) != 0);
+			        clip_rect, bucket_bounds, ibuf, &tmpibuf);
 		}
 	}
 	else {
@@ -2954,7 +2941,6 @@ static void project_bucket_init(
 				for (image_index = 0; image_index < ps->image_tot; image_index++) {
 					if (ps->projImages[image_index].ima == tpage_last) {
 						ibuf = ps->projImages[image_index].ibuf;
-						ima = ps->projImages[image_index].ima;
 						break;
 					}
 				}
@@ -2963,8 +2949,7 @@ static void project_bucket_init(
 
 			project_paint_face_init(
 			        ps, thread_index, bucket_index, tri_index, image_index,
-			        clip_rect, bucket_bounds, ibuf, &tmpibuf,
-			        (ima->tpageflag & IMA_CLAMP_U) != 0, (ima->tpageflag & IMA_CLAMP_V) != 0);
+			        clip_rect, bucket_bounds, ibuf, &tmpibuf);
 		}
 	}
 
@@ -3099,7 +3084,7 @@ static void proj_paint_state_non_cddm_init(ProjPaintState *ps)
 }
 
 static void proj_paint_state_viewport_init(
-        ProjPaintState *ps, const char symmetry_flag)
+        ProjPaintState *ps, const Depsgraph *depsgraph, const char symmetry_flag)
 {
 	float mat[3][3];
 	float viewmat[4][4];
@@ -3133,7 +3118,7 @@ static void proj_paint_state_viewport_init(
 
 		ED_view3d_ob_project_mat_get_from_obmat(ps->rv3d, ps->obmat, ps->projectMat);
 
-		ps->is_ortho = ED_view3d_clip_range_get(ps->v3d, ps->rv3d, &ps->clipsta, &ps->clipend, true);
+		ps->is_ortho = ED_view3d_clip_range_get(ps->depsgraph, ps->v3d, ps->rv3d, &ps->clipsta, &ps->clipend, true);
 	}
 	else {
 		/* re-projection */
@@ -3160,17 +3145,17 @@ static void proj_paint_state_viewport_init(
 			invert_m4_m4(viewinv, viewmat);
 		}
 		else if (ps->source == PROJ_SRC_IMAGE_CAM) {
-			Object *cam_ob = ps->scene->camera;
+			Object *cam_ob_eval = DEG_get_evaluated_object(depsgraph, ps->scene->camera);
 			CameraParams params;
 
 			/* viewmat & viewinv */
-			copy_m4_m4(viewinv, cam_ob->obmat);
+			copy_m4_m4(viewinv, cam_ob_eval->obmat);
 			normalize_m4(viewinv);
 			invert_m4_m4(viewmat, viewinv);
 
 			/* window matrix, clipping and ortho */
 			BKE_camera_params_init(&params);
-			BKE_camera_params_from_object(&params, cam_ob);
+			BKE_camera_params_from_object(&params, cam_ob_eval);
 			BKE_camera_params_compute_viewplane(&params, ps->winx, ps->winy, 1.0f, 1.0f);
 			BKE_camera_params_compute_matrix(&params);
 
@@ -3422,12 +3407,14 @@ static void project_paint_bleed_add_face_user(
 #endif
 
 /* Return true if DM can be painted on, false otherwise */
-static bool proj_paint_state_dm_init(ProjPaintState *ps)
+static bool proj_paint_state_dm_init(const bContext *C, ProjPaintState *ps)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 	/* Workaround for subsurf selection, try the display mesh first */
 	if (ps->source == PROJ_SRC_IMAGE_CAM) {
 		/* using render mesh, assume only camera was rendered from */
-		ps->dm = mesh_create_derived_render(ps->scene, ps->ob, ps->scene->customdata_mask | CD_MASK_MTFACE);
+		ps->dm = mesh_create_derived_render(depsgraph, ps->scene, ps->ob, ps->scene->customdata_mask | CD_MASK_MTFACE);
 		ps->dm_release = true;
 	}
 	else if (ps->ob->derivedFinal &&
@@ -3439,7 +3426,7 @@ static bool proj_paint_state_dm_init(ProjPaintState *ps)
 	}
 	else {
 		ps->dm = mesh_get_derived_final(
-		        ps->scene, ps->ob,
+		        depsgraph, ps->scene, ps->ob,
 		        ps->scene->customdata_mask | CD_MASK_MTFACE | (ps->do_face_sel ? CD_ORIGINDEX : 0));
 		ps->dm_release = true;
 	}
@@ -3489,7 +3476,7 @@ static void proj_paint_layer_clone_init(
 
 	/* use clone mtface? */
 	if (ps->do_layer_clone) {
-		const int layer_num = CustomData_get_clone_layer(&((Mesh *)ps->ob->data)->pdata, CD_MTEXPOLY);
+		const int layer_num = CustomData_get_clone_layer(&((Mesh *)ps->ob->data)->ldata, CD_MLOOPUV);
 
 		ps->dm_mloopuv_clone = MEM_mallocN(ps->dm_totpoly * sizeof(MLoopUV *), "proj_paint_mtfaces");
 
@@ -3819,7 +3806,7 @@ static void project_paint_prepare_all_faces(
 
 /* run once per stroke before projection painting */
 static void project_paint_begin(
-        ProjPaintState *ps,
+        const bContext *C, ProjPaintState *ps,
         const bool is_multi_view, const char symmetry_flag)
 {
 	ProjPaintLayerClone layer_clone;
@@ -3842,7 +3829,7 @@ static void project_paint_begin(
 
 	/* paint onto the derived mesh */
 	if (ps->is_shared_user == false) {
-		if (!proj_paint_state_dm_init(ps)) {
+		if (!proj_paint_state_dm_init(C, ps)) {
 			return;
 		}
 	}
@@ -3852,7 +3839,7 @@ static void project_paint_begin(
 
 	if (ps->do_layer_stencil || ps->do_stencil_brush) {
 		//int layer_num = CustomData_get_stencil_layer(&ps->dm->loopData, CD_MLOOPUV);
-		int layer_num = CustomData_get_stencil_layer(&((Mesh *)ps->ob->data)->pdata, CD_MTEXPOLY);
+		int layer_num = CustomData_get_stencil_layer(&((Mesh *)ps->ob->data)->ldata, CD_MLOOPUV);
 		if (layer_num != -1)
 			ps->dm_mloopuv_stencil = CustomData_get_layer_n(&ps->dm->loopData, CD_MLOOPUV, layer_num);
 
@@ -3872,7 +3859,7 @@ static void project_paint_begin(
 		proj_paint_state_cavity_init(ps);
 	}
 
-	proj_paint_state_viewport_init(ps, symmetry_flag);
+	proj_paint_state_viewport_init(ps, CTX_data_depsgraph(C), symmetry_flag);
 
 	/* calculate vert screen coords
 	 * run this early so we can calculate the x/y resolution of our bucket rect */
@@ -3919,7 +3906,7 @@ static void paint_proj_begin_clone(ProjPaintState *ps, const float mouse[2])
 	/* setup clone offset */
 	if (ps->tool == PAINT_TOOL_CLONE) {
 		float projCo[4];
-		copy_v3_v3(projCo, ED_view3d_cursor3d_get(ps->scene, ps->v3d));
+		copy_v3_v3(projCo, ED_view3d_cursor3d_get(ps->scene, ps->v3d)->location);
 		mul_m4_v3(ps->obmat_imat, projCo);
 
 		projCo[3] = 1.0f;
@@ -3940,7 +3927,7 @@ static void project_paint_end(ProjPaintState *ps)
 		ProjPaintImage *projIma;
 		for (a = 0, projIma = ps->projImages; a < ps->image_tot; a++, projIma++) {
 			BKE_image_release_ibuf(projIma->ima, projIma->ibuf, NULL);
-			DAG_id_tag_update(&projIma->ima->id, 0);
+			DEG_id_tag_update(&projIma->ima->id, 0);
 		}
 	}
 
@@ -5026,15 +5013,17 @@ void paint_proj_stroke(
 	/* clone gets special treatment here to avoid going through image initialization */
 	if (ps_handle->is_clone_cursor_pick) {
 		Scene *scene = ps_handle->scene;
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		View3D *v3d = CTX_wm_view3d(C);
 		ARegion *ar = CTX_wm_region(C);
-		float *cursor = ED_view3d_cursor3d_get(scene, v3d);
+		float *cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
 		int mval_i[2] = {(int)pos[0], (int)pos[1]};
 
 		view3d_operator_needs_opengl(C);
 
-		if (!ED_view3d_autodist(scene, ar, v3d, mval_i, cursor, false, NULL))
+		if (!ED_view3d_autodist(depsgraph, ar, v3d, mval_i, cursor, false, NULL)) {
 			return;
+		}
 
 		ED_region_tag_redraw(ar);
 
@@ -5090,6 +5079,7 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int
 	ps->rv3d = CTX_wm_region_view3d(C);
 	ps->ar = CTX_wm_region(C);
 
+	ps->depsgraph = CTX_data_depsgraph(C);
 	ps->scene = scene;
 	ps->ob = ob; /* allow override of active object */
 
@@ -5112,7 +5102,6 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int
 	else {
 		ps->do_backfacecull = ps->do_occlude = ps->do_mask_normal = 0;
 	}
-	ps->do_new_shading_nodes = BKE_scene_use_new_shading_nodes(scene); /* only cache the value */
 
 	if (ps->tool == PAINT_TOOL_CLONE)
 		ps->do_layer_clone = (settings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_CLONE) ? 1 : 0;
@@ -5212,7 +5201,7 @@ void *paint_proj_new_stroke(bContext *C, Object *ob, const float mouse[2], int m
 
 		project_state_init(C, ob, ps, mode);
 
-		if (ps->ob == NULL || !(ps->ob->lay & ps->v3d->lay)) {
+		if (ps->ob == NULL) {
 			ps_handle->ps_views_tot = i + 1;
 			goto fail;
 		}
@@ -5236,7 +5225,7 @@ void *paint_proj_new_stroke(bContext *C, Object *ob, const float mouse[2], int m
 			PROJ_PAINT_STATE_SHARED_MEMCPY(ps, ps_handle->ps_views[0]);
 		}
 
-		project_paint_begin(ps, is_multi_view, symmetry_flag_views[i]);
+		project_paint_begin(C, ps, is_multi_view, symmetry_flag_views[i]);
 
 		paint_proj_begin_clone(ps, mouse);
 
@@ -5314,11 +5303,12 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
 {
 	Image *image = BLI_findlink(&CTX_data_main(C)->image, RNA_enum_get(op->ptr, "image"));
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ProjPaintState ps = {NULL};
 	int orig_brush_size;
 	IDProperty *idgroup;
 	IDProperty *view_data = NULL;
-	Object *ob = OBACT;
+	Object *ob = OBACT(view_layer);
 	bool uvs, mat, tex;
 
 	if (ob == NULL || ob->type != OB_MESH) {
@@ -5388,7 +5378,7 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
 	ED_image_undo_push_begin(op->type->name);
 
 	/* allocate and initialize spatial data structures */
-	project_paint_begin(&ps, false, 0);
+	project_paint_begin(C, &ps, false, 0);
 
 	if (ps.dm == NULL) {
 		BKE_brush_size_set(scene, ps.brush, orig_brush_size);
@@ -5445,8 +5435,11 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op)
 	ImBuf *ibuf;
 	char filename[FILE_MAX];
 
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *settings = scene->toolsettings;
+	View3D *v3d = CTX_wm_view3d(C);
+	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	int w = settings->imapaint.screen_grab_size[0];
 	int h = settings->imapaint.screen_grab_size[1];
 	int maxsize;
@@ -5460,9 +5453,10 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op)
 	if (h > maxsize) h = maxsize;
 
 	ibuf = ED_view3d_draw_offscreen_imbuf(
-	        scene, CTX_wm_view3d(C), CTX_wm_region(C),
+	        depsgraph, scene, v3d->drawtype,
+	        v3d, CTX_wm_region(C),
 	        w, h, IB_rect, V3D_OFSDRAW_NONE, R_ALPHAPREMUL, 0, NULL,
-	        NULL, NULL, err_out);
+	        NULL, err_out);
 	if (!ibuf) {
 		/* Mostly happens when OpenGL offscreen buffer was failed to create, */
 		/* but could be other reasons. Should be handled in the future. nazgul */
@@ -5478,9 +5472,6 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op)
 	if (image) {
 		/* now for the trickiness. store the view projection here!
 		 * re-projection will reuse this */
-		View3D *v3d = CTX_wm_view3d(C);
-		RegionView3D *rv3d = CTX_wm_region_view3d(C);
-
 		IDPropertyTemplate val;
 		IDProperty *idgroup = IDP_GetProperties(&image->id, 1);
 		IDProperty *view_data;
@@ -5494,7 +5485,7 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op)
 		array = (float *)IDP_Array(view_data);
 		memcpy(array, rv3d->winmat, sizeof(rv3d->winmat)); array += sizeof(rv3d->winmat) / sizeof(float);
 		memcpy(array, rv3d->viewmat, sizeof(rv3d->viewmat)); array += sizeof(rv3d->viewmat) / sizeof(float);
-		is_ortho = ED_view3d_clip_range_get(v3d, rv3d, &array[0], &array[1], true);
+		is_ortho = ED_view3d_clip_range_get(CTX_data_depsgraph(C), v3d, rv3d, &array[0], &array[1], true);
 		/* using float for a bool is dodgy but since its an extra member in the array...
 		 * easier then adding a single bool prop */
 		array[2] = is_ortho ? 1.0f : 0.0f;
@@ -5594,7 +5585,7 @@ bool BKE_paint_proj_mesh_data_check(Scene *scene, Object *ob, bool *uvs, bool *m
 	}
 
 	me = BKE_mesh_from_object(ob);
-	layernum = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
+	layernum = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
 
 	if (layernum == 0) {
 		hasuvs = false;
@@ -5633,20 +5624,11 @@ bool BKE_paint_proj_mesh_data_check(Scene *scene, Object *ob, bool *uvs, bool *m
 /* Add layer operator */
 
 static const EnumPropertyItem layer_type_items[] = {
-	{MAP_COL, "DIFFUSE_COLOR", 0, "Diffuse Color", ""},
-	{MAP_REF, "DIFFUSE_INTENSITY", 0, "Diffuse Intensity", ""},
-	{MAP_ALPHA, "ALPHA", 0, "Alpha", ""},
-	{MAP_TRANSLU, "TRANSLUCENCY", 0, "Translucency", ""},
-	{MAP_COLSPEC, "SPECULAR_COLOR", 0, "Specular Color", ""},
-	{MAP_SPEC, "SPECULAR_INTENSITY", 0, "Specular Intensity", ""},
-	{MAP_HAR, "SPECULAR_HARDNESS", 0, "Specular Hardness", ""},
-	{MAP_AMB, "AMBIENT", 0, "Ambient", ""},
-	{MAP_EMIT, "EMIT", 0, "Emit", ""},
-	{MAP_COLMIR, "MIRROR_COLOR", 0, "Mirror Color", ""},
-	{MAP_RAYMIRR, "RAYMIRROR", 0, "Ray Mirror", ""},
-	{MAP_NORM, "NORMAL", 0, "Normal", ""},
-	{MAP_WARP, "WARP", 0, "Warp", ""},
-	{MAP_DISPLACE, "DISPLACE", 0, "Displace", ""},
+	{0, "BASE_COLOR", 0, "Base Color", ""},
+	{1, "EMISSION", 0, "Emission", ""},
+	{2, "NORMAL", 0, "Normal", ""},
+	{3, "BUMP", 0, "Bump", ""},
+	{4, "DISPLACEMENT", 0, "Displacement", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -5681,7 +5663,6 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
 	Object *ob = CTX_data_active_object(C);
 	Scene *scene = CTX_data_scene(C);
 	Material *ma;
-	bool is_bi = BKE_scene_uses_blender_internal(scene) || BKE_scene_uses_blender_game(scene);
 	Image *ima = NULL;
 
 	if (!ob)
@@ -5690,60 +5671,34 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
 	ma = give_current_material(ob, ob->actcol);
 
 	if (ma) {
+		/* TODO: use type to link to proper socket. */
 		Main *bmain = CTX_data_main(C);
 
-		if (!is_bi && BKE_scene_use_new_shading_nodes(scene)) {
-			bNode *imanode;
-			bNodeTree *ntree = ma->nodetree;
-
-			if (!ntree) {
-				ED_node_shader_default(C, &ma->id);
-				ntree = ma->nodetree;
-			}
-
-			ma->use_nodes = true;
+		bNode *imanode;
+		bNodeTree *ntree = ma->nodetree;
 
-			/* try to add an image node */
-			imanode = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE);
+		if (!ntree) {
+			ED_node_shader_default(C, &ma->id);
+			ntree = ma->nodetree;
+		}
 
-			ima = proj_paint_image_create(op, bmain);
-			imanode->id = &ima->id;
+		ma->use_nodes = true;
 
-			nodeSetActive(ntree, imanode);
+		/* try to add an image node */
+		imanode = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE);
 
-			ntreeUpdateTree(CTX_data_main(C), ntree);
-		}
-		else {
-			MTex *mtex = BKE_texture_mtex_add_id(&ma->id, -1);
-
-			/* successful creation of mtex layer, now create set */
-			if (mtex) {
-				int type = MAP_COL;
-				char imagename_buff[MAX_ID_NAME - 2];
-				const char *imagename = DATA_("Diffuse Color");
-
-				if (op) {
-					type = RNA_enum_get(op->ptr, "type");
-					RNA_string_get(op->ptr, "name", imagename_buff);
-					imagename = imagename_buff;
-				}
+		ima = proj_paint_image_create(op, bmain);
+		imanode->id = &ima->id;
 
-				mtex->tex = BKE_texture_add(bmain, imagename);
-				mtex->mapto = type;
+		nodeSetActive(ntree, imanode);
 
-				if (mtex->tex) {
-					ima = mtex->tex->ima = proj_paint_image_create(op, bmain);
-				}
-
-				WM_event_add_notifier(C, NC_TEXTURE | NA_ADDED, mtex->tex);
-			}
-		}
+		ntreeUpdateTree(CTX_data_main(C), ntree);
 
 		if (ima) {
 			BKE_texpaint_slot_refresh_cache(scene, ma);
 			BKE_image_signal(ima, NULL, IMA_SIGNAL_USER_NEW_IMAGE);
 			WM_event_add_notifier(C, NC_IMAGE | NA_ADDED, ima);
-			DAG_id_tag_update(&ma->id, 0);
+			DEG_id_tag_update(&ma->id, 0);
 			ED_area_tag_redraw(CTX_wm_area(C));
 
 			BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
@@ -5808,7 +5763,7 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = texture_paint_add_texture_paint_slot_invoke;
 	ot->exec = texture_paint_add_texture_paint_slot_exec;
-	ot->poll = ED_operator_region_view3d_active;
+	ot->poll = ED_operator_object_active;
 
 	/* flags */
 	ot->flag = OPTYPE_UNDO;
@@ -5830,59 +5785,6 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
 }
 
-static int texture_paint_delete_texture_paint_slot_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Object *ob = CTX_data_active_object(C);
-	Scene *scene = CTX_data_scene(C);
-	Material *ma;
-	bool is_bi = BKE_scene_uses_blender_internal(scene) || BKE_scene_uses_blender_game(scene);
-	TexPaintSlot *slot;
-
-	/* not supported for node-based engines */
-	if (!ob || !is_bi)
-		return OPERATOR_CANCELLED;
-
-	ma = give_current_material(ob, ob->actcol);
-
-	if (!ma->texpaintslot || ma->use_nodes)
-		return OPERATOR_CANCELLED;
-
-	slot = ma->texpaintslot + ma->paint_active_slot;
-
-	if (ma->mtex[slot->index]->tex) {
-		id_us_min(&ma->mtex[slot->index]->tex->id);
-
-		if (ma->mtex[slot->index]->tex->ima) {
-			id_us_min(&ma->mtex[slot->index]->tex->ima->id);
-		}
-	}
-	MEM_freeN(ma->mtex[slot->index]);
-	ma->mtex[slot->index] = NULL;
-
-	BKE_texpaint_slot_refresh_cache(scene, ma);
-	DAG_id_tag_update(&ma->id, 0);
-	WM_event_add_notifier(C, NC_MATERIAL, ma);
-	/* we need a notifier for data change since we change the displayed modifier uvs */
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
-	return OPERATOR_FINISHED;
-}
-
-
-void PAINT_OT_delete_texture_paint_slot(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Delete Texture Paint Slot";
-	ot->description = "Delete selected texture paint slot";
-	ot->idname = "PAINT_OT_delete_texture_paint_slot";
-
-	/* api callbacks */
-	ot->exec = texture_paint_delete_texture_paint_slot_exec;
-	ot->poll = ED_operator_region_view3d_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
 static int add_simple_uvs_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	/* no checks here, poll function does them for us */
@@ -5918,7 +5820,7 @@ static int add_simple_uvs_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
 
-	DAG_id_tag_update(ob->data, 0);
+	DEG_id_tag_update(ob->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 	WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, scene);
 	return OPERATOR_FINISHED;
@@ -5928,9 +5830,9 @@ static int add_simple_uvs_poll(bContext *C)
 {
 	Object *ob = CTX_data_active_object(C);
 
-	if (!ob || ob->type != OB_MESH || ob->mode != OB_MODE_TEXTURE_PAINT)
+	if (!ob || ob->type != OB_MESH || ob->mode != OB_MODE_TEXTURE_PAINT) {
 		return false;
-
+	}
 	return true;
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_image_undo.c b/source/blender/editors/sculpt_paint/paint_image_undo.c
index ef28dafa8c9..ade775d14e6 100644
--- a/source/blender/editors/sculpt_paint/paint_image_undo.c
+++ b/source/blender/editors/sculpt_paint/paint_image_undo.c
@@ -33,16 +33,18 @@
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+#include "DNA_workspace_types.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_paint.h"
 #include "ED_undo.h"
 
@@ -328,7 +330,7 @@ static void image_undo_restore_list(ListBase *lb, struct UndoIDPtrMap *id_map)
 		}
 		ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
 
-		DAG_id_tag_update(&ima->id, 0);
+		DEG_id_tag_update(&ima->id, 0);
 
 		BKE_image_release_ibuf(ima, ibuf, NULL);
 	}
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index e1ac35c3675..8d94978f5c6 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -94,8 +94,10 @@ void paint_cursor_delete_textures(void);
 
 /* paint_vertex.c */
 int weight_paint_poll(struct bContext *C);
+int weight_paint_poll_ignore_tool(bContext *C);
 int weight_paint_mode_poll(struct bContext *C);
 int vertex_paint_poll(struct bContext *C);
+int vertex_paint_poll_ignore_tool(struct bContext *C);
 int vertex_paint_mode_poll(struct bContext *C);
 
 typedef void (*VPaintTransform_Callback)(const float col[3], const void *user_data, float r_col[3]);
@@ -157,10 +159,10 @@ void PAINT_OT_weight_sample_group(struct wmOperatorType *ot);
 /* paint_vertex_proj.c */
 struct VertProjHandle;
 struct VertProjHandle *ED_vpaint_proj_handle_create(
-        struct Scene *scene, struct Object *ob,
+        struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob,
         struct DMCoNo **r_vcosnos);
 void  ED_vpaint_proj_handle_update(
-        struct VertProjHandle *vp_handle,
+        struct Depsgraph *depsgraph, struct VertProjHandle *vp_handle,
         /* runtime vars */
         struct ARegion *ar, const float mval_fl[2]);
 void  ED_vpaint_proj_handle_free(
@@ -216,7 +218,6 @@ void PAINT_OT_texture_paint_toggle(struct wmOperatorType *ot);
 void PAINT_OT_project_image(struct wmOperatorType *ot);
 void PAINT_OT_image_from_view(struct wmOperatorType *ot);
 void PAINT_OT_add_texture_paint_slot(struct wmOperatorType *ot);
-void PAINT_OT_delete_texture_paint_slot(struct wmOperatorType *ot);
 void PAINT_OT_image_paint(struct wmOperatorType *ot);
 void PAINT_OT_add_simple_uvs(struct wmOperatorType *ot);
 
@@ -259,7 +260,6 @@ bool paint_convert_bb_to_rect(struct rcti *rect,
  * 2D screens-space bounding box into four 3D planes) */
 void paint_calc_redraw_planes(float planes[4][4],
                               const struct ARegion *ar,
-                              struct RegionView3D *rv3d,
                               struct Object *ob,
                               const struct rcti *screen_rect);
 
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index 76b629395e2..f22e6f514e6 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -35,8 +35,6 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BIF_glutil.h"
-
 #include "BLI_bitmap_draw_2d.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_geom.h"
@@ -52,6 +50,8 @@
 #include "BKE_paint.h"
 #include "BKE_subsurf.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -134,6 +134,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
 	ARegion *ar = CTX_wm_region(C);
 	struct Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	PaintMaskFloodMode mode;
 	float value;
 	PBVH *pbvh;
@@ -145,7 +146,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
 	mode = RNA_enum_get(op->ptr, "mode");
 	value = RNA_float_get(op->ptr, "value");
 
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, true);
 	pbvh = ob->sculpt->pbvh;
 	multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
 
@@ -258,9 +259,9 @@ static void mask_box_select_task_cb(
 
 int ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti *rect, bool select, bool UNUSED(extend))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Sculpt *sd = vc->scene->toolsettings->sculpt;
 	BoundBox bb;
-	bglMats mats = {{0}};
 	float clip_planes[4][4];
 	float clip_planes_final[4][4];
 	ARegion *ar = vc->ar;
@@ -278,11 +279,10 @@ int ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti *r
 	value = select ? 1.0 : 0.0;
 
 	/* transform the clip planes in object space */
-	view3d_get_transformation(vc->ar, vc->rv3d, vc->obact, &mats);
-	ED_view3d_clipping_calc(&bb, clip_planes, &mats, rect);
+	ED_view3d_clipping_calc(&bb, clip_planes, vc->ar, vc->obact, rect);
 	negate_m4(clip_planes);
 
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, true);
 	pbvh = ob->sculpt->pbvh;
 	multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
 
@@ -424,9 +424,9 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 	const int (*mcords)[2] = WM_gesture_lasso_path_to_array(C, op, &mcords_tot);
 
 	if (mcords) {
+		Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		float clip_planes[4][4], clip_planes_final[4][4];
 		BoundBox bb;
-		bglMats mats = {{0}};
 		Object *ob;
 		ViewContext vc;
 		LassoMaskData data;
@@ -444,7 +444,6 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 		 * calculations done. Bounding box PBVH collision is not computed against enclosing rectangle
 		 * of lasso */
 		ED_view3d_viewcontext_init(C, &vc);
-		view3d_get_transformation(vc.ar, vc.rv3d, vc.obact, &mats);
 
 		/* lasso data calculations */
 		data.vc = &vc;
@@ -460,10 +459,10 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 		       mcords, mcords_tot,
 		       mask_lasso_px_cb, &data);
 
-		ED_view3d_clipping_calc(&bb, clip_planes, &mats, &data.rect);
+		ED_view3d_clipping_calc(&bb, clip_planes, vc.ar, vc.obact, &data.rect);
 		negate_m4(clip_planes);
 
-		BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+		BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, true);
 		pbvh = ob->sculpt->pbvh;
 		multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
 
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index f03c119a09e..3a8ab12b96d 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -47,6 +47,7 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_toolsystem.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -452,9 +453,23 @@ static int brush_select_exec(bContext *C, wmOperator *op)
 			return OPERATOR_CANCELLED;
 	}
 
-	return brush_generic_tool_set(bmain, paint, tool, tool_offset,
-	                              paint_mode, tool_name, create_missing,
-	                              toggle);
+	/* TODO(campbell): Use the toolsystem for now, ideally the toolsystem will display brushes directly
+	 * so we don't need to sync between tools and brushes. */
+	if (false) {
+		return brush_generic_tool_set(
+		            bmain, paint, tool, tool_offset,
+		            paint_mode, tool_name, create_missing,
+		            toggle);
+	}
+	else {
+		WorkSpace *workspace = CTX_wm_workspace(C);
+		if (WM_toolsystem_ref_set_by_name(C, workspace, NULL, tool_name, true)) {
+			return OPERATOR_FINISHED;
+		}
+		else {
+			return OPERATOR_CANCELLED;
+		}
+	}
 }
 
 static void PAINT_OT_brush_select(wmOperatorType *ot)
@@ -493,9 +508,10 @@ static void PAINT_OT_brush_select(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
-static wmKeyMapItem *keymap_brush_select(wmKeyMap *keymap, int paint_mode,
-                                         int tool, int keymap_type,
-                                         int keymap_modifier)
+static wmKeyMapItem *keymap_brush_select(
+        wmKeyMap *keymap, int paint_mode,
+        int tool, int keymap_type,
+        int keymap_modifier)
 {
 	wmKeyMapItem *kmi;
 	kmi = WM_keymap_add_item(keymap, "PAINT_OT_brush_select",
@@ -1035,7 +1051,6 @@ void ED_operatortypes_paint(void)
 	WM_operatortype_append(PAINT_OT_image_from_view);
 	WM_operatortype_append(PAINT_OT_brush_colors_flip);
 	WM_operatortype_append(PAINT_OT_add_texture_paint_slot);
-	WM_operatortype_append(PAINT_OT_delete_texture_paint_slot);
 	WM_operatortype_append(PAINT_OT_add_simple_uvs);
 
 	/* weight */
@@ -1081,20 +1096,6 @@ void ED_operatortypes_paint(void)
 	WM_operatortype_append(PAINT_OT_mask_lasso_gesture);
 }
 
-
-static void ed_keymap_paint_brush_switch(wmKeyMap *keymap, const char *mode)
-{
-	wmKeyMapItem *kmi;
-	int i;
-	/* index 0-9 (zero key is tenth), shift key for index 10-19 */
-	for (i = 0; i < 20; i++) {
-		kmi = WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set",
-		                         ZEROKEY + ((i + 1) % 10), KM_PRESS, i < 10 ? 0 : KM_SHIFT, 0);
-		RNA_string_set(kmi->ptr, "mode", mode);
-		RNA_int_set(kmi->ptr, "index", i);
-	}
-}
-
 static void ed_keymap_paint_brush_size(wmKeyMap *keymap, const char *UNUSED(path))
 {
 	wmKeyMapItem *kmi;
@@ -1299,7 +1300,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
 	RNA_int_set(kmi->ptr, "level", -1);
 	RNA_boolean_set(kmi->ptr, "relative", true);
 
-	ed_keymap_paint_brush_switch(keymap, "sculpt");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.sculpt.brush.size");
 	ed_keymap_paint_brush_radial_control(keymap, "sculpt", RC_ROTATION);
 
@@ -1339,7 +1339,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap,
 	                   "PAINT_OT_vertex_color_set", KKEY, KM_PRESS, KM_SHIFT, 0);
 
-	ed_keymap_paint_brush_switch(keymap, "vertex_paint");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.vertex_paint.brush.size");
 	ed_keymap_paint_brush_radial_control(keymap, "vertex_paint", RC_COLOR | RC_COLOR_OVERRIDE | RC_ROTATION);
 
@@ -1372,7 +1371,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap,
 	                   "PAINT_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
 
-	ed_keymap_paint_brush_switch(keymap, "weight_paint");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.weight_paint.brush.size");
 	ed_keymap_paint_brush_radial_control(keymap, "weight_paint", RC_WEIGHT);
 
@@ -1413,7 +1411,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "PAINT_OT_grab_clone", RIGHTMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "PAINT_OT_sample_color", SKEY, KM_PRESS, 0, 0);
 
-	ed_keymap_paint_brush_switch(keymap, "image_paint");
 	ed_keymap_paint_brush_size(keymap, "tool_settings.image_paint.brush.size");
 	ed_keymap_paint_brush_radial_control(
 	        keymap, "image_paint",
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index afd24f0fe90..b63f9461401 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -51,6 +51,7 @@
 #include "BKE_curve.h"
 #include "BKE_colortools.h"
 #include "BKE_image.h"
+#include "BKE_mesh.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -58,7 +59,7 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
+#include "GPU_immediate.h"
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
@@ -147,9 +148,23 @@ static void paint_draw_smooth_cursor(bContext *C, int x, int y, void *customdata
 	if (stroke && brush) {
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
-		glColor4ubv(paint->paint_cursor_col);
-		sdrawline(x, y, (int)stroke->last_mouse_position[0],
-		          (int)stroke->last_mouse_position[1]);
+
+		ARegion *ar = stroke->vc.ar;
+
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4ubv(paint->paint_cursor_col);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, x, y);
+		immVertex2f(pos,
+		            stroke->last_mouse_position[0] + ar->winrct.xmin,
+		            stroke->last_mouse_position[1] + ar->winrct.ymin);
+
+		immEnd();
+
+		immUnbindProgram();
+
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
 	}
@@ -161,36 +176,45 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata)
 	PaintStroke *stroke = customdata;
 
 	glEnable(GL_LINE_SMOOTH);
-	glEnable(GL_BLEND);
 
-	GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-	GPU_basic_shader_line_stipple(3, 0xAAAA);
-	GPU_basic_shader_line_width(3.0);
+	uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	glColor4ub(0, 0, 0, paint->paint_cursor_col[3]);
-	if (stroke->constrain_line) {
-		sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1],
-		        stroke->constrained_pos[0], stroke->constrained_pos[1]);
-	}
-	else {
-		sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1],
-		        x, y);
-	}
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+	immUniform1i("num_colors", 2);  /* "advanced" mode */
+	const float alpha = (float)paint->paint_cursor_col[3] / 255.0f;
+	immUniformArray4fv("colors", (float *)(float[][4]){{0.0f, 0.0f, 0.0f, alpha}, {1.0f, 1.0f, 1.0f, alpha}}, 2);
+	immUniform1f("dash_width", 6.0f);
+
+	immBegin(GWN_PRIM_LINES, 2);
+
+	ARegion *ar = stroke->vc.ar;
 
-	glColor4ub(255, 255, 255, paint->paint_cursor_col[3]);
-	GPU_basic_shader_line_width(1.0);
 	if (stroke->constrain_line) {
-		sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1],
-		        stroke->constrained_pos[0], stroke->constrained_pos[1]);
+		immVertex2f(shdr_pos,
+		            stroke->last_mouse_position[0] + ar->winrct.xmin,
+		            stroke->last_mouse_position[1] + ar->winrct.ymin);
+
+		immVertex2f(shdr_pos,
+		            stroke->constrained_pos[0] + ar->winrct.xmin,
+		            stroke->constrained_pos[1] + ar->winrct.ymin);
 	}
 	else {
-		sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1],
-		        x, y);
+		immVertex2f(shdr_pos,
+		            stroke->last_mouse_position[0] + ar->winrct.xmin,
+		            stroke->last_mouse_position[1] + ar->winrct.ymin);
+
+		immVertex2f(shdr_pos, x, y);
 	}
 
-	GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+	immEnd();
+
+	immUnbindProgram();
 
-	glDisable(GL_BLEND);
 	glDisable(GL_LINE_SMOOTH);
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c
index 77c9dcf8ac6..80c4d4099a2 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@ -50,17 +50,21 @@
 
 #include "BKE_brush.h"
 #include "BKE_context.h"
-#include "BKE_DerivedMesh.h"
+#include "BKE_customdata.h"
 #include "BKE_image.h"
 #include "BKE_material.h"
+#include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
@@ -130,17 +134,12 @@ bool paint_convert_bb_to_rect(rcti *rect,
  * 2D screens-space bounding box into four 3D planes) */
 void paint_calc_redraw_planes(float planes[4][4],
                               const ARegion *ar,
-                              RegionView3D *rv3d,
                               Object *ob,
                               const rcti *screen_rect)
 {
 	BoundBox bb;
-	bglMats mats;
 	rcti rect;
 
-	memset(&bb, 0, sizeof(BoundBox));
-	view3d_get_transformation(ar, rv3d, ob, &mats);
-
 	/* use some extra space just in case */
 	rect = *screen_rect;
 	rect.xmin -= 2;
@@ -148,7 +147,7 @@ void paint_calc_redraw_planes(float planes[4][4],
 	rect.ymin -= 2;
 	rect.ymax += 2;
 
-	ED_view3d_clipping_calc(&bb, planes, &mats, &rect);
+	ED_view3d_clipping_calc(&bb, planes, ar, ob, &rect);
 	negate_m4(planes);
 }
 
@@ -277,26 +276,26 @@ static void imapaint_tri_weights(float matrix[4][4], GLint view[4],
 }
 
 /* compute uv coordinates of mouse in face */
-static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, const int xy[2], float uv[2])
+static void imapaint_pick_uv(Mesh *me_eval, Scene *scene, Object *ob_eval, unsigned int faceindex, const int xy[2], float uv[2])
 {
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
-	const int tottri = dm->getNumLoopTri(dm);
+	const int tottri = me_eval->runtime.looptris.len;
 	int i, findex;
 	float p[2], w[3], absw, minabsw;
 	float matrix[4][4], proj[4][4];
 	GLint view[4];
 	const eImagePaintMode mode = scene->toolsettings->imapaint.mode;
-	const MLoopTri *lt = dm->getLoopTriArray(dm);
-	const MPoly *mpoly = dm->getPolyArray(dm);
-	const MLoop *mloop = dm->getLoopArray(dm);
-	const int *index_mp_to_orig  = dm->getPolyDataArray(dm, CD_ORIGINDEX);
+	const MLoopTri *lt = me_eval->runtime.looptris.array;
+	const MVert *mvert = me_eval->mvert;
+	const MPoly *mpoly = me_eval->mpoly;
+	const MLoop *mloop = me_eval->mloop;
+	const int *index_mp_to_orig  = CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX);
 
 	/* get the needed opengl matrices */
 	glGetIntegerv(GL_VIEWPORT, view);
-	glGetFloatv(GL_MODELVIEW_MATRIX,  (float *)matrix);
-	glGetFloatv(GL_PROJECTION_MATRIX, (float *)proj);
+	gpuGetModelViewMatrix(matrix);
+	gpuGetProjectionMatrix(proj);
 	view[0] = view[1] = 0;
-	mul_m4_m4m4(matrix, matrix, ob->obmat);
+	mul_m4_m4m4(matrix, matrix, ob_eval->obmat);
 	mul_m4_m4m4(matrix, proj, matrix);
 
 	minabsw = 1e10;
@@ -313,25 +312,25 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
 			const MLoopUV *tri_uv[3];
 			float  tri_co[3][3];
 
-			dm->getVertCo(dm, mloop[lt->tri[0]].v, tri_co[0]);
-			dm->getVertCo(dm, mloop[lt->tri[1]].v, tri_co[1]);
-			dm->getVertCo(dm, mloop[lt->tri[2]].v, tri_co[2]);
+			for (int j = 3; j--; ) {
+				copy_v3_v3(tri_co[j], mvert[mloop[lt->tri[j]].v].co);
+			}
 
 			if (mode == IMAGEPAINT_MODE_MATERIAL) {
 				const Material *ma;
 				const TexPaintSlot *slot;
 
-				ma = dm->mat[mp->mat_nr];
+				ma = give_current_material(ob_eval, mp->mat_nr);
 				slot = &ma->texpaintslot[ma->paint_active_slot];
 
 				if (!(slot && slot->uvname &&
-				      (mloopuv = CustomData_get_layer_named(&dm->loopData, CD_MLOOPUV, slot->uvname))))
+				      (mloopuv = CustomData_get_layer_named(&me_eval->ldata, CD_MLOOPUV, slot->uvname))))
 				{
-					mloopuv = CustomData_get_layer(&dm->loopData, CD_MLOOPUV);
+					mloopuv = CustomData_get_layer(&me_eval->ldata, CD_MLOOPUV);
 				}
 			}
 			else {
-				mloopuv = CustomData_get_layer(&dm->loopData, CD_MLOOPUV);
+				mloopuv = CustomData_get_layer(&me_eval->ldata, CD_MLOOPUV);
 			}
 
 			tri_uv[0] = &mloopuv[lt->tri[0]];
@@ -350,12 +349,12 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
 			}
 		}
 	}
-
-	dm->release(dm);
 }
 
 /* returns 0 if not found, otherwise 1 */
-static int imapaint_pick_face(ViewContext *vc, const int mval[2], unsigned int *r_index, unsigned int totpoly)
+static int imapaint_pick_face(
+        ViewContext *vc, const int mval[2],
+        unsigned int *r_index, unsigned int totpoly)
 {
 	if (totpoly == 0)
 		return 0;
@@ -427,6 +426,7 @@ void flip_qt_qt(float out[4], const float in[4], const char symm)
 void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_proj, bool use_palette)
 {
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Paint *paint = BKE_paint_get_active_from_context(C);
 	Palette *palette = BKE_paint_palette(paint);
 	PaletteColor *color = NULL;
@@ -450,21 +450,23 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 
 	if (CTX_wm_view3d(C) && texpaint_proj) {
 		/* first try getting a colour directly from the mesh faces if possible */
-		Object *ob = OBACT;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Object *ob = OBACT(view_layer);
+		Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 		bool sample_success = false;
 		ImagePaintSettings *imapaint = &scene->toolsettings->imapaint;
 		bool use_material = (imapaint->mode == IMAGEPAINT_MODE_MATERIAL);
 
 		if (ob) {
 			Mesh *me = (Mesh *)ob->data;
-			DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
+			Mesh *me_eval = BKE_object_get_evaluated_mesh(depsgraph, ob);  /* Or shall we just do ob_eval->mesh_eval ? */
 
 			ViewContext vc;
 			const int mval[2] = {x, y};
 			unsigned int faceindex;
 			unsigned int totpoly = me->totpoly;
 
-			if (dm->getLoopDataArray(dm, CD_MLOOPUV)) {
+			if (CustomData_has_layer(&me_eval->ldata, CD_MLOOPUV)) {
 				ED_view3d_viewcontext_init(C, &vc);
 
 				view3d_operator_needs_opengl(C);
@@ -473,7 +475,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 					Image *image;
 
 					if (use_material)
-						image = imapaint_face_image(ob, me, faceindex);
+						image = imapaint_face_image(ob_eval, me_eval, faceindex);
 					else
 						image = imapaint->canvas;
 
@@ -482,7 +484,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 						if (ibuf && ibuf->rect) {
 							float uv[2];
 							float u, v;
-							imapaint_pick_uv(scene, ob, faceindex, mval, uv);
+							imapaint_pick_uv(me_eval, scene, ob_eval, faceindex, mval, uv);
 							sample_success = true;
 
 							u = fmodf(uv[0], 1.0f);
@@ -496,10 +498,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 
 							if (ibuf->rect_float) {
 								float rgba_f[4];
-								if (U.gameflags & USER_DISABLE_MIPMAP)
-									nearest_interpolation_color_wrap(ibuf, NULL, rgba_f, u, v);
-								else
-									bilinear_interpolation_color_wrap(ibuf, NULL, rgba_f, u, v);
+								bilinear_interpolation_color_wrap(ibuf, NULL, rgba_f, u, v);
 								straight_to_premul_v4(rgba_f);
 								if (use_palette) {
 									linearrgb_to_srgb_v3_v3(color->rgb, rgba_f);
@@ -511,10 +510,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 							}
 							else {
 								unsigned char rgba[4];
-								if (U.gameflags & USER_DISABLE_MIPMAP)
-									nearest_interpolation_color_wrap(ibuf, rgba, NULL, u, v);
-								else
-									bilinear_interpolation_color_wrap(ibuf, rgba, NULL, u, v);
+								bilinear_interpolation_color_wrap(ibuf, rgba, NULL, u, v);
 								if (use_palette) {
 									rgb_uchar_to_float(color->rgb, rgba);
 								}
@@ -530,7 +526,6 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
 					}
 				}
 			}
-			dm->release(dm);
 		}
 
 		if (!sample_success) {
@@ -564,8 +559,9 @@ static int brush_curve_preset_exec(bContext *C, wmOperator *op)
 
 	if (br) {
 		Scene *scene = CTX_data_scene(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 		BKE_brush_curve_preset(br, RNA_enum_get(op->ptr, "shape"));
-		BKE_paint_invalidate_cursor_overlay(scene, br->curve);
+		BKE_paint_invalidate_cursor_overlay(scene, view_layer, br->curve);
 	}
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index a496c4cb01d..53b73562322 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -54,8 +54,9 @@
 
 #include "BKE_brush.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_deform.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_object_deform.h"
@@ -63,8 +64,12 @@
 #include "BKE_report.h"
 #include "BKE_subsurf.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "ED_object.h"
 #include "ED_mesh.h"
@@ -203,7 +208,7 @@ int vertex_paint_mode_poll(bContext *C)
 	return ob && ob->mode == OB_MODE_VERTEX_PAINT && ((Mesh *)ob->data)->totpoly;
 }
 
-int vertex_paint_poll(bContext *C)
+static int vertex_paint_poll_ex(bContext *C, bool check_tool)
 {
 	if (vertex_paint_mode_poll(C) &&
 	    BKE_paint_brush(&CTX_data_tool_settings(C)->vpaint->paint))
@@ -211,13 +216,26 @@ int vertex_paint_poll(bContext *C)
 		ScrArea *sa = CTX_wm_area(C);
 		if (sa && sa->spacetype == SPACE_VIEW3D) {
 			ARegion *ar = CTX_wm_region(C);
-			if (ar->regiontype == RGN_TYPE_WINDOW)
-				return 1;
+			if (ar->regiontype == RGN_TYPE_WINDOW) {
+				if (!check_tool || WM_toolsystem_active_tool_is_brush(C)) {
+					return 1;
+				}
+			}
 		}
 	}
 	return 0;
 }
 
+int vertex_paint_poll(bContext *C)
+{
+	return vertex_paint_poll_ex(C, true);
+}
+
+int vertex_paint_poll_ignore_tool(bContext *C)
+{
+	return vertex_paint_poll_ex(C, true);
+}
+
 int weight_paint_mode_poll(bContext *C)
 {
 	Object *ob = CTX_data_active_object(C);
@@ -225,7 +243,7 @@ int weight_paint_mode_poll(bContext *C)
 	return ob && ob->mode == OB_MODE_WEIGHT_PAINT && ((Mesh *)ob->data)->totpoly;
 }
 
-int weight_paint_poll(bContext *C)
+static int weight_paint_poll_ex(bContext *C, bool check_tool)
 {
 	Object *ob = CTX_data_active_object(C);
 	ScrArea *sa;
@@ -238,12 +256,24 @@ int weight_paint_poll(bContext *C)
 	{
 		ARegion *ar = CTX_wm_region(C);
 		if (ar->regiontype == RGN_TYPE_WINDOW) {
-			return 1;
+			if (!check_tool || WM_toolsystem_active_tool_is_brush(C)) {
+				return 1;
+			}
 		}
 	}
 	return 0;
 }
 
+int weight_paint_poll(bContext *C)
+{
+	return weight_paint_poll_ex(C, true);
+}
+
+int weight_paint_poll_ignore_tool(bContext *C)
+{
+	return weight_paint_poll_ex(C, false);
+}
+
 static VPaint *new_vpaint(void)
 {
 	VPaint *vp = MEM_callocN(sizeof(VPaint), "VPaint");
@@ -937,14 +967,14 @@ static void do_weight_paint_vertex(
 
 
 /* Toggle operator for turning vertex paint mode on or off (copied from sculpt.c) */
-static void vertex_paint_init_session(Scene *scene, Object *ob)
+static void vertex_paint_init_session(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
 	/* Create persistent sculpt mode data */
 	BKE_sculpt_toolsettings_data_ensure(scene);
 
 	if (ob->sculpt == NULL) {
 		ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
-		BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, 0, false);
+		BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, 0, false);
 	}
 }
 
@@ -1031,8 +1061,7 @@ static void vertex_paint_init_session_data(const ToolSettings *ts, Object *ob)
  * \{ */
 
 static void ed_vwpaintmode_enter_generic(
-        wmWindowManager *wm,
-        Scene *scene,
+        Depsgraph *depsgraph, wmWindowManager *wm, Scene *scene,
         Object *ob, const eObjectMode mode_flag)
 {
 	ob->mode |= mode_flag;
@@ -1078,37 +1107,39 @@ static void ed_vwpaintmode_enter_generic(
 		BKE_sculptsession_free(ob);
 	}
 
-	vertex_paint_init_session(scene, ob);
+	vertex_paint_init_session(depsgraph, scene, ob);
 }
 
 void ED_object_vpaintmode_enter_ex(
-        wmWindowManager *wm,
+        Depsgraph *depsgraph, wmWindowManager *wm,
         Scene *scene, Object *ob)
 {
 	ed_vwpaintmode_enter_generic(
-	        wm, scene, ob, OB_MODE_VERTEX_PAINT);
+	        depsgraph, wm, scene, ob, OB_MODE_VERTEX_PAINT);
 }
 void ED_object_vpaintmode_enter(struct bContext *C)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	ED_object_vpaintmode_enter_ex(wm, scene, ob);
+	ED_object_vpaintmode_enter_ex(depsgraph, wm, scene, ob);
 }
 
 void ED_object_wpaintmode_enter_ex(
-        wmWindowManager *wm,
+        Depsgraph *depsgraph, wmWindowManager *wm,
         Scene *scene, Object *ob)
 {
 	ed_vwpaintmode_enter_generic(
-	        wm, scene, ob, OB_MODE_WEIGHT_PAINT);
+	        depsgraph, wm, scene, ob, OB_MODE_WEIGHT_PAINT);
 }
 void ED_object_wpaintmode_enter(struct bContext *C)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	ED_object_wpaintmode_enter_ex(wm, scene, ob);
+	ED_object_wpaintmode_enter_ex(depsgraph, wm, scene, ob);
 }
 
 /** \} */
@@ -1157,6 +1188,8 @@ static void ed_vwpaintmode_exit_generic(
 		ED_mesh_mirror_spatial_table(NULL, NULL, NULL, NULL, 'e');
 		ED_mesh_mirror_topo_table(NULL, NULL, 'e');
 	}
+
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 }
 
 void ED_object_vpaintmode_exit_ex(Object *ob)
@@ -1188,6 +1221,7 @@ void ED_object_wpaintmode_exit(struct bContext *C)
  */
 static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
 	Object *ob = CTX_data_active_object(C);
 	const int mode_flag = OB_MODE_WEIGHT_PAINT;
 	const bool is_mode_set = (ob->mode & mode_flag) != 0;
@@ -1205,8 +1239,9 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op)
 		ED_object_wpaintmode_exit_ex(ob);
 	}
 	else {
+		Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C);
 		wmWindowManager *wm = CTX_wm_manager(C);
-		ED_object_wpaintmode_enter_ex(wm, scene, ob);
+		ED_object_wpaintmode_enter_ex(depsgraph, wm, scene, ob);
 	}
 
 	/* Weightpaint works by overriding colors in mesh,
@@ -1214,10 +1249,14 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op)
 	 * exit (exit needs doing regardless because we
 	 * should redeform).
 	 */
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
 
+	WM_msg_publish_rna_prop(mbus, &ob->id, ob, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -1397,6 +1436,7 @@ static bool wpaint_stroke_test_start(bContext *C, wmOperator *op, const float mo
 	bool *defbase_sel;
 	SculptSession *ss = ob->sculpt;
 	VPaint *vp = CTX_data_tool_settings(C)->wpaint;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	if (ED_wpaint_ensure_data(C, op->reports, WPAINT_ENSURE_MIRROR, &vgroup_index) == false) {
 		return false;
@@ -1500,7 +1540,7 @@ static bool wpaint_stroke_test_start(bContext *C, wmOperator *op, const float mo
 	}
 
 	/* If not previously created, create vertex/weight paint mode session data */
-	vertex_paint_init_session(scene, ob);
+	vertex_paint_init_session(depsgraph, scene, ob);
 	vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
 	vertex_paint_init_session_data(ts, ob);
 
@@ -1941,7 +1981,8 @@ static void wpaint_paint_leaves(
 
 	/* threaded loop over nodes */
 	SculptThreadedTaskData data = {
-		.sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .wpd = wpd, .wpi = wpi, .me = me, .C = C,
+		 .C = C, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes,
+		 .vp = vp, .wpd = wpd, .wpi = wpi, .me = me,
 	};
 
 	/* Use this so average can modify its weight without touching the brush. */
@@ -2169,7 +2210,9 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 	/* also needed for "View Selected" on last stroke */
 	paint_last_stroke_update(scene, vc->ar, mval);
 
-	DAG_id_tag_update(ob->data, 0);
+	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+
+	DEG_id_tag_update(ob->data, 0);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	swap_m4m4(wpd->vc.rv3d->persmat, mat);
 
@@ -2233,7 +2276,7 @@ static void wpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
 		}
 	}
 
-	DAG_id_tag_update(ob->data, 0);
+	DEG_id_tag_update(ob->data, 0);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
@@ -2315,6 +2358,7 @@ void PAINT_OT_weight_paint(wmOperatorType *ot)
  */
 static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
 	Object *ob = CTX_data_active_object(C);
 	const int mode_flag = OB_MODE_VERTEX_PAINT;
 	const bool is_mode_set = (ob->mode & mode_flag) != 0;
@@ -2333,15 +2377,22 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
 		ED_object_vpaintmode_exit_ex(ob);
 	}
 	else {
+		Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C);
 		wmWindowManager *wm = CTX_wm_manager(C);
-		ED_object_vpaintmode_enter_ex(wm, scene, ob);
+		ED_object_vpaintmode_enter_ex(depsgraph, wm, scene, ob);
 	}
 
+	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+
 	/* update modifier stack for mapping requirements */
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
 
+	WM_msg_publish_rna_prop(mbus, &ob->id, ob, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
 	return OPERATOR_FINISHED;
 }
 
@@ -2424,6 +2475,7 @@ static bool vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const f
 	Object *ob = CTX_data_active_object(C);
 	Mesh *me;
 	SculptSession *ss = ob->sculpt;
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 
 	/* context checks could be a poll() */
 	me = BKE_mesh_from_object(ob);
@@ -2471,12 +2523,12 @@ static bool vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const f
 	/* Create projection handle */
 	if (vpd->is_texbrush) {
 		ob->sculpt->building_vp_handle = true;
-		vpd->vp_handle = ED_vpaint_proj_handle_create(scene, ob, &vpd->vertexcosnos);
+		vpd->vp_handle = ED_vpaint_proj_handle_create(depsgraph, scene, ob, &vpd->vertexcosnos);
 		ob->sculpt->building_vp_handle = false;
 	}
 
 	/* If not previously created, create vertex/weight paint mode session data */
-	vertex_paint_init_session(scene, ob);
+	vertex_paint_init_session(depsgraph, scene, ob);
 	vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
 	vertex_paint_init_session_data(ts, ob);
 
@@ -2932,8 +2984,8 @@ static void vpaint_paint_leaves(
 	const Brush *brush = ob->sculpt->cache->brush;
 
 	SculptThreadedTaskData data = {
-		.sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .vpd = vpd,
-		.lcol = (uint *)me->mloopcol, .me = me, .C = C,
+		.C = C, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .vpd = vpd,
+		.lcol = (uint *)me->mloopcol, .me = me,
 	};
 	ParallelRangeSettings settings;
 	BLI_parallel_range_settings_defaults(&settings);
@@ -3070,6 +3122,8 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 
 	swap_m4m4(vc->rv3d->persmat, mat);
 
+	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+
 	if (vp->paint.brush->vertexpaint_tool == PAINT_BLEND_SMEAR) {
 		memcpy(vpd->smear.color_prev, vpd->smear.color_curr, sizeof(uint) * ((Mesh *)ob->data)->totloop);
 	}
@@ -3083,11 +3137,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 	if (vpd->use_fast_update == false) {
 		/* recalculate modifier stack to get new colors, slow,
 		 * avoid this if we can! */
-		DAG_id_tag_update(ob->data, 0);
-	}
-	else {
-		/* If using new VBO drawing, mark mcol as dirty to force colors gpu buffer refresh! */
-		ob->derivedFinal->dirty |= DM_DIRTY_MCOL_UPDATE_DRAW;
+		DEG_id_tag_update(ob->data, 0);
 	}
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
index b69ca32e5af..d7668a48139 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
@@ -33,10 +33,11 @@
 #include "BLI_math_color.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 #include "BKE_deform.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -97,7 +98,7 @@ static bool vertex_color_set(Object *ob, uint paintcol)
 	/* remove stale me->mcol, will be added later */
 	BKE_mesh_tessface_clear(me);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	return true;
 }
@@ -168,7 +169,7 @@ static bool vertex_paint_from_weight(Object *ob)
 		} while (j < mp->totloop);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	return true;
 }
@@ -304,7 +305,7 @@ static bool vertex_color_smooth(Object *ob)
 
 	MEM_freeN(mlooptag);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	return true;
 }
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
index a0bd5ea2a2d..481d5e7d5ea 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
@@ -38,9 +38,10 @@
 #include "IMB_colormanagement.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_mesh.h"
 
 #include "paint_intern.h"  /* own include */
@@ -87,7 +88,7 @@ bool ED_vpaint_color_transform(
 	/* remove stale me->mcol, will be added later */
 	BKE_mesh_tessface_clear(me);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	return true;
 }
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.c b/source/blender/editors/sculpt_paint/paint_vertex_proj.c
index 411a0ca9ec3..c5c9aa48760 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.c
@@ -42,6 +42,8 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
@@ -100,13 +102,13 @@ static void vpaint_proj_dm_map_cosnos_init__map_cb(
 }
 
 static void vpaint_proj_dm_map_cosnos_init(
-        Scene *scene, Object *ob,
+        struct Depsgraph *depsgraph, Scene *scene, Object *ob,
         struct VertProjHandle *vp_handle)
 {
 	Mesh *me = ob->data;
 	DerivedMesh *dm;
 
-	dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
+	dm = mesh_get_derived_final(depsgraph, scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
 
 	if (dm->foreachMappedVert) {
 		memset(vp_handle->vcosnos, 0, sizeof(DMCoNo) * me->totvert);
@@ -174,7 +176,7 @@ static void vpaint_proj_dm_map_cosnos_update__map_cb(
 }
 
 static void vpaint_proj_dm_map_cosnos_update(
-        struct VertProjHandle *vp_handle,
+        struct Depsgraph *depsgraph, struct VertProjHandle *vp_handle,
         ARegion *ar, const float mval_fl[2])
 {
 	struct VertProjUpdate vp_update = {vp_handle, ar, mval_fl};
@@ -187,7 +189,7 @@ static void vpaint_proj_dm_map_cosnos_update(
 	/* quick sanity check - we shouldn't have to run this if there are no modifiers */
 	BLI_assert(BLI_listbase_is_empty(&ob->modifiers) == false);
 
-	dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
+	dm = mesh_get_derived_final(depsgraph, scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
 
 	/* highly unlikely this will become unavailable once painting starts (perhaps with animated modifiers) */
 	if (LIKELY(dm->foreachMappedVert)) {
@@ -204,7 +206,7 @@ static void vpaint_proj_dm_map_cosnos_update(
 /* Public Functions */
 
 struct VertProjHandle *ED_vpaint_proj_handle_create(
-        Scene *scene, Object *ob,
+        struct Depsgraph *depsgraph, Scene *scene, Object *ob,
         DMCoNo **r_vcosnos)
 {
 	struct VertProjHandle *vp_handle = MEM_mallocN(sizeof(struct VertProjHandle), __func__);
@@ -215,7 +217,7 @@ struct VertProjHandle *ED_vpaint_proj_handle_create(
 	vp_handle->use_update = false;
 
 	/* sets 'use_update' if needed */
-	vpaint_proj_dm_map_cosnos_init(scene, ob, vp_handle);
+	vpaint_proj_dm_map_cosnos_init(depsgraph, scene, ob, vp_handle);
 
 	if (vp_handle->use_update) {
 		vp_handle->dists_sq = MEM_mallocN(sizeof(float) * me->totvert, __func__);
@@ -235,11 +237,11 @@ struct VertProjHandle *ED_vpaint_proj_handle_create(
 }
 
 void  ED_vpaint_proj_handle_update(
-        struct VertProjHandle *vp_handle,
+        struct Depsgraph *depsgraph, struct VertProjHandle *vp_handle,
         ARegion *ar, const float mval_fl[2])
 {
 	if (vp_handle->use_update) {
-		vpaint_proj_dm_map_cosnos_update(vp_handle, ar, mval_fl);
+		vpaint_proj_dm_map_cosnos_update(depsgraph, vp_handle, ar, mval_fl);
 	}
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
index 957cb6a7389..e560a4cddff 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
@@ -49,7 +49,6 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_brush.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_deform.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
@@ -59,6 +58,8 @@
 #include "BKE_report.h"
 #include "BKE_colortools.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -124,15 +125,16 @@ static int weight_from_bones_poll(bContext *C)
 
 static int weight_from_bones_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	Object *armob = modifiers_isDeformedByArmature(ob);
 	Mesh *me = ob->data;
 	int type = RNA_enum_get(op->ptr, "type");
 
-	ED_object_vgroup_calc_from_armature(op->reports, scene, ob, armob, type, (me->editflag & ME_EDIT_MIRROR_X));
+	ED_object_vgroup_calc_from_armature(op->reports, depsgraph, scene, ob, armob, type, (me->editflag & ME_EDIT_MIRROR_X));
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 	return OPERATOR_FINISHED;
@@ -366,7 +368,7 @@ static int weight_sample_group_exec(bContext *C, wmOperator *op)
 	BLI_assert(type + 1 >= 0);
 	vc.obact->actdef = type + 1;
 
-	DAG_id_tag_update(&vc.obact->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&vc.obact->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, vc.obact);
 	return OPERATOR_FINISHED;
 }
@@ -482,7 +484,7 @@ static bool weight_paint_set(Object *ob, float paintweight)
 
 	wpaint_prev_destroy(&wpp);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 
 	return true;
 }
@@ -694,7 +696,7 @@ static int paint_weight_gradient_modal(bContext *C, wmOperator *op, const wmEven
 		}
 		MEM_freeN(vert_cache);
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	}
 	else if (ret & OPERATOR_FINISHED) {
@@ -720,7 +722,10 @@ static int paint_weight_gradient_exec(bContext *C, wmOperator *op)
 	float sco_start[2] = {x_start, y_start};
 	float sco_end[2] = {x_end, y_end};
 	const bool is_interactive = (gesture != NULL);
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
+
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
+	DerivedMesh *dm = mesh_get_derived_final(depsgraph, scene, ob, scene->customdata_mask);
 
 	DMGradient_userData data = {NULL};
 
@@ -792,7 +797,7 @@ static int paint_weight_gradient_exec(bContext *C, wmOperator *op)
 		dm->foreachMappedVert(dm, gradientVertUpdate__mapFunc, &data, DM_FOREACH_NOP);
 	}
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
 	if (is_interactive == false) {
@@ -844,7 +849,7 @@ void PAINT_OT_weight_gradient(wmOperatorType *ot)
 	ot->invoke = paint_weight_gradient_invoke;
 	ot->modal = paint_weight_gradient_modal;
 	ot->exec = paint_weight_gradient_exec;
-	ot->poll = weight_paint_poll;
+	ot->poll = weight_paint_poll_ignore_tool;
 	ot->cancel = WM_gesture_straightline_cancel;
 
 	/* flags */
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
index 197b16ffe6e..51cd759b260 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
@@ -43,6 +43,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
+#include "BKE_object.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -58,7 +59,6 @@ bool ED_wpaint_ensure_data(
         bContext *C, struct ReportList *reports,
         enum eWPaintFlag flag, struct WPaintVGroupIndex *vgroup_index)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	Mesh *me = BKE_mesh_from_object(ob);
 
@@ -67,7 +67,7 @@ bool ED_wpaint_ensure_data(
 		vgroup_index->mirror = -1;
 	}
 
-	if (scene->obedit) {
+	if (BKE_object_is_in_editmode(ob)) {
 		return false;
 	}
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index ca4ad39d14e..5dd7f23864c 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -56,7 +56,6 @@
 #include "BKE_brush.h"
 #include "BKE_ccg.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_key.h"
@@ -73,8 +72,12 @@
 #include "BKE_subsurf.h"
 #include "BKE_colortools.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "ED_sculpt.h"
 #include "ED_object.h"
@@ -86,9 +89,6 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "GPU_buffers.h"
-#include "GPU_extensions.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"
 
@@ -500,8 +500,7 @@ bool sculpt_get_redraw_rect(ARegion *ar, RegionView3D *rv3d,
 	return 1;
 }
 
-void ED_sculpt_redraw_planes_get(float planes[4][4], ARegion *ar,
-                                 RegionView3D *rv3d, Object *ob)
+void ED_sculpt_redraw_planes_get(float planes[4][4], ARegion *ar, Object *ob)
 {
 	PBVH *pbvh = ob->sculpt->pbvh;
 	/* copy here, original will be used below */
@@ -509,7 +508,7 @@ void ED_sculpt_redraw_planes_get(float planes[4][4], ARegion *ar,
 
 	sculpt_extend_redraw_rect_previous(ob, &rect);
 
-	paint_calc_redraw_planes(planes, ar, rv3d, ob, &rect);
+	paint_calc_redraw_planes(planes, ar, ob, &rect);
 
 	/* we will draw this rect, so now we can set it as the previous partial rect.
 	 * Note that we don't update with the union of previous/current (rect), only with
@@ -2101,6 +2100,10 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
 	mul_v3_v3(offset, ss->cache->scale);
 	mul_v3_fl(offset, bstrength);
 
+	/* XXX - this shouldn't be necessary, but sculpting crashes in blender2.8 otherwise
+	 * initialize before threads so they can do curve mapping */
+	curvemapping_initialize(brush->curve);
+
 	/* threaded loop over nodes */
 	SculptThreadedTaskData data = {
 	    .sd = sd, .ob = ob, .brush = brush, .nodes = nodes,
@@ -4600,10 +4603,11 @@ static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob, const B
 	SculptSession *ss = ob->sculpt;
 
 	if (ss->kb || ss->modifiers_active) {
+		Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		Scene *scene = CTX_data_scene(C);
 		Sculpt *sd = scene->toolsettings->sculpt;
 		bool need_pmap = sculpt_any_smooth_mode(brush, ss->cache, 0);
-		BKE_sculpt_update_mesh_elements(scene, sd, ob, need_pmap, false);
+		BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, need_pmap, false);
 	}
 }
 
@@ -4688,7 +4692,7 @@ static float sculpt_raycast_init(
 	RegionView3D *rv3d = vc->ar->regiondata;
 
 	/* TODO: what if the segment is totally clipped? (return == 0) */
-	ED_view3d_win_to_segment(vc->ar, vc->v3d, mouse, ray_start, ray_end, true);
+	ED_view3d_win_to_segment(vc->depsgraph, vc->ar, vc->v3d, mouse, ray_start, ray_end, true);
 
 	invert_m4_m4(obimat, ob->obmat);
 	mul_m4_v3(obimat, ray_start);
@@ -4806,6 +4810,7 @@ static void sculpt_brush_init_tex(const Scene *scene, Sculpt *sd, SculptSession
 
 static bool sculpt_brush_stroke_init(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
@@ -4823,7 +4828,7 @@ static bool sculpt_brush_stroke_init(bContext *C, wmOperator *op)
 	sculpt_brush_init_tex(scene, sd, ss);
 
 	is_smooth = sculpt_any_smooth_mode(brush, NULL, mode);
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, is_smooth, need_mask);
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, is_smooth, need_mask);
 
 	return 1;
 }
@@ -4863,11 +4868,9 @@ static void sculpt_flush_update(bContext *C)
 
 	if (mmd)
 		multires_mark_as_modified(ob, MULTIRES_COORDS_MODIFIED);
-	if (ob->derivedFinal) /* VBO no longer valid */
-		GPU_drawobject_free(ob->derivedFinal);
 
 	if (ss->kb || ss->modifiers_active) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		ED_region_tag_redraw(ar);
 	}
 	else {
@@ -4897,6 +4900,9 @@ static void sculpt_flush_update(bContext *C)
 			ED_region_tag_redraw_partial(ar, &r);
 		}
 	}
+
+	/* 2.8x - avoid full mesh update! */
+	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
 }
 
 /* Returns whether the mouse/stylus is over the mesh (1)
@@ -4980,7 +4986,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st
 	 * Could be optimized later, but currently don't think it's so
 	 * much common scenario.
 	 *
-	 * Same applies to the DAG_id_tag_update() invoked from
+	 * Same applies to the DEG_id_tag_update() invoked from
 	 * sculpt_flush_update().
 	 */
 	if (ss->modifiers_active) {
@@ -5055,7 +5061,7 @@ static void sculpt_stroke_done(const bContext *C, struct PaintStroke *UNUSED(str
 
 		/* try to avoid calling this, only for e.g. linked duplicates now */
 		if (((Mesh *)ob->data)->id.us > 1)
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 	}
@@ -5248,16 +5254,18 @@ void sculpt_dyntopo_node_layers_add(SculptSession *ss)
 
 
 void sculpt_update_after_dynamic_topology_toggle(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob)
 {
 	Sculpt *sd = scene->toolsettings->sculpt;
 
 	/* Create the PBVH */
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, false, false);
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, false);
 	WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
 }
 
 void sculpt_dynamic_topology_enable_ex(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob)
 {
 	SculptSession *ss = ob->sculpt;
@@ -5295,7 +5303,7 @@ void sculpt_dynamic_topology_enable_ex(
 	ss->bm_log = BM_log_create(ss->bm);
 
 	/* Refresh */
-	sculpt_update_after_dynamic_topology_toggle(scene, ob);
+	sculpt_update_after_dynamic_topology_toggle(depsgraph, scene, ob);
 }
 
 /* Free the sculpt BMesh and BMLog
@@ -5303,6 +5311,7 @@ void sculpt_dynamic_topology_enable_ex(
  * If 'unode' is given, the BMesh's data is copied out to the unode
  * before the BMesh is deleted so that it can be restored from */
 void sculpt_dynamic_topology_disable_ex(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob, SculptUndoNode *unode)
 {
 	SculptSession *ss = ob->sculpt;
@@ -5353,35 +5362,37 @@ void sculpt_dynamic_topology_disable_ex(
 	}
 
 	/* Refresh */
-	sculpt_update_after_dynamic_topology_toggle(scene, ob);
+	sculpt_update_after_dynamic_topology_toggle(depsgraph, scene, ob);
 }
 
 void sculpt_dynamic_topology_disable(bContext *C, SculptUndoNode *unode)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	sculpt_dynamic_topology_disable_ex(scene, ob, unode);
+	sculpt_dynamic_topology_disable_ex(depsgraph, scene, ob, unode);
 }
 
 static void sculpt_dynamic_topology_disable_with_undo(
-        Scene *scene, Object *ob)
+        Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
 	SculptSession *ss = ob->sculpt;
 	if (ss->bm) {
 		sculpt_undo_push_begin("Dynamic topology disable");
 		sculpt_undo_push_node(ob, NULL, SCULPT_UNDO_DYNTOPO_END);
-		sculpt_dynamic_topology_disable_ex(scene, ob, NULL);
+		sculpt_dynamic_topology_disable_ex(depsgraph, scene, ob, NULL);
 		sculpt_undo_push_end();
 	}
 }
 
 static void sculpt_dynamic_topology_enable_with_undo(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob)
 {
 	SculptSession *ss = ob->sculpt;
 	if (ss->bm == NULL) {
 		sculpt_undo_push_begin("Dynamic topology enable");
-		sculpt_dynamic_topology_enable_ex(scene, ob);
+		sculpt_dynamic_topology_enable_ex(depsgraph, scene, ob);
 		sculpt_undo_push_node(ob, NULL, SCULPT_UNDO_DYNTOPO_BEGIN);
 		sculpt_undo_push_end();
 	}
@@ -5389,6 +5400,7 @@ static void sculpt_dynamic_topology_enable_with_undo(
 
 static int sculpt_dynamic_topology_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	SculptSession *ss = ob->sculpt;
@@ -5396,10 +5408,10 @@ static int sculpt_dynamic_topology_toggle_exec(bContext *C, wmOperator *UNUSED(o
 	WM_cursor_wait(1);
 
 	if (ss->bm) {
-		sculpt_dynamic_topology_disable_with_undo(scene, ob);
+		sculpt_dynamic_topology_disable_with_undo(depsgraph, scene, ob);
 	}
 	else {
-		sculpt_dynamic_topology_enable_with_undo(scene, ob);
+		sculpt_dynamic_topology_enable_with_undo(depsgraph, scene, ob);
 	}
 
 	WM_cursor_wait(0);
@@ -5610,13 +5622,14 @@ static void SCULPT_OT_symmetrize(wmOperatorType *ot)
 
 /**** Toggle operator for turning sculpt mode on or off ****/
 
-static void sculpt_init_session(Scene *scene, Object *ob)
+static void sculpt_init_session(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
 	/* Create persistent sculpt mode data */
 	BKE_sculpt_toolsettings_data_ensure(scene);
 
 	ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
-	BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, 0, false);
+	ob->sculpt->mode_type = OB_MODE_SCULPT;
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, 0, false);
 }
 
 static int ed_object_sculptmode_flush_recalc_flag(Scene *scene, Object *ob, MultiresModifierData *mmd)
@@ -5630,6 +5643,7 @@ static int ed_object_sculptmode_flush_recalc_flag(Scene *scene, Object *ob, Mult
 }
 
 void ED_object_sculptmode_enter_ex(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob,
         ReportList *reports)
 {
@@ -5639,21 +5653,19 @@ void ED_object_sculptmode_enter_ex(
 	/* Enter sculptmode */
 	ob->mode |= mode_flag;
 
-
 	MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob);
 
 	const int flush_recalc = ed_object_sculptmode_flush_recalc_flag(scene, ob, mmd);
 
-	if (flush_recalc) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	}
+	if (flush_recalc)
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	/* Create sculpt mode session data */
 	if (ob->sculpt) {
 		BKE_sculptsession_free(ob);
 	}
 
-	sculpt_init_session(scene, ob);
+	sculpt_init_session(depsgraph, scene, ob);
 
 	/* Mask layer is required */
 	if (mmd) {
@@ -5711,7 +5723,7 @@ void ED_object_sculptmode_enter_ex(
 		if (message_unsupported == NULL) {
 			/* undo push is needed to prevent memory leak */
 			sculpt_undo_push_begin("Dynamic topology enable");
-			sculpt_dynamic_topology_enable_ex(scene, ob);
+			sculpt_dynamic_topology_enable_ex(depsgraph, scene, ob);
 			sculpt_undo_push_node(ob, NULL, SCULPT_UNDO_DYNTOPO_BEGIN);
 		}
 		else {
@@ -5722,20 +5734,19 @@ void ED_object_sculptmode_enter_ex(
 		}
 	}
 
-	/* VBO no longer valid */
-	if (ob->derivedFinal) {
-		GPU_drawobject_free(ob->derivedFinal);
-	}
+	// ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, ob);
 }
 
 void ED_object_sculptmode_enter(struct bContext *C, ReportList *reports)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	ED_object_sculptmode_enter_ex(scene, ob, reports);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ED_object_sculptmode_enter_ex(depsgraph, scene, ob, reports);
 }
 
 void ED_object_sculptmode_exit_ex(
+        Depsgraph *depsgraph,
         Scene *scene, Object *ob)
 {
 	const int mode_flag = OB_MODE_SCULPT;
@@ -5755,14 +5766,14 @@ void ED_object_sculptmode_exit_ex(
 	 * a consistent state.
 	 */
 	if (true || /* flush_recalc || */ (ob->sculpt && ob->sculpt->bm)) {
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
 	if (me->flag & ME_SCULPT_DYNAMIC_TOPOLOGY) {
 		/* Dynamic topology must be disabled before exiting sculpt
 		 * mode to ensure the undo stack stays in a consistent
 		 * state */
-		sculpt_dynamic_topology_disable_with_undo(scene, ob);
+		sculpt_dynamic_topology_disable_with_undo(depsgraph, scene, ob);
 
 		/* store so we know to re-enable when entering sculpt mode */
 		me->flag |= ME_SCULPT_DYNAMIC_TOPOLOGY;
@@ -5771,25 +5782,27 @@ void ED_object_sculptmode_exit_ex(
 	/* Leave sculptmode */
 	ob->mode &= ~mode_flag;
 
+	// ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, ob);
+
 	BKE_sculptsession_free(ob);
 
 	paint_cursor_delete_textures();
 
-	/* VBO no longer valid */
-	if (ob->derivedFinal) {
-		GPU_drawobject_free(ob->derivedFinal);
-	}
+	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 }
 
 void ED_object_sculptmode_exit(bContext *C)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	ED_object_sculptmode_exit_ex(scene, ob);
+	ED_object_sculptmode_exit_ex(depsgraph, scene, ob);
 }
 
 static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op)
 {
+	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	const int mode_flag = OB_MODE_SCULPT;
@@ -5802,14 +5815,18 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op)
 	}
 
 	if (is_mode_set) {
-		ED_object_sculptmode_exit_ex(scene, ob);
+		ED_object_sculptmode_exit_ex(depsgraph, scene, ob);
 	}
 	else {
-		ED_object_sculptmode_enter_ex(scene, ob, op->reports);
+		ED_object_sculptmode_enter_ex(depsgraph, scene, ob, op->reports);
 	}
 
 	WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
 
+	WM_msg_publish_rna_prop(mbus, &ob->id, ob, Object, mode);
+
+	WM_toolsystem_update_from_context_view3d(C);
+
 	return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 1c94c1d9198..ff6b5a6f374 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -61,12 +61,15 @@ bool sculpt_stroke_get_location(struct bContext *C, float out[3], const float mo
 void sculpt_pbvh_clear(Object *ob);
 void sculpt_dyntopo_node_layers_add(struct SculptSession *ss);
 void sculpt_update_after_dynamic_topology_toggle(
+        struct Depsgraph *depsgraph,
         struct Scene *scene, struct Object *ob);
 void sculpt_dynamic_topology_enable_ex(
+        struct Depsgraph *depsgraph,
         struct Scene *scene, struct Object *ob);
 void sculpt_dynamic_topology_enable(bContext *C);
 
 void sculpt_dynamic_topology_disable_ex(
+        struct Depsgraph *depsgraph,
         struct Scene *scene, struct Object *ob,
         struct SculptUndoNode *unode);
 void sculpt_dynamic_topology_disable(bContext *C, struct SculptUndoNode *unode);
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index cd03c3ec7e2..fbdca27b018 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -50,10 +50,10 @@
 #include "DNA_mesh_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BKE_ccg.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_multires.h"
 #include "BKE_paint.h"
 #include "BKE_key.h"
@@ -61,11 +61,11 @@
 #include "BKE_subsurf.h"
 #include "BKE_undo_system.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "GPU_buffers.h"
-
 #include "ED_paint.h"
 #include "ED_object.h"
 #include "ED_sculpt.h"
@@ -140,6 +140,7 @@ static bool sculpt_undo_restore_coords(bContext *C, DerivedMesh *dm, SculptUndoN
 	Scene *scene = CTX_data_scene(C);
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	Object *ob = CTX_data_active_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	SculptSession *ss = ob->sculpt;
 	MVert *mvert;
 	int *index;
@@ -156,7 +157,7 @@ static bool sculpt_undo_restore_coords(bContext *C, DerivedMesh *dm, SculptUndoN
 			if (kb) {
 				ob->shapenr = BLI_findindex(&key->block, kb) + 1;
 
-				BKE_sculpt_update_mesh_elements(scene, sd, ob, 0, false);
+				BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, 0, false);
 				WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob);
 			}
 			else {
@@ -378,8 +379,8 @@ static void sculpt_undo_bmesh_restore_generic(bContext *C,
 }
 
 /* Create empty sculpt BMesh and enable logging */
-static void sculpt_undo_bmesh_enable(Object *ob,
-                                     SculptUndoNode *unode)
+static void sculpt_undo_bmesh_enable(
+        Object *ob, SculptUndoNode *unode)
 {
 	SculptSession *ss = ob->sculpt;
 	Mesh *me = ob->data;
@@ -472,6 +473,7 @@ static void sculpt_undo_restore_list(bContext *C, ListBase *lb)
 	Scene *scene = CTX_data_scene(C);
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	Object *ob = CTX_data_active_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	DerivedMesh *dm;
 	SculptSession *ss = ob->sculpt;
 	SculptUndoNode *unode;
@@ -490,10 +492,10 @@ static void sculpt_undo_restore_list(bContext *C, ListBase *lb)
 		}
 	}
 
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, 0, need_mask);
+	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, 0, need_mask);
 
 	/* call _after_ sculpt_update_mesh_elements() which may update 'ob->derivedFinal' */
-	dm = mesh_get_derived_final(scene, ob, 0);
+	dm = mesh_get_derived_final(depsgraph, scene, ob, 0);
 
 	if (lb->first && sculpt_undo_bmesh_restore(C, lb->first, ob, ss))
 		return;
@@ -576,14 +578,11 @@ static void sculpt_undo_restore_list(bContext *C, ListBase *lb)
 		}
 
 		if (tag_update) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 		else {
 			sculpt_update_object_bounding_box(ob);
 		}
-
-		/* for non-PBVH drawing, need to recreate VBOs */
-		GPU_drawobject_free(ob->derivedFinal);
 	}
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index e93a68b9350..46d704e8f74 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -46,15 +46,19 @@
 #include "BKE_paint.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_screen.h"
 #include "ED_image.h"
 #include "ED_mesh.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -64,9 +68,6 @@
 #include "paint_intern.h"
 #include "uvedit_intern.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
 #include "UI_view2d.h"
 
 #define MARK_BOUNDARY   1
@@ -212,18 +213,17 @@ static void brush_drawcursor_uvsculpt(bContext *C, int x, int y, void *UNUSED(cu
 			alpha *= (size - PX_SIZE_FADE_MIN) / (PX_SIZE_FADE_MAX - PX_SIZE_FADE_MIN);
 		}
 
-		glPushMatrix();
-
-		glTranslatef((float)x, (float)y, 0.0f);
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor3fvAlpha(brush->add_col, alpha);
 
-		glColor4f(brush->add_col[0], brush->add_col[1], brush->add_col[2], alpha);
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
-		glutil_draw_lined_arc(0, (float)(M_PI * 2.0), size, 40);
+		imm_draw_circle_wire_2d(pos, (float)x, (float)y, size, 40);
 		glDisable(GL_BLEND);
 		glDisable(GL_LINE_SMOOTH);
 
-		glPopMatrix();
+		immUnbindProgram();
 	}
 #undef PX_SIZE_FADE_MAX
 #undef PX_SIZE_FADE_MIN
@@ -652,7 +652,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, const wm
 			UvElement *element;
 			UvNearestHit hit = UV_NEAREST_HIT_INIT;
 			Image *ima = CTX_data_edit_image(C);
-			uv_find_nearest_vert(scene, ima, em, co, 0.0f, &hit);
+			uv_find_nearest_vert(scene, ima, obedit, co, 0.0f, &hit);
 
 			element = BM_uv_element_get(data->elementMap, hit.efa, hit.l);
 			island_index = element->island;
@@ -899,7 +899,7 @@ static int uv_sculpt_stroke_modal(bContext *C, wmOperator *op, const wmEvent *ev
 
 	ED_region_tag_redraw(CTX_wm_region(C));
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	return OPERATOR_RUNNING_MODAL;
 }
 
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 535cd579030..9efdf11e8d7 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -39,7 +39,7 @@ set(SRC
 )
 
 if(WITH_AUDASPACE)
-	add_definitions(${AUDASPACE_DEFINITIONS})
+	add_definitions(-DWITH_AUDASPACE)
 
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index a7660092e6d..07d12de3662 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -67,7 +67,7 @@
 #include "WM_types.h"
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SPECIAL_H
+#  include <AUD_Special.h>
 #endif
 
 #include "ED_sound.h"
@@ -311,6 +311,7 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	int oldfra = scene->r.cfra;
 	int cfra;
 
@@ -318,11 +319,11 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op))
 
 	for (cfra = (scene->r.sfra > 0) ? (scene->r.sfra - 1) : 0; cfra <= scene->r.efra + 1; cfra++) {
 		scene->r.cfra = cfra;
-		BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
+		BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 	}
 
 	scene->r.cfra = oldfra;
-	BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
+	BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 
 	return OPERATOR_FINISHED;
 }
@@ -634,7 +635,7 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
 	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
 	/* main draw call */
-	uiDefAutoButsRNA(layout, &ptr, sound_mixdown_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, sound_mixdown_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 #endif // WITH_AUDASPACE
 
diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c
index b16d0543d0e..a5cc66add87 100644
--- a/source/blender/editors/space_action/action_buttons.c
+++ b/source/blender/editors/space_action/action_buttons.c
@@ -48,7 +48,6 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_screen.h"
 #include "BKE_unit.h"
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index a7c94c072a4..7c8be943a87 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -43,16 +43,23 @@
 /* Types --------------------------------------------------------------- */
 
 #include "DNA_anim_types.h"
+#include "DNA_cachefile_types.h"
+#include "DNA_object_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
 
 #include "BKE_action.h"
 #include "BKE_context.h"
+#include "BKE_pointcache.h"
 
 
 /* Everything from source (BIF, BDR, BSE) ------------------------------ */
 
 #include "BIF_gl.h"
 
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -156,15 +163,12 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 {
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
-	int filter;
 
 	View2D *v2d = &ar->v2d;
 	bDopeSheet *ads = &saction->ads;
 	AnimData *adt = NULL;
 
 	float act_start, act_end, y;
-	size_t items;
-	int height;
 
 	unsigned char col1[3], col2[3];
 	unsigned char col1a[3], col2a[3];
@@ -194,10 +198,10 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 	}
 
 	/* build list of channels to draw */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
-	items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+	int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
+	size_t items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 
-	height = ((items * ACHANNEL_STEP(ac)) + (ACHANNEL_HEIGHT(ac)));
+	int height = ((items * ACHANNEL_STEP(ac)) + (ACHANNEL_HEIGHT(ac)));
 	/* don't use totrect set, as the width stays the same
 	 * (NOTE: this is ok here, the configuration is pretty straightforward)
 	 */
@@ -205,6 +209,12 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 
 	/* first backdrop strips */
 	y = (float)(-ACHANNEL_HEIGHT(ac));
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	glEnable(GL_BLEND);
 
 	for (ale = anim_data.first; ale; ale = ale->next) {
@@ -229,22 +239,20 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 						case ANIMTYPE_SUMMARY:
 						{
 							/* reddish color from NLA */
-							UI_ThemeColor4(TH_ANIM_ACTIVE);
+							immUniformThemeColor(TH_ANIM_ACTIVE);
 							break;
 						}
 						case ANIMTYPE_SCENE:
 						case ANIMTYPE_OBJECT:
 						{
-							if (sel) glColor4ub(col1b[0], col1b[1], col1b[2], 0x45);
-							else glColor4ub(col1b[0], col1b[1], col1b[2], 0x22);
+							immUniformColor3ubvAlpha(col1b, sel ? 0x45 : 0x22);
 							break;
 						}
 						case ANIMTYPE_FILLACTD:
 						case ANIMTYPE_DSSKEY:
 						case ANIMTYPE_DSWOR:
 						{
-							if (sel) glColor4ub(col2b[0], col2b[1], col2b[2], 0x45);
-							else glColor4ub(col2b[0], col2b[1], col2b[2], 0x22);
+							immUniformColor3ubvAlpha(col2b, sel ? 0x45 : 0x22);
 							break;
 						}
 						case ANIMTYPE_GROUP:
@@ -252,17 +260,14 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 							bActionGroup *agrp = ale->data;
 							if (show_group_colors && agrp->customCol) {
 								if (sel) {
-									unsigned char *cp = (unsigned char *)agrp->cs.select;
-									glColor4ub(cp[0], cp[1], cp[2], 0x45);
+									immUniformColor3ubvAlpha((unsigned char *)agrp->cs.select, 0x45);
 								}
 								else {
-									unsigned char *cp = (unsigned char *)agrp->cs.solid;
-									glColor4ub(cp[0], cp[1], cp[2], 0x1D);
+									immUniformColor3ubvAlpha((unsigned char *)agrp->cs.solid, 0x1D);
 								}
 							}
 							else {
-								if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
-								else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
+								immUniformColor3ubvAlpha(sel ? col1a : col2a, 0x22);
 							}
 							break;
 						}
@@ -270,53 +275,43 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 						{
 							FCurve *fcu = ale->data;
 							if (show_group_colors && fcu->grp && fcu->grp->customCol) {
-								unsigned char *cp = (unsigned char *)fcu->grp->cs.active;
-
-								if (sel) glColor4ub(cp[0], cp[1], cp[2], 0x65);
-								else glColor4ub(cp[0], cp[1], cp[2], 0x0B);
+								immUniformColor3ubvAlpha((unsigned char *)fcu->grp->cs.active, sel ? 0x65 : 0x0B);
 							}
 							else {
-								if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
-								else glColor4ub(col2[0], col2[1], col2[2], 0x22);
+								immUniformColor3ubvAlpha(sel ? col1 : col2, 0x22);
 							}
 							break;
 						}
 						default:
 						{
-							if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
-							else glColor4ub(col2[0], col2[1], col2[2], 0x22);
-							break;
+							immUniformColor3ubvAlpha(sel ? col1 : col2, 0x22);
 						}
 					}
 
 					/* draw region twice: firstly backdrop, then the current range */
-					glRectf(v2d->cur.xmin,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
+					immRectf(pos, v2d->cur.xmin,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
 
 					if (ac->datatype == ANIMCONT_ACTION)
-						glRectf(act_start,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  act_end,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
+						immRectf(pos, act_start,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  act_end,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
 				}
 				else if (ac->datatype == ANIMCONT_GPENCIL) {
 					/* frames less than one get less saturated background */
-					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
-					else glColor4ub(col2[0], col2[1], col2[2], 0x22);
-					glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
+					immUniformColor3ubvAlpha(sel ? col1 : col2, 0x22);
+					immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
 
 					/* frames one and higher get a saturated background */
-					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
-					else glColor4ub(col2[0], col2[1], col2[2], 0x44);
-					glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
+					immUniformColor3ubvAlpha(sel ? col1 : col2, 0x44);
+					immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
 				}
 				else if (ac->datatype == ANIMCONT_MASK) {
 					/* TODO --- this is a copy of gpencil */
 					/* frames less than one get less saturated background */
-					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
-					else glColor4ub(col2[0], col2[1], col2[2], 0x22);
-					glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
+					immUniformColor3ubvAlpha(sel ? col1 : col2, 0x22);
+					immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
 
 					/* frames one and higher get a saturated background */
-					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
-					else glColor4ub(col2[0], col2[1], col2[2], 0x44);
-					glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
+					immUniformColor3ubvAlpha(sel ? col1 : col2, 0x44);
+					immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));
 				}
 			}
 		}
@@ -326,6 +321,17 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 	}
 	glDisable(GL_BLEND);
 
+	/* black line marking 'current frame' for Time-Slide transform mode */
+	if (saction->flag & SACTION_MOVING) {
+		immUniformColor3f(0.0f, 0.0f, 0.0f);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, saction->timeslide, v2d->cur.ymin - EXTRA_SCROLL_PAD);
+		immVertex2f(pos, saction->timeslide, v2d->cur.ymax);
+		immEnd();
+	}
+	immUnbindProgram();
+
 	/* Draw keyframes
 	 *	1) Only channels that are visible in the Action Editor get drawn/evaluated.
 	 *	   This is to try to optimize this for heavier data sets
@@ -378,16 +384,141 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 		y -= ACHANNEL_STEP(ac);
 	}
 
-	/* free tempolary channels used for drawing */
+	/* free temporary channels used for drawing */
 	ANIM_animdata_freelist(&anim_data);
+}
 
-	/* black line marking 'current frame' for Time-Slide transform mode */
-	if (saction->flag & SACTION_MOVING) {
-		glColor3f(0.0f, 0.0f, 0.0f);
+/* ************************************************************************* */
+/* Timeline - Caches */
+
+void timeline_draw_cache(SpaceAction *saction, Object *ob, Scene *scene)
+{
+	PTCacheID *pid;
+	ListBase pidlist;
+	const float cache_draw_height = (4.0f * UI_DPI_FAC * U.pixelsize);
+	float yoffs = 0.f;
+
+	if (!(saction->cache_display & TIME_CACHE_DISPLAY) || (!ob))
+		return;
+
+	BKE_ptcache_ids_from_object(&pidlist, ob, scene, 0);
+
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	/* iterate over pointcaches on the active object, and draw each one's range */
+	for (pid = pidlist.first; pid; pid = pid->next) {
+		float col[4];
+
+		switch (pid->type) {
+			case PTCACHE_TYPE_SOFTBODY:
+				if (!(saction->cache_display & TIME_CACHE_SOFTBODY)) continue;
+				break;
+			case PTCACHE_TYPE_PARTICLES:
+				if (!(saction->cache_display & TIME_CACHE_PARTICLES)) continue;
+				break;
+			case PTCACHE_TYPE_CLOTH:
+				if (!(saction->cache_display & TIME_CACHE_CLOTH)) continue;
+				break;
+			case PTCACHE_TYPE_SMOKE_DOMAIN:
+			case PTCACHE_TYPE_SMOKE_HIGHRES:
+				if (!(saction->cache_display & TIME_CACHE_SMOKE)) continue;
+				break;
+			case PTCACHE_TYPE_DYNAMICPAINT:
+				if (!(saction->cache_display & TIME_CACHE_DYNAMICPAINT)) continue;
+				break;
+			case PTCACHE_TYPE_RIGIDBODY:
+				if (!(saction->cache_display & TIME_CACHE_RIGIDBODY)) continue;
+				break;
+		}
+
+		if (pid->cache->cached_frames == NULL)
+			continue;
+
+		gpuPushMatrix();
+		gpuTranslate2f(0.0, (float)V2D_SCROLL_HEIGHT + yoffs);
+		gpuScale2f(1.0, cache_draw_height);
+
+		switch (pid->type) {
+			case PTCACHE_TYPE_SOFTBODY:
+				col[0] = 1.0;   col[1] = 0.4;   col[2] = 0.02;
+				col[3] = 0.1;
+				break;
+			case PTCACHE_TYPE_PARTICLES:
+				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.02;
+				col[3] = 0.1;
+				break;
+			case PTCACHE_TYPE_CLOTH:
+				col[0] = 0.1;   col[1] = 0.1;   col[2] = 0.75;
+				col[3] = 0.1;
+				break;
+			case PTCACHE_TYPE_SMOKE_DOMAIN:
+			case PTCACHE_TYPE_SMOKE_HIGHRES:
+				col[0] = 0.2;   col[1] = 0.2;   col[2] = 0.2;
+				col[3] = 0.1;
+				break;
+			case PTCACHE_TYPE_DYNAMICPAINT:
+				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.75;
+				col[3] = 0.1;
+				break;
+			case PTCACHE_TYPE_RIGIDBODY:
+				col[0] = 1.0;   col[1] = 0.6;   col[2] = 0.0;
+				col[3] = 0.1;
+				break;
+			default:
+				col[0] = 1.0;   col[1] = 0.0;   col[2] = 1.0;
+				col[3] = 0.1;
+				BLI_assert(0);
+				break;
+		}
+
+		const int sta = pid->cache->startframe, end = pid->cache->endframe;
+		const int len = (end - sta + 1) * 6;
+
+		glEnable(GL_BLEND);
+
+		immUniformColor4fv(col);
+		immRectf(pos, (float)sta, 0.0, (float)end, 1.0);
+
+		col[3] = 0.4f;
+		if (pid->cache->flag & PTCACHE_BAKED) {
+			col[0] -= 0.4f; col[1] -= 0.4f; col[2] -= 0.4f;
+		}
+		else if (pid->cache->flag & PTCACHE_OUTDATED) {
+			col[0] += 0.4f; col[1] += 0.4f; col[2] += 0.4f;
+		}
+
+		immUniformColor4fv(col);
+
+		if (len > 0) {
+			immBeginAtMost(GWN_PRIM_TRIS, len);
+
+			/* draw a quad for each cached frame */
+			for (int i = sta; i <= end; i++) {
+				if (pid->cache->cached_frames[i - sta]) {
+					immVertex2f(pos, (float)i - 0.5f, 0.0f);
+					immVertex2f(pos, (float)i - 0.5f, 1.0f);
+					immVertex2f(pos, (float)i + 0.5f, 1.0f);
 
-		glBegin(GL_LINES);
-		glVertex2f(saction->timeslide, v2d->cur.ymin - EXTRA_SCROLL_PAD);
-		glVertex2f(saction->timeslide, v2d->cur.ymax);
-		glEnd();
+					immVertex2f(pos, (float)i - 0.5f, 0.0f);
+					immVertex2f(pos, (float)i + 0.5f, 1.0f);
+					immVertex2f(pos, (float)i + 0.5f, 0.0f);
+				}
+			}
+
+			immEnd();
+		}
+
+		glDisable(GL_BLEND);
+
+		gpuPopMatrix();
+
+		yoffs += cache_draw_height;
 	}
+
+	immUnbindProgram();
+
+	BLI_freelistN(&pidlist);
 }
+
+/* ************************************************************************* */
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 285e9afb8b4..b3c1c536ad8 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -384,12 +384,22 @@ static int actkeys_viewall(bContext *C, const bool only_sel)
 	if (only_sel && (found == false))
 		return OPERATOR_CANCELLED;
 
-	v2d->cur.xmin = min;
-	v2d->cur.xmax = max;
+	if (fabsf(max - min) < 1.0f) {
+		/* Exception - center the single keyfrme */
+		float xwidth = BLI_rctf_size_x(&v2d->cur);
 
-	extra = 0.1f * BLI_rctf_size_x(&v2d->cur);
-	v2d->cur.xmin -= extra;
-	v2d->cur.xmax += extra;
+		v2d->cur.xmin = min - xwidth / 2.0f;
+		v2d->cur.xmax = max + xwidth / 2.0f;
+	}
+	else {
+		/* Normal case - stretch the two keyframes out to fill the space, with extra spacing */
+		v2d->cur.xmin = min;
+		v2d->cur.xmax = max;
+
+		extra = 0.125f * BLI_rctf_size_x(&v2d->cur);
+		v2d->cur.xmin -= extra;
+		v2d->cur.xmax += extra;
+	}
 
 	/* set vertical range */
 	if (only_sel == false) {
@@ -673,6 +683,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
 	bAnimListElem *ale;
 	int filter;
 
+	struct Depsgraph *depsgraph = ac->depsgraph;
 	ReportList *reports = ac->reports;
 	Scene *scene = ac->scene;
 	ToolSettings *ts = scene->toolsettings;
@@ -707,7 +718,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
 		 *                       (TODO: add the full-blown PointerRNA relative parsing case here...)
 		 */
 		if (ale->id && !ale->owner) {
-			insert_keyframe(reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
+			insert_keyframe(depsgraph, reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
 		}
 		else {
 			const float curval = evaluate_fcurve(fcu, cfra);
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index f2588b8139e..25d3560b175 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -33,10 +33,13 @@
 
 struct bContext;
 struct bAnimContext;
+struct Scene;
+struct Object;
 struct SpaceAction;
 struct ScrArea;
 struct ARegion;
 struct ARegionType;
+struct View2D;
 struct wmOperatorType;
 
 /* internal exports only */
@@ -54,6 +57,8 @@ void ACTION_OT_properties(struct wmOperatorType *ot);
 void draw_channel_names(struct bContext *C, struct bAnimContext *ac, struct ARegion *ar);
 void draw_channel_strips(struct bAnimContext *ac, struct SpaceAction *saction, struct ARegion *ar);
 
+void timeline_draw_cache(struct SpaceAction *saction, struct Object *ob, struct Scene *scene);
+
 /* ***************************************** */
 /* action_select.c */
 
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 0b7201c2857..ffcaf53513a 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -34,6 +34,7 @@
 
 #include "DNA_action_types.h"
 #include "DNA_group_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -45,10 +46,13 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
+#include "RNA_access.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+
+#include "BIF_gl.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -88,10 +92,8 @@ ARegion *action_has_buttons_region(ScrArea *sa)
 
 /* ******************** default callbacks for action space ***************** */
 
-static SpaceLink *action_new(const bContext *C)
+static SpaceLink *action_new(const ScrArea *sa, const Scene *scene)
 {
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
 	SpaceAction *saction;
 	ARegion *ar;
 
@@ -103,6 +105,12 @@ static SpaceLink *action_new(const bContext *C)
 
 	saction->ads.filterflag |= ADS_FILTER_SUMMARY;
 
+	/* enable all cache display */
+	saction->cache_display |= TIME_CACHE_DISPLAY;
+	saction->cache_display |= (TIME_CACHE_SOFTBODY | TIME_CACHE_PARTICLES);
+	saction->cache_display |= (TIME_CACHE_CLOTH | TIME_CACHE_SMOKE | TIME_CACHE_DYNAMICPAINT);
+	saction->cache_display |= TIME_CACHE_RIGIDBODY;
+
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for action");
 
@@ -170,6 +178,7 @@ static void action_free(SpaceLink *UNUSED(sl))
 static void action_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa)
 {
 	SpaceAction *saction = sa->spacedata.first;
+
 	saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
 }
 
@@ -202,11 +211,15 @@ static void action_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
 	SpaceAction *saction = CTX_wm_space_action(C);
+	Scene *scene = CTX_data_scene(C);
+	Object *obact = CTX_data_active_object(C);
 	bAnimContext ac;
 	View2D *v2d = &ar->v2d;
 	View2DGrid *grid;
 	View2DScrollers *scrollers;
-	short unit = 0, flag = 0;
+	short marker_flag = 0;
+	short cfra_flag = 0;
+	short unit = 0;
 
 	/* clear and setup matrix */
 	UI_ThemeClearColor(TH_BACK);
@@ -222,21 +235,28 @@ static void action_main_region_draw(const bContext *C, ARegion *ar)
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
+	/* start and end frame */
+	ANIM_draw_framerange(scene, v2d);
+
 	/* data */
 	if (ANIM_animdata_get_context(C, &ac)) {
 		draw_channel_strips(&ac, saction, ar);
 	}
 
 	/* current frame */
-	if (saction->flag & SACTION_DRAWTIME) flag |= DRAWCFRA_UNIT_SECONDS;
-	if ((saction->flag & SACTION_NODRAWCFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
-	ANIM_draw_cfra(C, v2d, flag);
+	if (saction->flag & SACTION_DRAWTIME) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	ANIM_draw_cfra(C, v2d, cfra_flag);
 
 	/* markers */
 	UI_view2d_view_orthoSpecial(ar, v2d, 1);
 
-	flag = ((ac.markers && (ac.markers != &ac.scene->markers)) ? DRAW_MARKERS_LOCAL : 0) | DRAW_MARKERS_MARGIN;
-	ED_markers_draw(C, flag);
+	marker_flag = ((ac.markers && (ac.markers != &ac.scene->markers)) ? DRAW_MARKERS_LOCAL : 0) | DRAW_MARKERS_MARGIN;
+	ED_markers_draw(C, marker_flag);
+
+	/* caches */
+	if (saction->mode == SACTCONT_TIMELINE) {
+		timeline_draw_cache(saction, obact, scene);
+	}
 
 	/* preview range */
 	UI_view2d_view_ortho(v2d);
@@ -253,6 +273,12 @@ static void action_main_region_draw(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* draw current frame number-indicator on top of scrollers */
+	if ((saction->flag & SACTION_NODRAWCFRANUM) == 0) {
+		UI_view2d_view_orthoSpecial(ar, v2d, 1);
+		ANIM_draw_cfra_number(C, v2d, cfra_flag);
+	}
 }
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -308,7 +334,9 @@ static void action_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void action_channel_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_channel_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -351,7 +379,55 @@ static void action_channel_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(
 	}
 }
 
-static void action_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void saction_channel_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceDopeSheetEditor, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* All dopesheet filter settings, etc. affect the drawing of this editor,
+	 * also same applies for all animation-related datatypes that may appear here,
+	 * so just whitelist the entire structs for updates
+	 */
+	{
+		wmMsgParams_RNA msg_key_params = {{{0}}};
+		StructRNA *type_array[] = {
+			&RNA_DopeSheet,    /* dopesheet filters */
+
+			&RNA_ActionGroup,  /* channel groups */
+
+			&RNA_FCurve,       /* F-Curve */
+			&RNA_Keyframe,
+			&RNA_FCurveSample,
+
+			&RNA_GreasePencil, /* Grease Pencil */
+			&RNA_GPencilLayer,
+			&RNA_GPencilFrame,
+		};
+
+		for (int i = 0; i < ARRAY_SIZE(type_array); i++) {
+			msg_key_params.ptr.type = type_array[i];
+			WM_msg_subscribe_rna_params(
+			        mbus,
+			        &msg_key_params,
+			        &msg_sub_value_region_tag_redraw,
+			        __func__);
+		}
+	}
+}
+
+static void action_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -363,6 +439,7 @@ static void action_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 				case ND_RENDER_OPTIONS:
 				case ND_OB_ACTIVE:
 				case ND_FRAME:
+				case ND_FRAME_RANGE:
 				case ND_MARKERS:
 					ED_region_tag_redraw(ar);
 					break;
@@ -391,7 +468,11 @@ static void action_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 			if (wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
 			break;
-
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 		default:
 			if (wmn->data == ND_KEYS)
 				ED_region_tag_redraw(ar);
@@ -399,8 +480,53 @@ static void action_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 	}
 }
 
+static void saction_main_region_message_subscribe(
+        const struct bContext *C,
+        struct WorkSpace *workspace, struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceDopeSheetEditor, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* Timeline depends on scene properties. */
+	{
+		bool use_preview = (scene->r.flag & SCER_PRV_RANGE);
+		extern PropertyRNA rna_Scene_frame_start;
+		extern PropertyRNA rna_Scene_frame_end;
+		extern PropertyRNA rna_Scene_frame_preview_start;
+		extern PropertyRNA rna_Scene_frame_preview_end;
+		extern PropertyRNA rna_Scene_use_preview_range;
+		extern PropertyRNA rna_Scene_frame_current;
+		const PropertyRNA *props[] = {
+			use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start,
+			use_preview ? &rna_Scene_frame_preview_end   : &rna_Scene_frame_end,
+			&rna_Scene_use_preview_range,
+			&rna_Scene_frame_current,
+		};
+
+		PointerRNA idptr;
+		RNA_id_pointer_create(&scene->id, &idptr);
+
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_region_tag_redraw, __func__);
+		}
+	}
+
+	/* Now run the general "channels region" one - since channels and main should be in sync */
+	saction_channel_region_message_subscribe(C, workspace, scene, screen, sa, ar, mbus);
+}
+
 /* editor level listener */
-static void action_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void action_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+        WorkSpace *UNUSED(workspace))
 {
 	SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
 
@@ -440,16 +566,43 @@ static void action_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 			}
 			break;
 		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_OB_ACTIVE:  /* selection changed, so force refresh to flush (needs flag set to do syncing) */
-				case ND_OB_SELECT:
-					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
-					ED_area_tag_refresh(sa);
-					break;
+			if (saction->mode == SACTCONT_TIMELINE) {
+				switch (wmn->data) {
+					case ND_RENDER_RESULT:
+						ED_area_tag_redraw(sa);
+						break;
+					case ND_OB_ACTIVE:
+					case ND_FRAME:
+						ED_area_tag_refresh(sa);
+						break;
+					case ND_FRAME_RANGE:
+					{
+						ARegion *ar;
+						Scene *scene = wmn->reference;
+
+						for (ar = sa->regionbase.first; ar; ar = ar->next) {
+							if (ar->regiontype == RGN_TYPE_WINDOW) {
+								ar->v2d.tot.xmin = (float)(SFRA - 4);
+								ar->v2d.tot.xmax = (float)(EFRA + 4);
+								break;
+							}
+						}
+						break;
+					}
+				}
+			}
+			else {
+				switch (wmn->data) {
+					case ND_OB_ACTIVE:  /* selection changed, so force refresh to flush (needs flag set to do syncing) */
+					case ND_OB_SELECT:
+						saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+						ED_area_tag_refresh(sa);
+						break;
 
-				default: /* just redrawing the view will do */
-					ED_area_tag_redraw(sa);
-					break;
+					default: /* just redrawing the view will do */
+						ED_area_tag_redraw(sa);
+						break;
+				}
 			}
 			break;
 		case NC_OBJECT:
@@ -462,6 +615,15 @@ static void action_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 				case ND_TRANSFORM:
 					/* moving object shouldn't need to redraw action */
 					break;
+				case ND_POINTCACHE:
+				case ND_MODIFIER:
+				case ND_PARTICLE:
+					/* only needed in timeline mode */
+					if (saction->mode == SACTCONT_TIMELINE) {
+						ED_area_tag_refresh(sa);
+						ED_area_tag_redraw(sa);
+					}
+					break;
 				default: /* just redrawing the view will do */
 					ED_area_tag_redraw(sa);
 					break;
@@ -492,6 +654,9 @@ static void action_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 				case ND_SPACE_DOPESHEET:
 					ED_area_tag_redraw(sa);
 					break;
+				case ND_SPACE_TIME:
+					ED_area_tag_redraw(sa);
+					break;
 				case ND_SPACE_CHANGED:
 					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
 					ED_area_tag_refresh(sa);
@@ -504,20 +669,49 @@ static void action_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 				ED_area_tag_refresh(sa);
 			}
 			break;
+		case NC_WM:
+			switch (wmn->data) {
+				case ND_FILEREAD:
+					ED_area_tag_refresh(sa);
+					break;
+			}
+			break;
 	}
 }
 
-static void action_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
-	// SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
+	SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
 
 	/* context changes */
 	switch (wmn->category) {
-		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_OB_ACTIVE:
+		case NC_SCREEN:
+			if (saction->mode == SACTCONT_TIMELINE) {
+				if (wmn->data == ND_ANIMPLAY)
 					ED_region_tag_redraw(ar);
-					break;
+			}
+			break;
+		case NC_SCENE:
+			if (saction->mode == SACTCONT_TIMELINE) {
+				switch (wmn->data) {
+					case ND_RENDER_RESULT:
+					case ND_OB_SELECT:
+					case ND_FRAME:
+					case ND_FRAME_RANGE:
+					case ND_KEYINGSET:
+					case ND_RENDER_OPTIONS:
+						ED_region_tag_redraw(ar);
+						break;
+				}
+			}
+			else {
+				switch (wmn->data) {
+					case ND_OB_ACTIVE:
+						ED_region_tag_redraw(ar);
+						break;
+				}
 			}
 			break;
 		case NC_ID:
@@ -559,7 +753,9 @@ static void action_buttons_area_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void action_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -629,7 +825,7 @@ static void action_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, I
 	}
 
 	if ((ID *)sact->ads.filter_grp == old_id) {
-		sact->ads.filter_grp = (Group *)new_id;
+		sact->ads.filter_grp = (Collection *)new_id;
 	}
 	if ((ID *)sact->ads.source == old_id) {
 		sact->ads.source = new_id;
@@ -662,6 +858,7 @@ void ED_spacetype_action(void)
 	art->init = action_main_region_init;
 	art->draw = action_main_region_draw;
 	art->listener = action_main_region_listener;
+	art->message_subscribe = saction_main_region_message_subscribe;
 	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
 
 	BLI_addhead(&st->regiontypes, art);
@@ -687,6 +884,7 @@ void ED_spacetype_action(void)
 	art->init = action_channel_region_init;
 	art->draw = action_channel_region_draw;
 	art->listener = action_channel_region_listener;
+	art->message_subscribe = saction_channel_region_message_subscribe;
 
 	BLI_addhead(&st->regiontypes, art);
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 45b0fb36ecc..33ec7f771ba 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -55,6 +55,7 @@
 #include "ED_paint.h"
 #include "ED_physics.h"
 #include "ED_render.h"
+#include "ED_scene.h"
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 #include "ED_space_api.h"
@@ -66,6 +67,7 @@
 #include "ED_clip.h"
 #include "ED_mask.h"
 #include "ED_sequencer.h"
+#include "ED_manipulator_library.h"
 
 #include "io_ops.h"
 
@@ -80,7 +82,6 @@ void ED_spacetypes_init(void)
 
 	/* create space types */
 	ED_spacetype_outliner();
-	ED_spacetype_time();
 	ED_spacetype_view3d();
 	ED_spacetype_ipo();
 	ED_spacetype_image();
@@ -93,13 +94,16 @@ void ED_spacetypes_init(void)
 	ED_spacetype_script();
 	ED_spacetype_text();
 	ED_spacetype_sequencer();
-	ED_spacetype_logic();
 	ED_spacetype_console();
 	ED_spacetype_userpref();
 	ED_spacetype_clip();
+	ED_spacetype_statusbar();
+	ED_spacetype_topbar();
 //	...
 
 	/* register operator types for screen and all spaces */
+	ED_operatortypes_workspace();
+	ED_operatortypes_scene();
 	ED_operatortypes_screen();
 	ED_operatortypes_anim();
 	ED_operatortypes_animchannels();
@@ -117,22 +121,33 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_metaball();
 	ED_operatortypes_sound();
 	ED_operatortypes_render();
-	ED_operatortypes_logic();
 	ED_operatortypes_mask();
 	ED_operatortypes_io();
 
 	ED_operatortypes_view2d();
 	ED_operatortypes_ui();
 
-	/* register operators */
+	/* manipulator types */
+	ED_manipulatortypes_button_2d();
+	ED_manipulatortypes_dial_3d();
+	ED_manipulatortypes_grab_3d();
+	ED_manipulatortypes_arrow_2d();
+	ED_manipulatortypes_arrow_3d();
+	ED_manipulatortypes_primitive_3d();
+	ED_manipulatortypes_cage_2d();
+	ED_manipulatortypes_cage_3d();
+
+	/* register types for operators and manipulators */
 	spacetypes = BKE_spacetypes_list();
 	for (type = spacetypes->first; type; type = type->next) {
-		if (type->operatortypes)
+		/* init manipulator types first, operator-types need them */
+		if (type->manipulators) {
+			type->manipulators();
+		}
+		if (type->operatortypes) {
 			type->operatortypes();
+		}
 	}
-
-	/* register internal render callbacks */
-	ED_render_internal_init();
 }
 
 void ED_spacemacros_init(void)
@@ -254,7 +269,6 @@ void ED_region_draw_cb_draw(const bContext *C, ARegion *ar, int type)
 
 	for (rdc = ar->type->drawcalls.first; rdc; rdc = rdc->next) {
 		if (rdc->type == type) {
-			UI_reinit_gl_state();
 			rdc->draw(C, ar, rdc->customdata);
 		}
 	}
@@ -267,7 +281,7 @@ void ED_region_draw_cb_draw(const bContext *C, ARegion *ar, int type)
 void ED_spacetype_xxx(void);
 
 /* allocate and init some vars */
-static SpaceLink *xxx_new(const bContext *UNUSED(C))
+static SpaceLink *xxx_new(const ScrArea *UNUSED(sa), const Scene *UNUSED(scene))
 {
 	return NULL;
 }
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index f5e0ccb60c7..9caf381c93d 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -39,6 +39,7 @@
 #include "BLT_translation.h"
 
 #include "DNA_armature_types.h"
+#include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
@@ -49,6 +50,7 @@
 
 #include "BKE_context.h"
 #include "BKE_action.h"
+#include "BKE_layer.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
 #include "BKE_paint.h"
@@ -56,6 +58,7 @@
 #include "BKE_screen.h"
 #include "BKE_texture.h"
 #include "BKE_linestyle.h"
+#include "BKE_workspace.h"
 
 #include "RNA_access.h"
 
@@ -111,6 +114,20 @@ static int buttons_context_path_scene(ButsContextPath *path)
 	return RNA_struct_is_a(ptr->type, &RNA_Scene);
 }
 
+static int buttons_context_path_view_layer(ButsContextPath *path, WorkSpace *workspace)
+{
+	if (buttons_context_path_scene(path)) {
+		Scene *scene = path->ptr[path->len - 1].data;
+		ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
+
+		RNA_pointer_create(&scene->id, &RNA_ViewLayer, view_layer, &path->ptr[path->len]);
+		path->len++;
+		return 1;
+	}
+
+	return 0;
+}
+
 /* note: this function can return 1 without adding a world to the path
  * so the buttons stay visible, but be sure to check the ID type if a ID_WO */
 static int buttons_context_path_world(ButsContextPath *path)
@@ -142,9 +159,8 @@ static int buttons_context_path_world(ButsContextPath *path)
 	return 0;
 }
 
-static int buttons_context_path_linestyle(ButsContextPath *path)
+static int buttons_context_path_linestyle(ButsContextPath *path, WorkSpace *workspace)
 {
-	Scene *scene;
 	FreestyleLineStyle *linestyle;
 	PointerRNA *ptr = &path->ptr[path->len - 1];
 
@@ -152,10 +168,10 @@ static int buttons_context_path_linestyle(ButsContextPath *path)
 	if (RNA_struct_is_a(ptr->type, &RNA_FreestyleLineStyle)) {
 		return 1;
 	}
-	/* if we have a scene, use the lineset's linestyle */
-	else if (buttons_context_path_scene(path)) {
-		scene = path->ptr[path->len - 1].data;
-		linestyle = BKE_linestyle_active_from_scene(scene);
+	/* if we have a view layer, use the lineset's linestyle */
+	else if (buttons_context_path_view_layer(path, workspace)) {
+		ViewLayer *view_layer = path->ptr[path->len - 1].data;
+		linestyle = BKE_linestyle_active_from_view_layer(view_layer);
 		if (linestyle) {
 			RNA_id_pointer_create(&linestyle->id, &path->ptr[path->len]);
 			path->len++;
@@ -167,27 +183,31 @@ static int buttons_context_path_linestyle(ButsContextPath *path)
 	return 0;
 }
 
+static int buttons_context_path_workspace(ButsContextPath *path)
+{
+	PointerRNA *ptr = &path->ptr[path->len - 1];
+
+	/* This one just verifies. */
+	return RNA_struct_is_a(ptr->type, &RNA_WorkSpace);
+}
+
 static int buttons_context_path_object(ButsContextPath *path)
 {
-	Scene *scene;
-	Object *ob;
 	PointerRNA *ptr = &path->ptr[path->len - 1];
 
 	/* if we already have a (pinned) object, we're done */
 	if (RNA_struct_is_a(ptr->type, &RNA_Object)) {
 		return 1;
 	}
-	/* if we have a scene, use the scene's active object */
-	else if (buttons_context_path_scene(path)) {
-		scene = path->ptr[path->len - 1].data;
-		ob = (scene->basact) ? scene->basact->object : NULL;
 
-		if (ob) {
-			RNA_id_pointer_create(&ob->id, &path->ptr[path->len]);
-			path->len++;
+	ViewLayer *view_layer = ptr->data;
+	Object *ob = (view_layer->basact) ? view_layer->basact->object : NULL;
 
-			return 1;
-		}
+	if (ob) {
+		RNA_id_pointer_create(&ob->id, &path->ptr[path->len]);
+		path->len++;
+
+		return 1;
 	}
 
 	/* no path to a object possible */
@@ -208,6 +228,7 @@ static int buttons_context_path_data(ButsContextPath *path, int type)
 	else if (RNA_struct_is_a(ptr->type, &RNA_Camera) && (type == -1 || type == OB_CAMERA)) return 1;
 	else if (RNA_struct_is_a(ptr->type, &RNA_Lamp) && (type == -1 || type == OB_LAMP)) return 1;
 	else if (RNA_struct_is_a(ptr->type, &RNA_Speaker) && (type == -1 || type == OB_SPEAKER)) return 1;
+	else if (RNA_struct_is_a(ptr->type, &RNA_LightProbe) && (type == -1 || type == OB_LIGHTPROBE)) return 1;
 	/* try to get an object in the path, no pinning supported here */
 	else if (buttons_context_path_object(path)) {
 		ob = path->ptr[path->len - 1].data;
@@ -238,7 +259,7 @@ static int buttons_context_path_modifier(ButsContextPath *path)
 	return 0;
 }
 
-static int buttons_context_path_material(ButsContextPath *path, bool for_texture, bool new_shading)
+static int buttons_context_path_material(ButsContextPath *path)
 {
 	Object *ob;
 	PointerRNA *ptr = &path->ptr[path->len - 1];
@@ -256,18 +277,6 @@ static int buttons_context_path_material(ButsContextPath *path, bool for_texture
 			ma = give_current_material(ob, ob->actcol);
 			RNA_id_pointer_create(&ma->id, &path->ptr[path->len]);
 			path->len++;
-
-			if (for_texture && give_current_material_texture_node(ma))
-				return 1;
-
-			if (!new_shading) {
-				/* Only try to get mat from node in case of old shading system (see T40331). */
-				ma = give_node_material(ma);
-				if (ma) {
-					RNA_id_pointer_create(&ma->id, &path->ptr[path->len]);
-					path->len++;
-				}
-			}
 			return 1;
 		}
 	}
@@ -367,7 +376,7 @@ static int buttons_context_path_particle(ButsContextPath *path)
 	return 0;
 }
 
-static int buttons_context_path_brush(ButsContextPath *path)
+static int buttons_context_path_brush(const bContext *C, ButsContextPath *path)
 {
 	Scene *scene;
 	Brush *br = NULL;
@@ -381,8 +390,10 @@ static int buttons_context_path_brush(ButsContextPath *path)
 	else if (buttons_context_path_scene(path)) {
 		scene = path->ptr[path->len - 1].data;
 
-		if (scene)
-			br = BKE_paint_brush(BKE_paint_get_active(scene));
+		if (scene) {
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+			br = BKE_paint_brush(BKE_paint_get_active(scene, view_layer));
+		}
 
 		if (br) {
 			RNA_id_pointer_create((ID *)br, &path->ptr[path->len]);
@@ -396,141 +407,46 @@ static int buttons_context_path_brush(ButsContextPath *path)
 	return 0;
 }
 
-static int buttons_context_path_texture(ButsContextPath *path, ButsContextTexture *ct)
+static int buttons_context_path_texture(const bContext *C, ButsContextPath *path, ButsContextTexture *ct)
 {
-	if (ct) {
-		/* new shading system */
-		PointerRNA *ptr = &path->ptr[path->len - 1];
-		ID *id;
-
-		/* if we already have a (pinned) texture, we're done */
-		if (RNA_struct_is_a(ptr->type, &RNA_Texture))
-			return 1;
-
-		if (!ct->user)
-			return 0;
-
-		id = ct->user->id;
-
-		if (id) {
-			if (GS(id->name) == ID_BR)
-				buttons_context_path_brush(path);
-			else if (GS(id->name) == ID_MA)
-				buttons_context_path_material(path, false, true);
-			else if (GS(id->name) == ID_WO)
-				buttons_context_path_world(path);
-			else if (GS(id->name) == ID_LA)
-				buttons_context_path_data(path, OB_LAMP);
-			else if (GS(id->name) == ID_PA)
-				buttons_context_path_particle(path);
-			else if (GS(id->name) == ID_OB)
-				buttons_context_path_object(path);
-			else if (GS(id->name) == ID_LS)
-				buttons_context_path_linestyle(path);
-		}
+	PointerRNA *ptr = &path->ptr[path->len - 1];
+	ID *id;
 
-		if (ct->texture) {
-			RNA_id_pointer_create(&ct->texture->id, &path->ptr[path->len]);
-			path->len++;
-		}
+	if (!ct)
+		return 0;
 
+	/* if we already have a (pinned) texture, we're done */
+	if (RNA_struct_is_a(ptr->type, &RNA_Texture))
 		return 1;
-	}
-	else {
-		/* old shading system */
-		Material *ma;
-		Lamp *la;
-		World *wo;
-		ParticleSystem *psys;
-		FreestyleLineStyle *ls;
-		Tex *tex;
-		PointerRNA *ptr = &path->ptr[path->len - 1];
-
-		/* if we already have a (pinned) texture, we're done */
-		if (RNA_struct_is_a(ptr->type, &RNA_Texture)) {
-			return 1;
-		}
-		/* try world */
-		else if ((path->tex_ctx == SB_TEXC_WORLD) && buttons_context_path_world(path)) {
-			wo = path->ptr[path->len - 1].data;
-
-			if (wo && GS(wo->id.name) == ID_WO) {
-				tex = give_current_world_texture(wo);
-
-				RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-				path->len++;
-				return 1;
-			}
-		}
-		/* try particles */
-		else if ((path->tex_ctx == SB_TEXC_PARTICLES) && buttons_context_path_particle(path)) {
-			if (path->ptr[path->len - 1].type == &RNA_ParticleSettings) {
-				ParticleSettings *part = path->ptr[path->len - 1].data;
 
-				tex = give_current_particle_texture(part);
-				RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-				path->len++;
-				return 1;
-			}
-			else {
-				psys = path->ptr[path->len - 1].data;
-
-				if (psys && psys->part && GS(psys->part->id.name) == ID_PA) {
-					tex = give_current_particle_texture(psys->part);
-
-					RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-					path->len++;
-					return 1;
-				}
-			}
-		}
-		/* try material */
-		else if ((path->tex_ctx == SB_TEXC_MATERIAL) && buttons_context_path_material(path, true, false)) {
-			ma = path->ptr[path->len - 1].data;
-
-			if (ma) {
-				tex = give_current_material_texture(ma);
-
-				RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-				path->len++;
-				return 1;
-			}
-		}
-		/* try lamp */
-		else if ((path->tex_ctx == SB_TEXC_LAMP) && buttons_context_path_data(path, OB_LAMP)) {
-			la = path->ptr[path->len - 1].data;
-
-			if (la) {
-				tex = give_current_lamp_texture(la);
+	if (!ct->user)
+		return 0;
 
-				RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-				path->len++;
-				return 1;
-			}
-		}
-		/* try linestyle */
-		else if ((path->tex_ctx == SB_TEXC_LINESTYLE) && buttons_context_path_linestyle(path)) {
-			ls = path->ptr[path->len - 1].data;
+	id = ct->user->id;
 
-			if (ls) {
-				tex = give_current_linestyle_texture(ls);
+	if (id) {
+		if (GS(id->name) == ID_BR)
+			buttons_context_path_brush(C, path);
+		else if (GS(id->name) == ID_PA)
+			buttons_context_path_particle(path);
+		else if (GS(id->name) == ID_OB)
+			buttons_context_path_object(path);
+		else if (GS(id->name) == ID_LS)
+			buttons_context_path_linestyle(path, CTX_wm_workspace(C));
+	}
 
-				RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
-				path->len++;
-				return 1;
-			}
-		}
+	if (ct->texture) {
+		RNA_id_pointer_create(&ct->texture->id, &path->ptr[path->len]);
+		path->len++;
 	}
 
-	/* no path to a texture possible */
-	return 0;
+	return 1;
 }
 
 #ifdef WITH_FREESTYLE
-static bool buttons_context_linestyle_pinnable(const bContext *C)
+static bool buttons_context_linestyle_pinnable(const bContext *C, ViewLayer *view_layer)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *actsrl;
 	FreestyleConfig *config;
 	SpaceButs *sbuts;
 
@@ -539,8 +455,7 @@ static bool buttons_context_linestyle_pinnable(const bContext *C)
 		return false;
 	}
 	/* if Freestyle is not in the Parameter Editor mode */
-	actsrl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	config = &actsrl->freestyleConfig;
+	config = &view_layer->freestyle_config;
 	if (config->mode != FREESTYLE_CONTROL_EDITOR_MODE) {
 		return false;
 	}
@@ -556,26 +471,37 @@ static bool buttons_context_linestyle_pinnable(const bContext *C)
 static int buttons_context_path(const bContext *C, ButsContextPath *path, int mainb, int flag)
 {
 	SpaceButs *sbuts = CTX_wm_space_buts(C);
+	Scene *scene = CTX_data_scene(C);
+	WorkSpace *workspace = CTX_wm_workspace(C);
+	ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
 	ID *id;
 	int found;
 
 	memset(path, 0, sizeof(*path));
 	path->flag = flag;
-	path->tex_ctx = sbuts->texture_context;
 
-	/* if some ID datablock is pinned, set the root pointer */
+	/* If some ID datablock is pinned, set the root pointer. */
 	if (sbuts->pinid) {
 		id = sbuts->pinid;
 
 		RNA_id_pointer_create(id, &path->ptr[0]);
 		path->len++;
 	}
+	/* No pinned root, use scene as initial root. */
+	else {
+		if (mainb == BCONTEXT_WORKSPACE) {
+			RNA_id_pointer_create(&workspace->id, &path->ptr[0]);
+			path->len++;
+		}
+		else {
+			RNA_id_pointer_create(&scene->id, &path->ptr[0]);
+			path->len++;
 
-	/* no pinned root, use scene as root */
-	if (path->len == 0) {
-		id = (ID *)CTX_data_scene(C);
-		RNA_id_pointer_create(id, &path->ptr[0]);
-		path->len++;
+			if (!ELEM(mainb, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_VIEW_LAYER, BCONTEXT_WORLD)) {
+				RNA_pointer_create(NULL, &RNA_ViewLayer, view_layer, &path->ptr[path->len]);
+				path->len++;
+			}
+		}
 	}
 
 	/* now for each buttons context type, we try to construct a path,
@@ -585,20 +511,23 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma
 		case BCONTEXT_RENDER:
 			found = buttons_context_path_scene(path);
 			break;
-		case BCONTEXT_RENDER_LAYER:
+		case BCONTEXT_VIEW_LAYER:
 #ifdef WITH_FREESTYLE
-			if (buttons_context_linestyle_pinnable(C)) {
-				found = buttons_context_path_linestyle(path);
+			if (buttons_context_linestyle_pinnable(C, view_layer)) {
+				found = buttons_context_path_linestyle(path, workspace);
 				if (found) {
 					break;
 				}
 			}
 #endif
-			found = buttons_context_path_scene(path);
+			found = buttons_context_path_view_layer(path, workspace);
 			break;
 		case BCONTEXT_WORLD:
 			found = buttons_context_path_world(path);
 			break;
+		case BCONTEXT_WORKSPACE:
+			found = buttons_context_path_workspace(path);
+			break;
 		case BCONTEXT_OBJECT:
 		case BCONTEXT_PHYSICS:
 		case BCONTEXT_CONSTRAINT:
@@ -614,10 +543,10 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma
 			found = buttons_context_path_particle(path);
 			break;
 		case BCONTEXT_MATERIAL:
-			found = buttons_context_path_material(path, false, (sbuts->texuser != NULL));
+			found = buttons_context_path_material(path);
 			break;
 		case BCONTEXT_TEXTURE:
-			found = buttons_context_path_texture(path, sbuts->texuser);
+			found = buttons_context_path_texture(C, path, sbuts->texuser);
 			break;
 		case BCONTEXT_BONE:
 			found = buttons_context_path_bone(path);
@@ -672,7 +601,7 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
 
 	path = sbuts->path;
 
-	/* We need to set Scene path now! Else, buttons_texture_context_compute() might not get a valid scene. */
+	/* Set scene path. */
 	buttons_context_path(C, path, BCONTEXT_SCENE, pflag);
 
 	buttons_texture_context_compute(C, sbuts);
@@ -740,11 +669,11 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
 
 const char *buttons_context_dir[] = {
 	"texture_slot", "scene", "world", "object", "mesh", "armature", "lattice", "curve",
-	"meta_ball", "lamp", "speaker", "camera", "material", "material_slot",
+	"meta_ball", "lamp", "speaker", "lightprobe", "camera", "material", "material_slot",
 	"texture", "texture_user", "texture_user_property", "bone", "edit_bone",
 	"pose_bone", "particle_system", "particle_system_editable", "particle_settings",
 	"cloth", "soft_body", "fluid", "smoke", "collision", "brush", "dynamic_paint",
-	"line_style", NULL
+	"line_style", "collection", NULL
 };
 
 int buttons_context(const bContext *C, const char *member, bContextDataResult *result)
@@ -809,6 +738,10 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		set_pointer_type(path, result, &RNA_Speaker);
 		return 1;
 	}
+	else if (CTX_data_equals(member, "lightprobe")) {
+		set_pointer_type(path, result, &RNA_LightProbe);
+		return 1;
+	}
 	else if (CTX_data_equals(member, "material")) {
 		set_pointer_type(path, result, &RNA_Material);
 		return 1;
@@ -817,13 +750,8 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		ButsContextTexture *ct = sbuts->texuser;
 
 		if (ct) {
-			/* new shading system */
 			CTX_data_pointer_set(result, &ct->texture->id, &RNA_Texture, ct->texture);
 		}
-		else {
-			/* old shading system */
-			set_pointer_type(path, result, &RNA_Texture);
-		}
 
 		return 1;
 	}
@@ -847,7 +775,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		ButsContextTexture *ct = sbuts->texuser;
 
 		if (!ct)
-			return -1;  /* old shading system (found but not available) */
+			return -1;
 
 		if (ct->user && ct->user->ptr.data) {
 			ButsTextureUser *user = ct->user;
@@ -860,7 +788,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		ButsContextTexture *ct = sbuts->texuser;
 
 		if (!ct)
-			return -1;  /* old shading system (found but not available) */
+			return -1;
 
 		if (ct->user && ct->user->ptr.data) {
 			ButsTextureUser *user = ct->user;
@@ -880,21 +808,6 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 
 			return 1;
 		}
-		else {
-			/* old shading system */
-			PointerRNA *ptr;
-
-			if ((ptr = get_pointer_type(path, &RNA_Material))) {
-				Material *ma = ptr->data;
-
-				if (ma) {
-					bNode *node = give_current_material_texture_node(ma);
-					CTX_data_pointer_set(result, &ma->nodetree->id, &RNA_Node, node);
-				}
-			}
-
-			return 1;
-		}
 	}
 	else if (CTX_data_equals(member, "texture_slot")) {
 		ButsContextTexture *ct = sbuts->texuser;
@@ -910,38 +823,6 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		else if (ct) {
 			return 0;  /* new shading system */
 		}
-		else if ((ptr = get_pointer_type(path, &RNA_Material))) {
-			Material *ma = ptr->data;
-
-			/* if we have a node material, get slot from material in material node */
-			if (ma && ma->use_nodes && ma->nodetree) {
-				/* if there's an active texture node in the node tree,
-				 * then that texture is in context directly, without a texture slot */
-				if (give_current_material_texture_node(ma))
-					return 0;
-
-				ma = give_node_material(ma);
-				if (ma)
-					CTX_data_pointer_set(result, &ma->id, &RNA_MaterialTextureSlot, ma->mtex[(int)ma->texact]);
-				else
-					return 0;
-			}
-			else if (ma) {
-				CTX_data_pointer_set(result, &ma->id, &RNA_MaterialTextureSlot, ma->mtex[(int)ma->texact]);
-			}
-		}
-		else if ((ptr = get_pointer_type(path, &RNA_Lamp))) {
-			Lamp *la = ptr->data;
-
-			if (la)
-				CTX_data_pointer_set(result, &la->id, &RNA_LampTextureSlot, la->mtex[(int)la->texact]);
-		}
-		else if ((ptr = get_pointer_type(path, &RNA_World))) {
-			World *wo = ptr->data;
-
-			if (wo)
-				CTX_data_pointer_set(result, &wo->id, &RNA_WorldTextureSlot, wo->mtex[(int)wo->texact]);
-		}
 		else if ((ptr = get_pointer_type(path, &RNA_FreestyleLineStyle))) {
 			FreestyleLineStyle *ls = ptr->data;
 
@@ -1121,10 +1002,15 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
 			name = RNA_struct_name_get_alloc(ptr, namebuf, sizeof(namebuf), NULL);
 
 			if (name) {
-				if (!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_RENDER_LAYER) && ptr->type == &RNA_Scene)
+				if ((!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_VIEW_LAYER) && ptr->type == &RNA_Scene)) {
 					uiItemLDrag(row, ptr, "", icon);  /* save some space */
-				else
+				}
+				else if ((!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_VIEW_LAYER) && ptr->type == &RNA_ViewLayer)) {
+					uiItemLDrag(row, ptr, "", icon);  /* save some space */
+				}
+				else {
 					uiItemLDrag(row, ptr, name, icon);
+				}
 
 				if (name != namebuf)
 					MEM_freeN(name);
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 53b541ad382..2219b2a932c 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -45,26 +45,13 @@ struct bNodeTree;
 struct uiLayout;
 struct wmOperatorType;
 
-/* buts->scaflag */
-#define BUTS_SENS_SEL       1
-#define BUTS_SENS_ACT       2
-#define BUTS_SENS_LINK      4
-#define BUTS_CONT_SEL       8
-#define BUTS_CONT_ACT       16
-#define BUTS_CONT_LINK      32
-#define BUTS_ACT_SEL        64
-#define BUTS_ACT_ACT        128
-#define BUTS_ACT_LINK       256
-#define BUTS_SENS_STATE     512
-#define BUTS_ACT_STATE      1024
-
 /* context data */
 
 typedef struct ButsContextPath {
 	PointerRNA ptr[8];
 	int len;
 	int flag;
-	int tex_ctx;
+	int collection_ctx;
 } ButsContextPath;
 
 typedef struct ButsTextureUser {
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index 50791cf6bef..5feb74edef7 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -41,8 +41,6 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_ID.h"
-#include "DNA_lamp_types.h"
-#include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force_types.h"
@@ -50,17 +48,17 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
-#include "DNA_world_types.h"
 #include "DNA_linestyle_types.h"
 
 #include "BKE_context.h"
+#include "BKE_layer.h"
 #include "BKE_linestyle.h"
-#include "BKE_material.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
+#include "BKE_workspace.h"
 #ifdef WITH_FREESTYLE
 #  include "BKE_freestyle.h"
 #endif
@@ -78,172 +76,6 @@
 
 #include "buttons_intern.h" // own include
 
-/****************** "Old Shading" Texture Context ****************/
-
-bool ED_texture_context_check_world(const bContext *C)
-{
-	Scene *scene = CTX_data_scene(C);
-	return (scene && scene->world);
-}
-
-bool ED_texture_context_check_material(const bContext *C)
-{
-	Object *ob = CTX_data_active_object(C);
-	return (ob && (ob->totcol != 0));
-}
-
-bool ED_texture_context_check_lamp(const bContext *C)
-{
-	Object *ob = CTX_data_active_object(C);
-	return (ob && (ob->type == OB_LAMP));
-}
-
-bool ED_texture_context_check_particles(const bContext *C)
-{
-	Object *ob = CTX_data_active_object(C);
-	return (ob && ob->particlesystem.first);
-}
-
-bool ED_texture_context_check_linestyle(const bContext *C)
-{
-#ifdef WITH_FREESTYLE
-	Scene *scene = CTX_data_scene(C);
-	SceneRenderLayer *actsrl;
-	FreestyleConfig *config;
-	FreestyleLineSet *lineset;
-	FreestyleLineStyle *linestyle;
-
-	if (scene && (scene->r.mode & R_EDGE_FRS)) {
-		actsrl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-		config = &actsrl->freestyleConfig;
-		if (config->mode == FREESTYLE_CONTROL_EDITOR_MODE) {
-			lineset = BKE_freestyle_lineset_get_active(config);
-			if (lineset) {
-				linestyle = lineset->linestyle;
-				return linestyle && (linestyle->flag & LS_TEXTURE);
-			}
-		}
-	}
-#else
-	(void)C;
-#endif
-	return false;
-}
-
-static void texture_context_check_modifier_foreach(void *userData, Object *UNUSED(ob), ModifierData *UNUSED(md),
-                                                   const char *UNUSED(propname))
-{
-	*((bool *)userData) = true;
-}
-
-bool ED_texture_context_check_others(const bContext *C)
-{
-	/* We cannot rely on sbuts->texuser here, as it is NULL when in "old" tex handling, non-OTHERS tex context. */
-	Object *ob = CTX_data_active_object(C);
-
-	/* object */
-	if (ob) {
-		/* Tex force field. */
-		if (ob->pd && ob->pd->forcefield == PFIELD_TEXTURE) {
-			return true;
-		}
-
-		/* modifiers */
-		{
-			bool check = false;
-			modifiers_foreachTexLink(ob, texture_context_check_modifier_foreach, &check);
-			if (check) {
-				return true;
-			}
-		}
-	}
-
-	/* brush */
-	if (BKE_paint_brush(BKE_paint_get_active_from_context(C))) {
-		return true;
-	}
-
-	return false;
-}
-
-static void set_texture_context(const bContext *C, SpaceButs *sbuts)
-{
-	Scene *scene = CTX_data_scene(C);
-
-	if (BKE_scene_use_new_shading_nodes(scene)) {
-		return;  /* No texture context in new shading mode */
-	}
-
-	{
-		bool valid_world = ED_texture_context_check_world(C);
-		bool valid_material = ED_texture_context_check_material(C);
-		bool valid_lamp = ED_texture_context_check_lamp(C);
-		bool valid_particles = ED_texture_context_check_particles(C);
-		bool valid_linestyle = ED_texture_context_check_linestyle(C);
-		bool valid_others = ED_texture_context_check_others(C);
-
-		/* this is similar to direct user action, no need to keep "better" ctxt in _prev */
-		if ((sbuts->mainb == BCONTEXT_WORLD) && valid_world) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_WORLD;
-		}
-		else if ((sbuts->mainb == BCONTEXT_MATERIAL) && valid_material) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_MATERIAL;
-		}
-		else if ((sbuts->mainb == BCONTEXT_DATA) && valid_lamp) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_LAMP;
-		}
-		else if ((sbuts->mainb == BCONTEXT_PARTICLE) && valid_particles) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_PARTICLES;
-		}
-		else if ((sbuts->mainb == BCONTEXT_RENDER_LAYER) && valid_linestyle) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_LINESTYLE;
-		}
-		else if ((ELEM(sbuts->mainb, BCONTEXT_MODIFIER, BCONTEXT_PHYSICS)) && valid_others) {
-			sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_OTHER;
-		}
-		/* Else, try to revive a previous "better" ctxt... */
-		else if ((sbuts->texture_context_prev != sbuts->texture_context) &&
-		         (((sbuts->texture_context_prev == SB_TEXC_WORLD) && valid_world) ||
-		          ((sbuts->texture_context_prev == SB_TEXC_MATERIAL) && valid_material) ||
-		          ((sbuts->texture_context_prev == SB_TEXC_LAMP) && valid_lamp) ||
-		          ((sbuts->texture_context_prev == SB_TEXC_PARTICLES) && valid_particles) ||
-		          ((sbuts->texture_context_prev == SB_TEXC_LINESTYLE) && valid_linestyle) ||
-		          ((sbuts->texture_context_prev == SB_TEXC_OTHER) && valid_others)))
-		{
-			sbuts->texture_context = sbuts->texture_context_prev;
-		}
-		/* Else, just be sure that current context is valid! */
-		else if (((sbuts->texture_context == SB_TEXC_WORLD) && !valid_world) ||
-		         ((sbuts->texture_context == SB_TEXC_MATERIAL) && !valid_material) ||
-		         ((sbuts->texture_context == SB_TEXC_LAMP) && !valid_lamp) ||
-		         ((sbuts->texture_context == SB_TEXC_PARTICLES) && !valid_particles) ||
-		         ((sbuts->texture_context == SB_TEXC_LINESTYLE) && !valid_linestyle) ||
-		         ((sbuts->texture_context == SB_TEXC_OTHER) && !valid_others))
-		{
-			/* this is default fallback, do keep "better" ctxt in _prev */
-			sbuts->texture_context_prev = sbuts->texture_context;
-			if (valid_material) {
-				sbuts->texture_context = SB_TEXC_MATERIAL;
-			}
-			else if (valid_lamp) {
-				sbuts->texture_context = SB_TEXC_LAMP;
-			}
-			else if (valid_particles) {
-				sbuts->texture_context = SB_TEXC_PARTICLES;
-			}
-			else if (valid_linestyle) {
-				sbuts->texture_context = SB_TEXC_LINESTYLE;
-			}
-			else if (valid_world) {
-				sbuts->texture_context = SB_TEXC_WORLD;
-			}
-			else if (valid_others) {
-				sbuts->texture_context = SB_TEXC_OTHER;
-			}
-		}
-	}
-}
-
 /************************* Texture User **************************/
 
 static void buttons_texture_user_property_add(ListBase *users, ID *id,
@@ -321,9 +153,6 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext *
 {
 	Scene *scene = NULL;
 	Object *ob = NULL;
-	Material *ma = NULL;
-	Lamp *la = NULL;
-	World *wrld = NULL;
 	FreestyleLineStyle *linestyle = NULL;
 	Brush *brush = NULL;
 	ID *pinid = sbuts->pinid;
@@ -335,42 +164,29 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext *
 			scene = (Scene *)pinid;
 		else if (GS(pinid->name) == ID_OB)
 			ob = (Object *)pinid;
-		else if (GS(pinid->name) == ID_LA)
-			la = (Lamp *)pinid;
-		else if (GS(pinid->name) == ID_WO)
-			wrld = (World *)pinid;
-		else if (GS(pinid->name) == ID_MA)
-			ma = (Material *)pinid;
 		else if (GS(pinid->name) == ID_BR)
 			brush = (Brush *)pinid;
 		else if (GS(pinid->name) == ID_LS)
 			linestyle = (FreestyleLineStyle *)pinid;
 	}
 
-	if (!scene)
+	if (!scene) {
 		scene = CTX_data_scene(C);
+	}
+
+	const ID_Type id_type = pinid != NULL ? GS(pinid->name) : -1;
+	if (!pinid || id_type == ID_SCE) {
+		WorkSpace *workspace = CTX_wm_workspace(C);
+		ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene);
 
-	if (!pinid || GS(pinid->name) == ID_SCE) {
-		ob = (scene->basact) ? scene->basact->object : NULL;
-		wrld = scene->world;
 		brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
-		linestyle = BKE_linestyle_active_from_scene(scene);
+		linestyle = BKE_linestyle_active_from_view_layer(view_layer);
+		ob = OBACT(view_layer);
 	}
 
-	if (ob && ob->type == OB_LAMP && !la)
-		la = ob->data;
-	if (ob && !ma)
-		ma = give_current_material(ob, ob->actcol);
-
 	/* fill users */
 	BLI_listbase_clear(users);
 
-	if (ma && !limited_mode)
-		buttons_texture_users_find_nodetree(users, &ma->id, ma->nodetree, N_("Material"));
-	if (la && !limited_mode)
-		buttons_texture_users_find_nodetree(users, &la->id, la->nodetree, N_("Lamp"));
-	if (wrld && !limited_mode)
-		buttons_texture_users_find_nodetree(users, &wrld->id, wrld->nodetree, N_("World"));
 	if (linestyle && !limited_mode)
 		buttons_texture_users_find_nodetree(users, &linestyle->id, linestyle->nodetree, N_("Line Style"));
 
@@ -439,21 +255,8 @@ void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts)
 	/* gather available texture users in context. runs on every draw of
 	 * properties editor, before the buttons are created. */
 	ButsContextTexture *ct = sbuts->texuser;
-	Scene *scene = CTX_data_scene(C);
 	ID *pinid = sbuts->pinid;
 
-	set_texture_context(C, sbuts);
-
-	if (!((sbuts->texture_context == SB_TEXC_OTHER) || BKE_scene_use_new_shading_nodes(scene))) {
-		if (ct) {
-			BLI_freelistN(&ct->users);
-			MEM_freeN(ct);
-			sbuts->texuser = NULL;
-		}
-
-		return;
-	}
-
 	if (!ct) {
 		ct = MEM_callocN(sizeof(ButsContextTexture), "ButsContextTexture");
 		sbuts->texuser = ct;
@@ -687,4 +490,3 @@ void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, Prope
 		UI_but_func_set(but, template_texture_show, user->ptr.data, user->prop);
 	}
 }
-
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 3df913c5f7e..11857dd0b27 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -44,14 +44,19 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "UI_resources.h"
 
 #include "buttons_intern.h"  /* own include */
 
 /* ******************** default callbacks for buttons space ***************** */
 
-static SpaceLink *buttons_new(const bContext *UNUSED(C))
+static SpaceLink *buttons_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceButs *sbuts;
@@ -60,6 +65,8 @@ static SpaceLink *buttons_new(const bContext *UNUSED(C))
 	sbuts->spacetype = SPACE_BUTS;
 	sbuts->align = BUT_VERTICAL;
 
+	sbuts->mainb = sbuts->mainbuser = BCONTEXT_OBJECT;
+
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for buts");
 
@@ -135,47 +142,160 @@ static void buttons_main_region_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 }
 
-static void buttons_main_region_draw(const bContext *C, ARegion *ar)
+static void buttons_main_region_draw_properties(const bContext *C, SpaceButs *sbuts, ARegion *ar)
 {
-	/* draw entirely, view changes should be handled here */
-	SpaceButs *sbuts = CTX_wm_space_buts(C);
+	BLI_assert(sbuts->space_subtype == SB_SUBTYPE_DATA);
 	const bool vertical = (sbuts->align == BUT_VERTICAL);
 
 	buttons_context_compute(C, sbuts);
 
-	if (sbuts->mainb == BCONTEXT_SCENE)
-		ED_region_panels(C, ar, "scene", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_RENDER)
-		ED_region_panels(C, ar, "render", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_RENDER_LAYER)
-		ED_region_panels(C, ar, "render_layer", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_WORLD)
-		ED_region_panels(C, ar, "world", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_OBJECT)
-		ED_region_panels(C, ar, "object", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_DATA)
-		ED_region_panels(C, ar, "data", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_MATERIAL)
-		ED_region_panels(C, ar, "material", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_TEXTURE)
-		ED_region_panels(C, ar, "texture", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_PARTICLE)
-		ED_region_panels(C, ar, "particle", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_PHYSICS)
-		ED_region_panels(C, ar, "physics", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_BONE)
-		ED_region_panels(C, ar, "bone", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_MODIFIER)
-		ED_region_panels(C, ar, "modifier", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_CONSTRAINT)
-		ED_region_panels(C, ar, "constraint", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_BONE_CONSTRAINT)
-		ED_region_panels(C, ar, "bone_constraint", sbuts->mainb, vertical);
+	const char *contexts[2] = {NULL, NULL};
+
+	switch (sbuts->mainb) {
+		case BCONTEXT_SCENE:
+			contexts[0] = "scene";
+			break;
+		case BCONTEXT_RENDER:
+			contexts[0] = "render";
+			break;
+		case BCONTEXT_VIEW_LAYER:
+			contexts[0] = "view_layer";
+			break;
+		case BCONTEXT_WORLD:
+			contexts[0] = "world";
+			break;
+		case BCONTEXT_WORKSPACE:
+			contexts[0] = "workspace";
+			break;
+		case BCONTEXT_OBJECT:
+			contexts[0] = "object";
+			break;
+		case BCONTEXT_DATA:
+			contexts[0] = "data";
+			break;
+		case BCONTEXT_MATERIAL:
+			contexts[0] = "material";
+			break;
+		case BCONTEXT_TEXTURE:
+			contexts[0] = "texture";
+			break;
+		case BCONTEXT_PARTICLE:
+			contexts[0] = "particle";
+			break;
+		case BCONTEXT_PHYSICS:
+			contexts[0] = "physics";
+			break;
+		case BCONTEXT_BONE:
+			contexts[0] = "bone";
+			break;
+		case BCONTEXT_MODIFIER:
+			contexts[0] = "modifier";
+			break;
+		case BCONTEXT_CONSTRAINT:
+			contexts[0] = "constraint";
+			break;
+		case BCONTEXT_BONE_CONSTRAINT:
+			contexts[0] = "bone_constraint";
+			break;
+	}
+
+	if (contexts[0]) {
+		ED_region_panels(C, ar, contexts, sbuts->mainb, vertical);
+	}
+}
+
+static void buttons_main_region_draw_tool(const bContext *C, SpaceButs *sbuts, ARegion *ar)
+{
+	BLI_assert(sbuts->space_subtype == SB_SUBTYPE_TOOL);
+	const bool vertical = (sbuts->align == BUT_VERTICAL);
+
+	const WorkSpace *workspace = CTX_wm_workspace(C);
+	if (workspace->tools_space_type == SPACE_VIEW3D) {
+		const int mode = CTX_data_mode_enum(C);
+		const char *contexts[3] = {NULL};
+		switch (mode) {
+			case CTX_MODE_EDIT_MESH:
+				ARRAY_SET_ITEMS(contexts, ".mesh_edit");
+				break;
+			case CTX_MODE_EDIT_CURVE:
+				ARRAY_SET_ITEMS(contexts, ".curve_edit");
+				break;
+			case CTX_MODE_EDIT_SURFACE:
+				ARRAY_SET_ITEMS(contexts, ".curve_edit");
+				break;
+			case CTX_MODE_EDIT_TEXT:
+				ARRAY_SET_ITEMS(contexts, ".todo");
+				break;
+			case CTX_MODE_EDIT_ARMATURE:
+				ARRAY_SET_ITEMS(contexts, ".armature_edit");
+				break;
+			case CTX_MODE_EDIT_METABALL:
+				ARRAY_SET_ITEMS(contexts, ".todo");
+				break;
+			case CTX_MODE_EDIT_LATTICE:
+				ARRAY_SET_ITEMS(contexts, ".todo");
+				break;
+			case CTX_MODE_POSE:
+				ARRAY_SET_ITEMS(contexts, ".posemode");
+				break;
+			case CTX_MODE_SCULPT:
+				ARRAY_SET_ITEMS(contexts, ".paint_common", ".sculpt_mode");
+				break;
+			case CTX_MODE_PAINT_WEIGHT:
+				ARRAY_SET_ITEMS(contexts, ".paint_common", ".weightpaint");
+				break;
+			case CTX_MODE_PAINT_VERTEX:
+				ARRAY_SET_ITEMS(contexts, ".paint_common", ".vertexpaint");
+				break;
+			case CTX_MODE_PAINT_TEXTURE:
+				ARRAY_SET_ITEMS(contexts, ".paint_common", ".imagepaint");
+				break;
+			case CTX_MODE_PARTICLE:
+				ARRAY_SET_ITEMS(contexts, ".particlemode");
+				break;
+			case CTX_MODE_OBJECT:
+				ARRAY_SET_ITEMS(contexts, ".todo");
+				break;
+		}
+		if (contexts[0]) {
+			ED_region_panels(C, ar, contexts, -1, vertical);
+		}
+	}
+	else if (workspace->tools_space_type == SPACE_IMAGE) {
+		/* TODO */
+	}
+}
+
+static void buttons_main_region_draw(const bContext *C, ARegion *ar)
+{
+	/* draw entirely, view changes should be handled here */
+	SpaceButs *sbuts = CTX_wm_space_buts(C);
+
+	if (sbuts->space_subtype == SB_SUBTYPE_DATA) {
+		buttons_main_region_draw_properties(C, sbuts, ar);
+	}
+	else if (sbuts->space_subtype == SB_SUBTYPE_TOOL) {
+		buttons_main_region_draw_tool(C, sbuts, ar);
+	}
 
 	sbuts->re_align = 0;
 	sbuts->mainbo = sbuts->mainb;
 }
 
+static void buttons_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn,
+        const Scene *UNUSED(scene))
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
+	}
+}
+
 static void buttons_operatortypes(void)
 {
 	WM_operatortype_append(BUTTONS_OT_toolbox);
@@ -200,12 +320,36 @@ static void buttons_header_region_draw(const bContext *C, ARegion *ar)
 {
 	SpaceButs *sbuts = CTX_wm_space_buts(C);
 
-	/* Needed for RNA to get the good values! */
-	buttons_context_compute(C, sbuts);
+	if (sbuts->space_subtype == SB_SUBTYPE_DATA) {
+		/* Needed for RNA to get the good values! */
+		buttons_context_compute(C, sbuts);
+	}
 
 	ED_region_header(C, ar);
 }
 
+static void buttons_header_region_message_subscribe(
+        const bContext *UNUSED(C),
+        WorkSpace *UNUSED(workspace), Scene *UNUSED(scene),
+        bScreen *UNUSED(screen), ScrArea *sa, ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	SpaceButs *sbuts = sa->spacedata.first;
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* Don't check for SpaceButs.mainb here, we may toggle between view-layers
+	 * where one has no active object, so that available contexts changes. */
+	WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
+
+	if (!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_WORLD)) {
+		WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw);
+	}
+}
+
 /* draw a certain button set only if properties area is currently
  * showing that button set, to reduce unnecessary drawing. */
 static void buttons_area_redraw(ScrArea *sa, short buttons)
@@ -218,7 +362,9 @@ static void buttons_area_redraw(ScrArea *sa, short buttons)
 }
 
 /* reused! */
-static void buttons_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void buttons_area_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+        WorkSpace *UNUSED(workspace))
 {
 	SpaceButs *sbuts = sa->spacedata.first;
 
@@ -228,7 +374,7 @@ static void buttons_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *
 			switch (wmn->data) {
 				case ND_RENDER_OPTIONS:
 					buttons_area_redraw(sa, BCONTEXT_RENDER);
-					buttons_area_redraw(sa, BCONTEXT_RENDER_LAYER);
+					buttons_area_redraw(sa, BCONTEXT_VIEW_LAYER);
 					break;
 				case ND_WORLD:
 					buttons_area_redraw(sa, BCONTEXT_WORLD);
@@ -444,6 +590,24 @@ static void buttons_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id,
 	}
 }
 
+static int buttons_space_subtype_get(ScrArea *sa)
+{
+	SpaceButs *sbuts = sa->spacedata.first;
+	return sbuts->space_subtype;
+}
+
+static void buttons_space_subtype_set(ScrArea *sa, int value)
+{
+	SpaceButs *sbuts = sa->spacedata.first;
+	sbuts->space_subtype = value;
+}
+
+static void buttons_space_subtype_item_extend(
+        bContext *UNUSED(C), EnumPropertyItem **item, int *totitem)
+{
+	RNA_enum_items_add(item, totitem, rna_enum_space_button_mode_items);
+}
+
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_buttons(void)
 {
@@ -462,12 +626,16 @@ void ED_spacetype_buttons(void)
 	st->listener = buttons_area_listener;
 	st->context = buttons_context;
 	st->id_remap = buttons_id_remap;
+	st->space_subtype_item_extend = buttons_space_subtype_item_extend;
+	st->space_subtype_get = buttons_space_subtype_get;
+	st->space_subtype_set = buttons_space_subtype_set;
 
 	/* regions: main window */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
 	art->regionid = RGN_TYPE_WINDOW;
 	art->init = buttons_main_region_init;
 	art->draw = buttons_main_region_draw;
+	art->listener = buttons_main_region_listener;
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
 	BLI_addhead(&st->regiontypes, art);
 
@@ -481,6 +649,7 @@ void ED_spacetype_buttons(void)
 
 	art->init = buttons_header_region_init;
 	art->draw = buttons_header_region_draw;
+	art->message_subscribe = buttons_header_region_message_subscribe;
 	BLI_addhead(&st->regiontypes, art);
 
 	BKE_spacetype_register(st);
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index 32d48c9c564..8fa4a0de53f 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -27,6 +27,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c
index ec8e4a881e1..469d94fed3a 100644
--- a/source/blender/editors/space_clip/clip_buttons.c
+++ b/source/blender/editors/space_clip/clip_buttons.c
@@ -47,11 +47,12 @@
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_screen.h"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_gpencil.h"
 
 #include "UI_interface.h"
@@ -236,7 +237,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event)
 		marker->pos[1] = cb->marker_pos[1] / height;
 
 		/* to update position of "parented" objects */
-		DAG_id_tag_update(&cb->clip->id, 0);
+		DEG_id_tag_update(&cb->clip->id, 0);
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 		ok = true;
@@ -321,7 +322,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event)
 			sub_v2_v2(cb->track->markers[i].pos, delta);
 
 		/* to update position of "parented" objects */
-		DAG_id_tag_update(&cb->clip->id, 0);
+		DEG_id_tag_update(&cb->clip->id, 0);
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 		ok = true;
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c
index 4bf4c1e7baa..bc2aa3ae67f 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_draw.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c
@@ -42,8 +42,6 @@
 #include "ED_screen.h"
 #include "ED_clip.h"
 
-#include "BIF_gl.h"
-
 #include "WM_types.h"
 
 #include "UI_interface.h"
@@ -54,6 +52,9 @@
 
 #include "RNA_access.h"
 
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+
 #include "clip_intern.h"  /* own include */
 
 static void track_channel_color(MovieTrackingTrack *track, float default_color[3], float color[3])
@@ -72,72 +73,19 @@ static void track_channel_color(MovieTrackingTrack *track, float default_color[3
 	}
 }
 
-static void draw_keyframe_shape(float x, float y, float xscale, float yscale, bool sel, float alpha)
+static void draw_keyframe_shape(float x, float y, bool sel, float alpha,
+                                unsigned int pos_id, unsigned int color_id)
 {
-	/* coordinates for diamond shape */
-	static const float _unit_diamond_shape[4][2] = {
-		{0.0f, 1.0f},   /* top vert */
-		{1.0f, 0.0f},   /* mid-right */
-		{0.0f, -1.0f},  /* bottom vert */
-		{-1.0f, 0.0f}   /* mid-left */
-	};
-	static GLuint displist1 = 0;
-	static GLuint displist2 = 0;
-	int hsize = STRIP_HEIGHT_HALF;
-
-	/* initialize 2 display lists for diamond shape - one empty, one filled */
-	if (displist1 == 0) {
-		displist1 = glGenLists(1);
-		glNewList(displist1, GL_COMPILE);
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2fv(_unit_diamond_shape[0]);
-		glVertex2fv(_unit_diamond_shape[1]);
-		glVertex2fv(_unit_diamond_shape[2]);
-		glVertex2fv(_unit_diamond_shape[3]);
-		glEnd();
-		glEndList();
+	float color[4] = { 0.91f, 0.91f, 0.91f, alpha };
+	if (sel) {
+		UI_GetThemeColorShadeAlpha4fv(TH_STRIP_SELECT, 50, -255 * (1.0f - alpha), color);
 	}
-	if (displist2 == 0) {
-		displist2 = glGenLists(1);
-		glNewList(displist2, GL_COMPILE);
-
-		glBegin(GL_QUADS);
-		glVertex2fv(_unit_diamond_shape[0]);
-		glVertex2fv(_unit_diamond_shape[1]);
-		glVertex2fv(_unit_diamond_shape[2]);
-		glVertex2fv(_unit_diamond_shape[3]);
-		glEnd();
-		glEndList();
-	}
-
-	glPushMatrix();
-
-	/* adjust view transform before starting */
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * hsize, 1.0f / yscale * hsize, 1.0f);
-
-	/* anti-aliased lines for more consistent appearance */
-	glEnable(GL_LINE_SMOOTH);
-
-	if (sel)
-		UI_ThemeColorShadeAlpha(TH_STRIP_SELECT, 50, -255 * (1.0f - alpha));
-	else
-		glColor4f(0.91f, 0.91f, 0.91f, alpha);
 
-	glCallList(displist2);
-
-	/* exterior - black frame */
-	glColor4f(0.0f, 0.0f, 0.0f, alpha);
-	glCallList(displist1);
-
-	glDisable(GL_LINE_SMOOTH);
-
-	/* restore view transform */
-	glPopMatrix();
+	immAttrib4fv(color_id, color);
+	immVertex2f(pos_id, x, y);
 }
 
-static void clip_draw_dopesheet_background(ARegion *ar, MovieClip *clip)
+static void clip_draw_dopesheet_background(ARegion *ar, MovieClip *clip, unsigned int pos_id)
 {
 	View2D *v2d = &ar->v2d;
 	MovieTracking *tracking = &clip->tracking;
@@ -153,12 +101,13 @@ static void clip_draw_dopesheet_background(ARegion *ar, MovieClip *clip)
 			int end_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, coverage_segment->end_frame);
 
 			if (coverage_segment->coverage == TRACKING_COVERAGE_BAD) {
-				glColor4f(1.0f, 0.0f, 0.0f, 0.07f);
+				immUniformColor4f(1.0f, 0.0f, 0.0f, 0.07f);
+			}
+			else {
+				immUniformColor4f(1.0f, 1.0f, 0.0f, 0.07f);
 			}
-			else
-				glColor4f(1.0f, 1.0f, 0.0f, 0.07f);
 
-			glRectf(start_frame, v2d->cur.ymin, end_frame, v2d->cur.ymax);
+			immRectf(pos_id, start_frame, v2d->cur.ymin, end_frame, v2d->cur.ymax);
 		}
 	}
 }
@@ -175,18 +124,21 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 		MovieTracking *tracking = &clip->tracking;
 		MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
 		MovieTrackingDopesheetChannel *channel;
-		float y, xscale, yscale;
 		float strip[4], selected_strip[4];
 		float height = (dopesheet->tot_channel * CHANNEL_STEP) + (CHANNEL_HEIGHT);
 
+		unsigned int keyframe_ct = 0;
+
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		/* don't use totrect set, as the width stays the same
 		 * (NOTE: this is ok here, the configuration is pretty straightforward)
 		 */
 		v2d->tot.ymin = (float)(-height);
 
-		y = (float) CHANNEL_FIRST;
-
-		UI_view2d_scale_get(v2d, &xscale, &yscale);
+		float y = (float) CHANNEL_FIRST;
 
 		/* setup colors for regular and selected strips */
 		UI_GetThemeColor3fv(TH_STRIP, strip);
@@ -197,7 +149,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 
 		glEnable(GL_BLEND);
 
-		clip_draw_dopesheet_background(ar, clip);
+		clip_draw_dopesheet_background(ar, clip, pos_id);
 
 		for (channel = dopesheet->channels.first; channel; channel = channel->next) {
 			float yminc = (float) (y - CHANNEL_HEIGHT_HALF);
@@ -208,7 +160,6 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 			    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
 			{
 				MovieTrackingTrack *track = channel->track;
-				float alpha;
 				int i;
 				bool sel = (track->flag & TRACK_DOPE_SEL) != 0;
 
@@ -218,32 +169,26 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 					float default_color[4] = {0.8f, 0.93f, 0.8f, 0.3f};
 
 					track_channel_color(track, default_color, color);
-					glColor4fv(color);
+					immUniformColor4fv(color);
 
-					glRectf(v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
-					        v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
+					immRectf(pos_id, v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
+					         v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
 				}
 
-				alpha = (track->flag & TRACK_LOCKED) ? 0.5f : 1.0f;
-
 				/* tracked segments */
 				for (i = 0; i < channel->tot_segment; i++) {
 					int start_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i]);
 					int end_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i + 1]);
 
-					if (sel)
-						glColor4fv(selected_strip);
-					else
-						glColor4fv(strip);
+					immUniformColor4fv(sel ? selected_strip : strip);
 
 					if (start_frame != end_frame) {
-						glRectf(start_frame, (float) y - STRIP_HEIGHT_HALF,
-						        end_frame, (float) y + STRIP_HEIGHT_HALF);
-						draw_keyframe_shape(start_frame, y, xscale, yscale, sel, alpha);
-						draw_keyframe_shape(end_frame, y, xscale, yscale, sel, alpha);
+						immRectf(pos_id, start_frame, (float) y - STRIP_HEIGHT_HALF,
+						         end_frame, (float) y + STRIP_HEIGHT_HALF);
+						keyframe_ct += 2;
 					}
 					else {
-						draw_keyframe_shape(start_frame, y, xscale, yscale, sel, alpha);
+						keyframe_ct++;
 					}
 				}
 
@@ -253,9 +198,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 					MovieTrackingMarker *marker = &track->markers[i];
 
 					if ((marker->flag & (MARKER_DISABLED | MARKER_TRACKED)) == 0) {
-						int framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
-
-						draw_keyframe_shape(framenr, y, xscale, yscale, sel, alpha);
+						keyframe_ct++;
 					}
 
 					i++;
@@ -266,11 +209,78 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 			y -= CHANNEL_STEP;
 		}
 
+		immUnbindProgram();
+
+		if (keyframe_ct > 0) {
+			/* draw keyframe markers */
+			format = immVertexFormat();
+			pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int size_id = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+			unsigned int color_id = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+			unsigned int outline_color_id = GWN_vertformat_attr_add(format, "outlineColor", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+
+			immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND);
+			GPU_enable_program_point_size();
+			immBegin(GWN_PRIM_POINTS, keyframe_ct);
+
+			/* all same size with black outline */
+			immAttrib1f(size_id, 2.0f * STRIP_HEIGHT_HALF);
+			immAttrib4ub(outline_color_id, 0, 0, 0, 255);
+
+			y = (float) CHANNEL_FIRST; /* start again at the top */
+			for (channel = dopesheet->channels.first; channel; channel = channel->next) {
+				float yminc = (float) (y - CHANNEL_HEIGHT_HALF);
+				float ymaxc = (float) (y + CHANNEL_HEIGHT_HALF);
+
+				/* check if visible */
+				if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
+				    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
+				{
+					MovieTrackingTrack *track = channel->track;
+					int i;
+					bool sel = (track->flag & TRACK_DOPE_SEL) != 0;
+					float alpha = (track->flag & TRACK_LOCKED) ? 0.5f : 1.0f;
+
+					/* tracked segments */
+					for (i = 0; i < channel->tot_segment; i++) {
+						int start_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i]);
+						int end_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i + 1]);
+
+						if (start_frame != end_frame) {
+							draw_keyframe_shape(start_frame, y, sel, alpha, pos_id, color_id);
+							draw_keyframe_shape(end_frame, y, sel, alpha, pos_id, color_id);
+						}
+						else {
+							draw_keyframe_shape(start_frame, y, sel, alpha, pos_id, color_id);
+						}
+					}
+
+					/* keyframes */
+					i = 0;
+					while (i < track->markersnr) {
+						MovieTrackingMarker *marker = &track->markers[i];
+
+						if ((marker->flag & (MARKER_DISABLED | MARKER_TRACKED)) == 0) {
+							int framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
+
+							draw_keyframe_shape(framenr, y, sel, alpha, pos_id, color_id);
+						}
+
+						i++;
+					}
+				}
+
+				/* adjust y-position for next one */
+				y -= CHANNEL_STEP;
+			}
+
+			immEnd();
+			GPU_disable_program_point_size();
+			immUnbindProgram();
+		}
+
 		glDisable(GL_BLEND);
 	}
-
-	/* current frame */
-	clip_draw_cfra(sc, ar, scene);
 }
 
 void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
@@ -279,22 +289,15 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	View2D *v2d = &ar->v2d;
 	MovieClip *clip = ED_space_clip_get_clip(sc);
-	MovieTracking *tracking;
-	MovieTrackingDopesheet *dopesheet;
-	MovieTrackingDopesheetChannel *channel;
 	uiStyle *style = UI_style_get();
-	uiBlock *block;
 	int fontid = style->widget.uifont_id;
-	int height;
-	float y;
-	PropertyRNA *chan_prop_lock;
 
 	if (!clip)
 		return;
 
-	tracking = &clip->tracking;
-	dopesheet = &tracking->dopesheet;
-	height = (dopesheet->tot_channel * CHANNEL_STEP) + (CHANNEL_HEIGHT);
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
+	int height = (dopesheet->tot_channel * CHANNEL_STEP) + (CHANNEL_HEIGHT);
 
 	if (height > BLI_rcti_size_y(&v2d->mask)) {
 		/* don't use totrect set, as the width stays the same
@@ -309,6 +312,37 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 	/* loop through channels, and set up drawing depending on their type
 	 * first pass: just the standard GL-drawing for backdrop + text
 	 */
+	float y = (float) CHANNEL_FIRST;
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	MovieTrackingDopesheetChannel *channel;
+	for (channel = dopesheet->channels.first; channel; channel = channel->next) {
+		float yminc = (float) (y - CHANNEL_HEIGHT_HALF);
+		float ymaxc = (float) (y + CHANNEL_HEIGHT_HALF);
+
+		/* check if visible */
+		if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
+		    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
+		{
+			MovieTrackingTrack *track = channel->track;
+			float color[3];
+			track_channel_color(track, NULL, color);
+			immUniformColor3fv(color);
+
+			immRectf(pos, v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
+			         v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
+		}
+
+		/* adjust y-position for next one */
+		y -= CHANNEL_STEP;
+	}
+	immUnbindProgram();
+
+	/* second pass: text */
 	y = (float) CHANNEL_FIRST;
 
 	BLF_size(fontid, 11.0f * U.pixelsize, U.dpi);
@@ -322,21 +356,11 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 		    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
 		{
 			MovieTrackingTrack *track = channel->track;
-			float font_height, color[3];
 			bool sel = (track->flag & TRACK_DOPE_SEL) != 0;
 
-			track_channel_color(track, NULL, color);
-			glColor3fv(color);
-
-			glRectf(v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
-			        v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
-
-			if (sel)
-				UI_ThemeColor(TH_TEXT_HI);
-			else
-				UI_ThemeColor(TH_TEXT);
+			UI_FontThemeColor(fontid, sel ? TH_TEXT_HI : TH_TEXT);
 
-			font_height = BLF_height(fontid, channel->name, sizeof(channel->name));
+			float font_height = BLF_height(fontid, channel->name, sizeof(channel->name));
 			BLF_position(fontid, v2d->cur.xmin + CHANNEL_PAD,
 			             y - font_height / 2.0f, 0.0f);
 			BLF_draw(fontid, channel->name, strlen(channel->name));
@@ -346,12 +370,12 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 		y -= CHANNEL_STEP;
 	}
 
-	/* second pass: widgets */
-	block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
+	/* third pass: widgets */
+	uiBlock *block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
 	y = (float) CHANNEL_FIRST;
 
 	/* get RNA properties (once) */
-	chan_prop_lock = RNA_struct_type_find_property(&RNA_MovieTrackingTrack, "lock");
+	PropertyRNA *chan_prop_lock = RNA_struct_type_find_property(&RNA_MovieTrackingTrack, "lock");
 	BLI_assert(chan_prop_lock);
 
 	glEnable(GL_BLEND);
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index a71b2baa96f..5962bfe33f3 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -55,10 +55,11 @@
 #include "ED_mask.h"
 #include "ED_gpencil.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "WM_types.h"
 
@@ -66,26 +67,25 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-
 #include "BLF_api.h"
 
 #include "clip_intern.h"    // own include
 
 /*********************** main area drawing *************************/
 
-static void draw_keyframe(int frame, int cfra, int sfra, float framelen, int width)
+static void draw_keyframe(int frame, int cfra, int sfra, float framelen, int width, unsigned int pos)
 {
 	int height = (frame == cfra) ? 22 : 10;
 	int x = (frame - sfra) * framelen;
 
 	if (width == 1) {
-		glBegin(GL_LINES);
-		glVertex2i(x, 0);
-		glVertex2i(x, height * UI_DPI_FAC);
-		glEnd();
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2i(pos, x, 0);
+		immVertex2i(pos, x, height * UI_DPI_FAC);
+		immEnd();
 	}
 	else {
-		glRecti(x, 0, x + width, height * UI_DPI_FAC);
+		immRecti(pos, x, 0, x + width, height * UI_DPI_FAC);
 	}
 }
 
@@ -157,7 +157,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* cache background */
 	ED_region_cache_draw_background(ar);
@@ -166,6 +166,9 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	BKE_movieclip_get_cache_segments(clip, &sc->user, &totseg, &points);
 	ED_region_cache_draw_cached_segments(ar, totseg, points, sfra, efra);
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* track */
 	if (act_track || act_plane_track) {
 		for (i = sfra - clip->start_frame + 1, a = 0; i <= efra - clip->start_frame + 1; i++) {
@@ -189,14 +192,17 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 			if (generic_track_is_marker_enabled(act_track, act_plane_track, a)) {
 				framenr = generic_track_get_marker_framenr(act_track, act_plane_track, a);
 
-				if (framenr != i)
-					glColor4ub(128, 128, 0, 96);
-				else if (generic_track_is_marker_keyframed(act_track, act_plane_track, a))
-					glColor4ub(255, 255, 0, 196);
-				else
-					glColor4ub(255, 255, 0, 96);
+				if (framenr != i) {
+					immUniformColor4ub(128, 128, 0, 96);
+				}
+				else if (generic_track_is_marker_keyframed(act_track, act_plane_track, a)) {
+					immUniformColor4ub(255, 255, 0, 196);
+				}
+				else {
+					immUniformColor4ub(255, 255, 0, 96);
+				}
 
-				glRecti((i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 4 * UI_DPI_FAC);
+				immRecti(pos, (i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 4 * UI_DPI_FAC);
 			}
 		}
 	}
@@ -206,7 +212,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 		int n = reconstruction->camnr;
 		MovieReconstructedCamera *cameras = reconstruction->cameras;
 
-		glColor4ub(255, 0, 0, 96);
+		immUniformColor4ub(255, 0, 0, 96);
 
 		for (i = sfra, a = 0; i <= efra; i++) {
 			bool ok = false;
@@ -223,8 +229,9 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 				a++;
 			}
 
-			if (!ok)
-				glRecti((i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 8 * UI_DPI_FAC);
+			if (!ok) {
+				immRecti(pos, (i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 8 * UI_DPI_FAC);
+			}
 		}
 	}
 
@@ -233,15 +240,22 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	/* current frame */
 	x = (sc->user.framenr - sfra) / (efra - sfra + 1) * ar->winx;
 
-	UI_ThemeColor(TH_CFRAME);
-	glRecti(x, 0, x + ceilf(framelen), 8 * UI_DPI_FAC);
+	immUniformThemeColor(TH_CFRAME);
+	immRecti(pos, x, 0, x + ceilf(framelen), 8 * UI_DPI_FAC);
+
+	immUnbindProgram();
 
 	ED_region_cache_draw_curfra_label(sc->user.framenr, x, 8.0f * UI_DPI_FAC);
 
+	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* solver keyframes */
-	glColor4ub(175, 255, 0, 255);
-	draw_keyframe(act_object->keyframe1 + clip->start_frame - 1, CFRA, sfra, framelen, 2);
-	draw_keyframe(act_object->keyframe2 + clip->start_frame - 1, CFRA, sfra, framelen, 2);
+	immUniformColor4ub(175, 255, 0, 255);
+	draw_keyframe(act_object->keyframe1 + clip->start_frame - 1, CFRA, sfra, framelen, 2, pos);
+	draw_keyframe(act_object->keyframe2 + clip->start_frame - 1, CFRA, sfra, framelen, 2, pos);
+
+	immUnbindProgram();
 
 	/* movie clip animation */
 	if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask_info.mask) {
@@ -275,11 +289,16 @@ static void draw_movieclip_muted(ARegion *ar, int width, int height, float zoomx
 {
 	int x, y;
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* find window pixel coordinates of origin */
 	UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-	glColor3f(0.0f, 0.0f, 0.0f);
-	glRectf(x, y, x + zoomx * width, y + zoomy * height);
+	immUniformColor3f(0.0f, 0.0f, 0.0f);
+	immRectf(pos, x, y, x + zoomx * width, y + zoomy * height);
+
+	immUnbindProgram();
 }
 
 static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar, ImBuf *ibuf,
@@ -295,9 +314,9 @@ static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar,
 	/* checkerboard for case alpha */
 	if (ibuf->planes == 32) {
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-		fdrawcheckerboard(x, y, x + zoomx * ibuf->x, y + zoomy * ibuf->y);
+		imm_draw_box_checker_2d(x, y, x + zoomx * ibuf->x, y + zoomy * ibuf->y);
 	}
 
 	/* non-scaled proxy shouldn't use filtering */
@@ -307,13 +326,7 @@ static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar,
 		filter = GL_NEAREST;
 	}
 
-	/* set zoom */
-	glPixelZoom(zoomx * width / ibuf->x, zoomy * height / ibuf->y);
-
-	glaDrawImBuf_glsl_ctx(C, ibuf, x, y, filter);
-	/* reset zoom */
-	glPixelZoom(1.0f, 1.0f);
-
+	glaDrawImBuf_glsl_ctx(C, ibuf, x, y, filter, zoomx * width / ibuf->x, zoomy * height / ibuf->y);
 
 	if (sc->flag & SC_SHOW_METADATA) {
 		rctf frame;
@@ -335,31 +348,37 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int
 
 	/* draw boundary border for frame if stabilization is enabled */
 	if (sc->flag & SC_SHOW_STABLE && clip->tracking.stabilization.flag & TRACKING_2D_STABILIZATION) {
-		glColor3f(0.0f, 0.0f, 0.0f);
-
-		GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-		GPU_basic_shader_line_stipple(3, 0xAAAA);
+		const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
+		/* Exclusive OR allows to get orig value when second operand is 0,
+		 * and negative of orig value when second operand is 1. */
 		glEnable(GL_COLOR_LOGIC_OP);
-		glLogicOp(GL_NOR);
+		glLogicOp(GL_XOR);
+
+		gpuPushMatrix();
+		gpuTranslate2f(x, y);
+
+		gpuScale2f(zoomx, zoomy);
+		gpuMultMatrix(sc->stabmat);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-		glPushMatrix();
-		glTranslatef(x, y, 0.0f);
+		immUniform1i("num_colors", 0);  /* "simple" mode */
+		immUniformColor4f(1.0f, 1.0f, 1.0f, 0.0f);
+		immUniform1f("dash_width", 6.0f);
+		immUniform1f("dash_factor", 0.5f);
 
-		glScalef(zoomx, zoomy, 1.0f);
-		glMultMatrixf(sc->stabmat);
+		imm_draw_box_wire_2d(shdr_pos, 0.0f, 0.0f, width, height);
 
-		glBegin(GL_LINE_LOOP);
-		glVertex2f(0.0f, 0.0f);
-		glVertex2f(width, 0.0f);
-		glVertex2f(width, height);
-		glVertex2f(0.0f, height);
-		glEnd();
+		immUnbindProgram();
 
-		glPopMatrix();
+		gpuPopMatrix();
 
 		glDisable(GL_COLOR_LOGIC_OP);
-		GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
 	}
 }
 
@@ -432,53 +451,97 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		i++;
 	}
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	if (!tiny) {
-		UI_ThemeColor(TH_MARKER_OUTLINE);
+		immUniformThemeColor(TH_MARKER_OUTLINE);
 
 		if (TRACK_VIEW_SELECTED(sc, track)) {
-			glPointSize(5.0f);
-			glBegin(GL_POINTS);
-			for (i = a; i < b; i++) {
-				if (i != curindex)
-					glVertex2f(path[i][0], path[i][1]);
+			if ((b - a - 1) >= 1) {
+				glPointSize(5.0f);
+
+				immBegin(GWN_PRIM_POINTS, b - a - 1);
+
+				for (i = a; i < b; i++) {
+					if (i != curindex) {
+						immVertex2f(pos, path[i][0], path[i][1]);
+					}
+				}
+
+				immEnd();
 			}
-			glEnd();
 		}
 
-		glLineWidth(3.0f);
-		glBegin(GL_LINE_STRIP);
-		for (i = a; i < b; i++)
-			glVertex2f(path[i][0], path[i][1]);
-		glEnd();
-	}
+		if ((b - a) >= 2) {
+			glLineWidth(3.0f);
+
+			immBegin(GWN_PRIM_LINE_STRIP, b - a);
+
+			for (i = a; i < b; i++) {
+				immVertex2f(pos, path[i][0], path[i][1]);
+			}
 
-	UI_ThemeColor(TH_PATH_BEFORE);
+			immEnd();
+		}
+	}
 
 	if (TRACK_VIEW_SELECTED(sc, track)) {
 		glPointSize(3.0f);
-		glBegin(GL_POINTS);
-		for (i = a; i < b; i++) {
-			if (i == count + 1)
-				UI_ThemeColor(TH_PATH_AFTER);
 
-			if (i != curindex)
-				glVertex2f(path[i][0], path[i][1]);
+		if ((curindex - a) >= 1) {
+			immUniformThemeColor(TH_PATH_BEFORE);
+
+			immBegin(GWN_PRIM_POINTS, curindex - a);
+
+			for (i = a; i < curindex; i++) {
+				immVertex2f(pos, path[i][0], path[i][1]);
+			}
+
+			immEnd();
 		}
-		glEnd();
-	}
 
-	UI_ThemeColor(TH_PATH_BEFORE);
+		if ((b - curindex - 1) >= 1) {
+			immUniformThemeColor(TH_PATH_AFTER);
+
+			immBegin(GWN_PRIM_POINTS, b - curindex - 1);
+
+			for (i = curindex + 1; i < b; i++) {
+				immVertex2f(pos, path[i][0], path[i][1]);
+			}
+
+			immEnd();
+		}
+	}
 
 	glLineWidth(1);
 
-	glBegin(GL_LINE_STRIP);
-	for (i = a; i < b; i++) {
-		if (i == count + 1)
-			UI_ThemeColor(TH_PATH_AFTER);
+	if ((curindex - a + 1) >= 2) {
+		immUniformThemeColor(TH_PATH_BEFORE);
+
+		immBegin(GWN_PRIM_LINE_STRIP, curindex - a + 1);
+
+		for (i = a; i <= curindex; i++) {
+			immVertex2f(pos, path[i][0], path[i][1]);
+		}
+
+		immEnd();
+	}
+
+	if ((b - curindex) >= 2) {
+		immUniformThemeColor(TH_PATH_AFTER);
+
+		immBegin(GWN_PRIM_LINE_STRIP, b - curindex);
+
+		for (i = curindex; i < b; i++) {
+			immVertex2f(pos, path[i][0], path[i][1]);
+		}
 
-		glVertex2f(path[i][0], path[i][1]);
+		immEnd();
 	}
-	glEnd();
+
+	immUnbindProgram();
 
 	if (path != path_static) {
 		MEM_freeN(path);
@@ -487,19 +550,19 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 }
 
 static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                const float marker_pos[2], int width, int height)
+                                const float marker_pos[2], int width, int height, unsigned int position)
 {
 	int tiny = sc->flag & SC_SHOW_TINY_MARKER;
 	bool show_search = false;
 	float px[2];
 
-	UI_ThemeColor(TH_MARKER_OUTLINE);
-
 	px[0] = 1.0f / width / sc->zoom;
 	px[1] = 1.0f / height / sc->zoom;
 
 	glLineWidth(tiny ? 1.0f : 3.0f);
 
+	immUniformThemeColor(TH_MARKER_OUTLINE);
+
 	if ((marker->flag & MARKER_DISABLED) == 0) {
 		float pos[2];
 		float p[2];
@@ -514,51 +577,54 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 		                        marker->pattern_corners[2], marker->pattern_corners[3]))
 		{
 			glPointSize(tiny ? 3.0f : 4.0f);
-			glBegin(GL_POINTS);
-			glVertex2f(pos[0], pos[1]);
-			glEnd();
+
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex2f(position, pos[0], pos[1]);
+			immEnd();
 		}
 		else {
-			glBegin(GL_LINES);
-			glVertex2f(pos[0] + px[0] * 2, pos[1]);
-			glVertex2f(pos[0] + px[0] * 8, pos[1]);
+			immBegin(GWN_PRIM_LINES, 8);
+
+			immVertex2f(position, pos[0] + px[0] * 2, pos[1]);
+			immVertex2f(position, pos[0] + px[0] * 8, pos[1]);
+
+			immVertex2f(position, pos[0] - px[0] * 2, pos[1]);
+			immVertex2f(position, pos[0] - px[0] * 8, pos[1]);
 
-			glVertex2f(pos[0] - px[0] * 2, pos[1]);
-			glVertex2f(pos[0] - px[0] * 8, pos[1]);
+			immVertex2f(position, pos[0], pos[1] - px[1] * 2);
+			immVertex2f(position, pos[0], pos[1] - px[1] * 8);
 
-			glVertex2f(pos[0], pos[1] - px[1] * 2);
-			glVertex2f(pos[0], pos[1] - px[1] * 8);
+			immVertex2f(position, pos[0], pos[1] + px[1] * 2);
+			immVertex2f(position, pos[0], pos[1] + px[1] * 8);
 
-			glVertex2f(pos[0], pos[1] + px[1] * 2);
-			glVertex2f(pos[0], pos[1] + px[1] * 8);
-			glEnd();
+			immEnd();
 		}
 	}
 
 	/* pattern and search outline */
-	glPushMatrix();
-	glTranslate2fv(marker_pos);
+	gpuPushMatrix();
+	gpuTranslate2fv(marker_pos);
 
 	if (sc->flag & SC_SHOW_MARKER_PATTERN) {
-		glBegin(GL_LINE_LOOP);
-		glVertex2fv(marker->pattern_corners[0]);
-		glVertex2fv(marker->pattern_corners[1]);
-		glVertex2fv(marker->pattern_corners[2]);
-		glVertex2fv(marker->pattern_corners[3]);
-		glEnd();
+		immBegin(GWN_PRIM_LINE_LOOP, 4);
+		immVertex2fv(position, marker->pattern_corners[0]);
+		immVertex2fv(position, marker->pattern_corners[1]);
+		immVertex2fv(position, marker->pattern_corners[2]);
+		immVertex2fv(position, marker->pattern_corners[3]);
+		immEnd();
 	}
 
 	show_search = (TRACK_VIEW_SELECTED(sc, track) &&
 	               ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0)) != 0;
+
 	if (sc->flag & SC_SHOW_MARKER_SEARCH && show_search) {
-		glBegin(GL_LINE_LOOP);
-		glVertex2f(marker->search_min[0], marker->search_min[1]);
-		glVertex2f(marker->search_max[0], marker->search_min[1]);
-		glVertex2f(marker->search_max[0], marker->search_max[1]);
-		glVertex2f(marker->search_min[0], marker->search_max[1]);
-		glEnd();
-	}
-	glPopMatrix();
+		imm_draw_box_wire_2d(position, marker->search_min[0],
+		                            marker->search_min[1],
+		                            marker->search_max[0],
+		                            marker->search_max[1]);
+	}
+
+	gpuPopMatrix();
 }
 
 static void track_colors(MovieTrackingTrack *track, int act, float col[3], float scol[3])
@@ -582,11 +648,12 @@ static void track_colors(MovieTrackingTrack *track, int act, float col[3], float
 }
 
 static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                              const float marker_pos[2], int width, int height, int act, int sel)
+                              const float marker_pos[2], int width, int height, int act, int sel, const uint shdr_pos)
 {
 	int tiny = sc->flag & SC_SHOW_TINY_MARKER;
 	bool show_search = false;
-	float col[3], scol[3], px[2];
+	float col[3], scol[3];
+	float px[2];
 
 	track_colors(track, act, col, scol);
 
@@ -595,23 +662,34 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 
 	glLineWidth(1.0f);
 
+	/* Since we are switching solid and dashed lines in rather complex logic here, just always go with dashed shader. */
+	immUnbindProgram();
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* "simple" mode */
+
 	/* marker position and offset position */
 	if ((track->flag & SELECT) == sel && (marker->flag & MARKER_DISABLED) == 0) {
 		float pos[2], p[2];
 
 		if (track->flag & TRACK_LOCKED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->flag & SELECT)
-				UI_ThemeColorShade(TH_LOCK_MARKER, 64);
-			else
-				UI_ThemeColor(TH_LOCK_MARKER);
+			if (act) {
+				immUniformThemeColor(TH_ACT_MARKER);
+			}
+			else if (track->flag & SELECT) {
+				immUniformThemeColorShade(TH_LOCK_MARKER, 64);
+			}
+			else {
+				immUniformThemeColor(TH_LOCK_MARKER);
+			}
 		}
 		else {
-			if (track->flag & SELECT)
-				glColor3fv(scol);
-			else
-				glColor3fv(col);
+			immUniformColor3fv((track->flag & SELECT) ? scol : col);
 		}
 
 		add_v2_v2v2(pos, marker->pos, track->offset);
@@ -623,123 +701,114 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		                        marker->pattern_corners[2], marker->pattern_corners[3]))
 		{
 			glPointSize(tiny ? 1.0f : 2.0f);
-			glBegin(GL_POINTS);
-			glVertex2f(pos[0], pos[1]);
-			glEnd();
+
+			immUniform1f("dash_factor", 2.0f);  /* Solid "line" */
+
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex2f(shdr_pos, pos[0], pos[1]);
+			immEnd();
 		}
 		else {
-			glBegin(GL_LINES);
-			glVertex2f(pos[0] + px[0] * 3, pos[1]);
-			glVertex2f(pos[0] + px[0] * 7, pos[1]);
+			immUniform1f("dash_factor", 2.0f);  /* Solid line */
+
+			immBegin(GWN_PRIM_LINES, 8);
+
+			immVertex2f(shdr_pos, pos[0] + px[0] * 3, pos[1]);
+			immVertex2f(shdr_pos, pos[0] + px[0] * 7, pos[1]);
+
+			immVertex2f(shdr_pos, pos[0] - px[0] * 3, pos[1]);
+			immVertex2f(shdr_pos, pos[0] - px[0] * 7, pos[1]);
 
-			glVertex2f(pos[0] - px[0] * 3, pos[1]);
-			glVertex2f(pos[0] - px[0] * 7, pos[1]);
+			immVertex2f(shdr_pos, pos[0], pos[1] - px[1] * 3);
+			immVertex2f(shdr_pos, pos[0], pos[1] - px[1] * 7);
 
-			glVertex2f(pos[0], pos[1] - px[1] * 3);
-			glVertex2f(pos[0], pos[1] - px[1] * 7);
+			immVertex2f(shdr_pos, pos[0], pos[1] + px[1] * 3);
+			immVertex2f(shdr_pos, pos[0], pos[1] + px[1] * 7);
 
-			glVertex2f(pos[0], pos[1] + px[1] * 3);
-			glVertex2f(pos[0], pos[1] + px[1] * 7);
-			glEnd();
+			immEnd();
+
+			immUniformColor4f(1.0f, 1.0f, 1.0f, 0.0f);
+			immUniform1f("dash_width", 6.0f);
+			immUniform1f("dash_factor", 0.5f);
 
-			glColor3f(0.0f, 0.0f, 0.0f);
-			GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-			GPU_basic_shader_line_stipple(3, 0xAAAA);
 			glEnable(GL_COLOR_LOGIC_OP);
-			glLogicOp(GL_NOR);
+			glLogicOp(GL_XOR);
 
-			glBegin(GL_LINES);
-			glVertex2fv(pos);
-			glVertex2fv(marker_pos);
-			glEnd();
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2fv(shdr_pos, pos);
+			immVertex2fv(shdr_pos, marker_pos);
+			immEnd();
 
 			glDisable(GL_COLOR_LOGIC_OP);
-			GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
 		}
 	}
 
 	/* pattern */
-	glPushMatrix();
-	glTranslate2fv(marker_pos);
-
-	if (tiny) {
-		GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-		GPU_basic_shader_line_stipple(3, 0xAAAA);
-	}
-	else {
-		GPU_basic_shader_bind_enable(GPU_SHADER_LINE);
-	}
+	gpuPushMatrix();
+	gpuTranslate2fv(marker_pos);
 
-	if ((track->pat_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_PATTERN)) {
-		if (track->flag & TRACK_LOCKED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->pat_flag & SELECT)
-				UI_ThemeColorShade(TH_LOCK_MARKER, 64);
-			else UI_ThemeColor(TH_LOCK_MARKER);
+	if (track->flag & TRACK_LOCKED) {
+		if (act) {
+			immUniformThemeColor(TH_ACT_MARKER);
 		}
-		else if (marker->flag & MARKER_DISABLED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->pat_flag & SELECT)
-				UI_ThemeColorShade(TH_DIS_MARKER, 128);
-			else UI_ThemeColor(TH_DIS_MARKER);
+		else if (track->pat_flag & SELECT) {
+			immUniformThemeColorShade(TH_LOCK_MARKER, 64);
 		}
 		else {
-			if (track->pat_flag & SELECT)
-				glColor3fv(scol);
-			else glColor3fv(col);
+			immUniformThemeColor(TH_LOCK_MARKER);
 		}
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2fv(marker->pattern_corners[0]);
-		glVertex2fv(marker->pattern_corners[1]);
-		glVertex2fv(marker->pattern_corners[2]);
-		glVertex2fv(marker->pattern_corners[3]);
-		glEnd();
 	}
-
-	/* search */
-	show_search = (TRACK_VIEW_SELECTED(sc, track) &&
-	               ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0)) != 0;
-	if ((track->search_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_SEARCH) && show_search) {
-		if (track->flag & TRACK_LOCKED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->search_flag & SELECT)
-				UI_ThemeColorShade(TH_LOCK_MARKER, 64);
-			else UI_ThemeColor(TH_LOCK_MARKER);
+	else if (marker->flag & MARKER_DISABLED) {
+		if (act) {
+			immUniformThemeColor(TH_ACT_MARKER);
 		}
-		else if (marker->flag & MARKER_DISABLED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->search_flag & SELECT)
-				UI_ThemeColorShade(TH_DIS_MARKER, 128);
-			else UI_ThemeColor(TH_DIS_MARKER);
+		else if (track->pat_flag & SELECT) {
+			immUniformThemeColorShade(TH_DIS_MARKER, 128);
 		}
 		else {
-			if (track->search_flag & SELECT)
-				glColor3fv(scol);
-			else
-				glColor3fv(col);
+			immUniformThemeColor(TH_DIS_MARKER);
 		}
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2f(marker->search_min[0], marker->search_min[1]);
-		glVertex2f(marker->search_max[0], marker->search_min[1]);
-		glVertex2f(marker->search_max[0], marker->search_max[1]);
-		glVertex2f(marker->search_min[0], marker->search_max[1]);
-		glEnd();
+	}
+	else {
+		immUniformColor3fv((track->pat_flag & SELECT) ? scol : col);
 	}
 
 	if (tiny) {
-		GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+		immUniform1f("dash_width", 6.0f);
+		immUniform1f("dash_factor", 0.5f);
 	}
 	else {
-		GPU_basic_shader_bind_disable(GPU_SHADER_LINE);
+		immUniform1f("dash_factor", 2.0f);  /* Solid line */
+	}
+
+	if ((track->pat_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_PATTERN)) {
+		immBegin(GWN_PRIM_LINE_LOOP, 4);
+		immVertex2fv(shdr_pos, marker->pattern_corners[0]);
+		immVertex2fv(shdr_pos, marker->pattern_corners[1]);
+		immVertex2fv(shdr_pos, marker->pattern_corners[2]);
+		immVertex2fv(shdr_pos, marker->pattern_corners[3]);
+		immEnd();
+	}
+
+	/* search */
+	show_search = (TRACK_VIEW_SELECTED(sc, track) &&
+	               ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0)) != 0;
+
+	if ((track->search_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_SEARCH) && show_search) {
+		imm_draw_box_wire_2d(shdr_pos, marker->search_min[0], marker->search_min[1],
+		                            marker->search_max[0], marker->search_max[1]);
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
+
+	/* Restore default shader */
+	immUnbindProgram();
+
+	const uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	BLI_assert(pos == shdr_pos);
+	UNUSED_VARS_NDEBUG(pos);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 }
 
 static float get_shortest_pattern_side(MovieTrackingMarker *marker)
@@ -760,7 +829,7 @@ static float get_shortest_pattern_side(MovieTrackingMarker *marker)
 	return sqrtf(len_sq);
 }
 
-static void draw_marker_slide_square(float x, float y, float dx, float dy, int outline, float px[2])
+static void draw_marker_slide_square(float x, float y, float dx, float dy, int outline, float px[2], unsigned int pos)
 {
 	float tdx, tdy;
 
@@ -772,15 +841,10 @@ static void draw_marker_slide_square(float x, float y, float dx, float dy, int o
 		tdy += px[1];
 	}
 
-	glBegin(GL_QUADS);
-	glVertex3f(x - tdx, y + tdy, 0.0f);
-	glVertex3f(x + tdx, y + tdy, 0.0f);
-	glVertex3f(x + tdx, y - tdy, 0.0f);
-	glVertex3f(x - tdx, y - tdy, 0.0f);
-	glEnd();
+	immRectf(pos, x - tdx, y - tdy, x + tdx, y + tdy);
 }
 
-static void draw_marker_slide_triangle(float x, float y, float dx, float dy, int outline, float px[2])
+static void draw_marker_slide_triangle(float x, float y, float dx, float dy, int outline, float px[2], unsigned int pos)
 {
 	float tdx, tdy;
 
@@ -792,15 +856,16 @@ static void draw_marker_slide_triangle(float x, float y, float dx, float dy, int
 		tdy += px[1];
 	}
 
-	glBegin(GL_TRIANGLES);
-	glVertex3f(x,       y,       0.0f);
-	glVertex3f(x - tdx, y,       0.0f);
-	glVertex3f(x,       y + tdy, 0.0f);
-	glEnd();
+	immBegin(GWN_PRIM_TRIS, 3);
+	immVertex2f(pos, x, y);
+	immVertex2f(pos, x - tdx, y);
+	immVertex2f(pos, x, y + tdy);
+	immEnd();
 }
 
 static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                    const float marker_pos[2], int outline, int sel, int act, int width, int height)
+                                    const float marker_pos[2], int outline, int sel, int act,
+                                    int width, int height, unsigned int pos)
 {
 	float dx, dy, patdx, patdy, searchdx, searchdy;
 	int tiny = sc->flag & SC_SHOW_TINY_MARKER;
@@ -815,11 +880,11 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 	track_colors(track, act, col, scol);
 
 	if (outline) {
-		UI_ThemeColor(TH_MARKER_OUTLINE);
+		immUniformThemeColor(TH_MARKER_OUTLINE);
 	}
 
-	glPushMatrix();
-	glTranslate2fv(marker_pos);
+	gpuPushMatrix();
+	gpuTranslate2fv(marker_pos);
 
 	dx = 6.0f / width / sc->zoom;
 	dy = 6.0f / height / sc->zoom;
@@ -836,17 +901,14 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 
 	if ((sc->flag & SC_SHOW_MARKER_SEARCH) && ((track->search_flag & SELECT) == sel || outline)) {
 		if (!outline) {
-			if (track->search_flag & SELECT)
-				glColor3fv(scol);
-			else
-				glColor3fv(col);
+			immUniformColor3fv((track->search_flag & SELECT) ? scol : col);
 		}
 
 		/* search offset square */
-		draw_marker_slide_square(marker->search_min[0], marker->search_max[1], searchdx, searchdy, outline, px);
+		draw_marker_slide_square(marker->search_min[0], marker->search_max[1], searchdx, searchdy, outline, px, pos);
 
 		/* search re-sizing triangle */
-		draw_marker_slide_triangle(marker->search_max[0], marker->search_min[1], searchdx, searchdy, outline, px);
+		draw_marker_slide_triangle(marker->search_max[0], marker->search_min[1], searchdx, searchdy, outline, px, pos);
 	}
 
 	if ((sc->flag & SC_SHOW_MARKER_PATTERN) && ((track->pat_flag & SELECT) == sel || outline)) {
@@ -856,16 +918,13 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 		float tilt_ctrl[2];
 
 		if (!outline) {
-			if (track->pat_flag & SELECT)
-				glColor3fv(scol);
-			else
-				glColor3fv(col);
+			immUniformColor3fv((track->pat_flag & SELECT) ? scol : col);
 		}
 
 		/* pattern's corners sliding squares */
 		for (i = 0; i < 4; i++) {
 			draw_marker_slide_square(marker->pattern_corners[i][0], marker->pattern_corners[i][1],
-			                         patdx / 1.5f, patdy / 1.5f, outline, px);
+			                         patdx / 1.5f, patdy / 1.5f, outline, px, pos);
 		}
 
 		/* ** sliders to control overall pattern  ** */
@@ -875,18 +934,16 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 
 		glLineWidth(outline ? 3.0f : 1.0f);
 
-		glBegin(GL_LINES);
-		glVertex2f(0.0f, 0.0f);
-		glVertex2fv(tilt_ctrl);
-		glEnd();
-
-		GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, 0.0f, 0.0f);
+		immVertex2fv(pos, tilt_ctrl);
+		immEnd();
 
 		/* slider to control pattern tilt */
-		draw_marker_slide_square(tilt_ctrl[0], tilt_ctrl[1], patdx, patdy, outline, px);
+		draw_marker_slide_square(tilt_ctrl[0], tilt_ctrl[1], patdx, patdy, outline, px, pos);
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
 }
 
 static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
@@ -904,16 +961,17 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	fontsize = BLF_height_max(fontid);
 
 	if (marker->flag & MARKER_DISABLED) {
-		if (act)
-			UI_ThemeColor(TH_ACT_MARKER);
-		else
-			UI_ThemeColorShade(TH_DIS_MARKER, 128);
+		if (act) {
+			UI_FontThemeColor(fontid, TH_ACT_MARKER);
+		}
+		else {
+			unsigned char color[4];
+			UI_GetThemeColorShade4ubv(TH_DIS_MARKER, 128, color);
+			BLF_color4ubv(fontid, color);
+		}
 	}
 	else {
-		if (act)
-			UI_ThemeColor(TH_ACT_MARKER);
-		else
-			UI_ThemeColor(TH_SEL_MARKER);
+		UI_FontThemeColor(fontid, act ? TH_ACT_MARKER : TH_SEL_MARKER);
 	}
 
 	if ((sc->flag & SC_SHOW_MARKER_SEARCH) &&
@@ -974,10 +1032,7 @@ static void plane_track_colors(bool is_active, float color[3], float selected_co
 {
 	UI_GetThemeColor3fv(TH_MARKER, color);
 
-	if (is_active)
-		UI_GetThemeColor3fv(TH_ACT_MARKER, selected_color);
-	else
-		UI_GetThemeColor3fv(TH_SEL_MARKER, selected_color);
+	UI_GetThemeColor3fv(is_active ? TH_ACT_MARKER : TH_SEL_MARKER, selected_color);
 }
 
 static void getArrowEndPoint(const int width, const int height, const float zoom,
@@ -1071,14 +1126,12 @@ static void draw_plane_marker_image(Scene *scene,
 			if (plane_track->image_opacity != 1.0f || ibuf->planes == 32) {
 				transparent = true;
 				glEnable(GL_BLEND);
-				glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA);
+				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 			}
 
-			glColor4f(1.0, 1.0, 1.0, plane_track->image_opacity);
-
-			GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
 			glGenTextures(1, (GLuint *)&texid);
 
+			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(GL_TEXTURE_2D, texid);
 
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -1087,20 +1140,38 @@ static void draw_plane_marker_image(Scene *scene,
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, GL_RGBA,
 			             GL_UNSIGNED_BYTE, display_buffer);
 
-			glPushMatrix();
-			glMultMatrixf(gl_matrix);
+			gpuPushMatrix();
+			gpuMultMatrix(gl_matrix);
+
+			Gwn_VertFormat *imm_format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(imm_format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int texCoord = GWN_vertformat_attr_add(imm_format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
+			immUniformColor4f(1.0f, 1.0f, 1.0f, plane_track->image_opacity);
+			immUniform1i("image", 0);
+
+			immBegin(GWN_PRIM_TRI_FAN, 4);
+
+			immAttrib2f(texCoord, 0.0f, 0.0f);
+			immVertex2f(pos, 0.0f, 0.0f);
+
+			immAttrib2f(texCoord, 1.0f, 0.0f);
+			immVertex2f(pos, 1.0f, 0.0f);
+
+			immAttrib2f(texCoord, 1.0f, 1.0f);
+			immVertex2f(pos, 1.0f, 1.0f);
+
+			immAttrib2f(texCoord, 0.0f, 1.0f);
+			immVertex2f(pos, 0.0f, 1.0f);
+
+			immEnd();
 
-			glBegin(GL_QUADS);
-			glTexCoord2f(0.0f, 0.0f); glVertex2f(0.0f, 0.0f);
-			glTexCoord2f(1.0f, 0.0f); glVertex2f(1.0f, 0.0f);
-			glTexCoord2f(1.0f, 1.0f); glVertex2f(1.0f, 1.0f);
-			glTexCoord2f(0.0f, 1.0f); glVertex2f(0.0f, 1.0f);
-			glEnd();
+			immUnbindProgram();
 
-			glPopMatrix();
+			gpuPopMatrix();
 
 			glBindTexture(GL_TEXTURE_2D, 0);
-			GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
 
 			if (transparent) {
 				glDisable(GL_BLEND);
@@ -1123,20 +1194,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 	                       BKE_image_has_ibuf(plane_track->image, NULL);
 	const bool draw_plane_quad = !has_image || plane_track->image_opacity == 0.0f;
 	float px[2];
-
-	if (draw_outline) {
-		UI_ThemeColor(TH_MARKER_OUTLINE);
-	}
-	else {
-		float color[3], selected_color[3];
-		plane_track_colors(is_active_track, color, selected_color);
-		if (is_selected_track) {
-			glColor3fv(selected_color);
-		}
-		else {
-			glColor3fv(color);
-		}
-	}
+	float color[3], selected_color[3];
 
 	px[0] = 1.0f / width / sc->zoom;
 	px[1] = 1.0f / height / sc->zoom;
@@ -1146,66 +1204,92 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 		draw_plane_marker_image(scene, plane_track, plane_marker);
 	}
 
-	if (draw_plane_quad) {
+	if (draw_plane_quad || is_selected_track) {
+		const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-		const bool stipple = !draw_outline && tiny;
-		const bool thick = draw_outline && !tiny;
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-		if (stipple) {
-			GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-			GPU_basic_shader_line_stipple(3, 0xAAAA);
-		}
-		else {
-			GPU_basic_shader_bind_enable(GPU_SHADER_LINE);
-		}
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-		GPU_basic_shader_line_width(thick ? 3.0f : 1.0f);
+		immUniform1i("num_colors", 0);  /* "simple" mode */
 
-		/* Draw rectangle itself. */
-		glBegin(GL_LINE_LOOP);
-		glVertex2fv(plane_marker->corners[0]);
-		glVertex2fv(plane_marker->corners[1]);
-		glVertex2fv(plane_marker->corners[2]);
-		glVertex2fv(plane_marker->corners[3]);
-		glEnd();
+		if (draw_plane_quad) {
+			const bool stipple = !draw_outline && tiny;
+			const bool thick = draw_outline && !tiny;
 
-		/* Draw axis. */
-		if (!draw_outline) {
-			float end_point[2];
-			glPushAttrib(GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
+			glLineWidth(thick ? 3.0f : 1.0f);
 
-			glBegin(GL_LINES);
+			if (stipple) {
+				immUniform1f("dash_width", 6.0f);
+				immUniform1f("dash_factor", 0.5f);
+			}
+			else {
+				immUniform1f("dash_factor", 2.0f);  /* Solid line */
+			}
 
-			getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[1], end_point);
-			glColor3f(1.0, 0.0, 0.0f);
-			glVertex2fv(plane_marker->corners[0]);
-			glVertex2fv(end_point);
+			if (draw_outline) {
+				immUniformThemeColor(TH_MARKER_OUTLINE);
+			}
+			else {
+				plane_track_colors(is_active_track, color, selected_color);
+				immUniformColor3fv(is_selected_track ? selected_color : color);
+			}
 
-			getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[3], end_point);
-			glColor3f(0.0, 1.0, 0.0f);
-			glVertex2fv(plane_marker->corners[0]);
-			glVertex2fv(end_point);
+			/* Draw rectangle itself. */
+			immBegin(GWN_PRIM_LINE_LOOP, 4);
+			immVertex2fv(shdr_pos, plane_marker->corners[0]);
+			immVertex2fv(shdr_pos, plane_marker->corners[1]);
+			immVertex2fv(shdr_pos, plane_marker->corners[2]);
+			immVertex2fv(shdr_pos, plane_marker->corners[3]);
+			immEnd();
 
-			glEnd();
+			/* Draw axis. */
+			if (!draw_outline) {
+				float end_point[2];
 
-			glPopAttrib();
-		}
+				immUniformColor3f(1.0f, 0.0f, 0.0f);
 
-		if (stipple) {
-			GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-		}
-		else {
-			GPU_basic_shader_bind_disable(GPU_SHADER_LINE);
+				immBegin(GWN_PRIM_LINES, 2);
+
+				getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[1], end_point);
+				immVertex2fv(shdr_pos, plane_marker->corners[0]);
+				immVertex2fv(shdr_pos, end_point);
+
+				immEnd();
+
+				immUniformColor3f(0.0f, 1.0f, 0.0f);
+
+				immBegin(GWN_PRIM_LINES, 2);
+
+				getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[3], end_point);
+				immVertex2fv(shdr_pos, plane_marker->corners[0]);
+				immVertex2fv(shdr_pos, end_point);
+
+				immEnd();
+			}
 		}
-	}
 
-	/* Draw sliders. */
-	if (is_selected_track) {
-		int i;
-		for (i = 0; i < 4; i++) {
-			draw_marker_slide_square(plane_marker->corners[i][0], plane_marker->corners[i][1],
-			                         3.0f * px[0], 3.0f * px[1], draw_outline, px);
+		/* Draw sliders. */
+		if (is_selected_track) {
+			immUniform1f("dash_factor", 2.0f);  /* Solid line */
+
+			if (draw_outline) {
+				immUniformThemeColor(TH_MARKER_OUTLINE);
+			}
+			else {
+				immUniformColor3fv(selected_color);
+			}
+
+			int i;
+			for (i = 0; i < 4; i++) {
+				draw_marker_slide_square(plane_marker->corners[i][0], plane_marker->corners[i][1],
+				                         3.0f * px[0], 3.0f * px[1], draw_outline, px, shdr_pos);
+			}
 		}
+
+		immUnbindProgram();
 	}
 }
 
@@ -1257,13 +1341,13 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 
 	UI_view2d_view_to_region_fl(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-	glPushMatrix();
-	glTranslatef(x, y, 0);
+	gpuPushMatrix();
+	gpuTranslate2f(x, y);
 
-	glPushMatrix();
-	glScalef(zoomx, zoomy, 0);
-	glMultMatrixf(sc->stabmat);
-	glScalef(width, height, 0);
+	gpuPushMatrix();
+	gpuScale2f(zoomx, zoomy);
+	gpuMultMatrix(sc->stabmat);
+	gpuScale2f(width, height);
 
 	act_track = BKE_tracking_track_get_active(tracking);
 
@@ -1329,6 +1413,10 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 		}
 	}
 
+	unsigned int position = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* markers outline and non-selected areas */
 	track = tracksbase->first;
 	fp = marker_pos;
@@ -1339,10 +1427,10 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 			if (MARKER_VISIBLE(sc, track, marker)) {
 				copy_v2_v2(cur_pos, fp ? fp : marker->pos);
 
-				draw_marker_outline(sc, track, marker, cur_pos, width, height);
-				draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 0);
-				draw_marker_slide_zones(sc, track, marker, cur_pos, 1, 0, 0, width, height);
-				draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 0, 0, width, height);
+				draw_marker_outline(sc, track, marker, cur_pos, width, height, position);
+				draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 0, position);
+				draw_marker_slide_zones(sc, track, marker, cur_pos, 1, 0, 0, width, height, position);
+				draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 0, 0, width, height, position);
 
 				if (fp)
 					fp += 2;
@@ -1365,8 +1453,8 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 				if (!act) {
 					copy_v2_v2(cur_pos, fp ? fp : marker->pos);
 
-					draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 1);
-					draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 1, 0, width, height);
+					draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 1, position);
+					draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 1, 0, width, height, position);
 				}
 
 				if (fp)
@@ -1385,8 +1473,8 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 			if (MARKER_VISIBLE(sc, act_track, marker)) {
 				copy_v2_v2(cur_pos, active_pos ? active_pos : marker->pos);
 
-				draw_marker_areas(sc, act_track, marker, cur_pos, width, height, 1, 1);
-				draw_marker_slide_zones(sc, act_track, marker, cur_pos, 0, 1, 1, width, height);
+				draw_marker_areas(sc, act_track, marker, cur_pos, width, height, 1, 1, position);
+				draw_marker_slide_zones(sc, act_track, marker, cur_pos, 0, 1, 1, width, height, position);
 			}
 		}
 	}
@@ -1395,7 +1483,6 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 		MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 		float pos[4], vec[4], mat[4][4], aspy;
 
-		glEnable(GL_POINT_SMOOTH);
 		glPointSize(3.0f);
 
 		aspy = 1.0f / clip->tracking.camera.pixel_aspect;
@@ -1424,28 +1511,34 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 
 						sub_v2_v2(vec, npos);
 
-						if (len_squared_v2(vec) < (3.0f * 3.0f))
-							glColor3f(0.0f, 1.0f, 0.0f);
-						else
-							glColor3f(1.0f, 0.0f, 0.0f);
+						if (len_squared_v2(vec) < (3.0f * 3.0f)) {
+							immUniformColor3f(0.0f, 1.0f, 0.0f);
+						}
+						else {
+							immUniformColor3f(1.0f, 0.0f, 0.0f);
+						}
 
-						glBegin(GL_POINTS);
-						if (undistort)
-							glVertex3f(pos[0] / width, pos[1] / (height * aspy), 0);
-						else
-							glVertex3f(npos[0] / width, npos[1] / (height * aspy), 0);
-						glEnd();
+						immBegin(GWN_PRIM_POINTS, 1);
+
+						if (undistort) {
+							immVertex2f(position, pos[0] / width, pos[1] / (height * aspy));
+						}
+						else {
+							immVertex2f(position, npos[0] / width, npos[1] / (height * aspy));
+						}
+
+						immEnd();
 					}
 				}
 			}
 
 			track = track->next;
 		}
-
-		glDisable(GL_POINT_SMOOTH);
 	}
 
-	glPopMatrix();
+	immUnbindProgram();
+
+	gpuPopMatrix();
 
 	if (sc->flag & SC_SHOW_NAMES) {
 		/* scaling should be cleared before drawing texts, otherwise font would also be scaled */
@@ -1471,7 +1564,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 		}
 	}
 
-	glPopMatrix();
+	gpuPopMatrix();
 
 	if (marker_pos)
 		MEM_freeN(marker_pos);
@@ -1498,11 +1591,15 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 	UI_view2d_view_to_region_fl(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-	glPushMatrix();
-	glTranslatef(x, y, 0);
-	glScalef(zoomx, zoomy, 0);
-	glMultMatrixf(sc->stabmat);
-	glScalef(width, height, 0);
+	gpuPushMatrix();
+	gpuTranslate2f(x, y);
+	gpuScale2f(zoomx, zoomy);
+	gpuMultMatrix(sc->stabmat);
+	gpuScale2f(width, height);
+
+	unsigned int position = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* grid */
 	if (sc->flag & SC_SHOW_GRID) {
@@ -1574,22 +1671,26 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 			pos[1] += dy;
 		}
 
-		glColor3f(1.0f, 0.0f, 0.0f);
+		immUniformColor3f(1.0f, 0.0f, 0.0f);
 
 		for (i = 0; i <= n; i++) {
-			glBegin(GL_LINE_STRIP);
+			immBegin(GWN_PRIM_LINE_STRIP, n + 1);
+
 			for (j = 0; j <= n; j++) {
-				glVertex2fv(grid[i][j]);
+				immVertex2fv(position, grid[i][j]);
 			}
-			glEnd();
+
+			immEnd();
 		}
 
 		for (j = 0; j <= n; j++) {
-			glBegin(GL_LINE_STRIP);
+			immBegin(GWN_PRIM_LINE_STRIP, n + 1);
+
 			for (i = 0; i <= n; i++) {
-				glVertex2fv(grid[i][j]);
+				immVertex2fv(position, grid[i][j]);
 			}
-			glEnd();
+
+			immEnd();
 		}
 	}
 
@@ -1608,7 +1709,8 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 				continue;
 			}
 
-			glColor4fv(layer->color);
+			immUniformColor4fv(layer->color);
+
 			glLineWidth(layer->thickness);
 			glPointSize((float)(layer->thickness + 2));
 
@@ -1618,7 +1720,6 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 				while (stroke) {
 					if (stroke->flag & GP_STROKE_2DSPACE) {
 						if (stroke->totpoints > 1) {
-							glBegin(GL_LINE_STRIP);
 							for (i = 0; i < stroke->totpoints - 1; i++) {
 								float npos[2], dpos[2], len;
 								int steps;
@@ -1641,19 +1742,22 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 								sub_v2_v2v2(dpos, npos, pos);
 								mul_v2_fl(dpos, 1.0f / steps);
 
+								immBegin(GWN_PRIM_LINE_STRIP, steps + 1);
+
 								for (j = 0; j <= steps; j++) {
 									BKE_tracking_distort_v2(tracking, pos, tpos);
-									glVertex2f(tpos[0] / width, tpos[1] / (height * aspy));
+									immVertex2f(position, tpos[0] / width, tpos[1] / (height * aspy));
 
 									add_v2_v2(pos, dpos);
 								}
+
+								immEnd();
 							}
-							glEnd();
 						}
 						else if (stroke->totpoints == 1) {
-							glBegin(GL_POINTS);
-							glVertex2f(stroke->points[0].x + offsx, stroke->points[0].y + offsy);
-							glEnd();
+							immBegin(GWN_PRIM_POINTS, 1);
+							immVertex2f(position, stroke->points[0].x + offsx, stroke->points[0].y + offsy);
+							immEnd();
 						}
 					}
 
@@ -1667,7 +1771,9 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		}
 	}
 
-	glPopMatrix();
+	immUnbindProgram();
+
+	gpuPopMatrix();
 }
 
 void clip_draw_main(const bContext *C, SpaceClip *sc, ARegion *ar)
@@ -1764,8 +1870,8 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 		 * associated with the clip is already drawn in draw_distortion
 		 */
 		if ((sc->flag & SC_MANUAL_CALIBRATION) == 0 || is_track_source) {
-			glPushMatrix();
-			glMultMatrixf(sc->unistabmat);
+			gpuPushMatrix();
+			gpuMultMatrix(sc->unistabmat);
 
 			if (is_track_source) {
 				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
@@ -1774,13 +1880,13 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 					int framenr = ED_space_clip_get_clip_frame_number(sc);
 					MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
-					glTranslate2fv(marker->pos);
+					gpuTranslate2fv(marker->pos);
 				}
 			}
 
 			ED_gpencil_draw_2dimage(C);
 
-			glPopMatrix();
+			gpuPopMatrix();
 		}
 	}
 	else {
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 2a218df2a44..67aa7e19de7 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -305,15 +305,12 @@ bool ED_space_clip_color_sample(SpaceClip *sc, ARegion *ar, int mval[2], float r
 
 void ED_clip_update_frame(const Main *mainp, int cfra)
 {
-	wmWindowManager *wm;
-	wmWindow *win;
-
 	/* image window, compo node users */
-	for (wm = mainp->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
-		for (win = wm->windows.first; win; win = win->next) {
-			ScrArea *sa;
+	for (wmWindowManager *wm = mainp->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
+		for (wmWindow *win = wm->windows.first; win; win = win->next) {
+			bScreen *screen = WM_window_get_active_screen(win);
 
-			for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				if (sa->spacetype == SPACE_CLIP) {
 					SpaceClip *sc = sa->spacedata.first;
 
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 424d25defdd..8d29cb73a68 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -42,7 +42,9 @@
 #include "ED_screen.h"
 #include "ED_clip.h"
 
-#include "BIF_gl.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "WM_types.h"
 
@@ -53,52 +55,30 @@
 
 #include "clip_intern.h"    // own include
 
-static void draw_curve_knot(float x, float y, float xscale, float yscale, float hsize)
-{
-	static GLuint displist = 0;
-
-	/* initialize round circle shape */
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-		gluDisk(qobj, 0,  0.7, 8, 1);
-		gluDeleteQuadric(qobj);
-
-		glEndList();
-	}
-
-	glPushMatrix();
-
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * hsize, 1.0f / yscale * hsize, 1.0f);
-	glCallList(displist);
-
-	glPopMatrix();
-}
+typedef struct TrackMotionCurveUserData {
+	MovieTrackingTrack *act_track;
+	bool sel;
+	float xscale, yscale, hsize;
+	unsigned int pos;
+} TrackMotionCurveUserData;
 
-static void tracking_segment_point_cb(void *UNUSED(userdata), MovieTrackingTrack *UNUSED(track),
+static void tracking_segment_point_cb(void *userdata, MovieTrackingTrack *UNUSED(track),
                                       MovieTrackingMarker *UNUSED(marker), int UNUSED(coord),
                                       int scene_framenr, float val)
 {
-	glVertex2f(scene_framenr, val);
+	TrackMotionCurveUserData *data = (TrackMotionCurveUserData *) userdata;
+
+	immVertex2f(data->pos, scene_framenr, val);
 }
 
-static void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track, int coord)
+static void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track, int coord, bool is_point)
 {
-	const float colors[2][3] = {
-	    {1.0f, 0.0f, 0.0f},
-	    {0.0f, 1.0f, 0.0f},
-	};
-	float col[4];
+	TrackMotionCurveUserData *data = (TrackMotionCurveUserData *) userdata;
+	float col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
-	copy_v3_v3(col, colors[coord]);
+	col[coord] = 1.0f;
 
-	if (track == userdata) {
+	if (track == data->act_track) {
 		col[3] = 1.0f;
 		glLineWidth(2.0f);
 	}
@@ -107,22 +87,22 @@ static void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track,
 		glLineWidth(1.0f);
 	}
 
-	glColor4fv(col);
+	immUniformColor4fv(col);
 
-	glBegin(GL_LINE_STRIP);
+	if (is_point) {
+		immBeginAtMost(GWN_PRIM_POINTS, 1);
+	}
+	else {
+		/* Graph can be composed of smaller segments, if any marker is disabled */
+		immBeginAtMost(GWN_PRIM_LINE_STRIP, track->markersnr);
+	}
 }
 
 static void tracking_segment_end_cb(void *UNUSED(userdata), int UNUSED(coord))
 {
-	glEnd();
+	immEnd();
 }
 
-typedef struct TrackMotionCurveUserData {
-	MovieTrackingTrack *act_track;
-	bool sel;
-	float xscale, yscale, hsize;
-} TrackMotionCurveUserData;
-
 static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
                                      MovieTrackingMarker *marker, int coord, int scene_framenr, float val)
 {
@@ -136,16 +116,19 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
 	sel = (marker->flag & sel_flag) ? 1 : 0;
 
 	if (sel == data->sel) {
-		if (sel)
-			UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
-		else
-			UI_ThemeColor(TH_HANDLE_VERTEX);
+		immUniformThemeColor(sel ? TH_HANDLE_VERTEX_SELECT : TH_HANDLE_VERTEX);
+
+		gpuPushMatrix();
+		gpuTranslate2f(scene_framenr, val);
+		gpuScale2f(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize);
+
+		imm_draw_circle_wire_2d(data->pos, 0, 0, 0.7, 8);
 
-		draw_curve_knot(scene_framenr, val, data->xscale, data->yscale, data->hsize);
+		gpuPopMatrix();
 	}
 }
 
-static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc)
+static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int pos)
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
@@ -162,18 +145,18 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc)
 	userdata.hsize = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
 	userdata.sel = false;
 	userdata.act_track = act_track;
+	userdata.pos = pos;
 	UI_view2d_scale_get(v2d, &userdata.xscale, &userdata.yscale);
 	clip_graph_tracking_values_iterate(sc,
 	                                   (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
 	                                   (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
 	                                   &userdata, tracking_segment_knot_cb, NULL, NULL);
-
 	/* draw graph lines */
 	glEnable(GL_BLEND);
 	clip_graph_tracking_values_iterate(sc,
 	                                   (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
 	                                   (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
-	                                   act_track, tracking_segment_point_cb, tracking_segment_start_cb,
+	                                   &userdata, tracking_segment_point_cb, tracking_segment_start_cb,
 	                                   tracking_segment_end_cb);
 	glDisable(GL_BLEND);
 
@@ -195,6 +178,7 @@ typedef struct TrackErrorCurveUserData {
 	float projection_matrix[4][4];
 	int width, height;
 	float aspy;
+	unsigned int pos;
 } TrackErrorCurveUserData;
 
 static void tracking_error_segment_point_cb(void *userdata,
@@ -230,11 +214,11 @@ static void tracking_error_segment_point_cb(void *userdata,
 		sub_v2_v2v2(delta, reprojected_position, marker_position);
 		reprojection_error = len_v2(delta) * weight;
 
-		glVertex2f(scene_framenr, reprojection_error);
+		immVertex2f(data->pos, scene_framenr, reprojection_error);
 	}
 }
 
-static void tracking_error_segment_start_cb(void *userdata, MovieTrackingTrack *track, int coord)
+static void tracking_error_segment_start_cb(void *userdata, MovieTrackingTrack *track, int coord, bool is_point)
 {
 	if (coord == 1) {
 		TrackErrorCurveUserData *data = (TrackErrorCurveUserData *) userdata;
@@ -249,20 +233,26 @@ static void tracking_error_segment_start_cb(void *userdata, MovieTrackingTrack *
 			glLineWidth(1.0f);
 		}
 
-		glColor4fv(col);
+		immUniformColor4fv(col);
 
-		glBegin(GL_LINE_STRIP);
+		if (is_point) { /* This probably never happens here, but just in case... */
+			immBeginAtMost(GWN_PRIM_POINTS, 1);
+		}
+		else {
+			/* Graph can be composed of smaller segments, if any marker is disabled */
+			immBeginAtMost(GWN_PRIM_LINE_STRIP, track->markersnr);
+		}
 	}
 }
 
 static void tracking_error_segment_end_cb(void *UNUSED(userdata), int coord)
 {
 	if (coord == 1) {
-		glEnd();
+		immEnd();
 	}
 }
 
-static void draw_tracks_error_curves(SpaceClip *sc)
+static void draw_tracks_error_curves(SpaceClip *sc, unsigned int pos)
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
@@ -273,6 +263,7 @@ static void draw_tracks_error_curves(SpaceClip *sc)
 	data.tracking_object = BKE_tracking_object_get_active(tracking);
 	data.active_track = BKE_tracking_track_get_active(tracking);
 	data.matrix_initialized = false;
+	data.pos = pos;
 	BKE_movieclip_get_size(clip, &sc->user, &data.width, &data.height);
 	data.aspy = 1.0f / tracking->camera.pixel_aspect;
 
@@ -289,37 +280,38 @@ static void draw_tracks_error_curves(SpaceClip *sc)
 	                                   tracking_error_segment_end_cb);
 }
 
-static void draw_frame_curves(SpaceClip *sc)
+static void draw_frame_curves(SpaceClip *sc, unsigned int pos)
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
 	int i, lines = 0, prevfra = 0;
 
-	glColor3f(0.0f, 0.0f, 1.0f);
+	immUniformColor3f(0.0f, 0.0f, 1.0f);
 
 	for (i = 0; i < reconstruction->camnr; i++) {
 		MovieReconstructedCamera *camera = &reconstruction->cameras[i];
 		int framenr;
 
 		if (lines && camera->framenr != prevfra + 1) {
-			glEnd();
+			immEnd();
 			lines = 0;
 		}
 
 		if (!lines) {
-			glBegin(GL_LINE_STRIP);
+			immBeginAtMost(GWN_PRIM_LINE_STRIP, reconstruction->camnr);
 			lines = 1;
 		}
 
 		framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, camera->framenr);
-		glVertex2f(framenr, camera->error);
+		immVertex2f(pos, framenr, camera->error);
 
 		prevfra = camera->framenr;
 	}
 
-	if (lines)
-		glEnd();
+	if (lines) {
+		immEnd();
+	}
 }
 
 void clip_draw_graph(SpaceClip *sc, ARegion *ar, Scene *scene)
@@ -335,19 +327,26 @@ void clip_draw_graph(SpaceClip *sc, ARegion *ar, Scene *scene)
 	UI_view2d_grid_free(grid);
 
 	if (clip) {
-		if (sc->flag & SC_SHOW_GRAPH_TRACKS_MOTION)
-			draw_tracks_motion_curves(v2d, sc);
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		glPointSize(3.0f);
+
+		if (sc->flag & SC_SHOW_GRAPH_TRACKS_MOTION) {
+			draw_tracks_motion_curves(v2d, sc, pos);
+		}
 
-		if (sc->flag & SC_SHOW_GRAPH_TRACKS_ERROR)
-			draw_tracks_error_curves(sc);
+		if (sc->flag & SC_SHOW_GRAPH_TRACKS_ERROR) {
+			draw_tracks_error_curves(sc, pos);
+		}
 
-		if (sc->flag & SC_SHOW_GRAPH_FRAMES)
-			draw_frame_curves(sc);
+		if (sc->flag & SC_SHOW_GRAPH_FRAMES) {
+			draw_frame_curves(sc, pos);
+		}
+
+		immUnbindProgram();
 	}
 
 	/* frame range */
 	clip_draw_sfra_efra(v2d, scene);
-
-	/* current frame */
-	clip_draw_cfra(sc, ar, scene);
 }
diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index b572e1893ae..02ea340eb57 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -37,7 +37,8 @@
 
 #include "BKE_context.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
+
+#include "DEG_depsgraph.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -691,7 +692,7 @@ static int graph_disable_markers_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&clip->id, 0);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 
diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h
index ae15834a1d9..ab8a7add009 100644
--- a/source/blender/editors/space_clip/clip_intern.h
+++ b/source/blender/editors/space_clip/clip_intern.h
@@ -125,12 +125,12 @@ void ED_clip_tool_props_register(struct ARegionType *art);
 /* clip_utils.c */
 void clip_graph_tracking_values_iterate_track(struct SpaceClip *sc, struct MovieTrackingTrack *track, void *userdata,
                                               void (*func)(void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
-                                              void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord),
+                                              void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord, bool is_point),
                                               void (*segment_end)(void *userdata, int coord));
 
 void clip_graph_tracking_values_iterate(struct SpaceClip *sc, bool selected_only, bool include_hidden, void *userdata,
                                         void (*func)(void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
-                                        void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord),
+                                        void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord, bool is_point),
                                         void (*segment_end)(void *userdata, int coord));
 
 void clip_graph_tracking_iterate(struct SpaceClip *sc, bool selected_only, bool include_hidden, void *userdata,
@@ -143,7 +143,6 @@ void clip_delete_plane_track(struct bContext *C, struct MovieClip *clip, struct
 
 void clip_view_center_to_point(SpaceClip *sc, float x, float y);
 
-void clip_draw_cfra(struct SpaceClip *sc, struct ARegion *ar, struct Scene *scene);
 void clip_draw_sfra_efra(struct View2D *v2d, struct Scene *scene);
 
 /* tracking_ops.c */
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index af5a33bbebe..0d9371a7784 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -56,7 +56,6 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
@@ -83,6 +82,8 @@
 
 #include "PIL_time.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "clip_intern.h"	// own include
 
 /******************** view navigation utilities *********************/
@@ -249,7 +250,7 @@ static int open_exec(bContext *C, wmOperator *op)
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_ADDED, clip);
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	MEM_freeN(op->customdata);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c
index d2a7244eded..61bd8df3dbf 100644
--- a/source/blender/editors/space_clip/clip_toolbar.c
+++ b/source/blender/editors/space_clip/clip_toolbar.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include "DNA_windowmanager_types.h"
+#include "DNA_workspace_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -118,19 +119,17 @@ void CLIP_OT_properties(wmOperatorType *ot)
 
 static ARegion *clip_has_tools_region(ScrArea *sa)
 {
-	ARegion *ar, *artool = NULL, *arprops = NULL, *arhead;
+	ARegion *ar, *artool = NULL, *arhead;
 
 	for (ar = sa->regionbase.first; ar; ar = ar->next) {
 		if (ar->regiontype == RGN_TYPE_TOOLS)
 			artool = ar;
-
-		if (ar->regiontype == RGN_TYPE_TOOL_PROPS)
-			arprops = ar;
 	}
 
 	/* tool region hide/unhide also hides props */
-	if (arprops && artool)
+	if (artool) {
 		return artool;
+	}
 
 	if (artool == NULL) {
 		/* add subdiv level; after header */
@@ -149,15 +148,6 @@ static ARegion *clip_has_tools_region(ScrArea *sa)
 		artool->flag = RGN_FLAG_HIDDEN;
 	}
 
-	if (arprops == NULL) {
-		/* add extra subdivided region for tool properties */
-		arprops = MEM_callocN(sizeof(ARegion), "tool props for clip");
-
-		BLI_insertlinkafter(&sa->regionbase, artool, arprops);
-		arprops->regiontype = RGN_TYPE_TOOL_PROPS;
-		arprops->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
-	}
-
 	return artool;
 }
 
@@ -188,78 +178,3 @@ void CLIP_OT_tools(wmOperatorType *ot)
 	ot->exec = tools_exec;
 	ot->poll = tools_poll;
 }
-
-/************************** redo panel ******************************/
-
-static void clip_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOperator *op)
-{
-	uiTemplateOperatorPropertyButs(C, pa->layout, op, NULL, 'V', 0);
-}
-
-static void clip_panel_operator_redo_header(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-
-	if (op)
-		BLI_strncpy(pa->drawname, RNA_struct_ui_name(op->type->srna), sizeof(pa->drawname));
-	else
-		BLI_strncpy(pa->drawname, IFACE_("Operator"), sizeof(pa->drawname));
-}
-
-static void clip_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op)
-{
-	if (op->type->flag & OPTYPE_MACRO) {
-		for (op = op->macro.first; op; op = op->next) {
-			uiItemL(pa->layout, RNA_struct_ui_name(op->type->srna), ICON_NONE);
-			clip_panel_operator_redo_operator(C, pa, op);
-		}
-	}
-	else {
-		clip_panel_operator_redo_buts(C, pa, op);
-	}
-}
-
-/* TODO de-duplicate redo panel functions - campbell */
-static void clip_panel_operator_redo(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-	ARegion *ar;
-	ARegion *ar1;
-
-	if (op == NULL)
-		return;
-
-	/* keep in sync with logic in ED_undo_operator_repeat() */
-	ar = CTX_wm_region(C);
-	ar1 = BKE_area_find_region_type(CTX_wm_area(C), RGN_TYPE_WINDOW);
-	if (ar1)
-		CTX_wm_region_set((bContext *)C, ar1);
-
-	if (WM_operator_poll((bContext *)C, op->type)) {
-		uiBlock *block = uiLayoutGetBlock(pa->layout);
-
-		if (!WM_operator_check_ui_enabled(C, op->type->name))
-			uiLayoutSetEnabled(pa->layout, false);
-
-		/* note, blockfunc is a default but->func, use Handle func to allow button callbacks too */
-		UI_block_func_handle_set(block, ED_undo_operator_repeat_cb_evt, op);
-
-		clip_panel_operator_redo_operator(C, pa, op);
-	}
-
-	/* set region back */
-	CTX_wm_region_set((bContext *)C, ar);
-}
-
-void ED_clip_tool_props_register(ARegionType *art)
-{
-	PanelType *pt;
-
-	pt = MEM_callocN(sizeof(PanelType), "spacetype clip panel last operator");
-	strcpy(pt->idname, "CLIP_PT_last_operator");
-	strcpy(pt->label, N_("Operator"));
-	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
-	pt->draw_header = clip_panel_operator_redo_header;
-	pt->draw = clip_panel_operator_redo;
-	BLI_addtail(&art->paneltypes, pt);
-}
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index b5b193804b1..a666b20dfa4 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -41,10 +41,11 @@
 #include "BKE_context.h"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "DEG_depsgraph.h"
+
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -52,7 +53,6 @@
 #include "ED_screen.h"
 #include "ED_clip.h"
 
-
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -63,7 +63,7 @@ void clip_graph_tracking_values_iterate_track(
         SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
         void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
                      int scene_framenr, float val),
-        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
         void (*segment_end)(void *userdata, int coord))
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
@@ -92,8 +92,14 @@ void clip_graph_tracking_values_iterate_track(
 			}
 
 			if (!open) {
-				if (segment_start)
-					segment_start(userdata, track, coord);
+				if (segment_start) {
+					if ((i + 1) == track->markersnr) {
+						segment_start(userdata, track, coord, true);
+					}
+					else {
+						segment_start(userdata, track, coord, (track->markers[i + 1].flag & MARKER_DISABLED));
+					}
+				}
 
 				open = true;
 				prevval = marker->pos[coord];
@@ -124,7 +130,7 @@ void clip_graph_tracking_values_iterate(
         SpaceClip *sc, bool selected_only, bool include_hidden, void *userdata,
         void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
                      int coord, int scene_framenr, float val),
-        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
         void (*segment_end)(void *userdata, int coord))
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
@@ -204,11 +210,11 @@ void clip_delete_track(bContext *C, MovieClip *clip, MovieTrackingTrack *track)
 	if (used_for_stabilization) {
 		WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
 	}
+	/* Inform dependency graph. */
+	DEG_id_tag_update(&clip->id, 0);
 	if (has_bundle) {
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 	}
-	/* Inform dependency graph. */
-	DAG_id_tag_update(&clip->id, 0);
 }
 
 void clip_delete_marker(bContext *C, MovieClip *clip, MovieTrackingTrack *track,
@@ -243,7 +249,7 @@ void clip_delete_plane_track(bContext *C,
 	/* TODO(sergey): Any notifiers to be sent here? */
 	(void) C;
 	/* Inform dependency graph. */
-	DAG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&clip->id, 0);
 }
 
 void clip_view_center_to_point(SpaceClip *sc, float x, float y)
@@ -258,51 +264,34 @@ void clip_view_center_to_point(SpaceClip *sc, float x, float y)
 	sc->yof = (y - 0.5f) * height * aspy;
 }
 
-void clip_draw_cfra(SpaceClip *sc, ARegion *ar, Scene *scene)
-{
-	View2D *v2d = &ar->v2d;
-	float xscale, yscale;
-
-	/* Draw a light green line to indicate current frame */
-	UI_ThemeColor(TH_CFRAME);
-
-	float x = (float)(sc->user.framenr * scene->r.framelen);
-
-	glLineWidth(2.0);
-
-	glBegin(GL_LINES);
-	glVertex2f(x, v2d->cur.ymin);
-	glVertex2f(x, v2d->cur.ymax);
-	glEnd();
-
-	UI_view2d_view_orthoSpecial(ar, v2d, 1);
-
-	/* because the frame number text is subject to the same scaling as the contents of the view */
-	UI_view2d_scale_get(v2d, &xscale, &yscale);
-	glScalef(1.0f / xscale, 1.0f, 1.0f);
-
-	ED_region_cache_draw_curfra_label(sc->user.framenr, (float)sc->user.framenr * xscale, 18);
-
-	/* restore view transform */
-	glScalef(xscale, 1.0, 1.0);
-}
-
 void clip_draw_sfra_efra(View2D *v2d, Scene *scene)
 {
 	UI_view2d_view_ortho(v2d);
 
 	/* currently clip editor supposes that editing clip length is equal to scene frame range */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
 
-	glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
-	glRectf((float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+	immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
+	immRectf(pos, (float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+
 	glDisable(GL_BLEND);
 
-	UI_ThemeColorShade(TH_BACK, -60);
+	immUniformThemeColorShade(TH_BACK, -60);
 
 	/* thin lines where the actual frames are */
-	fdrawline((float)SFRA, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
-	fdrawline((float)EFRA, v2d->cur.ymin, (float)EFRA, v2d->cur.ymax);
+	glLineWidth(1.0f);
+
+	immBegin(GWN_PRIM_LINES, 4);
+	immVertex2f(pos, (float)SFRA, v2d->cur.ymin);
+	immVertex2f(pos, (float)SFRA, v2d->cur.ymax);
+	immVertex2f(pos, (float)EFRA, v2d->cur.ymin);
+	immVertex2f(pos, (float)EFRA, v2d->cur.ymax);
+	immEnd();
+
+	immUnbindProgram();
 }
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 58930fa2cf2..f022bb7e6f8 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -51,6 +51,7 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "ED_anim_api.h" /* for timeline cursor drawing */
 #include "ED_mask.h"
 #include "ED_space_api.h"
 #include "ED_screen.h"
@@ -60,7 +61,8 @@
 
 #include "IMB_imbuf.h"
 
-#include "BIF_gl.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -74,12 +76,8 @@
 
 #include "clip_intern.h"  /* own include */
 
-static void init_preview_region(const bContext *C, ARegion *ar)
+static void init_preview_region(const Scene *scene, const ScrArea *sa, const SpaceClip *sc, ARegion *ar)
 {
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	SpaceClip *sc = CTX_wm_space_clip(C);
-
 	ar->regiontype = RGN_TYPE_PREVIEW;
 	ar->alignment = RGN_ALIGN_TOP;
 	ar->flag |= RGN_FLAG_HIDDEN;
@@ -137,15 +135,17 @@ static void init_preview_region(const bContext *C, ARegion *ar)
 
 static void reinit_preview_region(const bContext *C, ARegion *ar)
 {
+	Scene *scene = CTX_data_scene(C);
+	ScrArea *sa = CTX_wm_area(C);
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
 	if (sc->view == SC_VIEW_DOPESHEET) {
 		if ((ar->v2d.flag & V2D_VIEWSYNC_AREA_VERTICAL) == 0)
-			init_preview_region(C, ar);
+			init_preview_region(scene, sa, sc, ar);
 	}
 	else {
 		if (ar->v2d.flag & V2D_VIEWSYNC_AREA_VERTICAL)
-			init_preview_region(C, ar);
+			init_preview_region(scene, sa, sc, ar);
 	}
 }
 
@@ -167,7 +167,7 @@ static ARegion *ED_clip_has_preview_region(const bContext *C, ScrArea *sa)
 	arnew = MEM_callocN(sizeof(ARegion), "clip preview region");
 
 	BLI_insertlinkbefore(&sa->regionbase, ar, arnew);
-	init_preview_region(C, arnew);
+	init_preview_region(CTX_data_scene(C), sa, CTX_wm_space_clip(C), arnew);
 
 	return arnew;
 }
@@ -227,7 +227,7 @@ static void clip_scopes_check_gpencil_change(ScrArea *sa)
 
 /* ******************** default callbacks for clip space ***************** */
 
-static SpaceLink *clip_new(const bContext *C)
+static SpaceLink *clip_new(const ScrArea *sa, const Scene *scene)
 {
 	ARegion *ar;
 	SpaceClip *sc;
@@ -246,7 +246,7 @@ static SpaceLink *clip_new(const bContext *C)
 
 	BLI_addtail(&sc->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* tools view */
 	ar = MEM_callocN(sizeof(ARegion), "tools for clip");
@@ -255,13 +255,6 @@ static SpaceLink *clip_new(const bContext *C)
 	ar->regiontype = RGN_TYPE_TOOLS;
 	ar->alignment = RGN_ALIGN_LEFT;
 
-	/* tool properties */
-	ar = MEM_callocN(sizeof(ARegion), "tool properties for clip");
-
-	BLI_addtail(&sc->regionbase, ar);
-	ar->regiontype = RGN_TYPE_TOOL_PROPS;
-	ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
-
 	/* properties view */
 	ar = MEM_callocN(sizeof(ARegion), "properties for clip");
 
@@ -283,7 +276,7 @@ static SpaceLink *clip_new(const bContext *C)
 	ar = MEM_callocN(sizeof(ARegion), "preview for clip");
 
 	BLI_addtail(&sc->regionbase, ar);
-	init_preview_region(C, ar);
+	init_preview_region(scene, sa, sc, ar);
 
 	/* main region */
 	ar = MEM_callocN(sizeof(ARegion), "main region for clip");
@@ -329,7 +322,8 @@ static SpaceLink *clip_duplicate(SpaceLink *sl)
 	return (SpaceLink *)scn;
 }
 
-static void clip_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void clip_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                          WorkSpace *UNUSED(workspace))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -887,12 +881,11 @@ static void clip_refresh(const bContext *C, ScrArea *sa)
 	SpaceClip *sc = (SpaceClip *)sa->spacedata.first;
 	ARegion *ar_main = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
 	ARegion *ar_tools = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
-	ARegion *ar_tool_props = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS);
 	ARegion *ar_preview = ED_clip_has_preview_region(C, sa);
 	ARegion *ar_properties = ED_clip_has_properties_region(sa);
 	ARegion *ar_channels = ED_clip_has_channels_region(sa);
 	bool main_visible = false, preview_visible = false, tools_visible = false;
-	bool tool_props_visible = false, properties_visible = false, channels_visible = false;
+	bool properties_visible = false, channels_visible = false;
 	bool view_changed = false;
 
 	switch (sc->view) {
@@ -900,7 +893,6 @@ static void clip_refresh(const bContext *C, ScrArea *sa)
 			main_visible = true;
 			preview_visible = false;
 			tools_visible = true;
-			tool_props_visible = true;
 			properties_visible = true;
 			channels_visible = false;
 			break;
@@ -908,7 +900,6 @@ static void clip_refresh(const bContext *C, ScrArea *sa)
 			main_visible = false;
 			preview_visible = true;
 			tools_visible = false;
-			tool_props_visible = false;
 			properties_visible = false;
 			channels_visible = false;
 
@@ -918,7 +909,6 @@ static void clip_refresh(const bContext *C, ScrArea *sa)
 			main_visible = false;
 			preview_visible = true;
 			tools_visible = false;
-			tool_props_visible = false;
 			properties_visible = false;
 			channels_visible = true;
 
@@ -999,30 +989,6 @@ static void clip_refresh(const bContext *C, ScrArea *sa)
 		}
 	}
 
-	if (tool_props_visible) {
-		if (ar_tool_props && (ar_tool_props->flag & RGN_FLAG_HIDDEN)) {
-			ar_tool_props->flag &= ~RGN_FLAG_HIDDEN;
-			ar_tool_props->v2d.flag &= ~V2D_IS_INITIALISED;
-			view_changed = true;
-		}
-		if (ar_tool_props && (ar_tool_props->alignment != (RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV))) {
-			ar_tool_props->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
-			view_changed = true;
-		}
-	}
-	else {
-		if (ar_tool_props && !(ar_tool_props->flag & RGN_FLAG_HIDDEN)) {
-			ar_tool_props->flag |= RGN_FLAG_HIDDEN;
-			ar_tool_props->v2d.flag &= ~V2D_IS_INITIALISED;
-			WM_event_remove_handlers((bContext *)C, &ar_tool_props->handlers);
-			view_changed = true;
-		}
-		if (ar_tool_props && ar_tool_props->alignment != RGN_ALIGN_NONE) {
-			ar_tool_props->alignment = RGN_ALIGN_NONE;
-			view_changed = true;
-		}
-	}
-
 	if (preview_visible) {
 		if (ar_preview && (ar_preview->flag & RGN_FLAG_HIDDEN)) {
 			ar_preview->flag &= ~RGN_FLAG_HIDDEN;
@@ -1214,13 +1180,13 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
 	show_cursor |= sc->around == V3D_AROUND_CURSOR;
 
 	if (show_cursor) {
-		glPushMatrix();
-		glTranslatef(x, y, 0);
-		glScalef(zoomx, zoomy, 0);
-		glMultMatrixf(sc->stabmat);
-		glScalef(width, height, 0);
+		gpuPushMatrix();
+		gpuTranslate2f(x, y);
+		gpuScale2f(zoomx, zoomy);
+		gpuMultMatrix(sc->stabmat);
+		gpuScale2f(width, height);
 		ED_image_draw_cursor(ar, sc->cursor);
-		glPopMatrix();
+		gpuPopMatrix();
 	}
 
 	clip_draw_cache_and_notes(C, sc, ar);
@@ -1239,7 +1205,9 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
 	}
 }
 
-static void clip_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void clip_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1278,6 +1246,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	Scene *scene = CTX_data_scene(C);
 	short unitx, unity;
+	short cfra_flag = 0;
 
 	if (sc->flag & SC_LOCK_TIMECURSOR)
 		ED_clip_graph_center_current_frame(scene, ar);
@@ -1291,6 +1260,10 @@ static void graph_region_draw(const bContext *C, ARegion *ar)
 	/* data... */
 	clip_draw_graph(sc, ar, scene);
 
+	/* current frame indicator line */
+	if (sc->flag & SC_SHOW_SECONDS) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	ANIM_draw_cfra(C, v2d, cfra_flag);
+
 	/* reset view matrix */
 	UI_view2d_view_restore(C);
 
@@ -1300,6 +1273,11 @@ static void graph_region_draw(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* currnt frame indicator */
+	if (sc->flag & SC_SHOW_SECONDS) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	UI_view2d_view_orthoSpecial(ar, v2d, 1);
+	ANIM_draw_cfra_number(C, v2d, cfra_flag);
 }
 
 static void dopesheet_region_draw(const bContext *C, ARegion *ar)
@@ -1310,7 +1288,7 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar)
 	View2D *v2d = &ar->v2d;
 	View2DGrid *grid;
 	View2DScrollers *scrollers;
-	short unit = 0;
+	short unit = 0, cfra_flag = 0;
 
 	if (clip)
 		BKE_tracking_dopesheet_update(&clip->tracking);
@@ -1331,6 +1309,10 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar)
 	/* data... */
 	clip_draw_dopesheet_main(sc, ar, scene);
 
+	/* current frame indicator line */
+	if (sc->flag & SC_SHOW_SECONDS) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	ANIM_draw_cfra(C, v2d, cfra_flag);
+
 	/* reset view matrix */
 	UI_view2d_view_restore(C);
 
@@ -1338,6 +1320,10 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* currnt frame number indicator */
+	UI_view2d_view_orthoSpecial(ar, v2d, 1);
+	ANIM_draw_cfra_number(C, v2d, cfra_flag);
 }
 
 static void clip_preview_region_draw(const bContext *C, ARegion *ar)
@@ -1350,7 +1336,9 @@ static void clip_preview_region_draw(const bContext *C, ARegion *ar)
 		dopesheet_region_draw(C, ar);
 }
 
-static void clip_preview_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void clip_preview_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 }
 
@@ -1391,7 +1379,9 @@ static void clip_channels_region_draw(const bContext *C, ARegion *ar)
 	UI_view2d_view_restore(C);
 }
 
-static void clip_channels_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void clip_channels_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 }
 
@@ -1408,7 +1398,9 @@ static void clip_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void clip_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void clip_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1448,7 +1440,9 @@ static void clip_tools_region_draw(const bContext *C, ARegion *ar)
 
 /****************** tool properties region ******************/
 
-static void clip_props_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void clip_props_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1493,7 +1487,9 @@ static void clip_properties_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void clip_properties_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void clip_properties_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1593,19 +1589,6 @@ void ED_spacetype_clip(void)
 
 	BLI_addhead(&st->regiontypes, art);
 
-	/* tool properties */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype clip tool properties region");
-	art->regionid = RGN_TYPE_TOOL_PROPS;
-	art->prefsizex = 0;
-	art->prefsizey = 120;
-	art->keymapflag = ED_KEYMAP_FRAMES | ED_KEYMAP_UI;
-	art->listener = clip_props_region_listener;
-	art->init = clip_tools_region_init;
-	art->draw = clip_tools_region_draw;
-	ED_clip_tool_props_register(art);
-
-	BLI_addhead(&st->regiontypes, art);
-
 	/* regions: header */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype clip region");
 	art->regionid = RGN_TYPE_HEADER;
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 50f21c8891c..bfce5a862d0 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -42,10 +42,11 @@
 #include "BKE_context.h"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 #include "BKE_sound.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -675,7 +676,7 @@ MovieTrackingTrack *tracking_marker_check_slide(bContext *C,
 				 * the mouse.
 				 */
 				if (sc->flag & SC_SHOW_MARKER_PATTERN) {
-					int current_corner;
+					int current_corner = -1;
 					distance_squared =
 					        mouse_to_closest_pattern_corner_distance_squared(
 					                marker,
@@ -898,7 +899,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				}
 
 				WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-				DAG_id_tag_update(&sc->clip->id, 0);
+				DEG_id_tag_update(&sc->clip->id, 0);
 			}
 			else if (data->area == TRACK_AREA_PAT) {
 				if (data->action == SLIDE_ACTION_SIZE) {
@@ -1193,7 +1194,7 @@ static int disable_markers_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&clip->id, 0);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 
diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c
index 8c5be7c9d04..3db52e6a39b 100644
--- a/source/blender/editors/space_clip/tracking_ops_orient.c
+++ b/source/blender/editors/space_clip/tracking_ops_orient.c
@@ -42,10 +42,12 @@
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -68,17 +70,16 @@ static Object *get_camera_with_movieclip(Scene *scene, MovieClip *clip)
 		return camera;
 	}
 
-	for (Base *base = scene->base.first;
-	     base != NULL;
-	     base = base->next)
+	FOREACH_SCENE_OBJECT_BEGIN(scene, ob)
 	{
-		if (base->object->type == OB_CAMERA) {
-			if (BKE_object_movieclip_get(scene, base->object, false) == clip) {
-				camera = base->object;
+		if (ob->type == OB_CAMERA) {
+			if (BKE_object_movieclip_get(scene, ob, false) == clip) {
+				camera = ob;
 				break;
 			}
 		}
 	}
+	FOREACH_SCENE_OBJECT_END;
 
 	return camera;
 }
@@ -86,6 +87,7 @@ static Object *get_camera_with_movieclip(Scene *scene, MovieClip *clip)
 static Object *get_orientation_object(bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
@@ -96,7 +98,7 @@ static Object *get_orientation_object(bContext *C)
 		object = get_camera_with_movieclip(scene, clip);
 	}
 	else {
-		object = OBACT;
+		object = OBACT(view_layer);
 	}
 
 	if (object != NULL && object->parent != NULL) {
@@ -110,7 +112,7 @@ static int set_orientation_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	if (sc != NULL) {
-		Scene *scene = CTX_data_scene(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 		MovieClip *clip = ED_space_clip_get_clip(sc);
 		if (clip != NULL) {
 			MovieTracking *tracking = &clip->tracking;
@@ -119,7 +121,7 @@ static int set_orientation_poll(bContext *C)
 				return true;
 			}
 			else {
-				return OBACT != NULL;
+				return OBACT(view_layer) != NULL;
 			}
 		}
 	}
@@ -143,7 +145,8 @@ static int count_selected_bundles(bContext *C)
 	return tot;
 }
 
-static void object_solver_inverted_matrix(Scene *scene,
+static void object_solver_inverted_matrix(Depsgraph *depsgraph,
+                                          Scene *scene,
                                           Object *ob,
                                           float invmat[4][4])
 {
@@ -160,7 +163,7 @@ static void object_solver_inverted_matrix(Scene *scene,
 			bObjectSolverConstraint *data = (bObjectSolverConstraint *)con->data;
 			if (!found) {
 				Object *cam = data->camera ? data->camera : scene->camera;
-				BKE_object_where_is_calc_mat4(scene, cam, invmat);
+				BKE_object_where_is_calc_mat4(depsgraph, scene, cam, invmat);
 			}
 			mul_m4_m4m4(invmat, invmat, data->invmat);
 			found = true;
@@ -198,6 +201,7 @@ static int set_origin_exec(bContext *C, wmOperator *op)
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *camera = get_camera_with_movieclip(scene, clip);
 	int selected_count = count_selected_bundles(C);
 
@@ -234,20 +238,20 @@ static int set_origin_exec(bContext *C, wmOperator *op)
 	mul_v3_fl(median, 1.0f / selected_count);
 
 	float mat[4][4], vec[3];
-	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, camera, mat);
 	mul_v3_m4v3(vec, mat, median);
 
 	if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
 		sub_v3_v3(object->loc, vec);
 	}
 	else {
-		object_solver_inverted_matrix(scene, object, mat);
+		object_solver_inverted_matrix(depsgraph, scene, object, mat);
 		mul_v3_m4v3(vec, mat, vec);
 		copy_v3_v3(object->loc, vec);
 	}
 
-	DAG_id_tag_update(&clip->id, 0);
-	DAG_id_tag_update(&object->id, OB_RECALC_OB);
+	DEG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&object->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -276,7 +280,8 @@ void CLIP_OT_set_origin(wmOperatorType *ot)
 
 /********************** set floor operator *********************/
 
-static void set_axis(Scene *scene,
+static void set_axis(Depsgraph *depsgraph,
+                     Scene *scene,
                      Object *ob,
                      MovieClip *clip,
                      MovieTrackingObject *tracking_object,
@@ -290,14 +295,14 @@ static void set_axis(Scene *scene,
 
 	BKE_object_to_mat4(ob, obmat);
 
-	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, camera, mat);
 	mul_v3_m4v3(vec, mat, track->bundle_pos);
 	copy_v3_v3(dvec, vec);
 
 	if (!is_camera) {
 		float imat[4][4];
 
-		object_solver_inverted_matrix(scene, ob, imat);
+		object_solver_inverted_matrix(depsgraph, scene, ob, imat);
 		mul_v3_m4v3(vec, imat, vec);
 
 		invert_m4_m4(imat, obmat);
@@ -403,6 +408,7 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 	ListBase *tracksbase;
 	Object *object;
 	Object *camera = get_camera_with_movieclip(scene, clip);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	int tot = 0;
 	float vec[3][3], mat[4][4], obmat[4][4], newmat[4][4], orig[3] = {0.0f, 0.0f, 0.0f};
 	int plane = RNA_enum_get(op->ptr, "plane");
@@ -427,7 +433,7 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, camera, mat);
 
 	/* Get 3 bundles to use as reference. */
 	track = tracksbase->first;
@@ -489,11 +495,11 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 		BKE_object_apply_mat4(object, mat, 0, 0);
 	}
 
-	BKE_object_where_is_calc(scene, object);
-	set_axis(scene, object, clip, tracking_object, axis_track, 'X');
+	BKE_object_where_is_calc(depsgraph, scene, object);
+	set_axis(depsgraph, scene, object, clip, tracking_object, axis_track, 'X');
 
-	DAG_id_tag_update(&clip->id, 0);
-	DAG_id_tag_update(&object->id, OB_RECALC_OB);
+	DEG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&object->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -536,6 +542,7 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *object;
 	int axis = RNA_enum_get(op->ptr, "axis");
 
@@ -564,10 +571,10 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 		track = track->next;
 	}
 
-	set_axis(scene, object, clip, tracking_object, track, axis == 0 ? 'X' : 'Y');
+	set_axis(depsgraph, scene, object, clip, tracking_object, track, axis == 0 ? 'X' : 'Y');
 
-	DAG_id_tag_update(&clip->id, 0);
-	DAG_id_tag_update(&object->id, OB_RECALC_OB);
+	DEG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&object->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -615,6 +622,7 @@ static int do_set_scale(bContext *C,
 	MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
 	MovieTrackingTrack *track;
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *object = NULL;
 	Object *camera = get_camera_with_movieclip(scene, clip);
 	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
@@ -639,7 +647,7 @@ static int do_set_scale(bContext *C,
 		}
 	}
 
-	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, camera, mat);
 
 	track = tracksbase->first;
 	while (track) {
@@ -693,10 +701,10 @@ static int do_set_scale(bContext *C,
 				tracking_object->scale = scale;
 			}
 
-			DAG_id_tag_update(&clip->id, 0);
+			DEG_id_tag_update(&clip->id, 0);
 
 			if (object)
-				DAG_id_tag_update(&object->id, OB_RECALC_OB);
+				DEG_id_tag_update(&object->id, OB_RECALC_OB);
 
 			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 			WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c
index aa8518befaa..6c85bdfc4ec 100644
--- a/source/blender/editors/space_clip/tracking_ops_plane.c
+++ b/source/blender/editors/space_clip/tracking_ops_plane.c
@@ -39,9 +39,10 @@
 
 #include "BKE_context.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -372,7 +373,7 @@ static int slide_plane_marker_modal(bContext *C,
 			data->previous_mval[1] = event->mval[1];
 			copy_v2_v2(data->previous_corner, data->corner);
 
-			DAG_id_tag_update(&sc->clip->id, 0);
+			DEG_id_tag_update(&sc->clip->id, 0);
 
 			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
 
@@ -390,7 +391,7 @@ static int slide_plane_marker_modal(bContext *C,
 
 				clip_tracking_show_cursor(C);
 
-				DAG_id_tag_update(&sc->clip->id, 0);
+				DEG_id_tag_update(&sc->clip->id, 0);
 				WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
 
 				return OPERATOR_FINISHED;
diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c
index 5c74c1947e3..89dfadc8974 100644
--- a/source/blender/editors/space_clip/tracking_ops_solve.c
+++ b/source/blender/editors/space_clip/tracking_ops_solve.c
@@ -43,10 +43,11 @@
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 #include "BKE_global.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 #include "BKE_library.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -180,7 +181,7 @@ static void solve_camera_freejob(void *scv)
 	MEM_freeN(tracking->stats);
 	tracking->stats = NULL;
 
-	DAG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&clip->id, 0);
 
 	WM_main_add_notifier(NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_main_add_notifier(NC_OBJECT | ND_TRANSFORM, NULL);
@@ -327,7 +328,7 @@ static int clear_solution_exec(bContext *C, wmOperator *UNUSED(op))
 	reconstruction->camnr = 0;
 	reconstruction->flag &= ~TRACKING_RECONSTRUCTED;
 
-	DAG_id_tag_update(&clip->id, 0);
+	DEG_id_tag_update(&clip->id, 0);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
diff --git a/source/blender/editors/space_clip/tracking_ops_stabilize.c b/source/blender/editors/space_clip/tracking_ops_stabilize.c
index 35b1aead343..4eb6a4fbb24 100644
--- a/source/blender/editors/space_clip/tracking_ops_stabilize.c
+++ b/source/blender/editors/space_clip/tracking_ops_stabilize.c
@@ -38,7 +38,8 @@
 
 #include "BKE_context.h"
 #include "BKE_tracking.h"
-#include "BKE_depsgraph.h"
+
+#include "DEG_depsgraph.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -84,7 +85,7 @@ static int stabilize_2d_add_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	if (update) {
-		DAG_id_tag_update(&clip->id, 0);
+		DEG_id_tag_update(&clip->id, 0);
 		WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
 	}
 
@@ -138,7 +139,7 @@ static int stabilize_2d_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	if (update) {
-		DAG_id_tag_update(&clip->id, 0);
+		DEG_id_tag_update(&clip->id, 0);
 		WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
 	}
 
@@ -227,7 +228,7 @@ static int stabilize_2d_rotation_add_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	if (update) {
-		DAG_id_tag_update(&clip->id, 0);
+		DEG_id_tag_update(&clip->id, 0);
 		WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
 	}
 
@@ -281,7 +282,7 @@ static int stabilize_2d_rotation_remove_exec(bContext *C, wmOperator *UNUSED(op)
 	}
 
 	if (update) {
-		DAG_id_tag_update(&clip->id, 0);
+		DEG_id_tag_update(&clip->id, 0);
 		WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
 	}
 
diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c
index 0dd0ee8c7d4..cd8e92c9b9c 100644
--- a/source/blender/editors/space_clip/tracking_ops_track.c
+++ b/source/blender/editors/space_clip/tracking_ops_track.c
@@ -297,7 +297,8 @@ static void track_markers_endjob(void *tmv)
 	tmj->scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(tmj->clip,
 	                                                             tmj->lastfra);
 	if (wm != NULL) {
-		ED_update_for_newframe(tmj->main, tmj->scene, 0);
+		// XXX: ...
+		// ED_update_for_newframe(tmj->main, tmj->scene);
 	}
 
 	BKE_autotrack_context_sync(tmj->context);
diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c
index 6ee658b744c..66b203ff612 100644
--- a/source/blender/editors/space_console/console_draw.c
+++ b/source/blender/editors/space_console/console_draw.c
@@ -40,6 +40,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BIF_gl.h"
+#include "GPU_immediate.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -157,6 +158,8 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha
 		int offl = 0, offc = 0;
 		int xy[2] = {CONSOLE_DRAW_MARGIN, CONSOLE_DRAW_MARGIN};
 		int pen[2];
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 		xy[1] += tvc->lheight / 6;
 
 		console_cursor_wrap_offset(sc->prompt, tvc->console_width, &offl, &offc, NULL);
@@ -168,14 +171,17 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha
 		pen[1] += tvc->lheight * offl;
 
 		/* cursor */
-		UI_GetThemeColor3ubv(TH_CONSOLE_CURSOR, fg);
-		glColor3ubv(fg);
-
-		glRecti((xy[0] + pen[0]) - 1,
-		        (xy[1] + pen[1]),
-		        (xy[0] + pen[0]) + 1,
-		        (xy[1] + pen[1] + tvc->lheight)
-		        );
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_CONSOLE_CURSOR);
+
+		immRectf(pos,
+		         (xy[0] + pen[0]) - 1,
+		         (xy[1] + pen[1]),
+		         (xy[0] + pen[0]) + 1,
+		         (xy[1] + pen[1] + tvc->lheight)
+		         );
+
+		immUnbindProgram();
 	}
 
 	console_line_color(fg, cl_iter->type);
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index 2dfe02cc333..c65c9a175a0 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -52,7 +52,7 @@
 
 /* ******************** default callbacks for console space ***************** */
 
-static SpaceLink *console_new(const bContext *UNUSED(C))
+static SpaceLink *console_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceConsole *sconsole;
@@ -67,7 +67,7 @@ static SpaceLink *console_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&sconsole->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 
 	/* main region */
@@ -368,7 +368,9 @@ static void console_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void console_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar, wmNotifier *wmn)
+static void console_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	// SpaceInfo *sinfo = sa->spacedata.first;
 
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index befdf6751ee..fcfe745546e 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -42,7 +42,6 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
 #include "BKE_context.h"
@@ -53,6 +52,8 @@
 
 #include "BLT_translation.h"
 
+#include "BLF_api.h"
+
 #include "IMB_imbuf_types.h"
 
 #include "DNA_userdef_types.h"
@@ -71,6 +72,9 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+
 #include "filelist.h"
 
 #include "file_intern.h"    // own include
@@ -258,9 +262,10 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 
 static void draw_tile(int sx, int sy, int width, int height, int colorid, int shade)
 {
-	UI_ThemeColorShade(colorid, shade);
+	float color[4];
+	UI_GetThemeColorShade4fv(colorid, shade, color);
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox((float)sx, (float)(sy - height), (float)(sx + width), (float)sy, 5.0f);
+	UI_draw_roundbox_aa(true, (float)sx, (float)(sy - height), (float)(sx + width), (float)sy, 5.0f, color);
 }
 
 
@@ -285,7 +290,8 @@ static void file_draw_icon(uiBlock *block, const char *path, int sx, int sy, int
 }
 
 
-static void file_draw_string(int sx, int sy, const char *string, float width, int height, short align)
+static void file_draw_string(int sx, int sy, const char *string, float width, int height, short align,
+                             const unsigned char col[4])
 {
 	uiStyle *style;
 	uiFontStyle fs;
@@ -310,7 +316,7 @@ static void file_draw_string(int sx, int sy, const char *string, float width, in
 	rect.ymin = sy - height;
 	rect.ymax = sy;
 
-	UI_fontstyle_draw(&fs, &rect, fname);
+	UI_fontstyle_draw(&fs, &rect, fname, col);
 }
 
 void file_calc_previews(const bContext *C, ARegion *ar)
@@ -335,6 +341,7 @@ static void file_draw_preview(
 	float scale;
 	int ex, ey;
 	bool use_dropshadow = !is_icon && (typeflags & FILE_TYPE_IMAGE);
+	float col[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
 	BLI_assert(imb != NULL);
 
@@ -370,7 +377,7 @@ static void file_draw_preview(
 	xco = sx + (int)dx;
 	yco = sy - layout->prv_h + (int)dy;
 
-	glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* shadow */
 	if (use_dropshadow) {
@@ -381,12 +388,12 @@ static void file_draw_preview(
 
 	/* the image */
 	if (!is_icon && typeflags & FILE_TYPE_FTFONT) {
-		UI_ThemeColor(TH_TEXT);
-	}
-	else {
-		glColor4f(1.0, 1.0, 1.0, 1.0);
+		UI_GetThemeColor4fv(TH_TEXT, col);
 	}
-	glaDrawPixelsTexScaled((float)xco, (float)yco, imb->x, imb->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, imb->rect, scale, scale);
+
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+	immDrawPixelsTexScaled(&state, (float)xco, (float)yco, imb->x, imb->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, imb->rect,
+	                       scale, scale, 1.0f, 1.0f, col);
 
 	if (icon) {
 		UI_icon_draw_aspect((float)xco, (float)yco, icon, icon_aspect, 1.0f);
@@ -394,8 +401,13 @@ static void file_draw_preview(
 
 	/* border */
 	if (use_dropshadow) {
-		glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
-		fdrawbox((float)xco, (float)yco, (float)(xco + ex), (float)(yco + ey));
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+		imm_draw_box_wire_2d(pos, (float)xco, (float)yco, (float)(xco + ex), (float)(yco + ey));
+		immUnbindProgram();
 	}
 
 	but = uiDefBut(block, UI_BTYPE_LABEL, 0, "", xco, yco, ex, ey, NULL, 0.0, 0.0, 0, 0, NULL);
@@ -451,49 +463,70 @@ static void draw_background(FileLayout *layout, View2D *v2d)
 	int i;
 	int sy;
 
-	UI_ThemeColorShade(TH_BACK, -7);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShade(TH_BACK, -7);
 
 	/* alternating flat shade background */
 	for (i = 0; (i <= layout->rows); i += 2) {
 		sy = (int)v2d->cur.ymax - i * (layout->tile_h + 2 * layout->tile_border_y) - layout->tile_border_y;
 
-		glRectf(v2d->cur.xmin, (float)sy, v2d->cur.xmax, (float)(sy + layout->tile_h + 2 * layout->tile_border_y));
-
+		immRectf(pos, v2d->cur.xmin, (float)sy, v2d->cur.xmax, (float)(sy + layout->tile_h + 2 * layout->tile_border_y));
 	}
+
+	immUnbindProgram();
 }
 
 static void draw_dividers(FileLayout *layout, View2D *v2d)
 {
+	/* vertical column dividers */
+
 	const int step = (layout->tile_w + 2 * layout->tile_border_x);
-	int v1[2], v2[2];
-	int sx;
-	unsigned char col_hi[3], col_lo[3];
 
-	UI_GetThemeColorShade3ubv(TH_BACK,  30, col_hi);
-	UI_GetThemeColorShade3ubv(TH_BACK, -30, col_lo);
+	unsigned int vertex_ct = 0;
+	int sx = (int)v2d->tot.xmin;
+	while (sx < v2d->cur.xmax) {
+		sx += step;
+		vertex_ct += 4; /* vertex_count = 2 points per line * 2 lines per divider */
+	}
+
+	if (vertex_ct > 0) {
+		int v1[2], v2[2];
+		unsigned char col_hi[3], col_lo[3];
 
-	v1[1] = v2d->cur.ymax - layout->tile_border_y;
-	v2[1] = v2d->cur.ymin;
+		UI_GetThemeColorShade3ubv(TH_BACK,  30, col_hi);
+		UI_GetThemeColorShade3ubv(TH_BACK, -30, col_lo);
 
-	glBegin(GL_LINES);
+		v1[1] = v2d->cur.ymax - layout->tile_border_y;
+		v2[1] = v2d->cur.ymin;
 
-	/* vertical column dividers */
-	sx = (int)v2d->tot.xmin;
-	while (sx < v2d->cur.xmax) {
-		sx += step;
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 3, GWN_FETCH_INT_TO_FLOAT_UNIT);
 
-		glColor3ubv(col_lo);
-		v1[0] = v2[0] = sx;
-		glVertex2iv(v1);
-		glVertex2iv(v2);
+		immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+		immBegin(GWN_PRIM_LINES, vertex_ct);
 
-		glColor3ubv(col_hi);
-		v1[0] = v2[0] = sx + 1;
-		glVertex2iv(v1);
-		glVertex2iv(v2);
-	}
+		sx = (int)v2d->tot.xmin;
+		while (sx < v2d->cur.xmax) {
+			sx += step;
+
+			v1[0] = v2[0] = sx;
+			immSkipAttrib(color);
+			immVertex2iv(pos, v1);
+			immAttrib3ubv(color, col_lo);
+			immVertex2iv(pos, v2);
 
-	glEnd();
+			v1[0] = v2[0] = sx + 1;
+			immSkipAttrib(color);
+			immVertex2iv(pos, v1);
+			immAttrib3ubv(color, col_hi);
+			immVertex2iv(pos, v2);
+		}
+
+		immEnd();
+		immUnbindProgram();
+	}
 }
 
 void file_draw_list(const bContext *C, ARegion *ar)
@@ -517,6 +550,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
 	short align;
 	bool do_drag;
 	int column_space = 0.6f * UI_UNIT_X;
+	unsigned char text_col[4];
 	const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
 	const bool update_stat_strings = small_size != SMALL_SIZE_CHECK(layout->curr_size);
 	const float thumb_icon_aspect = sqrtf(64.0f / (float)(params->thumbnail_size));
@@ -575,6 +609,8 @@ void file_draw_list(const bContext *C, ARegion *ar)
 		}
 	}
 
+	BLF_batch_draw_begin();
+
 	for (i = offset; (i < numfiles) && (i < offset + numfiles_layout); i++) {
 		unsigned int file_selflag;
 		char path[FILE_MAX_LIBEXTRA];
@@ -587,9 +623,6 @@ void file_draw_list(const bContext *C, ARegion *ar)
 
 		BLI_join_dirfile(path, sizeof(path), root, file->relpath);
 
-		UI_ThemeColor4(TH_TEXT);
-
-
 		if (!(file_selflag & FILE_SEL_EDITING)) {
 			if ((params->highlight_file == i) || (file_selflag & FILE_SEL_HIGHLIGHTED) ||
 			    (file_selflag & FILE_SEL_SELECTED))
@@ -625,7 +658,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
 			sx += ICON_DEFAULT_WIDTH_SCALE + 0.2f * UI_UNIT_X;
 		}
 
-		UI_ThemeColor4(TH_TEXT);
+		UI_GetThemeColor4ubv(TH_TEXT, text_col);
 
 		if (file_selflag & FILE_SEL_EDITING) {
 			uiBut *but;
@@ -656,7 +689,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
 
 		if (!(file_selflag& FILE_SEL_EDITING)) {
 			int tpos = (FILE_IMGDISPLAY == params->display) ? sy - layout->tile_h + layout->textheight : sy;
-			file_draw_string(sx + 1, tpos, file->name, (float)textwidth, textheight, align);
+			file_draw_string(sx + 1, tpos, file->name, (float)textwidth, textheight, align, text_col);
 		}
 
 		sx += (int)layout->column_widths[COLUMN_NAME] + column_space;
@@ -668,7 +701,8 @@ void file_draw_list(const bContext *C, ARegion *ar)
 					BLI_filelist_entry_size_to_string(NULL, file->entry->size, small_size, file->entry->size_str);
 				}
 				file_draw_string(
-				            sx, sy, file->entry->size_str, layout->column_widths[COLUMN_SIZE], layout->tile_h, align);
+				            sx, sy, file->entry->size_str, layout->column_widths[COLUMN_SIZE], layout->tile_h,
+				            align, text_col);
 			}
 			sx += (int)layout->column_widths[COLUMN_SIZE] + column_space;
 		}
@@ -679,10 +713,12 @@ void file_draw_list(const bContext *C, ARegion *ar)
 					            NULL, file->entry->time, small_size, file->entry->time_str, file->entry->date_str);
 				}
 				file_draw_string(
-				            sx, sy, file->entry->date_str, layout->column_widths[COLUMN_DATE], layout->tile_h, align);
+				            sx, sy, file->entry->date_str, layout->column_widths[COLUMN_DATE], layout->tile_h,
+				            align, text_col);
 				sx += (int)layout->column_widths[COLUMN_DATE] + column_space;
 				file_draw_string(
-				            sx, sy, file->entry->time_str, layout->column_widths[COLUMN_TIME], layout->tile_h, align);
+				            sx, sy, file->entry->time_str, layout->column_widths[COLUMN_TIME], layout->tile_h,
+				            align, text_col);
 				sx += (int)layout->column_widths[COLUMN_TIME] + column_space;
 			}
 			else {
@@ -697,12 +733,15 @@ void file_draw_list(const bContext *C, ARegion *ar)
 					BLI_filelist_entry_size_to_string(NULL, file->entry->size, small_size, file->entry->size_str);
 				}
 				file_draw_string(
-				            sx, sy, file->entry->size_str, layout->column_widths[COLUMN_SIZE], layout->tile_h, align);
+				            sx, sy, file->entry->size_str, layout->column_widths[COLUMN_SIZE], layout->tile_h,
+				            align, text_col);
 			}
 			sx += (int)layout->column_widths[COLUMN_SIZE] + column_space;
 		}
 	}
 
+	BLF_batch_draw_end();
+
 	UI_block_end(C, block);
 	UI_block_draw(C, block);
 
diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index 70321ca4540..78bbe3aea58 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -88,7 +88,8 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 
 	UI_block_func_set(uiLayoutGetBlock(pa->layout), file_draw_check_cb, NULL, NULL);
 
-	uiTemplateOperatorPropertyButs(C, pa->layout, op, file_panel_check_prop, '\0', UI_TEMPLATE_OP_PROPS_SHOW_EMPTY);
+	uiTemplateOperatorPropertyButs(C, pa->layout, op, file_panel_check_prop, UI_BUT_LABEL_ALIGN_NONE,
+	                               UI_TEMPLATE_OP_PROPS_SHOW_EMPTY);
 
 	UI_block_func_set(uiLayoutGetBlock(pa->layout), NULL, NULL, NULL);
 }
diff --git a/source/blender/editors/space_file/file_utils.c b/source/blender/editors/space_file/file_utils.c
index c1caf5ae8ac..fc870399696 100644
--- a/source/blender/editors/space_file/file_utils.c
+++ b/source/blender/editors/space_file/file_utils.c
@@ -26,6 +26,7 @@
 
 #include "BLI_rect.h"
 #include "BLI_fileops.h"
+#include "BLI_listbase.h"
 
 #include "BLO_readfile.h"
 
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index 99307b1961d..9ba3c788daf 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -215,7 +215,8 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		                    FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA | FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
 		                    FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
 		                    FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
-		                    FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO | FILTER_ID_CF;
+		                    FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO | FILTER_ID_CF | FILTER_ID_WS |
+		                    FILTER_ID_LP;
 
 		if (U.uiflag & USER_HIDE_DOT) {
 			params->flag |= FILE_HIDE_DOT;
@@ -228,7 +229,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		if (params->type == FILE_LOADLIB) {
 			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
-			params->flag |= RNA_boolean_get(op->ptr, "active_layer") ? FILE_ACTIVELAY : 0;
+			params->flag |= RNA_boolean_get(op->ptr, "active_collection") ? FILE_ACTIVE_COLLECTION : 0;
 		}
 
 		if ((prop = RNA_struct_find_property(op->ptr, "display_type"))) {
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index baa8e78572a..5ecb95bf61b 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -42,8 +42,6 @@
 
 #include "BKE_appdir.h"
 
-#include "DNA_space_types.h"
-
 #include "ED_fileselect.h"
 
 #ifdef WIN32
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 8b681bd93c3..62e7c7923e8 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -49,6 +49,7 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "ED_space_api.h"
 #include "ED_screen.h"
@@ -67,7 +68,7 @@
 
 /* ******************** default callbacks for file space ***************** */
 
-static SpaceLink *file_new(const bContext *UNUSED(C))
+static SpaceLink *file_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceFile *sfile;
@@ -291,11 +292,13 @@ static void file_refresh(const bContext *C, ScrArea *sa)
 		file_tools_region(sa);
 
 		ED_area_initialize(wm, CTX_wm_window(C), sa);
-		ED_area_tag_redraw(sa);
 	}
+
+	ED_area_tag_redraw(sa);
 }
 
-static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                          WorkSpace *UNUSED(workspace))
 {
 	SpaceFile *sfile = (SpaceFile *)sa->spacedata.first;
 
@@ -305,16 +308,13 @@ static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 			switch (wmn->data) {
 				case ND_SPACE_FILE_LIST:
 					ED_area_tag_refresh(sa);
-					ED_area_tag_redraw(sa);
 					break;
 				case ND_SPACE_FILE_PARAMS:
 					ED_area_tag_refresh(sa);
-					ED_area_tag_redraw(sa);
 					break;
 				case ND_SPACE_FILE_PREVIEW:
 					if (sfile->files && filelist_cache_previews_update(sfile->files)) {
 						ED_area_tag_refresh(sa);
-						ED_area_tag_redraw(sa);
 					}
 					break;
 			}
@@ -337,7 +337,9 @@ static void file_main_region_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 }
 
-static void file_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void file_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -354,6 +356,42 @@ static void file_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
 	}
 }
 
+static void file_main_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	SpaceFile *sfile = sa->spacedata.first;
+	FileSelectParams *params = ED_fileselect_get_params(sfile);
+	/* This is a bit odd that a region owns the subscriber for an area,
+	 * keep for now since all subscribers for WM are regions.
+	 * May be worth re-visiting later. */
+	wmMsgSubscribeValue msg_sub_value_area_tag_refresh = {
+		.owner = ar,
+		.user_data = sa,
+		.notify = ED_area_do_msg_notify_tag_refresh,
+	};
+
+	/* SpaceFile itself. */
+	{
+		PointerRNA ptr;
+		RNA_pointer_create(&screen->id, &RNA_SpaceFileBrowser, sfile, &ptr);
+
+		/* All properties for this space type. */
+		WM_msg_subscribe_rna(mbus, &ptr, NULL, &msg_sub_value_area_tag_refresh, __func__);
+	}
+
+	/* FileSelectParams */
+	{
+		PointerRNA ptr;
+		RNA_pointer_create(&screen->id, &RNA_FileSelectParams, params, &ptr);
+
+		/* All properties for this space type. */
+		WM_msg_subscribe_rna(mbus, &ptr, NULL, &msg_sub_value_area_tag_refresh, __func__);
+	}
+}
+
 static void file_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
@@ -601,7 +639,9 @@ static void file_tools_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void file_tools_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void file_tools_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 #if 0
 	/* context changes */
@@ -663,7 +703,9 @@ static void file_ui_region_draw(const bContext *C, ARegion *ar)
 	UI_view2d_view_restore(C);
 }
 
-static void file_ui_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void file_ui_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -727,6 +769,7 @@ void ED_spacetype_file(void)
 	art->init = file_main_region_init;
 	art->draw = file_main_region_draw;
 	art->listener = file_main_region_listener;
+	art->message_subscribe = file_main_region_message_subscribe;
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D;
 	BLI_addhead(&st->regiontypes, art);
 
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 40a196fa95b..2840324e65e 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -23,6 +23,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
@@ -48,7 +49,7 @@ set(SRC
 )
 
 if(WITH_AUDASPACE)
-	add_definitions(${AUDASPACE_DEFINITIONS})
+	add_definitions(-DWITH_AUDASPACE)
 
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index d5586a51a40..706beb9784a 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -48,13 +48,13 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_main.h"
 #include "BKE_global.h"
 #include "BKE_screen.h"
 #include "BKE_unit.h"
 
+#include "DEG_depsgraph_build.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -154,17 +154,12 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
 	PointerRNA fcu_ptr;
 	uiLayout *layout = pa->layout;
 	uiLayout *col, *row, *sub;
-	// uiBlock *block;  // UNUSED
 	char name[256];
 	int icon = 0;
 
 	if (!graph_panel_context(C, &ale, &fcu))
 		return;
 
-	// UNUSED
-	// block = uiLayoutGetBlock(layout);
-	// UI_block_func_handle_set(block, do_graph_region_buttons, NULL);
-
 	/* F-Curve pointer */
 	RNA_pointer_create(ale->id, &RNA_FCurve, fcu, &fcu_ptr);
 
@@ -472,7 +467,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa)
 
 #define B_IPO_DEPCHANGE     10
 
-static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int event)
+static void do_graph_region_driver_buttons(bContext *C, void *fcu_v, int event)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
@@ -480,8 +475,18 @@ static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int e
 	switch (event) {
 		case B_IPO_DEPCHANGE:
 		{
+			/* force F-Curve & Driver to get re-evaluated (same as the old Update Dependencies) */
+			FCurve *fcu = (FCurve *)fcu_v;
+			ChannelDriver *driver = (fcu) ? fcu->driver : NULL;
+
+			/* clear invalid flags */
+			if (fcu) {
+				fcu->flag &= ~FCURVE_DISABLED;
+				driver->flag &= ~DRIVER_FLAG_INVALID;
+			}
+
 			/* rebuild depsgraph for the new deps */
-			DAG_relations_tag_update(bmain);
+			DEG_relations_tag_update(bmain);
 			break;
 		}
 	}
@@ -490,23 +495,6 @@ static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int e
 	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene); // XXX could use better notifier
 }
 
-/* callback to remove the active driver */
-static void driver_remove_cb(bContext *C, void *ale_v, void *UNUSED(arg))
-{
-	bAnimListElem *ale = (bAnimListElem *)ale_v;
-	ID *id = ale->id;
-	FCurve *fcu = ale->data;
-	ReportList *reports = CTX_wm_reports(C);
-
-	/* try to get F-Curve that driver lives on, and ID block which has this AnimData */
-	if (ELEM(NULL, id, fcu))
-		return;
-
-	/* call API method to remove this driver  */
-	ANIM_remove_driver(reports, id, fcu->rna_path, fcu->array_index, 0);
-	ED_undo_push(C, "Remove Driver");
-}
-
 /* callback to add a target variable to the active driver */
 static void driver_add_var_cb(bContext *C, void *driver_v, void *UNUSED(arg))
 {
@@ -728,60 +716,88 @@ static void graph_panel_driverVar__transChan(uiLayout *layout, ID *id, DriverVar
 	uiItemR(sub, &dtar_ptr, "transform_space", 0, IFACE_("Space"), ICON_NONE);
 }
 
-/* driver settings for active F-Curve (only for 'Drivers' mode) */
-static void graph_panel_drivers(const bContext *C, Panel *pa)
+/* ----------------------------------------------------------------- */
+
+
+/* property driven by the driver - duplicates Active FCurve, but useful for clarity */
+static void graph_draw_driven_property_panel(uiLayout *layout, ID *id, FCurve *fcu)
 {
-	bAnimListElem *ale;
-	FCurve *fcu;
-	ChannelDriver *driver;
+	PointerRNA fcu_ptr;
+	uiLayout *row;
+	char name[256];
+	int icon = 0;
+
+	/* F-Curve pointer */
+	RNA_pointer_create(id, &RNA_FCurve, fcu, &fcu_ptr);
+
+	/* get user-friendly 'name' for F-Curve */
+	icon = getname_anim_fcurve(name, id, fcu);
+
+	/* panel layout... */
+	row = uiLayoutRow(layout, true);
+	uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT);
+
+	/* -> user friendly 'name' for datablock that owns F-Curve */
+	/* XXX: Actually, we may need the datablock icons only... (e.g. right now will show bone for bone props) */
+	uiItemL(row, id->name + 2, icon);
+
+	/* -> user friendly 'name' for F-Curve/driver target */
+	uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC);
+	uiItemL(row, name, ICON_RNA);
+}
+
+/* UI properties panel layout for driver settings - shared for Drivers Editor and for */
+static void graph_draw_driver_settings_panel(uiLayout *layout, ID *id, FCurve *fcu)
+{
+	ChannelDriver *driver = fcu->driver;
 	DriverVar *dvar;
 
 	PointerRNA driver_ptr;
-	uiLayout *col;
+	uiLayout *col, *row;
 	uiBlock *block;
 	uiBut *but;
 
-	/* Get settings from context */
-	if (!graph_panel_context(C, &ale, &fcu))
-		return;
-	driver = fcu->driver;
-
 	/* set event handler for panel */
-	block = uiLayoutGetBlock(pa->layout); // xxx?
+	block = uiLayoutGetBlock(layout);
 	UI_block_func_handle_set(block, do_graph_region_driver_buttons, NULL);
 
-	/* general actions - management */
-	col = uiLayoutColumn(pa->layout, false);
-	block = uiLayoutGetBlock(col);
-	but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_FILE_REFRESH, IFACE_("Update Dependencies"),
-	               0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
-	               NULL, 0.0, 0.0, 0, 0,
-	               TIP_("Force updates of dependencies"));
-	UI_but_func_set(but, driver_update_flags_cb, fcu, NULL);
-
-	but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMOUT, IFACE_("Remove Driver"),
-	               0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
-	               NULL, 0.0, 0.0, 0, 0,
-	               TIP_("Remove this driver"));
-	UI_but_funcN_set(but, driver_remove_cb, MEM_dupallocN(ale), NULL);
-
 	/* driver-level settings - type, expressions, and errors */
-	RNA_pointer_create(ale->id, &RNA_Driver, driver, &driver_ptr);
+	RNA_pointer_create(id, &RNA_Driver, driver, &driver_ptr);
 
-	col = uiLayoutColumn(pa->layout, true);
+	col = uiLayoutColumn(layout, true);
 	block = uiLayoutGetBlock(col);
 	uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NONE);
 
+	{
+		char valBuf[32];
+
+		/* value of driver */
+		row = uiLayoutRow(col, true);
+		uiItemL(row, IFACE_("Driver Value:"), ICON_NONE);
+		BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", driver->curval);
+		uiItemL(row, valBuf, ICON_NONE);
+	}
+
 	/* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */
 	if (driver->type == DRIVER_TYPE_PYTHON) {
 		bool bpy_data_expr_error = (strstr(driver->expression, "bpy.data.") != NULL);
 		bool bpy_ctx_expr_error  = (strstr(driver->expression, "bpy.context.") != NULL);
 
 		/* expression */
-		uiItemR(col, &driver_ptr, "expression", 0, IFACE_("Expr"), ICON_NONE);
+		/* TODO: "Show syntax hints" button */
+		col = uiLayoutColumn(layout, true);
+		block = uiLayoutGetBlock(col);
+
+		uiItemL(col, IFACE_("Expression:"), ICON_NONE);
+		uiItemR(col, &driver_ptr, "expression", 0, "", ICON_NONE);
+		uiItemR(col, &driver_ptr, "use_self", 0, NULL, ICON_NONE);
 
 		/* errors? */
+		col = uiLayoutColumn(layout, true);
+		block = uiLayoutGetBlock(col);
+
 		if ((G.f & G_SCRIPT_AUTOEXEC) == 0) {
+			/* TODO: Add button to enable? */
 			uiItemL(col, IFACE_("ERROR: Python auto-execution disabled"), ICON_CANCEL);
 		}
 		else if (driver->flag & DRIVER_FLAG_INVALID) {
@@ -803,6 +819,9 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 	}
 	else {
 		/* errors? */
+		col = uiLayoutColumn(layout, true);
+		block = uiLayoutGetBlock(col);
+
 		if (driver->flag & DRIVER_FLAG_INVALID)
 			uiItemL(col, IFACE_("ERROR: Invalid target channel(s)"), ICON_ERROR);
 
@@ -822,37 +841,15 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 		}
 	}
 
-	col = uiLayoutColumn(pa->layout, true);
-
-	if (driver->type == DRIVER_TYPE_PYTHON) {
-		uiItemR(col, &driver_ptr, "use_self", 0, NULL, ICON_NONE);
-	}
-
-	/* debug setting */
-	uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NONE);
-
-	/* value of driver */
-	if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
-		uiLayout *row = uiLayoutRow(col, true);
-		char valBuf[32];
-
-		uiItemL(row, IFACE_("Driver Value:"), ICON_NONE);
-
-		BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", driver->curval);
-		uiItemL(row, valBuf, ICON_NONE);
-	}
-
 	/* add/copy/paste driver variables */
 	{
-		uiLayout *row;
-
 		/* add driver variable */
-		row = uiLayoutRow(pa->layout, false);
+		row = uiLayoutRow(layout, false);
 		block = uiLayoutGetBlock(row);
-		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Variable"),
+		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Input Variable"),
 	                           0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
 	                           NULL, 0.0, 0.0, 0, 0,
-	                           TIP_("Driver variables ensure that all dependencies will be accounted for and that drivers will update correctly"));
+	                           TIP_("Driver variables ensure that all dependencies will be accounted for, eusuring that drivers will update correctly"));
 		UI_but_func_set(but, driver_add_var_cb, driver, NULL);
 
 		/* copy/paste (as sub-row) */
@@ -866,15 +863,15 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 	/* loop over targets, drawing them */
 	for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
 		PointerRNA dvar_ptr;
-		uiLayout *box, *row;
+		uiLayout *box;
 		uiLayout *subrow, *sub;
 
 		/* sub-layout column for this variable's settings */
-		col = uiLayoutColumn(pa->layout, true);
+		col = uiLayoutColumn(layout, true);
 
 		/* 1) header panel */
 		box = uiLayoutBox(col);
-		RNA_pointer_create(ale->id, &RNA_DriverVariable, dvar, &dvar_ptr);
+		RNA_pointer_create(id, &RNA_DriverVariable, dvar, &dvar_ptr);
 
 		row = uiLayoutRow(box, false);
 		block = uiLayoutGetBlock(row);
@@ -915,21 +912,21 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 		/* controls to draw depends on the type of variable */
 		switch (dvar->type) {
 			case DVAR_TYPE_SINGLE_PROP:     /* single property */
-				graph_panel_driverVar__singleProp(box, ale->id, dvar);
+				graph_panel_driverVar__singleProp(box, id, dvar);
 				break;
 			case DVAR_TYPE_ROT_DIFF:     /* rotational difference */
-				graph_panel_driverVar__rotDiff(box, ale->id, dvar);
+				graph_panel_driverVar__rotDiff(box, id, dvar);
 				break;
 			case DVAR_TYPE_LOC_DIFF:     /* location difference */
-				graph_panel_driverVar__locDiff(box, ale->id, dvar);
+				graph_panel_driverVar__locDiff(box, id, dvar);
 				break;
 			case DVAR_TYPE_TRANSFORM_CHAN:     /* transform channel */
-				graph_panel_driverVar__transChan(box, ale->id, dvar);
+				graph_panel_driverVar__transChan(box, id, dvar);
 				break;
 		}
 
 		/* 3) value of variable */
-		if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
+		{
 			char valBuf[32];
 
 			box = uiLayoutBox(col);
@@ -951,10 +948,99 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 		}
 	}
 
+	/* XXX: This should become redundant. But sometimes the flushing fails, so keep this around for a while longer as a "last resort" */
+	row = uiLayoutRow(layout, true);
+	block = uiLayoutGetBlock(row);
+	but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_FILE_REFRESH, IFACE_("Update Dependencies"),
+	               0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
+	               NULL, 0.0, 0.0, 0, 0,
+	               TIP_("Force updates of dependencies - Only use this if drivers are not updating correctly"));
+	UI_but_func_set(but, driver_update_flags_cb, fcu, NULL);
+}
+
+/* ----------------------------------------------------------------- */
+
+
+/* panel to show property driven by the driver (in Drivers Editor) - duplicates Active FCurve, but useful for clarity */
+static void graph_panel_driven_property(const bContext *C, Panel *pa)
+{
+	bAnimListElem *ale;
+	FCurve *fcu;
+
+	if (!graph_panel_context(C, &ale, &fcu))
+		return;
+
+	graph_draw_driven_property_panel(pa->layout, ale->id, fcu);
+
+	MEM_freeN(ale);
+}
+
+/* driver settings for active F-Curve (only for 'Drivers' mode in Graph Editor, i.e. the full "Drivers Editor") */
+static void graph_panel_drivers(const bContext *C, Panel *pa)
+{
+	bAnimListElem *ale;
+	FCurve *fcu;
+
+	/* Get settings from context */
+	if (!graph_panel_context(C, &ale, &fcu))
+		return;
+
+	graph_draw_driver_settings_panel(pa->layout, ale->id, fcu);
+
 	/* cleanup */
 	MEM_freeN(ale);
 }
 
+/* ----------------------------------------------------------------- */
+
+/* poll to make this not show up in the graph editor, as this is only to be used as a popup elsewhere */
+static int graph_panel_drivers_popover_poll(const bContext *C, PanelType *UNUSED(pt))
+{
+	return ED_operator_graphedit_active((bContext *)C) == false;
+}
+
+/* popover panel for driver editing anywhere in ui */
+static void graph_panel_drivers_popover(const bContext *C, Panel *pa)
+{
+	uiLayout *layout = pa->layout;
+
+	PointerRNA ptr = {{NULL}};
+	PropertyRNA *prop = NULL;
+	int index = -1;
+	uiBut *but = NULL;
+
+	/* Get active property to show driver properties for */
+	but = UI_context_active_but_prop_get((bContext *)C, &ptr, &prop, &index);
+	if (but) {
+		FCurve *fcu;
+		bool driven, special;
+
+		fcu = rna_get_fcurve_context_ui((bContext *)C,
+		                                &ptr, prop, index,
+		                                NULL, NULL, &driven, &special);
+
+		/* Populate Panel - With a combination of the contents of the Driven and Driver panels */
+		if (fcu) {
+			ID *id = ptr.id.data;
+
+			/* Driven Property Settings */
+			uiItemL(layout, IFACE_("Driven Property:"), ICON_NONE);
+			graph_draw_driven_property_panel(pa->layout, id, fcu);
+			/* TODO: All vs Single */
+
+			uiItemS(layout);
+			uiItemS(layout);
+
+			/* Drivers Settings */
+			uiItemL(layout, IFACE_("Driver Settings:"), ICON_NONE);
+			graph_draw_driver_settings_panel(pa->layout, id, fcu);
+		}
+	}
+
+	/* Show drivers editor is always visible */
+	uiItemO(layout, IFACE_("Show in Drivers Editor"), ICON_DRIVER, "SCREEN_OT_drivers_editor_show");
+}
+
 /* ******************* F-Modifiers ******************************** */
 /* All the drawing code is in editors/animation/fmodifier_ui.c */
 
@@ -1035,16 +1121,33 @@ void graph_buttons_register(ARegionType *art)
 	pt->poll = graph_panel_poll;
 	BLI_addtail(&art->paneltypes, pt);
 
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers driven");
+	strcpy(pt->idname, "GRAPH_PT_driven_property");
+	strcpy(pt->label, N_("Driven Property"));
+	strcpy(pt->category, "Drivers");
+	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
+	pt->draw = graph_panel_driven_property;
+	pt->poll = graph_panel_drivers_poll;
+	BLI_addtail(&art->paneltypes, pt);
 
 	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers");
 	strcpy(pt->idname, "GRAPH_PT_drivers");
-	strcpy(pt->label, N_("Drivers"));
+	strcpy(pt->label, N_("Driver"));
 	strcpy(pt->category, "Drivers");
 	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
 	pt->draw = graph_panel_drivers;
 	pt->poll = graph_panel_drivers_poll;
 	BLI_addtail(&art->paneltypes, pt);
 
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers pover");
+	strcpy(pt->idname, "GRAPH_PT_drivers_popover");
+	strcpy(pt->label, N_("Add/Edit Driver"));
+	strcpy(pt->category, "Drivers");
+	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
+	pt->draw = graph_panel_drivers_popover;
+	pt->poll = graph_panel_drivers_popover_poll;
+	BLI_addtail(&art->paneltypes, pt);
+
 	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel modifiers");
 	strcpy(pt->idname, "GRAPH_PT_modifiers");
 	strcpy(pt->label, N_("Modifiers"));
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 9a94bb9072b..7c6af0b4c62 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -46,10 +46,12 @@
 #include "BKE_curve.h"
 #include "BKE_fcurve.h"
 
-
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 #include "ED_anim_api.h"
 
 #include "graph_intern.h"
@@ -83,37 +85,58 @@ static void draw_fcurve_modifier_controls_envelope(FModifier *fcm, View2D *v2d)
 	const float fac = 0.05f * BLI_rctf_size_x(&v2d->cur);
 	int i;
 
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	glLineWidth(1.0f);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* Simple dashes. */
+	immUniformColor3f(0.0f, 0.0f, 0.0f);
+	immUniform1f("dash_width", 10.0f);
+	immUniform1f("dash_factor", 0.5f);
+
 	/* draw two black lines showing the standard reference levels */
-	glColor3f(0.0f, 0.0f, 0.0f);
-	glLineWidth(1);
-	setlinestyle(5);
 
-	glBegin(GL_LINES);
-	glVertex2f(v2d->cur.xmin, env->midval + env->min);
-	glVertex2f(v2d->cur.xmax, env->midval + env->min);
+	immBegin(GWN_PRIM_LINES, 4);
+	immVertex2f(shdr_pos, v2d->cur.xmin, env->midval + env->min);
+	immVertex2f(shdr_pos, v2d->cur.xmax, env->midval + env->min);
 
-	glVertex2f(v2d->cur.xmin, env->midval + env->max);
-	glVertex2f(v2d->cur.xmax, env->midval + env->max);
-	glEnd();
-	setlinestyle(0);
+	immVertex2f(shdr_pos, v2d->cur.xmin, env->midval + env->max);
+	immVertex2f(shdr_pos, v2d->cur.xmax, env->midval + env->max);
+	immEnd();
 
-	/* set size of vertices (non-adjustable for now) */
-	glPointSize(2.0f);
+	immUnbindProgram();
 
-	/* for now, point color is fixed, and is white */
-	glColor3f(1.0f, 1.0f, 1.0f);
+	if (env->totvert > 0) {
+		/* set size of vertices (non-adjustable for now) */
+		glPointSize(2.0f);
 
-	glBegin(GL_POINTS);
-	for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
-		/* only draw if visible
-		 *	- min/max here are fixed, not relative
-		 */
-		if (IN_RANGE(fed->time, (v2d->cur.xmin - fac), (v2d->cur.xmax + fac))) {
-			glVertex2f(fed->time, fed->min);
-			glVertex2f(fed->time, fed->max);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		/* for now, point color is fixed, and is white */
+		immUniformColor3f(1.0f, 1.0f, 1.0f);
+
+		immBeginAtMost(GWN_PRIM_POINTS, env->totvert * 2);
+
+		for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
+			/* only draw if visible
+			 *	- min/max here are fixed, not relative
+			 */
+			if (IN_RANGE(fed->time, (v2d->cur.xmin - fac), (v2d->cur.xmax + fac))) {
+				immVertex2f(shdr_pos, fed->time, fed->min);
+				immVertex2f(shdr_pos, fed->time, fed->max);
+			}
 		}
+
+		immEnd();
+
+		immUnbindProgram();
 	}
-	glEnd();
 }
 
 /* *************************** */
@@ -121,16 +144,37 @@ static void draw_fcurve_modifier_controls_envelope(FModifier *fcm, View2D *v2d)
 
 /* Points ---------------- */
 
-/* helper func - draw keyframe vertices only for an F-Curve */
-static void draw_fcurve_vertices_keyframes(FCurve *fcu, SpaceIpo *UNUSED(sipo), View2D *v2d, short edit, short sel)
+/* helper func - set color to draw F-Curve data with */
+static void set_fcurve_vertex_color(FCurve *fcu, bool sel)
+{
+	/* Fade the 'intensity' of the vertices based on the selection of the curves too */
+	int alphaOffset = (int)((fcurve_display_alpha(fcu) - 1.0f) * 255);
+
+	float color[4];
+
+	/* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode) */
+	if ((fcu->flag & FCURVE_PROTECTED) == 0) {
+		/* Curve's points ARE BEING edited */
+		UI_GetThemeColorShadeAlpha4fv(sel ? TH_VERTEX_SELECT : TH_VERTEX, 0, alphaOffset, color);
+	}
+	else {
+		/* Curve's points CANNOT BE edited */
+		UI_GetThemeColorShadeAlpha4fv(sel ? TH_TEXT_HI : TH_TEXT, 0, alphaOffset, color);
+	}
+
+	immUniformColor4fv(color);
+}
+
+static void draw_fcurve_selected_keyframe_vertices(FCurve *fcu, View2D *v2d, bool edit, bool sel, unsigned pos)
 {
-	BezTriple *bezt = fcu->bezt;
 	const float fac = 0.05f * BLI_rctf_size_x(&v2d->cur);
-	int i;
 
-	glBegin(GL_POINTS);
+	set_fcurve_vertex_color(fcu, sel);
+
+	immBeginAtMost(GWN_PRIM_POINTS, fcu->totvert);
 
-	for (i = 0; i < fcu->totvert; i++, bezt++) {
+	BezTriple *bezt = fcu->bezt;
+	for (int i = 0; i < fcu->totvert; i++, bezt++) {
 		/* as an optimization step, only draw those in view
 		 *	- we apply a correction factor to ensure that points don't pop in/out due to slight twitches of view size
 		 */
@@ -141,79 +185,49 @@ static void draw_fcurve_vertices_keyframes(FCurve *fcu, SpaceIpo *UNUSED(sipo),
 				 *	-
 				 */
 				if ((bezt->f2 & SELECT) == sel)
-					glVertex3fv(bezt->vec[1]);
+					immVertex2fv(pos, bezt->vec[1]);
 			}
 			else {
 				/* no check for selection here, as curve is not editable... */
 				/* XXX perhaps we don't want to even draw points?   maybe add an option for that later */
-				glVertex3fv(bezt->vec[1]);
+				immVertex2fv(pos, bezt->vec[1]);
 			}
 		}
 	}
 
-	glEnd();
+	immEnd();
 }
 
-
-/* helper func - draw handle vertex for an F-Curve as a round unfilled circle
- * NOTE: the caller MUST HAVE GL_LINE_SMOOTH & GL_BLEND ENABLED, otherwise, the controls don't
- * have a consistent appearance (due to off-pixel alignments)...
- */
-static void draw_fcurve_handle_control(float x, float y, float xscale, float yscale, float hsize)
+/* helper func - draw keyframe vertices only for an F-Curve */
+static void draw_fcurve_keyframe_vertices(FCurve *fcu, View2D *v2d, bool edit, unsigned pos)
 {
-	static GLuint displist = 0;
-
-	/* initialize round circle shape */
-	if (displist == 0) {
-		GLUquadricObj *qobj;
+	immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
 
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
+	immUniform1f("size", UI_GetThemeValuef(TH_VERTEX_SIZE) * U.pixelsize);
 
-		qobj    = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-		gluDisk(qobj, 0,  0.7, 8, 1);
-		gluDeleteQuadric(qobj);
+	draw_fcurve_selected_keyframe_vertices(fcu, v2d, edit, false, pos);
+	draw_fcurve_selected_keyframe_vertices(fcu, v2d, edit, true, pos);
 
-		glEndList();
-	}
-
-	/* adjust view transform before starting */
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * hsize, 1.0f / yscale * hsize, 1.0f);
-
-	/* draw! */
-	glCallList(displist);
-
-	/* restore view transform */
-	glScalef(xscale / hsize, yscale / hsize, 1.0);
-	glTranslatef(-x, -y, 0.0f);
+	immUnbindProgram();
 }
 
+
 /* helper func - draw handle vertices only for an F-Curve (if it is not protected) */
-static void draw_fcurve_vertices_handles(FCurve *fcu, SpaceIpo *sipo, View2D *v2d, short sel, short sel_handle_only, float units_scale)
+static void draw_fcurve_selected_handle_vertices(FCurve *fcu, View2D *v2d, bool sel, bool sel_handle_only, unsigned pos)
 {
-	BezTriple *bezt = fcu->bezt;
-	BezTriple *prevbezt = NULL;
-	float hsize, xscale, yscale;
-	int i;
-
-	/* get view settings */
-	hsize = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE) * U.pixelsize;
-	UI_view2d_scale_get(v2d, &xscale, &yscale);
-
-	/* Compensate OGL scale sued for unit mapping, so circle will be circle, not ellipse */
-	yscale *= units_scale;
+	(void) v2d; /* TODO: use this to draw only points in view */
 
 	/* set handle color */
-	if (sel) UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
-	else UI_ThemeColor(TH_HANDLE_VERTEX);
+	float hcolor[3];
+	UI_GetThemeColor3fv(sel ? TH_HANDLE_VERTEX_SELECT : TH_HANDLE_VERTEX, hcolor);
+	immUniform4f("outlineColor", hcolor[0], hcolor[1], hcolor[2], 1.0f);
+	immUniformColor3fvAlpha(hcolor, 0.01f); /* almost invisible - only keep for smoothness */
 
-	/* anti-aliased lines for more consistent appearance */
-	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glEnable(GL_LINE_SMOOTH);
-	glEnable(GL_BLEND);
+	immBeginAtMost(GWN_PRIM_POINTS, fcu->totvert * 2);
 
-	for (i = 0; i < fcu->totvert; i++, prevbezt = bezt, bezt++) {
+	BezTriple *bezt = fcu->bezt;
+	BezTriple *prevbezt = NULL;
+	for (int i = 0; i < fcu->totvert; i++, prevbezt = bezt, bezt++) {
 		/* Draw the editmode handles for a bezier curve (others don't have handles)
 		 * if their selection status matches the selection status we're drawing for
 		 *	- first handle only if previous beztriple was bezier-mode
@@ -225,68 +239,61 @@ static void draw_fcurve_vertices_handles(FCurve *fcu, SpaceIpo *sipo, View2D *v2
 		if (!sel_handle_only || BEZT_ISSEL_ANY(bezt)) {
 			if ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
 				if ((bezt->f1 & SELECT) == sel) /* && v2d->cur.xmin < bezt->vec[0][0] < v2d->cur.xmax)*/
-					draw_fcurve_handle_control(bezt->vec[0][0], bezt->vec[0][1], xscale, yscale, hsize);
+					immVertex2fv(pos, bezt->vec[0]);
 			}
 
 			if (bezt->ipo == BEZT_IPO_BEZ) {
 				if ((bezt->f3 & SELECT) == sel) /* && v2d->cur.xmin < bezt->vec[2][0] < v2d->cur.xmax)*/
-					draw_fcurve_handle_control(bezt->vec[2][0], bezt->vec[2][1], xscale, yscale, hsize);
+					immVertex2fv(pos, bezt->vec[2]);
 			}
 		}
 	}
 
-	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_BLEND);
+	immEnd();
 }
 
-/* helper func - set color to draw F-Curve data with */
-static void set_fcurve_vertex_color(FCurve *fcu, short sel)
+/* helper func - draw handle vertices only for an F-Curve (if it is not protected) */
+static void draw_fcurve_handle_vertices(FCurve *fcu, View2D *v2d, bool sel_handle_only, unsigned pos)
 {
-	/* Fade the 'intensity' of the vertices based on the selection of the curves too */
-	int alphaOffset = (int)((fcurve_display_alpha(fcu) - 1.0f) * 255);
+	/* smooth outlines for more consistent appearance */
+	immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA);
 
-	/* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode) */
-	if ((fcu->flag & FCURVE_PROTECTED) == 0) {
-		/* Curve's points ARE BEING edited */
-		if (sel) UI_ThemeColorShadeAlpha(TH_VERTEX_SELECT, 0, alphaOffset);
-		else UI_ThemeColorShadeAlpha(TH_VERTEX, 0, alphaOffset);
-	}
-	else {
-		/* Curve's points CANNOT BE edited */
-		if (sel) UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, alphaOffset);
-		else UI_ThemeColorShadeAlpha(TH_TEXT, 0, alphaOffset);
-	}
+	/* set handle size */
+	immUniform1f("size", (1.4f * UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE)) * U.pixelsize);
+	immUniform1f("outlineWidth", 1.5f * U.pixelsize);
+
+	draw_fcurve_selected_handle_vertices(fcu, v2d, false, sel_handle_only, pos);
+	draw_fcurve_selected_handle_vertices(fcu, v2d, true, sel_handle_only, pos);
+
+	immUnbindProgram();
 }
 
 
-static void draw_fcurve_vertices(SpaceIpo *sipo, ARegion *ar, FCurve *fcu, short do_handles, short sel_handle_only, float units_scale)
+static void draw_fcurve_vertices(ARegion *ar, FCurve *fcu, bool do_handles, bool sel_handle_only)
 {
 	View2D *v2d = &ar->v2d;
 
 	/* only draw points if curve is visible
-	 *  - draw unselected points before selected points as separate passes to minimize color-changing overhead
-	 *	   (XXX dunno if this is faster than drawing all in one pass though)
-	 *     and also to make sure in the case of overlapping points that the selected is always visible
+	 *  - draw unselected points before selected points as separate passes
+	 *     to make sure in the case of overlapping points that the selected is always visible
 	 *	- draw handles before keyframes, so that keyframes will overlap handles (keyframes are more important for users)
 	 */
 
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	glEnable(GL_BLEND);
+	GPU_enable_program_point_size();
 
 	/* draw the two handles first (if they're shown, the curve doesn't have just a single keyframe, and the curve is being edited) */
 	if (do_handles) {
-		set_fcurve_vertex_color(fcu, 0);
-		draw_fcurve_vertices_handles(fcu, sipo, v2d, 0, sel_handle_only, units_scale);
-
-		set_fcurve_vertex_color(fcu, 1);
-		draw_fcurve_vertices_handles(fcu, sipo, v2d, 1, sel_handle_only, units_scale);
+		draw_fcurve_handle_vertices(fcu, v2d, sel_handle_only, pos);
 	}
 
 	/* draw keyframes over the handles */
-	set_fcurve_vertex_color(fcu, 0);
-	draw_fcurve_vertices_keyframes(fcu, sipo, v2d, !(fcu->flag & FCURVE_PROTECTED), 0);
+	draw_fcurve_keyframe_vertices(fcu, v2d, !(fcu->flag & FCURVE_PROTECTED), pos);
 
-	set_fcurve_vertex_color(fcu, 1);
-	draw_fcurve_vertices_keyframes(fcu, sipo, v2d, !(fcu->flag & FCURVE_PROTECTED), 1);
+	GPU_disable_program_point_size();
+	glDisable(GL_BLEND);
 }
 
 /* Handles ---------------- */
@@ -303,10 +310,10 @@ static bool draw_fcurve_handles_check(SpaceIpo *sipo, FCurve *fcu)
 	        (fcu->totvert <= 1) /* do not show handles if there is only 1 keyframe, otherwise they all clump together in an ugly ball */
 	        )
 	{
-		return 0;
+		return false;
 	}
 	else {
-		return 1;
+		return true;
 	}
 }
 
@@ -316,11 +323,12 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 {
 	int sel, b;
 
-	/* a single call to GL_LINES here around these calls should be sufficient to still
-	 * get separate line segments, but which aren't wrapped with GL_LINE_STRIP every time we
-	 * want a single line
-	 */
-	glBegin(GL_LINES);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+	immBeginAtMost(GWN_PRIM_LINES, 4 * 2 * fcu->totvert);
 
 	/* slightly hacky, but we want to draw unselected points before selected ones
 	 * so that selected points are clearly visible
@@ -348,18 +356,20 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 				if ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
 					UI_GetThemeColor3ubv(basecol + bezt->h1, col);
 					col[3] = fcurve_display_alpha(fcu) * 255;
-					glColor4ubv((GLubyte *)col);
-
-					glVertex2fv(fp); glVertex2fv(fp + 3);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp + 3);
 				}
 
 				/* only draw second handle if this segment is bezier */
 				if (bezt->ipo == BEZT_IPO_BEZ) {
 					UI_GetThemeColor3ubv(basecol + bezt->h2, col);
 					col[3] = fcurve_display_alpha(fcu) * 255;
-					glColor4ubv((GLubyte *)col);
-
-					glVertex2fv(fp + 3); glVertex2fv(fp + 6);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp + 3);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp + 6);
 				}
 			}
 			else {
@@ -370,9 +380,10 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 					fp = bezt->vec[0];
 					UI_GetThemeColor3ubv(basecol + bezt->h1, col);
 					col[3] = fcurve_display_alpha(fcu) * 255;
-					glColor4ubv((GLubyte *)col);
-
-					glVertex2fv(fp); glVertex2fv(fp + 3);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp + 3);
 				}
 
 				/* only draw second handle if this segment is bezier, and selection is ok */
@@ -382,15 +393,17 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 					fp = bezt->vec[1];
 					UI_GetThemeColor3ubv(basecol + bezt->h2, col);
 					col[3] = fcurve_display_alpha(fcu) * 255;
-					glColor4ubv((GLubyte *)col);
-
-					glVertex2fv(fp); glVertex2fv(fp + 3);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp);
+					immAttrib4ubv(color, col);
+					immVertex2fv(pos, fp + 3);
 				}
 			}
 		}
 	}
 
-	glEnd();  /* GL_LINES */
+	immEnd();
+	immUnbindProgram();
 }
 
 /* Samples ---------------- */
@@ -399,36 +412,24 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
  * NOTE: the caller MUST HAVE GL_LINE_SMOOTH & GL_BLEND ENABLED, otherwise, the controls don't
  * have a consistent appearance (due to off-pixel alignments)...
  */
-static void draw_fcurve_sample_control(float x, float y, float xscale, float yscale, float hsize)
+static void draw_fcurve_sample_control(float x, float y, float xscale, float yscale, float hsize, unsigned int pos)
 {
-	static GLuint displist = 0;
-
-	/* initialize X shape */
-	if (displist == 0) {
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		glBegin(GL_LINES);
-		glVertex2f(-0.7f, -0.7f);
-		glVertex2f(+0.7f, +0.7f);
-
-		glVertex2f(-0.7f, +0.7f);
-		glVertex2f(+0.7f, -0.7f);
-		glEnd();  /* GL_LINES */
-
-		glEndList();
-	}
-
 	/* adjust view transform before starting */
-	glTranslatef(x, y, 0.0f);
-	glScalef(1.0f / xscale * hsize, 1.0f / yscale * hsize, 1.0f);
+	gpuPushMatrix();
+	gpuTranslate2f(x, y);
+	gpuScale2f(1.0f / xscale * hsize, 1.0f / yscale * hsize);
 
-	/* draw! */
-	glCallList(displist);
+	/* draw X shape */
+	immBegin(GWN_PRIM_LINES, 4);
+	immVertex2f(pos, -0.7f, -0.7f);
+	immVertex2f(pos, +0.7f, +0.7f);
+
+	immVertex2f(pos, -0.7f, +0.7f);
+	immVertex2f(pos, +0.7f, -0.7f);
+	immEnd();
 
 	/* restore view transform */
-	glScalef(xscale / hsize, yscale / hsize, 1.0);
-	glTranslatef(-x, -y, 0.0f);
+	gpuPopMatrix();
 }
 
 /* helper func - draw keyframe vertices only for an F-Curve */
@@ -441,10 +442,6 @@ static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
 	hsize = UI_GetThemeValuef(TH_VERTEX_SIZE);
 	UI_view2d_scale_get(&ar->v2d, &xscale, &yscale);
 
-	/* set vertex color */
-	if (fcu->flag & (FCURVE_ACTIVE | FCURVE_SELECTED)) UI_ThemeColor(TH_TEXT_HI);
-	else UI_ThemeColor(TH_TEXT);
-
 	/* get verts */
 	first = fcu->fpt;
 	last = (first) ? (first + (fcu->totvert - 1)) : (NULL);
@@ -455,8 +452,15 @@ static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
 		if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
 
-		draw_fcurve_sample_control(first->vec[0], first->vec[1], xscale, yscale, hsize);
-		draw_fcurve_sample_control(last->vec[0], last->vec[1], xscale, yscale, hsize);
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformThemeColor((fcu->flag & FCURVE_SELECTED) ? TH_TEXT_HI : TH_TEXT);
+
+		draw_fcurve_sample_control(first->vec[0], first->vec[1], xscale, yscale, hsize, pos);
+		draw_fcurve_sample_control(last->vec[0], last->vec[1], xscale, yscale, hsize, pos);
+
+		immUnbindProgram();
 
 		glDisable(GL_BLEND);
 		if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glDisable(GL_LINE_SMOOTH);
@@ -466,7 +470,7 @@ static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
 /* Curve ---------------- */
 
 /* helper func - just draw the F-Curve by sampling the visible region (for drawing curves with modifiers) */
-static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d, View2DGrid *grid)
+static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d, View2DGrid *grid, unsigned int pos)
 {
 	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
 	ChannelDriver *driver;
@@ -536,37 +540,50 @@ static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d
 	 *	- apply the unit correction factor to the calculated values so that
 	 *	  the displayed values appear correctly in the viewport
 	 */
-	glBegin(GL_LINE_STRIP);
 
 	n = (etime - stime) / samplefreq + 0.5f;
-	for (i = 0; i <= n; i++) {
-		float ctime = stime + i * samplefreq;
-		glVertex2f(ctime, (evaluate_fcurve(fcu, ctime) + offset) * unitFac);
-	}
 
-	glEnd();
+	if (n > 0) {
+		immBegin(GWN_PRIM_LINE_STRIP, (n + 1));
+
+		for (i = 0; i <= n; i++) {
+			float ctime = stime + i * samplefreq;
+			immVertex2f(pos, ctime, (evaluate_fcurve(fcu, ctime) + offset) * unitFac);
+		}
+
+		immEnd();
+	}
 
 	/* restore driver */
 	fcu->driver = driver;
 }
 
 /* helper func - draw a samples-based F-Curve */
-static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d)
+static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d, const uint shdr_pos)
 {
 	FPoint *prevfpt = fcu->fpt;
 	FPoint *fpt = prevfpt + 1;
 	float fac, v[2];
-	int b = fcu->totvert - 1;
+	int b = fcu->totvert;
 	float unit_scale, offset;
 	short mapping_flag = ANIM_get_normalization_flags(ac);
+	int count = fcu->totvert;
+
+	if (prevfpt->vec[0] > v2d->cur.xmin) {
+		count++;
+	}
+
+	if ((prevfpt + b - 1)->vec[0] < v2d->cur.xmax) {
+		count++;
+	}
 
 	/* apply unit mapping */
-	glPushMatrix();
+	gpuPushMatrix();
 	unit_scale = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
-	glScalef(1.0f, unit_scale, 1.0f);
-	glTranslatef(0.0f, offset, 0.0f);
+	gpuScale2f(1.0f, unit_scale);
+	gpuTranslate2f(0.0f, offset);
 
-	glBegin(GL_LINE_STRIP);
+	immBegin(GWN_PRIM_LINE_STRIP, count);
 
 	/* extrapolate to left? - left-side of view comes before first keyframe? */
 	if (prevfpt->vec[0] > v2d->cur.xmin) {
@@ -584,26 +601,19 @@ static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, Vie
 			v[1] = prevfpt->vec[1] - fac * (prevfpt->vec[1] - fpt->vec[1]);
 		}
 
-		glVertex2fv(v);
+		immVertex2fv(shdr_pos, v);
 	}
 
-	/* if only one sample, add it now */
-	if (fcu->totvert == 1)
-		glVertex2fv(prevfpt->vec);
-
 	/* loop over samples, drawing segments */
 	/* draw curve between first and last keyframe (if there are enough to do so) */
 	while (b--) {
 		/* Linear interpolation: just add one point (which should add a new line segment) */
-		glVertex2fv(prevfpt->vec);
+		immVertex2fv(shdr_pos, prevfpt->vec);
 
 		/* get next pointers */
-		prevfpt = fpt;
-		fpt++;
-
-		/* last point? */
-		if (b == 0)
-			glVertex2fv(prevfpt->vec);
+		if (b > 0) {
+			prevfpt++;
+		}
 	}
 
 	/* extrapolate to right? (see code for left-extrapolation above too) */
@@ -623,11 +633,12 @@ static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, Vie
 			v[1] = prevfpt->vec[1] - fac * (prevfpt->vec[1] - fpt->vec[1]);
 		}
 
-		glVertex2fv(v);
+		immVertex2fv(shdr_pos, v);
 	}
 
-	glEnd();
-	glPopMatrix();
+	immEnd();
+
+	gpuPopMatrix();
 }
 
 /* helper func - check if the F-Curve only contains easily drawable segments
@@ -648,7 +659,7 @@ static bool fcurve_can_use_simple_bezt_drawing(FCurve *fcu)
 }
 
 /* helper func - draw one repeat of an F-Curve (using Bezier curve approximations) */
-static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d)
+static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d, unsigned int pos)
 {
 	BezTriple *prevbezt = fcu->bezt;
 	BezTriple *bezt = prevbezt + 1;
@@ -661,12 +672,15 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 	short mapping_flag = ANIM_get_normalization_flags(ac);
 
 	/* apply unit mapping */
-	glPushMatrix();
+	gpuPushMatrix();
 	unit_scale = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
-	glScalef(1.0f, unit_scale, 1.0f);
-	glTranslatef(0.0f, offset, 0.0f);
+	gpuScale2f(1.0f, unit_scale);
+	gpuTranslate2f(0.0f, offset);
 
-	glBegin(GL_LINE_STRIP);
+	/* For now, this assumes the worst case scenario, where all the keyframes have
+	 * bezier interpolation, and are drawn at full res.
+	 * This is tricky to optimize, but maybe can be improved at some point... */
+	immBeginAtMost(GWN_PRIM_LINE_STRIP, (b * 32 + 3));
 
 	/* extrapolate to left? */
 	if (prevbezt->vec[1][0] > v2d->cur.xmin) {
@@ -691,14 +705,14 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			v1[1] = prevbezt->vec[1][1] - fac * (prevbezt->vec[0][1] - prevbezt->vec[1][1]);
 		}
 
-		glVertex2fv(v1);
+		immVertex2fv(pos, v1);
 	}
 
 	/* if only one keyframe, add it now */
 	if (fcu->totvert == 1) {
 		v1[0] = prevbezt->vec[1][0];
 		v1[1] = prevbezt->vec[1][1];
-		glVertex2fv(v1);
+		immVertex2fv(pos, v1);
 	}
 
 	/* draw curve between first and last keyframe (if there are enough to do so) */
@@ -708,17 +722,17 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			/* Constant-Interpolation: draw segment between previous keyframe and next, but holding same value */
 			v1[0] = prevbezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
-			glVertex2fv(v1);
+			immVertex2fv(pos, v1);
 
 			v1[0] = bezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
-			glVertex2fv(v1);
+			immVertex2fv(pos, v1);
 		}
 		else if (prevbezt->ipo == BEZT_IPO_LIN) {
 			/* Linear interpolation: just add one point (which should add a new line segment) */
 			v1[0] = prevbezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
-			glVertex2fv(v1);
+			immVertex2fv(pos, v1);
 		}
 		else if (prevbezt->ipo == BEZT_IPO_BEZ) {
 			/* Bezier-Interpolation: draw curve as series of segments between keyframes
@@ -738,7 +752,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 				/* only draw one */
 				v1[0] = prevbezt->vec[1][0];
 				v1[1] = prevbezt->vec[1][1];
-				glVertex2fv(v1);
+				immVertex2fv(pos, v1);
 			}
 			else {
 				/* clamp resolution to max of 32 */
@@ -760,8 +774,9 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 				BKE_curve_forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, sizeof(float) * 3);
 				BKE_curve_forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data + 1, resol, sizeof(float) * 3);
 
-				for (fp = data; resol; resol--, fp += 3)
-					glVertex2fv(fp);
+				for (fp = data; resol; resol--, fp += 3) {
+					immVertex2fv(pos, fp);
+				}
 			}
 		}
 
@@ -773,7 +788,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 		if (b == 0) {
 			v1[0] = prevbezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
-			glVertex2fv(v1);
+			immVertex2fv(pos, v1);
 		}
 	}
 
@@ -800,11 +815,12 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			v1[1] = prevbezt->vec[1][1] - fac * (prevbezt->vec[2][1] - prevbezt->vec[1][1]);
 		}
 
-		glVertex2fv(v1);
+		immVertex2fv(pos, v1);
 	}
 
-	glEnd();
-	glPopMatrix();
+	immEnd();
+
+	gpuPopMatrix();
 }
 
 /* Debugging -------------------------------- */
@@ -826,6 +842,15 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 	//if ((driver->flag & DRIVER_FLAG_SHOWDEBUG) == 0)
 	//	return;
 
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* Simple dashes. */
+
 	/* No curve to modify/visualize the result?
 	 * => We still want to show the 1-1 default...
 	 */
@@ -833,26 +858,24 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 		float t;
 
 		/* draw with thin dotted lines in style of what curve would have been */
-		glColor3fv(fcu->color);
+		immUniformColor3fv(fcu->color);
 
-		setlinestyle(20);
+		immUniform1f("dash_width", 40.0f);
+		immUniform1f("dash_factor", 0.5f);
 		glLineWidth(2.0f);
 
 		/* draw 1-1 line, stretching just past the screen limits
 		 * NOTE: we need to scale the y-values to be valid for the units
 		 */
-		glBegin(GL_LINES);
-		{
-			t = v2d->cur.xmin;
-			glVertex2f(t, (t + offset) * unitfac);
+		immBegin(GWN_PRIM_LINES, 2);
 
-			t = v2d->cur.xmax;
-			glVertex2f(t, (t + offset) * unitfac);
-		}
-		glEnd();
+		t = v2d->cur.xmin;
+		immVertex2f(shdr_pos, t, (t + offset) * unitfac);
 
-		/* cleanup line drawing */
-		setlinestyle(0);
+		t = v2d->cur.xmax;
+		immVertex2f(shdr_pos, t, (t + offset) * unitfac);
+
+		immEnd();
 	}
 
 	/* draw driver only if actually functional */
@@ -866,53 +889,59 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 			float co[2];
 
 			/* draw dotted lines leading towards this point from both axes ....... */
-			glColor3f(0.9f, 0.9f, 0.9f);
-			setlinestyle(5);
+			immUniformColor3f(0.9f, 0.9f, 0.9f);
+			immUniform1f("dash_width", 10.0f);
+			immUniform1f("dash_factor", 0.5f);
 
-			glBegin(GL_LINES);
-			{
-				/* x-axis lookup */
-				co[0] = x;
+			immBegin(GWN_PRIM_LINES, (y >= v2d->cur.ymin) ? 4 : 2);
 
-				if (y >= v2d->cur.ymin) {
-					co[1] = v2d->cur.ymin - 1.0f;
-					glVertex2fv(co);
+			/* x-axis lookup */
+			co[0] = x;
 
-					co[1] = y;
-					glVertex2fv(co);
-				}
+			if (y >= v2d->cur.ymin) {
+				co[1] = v2d->cur.ymin - 1.0f;
+				immVertex2fv(shdr_pos, co);
 
-				/* y-axis lookup */
 				co[1] = y;
+				immVertex2fv(shdr_pos, co);
+			}
 
-				co[0] = v2d->cur.xmin - 1.0f;
-				glVertex2fv(co);
+			/* y-axis lookup */
+			co[1] = y;
 
-				co[0] = x;
-				glVertex2fv(co);
-			}
-			glEnd();
+			co[0] = v2d->cur.xmin - 1.0f;
+			immVertex2fv(shdr_pos, co);
+
+			co[0] = x;
+			immVertex2fv(shdr_pos, co);
+
+			immEnd();
 
-			setlinestyle(0);
+			immUnbindProgram();
+
+			/* GWN_PRIM_POINTS do not survive dashed line geometry shader... */
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 			/* x marks the spot .................................................... */
 			/* -> outer frame */
-			glColor3f(0.9f, 0.9f, 0.9f);
+			immUniformColor3f(0.9f, 0.9f, 0.9f);
 			glPointSize(7.0);
 
-			glBegin(GL_POINTS);
-			glVertex2f(x, y);
-			glEnd();
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex2f(shdr_pos, x, y);
+			immEnd();
 
 			/* inner frame */
-			glColor3f(0.9f, 0.0f, 0.0f);
+			immUniformColor3f(0.9f, 0.0f, 0.0f);
 			glPointSize(3.0);
 
-			glBegin(GL_POINTS);
-			glVertex2f(x, y);
-			glEnd();
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex2f(shdr_pos, x, y);
+			immEnd();
 		}
 	}
+
+	immUnbindProgram();
 }
 
 /* Public Curve-Drawing API  ---------------- */
@@ -925,29 +954,43 @@ void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
 	FCurve *fcu;
 
 	/* draw with thick dotted lines */
-	setlinestyle(10);
 	glLineWidth(3.0f);
 
 	/* anti-aliased lines for less jagged appearance */
-	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glEnable(GL_LINE_SMOOTH);
+	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
+		glEnable(GL_LINE_SMOOTH);
+	}
 	glEnable(GL_BLEND);
 
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* Simple dashes. */
+	immUniform1f("dash_width", 20.0f);
+	immUniform1f("dash_factor", 0.5f);
+
 	/* the ghost curves are simply sampled F-Curves stored in sipo->ghostCurves */
 	for (fcu = sipo->ghostCurves.first; fcu; fcu = fcu->next) {
 		/* set whatever color the curve has set
 		 *  - this is set by the function which creates these
 		 *	- draw with a fixed opacity of 2
 		 */
-		glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], 0.5f);
+		immUniformColor3fvAlpha(fcu->color, 0.5f);
 
 		/* simply draw the stored samples */
-		draw_fcurve_curve_samples(ac, NULL, fcu, &ar->v2d);
+		draw_fcurve_curve_samples(ac, NULL, fcu, &ar->v2d, shdr_pos);
 	}
 
-	/* restore settings */
-	setlinestyle(0);
+	immUnbindProgram();
 
-	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glDisable(GL_LINE_SMOOTH);
+	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
+		glDisable(GL_LINE_SMOOTH);
+	}
 	glDisable(GL_BLEND);
 }
 
@@ -975,8 +1018,9 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
 
 		/* map keyframes for drawing if scaled F-Curve */
-		if (adt)
+		if (adt) {
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0);
+		}
 
 		/* draw curve:
 		 *	- curve line may be result of one or more destructive modifiers or just the raw data,
@@ -986,60 +1030,82 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 		 */
 
 		/* 1) draw curve line */
+		if (((fcu->modifiers.first) || (fcu->flag & FCURVE_INT_VALUES)) ||
+		    (((fcu->bezt) || (fcu->fpt)) && (fcu->totvert)))
 		{
 			/* set color/drawing style for curve itself */
+			/* draw active F-Curve thicker than the rest to make it stand out */
+			if (fcu->flag & FCURVE_ACTIVE) {
+				glLineWidth(2.5);
+			}
+			else {
+				glLineWidth(1.0);
+			}
+
+			/* anti-aliased lines for less jagged appearance */
+			if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
+				glEnable(GL_LINE_SMOOTH);
+			}
+			glEnable(GL_BLEND);
+
+			const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+			immUniform1i("num_colors", 0);  /* Simple dashes. */
+
 			if (BKE_fcurve_is_protected(fcu)) {
 				/* protected curves (non editable) are drawn with dotted lines */
-				setlinestyle(2);
+				immUniform1f("dash_width", 4.0f);
+				immUniform1f("dash_factor", 0.5f);
+			}
+			else {
+				immUniform1f("dash_factor", 2.0f);  /* solid line */
 			}
+
 			if (((fcu->grp) && (fcu->grp->flag & AGRP_MUTED)) || (fcu->flag & FCURVE_MUTED)) {
 				/* muted curves are drawn in a grayish hue */
 				/* XXX should we have some variations? */
-				UI_ThemeColorShade(TH_HEADER, 50);
+				immUniformThemeColorShade(TH_HEADER, 50);
 			}
 			else {
 				/* set whatever color the curve has set
 				 *	- unselected curves draw less opaque to help distinguish the selected ones
 				 */
-				glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], fcurve_display_alpha(fcu));
-			}
-
-			/* draw active F-Curve thicker than the rest to make it stand out */
-			if (fcu->flag & FCURVE_ACTIVE) {
-				glLineWidth(2.0);
+				immUniformColor3fvAlpha(fcu->color, fcurve_display_alpha(fcu));
 			}
-			else {
-				glLineWidth(1.0);
-			}
-
-			/* anti-aliased lines for less jagged appearance */
-			if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glEnable(GL_LINE_SMOOTH);
-			glEnable(GL_BLEND);
 
 			/* draw F-Curve */
 			if ((fcu->modifiers.first) || (fcu->flag & FCURVE_INT_VALUES)) {
 				/* draw a curve affected by modifiers or only allowed to have integer values
 				 * by sampling it at various small-intervals over the visible region
 				 */
-				draw_fcurve_curve(ac, ale->id, fcu, &ar->v2d, grid);
+				draw_fcurve_curve(ac, ale->id, fcu, &ar->v2d, grid, shdr_pos);
 			}
 			else if (((fcu->bezt) || (fcu->fpt)) && (fcu->totvert)) {
 				/* just draw curve based on defined data (i.e. no modifiers) */
 				if (fcu->bezt) {
-					if (fcurve_can_use_simple_bezt_drawing(fcu))
-						draw_fcurve_curve_bezts(ac, ale->id, fcu, &ar->v2d);
-					else
-						draw_fcurve_curve(ac, ale->id, fcu, &ar->v2d, grid);
+					if (fcurve_can_use_simple_bezt_drawing(fcu)) {
+						draw_fcurve_curve_bezts(ac, ale->id, fcu, &ar->v2d, shdr_pos);
+					}
+					else {
+						draw_fcurve_curve(ac, ale->id, fcu, &ar->v2d, grid, shdr_pos);
+					}
 				}
 				else if (fcu->fpt) {
-					draw_fcurve_curve_samples(ac, ale->id, fcu, &ar->v2d);
+					draw_fcurve_curve_samples(ac, ale->id, fcu, &ar->v2d, shdr_pos);
 				}
 			}
 
-			/* restore settings */
-			setlinestyle(0);
+			immUnbindProgram();
 
-			if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) glDisable(GL_LINE_SMOOTH);
+			if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
+				glDisable(GL_LINE_SMOOTH);
+			}
 			glDisable(GL_BLEND);
 		}
 
@@ -1047,7 +1113,7 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 		 *	- if the option to only show controls if the F-Curve is selected is enabled, we must obey this
 		 */
 		if (!(sipo->flag & SIPO_SELCUVERTSONLY) || (fcu->flag & FCURVE_SELECTED)) {
-			if (fcurve_are_keyframes_usable(fcu) == 0) {
+			if (!fcurve_are_keyframes_usable(fcu) && !(fcu->fpt && fcu->totvert)) {
 				/* only draw controls if this is the active modifier */
 				if ((fcu->flag & FCURVE_ACTIVE) && (fcm)) {
 					switch (fcm->type) {
@@ -1063,9 +1129,9 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 				float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, fcu, mapping_flag, &offset);
 
 				/* apply unit-scaling to all values via OpenGL */
-				glPushMatrix();
-				glScalef(1.0f, unit_scale, 1.0f);
-				glTranslatef(0.0f, offset, 0.0f);
+				gpuPushMatrix();
+				gpuScale2f(1.0f, unit_scale);
+				gpuTranslate2f(0.0f, offset);
 
 				/* set this once and for all - all handles and handle-verts should use the same thickness */
 				glLineWidth(1.0);
@@ -1080,14 +1146,14 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 						glDisable(GL_BLEND);
 					}
 
-					draw_fcurve_vertices(sipo, ar, fcu, do_handles, (sipo->flag & SIPO_SELVHANDLESONLY), unit_scale);
+					draw_fcurve_vertices(ar, fcu, do_handles, (sipo->flag & SIPO_SELVHANDLESONLY));
 				}
 				else {
 					/* samples: only draw two indicators at either end as indicators */
 					draw_fcurve_samples(sipo, ar, fcu);
 				}
 
-				glPopMatrix();
+				gpuPopMatrix();
 			}
 		}
 
@@ -1163,7 +1229,7 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
 		y = (float)ACHANNEL_FIRST(ac);
 
 		/* set blending again, as may not be set in previous step */
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
 
 		for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 0370a9149bf..ef4bb917700 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -36,7 +36,7 @@
 #include <float.h>
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SPECIAL_H
+#  include <AUD_Special.h>
 #endif
 
 #include "MEM_guardedalloc.h"
@@ -54,13 +54,14 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "UI_view2d.h"
 
 #include "ED_anim_api.h"
@@ -525,6 +526,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
 
 	ReportList *reports = ac->reports;
 	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	struct Depsgraph *depsgraph = ac->depsgraph;
 	Scene *scene = ac->scene;
 	ToolSettings *ts = scene->toolsettings;
 	short flag = 0;
@@ -607,7 +609,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
 			 *                        up adding the keyframes on a new F-Curve in the action data instead.
 			 */
 			if (ale->id && !ale->owner && !fcu->driver) {
-				insert_keyframe(reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
+				insert_keyframe(depsgraph, reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
 			}
 			else {
 				const float curval = evaluate_fcurve(fcu, cfra);
@@ -2714,7 +2716,7 @@ static int graph_driver_vars_paste_exec(bContext *C, wmOperator *op)
 	/* successful or not? */
 	if (ok) {
 		/* rebuild depsgraph, now that there are extra deps here */
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 
 		/* set notifier that keyframes have changed */
 		WM_event_add_notifier(C, NC_SCENE | ND_FRAME, CTX_data_scene(C));
@@ -2788,7 +2790,7 @@ static int graph_driver_delete_invalid_exec(bContext *C, wmOperator *op)
 
 	if (deleted > 0) {
 		/* notify the world of any changes */
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 		WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_REMOVED, NULL);
 		WM_reportf(RPT_INFO, "Deleted %u drivers", deleted);
 	}
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 383c2b5b220..56236ea8f47 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -53,10 +53,13 @@
 #include "ED_anim_api.h"
 #include "ED_markers.h"
 
-#include "BIF_gl.h"
+#include "GPU_immediate.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+
+#include "RNA_access.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -92,9 +95,8 @@ ARegion *graph_has_buttons_region(ScrArea *sa)
 
 /* ******************** default callbacks for ipo space ***************** */
 
-static SpaceLink *graph_new(const bContext *C)
+static SpaceLink *graph_new(const ScrArea *UNUSED(sa), const Scene *scene)
 {
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar;
 	SpaceIpo *sipo;
 
@@ -117,7 +119,7 @@ static SpaceLink *graph_new(const bContext *C)
 
 	BLI_addtail(&sipo->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* channels */
 	ar = MEM_callocN(sizeof(ARegion), "channels region for graphedit");
@@ -226,12 +228,13 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
 	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	Scene *scene = CTX_data_scene(C);
 	bAnimContext ac;
 	View2D *v2d = &ar->v2d;
 	View2DGrid *grid;
 	View2DScrollers *scrollers;
 	float col[3];
-	short unitx = 0, unity = V2D_UNIT_VALUES, flag = 0;
+	short unitx = 0, unity = V2D_UNIT_VALUES, cfra_flag = 0;
 
 	/* clear and setup matrix */
 	UI_GetThemeColor3fv(TH_BACK, col);
@@ -247,6 +250,11 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar)
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
+	/* start and end frame (in F-Curve mode only) */
+	if (sipo->mode != SIPO_MODE_DRIVERS) {
+		ANIM_draw_framerange(scene, v2d);
+	}
+
 	/* draw data */
 	if (ANIM_animdata_get_context(C, &ac)) {
 		/* draw ghost curves */
@@ -266,46 +274,53 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar)
 	/* only free grid after drawing data, as we need to use it to determine sampling rate */
 	UI_view2d_grid_free(grid);
 
-	/* horizontal component of value-cursor (value line before the current frame line) */
-	if ((sipo->flag & SIPO_NODRAWCURSOR) == 0) {
+	if (((sipo->flag & SIPO_NODRAWCURSOR) == 0) || (sipo->mode == SIPO_MODE_DRIVERS)) {
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-		float y = sipo->cursorVal;
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		/* Draw a green line to indicate the cursor value */
-		UI_ThemeColorShadeAlpha(TH_CFRAME, -10, -50);
-		glEnable(GL_BLEND);
-		glLineWidth(2.0);
+		/* horizontal component of value-cursor (value line before the current frame line) */
+		if ((sipo->flag & SIPO_NODRAWCURSOR) == 0) {
+			float y = sipo->cursorVal;
 
-		glBegin(GL_LINES);
-		glVertex2f(v2d->cur.xmin, y);
-		glVertex2f(v2d->cur.xmax, y);
-		glEnd();
+			/* Draw a green line to indicate the cursor value */
+			immUniformThemeColorShadeAlpha(TH_CFRAME, -10, -50);
+			glEnable(GL_BLEND);
+			glLineWidth(2.0);
 
-		glDisable(GL_BLEND);
-	}
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, v2d->cur.xmin, y);
+			immVertex2f(pos, v2d->cur.xmax, y);
+			immEnd();
 
-	/* current frame or vertical component of vertical component of the cursor */
-	if (sipo->mode == SIPO_MODE_DRIVERS) {
-		/* cursor x-value */
-		float x = sipo->cursorTime;
+			glDisable(GL_BLEND);
+		}
 
-		/* to help differentiate this from the current frame, draw slightly darker like the horizontal one */
-		UI_ThemeColorShadeAlpha(TH_CFRAME, -40, -50);
-		glEnable(GL_BLEND);
-		glLineWidth(2.0);
+		/* current frame or vertical component of vertical component of the cursor */
+		if (sipo->mode == SIPO_MODE_DRIVERS) {
+			/* cursor x-value */
+			float x = sipo->cursorTime;
 
-		glBegin(GL_LINES);
-		glVertex2f(x, v2d->cur.ymin);
-		glVertex2f(x, v2d->cur.ymax);
-		glEnd();
+			/* to help differentiate this from the current frame, draw slightly darker like the horizontal one */
+			immUniformThemeColorShadeAlpha(TH_CFRAME, -40, -50);
+			glEnable(GL_BLEND);
+			glLineWidth(2.0);
 
-		glDisable(GL_BLEND);
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2f(pos, x, v2d->cur.ymin);
+			immVertex2f(pos, x, v2d->cur.ymax);
+			immEnd();
+
+			glDisable(GL_BLEND);
+		}
+
+		immUnbindProgram();
 	}
-	else {
+
+	if (sipo->mode != SIPO_MODE_DRIVERS) {
 		/* current frame */
-		if (sipo->flag & SIPO_DRAWTIME) flag |= DRAWCFRA_UNIT_SECONDS;
-		if ((sipo->flag & SIPO_NODRAWCFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
-		ANIM_draw_cfra(C, v2d, flag);
+		if (sipo->flag & SIPO_DRAWTIME) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+		ANIM_draw_cfra(C, v2d, cfra_flag);
 	}
 
 	/* markers */
@@ -328,6 +343,12 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* draw current frame number-indicator on top of scrollers */
+	if ((sipo->mode != SIPO_MODE_DRIVERS) && ((sipo->flag & SIPO_NODRAWCFRANUM) == 0)) {
+		UI_view2d_view_orthoSpecial(ar, v2d, 1);
+		ANIM_draw_cfra_number(C, v2d, cfra_flag);
+	}
 }
 
 static void graph_channel_region_init(wmWindowManager *wm, ARegion *ar)
@@ -404,7 +425,9 @@ static void graph_buttons_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void graph_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void graph_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -416,6 +439,7 @@ static void graph_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), AReg
 				case ND_RENDER_OPTIONS:
 				case ND_OB_ACTIVE:
 				case ND_FRAME:
+				case ND_FRAME_RANGE:
 				case ND_MARKERS:
 					ED_region_tag_redraw(ar);
 					break;
@@ -450,6 +474,11 @@ static void graph_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), AReg
 			if (wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
 			break;
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 		default:
 			if (wmn->data == ND_KEYS)
 				ED_region_tag_redraw(ar);
@@ -458,8 +487,85 @@ static void graph_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), AReg
 	}
 }
 
+static void graph_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceGraphEditor, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* Timeline depends on scene properties. */
+	{
+		bool use_preview = (scene->r.flag & SCER_PRV_RANGE);
+		extern PropertyRNA rna_Scene_frame_start;
+		extern PropertyRNA rna_Scene_frame_end;
+		extern PropertyRNA rna_Scene_frame_preview_start;
+		extern PropertyRNA rna_Scene_frame_preview_end;
+		extern PropertyRNA rna_Scene_use_preview_range;
+		extern PropertyRNA rna_Scene_frame_current;
+		const PropertyRNA *props[] = {
+			use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start,
+			use_preview ? &rna_Scene_frame_preview_end   : &rna_Scene_frame_end,
+			&rna_Scene_use_preview_range,
+			&rna_Scene_frame_current,
+		};
+
+		PointerRNA idptr;
+		RNA_id_pointer_create(&scene->id, &idptr);
+
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_region_tag_redraw, __func__);
+		}
+	}
+
+	/* All dopesheet filter settings, etc. affect the drawing of this editor,
+	 * also same applies for all animation-related datatypes that may appear here,
+	 * so just whitelist the entire structs for updates
+	 */
+	{
+		wmMsgParams_RNA msg_key_params = {{{0}}};
+		StructRNA *type_array[] = {
+			&RNA_DopeSheet,   /* dopesheet filters */
+
+			&RNA_ActionGroup, /* channel groups */
+			&RNA_FCurve,      /* F-Curve */
+			&RNA_Keyframe,
+			&RNA_FCurveSample,
+
+			&RNA_FModifier,   /* F-Modifiers (XXX: Why can't we just do all subclasses too?) */
+			&RNA_FModifierCycles,
+			&RNA_FModifierEnvelope,
+			&RNA_FModifierEnvelopeControlPoint,
+			&RNA_FModifierFunctionGenerator,
+			&RNA_FModifierGenerator,
+			&RNA_FModifierLimits,
+			&RNA_FModifierNoise,
+			&RNA_FModifierPython,
+			&RNA_FModifierStepped,
+		};
+
+		for (int i = 0; i < ARRAY_SIZE(type_array); i++) {
+			msg_key_params.ptr.type = type_array[i];
+			WM_msg_subscribe_rna_params(
+			        mbus,
+			        &msg_key_params,
+			        &msg_sub_value_region_tag_redraw,
+			        __func__);
+		}
+	}
+}
+
 /* editor level listener */
-static void graph_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void graph_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                           WorkSpace *UNUSED(workspace))
 {
 	SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
 
@@ -685,7 +791,7 @@ static void graph_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID
 
 	if (sgraph->ads) {
 		if ((ID *)sgraph->ads->filter_grp == old_id) {
-			sgraph->ads->filter_grp = (Group *)new_id;
+			sgraph->ads->filter_grp = (Collection *)new_id;
 		}
 		if ((ID *)sgraph->ads->source == old_id) {
 			sgraph->ads->source = new_id;
@@ -718,6 +824,7 @@ void ED_spacetype_ipo(void)
 	art->init = graph_main_region_init;
 	art->draw = graph_main_region_draw;
 	art->listener = graph_region_listener;
+	art->message_subscribe = graph_region_message_subscribe;
 	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
 
 	BLI_addhead(&st->regiontypes, art);
@@ -739,6 +846,7 @@ void ED_spacetype_ipo(void)
 	art->prefsizex = 200 + V2D_SCROLL_WIDTH; /* 200 is the 'standard', but due to scrollers, we want a bit more to fit the lock icons in */
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES;
 	art->listener = graph_region_listener;
+	art->message_subscribe = graph_region_message_subscribe;
 	art->init = graph_channel_region_init;
 	art->draw = graph_channel_region_draw;
 
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index c60d194b620..0bc09981ba5 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -25,6 +25,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index c358b38520a..1e2d668018f 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -60,9 +60,12 @@
 #include "BKE_image.h"
 #include "BKE_paint.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+
 #include "BLF_api.h"
 
 #include "ED_gpencil.h"
@@ -87,7 +90,6 @@ static void draw_render_info(const bContext *C,
                              float zoomx,
                              float zoomy)
 {
-	RenderResult *rr;
 	Render *re = RE_GetSceneRender(scene);
 	RenderData *rd = RE_engine_get_render_data(re);
 	Scene *stats_scene = ED_render_job_get_scene(C);
@@ -95,7 +97,7 @@ static void draw_render_info(const bContext *C,
 		stats_scene = CTX_data_scene(C);
 	}
 
-	rr = BKE_image_acquire_renderresult(stats_scene, ima);
+	RenderResult *rr = BKE_image_acquire_renderresult(stats_scene, ima);
 
 	if (rr && rr->text) {
 		float fill_color[4] = {0.0f, 0.0f, 0.0f, 0.25f};
@@ -107,39 +109,41 @@ static void draw_render_info(const bContext *C,
 	if (re) {
 		int total_tiles;
 		bool need_free_tiles;
-		rcti *tiles;
-
-		tiles = RE_engine_get_current_tiles(re, &total_tiles, &need_free_tiles);
+		rcti *tiles = RE_engine_get_current_tiles(re, &total_tiles, &need_free_tiles);
 
 		if (total_tiles) {
-			int i, x, y;
-			rcti *tile;
-
 			/* find window pixel coordinates of origin */
+			int x, y;
 			UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-			glPushMatrix();
-			glTranslatef(x, y, 0.0f);
-			glScalef(zoomx, zoomy, 1.0f);
+			gpuPushMatrix();
+			gpuTranslate2f(x, y);
+			gpuScale2f(zoomx, zoomy);
 
 			if (rd->mode & R_BORDER) {
-				glTranslatef((int)(-rd->border.xmin * rd->xsch * rd->size / 100.0f),
-				             (int)(-rd->border.ymin * rd->ysch * rd->size / 100.0f),
-				             0.0f);
+				/* TODO: round or floor instead of casting to int */
+				gpuTranslate2f((int)(-rd->border.xmin * rd->xsch * rd->size * 0.01f),
+				               (int)(-rd->border.ymin * rd->ysch * rd->size * 0.01f));
 			}
 
-			UI_ThemeColor(TH_FACE_SELECT);
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			immUniformThemeColor(TH_FACE_SELECT);
 
 			glLineWidth(1.0f);
-			for (i = 0, tile = tiles; i < total_tiles; i++, tile++) {
-				glaDrawBorderCorners(tile, zoomx, zoomy);
+
+			rcti *tile = tiles;
+			for (int i = 0; i < total_tiles; i++, tile++) {
+				immDrawBorderCorners(pos, tile, zoomx, zoomy);
 			}
 
+			immUnbindProgram();
+
 			if (need_free_tiles) {
 				MEM_freeN(tiles);
 			}
 
-			glPopMatrix();
+			gpuPopMatrix();
 		}
 	}
 }
@@ -166,31 +170,37 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 	float hue = 0, sat = 0, val = 0, lum = 0, u = 0, v = 0;
 	float col[4], finalcol[4];
 
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* noisy, high contrast make impossible to read if lower alpha is used. */
-	glColor4ub(0, 0, 0, 190);
-	glRecti(0.0, 0.0, BLI_rcti_size_x(&ar->winrct) + 1, UI_UNIT_Y);
+	immUniformColor4ub(0, 0, 0, 190);
+	immRecti(pos, 0, 0, BLI_rcti_size_x(&ar->winrct) + 1, UI_UNIT_Y);
+
+	immUnbindProgram();
+
 	glDisable(GL_BLEND);
 
 	BLF_size(blf_mono_font, 11 * U.pixelsize, U.dpi);
 
-	glColor3ub(255, 255, 255);
+	BLF_color3ub(blf_mono_font, 255, 255, 255);
 	BLI_snprintf(str, sizeof(str), "X:%-4d  Y:%-4d |", x, y);
 	BLF_position(blf_mono_font, dx, dy, 0);
 	BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 	dx += BLF_width(blf_mono_font, str, sizeof(str));
 
 	if (zp) {
-		glColor3ub(255, 255, 255);
+		BLF_color3ub(blf_mono_font, 255, 255, 255);
 		BLI_snprintf(str, sizeof(str), " Z:%-.4f |", 0.5f + 0.5f * (((float)*zp) / (float)0x7fffffff));
 		BLF_position(blf_mono_font, dx, dy, 0);
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 		dx += BLF_width(blf_mono_font, str, sizeof(str));
 	}
 	if (zpf) {
-		glColor3ub(255, 255, 255);
+		BLF_color3ub(blf_mono_font, 255, 255, 255);
 		BLI_snprintf(str, sizeof(str), " Z:%-.3f |", *zpf);
 		BLF_position(blf_mono_font, dx, dy, 0);
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
@@ -204,14 +214,14 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		else if (cp != NULL) {
 			BLI_snprintf(str, sizeof(str), " Val:%-.3f |", cp[0] / 255.0f);
 		}
-		glColor3ub(255, 255, 255);
+		BLF_color3ub(blf_mono_font, 255, 255, 255);
 		BLF_position(blf_mono_font, dx, dy, 0);
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 		dx += BLF_width(blf_mono_font, str, sizeof(str));
 	}
 
 	if (channels >= 3) {
-		glColor3ubv(red);
+		BLF_color3ubv(blf_mono_font, red);
 		if (fp)
 			BLI_snprintf(str, sizeof(str), "  R:%-.5f", fp[0]);
 		else if (cp)
@@ -222,7 +232,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 		dx += BLF_width(blf_mono_font, str, sizeof(str));
 
-		glColor3ubv(green);
+		BLF_color3ubv(blf_mono_font, green);
 		if (fp)
 			BLI_snprintf(str, sizeof(str), "  G:%-.5f", fp[1]);
 		else if (cp)
@@ -233,7 +243,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 		dx += BLF_width(blf_mono_font, str, sizeof(str));
 
-		glColor3ubv(blue);
+		BLF_color3ubv(blf_mono_font, blue);
 		if (fp)
 			BLI_snprintf(str, sizeof(str), "  B:%-.5f", fp[2]);
 		else if (cp)
@@ -245,7 +255,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		dx += BLF_width(blf_mono_font, str, sizeof(str));
 
 		if (channels == 4) {
-			glColor3ub(255, 255, 255);
+			BLF_color3ub(blf_mono_font, 255, 255, 255);
 			if (fp)
 				BLI_snprintf(str, sizeof(str), "  A:%-.4f", fp[3]);
 			else if (cp)
@@ -267,9 +277,9 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 				rgba[3] = linearcol[3];
 
 			if (use_default_view)
-				IMB_colormanagement_pixel_to_display_space_v4(rgba, rgba,  NULL, &scene->display_settings);
+				IMB_colormanagement_pixel_to_display_space_v4(rgba, rgba, NULL, &scene->display_settings);
 			else
-				IMB_colormanagement_pixel_to_display_space_v4(rgba, rgba,  &scene->view_settings, &scene->display_settings);
+				IMB_colormanagement_pixel_to_display_space_v4(rgba, rgba, &scene->view_settings, &scene->display_settings);
 
 			BLI_snprintf(str, sizeof(str), "  |  CM  R:%-.4f  G:%-.4f  B:%-.4f", rgba[0], rgba[1], rgba[2]);
 			BLF_position(blf_mono_font, dx, dy, 0);
@@ -305,9 +315,9 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 
 	if (color_manage) {
 		if (use_default_view)
-			IMB_colormanagement_pixel_to_display_space_v4(finalcol, col,  NULL, &scene->display_settings);
+			IMB_colormanagement_pixel_to_display_space_v4(finalcol, col, NULL, &scene->display_settings);
 		else
-			IMB_colormanagement_pixel_to_display_space_v4(finalcol, col,  &scene->view_settings, &scene->display_settings);
+			IMB_colormanagement_pixel_to_display_space_v4(finalcol, col, &scene->view_settings, &scene->display_settings);
 	}
 	else {
 		copy_v4_v4(finalcol, col);
@@ -318,13 +328,18 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 
 	BLI_rcti_init(&color_rect, dx, dx + (1.5f * UI_UNIT_X), 0.15f * UI_UNIT_Y, 0.85f * UI_UNIT_Y);
 
+	/* BLF uses immediate mode too, so we must reset our vertex format */
+	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	if (channels == 4) {
 		rcti color_rect_half;
 		int color_quater_x, color_quater_y;
 
 		color_rect_half = color_rect;
 		color_rect_half.xmax = BLI_rcti_cent_x(&color_rect);
-		glRecti(color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
+		/* what color ??? */
+		immRecti(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
 
 		color_rect_half = color_rect;
 		color_rect_half.xmin = BLI_rcti_cent_x(&color_rect);
@@ -332,31 +347,34 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		color_quater_x = BLI_rcti_cent_x(&color_rect_half);
 		color_quater_y = BLI_rcti_cent_y(&color_rect_half);
 
-		glColor4ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, 255);
-		glRecti(color_rect_half.xmin, color_rect_half.ymin, color_rect_half.xmax, color_rect_half.ymax);
+		immUniformColor3ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK);
+		immRecti(pos, color_rect_half.xmin, color_rect_half.ymin, color_rect_half.xmax, color_rect_half.ymax);
 
-		glColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
-		glRecti(color_quater_x, color_quater_y, color_rect_half.xmax, color_rect_half.ymax);
-		glRecti(color_rect_half.xmin, color_rect_half.ymin, color_quater_x, color_quater_y);
+		immUniformColor3ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT);
+		immRecti(pos, color_quater_x, color_quater_y, color_rect_half.xmax, color_rect_half.ymax);
+		immRecti(pos, color_rect_half.xmin, color_rect_half.ymin, color_quater_x, color_quater_y);
 
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glColor4f(UNPACK3(finalcol), fp ? fp[3] : (cp[3] / 255.0f));
-		glRecti(color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
+		immUniformColor3fvAlpha(finalcol, fp ? fp[3] : (cp[3] / 255.0f));
+		immRecti(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
 		glDisable(GL_BLEND);
 	}
 	else {
-		glColor3fv(finalcol);
-		glRecti(color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
+		immUniformColor3fv(finalcol);
+		immRecti(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
 	}
+	immUnbindProgram();
 
 	/* draw outline */
-	glColor3ub(128, 128, 128);
-	sdrawbox(color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
+	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformColor3ub(128, 128, 128);
+	imm_draw_box_wire_2d(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
+	immUnbindProgram();
 
 	dx += 1.75f * UI_UNIT_X;
 
-	glColor3ub(255, 255, 255);
+	BLF_color3ub(blf_mono_font, 255, 255, 255);
 	if (channels == 1) {
 		if (fp) {
 			rgb_to_hsv(fp[0], fp[0], fp[0], &hue, &sat, &val);
@@ -375,7 +393,6 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		BLI_snprintf(str, sizeof(str), "   L:%-.4f", lum);
 		BLF_position(blf_mono_font, dx, dy, 0);
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
-		dx += BLF_width(blf_mono_font, str, sizeof(str));
 	}
 	else if (channels >= 3) {
 		rgb_to_hsv(finalcol[0], finalcol[1], finalcol[2], &hue, &sat, &val);
@@ -399,69 +416,36 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
 		BLI_snprintf(str, sizeof(str), "   L:%-.4f", lum);
 		BLF_position(blf_mono_font, dx, dy, 0);
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
-		dx += BLF_width(blf_mono_font, str, sizeof(str));
 	}
-
-	(void)dx;
 }
 
 /* image drawing */
-
-static void sima_draw_alpha_pixels(float x1, float y1, int rectx, int recty, unsigned int *recti)
+static void sima_draw_zbuf_pixels(float x1, float y1, int rectx, int recty, int *rect,
+                                  float zoomx, float zoomy)
 {
+	float red[4] = {1.0f, 0.0f, 0.0f, 0.0f};
 
-	/* swap bytes, so alpha is most significant one, then just draw it as luminance int */
-	if (ENDIAN_ORDER == B_ENDIAN)
-		glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
+	/* Slowwww */
+	int *recti = MEM_mallocN(rectx * recty * sizeof(int), "temp");
+	for (int a = rectx * recty - 1; a >= 0; a--) {
+		/* zbuffer values are signed, so we need to shift color range */
+		recti[a] = rect[a] * 0.5f + 0.5f;
+	}
 
-	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_LUMINANCE, GL_UNSIGNED_INT, recti);
-	glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
-}
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR);
+	GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, red);
 
-static void sima_draw_alpha_pixelsf(float x1, float y1, int rectx, int recty, float *rectf)
-{
-	float *trectf = MEM_mallocN(rectx * recty * 4, "temp");
-	int a, b;
-
-	for (a = rectx * recty - 1, b = 4 * a + 3; a >= 0; a--, b -= 4)
-		trectf[a] = rectf[b];
-
-	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_LUMINANCE, GL_FLOAT, trectf);
-	MEM_freeN(trectf);
-	/* ogl trick below is slower... (on ATI 9600) */
-//	glColorMask(1, 0, 0, 0);
-//	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_RGBA, GL_FLOAT, rectf + 3);
-//	glColorMask(0, 1, 0, 0);
-//	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_RGBA, GL_FLOAT, rectf + 2);
-//	glColorMask(0, 0, 1, 0);
-//	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_RGBA, GL_FLOAT, rectf + 1);
-//	glColorMask(1, 1, 1, 1);
-}
+	immDrawPixelsTex(&state, x1, y1, rectx, recty, GL_RED, GL_INT, GL_NEAREST, recti, zoomx, zoomy, NULL);
 
-static void sima_draw_zbuf_pixels(float x1, float y1, int rectx, int recty, int *recti)
-{
-	/* zbuffer values are signed, so we need to shift color range */
-	glPixelTransferf(GL_RED_SCALE, 0.5f);
-	glPixelTransferf(GL_GREEN_SCALE, 0.5f);
-	glPixelTransferf(GL_BLUE_SCALE, 0.5f);
-	glPixelTransferf(GL_RED_BIAS, 0.5f);
-	glPixelTransferf(GL_GREEN_BIAS, 0.5f);
-	glPixelTransferf(GL_BLUE_BIAS, 0.5f);
-
-	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_LUMINANCE, GL_INT, recti);
-
-	glPixelTransferf(GL_RED_SCALE, 1.0f);
-	glPixelTransferf(GL_GREEN_SCALE, 1.0f);
-	glPixelTransferf(GL_BLUE_SCALE, 1.0f);
-	glPixelTransferf(GL_RED_BIAS, 0.0f);
-	glPixelTransferf(GL_GREEN_BIAS, 0.0f);
-	glPixelTransferf(GL_BLUE_BIAS, 0.0f);
+	MEM_freeN(recti);
 }
 
-static void sima_draw_zbuffloat_pixels(Scene *scene, float x1, float y1, int rectx, int recty, float *rect_float)
+static void sima_draw_zbuffloat_pixels(Scene *scene, float x1, float y1, int rectx, int recty,
+                                       float *rect_float, float zoomx, float zoomy)
 {
 	float bias, scale, *rectf, clipend;
 	int a;
+	float red[4] = {1.0f, 0.0f, 0.0f, 0.0f};
 
 	if (scene->camera && scene->camera->type == OB_CAMERA) {
 		bias = ((Camera *)scene->camera->data)->clipsta;
@@ -474,7 +458,7 @@ static void sima_draw_zbuffloat_pixels(Scene *scene, float x1, float y1, int rec
 		clipend = 100.0f;
 	}
 
-	rectf = MEM_mallocN(rectx * recty * 4, "temp");
+	rectf = MEM_mallocN(rectx * recty * sizeof(float), "temp");
 	for (a = rectx * recty - 1; a >= 0; a--) {
 		if (rect_float[a] > clipend)
 			rectf[a] = 0.0f;
@@ -485,196 +469,83 @@ static void sima_draw_zbuffloat_pixels(Scene *scene, float x1, float y1, int rec
 			rectf[a] *= rectf[a];
 		}
 	}
-	glaDrawPixelsSafe(x1, y1, rectx, recty, rectx, GL_LUMINANCE, GL_FLOAT, rectf);
 
-	MEM_freeN(rectf);
-}
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR);
+	GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, red);
 
-static int draw_image_channel_offset(SpaceImage *sima)
-{
-#ifdef __BIG_ENDIAN__
-	if      (sima->flag & SI_SHOW_R) return 0;
-	else if (sima->flag & SI_SHOW_G) return 1;
-	else                             return 2;
-#else
-	if      (sima->flag & SI_SHOW_R) return 1;
-	else if (sima->flag & SI_SHOW_G) return 2;
-	else                             return 3;
-#endif
+	immDrawPixelsTex(&state, x1, y1, rectx, recty, GL_RED, GL_FLOAT, GL_NEAREST, rectf, zoomx, zoomy, NULL);
+
+	MEM_freeN(rectf);
 }
 
 static void draw_image_buffer(const bContext *C, SpaceImage *sima, ARegion *ar, Scene *scene, ImBuf *ibuf, float fx, float fy, float zoomx, float zoomy)
 {
 	int x, y;
 
-	/* set zoom */
-	glPixelZoom(zoomx, zoomy);
-
-	glaDefine2DArea(&ar->winrct);
-
 	/* find window pixel coordinates of origin */
 	UI_view2d_view_to_region(&ar->v2d, fx, fy, &x, &y);
 
 	/* this part is generic image display */
-	if (sima->flag & SI_SHOW_ALPHA) {
-		if (ibuf->rect)
-			sima_draw_alpha_pixels(x, y, ibuf->x, ibuf->y, ibuf->rect);
-		else if (ibuf->rect_float && ibuf->channels == 4)
-			sima_draw_alpha_pixelsf(x, y, ibuf->x, ibuf->y, ibuf->rect_float);
-	}
-	else if (sima->flag & SI_SHOW_ZBUF && (ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels == 1))) {
+	if (sima->flag & SI_SHOW_ZBUF && (ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels == 1))) {
 		if (ibuf->zbuf)
-			sima_draw_zbuf_pixels(x, y, ibuf->x, ibuf->y, ibuf->zbuf);
+			sima_draw_zbuf_pixels(x, y, ibuf->x, ibuf->y, ibuf->zbuf, zoomx, zoomy);
 		else if (ibuf->zbuf_float)
-			sima_draw_zbuffloat_pixels(scene, x, y, ibuf->x, ibuf->y, ibuf->zbuf_float);
+			sima_draw_zbuffloat_pixels(scene, x, y, ibuf->x, ibuf->y, ibuf->zbuf_float, zoomx, zoomy);
 		else if (ibuf->channels == 1)
-			sima_draw_zbuffloat_pixels(scene, x, y, ibuf->x, ibuf->y, ibuf->rect_float);
+			sima_draw_zbuffloat_pixels(scene, x, y, ibuf->x, ibuf->y, ibuf->rect_float, zoomx, zoomy);
 	}
 	else {
+		int clip_max_x, clip_max_y;
+		UI_view2d_view_to_region(&ar->v2d,
+		                         ar->v2d.cur.xmax, ar->v2d.cur.ymax,
+		                         &clip_max_x, &clip_max_y);
+
 		if (sima->flag & SI_USE_ALPHA) {
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			imm_draw_box_checker_2d(x, y, x + ibuf->x * zoomx, y + ibuf->y * zoomy);
 
-			fdrawcheckerboard(x, y, x + ibuf->x * zoomx, y + ibuf->y * zoomy);
+			glEnable(GL_BLEND);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		}
 
-		if ((sima->flag & (SI_SHOW_R | SI_SHOW_G | SI_SHOW_B)) == 0) {
-			int clip_max_x, clip_max_y;
-			UI_view2d_view_to_region(&ar->v2d,
-			                         ar->v2d.cur.xmax, ar->v2d.cur.ymax,
-			                         &clip_max_x, &clip_max_y);
+		/* If RGBA display with color management */
+		if ((sima->flag & (SI_SHOW_R | SI_SHOW_G | SI_SHOW_B | SI_SHOW_ALPHA)) == 0) {
+
 			glaDrawImBuf_glsl_ctx_clipping(C, ibuf, x, y, GL_NEAREST,
-			                               0, 0, clip_max_x, clip_max_y);
+			                               0, 0, clip_max_x, clip_max_y, zoomx, zoomy);
 		}
 		else {
+			float shuffle[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 			unsigned char *display_buffer;
 			void *cache_handle;
-
-			/* TODO(sergey): Ideally GLSL shading should be capable of either
-			 * disabling some channels or displaying buffer with custom offset.
-			 */
-			display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
-
-			if (display_buffer != NULL) {
-				int channel_offset = draw_image_channel_offset(sima);
-				glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT,
-				                  display_buffer - (4 - channel_offset));
-			}
-			if (cache_handle != NULL) {
-				IMB_display_buffer_release(cache_handle);
+			ColorManagedViewSettings *view_settings;
+			ColorManagedDisplaySettings *display_settings;
+
+			if (sima->flag & SI_SHOW_R)
+				shuffle[0] = 1.0f;
+			else if (sima->flag & SI_SHOW_G)
+				shuffle[1] = 1.0f;
+			else if (sima->flag & SI_SHOW_B)
+				shuffle[2] = 1.0f;
+			else if (sima->flag & SI_SHOW_ALPHA)
+				shuffle[3] = 1.0f;
+
+			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR);
+			GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, shuffle);
+
+			IMB_colormanagement_display_settings_from_ctx(C, &view_settings, &display_settings);
+			display_buffer = IMB_display_buffer_acquire(ibuf, view_settings, display_settings, &cache_handle);
+
+			if (display_buffer) {
+				immDrawPixelsTex_clipping(&state, x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, display_buffer,
+				                          0, 0, clip_max_x, clip_max_y, zoomx, zoomy, NULL);
 			}
+
+			IMB_display_buffer_release(cache_handle);
 		}
 
 		if (sima->flag & SI_USE_ALPHA)
 			glDisable(GL_BLEND);
 	}
-
-	/* reset zoom */
-	glPixelZoom(1.0f, 1.0f);
-}
-
-static unsigned int *get_part_from_buffer(unsigned int *buffer, int width, short startx, short starty, short endx, short endy)
-{
-	unsigned int *rt, *rp, *rectmain;
-	short y, heigth, len;
-
-	/* the right offset in rectot */
-
-	rt = buffer + (starty * width + startx);
-
-	len = (endx - startx);
-	heigth = (endy - starty);
-
-	rp = rectmain = MEM_mallocN(heigth * len * sizeof(int), "rect");
-
-	for (y = 0; y < heigth; y++) {
-		memcpy(rp, rt, len * 4);
-		rt += width;
-		rp += len;
-	}
-	return rectmain;
-}
-
-static void draw_image_buffer_tiled(SpaceImage *sima, ARegion *ar, Scene *scene, Image *ima, ImBuf *ibuf, float fx, float fy, float zoomx, float zoomy)
-{
-	unsigned char *display_buffer;
-	unsigned int *rect;
-	int dx, dy, sx, sy, x, y;
-	void *cache_handle;
-	int channel_offset = -1;
-
-	/* verify valid values, just leave this a while */
-	if (ima->xrep < 1) return;
-	if (ima->yrep < 1) return;
-
-	if (ima->flag & IMA_VIEW_AS_RENDER)
-		display_buffer = IMB_display_buffer_acquire(ibuf, &scene->view_settings, &scene->display_settings, &cache_handle);
-	else
-		display_buffer = IMB_display_buffer_acquire(ibuf, NULL, &scene->display_settings, &cache_handle);
-
-	if (!display_buffer)
-		return;
-
-	glPixelZoom(zoomx, zoomy);
-
-	if (sima->curtile >= ima->xrep * ima->yrep)
-		sima->curtile = ima->xrep * ima->yrep - 1;
-
-	/* retrieve part of image buffer */
-	dx = max_ii(ibuf->x / ima->xrep, 1);
-	dy = max_ii(ibuf->y / ima->yrep, 1);
-	sx = (sima->curtile % ima->xrep) * dx;
-	sy = (sima->curtile / ima->xrep) * dy;
-	rect = get_part_from_buffer((unsigned int *)display_buffer, ibuf->x, sx, sy, sx + dx, sy + dy);
-
-	/* draw repeated */
-	if ((sima->flag & (SI_SHOW_R | SI_SHOW_G | SI_SHOW_B)) != 0) {
-		channel_offset = draw_image_channel_offset(sima);
-	}
-	for (sy = 0; sy + dy <= ibuf->y; sy += dy) {
-		for (sx = 0; sx + dx <= ibuf->x; sx += dx) {
-			UI_view2d_view_to_region(&ar->v2d, fx + (float)sx / (float)ibuf->x, fy + (float)sy / (float)ibuf->y, &x, &y);
-			if (channel_offset == -1) {
-				glaDrawPixelsSafe(x, y, dx, dy, dx, GL_RGBA, GL_UNSIGNED_BYTE, rect);
-			}
-			else {
-				glaDrawPixelsSafe(x, y, dx, dy, dx, GL_LUMINANCE, GL_UNSIGNED_INT,
-				                  (unsigned char *)rect - (4 - channel_offset));
-			}
-		}
-	}
-
-	glPixelZoom(1.0f, 1.0f);
-
-	IMB_display_buffer_release(cache_handle);
-
-	MEM_freeN(rect);
-}
-
-static void draw_image_buffer_repeated(const bContext *C, SpaceImage *sima, ARegion *ar, Scene *scene, Image *ima, ImBuf *ibuf, float zoomx, float zoomy)
-{
-	const double time_current = PIL_check_seconds_timer();
-
-	const int xmax = ceil(ar->v2d.cur.xmax);
-	const int ymax = ceil(ar->v2d.cur.ymax);
-	const int xmin = floor(ar->v2d.cur.xmin);
-	const int ymin = floor(ar->v2d.cur.ymin);
-
-	int x;
-
-	for (x = xmin; x < xmax; x++) {
-		int y;
-		for (y = ymin; y < ymax; y++) {
-			if (ima && (ima->tpageflag & IMA_TILES))
-				draw_image_buffer_tiled(sima, ar, scene, ima, ibuf, x, y, zoomx, zoomy);
-			else
-				draw_image_buffer(C, sima, ar, scene, ibuf, x, y, zoomx, zoomy);
-
-			/* only draw until running out of time */
-			if ((PIL_check_seconds_timer() - time_current) > 0.25)
-				return;
-		}
-	}
 }
 
 /* draw uv edit */
@@ -701,134 +572,62 @@ void draw_image_sample_line(SpaceImage *sima)
 	if (sima->sample_line_hist.flag & HISTO_FLAG_SAMPLELINE) {
 		Histogram *hist = &sima->sample_line_hist;
 
-		glBegin(GL_LINES);
-		glColor3ub(0, 0, 0);
-		glVertex2fv(hist->co[0]);
-		glVertex2fv(hist->co[1]);
-		glEnd();
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int shdr_dashed_pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-		setlinestyle(1);
-		glBegin(GL_LINES);
-		glColor3ub(255, 255, 255);
-		glVertex2fv(hist->co[0]);
-		glVertex2fv(hist->co[1]);
-		glEnd();
-		setlinestyle(0);
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-	}
-}
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-/* XXX becomes WM paint cursor */
-#if 0
-static void draw_image_view_tool(Scene *scene)
-{
-	ToolSettings *settings = scene->toolsettings;
-	Brush *brush = settings->imapaint.brush;
-	int mval[2];
-	float radius;
-	int draw = 0;
-
-	if (brush) {
-		if (settings->imapaint.flag & IMAGEPAINT_DRAWING) {
-			if (settings->imapaint.flag & IMAGEPAINT_DRAW_TOOL_DRAWING)
-				draw = 1;
-		}
-		else if (settings->imapaint.flag & IMAGEPAINT_DRAW_TOOL)
-			draw = 1;
-
-		if (draw) {
-			getmouseco_areawin(mval);
+		immUniform1i("num_colors", 2);  /* Advanced dashes. */
+		immUniformArray4fv("colors", (float *)(float[][4]){{1.0f, 1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, 2);
+		immUniform1f("dash_width", 2.0f);
 
-			radius = BKE_brush_size_get(brush) * G.sima->zoom;
-			fdrawXORcirc(mval[0], mval[1], radius);
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2fv(shdr_dashed_pos, hist->co[0]);
+		immVertex2fv(shdr_dashed_pos, hist->co[1]);
+		immEnd();
 
-			if (brush->innerradius != 1.0) {
-				radius *= brush->innerradius;
-				fdrawXORcirc(mval[0], mval[1], radius);
-			}
-		}
+		immUnbindProgram();
 	}
 }
-#endif
-
-static unsigned char *get_alpha_clone_image(const bContext *C, Scene *scene, int *width, int *height)
-{
-	Brush *brush = BKE_paint_brush(&scene->toolsettings->imapaint.paint);
-	ImBuf *ibuf;
-	unsigned int size, alpha;
-	unsigned char *display_buffer;
-	unsigned char *rect, *cp;
-	void *cache_handle;
-
-	if (!brush || !brush->clone.image)
-		return NULL;
-
-	ibuf = BKE_image_acquire_ibuf(brush->clone.image, NULL, NULL);
-
-	if (!ibuf)
-		return NULL;
-
-	display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
-
-	if (!display_buffer) {
-		BKE_image_release_ibuf(brush->clone.image, ibuf, NULL);
-		IMB_display_buffer_release(cache_handle);
-
-		return NULL;
-	}
-
-	rect = MEM_dupallocN(display_buffer);
-
-	IMB_display_buffer_release(cache_handle);
-
-	if (!rect) {
-		BKE_image_release_ibuf(brush->clone.image, ibuf, NULL);
-		return NULL;
-	}
-
-	*width = ibuf->x;
-	*height = ibuf->y;
-
-	size = (*width) * (*height);
-	alpha = (unsigned char)255 * brush->clone.alpha;
-	cp = rect;
-
-	while (size-- > 0) {
-		cp[3] = alpha;
-		cp += 4;
-	}
-
-	BKE_image_release_ibuf(brush->clone.image, ibuf, NULL);
-
-	return rect;
-}
 
 static void draw_image_paint_helpers(const bContext *C, ARegion *ar, Scene *scene, float zoomx, float zoomy)
 {
 	Brush *brush;
-	int x, y, w, h;
-	unsigned char *clonerect;
+	int x, y;
+	ImBuf *ibuf;
 
 	brush = BKE_paint_brush(&scene->toolsettings->imapaint.paint);
 
-	if (brush && (brush->imagepaint_tool == PAINT_TOOL_CLONE)) {
-		/* this is not very efficient, but glDrawPixels doesn't allow
-		 * drawing with alpha */
-		clonerect = get_alpha_clone_image(C, scene, &w, &h);
+	if (brush && (brush->imagepaint_tool == PAINT_TOOL_CLONE) && brush->clone.image) {
+		ibuf = BKE_image_acquire_ibuf(brush->clone.image, NULL, NULL);
 
-		if (clonerect) {
+		if (ibuf) {
+			void *cache_handle = NULL;
+			float col[4] = {1.0f, 1.0f, 1.0f, brush->clone.alpha};
 			UI_view2d_view_to_region(&ar->v2d, brush->clone.offset[0], brush->clone.offset[1], &x, &y);
 
-			glPixelZoom(zoomx, zoomy);
+			unsigned char *display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
+
+			if (!display_buffer) {
+				BKE_image_release_ibuf(brush->clone.image, ibuf, NULL);
+				IMB_display_buffer_release(cache_handle);
+				return;
+			}
 
 			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glaDrawPixelsSafe(x, y, w, h, w, GL_RGBA, GL_UNSIGNED_BYTE, clonerect);
-			glDisable(GL_BLEND);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+			immDrawPixelsTex(&state, x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, display_buffer, zoomx, zoomy, col);
 
-			glPixelZoom(1.0, 1.0);
+			glDisable(GL_BLEND);
 
-			MEM_freeN(clonerect);
+			BKE_image_release_ibuf(brush->clone.image, ibuf, NULL);
+			IMB_display_buffer_release(cache_handle);
 		}
 	}
 }
@@ -899,13 +698,7 @@ void draw_image_main(const bContext *C, ARegion *ar)
 		ED_region_grid_draw(ar, zoomx, zoomy);
 	}
 	else {
-
-		if (sima->flag & SI_DRAW_TILE)
-			draw_image_buffer_repeated(C, sima, ar, scene, ima, ibuf, zoomx, zoomy);
-		else if (ima && (ima->tpageflag & IMA_TILES))
-			draw_image_buffer_tiled(sima, ar, scene, ima, ibuf, 0.0f, 0.0, zoomx, zoomy);
-		else
-			draw_image_buffer(C, sima, ar, scene, ibuf, 0.0f, 0.0f, zoomx, zoomy);
+		draw_image_buffer(C, sima, ar, scene, ibuf, 0.0f, 0.0f, zoomx, zoomy);
 
 		if (sima->flag & SI_DRAW_METADATA) {
 			int x, y;
@@ -924,23 +717,6 @@ void draw_image_main(const bContext *C, ARegion *ar)
 	if (show_paint)
 		draw_image_paint_helpers(C, ar, scene, zoomx, zoomy);
 
-	/* XXX integrate this code */
-#if 0
-	if (ibuf) {
-		float xoffs = 0.0f, yoffs = 0.0f;
-
-		if (image_preview_active(sa, &xim, &yim)) {
-			xoffs = scene->r.disprect.xmin;
-			yoffs = scene->r.disprect.ymin;
-			glColor3ub(0, 0, 0);
-			calc_image_view(sima, 'f');
-			myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
-			glRectf(0.0f, 0.0f, 1.0f, 1.0f);
-			glLoadIdentity();
-		}
-	}
-#endif
-
 	if (show_viewer) {
 		BLI_thread_unlock(LOCK_DRAW_IMAGE);
 	}
@@ -983,7 +759,7 @@ void draw_image_cache(const bContext *C, ARegion *ar)
 	}
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* Draw cache background. */
 	ED_region_cache_draw_background(ar);
@@ -1002,8 +778,12 @@ void draw_image_cache(const bContext *C, ARegion *ar)
 	/* Draw current frame. */
 	x = (cfra - sfra) / (efra - sfra + 1) * ar->winx;
 
-	UI_ThemeColor(TH_CFRAME);
-	glRecti(x, 0, x + ceilf(framelen), 8 * UI_DPI_FAC);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColor(TH_CFRAME);
+	immRecti(pos, x, 0, x + ceilf(framelen), 8 * UI_DPI_FAC);
+	immUnbindProgram();
+
 	ED_region_cache_draw_curfra_label(cfra, x, 8.0f * UI_DPI_FAC);
 
 	if (mask != NULL) {
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 39a029fb9f0..0911bea3be4 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -45,6 +45,8 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_image.h"  /* own include */
 #include "ED_mesh.h"
 #include "ED_screen.h"
@@ -62,11 +64,8 @@ Image *ED_space_image(SpaceImage *sima)
 }
 
 /* called to assign images to UV faces */
-void ED_space_image_set(Main *bmain, SpaceImage *sima, Scene *scene, Object *obedit, Image *ima)
+void ED_space_image_set(SpaceImage *sima, Scene *UNUSED(scene), Object *obedit, Image *ima)
 {
-	/* context may be NULL, so use global */
-	ED_uvedit_assign_image(bmain, scene, obedit, ima, sima->image);
-
 	/* change the space ima after because uvedit_face_visible_test uses the space ima
 	 * to check if the face is displayed in UV-localview */
 	sima->image = ima;
@@ -375,10 +374,10 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
 }
 
 /* matches clip function */
-bool ED_space_image_check_show_maskedit(Scene *scene, SpaceImage *sima)
+bool ED_space_image_check_show_maskedit(SpaceImage *sima, ViewLayer *view_layer)
 {
 	/* check editmode - this is reserved for UV editing */
-	Object *ob = OBACT;
+	Object *ob = OBACT(view_layer);
 	if (ob && ob->mode & OB_MODE_EDIT && ED_space_image_show_uvedit(sima, ob)) {
 		return false;
 	}
@@ -391,8 +390,8 @@ int ED_space_image_maskedit_poll(bContext *C)
 	SpaceImage *sima = CTX_wm_space_image(C);
 
 	if (sima) {
-		Scene *scene = CTX_data_scene(C);
-		return ED_space_image_check_show_maskedit(scene, sima);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		return ED_space_image_check_show_maskedit(sima, view_layer);
 	}
 
 	return false;
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index 0847a04a993..9167a193f2d 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -90,7 +90,7 @@ void IMAGE_OT_curves_point_set(struct wmOperatorType *ot);
 
 void IMAGE_OT_change_frame(struct wmOperatorType *ot);
 
-void IMAGE_OT_read_renderlayers(struct wmOperatorType *ot);
+void IMAGE_OT_read_viewlayers(struct wmOperatorType *ot);
 void IMAGE_OT_render_border(struct wmOperatorType *ot);
 void IMAGE_OT_clear_render_border(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index dea1f761073..95cbc4fe4a2 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -48,6 +48,7 @@
 
 #include "BLT_translation.h"
 
+#include "DNA_camera_types.h"
 #include "DNA_object_types.h"
 #include "DNA_node_types.h"
 #include "DNA_packedFile_types.h"
@@ -56,7 +57,6 @@
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
@@ -70,8 +70,9 @@
 #include "BKE_sound.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "GPU_draw.h"
-#include "GPU_buffers.h"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
@@ -277,8 +278,9 @@ static int space_image_main_area_not_uv_brush_poll(bContext *C)
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *toolsettings = scene->toolsettings;
 
-	if (sima && !toolsettings->uvsculpt && !scene->obedit)
+	if (sima && !toolsettings->uvsculpt && (CTX_data_edit_object(C) == NULL)) {
 		return 1;
+	}
 
 	return 0;
 }
@@ -792,6 +794,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceImage *sima;
 	ARegion *ar;
 	Scene *scene;
+	ViewLayer *view_layer;
 	Object *obedit;
 	Image *ima;
 
@@ -799,6 +802,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	sima = CTX_wm_space_image(C);
 	ar = CTX_wm_region(C);
 	scene = CTX_data_scene(C);
+	view_layer = CTX_data_view_layer(C);
 	obedit = CTX_data_edit_object(C);
 
 	ima = ED_space_image(sima);
@@ -810,7 +814,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 			return OPERATOR_CANCELLED;
 		}
 	}
-	else if (ED_space_image_check_show_maskedit(scene, sima)) {
+	else if (ED_space_image_check_show_maskedit(sima, view_layer)) {
 		if (!ED_mask_selected_minmax(C, min, max)) {
 			return OPERATOR_CANCELLED;
 		}
@@ -1304,24 +1308,26 @@ static int image_open_exec(bContext *C, wmOperator *op)
 	}
 	else if (sa && sa->spacetype == SPACE_IMAGE) {
 		SpaceImage *sima = sa->spacedata.first;
-		ED_space_image_set(bmain, sima, scene, obedit, ima);
+		ED_space_image_set(sima, scene, obedit, ima);
 		iuser = &sima->iuser;
 	}
-	else if (sa && sa->spacetype == SPACE_VIEW3D) {
-		View3D *v3d = sa->spacedata.first;
-
-		for (BGpic *bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
-			if (bgpic->ima == ima) {
-				iuser = &bgpic->iuser;
-				break;
-			}
-		}
-	}
 	else {
 		Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
 		if (tex && tex->type == TEX_IMAGE) {
 			iuser = &tex->iuser;
 		}
+
+		if (iuser == NULL) {
+			Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
+			if (cam) {
+				for (CameraBGImage *bgpic = cam->bg_images.first; bgpic; bgpic = bgpic->next) {
+					if (bgpic->ima == ima) {
+						iuser = &bgpic->iuser;
+						break;
+					}
+				}
+			}
+		}
 	}
 
 	/* initialize because of new image */
@@ -1425,7 +1431,7 @@ static void image_open_draw(bContext *UNUSED(C), wmOperator *op)
 
 	/* main draw call */
 	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
-	uiDefAutoButsRNA(layout, &ptr, image_open_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, image_open_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 
 	/* image template */
 	RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);
@@ -2143,7 +2149,7 @@ static void image_save_as_draw(bContext *UNUSED(C), wmOperator *op)
 
 	/* main draw call */
 	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
-	uiDefAutoButsRNA(layout, &ptr, image_save_as_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, image_save_as_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 
 	/* multiview template */
 	if (is_multiview)
@@ -2344,7 +2350,7 @@ static int image_reload_exec(bContext *C, wmOperator *UNUSED(op))
 
 	// XXX other users?
 	BKE_image_signal(ima, (sima) ? &sima->iuser : NULL, IMA_SIGNAL_RELOAD);
-	DAG_id_tag_update(&ima->id, 0);
+	DEG_id_tag_update(&ima->id, 0);
 
 	WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, ima);
 
@@ -2435,13 +2441,12 @@ static int image_new_exec(bContext *C, wmOperator *op)
 		RNA_property_update(C, &ptr, prop);
 	}
 	else if (sima) {
-		ED_space_image_set(bmain, sima, scene, obedit, ima);
+		ED_space_image_set(sima, scene, obedit, ima);
 	}
 	else if (gen_context == GEN_CONTEXT_PAINT_CANVAS) {
 		bScreen *sc;
 		Object *ob = CTX_data_active_object(C);
 
-		GPU_drawobject_free(ob->derivedFinal);
 		if (scene->toolsettings->imapaint.canvas)
 			id_us_min(&scene->toolsettings->imapaint.canvas->id);
 		scene->toolsettings->imapaint.canvas = ima;
@@ -2455,7 +2460,7 @@ static int image_new_exec(bContext *C, wmOperator *op)
 						SpaceImage *sima_other = (SpaceImage *)sl;
 
 						if (!sima_other->pin) {
-							ED_space_image_set(bmain, sima_other, scene, scene->obedit, ima);
+							ED_space_image_set(sima_other, scene, obedit, ima);
 						}
 					}
 				}
@@ -3597,16 +3602,15 @@ void IMAGE_OT_change_frame(wmOperatorType *ot)
 
 /* Reload cached render results... */
 /* goes over all scenes, reads render layers */
-static int image_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op))
+static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Image *ima;
 
 	ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
 	if (sima->image == NULL) {
-		ED_space_image_set(bmain, sima, scene, NULL, ima);
+		ED_space_image_set(sima, scene, NULL, ima);
 	}
 
 	RE_ReadRenderResult(scene, scene);
@@ -3615,14 +3619,14 @@ static int image_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void IMAGE_OT_read_renderlayers(wmOperatorType *ot)
+void IMAGE_OT_read_viewlayers(wmOperatorType *ot)
 {
-	ot->name = "Read Render Layers";
-	ot->idname = "IMAGE_OT_read_renderlayers";
-	ot->description = "Read all the current scene's render layers from cache, as needed";
+	ot->name = "Read View Layers";
+	ot->idname = "IMAGE_OT_read_viewlayers";
+	ot->description = "Read all the current scene's view layers from cache, as needed";
 
 	ot->poll = space_image_main_region_poll;
-	ot->exec = image_read_renderlayers_exec;
+	ot->exec = image_read_viewlayers_exec;
 
 	/* flags */
 	ot->flag = 0;
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index dbe7ae578c7..28ce88b38f5 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -44,10 +44,15 @@
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
+#include "BKE_editmesh.h"
 #include "BKE_image.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
+#include "BKE_material.h"
+
+#include "DEG_depsgraph.h"
 
 #include "IMB_imbuf_types.h"
 
@@ -59,6 +64,7 @@
 #include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_uvedit.h"
+#include "ED_transform.h"
 
 #include "BIF_gl.h"
 
@@ -66,6 +72,7 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "UI_resources.h"
 #include "UI_interface.h"
@@ -156,7 +163,7 @@ ARegion *image_has_tools_region(ScrArea *sa)
 
 /* ******************** default callbacks for image space ***************** */
 
-static SpaceLink *image_new(const bContext *UNUSED(C))
+static SpaceLink *image_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceImage *simage;
@@ -165,12 +172,12 @@ static SpaceLink *image_new(const bContext *UNUSED(C))
 	simage->spacetype = SPACE_IMAGE;
 	simage->zoom = 1.0f;
 	simage->lock = true;
-	simage->flag = SI_SHOW_GPENCIL | SI_USE_ALPHA;
+	simage->flag = SI_SHOW_GPENCIL | SI_USE_ALPHA | SI_COORDFLOATS;
 
 	simage->iuser.ok = true;
 	simage->iuser.fie_ima = 2;
 	simage->iuser.frames = 100;
-	simage->iuser.flag = IMA_SHOW_STEREO;
+	simage->iuser.flag = IMA_SHOW_STEREO | IMA_ANIM_ALWAYS;
 
 	scopes_new(&simage->scopes);
 	simage->sample_line_hist.height = 100;
@@ -180,7 +187,7 @@ static SpaceLink *image_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&simage->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* buttons/list view */
 	ar = MEM_callocN(sizeof(ARegion), "buttons for image");
@@ -275,7 +282,7 @@ static void image_operatortypes(void)
 
 	WM_operatortype_append(IMAGE_OT_change_frame);
 
-	WM_operatortype_append(IMAGE_OT_read_renderlayers);
+	WM_operatortype_append(IMAGE_OT_read_viewlayers);
 	WM_operatortype_append(IMAGE_OT_render_border);
 	WM_operatortype_append(IMAGE_OT_clear_render_border);
 }
@@ -289,7 +296,7 @@ static void image_keymap(struct wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "IMAGE_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_reload", RKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "IMAGE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "IMAGE_OT_read_viewlayers", RKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_save", SKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_save_as", F3KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_properties", NKEY, KM_PRESS, 0, 0);
@@ -404,7 +411,6 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 {
 	Scene *scene = CTX_data_scene(C);
 	SpaceImage *sima = sa->spacedata.first;
-	Object *obedit = CTX_data_edit_object(C);
 	Image *ima;
 
 	ima = ED_space_image(sima);
@@ -420,38 +426,11 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 			}
 		}
 	}
-	else if (ima && (ima->source == IMA_SRC_VIEWER || sima->pin)) {
-		/* pass */
-	}
-	else if (obedit && obedit->type == OB_MESH) {
-		Mesh *me = (Mesh *)obedit->data;
-		struct BMEditMesh *em = me->edit_btmesh;
-		bool sloppy = true; /* partially selected face is ok */
-		bool selected = !(scene->toolsettings->uv_flag & UV_SYNC_SELECTION); /* only selected active face? */
-
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			/* new shading system does not alter image */
-		}
-		else {
-			/* old shading system, we set texface */
-			if (em && EDBM_uv_check(em)) {
-				MTexPoly *tf;
-				if (EDBM_uv_active_face_get(em, sloppy, selected, &tf)) {
-					/* don't need to check for pin here, see above */
-					sima->image = tf->tpage;
-
-					if ((sima->flag & SI_EDITTILE) == 0) {
-						sima->curtile = tf->tile;
-					}
-				}
-			}
-		}
-	}
 }
 
-static void image_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn)
+static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *scene,
+                           WorkSpace *workspace)
 {
-	Scene *scene = sc->scene;
 	SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 
 	/* context changes */
@@ -544,7 +523,8 @@ static void image_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn)
 				case ND_TRANSFORM:
 				case ND_MODIFIER:
 				{
-					Object *ob = OBACT;
+					ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
+					Object *ob = OBACT(view_layer);
 					if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) {
 						if (sima->lock && (sima->flag & SI_DRAWSHADOW)) {
 							ED_area_tag_refresh(sa);
@@ -596,6 +576,27 @@ static int image_context(const bContext *C, const char *member, bContextDataResu
 	return 0;
 }
 
+static void IMAGE_WGT_manipulator2d(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "UV Transform Manipulator";
+	wgt->idname = "IMAGE_WGT_manipulator2d";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_PERSISTENT;
+
+	wgt->poll = ED_widgetgroup_manipulator2d_poll;
+	wgt->setup = ED_widgetgroup_manipulator2d_setup;
+	wgt->refresh = ED_widgetgroup_manipulator2d_refresh;
+	wgt->draw_prepare = ED_widgetgroup_manipulator2d_draw_prepare;
+}
+
+static void image_widgets(void)
+{
+	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(
+	        &(const struct wmManipulatorMapType_Params){SPACE_IMAGE, RGN_TYPE_WINDOW});
+
+	WM_manipulatorgrouptype_append_and_link(mmap_type, IMAGE_WGT_manipulator2d);
+}
+
 /************************** main region ***************************/
 
 /* sets up the fields of the View2D from zoom and offset */
@@ -659,6 +660,16 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *ar)
 	// image space manages own v2d
 	// UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
+	/* manipulators */
+	if (ar->manipulator_map == NULL) {
+		const struct wmManipulatorMapType_Params wmap_params = {
+			.spaceid = SPACE_IMAGE,
+			.regionid = RGN_TYPE_WINDOW,
+		};
+		ar->manipulator_map = WM_manipulatormap_new_from_type(&wmap_params);
+	}
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+
 	/* mask polls mode */
 	keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
@@ -684,7 +695,6 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 	keymap = WM_keymap_find(wm->defaultconf, "Image", SPACE_IMAGE, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
-
 }
 
 static void image_main_region_draw(const bContext *C, ARegion *ar)
@@ -693,9 +703,11 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Object *obact = CTX_data_active_object(C);
 	Object *obedit = CTX_data_edit_object(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Mask *mask = NULL;
 	bool curve = false;
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	View2D *v2d = &ar->v2d;
 	//View2DScrollers *scrollers;
 	float col[3];
@@ -721,7 +733,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
-	ED_uvedit_draw_main(sima, ar, scene, obedit, obact);
+	ED_uvedit_draw_main(sima, ar, scene, view_layer, obedit, obact, depsgraph);
 
 	/* check for mask (delay draw) */
 	if (ED_space_image_show_uvedit(sima, obedit)) {
@@ -790,6 +802,8 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 		UI_view2d_view_restore(C);
 	}
 
+	WM_manipulatormap_draw(ar->manipulator_map, C, WM_MANIPULATORMAP_DRAWSTEP_2D);
+
 	draw_image_cache(C, ar);
 
 	/* scrollers? */
@@ -800,10 +814,16 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 #endif
 }
 
-static void image_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar, wmNotifier *wmn)
+static void image_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
+		case NC_GEOM:
+			if (ELEM(wmn->data, ND_DATA, ND_SELECT))
+				WM_manipulatormap_tag_refresh(ar->manipulator_map);
+			break;
 		case NC_GPENCIL:
 			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED))
 				ED_region_tag_redraw(ar);
@@ -813,6 +833,7 @@ static void image_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion
 		case NC_IMAGE:
 			if (wmn->action == NA_PAINTING)
 				ED_region_tag_redraw(ar);
+			WM_manipulatormap_tag_refresh(ar->manipulator_map);
 			break;
 		case NC_MATERIAL:
 			if (wmn->data == ND_SHADING_LINKS) {
@@ -822,6 +843,11 @@ static void image_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion
 					ED_region_tag_redraw(ar);
 			}
 			break;
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 	}
 }
 
@@ -844,7 +870,9 @@ static void image_buttons_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void image_buttons_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_buttons_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -917,7 +945,9 @@ static void image_tools_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void image_tools_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_tools_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -950,6 +980,21 @@ static void image_tools_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 	}
 }
 
+static void image_tools_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *UNUSED(sa), struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+	WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_region_tag_redraw);
+}
+
+
 /************************* header region **************************/
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -968,7 +1013,9 @@ static void image_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void image_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1037,6 +1084,7 @@ void ED_spacetype_image(void)
 	st->refresh = image_refresh;
 	st->listener = image_listener;
 	st->context = image_context;
+	st->manipulators = image_widgets;
 	st->id_remap = image_id_remap;
 
 	/* regions: main window */
@@ -1068,6 +1116,7 @@ void ED_spacetype_image(void)
 	art->prefsizex = 220; // XXX
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
 	art->listener = image_tools_region_listener;
+	art->message_subscribe = image_tools_region_message_subscribe;
 	art->init = image_tools_region_init;
 	art->draw = image_tools_region_draw;
 	BLI_addhead(&st->regiontypes, art);
diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c
index 10d92366606..a6b3dad239c 100644
--- a/source/blender/editors/space_info/info_report.c
+++ b/source/blender/editors/space_info/info_report.c
@@ -133,9 +133,6 @@ static int select_report_pick_invoke(bContext *C, wmOperator *op, const wmEvent
 	ReportList *reports = CTX_wm_reports(C);
 	Report *report;
 
-	/* uses opengl */
-	wmSubWindowSet(CTX_wm_window(C), ar->swinid);
-
 	report = info_text_pick(sinfo, ar, reports, event->mval[1]);
 
 	RNA_int_set(op->ptr, "report_index", BLI_findindex(&reports->list, report));
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index b00cb1fc585..481c9031a73 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -37,6 +37,7 @@
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
@@ -49,9 +50,11 @@
 #include "BKE_displist.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_editmesh.h"
+#include "BKE_object.h"
 
 #include "ED_info.h"
 #include "ED_armature.h"
@@ -269,9 +272,32 @@ static void stats_object_sculpt_dynamic_topology(Object *ob, SceneStats *stats)
 	stats->tottri = ob->sculpt->bm->totface;
 }
 
+static void stats_dupli_object_group_count(Collection *collection, int *count)
+{
+	*count += BLI_listbase_count(&collection->gobject);
+
+	for (CollectionChild *child = collection->children.first; child; child = child->next) {
+		stats_dupli_object_group_count(child->collection, count);
+	}
+}
+
+static void stats_dupli_object_group_doit(Collection *collection, SceneStats *stats, ParticleSystem *psys,
+                                          const int totgroup, int *cur)
+{
+	for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+		int tot = count_particles_mod(psys, totgroup, *cur);
+		stats_object(cob->ob, 0, tot, stats);
+		(*cur)++;
+	}
+
+	for (CollectionChild *child = collection->children.first; child; child = child->next) {
+		stats_dupli_object_group_doit(child->collection, stats, psys, totgroup, cur);
+	}
+}
+
 static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
 {
-	if (base->flag & SELECT) stats->totobjsel++;
+	if (base->flag & BASE_SELECTED) stats->totobjsel++;
 
 	if (ob->transflag & OB_DUPLIPARTS) {
 		/* Dupli Particles */
@@ -286,21 +312,15 @@ static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
 				stats_object(part->dup_ob, 0, tot, stats);
 			}
 			else if (part->draw_as == PART_DRAW_GR && part->dup_group) {
-				GroupObject *go;
-				int tot, totgroup = 0, cur = 0;
-
-				for (go = part->dup_group->gobject.first; go; go = go->next)
-					totgroup++;
+				int totgroup = 0, cur = 0;
 
-				for (go = part->dup_group->gobject.first; go; go = go->next) {
-					tot = count_particles_mod(psys, totgroup, cur);
-					stats_object(go->ob, 0, tot, stats);
-					cur++;
-				}
+				Collection *collection = part->dup_group;
+				stats_dupli_object_group_count(collection, &totgroup);
+				stats_dupli_object_group_doit(collection, stats, psys, totgroup, &cur);
 			}
 		}
 
-		stats_object(ob, base->flag & SELECT, 1, stats);
+		stats_object(ob, base->flag & BASE_SELECTED, 1, stats);
 		stats->totobj++;
 	}
 	else if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) {
@@ -316,71 +336,77 @@ static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
 		}
 
 		stats->totobj += tot;
-		stats_object(ob, base->flag & SELECT, tot, stats);
+		stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
 	}
 	else if (ob->transflag & OB_DUPLIFRAMES) {
 		/* Dupli Frames */
 		int tot = count_duplilist(ob);
 		stats->totobj += tot;
-		stats_object(ob, base->flag & SELECT, tot, stats);
+		stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
 	}
-	else if ((ob->transflag & OB_DUPLIGROUP) && ob->dup_group) {
+	else if ((ob->transflag & OB_DUPLICOLLECTION) && ob->dup_group) {
 		/* Dupli Group */
 		int tot = count_duplilist(ob);
 		stats->totobj += tot;
-		stats_object(ob, base->flag & SELECT, tot, stats);
+		stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
 	}
 	else {
 		/* No Dupli */
-		stats_object(ob, base->flag & SELECT, 1, stats);
+		stats_object(ob, base->flag & BASE_SELECTED, 1, stats);
 		stats->totobj++;
 	}
 }
 
-static bool stats_is_object_dynamic_topology_sculpt(Object *ob)
+static bool stats_is_object_dynamic_topology_sculpt(Object *ob, const eObjectMode object_mode)
 {
-	return (ob && (ob->mode & OB_MODE_SCULPT) &&
+	return (ob &&
+	        (object_mode & OB_MODE_SCULPT) &&
 	        ob->sculpt && ob->sculpt->bm);
 }
 
 /* Statistics displayed in info header. Called regularly on scene changes. */
-static void stats_update(Scene *scene)
+static void stats_update(ViewLayer *view_layer)
 {
 	SceneStats stats = {0};
-	Object *ob = (scene->basact) ? scene->basact->object : NULL;
+	Object *ob = OBACT(view_layer);
+	Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
 	Base *base;
 
-	if (scene->obedit) {
+	if (obedit) {
 		/* Edit Mode */
-		stats_object_edit(scene->obedit, &stats);
+		stats_object_edit(ob, &stats);
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
 		/* Pose Mode */
 		stats_object_pose(ob, &stats);
 	}
-	else if (stats_is_object_dynamic_topology_sculpt(ob)) {
+	else if (ob && stats_is_object_dynamic_topology_sculpt(ob, ob->mode)) {
 		/* Dynamic-topology sculpt mode */
 		stats_object_sculpt_dynamic_topology(ob, &stats);
 	}
 	else {
 		/* Objects */
-		for (base = scene->base.first; base; base = base->next)
-			if (scene->lay & base->lay)
+		for (base = view_layer->object_bases.first; base; base = base->next)
+			if (base->flag & BASE_VISIBLED) {
 				stats_dupli_object(base, base->object, &stats);
+			}
 	}
 
-	if (!scene->stats)
-		scene->stats = MEM_callocN(sizeof(SceneStats), "SceneStats");
+	if (!view_layer->stats) {
+		view_layer->stats = MEM_callocN(sizeof(SceneStats), "SceneStats");
+	}
 
-	*(scene->stats) = stats;
+	*(view_layer->stats) = stats;
 }
 
-static void stats_string(Scene *scene)
+static void stats_string(ViewLayer *view_layer)
 {
 #define MAX_INFO_MEM_LEN  64
-	SceneStats *stats = scene->stats;
+	SceneStats *stats = view_layer->stats;
 	SceneStatsFmt stats_fmt;
-	Object *ob = (scene->basact) ? scene->basact->object : NULL;
+	Object *ob = OBACT(view_layer);
+	Object *obedit = OBEDIT_FROM_OBACT(ob);
+	eObjectMode object_mode = ob ? ob->mode : OB_MODE_OBJECT;
 	uintptr_t mem_in_use, mmap_in_use;
 	char memstr[MAX_INFO_MEM_LEN];
 	char gpumemstr[MAX_INFO_MEM_LEN] = "";
@@ -447,17 +473,17 @@ static void stats_string(Scene *scene)
 
 	ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, "%s | ", versionstr);
 
-	if (scene->obedit) {
-		if (BKE_keyblock_from_object(scene->obedit))
+	if (obedit) {
+		if (BKE_keyblock_from_object(obedit))
 			ofs += BLI_strncpy_rlen(s + ofs, IFACE_("(Key) "), MAX_INFO_LEN - ofs);
 
-		if (scene->obedit->type == OB_MESH) {
+		if (obedit->type == OB_MESH) {
 			ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs,
 			                    IFACE_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"),
 			                    stats_fmt.totvertsel, stats_fmt.totvert, stats_fmt.totedgesel, stats_fmt.totedge,
 			                    stats_fmt.totfacesel, stats_fmt.totface, stats_fmt.tottri);
 		}
-		else if (scene->obedit->type == OB_ARMATURE) {
+		else if (obedit->type == OB_ARMATURE) {
 			ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%s/%s | Bones:%s/%s"), stats_fmt.totvertsel,
 			                    stats_fmt.totvert, stats_fmt.totbonesel, stats_fmt.totbone);
 		}
@@ -469,11 +495,11 @@ static void stats_string(Scene *scene)
 		ofs += BLI_strncpy_rlen(s + ofs, memstr, MAX_INFO_LEN - ofs);
 		ofs += BLI_strncpy_rlen(s + ofs, gpumemstr, MAX_INFO_LEN - ofs);
 	}
-	else if (ob && (ob->mode & OB_MODE_POSE)) {
+	else if (ob && (object_mode & OB_MODE_POSE)) {
 		ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Bones:%s/%s %s%s"),
 		                    stats_fmt.totbonesel, stats_fmt.totbone, memstr, gpumemstr);
 	}
-	else if (stats_is_object_dynamic_topology_sculpt(ob)) {
+	else if (stats_is_object_dynamic_topology_sculpt(ob, object_mode)) {
 		ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%s | Tris:%s%s"), stats_fmt.totvert,
 		                    stats_fmt.tottri, gpumemstr);
 	}
@@ -493,19 +519,19 @@ static void stats_string(Scene *scene)
 
 #undef MAX_INFO_LEN
 
-void ED_info_stats_clear(Scene *scene)
+void ED_info_stats_clear(ViewLayer *view_layer)
 {
-	if (scene->stats) {
-		MEM_freeN(scene->stats);
-		scene->stats = NULL;
+	if (view_layer->stats) {
+		MEM_freeN(view_layer->stats);
+		view_layer->stats = NULL;
 	}
 }
 
-const char *ED_info_stats_string(Scene *scene)
+const char *ED_info_stats_string(Scene *UNUSED(scene), ViewLayer *view_layer)
 {
-	if (!scene->stats)
-		stats_update(scene);
-	stats_string(scene);
-
-	return scene->stats->infostr;
+	if (!view_layer->stats) {
+		stats_update(view_layer);
+	}
+	stats_string(view_layer);
+	return view_layer->stats->infostr;
 }
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index 92b1be066b0..65b3c7bb9fd 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -50,6 +50,9 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+
+#include "RNA_access.h"
 
 #include "UI_resources.h"
 #include "UI_interface.h"
@@ -60,7 +63,7 @@
 
 /* ******************** default callbacks for info space ***************** */
 
-static SpaceLink *info_new(const bContext *UNUSED(C))
+static SpaceLink *info_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceInfo *sinfo;
@@ -75,7 +78,7 @@ static SpaceLink *info_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&sinfo->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* main region */
 	ar = MEM_callocN(sizeof(ARegion), "main region for info");
@@ -236,7 +239,9 @@ static void info_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void info_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void info_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	// SpaceInfo *sinfo = sa->spacedata.first;
 
@@ -251,13 +256,16 @@ static void info_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
 	}
 }
 
-static void info_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void info_header_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
 		case NC_SCREEN:
-			if (ELEM(wmn->data, ND_SCREENCAST, ND_ANIMPLAY))
+			if (ELEM(wmn->data, ND_LAYER, ND_SCREENCAST, ND_ANIMPLAY)) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_WM:
 			if (wmn->data == ND_JOB)
@@ -279,6 +287,22 @@ static void info_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegi
 
 }
 
+static void info_header_region_message_subscribe(
+        const bContext *UNUSED(C),
+        WorkSpace *UNUSED(workspace), Scene *UNUSED(scene),
+        bScreen *UNUSED(screen), ScrArea *UNUSED(sa), ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw);
+}
+
 static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
 {
 	struct RecentFile *recent;
@@ -342,6 +366,7 @@ void ED_spacetype_info(void)
 
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
 	art->listener = info_header_listener;
+	art->message_subscribe = info_header_region_message_subscribe;
 	art->init = info_header_region_init;
 	art->draw = info_header_region_draw;
 
diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c
index 334106ff08d..85de70c020f 100644
--- a/source/blender/editors/space_info/textview.c
+++ b/source/blender/editors/space_info/textview.c
@@ -39,6 +39,8 @@
 #include "BLI_utildefines.h"
 #include "BLI_string_utf8.h"
 
+#include "GPU_immediate.h"
+
 #include "BIF_gl.h"
 
 #include "BKE_text.h"
@@ -80,10 +82,16 @@ static void console_draw_sel(const char *str, const int sel[2], const int xy[2],
 		const int end = txt_utf8_offset_to_column(str, min_ii(sel[1], str_len_draw));
 
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glColor4ubv(bg_sel);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformColor4ubv(bg_sel);
+		immRecti(pos, xy[0] + (cwidth * sta), xy[1] - 2 + lheight, xy[0] + (cwidth * end), xy[1] - 2);
 
-		glRecti(xy[0] + (cwidth * sta), xy[1] - 2 + lheight, xy[0] + (cwidth * end), xy[1] - 2);
+		immUnbindProgram();
 
 		glDisable(GL_BLEND);
 	}
@@ -182,21 +190,25 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 		cdc->sel[1] = str_len - sel_orig[0];
 
 		if (bg) {
-			glColor3ubv(bg);
-			glRecti(0, cdc->xy[1], cdc->winx, (cdc->xy[1] + (cdc->lheight * tot_lines)));
-		}
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		glColor3ubv(fg);
+			immUniformColor3ubv(bg);
+			immRecti(pos, 0, cdc->xy[1], cdc->winx, (cdc->xy[1] + (cdc->lheight * tot_lines)));
+
+			immUnbindProgram();
+		}
 
 		/* last part needs no clipping */
 		BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0);
+		BLF_color3ubv(cdc->font_id, fg);
 		BLF_draw_mono(cdc->font_id, s, len, cdc->cwidth);
 
 		if (cdc->sel[0] != cdc->sel[1]) {
 			console_step_sel(cdc, -initial_offset);
-			// glColor4ub(255, 0, 0, 96); // debug
+			/* BLF_color3ub(cdc->font_id, 255, 0, 0); // debug */
 			console_draw_sel(s, cdc->sel, cdc->xy, len, cdc->cwidth, cdc->lheight, bg_sel);
-			glColor3ubv(fg);
 		}
 
 		cdc->xy[1] += cdc->lheight;
@@ -210,9 +222,8 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 
 			if (cdc->sel[0] != cdc->sel[1]) {
 				console_step_sel(cdc, len);
-				// glColor4ub(0, 255, 0, 96); // debug
+				/* BLF_color3ub(cdc->font_id, 0, 255, 0); // debug */
 				console_draw_sel(s, cdc->sel, cdc->xy, len, cdc->cwidth, cdc->lheight, bg_sel);
-				glColor3ubv(fg);
 			}
 
 			cdc->xy[1] += cdc->lheight;
@@ -230,12 +241,17 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 	else { /* simple, no wrap */
 
 		if (bg) {
-			glColor3ubv(bg);
-			glRecti(0, cdc->xy[1], cdc->winx, cdc->xy[1] + cdc->lheight);
-		}
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		glColor3ubv(fg);
+			immUniformColor3ubv(bg);
+			immRecti(pos, 0, cdc->xy[1], cdc->winx, cdc->xy[1] + cdc->lheight);
+
+			immUnbindProgram();
+		}
 
+		BLF_color3ubv(cdc->font_id, fg);
 		BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0);
 		BLF_draw_mono(cdc->font_id, str, str_len, cdc->cwidth);
 
@@ -245,7 +261,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 			isel[0] = str_len - cdc->sel[1];
 			isel[1] = str_len - cdc->sel[0];
 
-			// glColor4ub(255, 255, 0, 96); // debug
+			/* BLF_color3ub(cdc->font_id, 255, 255, 0); // debug */
 			console_draw_sel(str, isel, cdc->xy, str_len, cdc->cwidth, cdc->lheight, bg_sel);
 			console_step_sel(cdc, -(str_len + 1));
 		}
diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c
deleted file mode 100644
index 9de3daa41ca..00000000000
--- a/source/blender/editors/space_logic/logic_buttons.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 by Blender Foundation
- * All rights reserved.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_logic/logic_buttons.c
- *  \ingroup splogic
- */
-
-
-#include <string.h>
-#include <stdio.h>
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_context.h"
-
-#include "ED_screen.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "UI_interface.h"
-#include "UI_view2d.h"
-
-#include "interface_intern.h"
-#include "logic_intern.h"
-
-static int logic_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = logic_has_buttons_region(sa);
-
-	if (ar)
-		ED_region_toggle_hidden(C, ar);
-
-	return OPERATOR_FINISHED;
-}
-
-void LOGIC_OT_properties(wmOperatorType *ot)
-{
-	ot->name = "Properties";
-	ot->description = "Toggle the properties region visibility";
-	ot->idname = "LOGIC_OT_properties";
-
-	ot->exec = logic_properties_toggle_exec;
-	ot->poll = ED_operator_logic_active;
-
-	/* flags */
-	ot->flag = 0;
-}
-
-/* Remove Logic Bricks Connections */
-/* ********************** Cut Link operator ***************** */
-
-#define LINK_RESOL 12
-static int cut_links_intersect(uiLinkLine *line, float mcoords[][2], int tot)
-{
-	float coord_array[LINK_RESOL+1][2];
-	int i, b;
-	rcti rectlink;
-
-	rectlink.xmin = (int)BLI_rctf_cent_x(&line->from->rect);
-	rectlink.ymin = (int)BLI_rctf_cent_y(&line->from->rect);
-	rectlink.xmax = (int)BLI_rctf_cent_x(&line->to->rect);
-	rectlink.ymax = (int)BLI_rctf_cent_y(&line->to->rect);
-
-	if (ui_link_bezier_points(&rectlink, coord_array, LINK_RESOL)) {
-		for (i=0; i<tot-1; i++)
-			for (b=0; b<LINK_RESOL-1; b++)
-				if (isect_seg_seg_v2(mcoords[i], mcoords[i + 1], coord_array[b], coord_array[b + 1]) > 0)
-					return 1;
-	}
-	return 0;
-}
-
-static int cut_links_exec(bContext *C, wmOperator *op)
-{
-	ARegion *ar = CTX_wm_region(C);
-	float mcoords[256][2];
-	int i = 0;
-
-	RNA_BEGIN (op->ptr, itemptr, "path")
-	{
-		float loc[2];
-
-		RNA_float_get_array(&itemptr, "loc", loc);
-		UI_view2d_region_to_view(&ar->v2d,
-		                         (int)loc[0], (int)loc[1],
-		                         &mcoords[i][0], &mcoords[i][1]);
-		i++;
-		if (i >= 256) break;
-	}
-	RNA_END;
-
-	if (i>1) {
-		uiBlock *block;
-		uiLinkLine *line, *nline;
-		uiBut *but;
-		for (block = ar->uiblocks.first; block; block = block->next) {
-			but = block->buttons.first;
-			while (but) {
-				if (but->type==UI_BTYPE_LINK && but->link) {
-					for (line = but->link->lines.first; line; line = nline) {
-						nline = line->next;
-
-						if (cut_links_intersect(line, mcoords, i)) {
-							ui_linkline_remove(line, but);
-						}
-					}
-				}
-				but = but->next;
-			}
-		}
-		return OPERATOR_FINISHED;
-	}
-	return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
-}
-
-void LOGIC_OT_links_cut(wmOperatorType *ot)
-{
-	ot->name = "Cut Links";
-	ot->idname = "LOGIC_OT_links_cut";
-	ot->description = "Remove logic brick connections";
-
-	ot->invoke = WM_gesture_lines_invoke;
-	ot->modal = WM_gesture_lines_modal;
-	ot->exec = cut_links_exec;
-	ot->cancel = WM_gesture_lines_cancel;
-
-	ot->poll = ED_operator_logic_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	/* properties */
-	PropertyRNA *prop;
-	prop = RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", "");
-	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
-	/* internal */
-	RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX);
-}
-
diff --git a/source/blender/editors/space_logic/logic_intern.h b/source/blender/editors/space_logic/logic_intern.h
deleted file mode 100644
index b976538b729..00000000000
--- a/source/blender/editors/space_logic/logic_intern.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_logic/logic_intern.h
- *  \ingroup splogic
- */
-
-
-#ifndef __LOGIC_INTERN_H__
-#define __LOGIC_INTERN_H__
-
-/* internal exports only */
-struct bContext;
-struct ARegion;
-struct ScrArea;
-struct wmOperatorType;
-
-/* space_logic.c */
-struct ARegion *logic_has_buttons_region(struct ScrArea *sa);
-
-/* logic_ops.c */
-
-/* logic_buttons.c */
-void LOGIC_OT_properties(struct wmOperatorType *ot);
-void LOGIC_OT_links_cut(struct wmOperatorType *ot);
-
-/* logic_window.c */
-void logic_buttons(struct bContext *C, struct ARegion *ar);
-void make_unique_prop_names(struct bContext *C, char *str);
-
-#endif /* __LOGIC_INTERN_H__ */
-
diff --git a/source/blender/editors/space_logic/logic_ops.c b/source/blender/editors/space_logic/logic_ops.c
deleted file mode 100644
index 143583a9600..00000000000
--- a/source/blender/editors/space_logic/logic_ops.c
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_logic/logic_ops.c
- *  \ingroup splogic
- */
-
-#include <stddef.h>
-
-#include "DNA_object_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_actuator_types.h"
-#include "DNA_scene_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_string_utils.h"
-#include "BLI_utildefines.h"
-
-#include "BLT_translation.h"
-
-#include "BKE_context.h"
-#include "BKE_main.h"
-#include "BKE_sca.h"
-
-#include "ED_logic.h"
-#include "ED_object.h"
-#include "ED_screen.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-#include "RNA_enum_types.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "UI_view2d.h"
-
-#include "logic_intern.h"
-
-/* ************* Generic Operator Helpers ************* */
-static int edit_sensor_poll(bContext *C)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
-
-	if (ptr.data && ID_IS_LINKED(ptr.id.data)) return 0;
-	return 1;
-}
-
-static int edit_controller_poll(bContext *C)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
-
-	if (ptr.data && ID_IS_LINKED(ptr.id.data)) return 0;
-	return 1;
-}
-
-static int edit_actuator_poll(bContext *C)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
-
-	if (ptr.data && ID_IS_LINKED(ptr.id.data)) return 0;
-	return 1;
-}
-
-static void edit_sensor_properties(wmOperatorType *ot)
-{
-	RNA_def_string(ot->srna, "sensor", NULL, MAX_NAME, "Sensor", "Name of the sensor to edit");
-	RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the object the sensor belongs to");
-}
-
-static int edit_sensor_invoke_properties(bContext *C, wmOperator *op)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
-
-	if (RNA_struct_property_is_set(op->ptr, "sensor") && RNA_struct_property_is_set(op->ptr, "object") )
-		return 1;
-
-	if (ptr.data) {
-		bSensor *sens = ptr.data;
-		Object *ob = ptr.id.data;
-
-		RNA_string_set(op->ptr, "sensor", sens->name);
-		RNA_string_set(op->ptr, "object", ob->id.name + 2);
-		return 1;
-	}
-
-	return 0;
-}
-
-static Object *edit_object_property_get(bContext *C, wmOperator *op)
-{
-	char ob_name[MAX_NAME];
-	Object *ob;
-
-	RNA_string_get(op->ptr, "object", ob_name);
-
-	/* if ob_name is valid try to find the object with this name
-	 * otherwise gets the active object */
-	if (*ob_name)
-		ob = BLI_findstring(&(CTX_data_main(C)->object), ob_name, offsetof(ID, name) + 2);
-	else
-		ob = ED_object_active_context(C);
-
-	return ob;
-}
-
-static bSensor *edit_sensor_property_get(bContext *C, wmOperator *op, Object **ob)
-{
-	char sensor_name[MAX_NAME];
-	bSensor *sens;
-
-	RNA_string_get(op->ptr, "sensor", sensor_name);
-
-	*ob = edit_object_property_get(C, op);
-	if (!*ob) return NULL;
-
-	sens = BLI_findstring(&((*ob)->sensors), sensor_name, offsetof(bSensor, name));
-	return sens;
-}
-
-static void edit_controller_properties(wmOperatorType *ot)
-{
-	RNA_def_string(ot->srna, "controller", NULL, MAX_NAME, "Controller", "Name of the controller to edit");
-	RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the object the controller belongs to");
-}
-
-static int edit_controller_invoke_properties(bContext *C, wmOperator *op)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
-
-	if (RNA_struct_property_is_set(op->ptr, "controller") && RNA_struct_property_is_set(op->ptr, "object") )
-		return 1;
-
-	if (ptr.data) {
-		bController *cont = ptr.data;
-		Object *ob = ptr.id.data;
-
-		RNA_string_set(op->ptr, "controller", cont->name);
-		RNA_string_set(op->ptr, "object", ob->id.name + 2);
-		return 1;
-	}
-
-	return 0;
-}
-
-static bController *edit_controller_property_get(bContext *C, wmOperator *op, Object **ob)
-{
-	char controller_name[MAX_NAME];
-	bController *cont;
-
-	RNA_string_get(op->ptr, "controller", controller_name);
-
-	*ob = edit_object_property_get(C, op);
-	if (!*ob) return NULL;
-
-	cont = BLI_findstring(&((*ob)->controllers), controller_name, offsetof(bController, name));
-	return cont;
-}
-
-static void edit_actuator_properties(wmOperatorType *ot)
-{
-	RNA_def_string(ot->srna, "actuator", NULL, MAX_NAME, "Actuator", "Name of the actuator to edit");
-	RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the object the actuator belongs to");
-}
-
-static int edit_actuator_invoke_properties(bContext *C, wmOperator *op)
-{
-	PointerRNA ptr = CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
-
-	if (RNA_struct_property_is_set(op->ptr, "actuator") && RNA_struct_property_is_set(op->ptr, "object") )
-		return 1;
-
-	if (ptr.data) {
-		bActuator *act = ptr.data;
-		Object *ob = ptr.id.data;
-
-		RNA_string_set(op->ptr, "actuator", act->name);
-		RNA_string_set(op->ptr, "object", ob->id.name + 2);
-		return 1;
-	}
-
-	return 0;
-}
-
-static bActuator *edit_actuator_property_get(bContext *C, wmOperator *op, Object **ob)
-{
-	char actuator_name[MAX_NAME];
-	bActuator *act;
-
-	RNA_string_get(op->ptr, "actuator", actuator_name);
-
-	*ob = edit_object_property_get(C, op);
-	if (!*ob) return NULL;
-
-	act = BLI_findstring(&((*ob)->actuators), actuator_name, offsetof(bActuator, name));
-	return act;
-}
-
-static int logicbricks_move_property_get(wmOperator *op)
-{
-	int type = RNA_enum_get(op->ptr, "direction");
-
-	if (type == 1)
-		return true;
-	else
-		return false;
-}
-
-/* ************* Add/Remove Sensor Operator ************* */
-
-static int sensor_remove_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bSensor *sens = edit_sensor_property_get(C, op, &ob);
-
-	if (!sens)
-		return OPERATOR_CANCELLED;
-
-	BLI_remlink(&(ob->sensors), sens);
-	free_sensor(sens);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int sensor_remove_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_sensor_invoke_properties(C, op))
-		return sensor_remove_exec(C, op);
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_sensor_remove(wmOperatorType *ot)
-{
-	ot->name = "Remove Sensor";
-	ot->description = "Remove a sensor from the active object";
-	ot->idname = "LOGIC_OT_sensor_remove";
-
-	ot->invoke = sensor_remove_invoke;
-	ot->exec = sensor_remove_exec;
-	ot->poll = edit_sensor_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-	edit_sensor_properties(ot);
-}
-
-static int sensor_add_exec(bContext *C, wmOperator *op)
-{
-	Object *ob;
-	bSensor *sens;
-	PointerRNA sens_ptr;
-	PropertyRNA *prop;
-	const char *sens_name;
-	char name[MAX_NAME];
-	int type = RNA_enum_get(op->ptr, "type");
-
-	ob = edit_object_property_get(C, op);
-	if (!ob)
-		return OPERATOR_CANCELLED;
-
-	sens = new_sensor(type);
-	BLI_addtail(&(ob->sensors), sens);
-
-	/* set the sensor name based on rna type enum */
-	RNA_pointer_create((ID *)ob, &RNA_Sensor, sens, &sens_ptr);
-	prop = RNA_struct_find_property(&sens_ptr, "type");
-
-	RNA_string_get(op->ptr, "name", name);
-	if (*name) {
-		BLI_strncpy(sens->name, name, sizeof(sens->name));
-	}
-	else {
-		RNA_property_enum_name(C, &sens_ptr, prop, RNA_property_enum_get(&sens_ptr, prop), &sens_name);
-		BLI_strncpy(sens->name, sens_name, sizeof(sens->name));
-	}
-
-	BLI_uniquename(&ob->sensors, sens, DATA_("Sensor"), '.', offsetof(bSensor, name), sizeof(sens->name));
-	ob->scaflag |= OB_SHOWSENS;
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static void LOGIC_OT_sensor_add(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Add Sensor";
-	ot->description = "Add a sensor to the active object";
-	ot->idname = "LOGIC_OT_sensor_add";
-
-	/* api callbacks */
-	ot->invoke = WM_menu_invoke;
-	ot->exec = sensor_add_exec;
-	ot->poll = ED_operator_object_active_editable;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	ot->prop = prop = RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS, "Type", "Type of sensor to add");
-	RNA_def_enum_funcs(prop, rna_Sensor_type_itemf);
-	prop = RNA_def_string(ot->srna, "name", NULL, MAX_NAME, "Name", "Name of the Sensor to add");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the Object to add the Sensor to");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-}
-
-/* ************* Add/Remove Controller Operator ************* */
-
-static int controller_remove_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bController *cont = edit_controller_property_get(C, op, &ob);
-
-	if (!cont)
-		return OPERATOR_CANCELLED;
-
-	BLI_remlink(&(ob->controllers), cont);
-	unlink_controller(cont);
-	free_controller(cont);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int controller_remove_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_controller_invoke_properties(C, op))
-		return controller_remove_exec(C, op);
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_controller_remove(wmOperatorType *ot)
-{
-	ot->name = "Remove Controller";
-	ot->description = "Remove a controller from the active object";
-	ot->idname = "LOGIC_OT_controller_remove";
-
-	ot->invoke = controller_remove_invoke;
-	ot->exec = controller_remove_exec;
-	ot->poll = edit_controller_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-	edit_controller_properties(ot);
-}
-
-static int controller_add_exec(bContext *C, wmOperator *op)
-{
-	Object *ob;
-	bController *cont;
-	PointerRNA cont_ptr;
-	PropertyRNA *prop;
-	const char *cont_name;
-	int bit;
-	char name[MAX_NAME];
-	int type = RNA_enum_get(op->ptr, "type");
-
-	ob = edit_object_property_get(C, op);
-	if (!ob)
-		return OPERATOR_CANCELLED;
-
-	cont = new_controller(type);
-	BLI_addtail(&(ob->controllers), cont);
-
-	/* set the controller name based on rna type enum */
-	RNA_pointer_create((ID *)ob, &RNA_Controller, cont, &cont_ptr);
-	prop = RNA_struct_find_property(&cont_ptr, "type");
-
-	RNA_string_get(op->ptr, "name", name);
-	if (*name) {
-		BLI_strncpy(cont->name, name, sizeof(cont->name));
-	}
-	else {
-		RNA_property_enum_name(C, &cont_ptr, prop, RNA_property_enum_get(&cont_ptr, prop), &cont_name);
-		BLI_strncpy(cont->name, cont_name, sizeof(cont->name));
-	}
-
-	BLI_uniquename(&ob->controllers, cont, DATA_("Controller"), '.', offsetof(bController, name), sizeof(cont->name));
-
-	/* set the controller state mask from the current object state.
-	 * A controller is always in a single state, so select the lowest bit set
-	 * from the object state */
-	for (bit = 0; bit < OB_MAX_STATES; bit++) {
-		if (ob->state & (1 << bit))
-			break;
-	}
-	cont->state_mask = (1 << bit);
-	if (cont->state_mask == 0) {
-		/* shouldn't happen, object state is never 0 */
-		cont->state_mask = 1;
-	}
-
-	ob->scaflag |= OB_SHOWCONT;
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static void LOGIC_OT_controller_add(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Add Controller";
-	ot->description = "Add a controller to the active object";
-	ot->idname = "LOGIC_OT_controller_add";
-
-	/* api callbacks */
-	ot->invoke = WM_menu_invoke;
-	ot->exec = controller_add_exec;
-	ot->poll = ED_operator_object_active_editable;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_controller_type_items, CONT_LOGIC_AND, "Type", "Type of controller to add");
-	prop = RNA_def_string(ot->srna, "name", NULL, MAX_NAME, "Name", "Name of the Controller to add");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the Object to add the Controller to");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-}
-
-/* ************* Add/Remove Actuator Operator ************* */
-
-static int actuator_remove_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bActuator *act = edit_actuator_property_get(C, op, &ob);
-
-	if (!act)
-		return OPERATOR_CANCELLED;
-
-	BLI_remlink(&(ob->actuators), act);
-	unlink_actuator(act);
-	free_actuator(act);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int actuator_remove_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_actuator_invoke_properties(C, op))
-		return actuator_remove_exec(C, op);
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_actuator_remove(wmOperatorType *ot)
-{
-	ot->name = "Remove Actuator";
-	ot->description = "Remove an actuator from the active object";
-	ot->idname = "LOGIC_OT_actuator_remove";
-
-	ot->invoke = actuator_remove_invoke;
-	ot->exec = actuator_remove_exec;
-	ot->poll = edit_actuator_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-	edit_actuator_properties(ot);
-}
-
-static int actuator_add_exec(bContext *C, wmOperator *op)
-{
-	Object *ob;
-	bActuator *act;
-	PointerRNA act_ptr;
-	PropertyRNA *prop;
-	const char *act_name;
-	char name[MAX_NAME];
-	int type = RNA_enum_get(op->ptr, "type");
-
-	ob = edit_object_property_get(C, op);
-	if (!ob)
-		return OPERATOR_CANCELLED;
-
-	act = new_actuator(type);
-	BLI_addtail(&(ob->actuators), act);
-
-	/* set the actuator name based on rna type enum */
-	RNA_pointer_create((ID *)ob, &RNA_Actuator, act, &act_ptr);
-	prop = RNA_struct_find_property(&act_ptr, "type");
-
-	RNA_string_get(op->ptr, "name", name);
-	if (*name) {
-		BLI_strncpy(act->name, name, sizeof(act->name));
-	}
-	else {
-		RNA_property_enum_name(C, &act_ptr, prop, RNA_property_enum_get(&act_ptr, prop), &act_name);
-		BLI_strncpy(act->name, act_name, sizeof(act->name));
-	}
-
-	BLI_uniquename(&ob->actuators, act, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name));
-	ob->scaflag |= OB_SHOWACT;
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static void LOGIC_OT_actuator_add(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Add Actuator";
-	ot->description = "Add an actuator to the active object";
-	ot->idname = "LOGIC_OT_actuator_add";
-
-	/* api callbacks */
-	ot->invoke = WM_menu_invoke;
-	ot->exec = actuator_add_exec;
-	ot->poll = ED_operator_object_active_editable;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	ot->prop = prop = RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, CONT_LOGIC_AND, "Type", "Type of actuator to add");
-	RNA_def_enum_funcs(prop, rna_Actuator_type_itemf);
-	prop = RNA_def_string(ot->srna, "name", NULL, MAX_NAME, "Name", "Name of the Actuator to add");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_string(ot->srna, "object", NULL, MAX_NAME, "Object", "Name of the Object to add the Actuator to");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-}
-
-/* ************* Move Logic Bricks Operator ************* */
-static const EnumPropertyItem logicbricks_move_direction[] = {
-	{1, "UP", 0, "Move Up", ""},
-	{2, "DOWN", 0, "Move Down", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-
-static int sensor_move_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bSensor *sens = edit_sensor_property_get(C, op, &ob);
-	int move_up = logicbricks_move_property_get(op);
-
-	if (!sens)
-		return OPERATOR_CANCELLED;
-
-	sca_move_sensor(sens, ob, move_up);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int sensor_move_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_sensor_invoke_properties(C, op)) {
-		return sensor_move_exec(C, op);
-	}
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_sensor_move(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Move Sensor";
-	ot->description = "Move Sensor";
-	ot->idname = "LOGIC_OT_sensor_move";
-
-	/* api callbacks */
-	ot->invoke = sensor_move_invoke;
-	ot->exec = sensor_move_exec;
-	ot->poll = edit_sensor_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	edit_sensor_properties(ot);
-	RNA_def_enum(ot->srna, "direction", logicbricks_move_direction, 1, "Direction", "Move Up or Down");
-}
-
-static int controller_move_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bController *cont = edit_controller_property_get(C, op, &ob);
-	int move_up = logicbricks_move_property_get(op);
-
-	if (!cont)
-		return OPERATOR_CANCELLED;
-
-	sca_move_controller(cont, ob, move_up);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int controller_move_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_controller_invoke_properties(C, op)) {
-		return controller_move_exec(C, op);
-	}
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_controller_move(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Move Controller";
-	ot->description = "Move Controller";
-	ot->idname = "LOGIC_OT_controller_move";
-
-	/* api callbacks */
-	ot->invoke = controller_move_invoke;
-	ot->exec = controller_move_exec;
-	ot->poll = edit_controller_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	edit_controller_properties(ot);
-	RNA_def_enum(ot->srna, "direction", logicbricks_move_direction, 1, "Direction", "Move Up or Down");
-}
-
-static int actuator_move_exec(bContext *C, wmOperator *op)
-{
-	Object *ob = NULL;
-	bActuator *act = edit_actuator_property_get(C, op, &ob);
-	int move_up = logicbricks_move_property_get(op);
-
-	if (!act)
-		return OPERATOR_CANCELLED;
-
-	sca_move_actuator(act, ob, move_up);
-
-	WM_event_add_notifier(C, NC_LOGIC, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int actuator_move_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	if (edit_actuator_invoke_properties(C, op)) {
-		return actuator_move_exec(C, op);
-	}
-	else
-		return OPERATOR_CANCELLED;
-}
-
-static void LOGIC_OT_actuator_move(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Move Actuator";
-	ot->description = "Move Actuator";
-	ot->idname = "LOGIC_OT_actuator_move";
-
-	/* api callbacks */
-	ot->invoke = actuator_move_invoke;
-	ot->exec = actuator_move_exec;
-	ot->poll = edit_actuator_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
-
-	/* properties */
-	edit_actuator_properties(ot);
-	RNA_def_enum(ot->srna, "direction", logicbricks_move_direction, 1, "Direction", "Move Up or Down");
-}
-
-/* ************************ view ********************* */
-
-static int logic_view_all_exec(bContext *C, wmOperator *op)
-{
-	ARegion *ar = CTX_wm_region(C);
-	rctf cur_new = ar->v2d.tot;
-	float aspect = BLI_rctf_size_y(&ar->v2d.cur) / BLI_rctf_size_x(&ar->v2d.cur);
-	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
-
-	/* force the view2d code to zoom to width, not height */
-	cur_new.ymin = cur_new.ymax - BLI_rctf_size_x(&cur_new) * aspect;
-
-	UI_view2d_smooth_view(C, ar, &cur_new, smooth_viewtx);
-
-	return OPERATOR_FINISHED;
-}
-
-static void LOGIC_OT_view_all(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "View All";
-	ot->idname = "LOGIC_OT_view_all";
-	ot->description = "Resize view so you can see all logic bricks";
-
-	/* api callbacks */
-	ot->exec = logic_view_all_exec;
-	ot->poll = ED_operator_logic_active;
-
-	/* flags */
-	ot->flag = 0;
-}
-
-/* ************************* */
-
-void ED_operatortypes_logic(void)
-{
-	WM_operatortype_append(LOGIC_OT_sensor_remove);
-	WM_operatortype_append(LOGIC_OT_sensor_add);
-	WM_operatortype_append(LOGIC_OT_sensor_move);
-	WM_operatortype_append(LOGIC_OT_controller_remove);
-	WM_operatortype_append(LOGIC_OT_controller_add);
-	WM_operatortype_append(LOGIC_OT_controller_move);
-	WM_operatortype_append(LOGIC_OT_actuator_remove);
-	WM_operatortype_append(LOGIC_OT_actuator_add);
-	WM_operatortype_append(LOGIC_OT_actuator_move);
-	WM_operatortype_append(LOGIC_OT_view_all);
-}
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
deleted file mode 100644
index c3729dd588e..00000000000
--- a/source/blender/editors/space_logic/logic_window.c
+++ /dev/null
@@ -1,2601 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_logic/logic_window.c
- *  \ingroup splogic
- */
-
-
-#include <string.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <float.h>
-
-#include "DNA_actuator_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_property_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_object_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_string_utils.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_action.h"
-#include "BKE_context.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
-#include "BKE_sca.h"
-
-#include "ED_undo.h"
-
-#include "BLT_translation.h"
-
-#include "UI_interface.h"
-#include "UI_view2d.h"
-
-#include "RNA_access.h"
-
-/* XXX BAD BAD */
-#include "../interface/interface_intern.h"
-
-#include "logic_intern.h"
-
-#define B_REDR		1
-
-#define B_ADD_SENS		2703
-#define B_CHANGE_SENS		2704
-#define B_DEL_SENS		2705
-
-#define B_ADD_CONT		2706
-#define B_CHANGE_CONT		2707
-#define B_DEL_CONT		2708
-
-#define B_ADD_ACT		2709
-#define B_CHANGE_ACT		2710
-#define B_DEL_ACT		2711
-
-#define B_SOUNDACT_BROWSE	2712
-
-#define B_SETPROP		2714
-#define B_SETACTOR		2715
-#define B_SETMAINACTOR		2716
-#define B_SETDYNA		2717
-#define B_SET_STATE_BIT	2718
-#define B_INIT_STATE_BIT	2719
-
-/* proto */
-static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisflag);
-
-static void do_logic_buts(bContext *C, void *UNUSED(arg), int event)
-{
-	Main *bmain= CTX_data_main(C);
-	bSensor *sens;
-	bController *cont;
-	bActuator *act;
-	Object *ob;
-	int didit, bit;
-
-	ob= CTX_data_active_object(C);
-	if (ob==NULL) return;
-
-	switch (event) {
-
-	case B_SETPROP:
-		/* check for inconsistent types */
-		ob->gameflag &= ~(OB_SECTOR|OB_MAINACTOR|OB_DYNAMIC|OB_ACTOR);
-		break;
-
-	case B_SETACTOR:
-	case B_SETDYNA:
-	case B_SETMAINACTOR:
-		ob->gameflag &= ~(OB_SECTOR|OB_PROP);
-		break;
-
-	case B_ADD_SENS:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			if (ob->scaflag & OB_ADDSENS) {
-				ob->scaflag &= ~OB_ADDSENS;
-				sens= new_sensor(SENS_ALWAYS);
-				BLI_addtail(&(ob->sensors), sens);
-				BLI_uniquename(&ob->sensors, sens, DATA_("Sensor"), '.', offsetof(bSensor, name), sizeof(sens->name));
-				ob->scaflag |= OB_SHOWSENS;
-			}
-		}
-
-		ED_undo_push(C, "Add sensor");
-		break;
-
-	case B_CHANGE_SENS:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			sens= ob->sensors.first;
-			while (sens) {
-				if (sens->type != sens->otype) {
-					init_sensor(sens);
-					sens->otype= sens->type;
-					break;
-				}
-				sens= sens->next;
-			}
-		}
-		break;
-
-	case B_DEL_SENS:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			sens= ob->sensors.first;
-			while (sens) {
-				if (sens->flag & SENS_DEL) {
-					BLI_remlink(&(ob->sensors), sens);
-					free_sensor(sens);
-					break;
-				}
-				sens= sens->next;
-			}
-		}
-		ED_undo_push(C, "Delete sensor");
-		break;
-
-	case B_ADD_CONT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			if (ob->scaflag & OB_ADDCONT) {
-				ob->scaflag &= ~OB_ADDCONT;
-				cont= new_controller(CONT_LOGIC_AND);
-				BLI_uniquename(&ob->controllers, cont, DATA_("Controller"), '.', offsetof(bController, name), sizeof(cont->name));
-				ob->scaflag |= OB_SHOWCONT;
-				BLI_addtail(&(ob->controllers), cont);
-				/* set the controller state mask from the current object state.
-				 * A controller is always in a single state, so select the lowest bit set
-				 * from the object state */
-				for (bit=0; bit<32; bit++) {
-					if (ob->state & (1<<bit))
-						break;
-				}
-				cont->state_mask = (1<<bit);
-				if (cont->state_mask == 0) {
-					/* shouldn't happen, object state is never 0 */
-					cont->state_mask = 1;
-				}
-			}
-		}
-		ED_undo_push(C, "Add controller");
-		break;
-
-	case B_SET_STATE_BIT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			if (ob->scaflag & OB_ALLSTATE) {
-				ob->scaflag &= ~OB_ALLSTATE;
-				ob->state = 0x3FFFFFFF;
-			}
-		}
-		break;
-
-	case B_INIT_STATE_BIT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			if (ob->scaflag & OB_INITSTBIT) {
-				ob->scaflag &= ~OB_INITSTBIT;
-				ob->state = ob->init_state;
-				if (!ob->state)
-					ob->state = 1;
-			}
-		}
-		break;
-
-	case B_CHANGE_CONT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			cont= ob->controllers.first;
-			while (cont) {
-				if (cont->type != cont->otype) {
-					init_controller(cont);
-					cont->otype= cont->type;
-					break;
-				}
-				cont= cont->next;
-			}
-		}
-		break;
-
-
-	case B_DEL_CONT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			cont= ob->controllers.first;
-			while (cont) {
-				if (cont->flag & CONT_DEL) {
-					BLI_remlink(&(ob->controllers), cont);
-					unlink_controller(cont);
-					free_controller(cont);
-					break;
-				}
-				cont= cont->next;
-			}
-		}
-		ED_undo_push(C, "Delete controller");
-		break;
-
-	case B_ADD_ACT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			if (ob->scaflag & OB_ADDACT) {
-				ob->scaflag &= ~OB_ADDACT;
-				act= new_actuator(ACT_OBJECT);
-				BLI_uniquename(&ob->actuators, act, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name));
-				BLI_addtail(&(ob->actuators), act);
-				ob->scaflag |= OB_SHOWACT;
-			}
-		}
-		ED_undo_push(C, "Add actuator");
-		break;
-
-	case B_CHANGE_ACT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			act= ob->actuators.first;
-			while (act) {
-				if (act->type != act->otype) {
-					init_actuator(act);
-					act->otype= act->type;
-					break;
-				}
-				act= act->next;
-			}
-		}
-		break;
-
-	case B_DEL_ACT:
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			act= ob->actuators.first;
-			while (act) {
-				if (act->flag & ACT_DEL) {
-					BLI_remlink(&(ob->actuators), act);
-					unlink_actuator(act);
-					free_actuator(act);
-					break;
-				}
-				act= act->next;
-			}
-		}
-		ED_undo_push(C, "Delete actuator");
-		break;
-
-	case B_SOUNDACT_BROWSE:
-		/* since we don't know which... */
-		didit= 0;
-		for (ob=bmain->object.first; ob; ob=ob->id.next) {
-			act= ob->actuators.first;
-			while (act) {
-				if (act->type==ACT_SOUND) {
-					bSoundActuator *sa= act->data;
-					if (sa->sndnr) {
-						ID *sound= bmain->sound.first;
-						int nr= 1;
-
-						if (sa->sndnr == -2) {
-// XXX							activate_databrowse((ID *)bmain->sound.first, ID_SO, 0, B_SOUNDACT_BROWSE,
-//											&sa->sndnr, do_logic_buts);
-							break;
-						}
-
-						while (sound) {
-							if (nr==sa->sndnr)
-								break;
-							nr++;
-							sound= sound->next;
-						}
-
-						if (sa->sound)
-							id_us_min(((ID *)sa->sound));
-
-						sa->sound= (struct bSound *)sound;
-
-						if (sound) {
-							id_us_plus(sound);
-						}
-
-						sa->sndnr= 0;
-						didit= 1;
-					}
-				}
-				act= act->next;
-			}
-			if (didit)
-				break;
-		}
-
-		break;
-	}
-}
-
-
-static const char *sensor_name(int type)
-{
-	switch (type) {
-	case SENS_ALWAYS:
-		return N_("Always");
-	case SENS_NEAR:
-		return N_("Near");
-	case SENS_KEYBOARD:
-		return N_("Keyboard");
-	case SENS_PROPERTY:
-		return N_("Property");
-	case SENS_ARMATURE:
-		return N_("Armature");
-	case SENS_ACTUATOR:
-		return N_("Actuator");
-	case SENS_DELAY:
-		return N_("Delay");
-	case SENS_MOUSE:
-		return N_("Mouse");
-	case SENS_COLLISION:
-		return N_("Collision");
-	case SENS_RADAR:
-		return N_("Radar");
-	case SENS_RANDOM:
-		return N_("Random");
-	case SENS_RAY:
-		return N_("Ray");
-	case SENS_MESSAGE:
-		return N_("Message");
-	case SENS_JOYSTICK:
-		return N_("Joystick");
-	}
-	return N_("Unknown");
-}
-
-static const char *controller_name(int type)
-{
-	switch (type) {
-	case CONT_LOGIC_AND:
-		return N_("And");
-	case CONT_LOGIC_OR:
-		return N_("Or");
-	case CONT_LOGIC_NAND:
-		return N_("Nand");
-	case CONT_LOGIC_NOR:
-		return N_("Nor");
-	case CONT_LOGIC_XOR:
-		return N_("Xor");
-	case CONT_LOGIC_XNOR:
-		return N_("Xnor");
-	case CONT_EXPRESSION:
-		return N_("Expression");
-	case CONT_PYTHON:
-		return N_("Python");
-	}
-	return N_("Unknown");
-}
-
-static const char *actuator_name(int type)
-{
-	switch (type) {
-	case ACT_SHAPEACTION:
-		return N_("Shape Action");
-	case ACT_ACTION:
-		return N_("Action");
-	case ACT_OBJECT:
-		return N_("Motion");
-	case ACT_LAMP:
-		return N_("Lamp");
-	case ACT_CAMERA:
-		return N_("Camera");
-	case ACT_MATERIAL:
-		return N_("Material");
-	case ACT_SOUND:
-		return N_("Sound");
-	case ACT_PROPERTY:
-		return N_("Property");
-	case ACT_EDIT_OBJECT:
-		return N_("Edit Object");
-	case ACT_CONSTRAINT:
-		return N_("Constraint");
-	case ACT_SCENE:
-		return N_("Scene");
-	case ACT_GROUP:
-		return N_("Group");
-	case ACT_RANDOM:
-		return N_("Random");
-	case ACT_MESSAGE:
-		return N_("Message");
-	case ACT_GAME:
-		return N_("Game");
-	case ACT_VISIBILITY:
-		return N_("Visibility");
-	case ACT_2DFILTER:
-		return N_("Filter 2D");
-	case ACT_PARENT:
-		return N_("Parent");
-	case ACT_STATE:
-		return N_("State");
-	case ACT_ARMATURE:
-		return N_("Armature");
-	case ACT_STEERING:
-		return N_("Steering");
-	case ACT_MOUSE:
-		return N_("Mouse");
-	}
-	return N_("Unknown");
-}
-
-static void set_sca_ob(Object *ob)
-{
-	bController *cont;
-	bActuator *act;
-
-	cont= ob->controllers.first;
-	while (cont) {
-		cont->mynew= (bController *)ob;
-		cont= cont->next;
-	}
-	act= ob->actuators.first;
-	while (act) {
-		act->mynew= (bActuator *)ob;
-		act= act->next;
-	}
-}
-
-static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisflag)
-{
-	Base *base;
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *ob, *obt, *obact= CTX_data_active_object(C);
-	ID **idar;
-	bSensor *sens;
-	bController *cont;
-	unsigned int lay;
-	int a, nr, do_it;
-
-	/* we need a sorted object list */
-	/* set scavisflags flags in Objects to indicate these should be evaluated */
-	/* also hide ob pointers in ->new entries of controllerss/actuators */
-
-	*count= 0;
-
-	if (scene==NULL) return NULL;
-
-	ob= bmain->object.first;
-	while (ob) {
-		ob->scavisflag= 0;
-		set_sca_ob(ob);
-		ob= ob->id.next;
-	}
-
-	/* XXX here it checked 3d lay */
-	lay= scene->lay;
-
-	base= FIRSTBASE;
-	while (base) {
-		if (base->lay & lay) {
-			if (base->flag & SELECT) {
-				if (scavisflag & BUTS_SENS_SEL) base->object->scavisflag |= OB_VIS_SENS;
-				if (scavisflag & BUTS_CONT_SEL) base->object->scavisflag |= OB_VIS_CONT;
-				if (scavisflag & BUTS_ACT_SEL) base->object->scavisflag |= OB_VIS_ACT;
-			}
-		}
-		base= base->next;
-	}
-
-	if (obact) {
-		if (scavisflag & BUTS_SENS_ACT) obact->scavisflag |= OB_VIS_SENS;
-		if (scavisflag & BUTS_CONT_ACT) obact->scavisflag |= OB_VIS_CONT;
-		if (scavisflag & BUTS_ACT_ACT) obact->scavisflag |= OB_VIS_ACT;
-	}
-
-	/* BUTS_XXX_STATE are similar to BUTS_XXX_LINK for selecting the object */
-	if (scavisflag & (BUTS_SENS_LINK|BUTS_CONT_LINK|BUTS_ACT_LINK|BUTS_SENS_STATE|BUTS_ACT_STATE)) {
-		do_it = true;
-		while (do_it) {
-			do_it = false;
-
-			ob= bmain->object.first;
-			while (ob) {
-
-				/* 1st case: select sensor when controller selected */
-				if ((scavisflag & (BUTS_SENS_LINK|BUTS_SENS_STATE)) && (ob->scavisflag & OB_VIS_SENS)==0) {
-					sens= ob->sensors.first;
-					while (sens) {
-						for (a=0; a<sens->totlinks; a++) {
-							if (sens->links[a]) {
-								obt= (Object *)sens->links[a]->mynew;
-								if (obt && (obt->scavisflag & OB_VIS_CONT)) {
-									do_it = true;
-									ob->scavisflag |= OB_VIS_SENS;
-									break;
-								}
-							}
-						}
-						if (do_it) break;
-						sens= sens->next;
-					}
-				}
-
-				/* 2nd case: select cont when act selected */
-				if ((scavisflag & BUTS_CONT_LINK) && (ob->scavisflag & OB_VIS_CONT)==0) {
-					cont= ob->controllers.first;
-					while (cont) {
-						for (a=0; a<cont->totlinks; a++) {
-							if (cont->links[a]) {
-								obt= (Object *)cont->links[a]->mynew;
-								if (obt && (obt->scavisflag & OB_VIS_ACT)) {
-									do_it = true;
-									ob->scavisflag |= OB_VIS_CONT;
-									break;
-								}
-							}
-						}
-						if (do_it) break;
-						cont= cont->next;
-					}
-				}
-
-				/* 3rd case: select controller when sensor selected */
-				if ((scavisflag & BUTS_CONT_LINK) && (ob->scavisflag & OB_VIS_SENS)) {
-					sens= ob->sensors.first;
-					while (sens) {
-						for (a=0; a<sens->totlinks; a++) {
-							if (sens->links[a]) {
-								obt= (Object *)sens->links[a]->mynew;
-								if (obt && (obt->scavisflag & OB_VIS_CONT)==0) {
-									do_it = true;
-									obt->scavisflag |= OB_VIS_CONT;
-								}
-							}
-						}
-						sens= sens->next;
-					}
-				}
-
-				/* 4th case: select actuator when controller selected */
-				if ((scavisflag & (BUTS_ACT_LINK|BUTS_ACT_STATE)) && (ob->scavisflag & OB_VIS_CONT)) {
-					cont= ob->controllers.first;
-					while (cont) {
-						for (a=0; a<cont->totlinks; a++) {
-							if (cont->links[a]) {
-								obt= (Object *)cont->links[a]->mynew;
-								if (obt && (obt->scavisflag & OB_VIS_ACT)==0) {
-									do_it = true;
-									obt->scavisflag |= OB_VIS_ACT;
-								}
-							}
-						}
-						cont= cont->next;
-					}
-
-				}
-				ob= ob->id.next;
-			}
-		}
-	}
-
-	/* now we count */
-	ob= bmain->object.first;
-	while (ob) {
-		if ( ob->scavisflag ) (*count)++;
-		ob= ob->id.next;
-	}
-
-	if (*count == 0) return NULL;
-	if (*count > 24) *count = 24;  /* temporal */
-
-	idar= MEM_callocN((*count)*sizeof(void *), "idar");
-
-	ob= bmain->object.first;
-	nr= 0;
-
-	/* make the active object always the first one of the list */
-	if (obact) {
-		idar[0] = (ID *)obact;
-		nr++;
-	}
-
-	while (ob) {
-		if ((ob->scavisflag) && (ob != obact)) {
-			idar[nr] = (ID *)ob;
-			nr++;
-		}
-		if (nr >= 24) break;
-		ob= ob->id.next;
-	}
-
-	/* just to be sure... these were set in set_sca_done_ob() */
-	clear_sca_new_poins();
-
-	return idar;
-}
-
-static void get_armature_bone_constraint(Object *ob, const char *posechannel, const char *constraint_name, bConstraint **constraint)
-{
-	/* check that bone exist in the active object */
-	if (ob->type == OB_ARMATURE && ob->pose) {
-		bPoseChannel *pchan= BKE_pose_channel_find_name(ob->pose, posechannel);
-		if (pchan) {
-			bConstraint *con= BLI_findstring(&pchan->constraints, constraint_name, offsetof(bConstraint, name));
-			if (con) {
-				*constraint= con;
-			}
-		}
-	}
-	/* didn't find any */
-}
-
-static void do_sensor_menu(bContext *C, void *UNUSED(arg), int event)
-{
-	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	ID **idar;
-	Object *ob;
-	bSensor *sens;
-	short count, a;
-
-	idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		if (event==0 || event==2) ob->scaflag |= OB_SHOWSENS;
-		else if (event==1) ob->scaflag &= ~OB_SHOWSENS;
-	}
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		sens= ob->sensors.first;
-		while (sens) {
-			if (event==2) sens->flag |= SENS_SHOW;
-			else if (event==3) sens->flag &= ~SENS_SHOW;
-			sens= sens->next;
-		}
-	}
-
-	if (idar) MEM_freeN(idar);
-}
-
-static uiBlock *sensor_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
-{
-	uiBlock *block;
-	int yco=0;
-
-	block= UI_block_begin(C, ar, __func__, UI_EMBOSS_PULLDOWN);
-	UI_block_func_butmenu_set(block, do_sensor_menu, NULL);
-
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Objects"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Objects"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefBut(block, UI_BTYPE_SEPR_LINE, 0, "",	0, (short)(yco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Sensors"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Sensors"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 3, "");
-
-	UI_block_direction_set(block, UI_DIR_UP);
-	UI_block_end(C, block);
-
-	return block;
-}
-
-static void do_controller_menu(bContext *C, void *UNUSED(arg), int event)
-{
-	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	ID **idar;
-	Object *ob;
-	bController *cont;
-	short count, a;
-
-	idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		if (event==0 || event==2) ob->scaflag |= OB_SHOWCONT;
-		else if (event==1) ob->scaflag &= ~OB_SHOWCONT;
-	}
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		cont= ob->controllers.first;
-		while (cont) {
-			if (event==2) cont->flag |= CONT_SHOW;
-			else if (event==3) cont->flag &= ~CONT_SHOW;
-			cont= cont->next;
-		}
-	}
-
-	if (idar) MEM_freeN(idar);
-}
-
-static uiBlock *controller_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
-{
-	uiBlock *block;
-	int yco=0;
-
-	block= UI_block_begin(C, ar, __func__, UI_EMBOSS_PULLDOWN);
-	UI_block_func_butmenu_set(block, do_controller_menu, NULL);
-
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Objects"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Objects"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefBut(block, UI_BTYPE_SEPR_LINE, 0, "",					0, (short)(yco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Controllers"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 2, 2, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Controllers"),	0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 3, 3, "");
-
-	UI_block_direction_set(block, UI_DIR_UP);
-	UI_block_end(C, block);
-
-	return block;
-}
-
-static void do_actuator_menu(bContext *C, void *UNUSED(arg), int event)
-{
-	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	ID **idar;
-	Object *ob;
-	bActuator *act;
-	short count, a;
-
-	idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		if (event==0 || event==2) ob->scaflag |= OB_SHOWACT;
-		else if (event==1) ob->scaflag &= ~OB_SHOWACT;
-	}
-
-	for (a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		act= ob->actuators.first;
-		while (act) {
-			if (event==2) act->flag |= ACT_SHOW;
-			else if (event==3) act->flag &= ~ACT_SHOW;
-			act= act->next;
-		}
-	}
-
-	if (idar) MEM_freeN(idar);
-}
-
-static uiBlock *actuator_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
-{
-	uiBlock *block;
-	int xco=0;
-
-	block= UI_block_begin(C, ar, __func__, UI_EMBOSS_PULLDOWN);
-	UI_block_func_butmenu_set(block, do_actuator_menu, NULL);
-
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Objects"),	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Objects"),	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefBut(block, UI_BTYPE_SEPR_LINE, 0, "",	0, (short)(xco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Show Actuators"),	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefBut(block, UI_BTYPE_BUT_MENU, 1, IFACE_("Hide Actuators"),	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 3, "");
-
-	UI_block_direction_set(block, UI_DIR_UP);
-	UI_block_end(C, block);
-
-	return block;
-}
-
-static void check_controller_state_mask(bContext *UNUSED(C), void *arg1_but, void *arg2_mask)
-{
-	unsigned int *cont_mask = arg2_mask;
-	uiBut *but = arg1_but;
-
-	/* a controller is always in a single state */
-	*cont_mask = (1<<but->retval);
-	but->retval = B_REDR;
-}
-
-static uiBlock *controller_state_mask_menu(bContext *C, ARegion *ar, void *arg_cont)
-{
-	uiBlock *block;
-	uiBut *but;
-	bController *cont = arg_cont;
-
-	short yco = 12, xco = 0, stbit, offset;
-
-	block= UI_block_begin(C, ar, __func__, UI_EMBOSS);
-
-	/* use this for a fake extra empy space around the buttons */
-	uiDefBut(block, UI_BTYPE_LABEL, 0, "",			-5, -5, 200, 34, NULL, 0, 0, 0, 0, "");
-
-	for (offset=0; offset<15; offset += 5) {
-		UI_block_align_begin(block);
-		for (stbit=0; stbit<5; stbit++) {
-			but = uiDefButBitI(block, UI_BTYPE_TOGGLE, (1<<(stbit+offset)), (stbit+offset), "",	(short)(xco+12*stbit+13*offset), yco, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
-			UI_but_func_set(but, check_controller_state_mask, but, &(cont->state_mask));
-		}
-		for (stbit=0; stbit<5; stbit++) {
-			but = uiDefButBitI(block, UI_BTYPE_TOGGLE, (1<<(stbit+offset+15)), (stbit+offset+15), "",	(short)(xco+12*stbit+13*offset), yco-12, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
-			UI_but_func_set(but, check_controller_state_mask, but, &(cont->state_mask));
-		}
-	}
-	UI_block_align_end(block);
-
-	UI_block_direction_set(block, UI_DIR_UP);
-	UI_block_end(C, block);
-
-	return block;
-}
-
-static bool is_sensor_linked(uiBlock *block, bSensor *sens)
-{
-	bController *cont;
-	int i;
-
-	for (i=0; i<sens->totlinks; i++) {
-		cont = sens->links[i];
-		if (UI_block_links_find_inlink(block, cont) != NULL)
-			return 1;
-	}
-	return 0;
-}
-
-/* Sensors code */
-
-static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr)
-{
-	uiLayout *box, *row, *sub;
-	bSensor *sens= (bSensor *)ptr->data;
-
-	box = uiLayoutBox(layout);
-	row = uiLayoutRow(box, false);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemR(sub, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
-	if (RNA_boolean_get(ptr, "show_expanded")) {
-		uiItemR(sub, ptr, "type", 0, "", ICON_NONE);
-		uiItemR(sub, ptr, "name", 0, "", ICON_NONE);
-	}
-	else {
-		uiItemL(sub, IFACE_(sensor_name(sens->type)), ICON_NONE);
-		uiItemL(sub, sens->name, ICON_NONE);
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, (((RNA_boolean_get(logic_ptr, "show_sensors_active_states") &&
-	                         RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")) &&
-					         RNA_boolean_get(ptr, "active")));
-	uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE);
-
-	if (RNA_boolean_get(ptr, "show_expanded")==0) {
-		sub = uiLayoutRow(row, true);
-		uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-		uiItemEnumO(sub, "LOGIC_OT_sensor_move", "", ICON_TRIA_UP, "direction", 1); // up
-		uiItemEnumO(sub, "LOGIC_OT_sensor_move", "", ICON_TRIA_DOWN, "direction", 2); // down
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiItemR(sub, ptr, "active", 0, "", ICON_NONE);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemO(sub, "", ICON_X, "LOGIC_OT_sensor_remove");
-}
-
-static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *box, *split, *sub, *row;
-
-	box = uiLayoutBox(layout);
-	uiLayoutSetActive(box, RNA_boolean_get(ptr, "active"));
-	split = uiLayoutSplit(box, 0.45f, false);
-
-	row = uiLayoutRow(split, true);
-	uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP);
-	uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, (RNA_boolean_get(ptr, "use_pulse_true_level") ||
-	                        RNA_boolean_get(ptr, "use_pulse_false_level")));
-	uiItemR(sub, ptr, "tick_skip", 0, IFACE_("Skip"), ICON_NONE);
-
-	row = uiLayoutRow(split, true);
-	uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-	uiItemR(row, ptr, "use_tap", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-	uiItemR(split, ptr, "invert", UI_ITEM_R_TOGGLE, IFACE_("Invert"), ICON_NONE);
-}
-/* sensors in alphabetical order */
-
-static void draw_sensor_actuator(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-	uiItemPointerR(layout, ptr, "actuator", &settings_ptr, "actuators", NULL, ICON_LOGIC);
-}
-
-static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
-{
-	bSensor *sens = (bSensor *)ptr->data;
-	bArmatureSensor *as = (bArmatureSensor *) sens->data;
-	Object *ob = (Object *)ptr->id.data;
-	uiLayout *row;
-
-	if (ob->type != OB_ARMATURE) {
-		uiItemL(layout, IFACE_("Sensor only available for armatures"), ICON_NONE);
-		return;
-	}
-
-	if (ob->pose) {
-		PointerRNA pose_ptr, pchan_ptr;
-		PropertyRNA *bones_prop;
-
-		RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
-		bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
-
-		uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
-
-		if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, as->posechannel, &pchan_ptr))
-			uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
-	}
-	row = uiLayoutRow(layout, true);
-	uiItemR(row, ptr, "test_type", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "test_type") != SENS_ARM_STATE_CHANGED)
-		uiItemR(row, ptr, "value", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *row, *split;
-	PointerRNA main_ptr;
-
-	RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
-
-	split = uiLayoutSplit(layout, 0.3f, false);
-	row = uiLayoutRow(split, true);
-	uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-	uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-	switch (RNA_boolean_get(ptr, "use_material")) {
-		case SENS_COLLISION_PROPERTY:
-			uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
-			break;
-		case SENS_COLLISION_MATERIAL:
-			uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
-			break;
-	}
-}
-
-static void draw_sensor_delay(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-
-	row = uiLayoutRow(layout, false);
-
-	uiItemR(row, ptr, "delay", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "duration", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "use_repeat", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_joystick(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *col, *row;
-
-	uiItemR(layout, ptr, "joystick_index", 0, NULL, ICON_NONE);
-	uiItemR(layout, ptr, "event_type", 0, NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "event_type")) {
-		case SENS_JOY_BUTTON:
-			uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
-
-			col = uiLayoutColumn(layout, false);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == false);
-			uiItemR(col, ptr, "button_number", 0, NULL, ICON_NONE);
-			break;
-		case SENS_JOY_AXIS:
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "axis_number", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NONE);
-
-			uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
-			col = uiLayoutColumn(layout, false);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == false);
-			uiItemR(col, ptr, "axis_direction", 0, NULL, ICON_NONE);
-			break;
-		case SENS_JOY_HAT:
-			uiItemR(layout, ptr, "hat_number", 0, NULL, ICON_NONE);
-			uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
-
-			col = uiLayoutColumn(layout, false);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == false);
-			uiItemR(col, ptr, "hat_direction", 0, NULL, ICON_NONE);
-			break;
-		case SENS_JOY_AXIS_SINGLE:
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "single_axis_number", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_sensor_keyboard(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-	uiLayout *row, *col;
-
-	row = uiLayoutRow(layout, false);
-	uiItemL(row, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, "Key:"), ICON_NONE);
-	col = uiLayoutColumn(row, false);
-	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys") == false);
-	uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", ICON_NONE);
-	col = uiLayoutColumn(row, false);
-	uiItemR(col, ptr, "use_all_keys", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-	col = uiLayoutColumn(layout, false);
-	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys") == false);
-	row = uiLayoutRow(col, false);
-	uiItemL(row, IFACE_("First Modifier:"), ICON_NONE);
-	uiItemR(row, ptr, "modifier_key_1", UI_ITEM_R_EVENT, "", ICON_NONE);
-
-	row = uiLayoutRow(col, false);
-	uiItemL(row, IFACE_("Second Modifier:"), ICON_NONE);
-	uiItemR(row, ptr, "modifier_key_2", UI_ITEM_R_EVENT, "", ICON_NONE);
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-	uiItemPointerR(layout, ptr, "log", &settings_ptr, "properties", NULL, ICON_NONE);
-	uiItemPointerR(layout, ptr, "target", &settings_ptr, "properties", NULL, ICON_NONE);
-}
-
-static void draw_sensor_message(uiLayout *layout, PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "subject", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_mouse(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *split, *split2;
-	PointerRNA main_ptr;
-
-	split = uiLayoutSplit(layout, 0.8f, false);
-	uiItemR(split, ptr, "mouse_event", 0, NULL, ICON_NONE);
-
-	if (RNA_enum_get(ptr, "mouse_event") == BL_SENS_MOUSE_MOUSEOVER_ANY) {
-		uiItemR(split, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-		split = uiLayoutSplit(layout, 0.3f, false);
-		uiItemR(split, ptr, "use_material", 0, "", ICON_NONE);
-
-		split2 = uiLayoutSplit(split, 0.7f, false);
-		if (RNA_enum_get(ptr, "use_material") == SENS_RAY_PROPERTY) {
-			uiItemR(split2, ptr, "property", 0, "", ICON_NONE);
-		}
-		else {
-			RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
-			uiItemPointerR(split2, ptr, "material", &main_ptr, "materials", "", ICON_MATERIAL_DATA);
-		}
-		uiItemR(split2, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-	}
-}
-
-static void draw_sensor_near(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-
-	uiItemR(layout, ptr, "property", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, true);
-	uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "reset_distance", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_property(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-
-	uiLayout *row;
-	uiItemR(layout, ptr, "evaluation_type", 0, NULL, ICON_NONE);
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-	uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "evaluation_type")) {
-		case SENS_PROP_INTERVAL:
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "value_min", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "value_max", 0, NULL, ICON_NONE);
-			break;
-		case SENS_PROP_EQUAL:
-		case SENS_PROP_NEQUAL:
-		case SENS_PROP_LESSTHAN:
-		case SENS_PROP_GREATERTHAN:
-			uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
-			break;
-		case SENS_PROP_CHANGED:
-			break;
-	}
-}
-
-static void draw_sensor_radar(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-
-	uiItemR(layout, ptr, "property", 0, NULL, ICON_NONE);
-	uiItemR(layout, ptr, "axis", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "angle", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_random(uiLayout *layout, PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "seed", 0, NULL, ICON_NONE);
-}
-
-static void draw_sensor_ray(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *split, *row;
-	PointerRNA main_ptr;
-
-	RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
-	split = uiLayoutSplit(layout, 0.3f, false);
-	uiItemR(split, ptr, "ray_type", 0, "", ICON_NONE);
-	switch (RNA_enum_get(ptr, "ray_type")) {
-		case SENS_RAY_PROPERTY:
-			uiItemR(split, ptr, "property", 0, "", ICON_NONE);
-			break;
-		case SENS_RAY_MATERIAL:
-			uiItemPointerR(split, ptr, "material", &main_ptr, "materials", "", ICON_MATERIAL_DATA);
-			break;
-	}
-
-	split = uiLayoutSplit(layout, 0.3, false);
-	uiItemR(split, ptr, "axis", 0, "", ICON_NONE);
-	row = uiLayoutRow(split, false);
-	uiItemR(row, ptr, "range", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-}
-
-static void draw_brick_sensor(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *box;
-
-	if (!RNA_boolean_get(ptr, "show_expanded"))
-		return;
-
-	draw_sensor_internal_header(layout, ptr);
-
-	box = uiLayoutBox(layout);
-	uiLayoutSetActive(box, RNA_boolean_get(ptr, "active"));
-
-	switch (RNA_enum_get(ptr, "type")) {
-
-		case SENS_ACTUATOR:
-			draw_sensor_actuator(box, ptr);
-			break;
-		case SENS_ALWAYS:
-			break;
-		case SENS_ARMATURE:
-			draw_sensor_armature(box, ptr);
-			break;
-		case SENS_COLLISION:
-			draw_sensor_collision(box, ptr, C);
-			break;
-		case SENS_DELAY:
-			draw_sensor_delay(box, ptr);
-			break;
-		case SENS_JOYSTICK:
-			draw_sensor_joystick(box, ptr);
-			break;
-		case SENS_KEYBOARD:
-			draw_sensor_keyboard(box, ptr);
-			break;
-		case SENS_MESSAGE:
-			draw_sensor_message(box, ptr);
-			break;
-		case SENS_MOUSE:
-			draw_sensor_mouse(box, ptr, C);
-			break;
-		case SENS_NEAR:
-			draw_sensor_near(box, ptr);
-			break;
-		case SENS_PROPERTY:
-			draw_sensor_property(box, ptr);
-			break;
-		case SENS_RADAR:
-			draw_sensor_radar(box, ptr);
-			break;
-		case SENS_RANDOM:
-			draw_sensor_random(box, ptr);
-			break;
-		case SENS_RAY:
-			draw_sensor_ray(box, ptr, C);
-			break;
-	}
-}
-
-/* Controller code */
-static void draw_controller_header(uiLayout *layout, PointerRNA *ptr, int xco, int width, int yco)
-{
-	uiLayout *box, *row, *sub;
-	bController *cont= (bController *)ptr->data;
-
-	char state[3];
-	BLI_snprintf(state, sizeof(state), "%d", RNA_int_get(ptr, "states"));
-
-	box = uiLayoutBox(layout);
-	row = uiLayoutRow(box, false);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemR(sub, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
-	if (RNA_boolean_get(ptr, "show_expanded")) {
-		uiItemR(sub, ptr, "type", 0, "", ICON_NONE);
-		uiItemR(sub, ptr, "name", 0, "", ICON_NONE);
-		/* XXX provisory for Blender 2.50Beta */
-		uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, IFACE_("Set controller state index (from 1 to 30)"));
-	}
-	else {
-		uiItemL(sub, IFACE_(controller_name(cont->type)), ICON_NONE);
-		uiItemL(sub, cont->name, ICON_NONE);
-		uiItemL(sub, state, ICON_NONE);
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemR(sub, ptr, "use_priority", 0, "", ICON_NONE);
-
-	if (RNA_boolean_get(ptr, "show_expanded")==0) {
-		sub = uiLayoutRow(row, true);
-		uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-		uiItemEnumO(sub, "LOGIC_OT_controller_move", "", ICON_TRIA_UP, "direction", 1); // up
-		uiItemEnumO(sub, "LOGIC_OT_controller_move", "", ICON_TRIA_DOWN, "direction", 2); // down
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiItemR(sub, ptr, "active", 0, "", ICON_NONE);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemO(sub, "", ICON_X, "LOGIC_OT_controller_remove");
-}
-
-static void draw_controller_expression(uiLayout *layout, PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "expression", 0, "", ICON_NONE);
-}
-
-static void draw_controller_python(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *split, *sub;
-
-	split = uiLayoutSplit(layout, 0.3, true);
-	uiItemR(split, ptr, "mode", 0, "", ICON_NONE);
-	if (RNA_enum_get(ptr, "mode") == CONT_PY_SCRIPT) {
-		uiItemR(split, ptr, "text", 0, "", ICON_NONE);
-	}
-	else {
-		sub = uiLayoutSplit(split, 0.8f, false);
-		uiItemR(sub, ptr, "module", 0, "", ICON_NONE);
-		uiItemR(sub, ptr, "use_debug", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-	}
-}
-
-static void draw_controller_state(uiLayout *UNUSED(layout), PointerRNA *UNUSED(ptr))
-{
-
-}
-
-static void draw_brick_controller(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *box;
-
-	if (!RNA_boolean_get(ptr, "show_expanded"))
-		return;
-
-	box = uiLayoutBox(layout);
-	uiLayoutSetActive(box, RNA_boolean_get(ptr, "active"));
-
-	draw_controller_state(box, ptr);
-
-	switch (RNA_enum_get(ptr, "type")) {
-		case CONT_LOGIC_AND:
-			break;
-		case CONT_LOGIC_OR:
-			break;
-		case CONT_EXPRESSION:
-			draw_controller_expression(box, ptr);
-			break;
-		case CONT_PYTHON:
-			draw_controller_python(box, ptr);
-			break;
-		case CONT_LOGIC_NAND:
-			break;
-		case CONT_LOGIC_NOR:
-			break;
-		case CONT_LOGIC_XOR:
-			break;
-		case CONT_LOGIC_XNOR:
-			break;
-	}
-}
-
-/* Actuator code */
-static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr)
-{
-	uiLayout *box, *row, *sub;
-	bActuator *act= (bActuator *)ptr->data;
-
-	box = uiLayoutBox(layout);
-	row = uiLayoutRow(box, false);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemR(sub, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
-	if (RNA_boolean_get(ptr, "show_expanded")) {
-		uiItemR(sub, ptr, "type", 0, "", ICON_NONE);
-		uiItemR(sub, ptr, "name", 0, "", ICON_NONE);
-	}
-	else {
-		uiItemL(sub, IFACE_(actuator_name(act->type)), ICON_NONE);
-		uiItemL(sub, act->name, ICON_NONE);
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, (((RNA_boolean_get(logic_ptr, "show_actuators_active_states") &&
-	                          RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")) &&
-	                          RNA_boolean_get(ptr, "active")));
-	uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE);
-
-	if (RNA_boolean_get(ptr, "show_expanded")==0) {
-		sub = uiLayoutRow(row, true);
-		uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-		uiItemEnumO(sub, "LOGIC_OT_actuator_move", "", ICON_TRIA_UP, "direction", 1); // up
-		uiItemEnumO(sub, "LOGIC_OT_actuator_move", "", ICON_TRIA_DOWN, "direction", 2); // down
-	}
-
-	sub = uiLayoutRow(row, false);
-	uiItemR(sub, ptr, "active", 0, "", ICON_NONE);
-
-	sub = uiLayoutRow(row, false);
-	uiLayoutSetActive(sub, RNA_boolean_get(ptr, "active"));
-	uiItemO(sub, "", ICON_X, "LOGIC_OT_actuator_remove");
-}
-
-static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-	uiLayout *row, *sub;
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "play_mode", 0, "", ICON_NONE);
-
-	sub = uiLayoutRow(row, true);
-	uiItemR(sub, ptr, "use_force", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-	uiItemR(sub, ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-	row = uiLayoutColumn(sub, false);
-	uiLayoutSetActive(row, (RNA_boolean_get(ptr, "use_additive") || RNA_boolean_get(ptr, "use_force")));
-	uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "action", 0, "", ICON_NONE);
-	uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	if ((RNA_enum_get(ptr, "play_mode") == ACT_ACTION_FROM_PROP))
-		uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-	else {
-		uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NONE);
-		uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NONE);
-	}
-
-	uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "priority", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "layer", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "layer_weight", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "blend_mode", 0, "", ICON_NONE);
-
-	uiItemPointerR(layout, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-#ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
-	uiItemR(layout, "stride_length", 0, NULL, ICON_NONE);
-#endif
-}
-
-static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
-{
-	bActuator *act = (bActuator *)ptr->data;
-	bArmatureActuator *aa = (bArmatureActuator *) act->data;
-	Object *ob = (Object *)ptr->id.data;
-	bConstraint *constraint = NULL;
-	PointerRNA pose_ptr, pchan_ptr;
-	PropertyRNA *bones_prop = NULL;
-
-	if (ob->type != OB_ARMATURE) {
-		uiItemL(layout, IFACE_("Actuator only available for armatures"), ICON_NONE);
-		return;
-	}
-
-	if (ob->pose) {
-		RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
-		bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
-	}
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_ARM_RUN:
-			break;
-		case ACT_ARM_ENABLE:
-		case ACT_ARM_DISABLE:
-			if (ob->pose) {
-				uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
-
-				if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
-					uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
-			}
-			break;
-		case ACT_ARM_SETTARGET:
-			if (ob->pose) {
-				uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
-
-				if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
-					uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
-			}
-
-			uiItemR(layout, ptr, "target", 0, NULL, ICON_NONE);
-
-			/* show second target only if the constraint supports it */
-			get_armature_bone_constraint(ob, aa->posechannel, aa->constraint, &constraint);
-			if (constraint && constraint->type == CONSTRAINT_TYPE_KINEMATIC) {
-				uiItemR(layout, ptr, "secondary_target", 0, NULL, ICON_NONE);
-			}
-			break;
-		case ACT_ARM_SETWEIGHT:
-			if (ob->pose) {
-				uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
-
-				if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
-					uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
-			}
-
-			uiItemR(layout, ptr, "weight", 0, NULL, ICON_NONE);
-			break;
-		case ACT_ARM_SETINFLUENCE:
-			if (ob->pose) {
-				uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
-
-				if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
-					uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
-			}
-
-			uiItemR(layout, ptr, "influence", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_camera(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-	uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "height", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "axis", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, true);
-	uiItemR(row, ptr, "min", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "max", 0, NULL, ICON_NONE);
-
-	uiItemR(layout, ptr, "damping", 0, NULL, ICON_NONE);
-}
-
-static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *row, *col, *sub, *split;
-	PointerRNA main_ptr;
-
-	RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_CONST_TYPE_LOC:
-			uiItemR(layout, ptr, "limit", 0, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, true);
-			uiItemR(row, ptr, "limit_min", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "limit_max", 0, NULL, ICON_NONE);
-
-			uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			break;
-
-		case ACT_CONST_TYPE_DIST:
-			split = uiLayoutSplit(layout, 0.8, false);
-			uiItemR(split, ptr, "direction", 0, NULL, ICON_NONE);
-			row = uiLayoutRow(split, true);
-			uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			uiItemR(row, ptr, "use_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, false);
-			col = uiLayoutColumn(row, true);
-			uiItemL(col, IFACE_("Range:"), ICON_NONE);
-			uiItemR(col, ptr, "range", 0, "", ICON_NONE);
-
-			col = uiLayoutColumn(row, true);
-			uiItemR(col, ptr, "use_force_distance", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			sub = uiLayoutColumn(col, false);
-			uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_force_distance") == true);
-			uiItemR(sub, ptr, "distance", 0, "", ICON_NONE);
-
-			uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.15f, false);
-			uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			if (RNA_boolean_get(ptr, "use_material_detect"))
-				uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
-			else
-				uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.15, false);
-			uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(split, true);
-			uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			break;
-
-		case ACT_CONST_TYPE_ORI:
-			uiItemR(layout, ptr, "direction_axis_pos", 0, NULL, ICON_NONE);
-
-			row=uiLayoutRow(layout, true);
-			uiItemR(row, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
-
-			row=uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "rotation_max", 0, NULL, ICON_NONE);
-
-			row=uiLayoutRow(layout, true);
-			uiItemR(row, ptr, "angle_min", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "angle_max", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_CONST_TYPE_FH:
-			split = uiLayoutSplit(layout, 0.75, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "fh_damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-
-			uiItemR(row, ptr, "fh_height", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_fh_paralel_axis", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "direction_axis", 0, NULL, ICON_NONE);
-			split = uiLayoutSplit(row, 0.9f, false);
-			uiItemR(split, ptr, "fh_force", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_fh_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.15, false);
-			uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			if (RNA_boolean_get(ptr, "use_material_detect"))
-				uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
-			else
-				uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.15, false);
-			uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_edit_object(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	uiLayout *row, *split, *sub;
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_EDOB_ADD_OBJECT:
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "object", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			break;
-		case ACT_EDOB_END_OBJECT:
-			break;
-		case ACT_EDOB_REPLACE_MESH:
-			if (ob->type != OB_MESH) {
-				uiItemL(layout, IFACE_("Mode only available for mesh objects"), ICON_NONE);
-				break;
-			}
-			split = uiLayoutSplit(layout, 0.6, false);
-			uiItemR(split, ptr, "mesh", 0, NULL, ICON_NONE);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "use_replace_display_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			uiItemR(row, ptr, "use_replace_physics_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			break;
-		case ACT_EDOB_TRACK_TO:
-			split = uiLayoutSplit(layout, 0.5, false);
-			uiItemR(split, ptr, "track_object", 0, NULL, ICON_NONE);
-			sub = uiLayoutSplit(split, 0.7f, false);
-			uiItemR(sub, ptr, "time", 0, NULL, ICON_NONE);
-			uiItemR(sub, ptr, "use_3d_tracking", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "up_axis", 0, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "track_axis", 0, NULL, ICON_NONE);
-			break;
-		case ACT_EDOB_DYNAMICS:
-			if (ob->type != OB_MESH) {
-				uiItemL(layout, IFACE_("Mode only available for mesh objects"), ICON_NONE);
-				break;
-			}
-			uiItemR(layout, ptr, "dynamic_operation", 0, NULL, ICON_NONE);
-			if (RNA_enum_get(ptr, "dynamic_operation") == ACT_EDOB_SET_MASS)
-				uiItemR(layout, ptr, "mass", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_filter_2d(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row, *split;
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_2DFILTER_CUSTOMFILTER:
-			uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NONE);
-			uiItemR(layout, ptr, "glsl_shader", 0, NULL, ICON_NONE);
-			break;
-		case ACT_2DFILTER_MOTIONBLUR:
-			split=uiLayoutSplit(layout, 0.75f, true);
-			row = uiLayoutRow(split, false);
-			uiLayoutSetActive(row, RNA_boolean_get(ptr, "use_motion_blur") == true);
-			uiItemR(row, ptr, "motion_blur_factor", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_motion_blur", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			break;
-		default: // all other 2D Filters
-			uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_game(uiLayout *layout, PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-	if (ELEM(RNA_enum_get(ptr, "mode"), ACT_GAME_LOAD, ACT_GAME_SCREENSHOT))
-		uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE);
-}
-
-static void draw_actuator_message(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	Object *ob;
-	PointerRNA main_ptr, settings_ptr;
-	uiLayout *row;
-
-	RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
-
-	ob = (Object *)ptr->id.data;
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	uiItemPointerR(layout, ptr, "to_property", &main_ptr, "objects", NULL, ICON_OBJECT_DATA);
-	uiItemR(layout, ptr, "subject", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, true);
-	uiItemR(row, ptr, "body_type", 0, NULL, ICON_NONE);
-
-	if (RNA_enum_get(ptr, "body_type") == ACT_MESG_MESG)
-		uiItemR(row, ptr, "body_message", 0, "", ICON_NONE);
-	else // mode == ACT_MESG_PROP
-		uiItemPointerR(row, ptr, "body_property", &settings_ptr, "properties", "", ICON_NONE);
-}
-
-static void draw_actuator_motion(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob;
-	PointerRNA settings_ptr;
-	uiLayout *split, *row, *col, *sub;
-	int physics_type;
-
-	ob = (Object *)ptr->id.data;
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-	physics_type = RNA_enum_get(&settings_ptr, "physics_type");
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_OBJECT_NORMAL:
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "offset_location", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_location", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "offset_rotation", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_rotation", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			if (ELEM(physics_type, OB_BODY_TYPE_DYNAMIC, OB_BODY_TYPE_RIGID, OB_BODY_TYPE_SOFT)) {
-				uiItemL(layout, IFACE_("Dynamic Object Settings:"), ICON_NONE);
-				split = uiLayoutSplit(layout, 0.9, false);
-				row = uiLayoutRow(split, false);
-				uiItemR(row, ptr, "force", 0, NULL, ICON_NONE);
-				uiItemR(split, ptr, "use_local_force", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-				split = uiLayoutSplit(layout, 0.9, false);
-				row = uiLayoutRow(split, false);
-				uiItemR(row, ptr, "torque", 0, NULL, ICON_NONE);
-				uiItemR(split, ptr, "use_local_torque", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-				split = uiLayoutSplit(layout, 0.9, false);
-				row = uiLayoutRow(split, false);
-				uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
-				row = uiLayoutRow(split, true);
-				uiItemR(row, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-				uiItemR(row, ptr, "use_add_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-				split = uiLayoutSplit(layout, 0.9, false);
-				row = uiLayoutRow(split, false);
-				uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NONE);
-				uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-				uiItemR(layout, ptr, "damping", 0, NULL, ICON_NONE);
-			}
-			break;
-		case ACT_OBJECT_SERVO:
-			uiItemR(layout, ptr, "reference_object", 0, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			row = uiLayoutRow(layout, false);
-			col = uiLayoutColumn(row, false);
-			uiItemR(col, ptr, "use_servo_limit_x", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			sub = uiLayoutColumn(col, true);
-			uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_x") == true);
-			uiItemR(sub, ptr, "force_max_x", 0, NULL, ICON_NONE);
-			uiItemR(sub, ptr, "force_min_x", 0, NULL, ICON_NONE);
-
-			col = uiLayoutColumn(row, false);
-			uiItemR(col, ptr, "use_servo_limit_y", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			sub = uiLayoutColumn(col, true);
-			uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_y") == true);
-			uiItemR(sub, ptr, "force_max_y", 0, NULL, ICON_NONE);
-			uiItemR(sub, ptr, "force_min_y", 0, NULL, ICON_NONE);
-
-			col = uiLayoutColumn(row, false);
-			uiItemR(col, ptr, "use_servo_limit_z", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			sub = uiLayoutColumn(col, true);
-			uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_z") == true);
-			uiItemR(sub, ptr, "force_max_z", 0, NULL, ICON_NONE);
-			uiItemR(sub, ptr, "force_min_z", 0, NULL, ICON_NONE);
-
-			//XXXACTUATOR missing labels from original 2.49 ui (e.g. Servo, Min, Max, Fast)
-			//Layout designers willing to help on that, please compare with 2.49 ui
-			// (since the old code is going to be deleted ... soon)
-
-			col = uiLayoutColumn(layout, true);
-			uiItemR(col, ptr, "proportional_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			uiItemR(col, ptr, "integral_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			uiItemR(col, ptr, "derivate_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-			break;
-		case ACT_OBJECT_CHARACTER:
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "offset_location", 0, NULL, ICON_NONE);
-			row = uiLayoutRow(split, true);
-			uiItemR(row, ptr, "use_local_location", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			uiItemR(row, ptr, "use_add_character_location", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			uiItemR(row, ptr, "offset_rotation", 0, NULL, ICON_NONE);
-			uiItemR(split, ptr, "use_local_rotation", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
-			split = uiLayoutSplit(layout, 0.9, false);
-			row = uiLayoutRow(split, false);
-			split = uiLayoutSplit(row, 0.7, false);
-			uiItemL(split, "", ICON_NONE); /*Just use this for some spacing */
-			uiItemR(split, ptr, "use_character_jump", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_parent(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row, *sub;
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	if (RNA_enum_get(ptr, "mode") == ACT_PARENT_SET) {
-		uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE);
-
-		row = uiLayoutRow(layout, false);
-		uiItemR(row, ptr, "use_compound", 0, NULL, ICON_NONE);
-		sub = uiLayoutRow(row, false);
-		uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_compound") == true);
-		uiItemR(sub, ptr, "use_ghost", 0, NULL, ICON_NONE);
-	}
-}
-
-static void draw_actuator_property(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	bActuator *act = (bActuator *)ptr->data;
-	bPropertyActuator *pa = (bPropertyActuator *) act->data;
-	Object *ob_from= pa->ob;
-	PointerRNA settings_ptr, obj_settings_ptr;
-
-	uiLayout *row, *sub;
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-	uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_PROP_TOGGLE:
-		case ACT_PROP_LEVEL:
-			break;
-		case ACT_PROP_ADD:
-			uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
-			break;
-		case ACT_PROP_ASSIGN:
-			uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
-			break;
-		case ACT_PROP_COPY:
-			row = uiLayoutRow(layout, false);
-			uiItemR(row, ptr, "object", 0, NULL, ICON_NONE);
-			if (ob_from) {
-				RNA_pointer_create((ID *)ob_from, &RNA_GameObjectSettings, ob_from, &obj_settings_ptr);
-				uiItemPointerR(row, ptr, "object_property", &obj_settings_ptr, "properties", NULL, ICON_NONE);
-			}
-			else {
-				sub = uiLayoutRow(row, false);
-				uiLayoutSetActive(sub, false);
-				uiItemR(sub, ptr, "object_property", 0, NULL, ICON_NONE);
-			}
-			break;
-	}
-}
-
-static void draw_actuator_random(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob;
-	PointerRNA settings_ptr;
-	uiLayout *row;
-
-	ob = (Object *)ptr->id.data;
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	row = uiLayoutRow(layout, false);
-
-	uiItemR(row, ptr, "seed", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "distribution", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-
-	switch (RNA_enum_get(ptr, "distribution")) {
-		case ACT_RANDOM_BOOL_CONST:
-			uiItemR(row, ptr, "use_always_true", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_BOOL_UNIFORM:
-			uiItemL(row, IFACE_("Choose between true and false, 50% chance each"), ICON_NONE);
-			break;
-
-		case ACT_RANDOM_BOOL_BERNOUILLI:
-			uiItemR(row, ptr, "chance", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_INT_CONST:
-			uiItemR(row, ptr, "int_value", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_INT_UNIFORM:
-			uiItemR(row, ptr, "int_min", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "int_max", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_INT_POISSON:
-			uiItemR(row, ptr, "int_mean", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_FLOAT_CONST:
-			uiItemR(row, ptr, "float_value", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_FLOAT_UNIFORM:
-			uiItemR(row, ptr, "float_min", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "float_max", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_FLOAT_NORMAL:
-			uiItemR(row, ptr, "float_mean", 0, NULL, ICON_NONE);
-			uiItemR(row, ptr, "standard_derivation", 0, NULL, ICON_NONE);
-			break;
-
-		case ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL:
-			uiItemR(row, ptr, "half_life_time", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_scene(uiLayout *layout, PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_SCENE_CAMERA:
-			uiItemR(layout, ptr, "camera", 0, NULL, ICON_NONE);
-			break;
-		case ACT_SCENE_RESTART:
-			break;
-		default: // ACT_SCENE_SET|ACT_SCENE_ADD_FRONT|ACT_SCENE_ADD_BACK|ACT_SCENE_REMOVE|ACT_SCENE_SUSPEND|ACT_SCENE_RESUME
-			uiItemR(layout, ptr, "scene", 0, NULL, ICON_NONE);
-			break;
-	}
-}
-
-static void draw_actuator_shape_action(uiLayout *layout, PointerRNA *ptr)
-{
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-	uiLayout *row;
-
-	if (ob->type != OB_MESH) {
-		uiItemL(layout, IFACE_("Actuator only available for mesh objects"), ICON_NONE);
-		return;
-	}
-
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "mode", 0, "", ICON_NONE);
-	uiItemR(row, ptr, "action", 0, "", ICON_NONE);
-	uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	if ((RNA_enum_get(ptr, "mode") == ACT_ACTION_FROM_PROP))
-		uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-	else {
-		uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NONE);
-		uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NONE);
-	}
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "priority", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NONE);
-
-#ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
-	uiItemR(row, "stride_length", 0, NULL, ICON_NONE);
-#endif
-}
-
-static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *row, *col;
-
-	uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL);
-	if (!RNA_pointer_get(ptr, "sound").data) {
-		uiItemL(layout, IFACE_("Select a sound from the list or load a new one"), ICON_NONE);
-		return;
-	}
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "volume", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "pitch", 0, NULL, ICON_NONE);
-
-	uiItemR(layout, ptr, "use_sound_3d", 0, NULL, ICON_NONE);
-
-	col = uiLayoutColumn(layout, false);
-	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_sound_3d") == true);
-
-	row = uiLayoutRow(col, false);
-	uiItemR(row, ptr, "gain_3d_min", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "gain_3d_max", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(col, false);
-	uiItemR(row, ptr, "distance_3d_reference", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "distance_3d_max", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(col, false);
-	uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(col, false);
-	uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, ICON_NONE);
-}
-
-static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *split;
-	Object *ob = (Object *)ptr->id.data;
-	PointerRNA settings_ptr;
-	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-	split = uiLayoutSplit(layout, 0.35, false);
-	uiItemR(split, ptr, "operation", 0, NULL, ICON_NONE);
-
-	uiTemplateLayers(split, ptr, "states", &settings_ptr, "used_states", 0);
-}
-
-static void draw_actuator_visibility(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-	row = uiLayoutRow(layout, false);
-
-	uiItemR(row, ptr, "use_visible", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "use_occlusion", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NONE);
-}
-
-static void draw_actuator_steering(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row;
-	uiLayout *col;
-
-	uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-	uiItemR(layout, ptr, "target", 0, NULL, ICON_NONE);
-	uiItemR(layout, ptr, "navmesh", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "velocity", 0, NULL, ICON_NONE);
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "acceleration", 0, NULL, ICON_NONE);
-	uiItemR(row, ptr, "turn_speed", 0, NULL, ICON_NONE);
-
-	row = uiLayoutRow(layout, false);
-	col = uiLayoutColumn(row, false);
-	uiItemR(col, ptr, "facing", 0, NULL, ICON_NONE);
-	col = uiLayoutColumn(row, false);
-	uiItemR(col, ptr, "facing_axis", 0, NULL, ICON_NONE);
-	if (!RNA_boolean_get(ptr, "facing")) {
-		uiLayoutSetActive(col, false);
-	}
-	col = uiLayoutColumn(row, false);
-	uiItemR(col, ptr, "normal_up", 0, NULL, ICON_NONE);
-	if (!RNA_pointer_get(ptr, "navmesh").data) {
-		uiLayoutSetActive(col, false);
-	}
-
-	row = uiLayoutRow(layout, false);
-	col = uiLayoutColumn(row, false);
-	uiItemR(col, ptr, "self_terminated", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "mode")==ACT_STEERING_PATHFOLLOWING) {
-		col = uiLayoutColumn(row, false);
-		uiItemR(col, ptr, "update_period", 0, NULL, ICON_NONE);
-	}
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "lock_z_velocity", 1, NULL, ICON_NONE);
-	row = uiLayoutRow(layout, false);
-	uiItemR(row, ptr, "show_visualization", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "mode") != ACT_STEERING_PATHFOLLOWING) {
-		uiLayoutSetActive(row, false);
-	}
-}
-
-static void draw_actuator_mouse(uiLayout *layout, PointerRNA *ptr)
-{
-	uiLayout *row, *col, *subcol, *split, *subsplit;
-
-	uiItemR(layout, ptr, "mode", 0, NULL, 0);
-
-	switch (RNA_enum_get(ptr, "mode")) {
-		case ACT_MOUSE_VISIBILITY:
-			row = uiLayoutRow(layout, 0);
-			uiItemR(row, ptr, "visible", UI_ITEM_R_TOGGLE, NULL, 0);
-			break;
-
-		case ACT_MOUSE_LOOK:
-			/* X axis */
-			row = uiLayoutRow(layout, 0);
-			col = uiLayoutColumn(row, 1);
-
-			uiItemR(col, ptr, "use_axis_x", UI_ITEM_R_TOGGLE, NULL, 0);
-
-			subcol = uiLayoutColumn(col, 1);
-			uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_axis_x")==1);
-			uiItemR(subcol, ptr, "sensitivity_x", 0, NULL, 0);
-			uiItemR(subcol, ptr, "threshold_x", 0, NULL, 0);
-
-			uiItemR(subcol, ptr, "min_x", 0, NULL, 0);
-			uiItemR(subcol, ptr, "max_x", 0, NULL, 0);
-
-			uiItemR(subcol, ptr, "object_axis_x", 0, NULL, 0);
-
-			/* Y Axis */
-			col = uiLayoutColumn(row, 1);
-
-			uiItemR(col, ptr, "use_axis_y", UI_ITEM_R_TOGGLE, NULL, 0);
-
-			subcol = uiLayoutColumn(col, 1);
-			uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_axis_y")==1);
-			uiItemR(subcol, ptr, "sensitivity_y", 0, NULL, 0);
-			uiItemR(subcol, ptr, "threshold_y", 0, NULL, 0);
-
-			uiItemR(subcol, ptr, "min_y", 0, NULL, 0);
-			uiItemR(subcol, ptr, "max_y", 0, NULL, 0);
-
-			uiItemR(subcol, ptr, "object_axis_y", 0, NULL, 0);
-
-			/* Lower options */
-			row = uiLayoutRow(layout, 0);
-			split = uiLayoutSplit(row, 0.5, 0);
-
-			subsplit = uiLayoutSplit(split, 0.5, 1);
-			uiLayoutSetActive(subsplit, RNA_boolean_get(ptr, "use_axis_x")==1);
-			uiItemR(subsplit, ptr, "local_x", UI_ITEM_R_TOGGLE, NULL, 0);
-			uiItemR(subsplit, ptr, "reset_x", UI_ITEM_R_TOGGLE, NULL, 0);
-
-			subsplit = uiLayoutSplit(split, 0.5, 1);
-			uiLayoutSetActive(subsplit, RNA_boolean_get(ptr, "use_axis_y")==1);
-			uiItemR(subsplit, ptr, "local_y", UI_ITEM_R_TOGGLE, NULL, 0);
-			uiItemR(subsplit, ptr, "reset_y", UI_ITEM_R_TOGGLE, NULL, 0);
-
-			break;
-	}
-}
-
-static void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
-{
-	uiLayout *box;
-
-	if (!RNA_boolean_get(ptr, "show_expanded"))
-		return;
-
-	box = uiLayoutBox(layout);
-	uiLayoutSetActive(box, RNA_boolean_get(ptr, "active"));
-
-	switch (RNA_enum_get(ptr, "type")) {
-		case ACT_ACTION:
-			draw_actuator_action(box, ptr);
-			break;
-		case ACT_ARMATURE:
-			draw_actuator_armature(box, ptr);
-			break;
-		case ACT_CAMERA:
-			draw_actuator_camera(box, ptr);
-			break;
-		case ACT_CONSTRAINT:
-			draw_actuator_constraint(box, ptr, C);
-			break;
-		case ACT_EDIT_OBJECT:
-			draw_actuator_edit_object(box, ptr);
-			break;
-		case ACT_2DFILTER:
-			draw_actuator_filter_2d(box, ptr);
-			break;
-		case ACT_GAME:
-			draw_actuator_game(box, ptr);
-			break;
-		case ACT_MESSAGE:
-			draw_actuator_message(box, ptr, C);
-			break;
-		case ACT_OBJECT:
-			draw_actuator_motion(box, ptr);
-			break;
-		case ACT_PARENT:
-			draw_actuator_parent(box, ptr);
-			break;
-		case ACT_PROPERTY:
-			draw_actuator_property(box, ptr);
-			break;
-		case ACT_RANDOM:
-			draw_actuator_random(box, ptr);
-			break;
-		case ACT_SCENE:
-			draw_actuator_scene(box, ptr);
-			break;
-		case ACT_SHAPEACTION:
-			draw_actuator_shape_action(box, ptr);
-			break;
-		case ACT_SOUND:
-			draw_actuator_sound(box, ptr, C);
-			break;
-		case ACT_STATE:
-			draw_actuator_state(box, ptr);
-			break;
-		case ACT_VISIBILITY:
-			draw_actuator_visibility(box, ptr);
-			break;
-		case ACT_STEERING:
-			draw_actuator_steering(box, ptr);
-			break;
-		case ACT_MOUSE:
-			draw_actuator_mouse(box, ptr);
-			break;
-	}
-}
-
-void logic_buttons(bContext *C, ARegion *ar)
-{
-	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	Object *ob= CTX_data_active_object(C);
-	ID **idar;
-	PointerRNA logic_ptr, settings_ptr, object_ptr;
-	uiLayout *layout, *row, *box;
-	uiBlock *block;
-	uiBut *but;
-	char uiblockstr[32];
-	short a, count;
-	int xco, yco, width, height;
-
-	if (ob==NULL) return;
-
-	RNA_pointer_create(NULL, &RNA_SpaceLogicEditor, slogic, &logic_ptr);
-	idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
-
-	BLI_snprintf(uiblockstr, sizeof(uiblockstr), "buttonswin %p", (void *)ar);
-	block= UI_block_begin(C, ar, uiblockstr, UI_EMBOSS);
-	UI_block_func_handle_set(block, do_logic_buts, NULL);
-	UI_block_bounds_set_normal(block, U.widget_unit/2);
-
-	/* loop over all objects and set visible/linked flags for the logic bricks */
-	for (a=0; a<count; a++) {
-		bActuator *act;
-		bSensor *sens;
-		bController *cont;
-		int iact;
-		short flag;
-
-		ob= (Object *)idar[a];
-
-		/* clean ACT_LINKED and ACT_VISIBLE of all potentially visible actuators so that we can determine which is actually linked/visible */
-		act = ob->actuators.first;
-		while (act) {
-			act->flag &= ~(ACT_LINKED|ACT_VISIBLE);
-			act = act->next;
-		}
-		/* same for sensors */
-		sens= ob->sensors.first;
-		while (sens) {
-			sens->flag &= ~(SENS_VISIBLE);
-			sens = sens->next;
-		}
-
-		/* mark the linked and visible actuators */
-		cont= ob->controllers.first;
-		while (cont) {
-			flag = ACT_LINKED;
-
-			/* this controller is visible, mark all its actuator */
-			if ((ob->scaflag & OB_ALLSTATE) || (ob->state & cont->state_mask))
-				flag |= ACT_VISIBLE;
-
-			for (iact=0; iact<cont->totlinks; iact++) {
-				act = cont->links[iact];
-				if (act)
-					act->flag |= flag;
-			}
-			cont = cont->next;
-		}
-	}
-
-	/* ****************** Controllers ****************** */
-
-	xco= 21 * U.widget_unit; yco= - U.widget_unit / 2; width= 15 * U.widget_unit;
-	layout= UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, 0, UI_style_get());
-	row = uiLayoutRow(layout, true);
-
-	uiDefBlockBut(block, controller_menu, NULL, IFACE_("Controllers"), xco - U.widget_unit / 2, yco, width, UI_UNIT_Y, "");		/* replace this with uiLayout stuff later */
-
-	uiItemR(row, &logic_ptr, "show_controllers_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_controllers_active_object", 0, IFACE_("Act"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_controllers_linked_controller", 0, IFACE_("Link"), ICON_NONE);
-
-	for (a=0; a<count; a++) {
-		bController *cont;
-		PointerRNA ptr;
-		uiLayout *split, *subsplit, *col;
-
-
-		ob= (Object *)idar[a];
-
-		/* only draw the controller common header if "use_visible" */
-		if ( (ob->scavisflag & OB_VIS_CONT) == 0) {
-			continue;
-		}
-
-		/* Drawing the Controller Header common to all Selected Objects */
-
-		RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-
-		split = uiLayoutSplit(layout, 0.05f, false);
-		uiItemR(split, &settings_ptr, "show_state_panel", UI_ITEM_R_NO_BG, "", ICON_DISCLOSURE_TRI_RIGHT);
-
-		row = uiLayoutRow(split, true);
-		uiDefButBitS(block, UI_BTYPE_TOGGLE, OB_SHOWCONT, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide controllers"));
-
-		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
-		uiLayoutSetContextPointer(row, "object", &object_ptr);
-		uiItemMenuEnumO(row, C, "LOGIC_OT_controller_add", "type", IFACE_("Add Controller"), ICON_NONE);
-
-		if (RNA_boolean_get(&settings_ptr, "show_state_panel")) {
-
-			box = uiLayoutBox(layout);
-			split = uiLayoutSplit(box, 0.2f, false);
-
-			col = uiLayoutColumn(split, false);
-			uiItemL(col, IFACE_("Visible"), ICON_NONE);
-			uiItemL(col, IFACE_("Initial"), ICON_NONE);
-
-			subsplit = uiLayoutSplit(split, 0.85f, false);
-			col = uiLayoutColumn(subsplit, false);
-			row = uiLayoutRow(col, false);
-			uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "use_all_states") == false);
-			uiTemplateGameStates(row, &settings_ptr, "states_visible", &settings_ptr, "used_states", 0);
-			row = uiLayoutRow(col, false);
-			uiTemplateGameStates(row, &settings_ptr, "states_initial", &settings_ptr, "used_states", 0);
-
-			col = uiLayoutColumn(subsplit, false);
-			uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-			uiItemR(col, &settings_ptr, "show_debug_state", 0, "", ICON_NONE);
-		}
-
-		/* End of Drawing the Controller Header common to all Selected Objects */
-
-		if ((ob->scaflag & OB_SHOWCONT) == 0) continue;
-
-
-		uiItemS(layout);
-
-		for (cont= ob->controllers.first; cont; cont=cont->next) {
-			RNA_pointer_create((ID *)ob, &RNA_Controller, cont, &ptr);
-
-			if (!(ob->scaflag & OB_ALLSTATE) && !(ob->state & cont->state_mask))
-				continue;
-
-			/* use two nested splits to align inlinks/links properly */
-			split = uiLayoutSplit(layout, 0.05f, false);
-
-			/* put inlink button to the left */
-			col = uiLayoutColumn(split, false);
-			uiLayoutSetActive(col, RNA_boolean_get(&ptr, "active"));
-			uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_LEFT);
-			but = uiDefIconBut(block, UI_BTYPE_INLINK, 0, ICON_INLINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, cont, LINK_CONTROLLER, 0, 0, 0, "");
-			if (!RNA_boolean_get(&ptr, "active")) {
-				UI_but_flag_enable(but, UI_BUT_SCA_LINK_GREY);
-			}
-
-			//col = uiLayoutColumn(split, true);
-			/* nested split for middle and right columns */
-			subsplit = uiLayoutSplit(split, 0.95f, false);
-
-			col = uiLayoutColumn(subsplit, true);
-			uiLayoutSetContextPointer(col, "controller", &ptr);
-
-			/* should make UI template for controller header.. function will do for now */
-//			draw_controller_header(col, &ptr);
-			draw_controller_header(col, &ptr, xco, width, yco); //provisory for 2.50 beta
-
-			/* draw the brick contents */
-			draw_brick_controller(col, &ptr);
-
-			/* put link button to the right */
-			col = uiLayoutColumn(subsplit, false);
-			uiLayoutSetActive(col, RNA_boolean_get(&ptr, "active"));
-			uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_LEFT);
-			but = uiDefIconBut(block, UI_BTYPE_LINK, 0, ICON_LINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
-			if (!RNA_boolean_get(&ptr, "active")) {
-				UI_but_flag_enable(but, UI_BUT_SCA_LINK_GREY);
-			}
-
-			UI_but_link_set(but, NULL, (void ***)&(cont->links), &cont->totlinks, LINK_CONTROLLER, LINK_ACTUATOR);
-
-		}
-	}
-	UI_block_layout_resolve(block, NULL, &yco);	/* stores final height in yco */
-	height = yco;
-
-	/* ****************** Sensors ****************** */
-
-	xco= U.widget_unit / 2; yco= -U.widget_unit / 2; width= 17 * U.widget_unit;
-	layout= UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, 0, UI_style_get());
-	row = uiLayoutRow(layout, true);
-
-	uiDefBlockBut(block, sensor_menu, NULL, IFACE_("Sensors"), xco - U.widget_unit / 2, yco, 15 * U.widget_unit, UI_UNIT_Y, "");		/* replace this with uiLayout stuff later */
-
-	uiItemR(row, &logic_ptr, "show_sensors_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_sensors_active_object", 0, IFACE_("Act"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_sensors_linked_controller", 0, IFACE_("Link"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_sensors_active_states", 0, IFACE_("State"), ICON_NONE);
-
-	for (a=0; a<count; a++) {
-		bSensor *sens;
-		PointerRNA ptr;
-
-		ob= (Object *)idar[a];
-
-		/* only draw the sensor common header if "use_visible" */
-		if ((ob->scavisflag & OB_VIS_SENS) == 0) continue;
-
-		row = uiLayoutRow(layout, true);
-		uiDefButBitS(block, UI_BTYPE_TOGGLE, OB_SHOWSENS, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide sensors"));
-
-		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
-		uiLayoutSetContextPointer(row, "object", &object_ptr);
-		uiItemMenuEnumO(row, C, "LOGIC_OT_sensor_add", "type", IFACE_("Add Sensor"), ICON_NONE);
-
-		if ((ob->scaflag & OB_SHOWSENS) == 0) continue;
-
-		uiItemS(layout);
-
-		for (sens= ob->sensors.first; sens; sens=sens->next) {
-			RNA_pointer_create((ID *)ob, &RNA_Sensor, sens, &ptr);
-
-			if ((ob->scaflag & OB_ALLSTATE) ||
-				!(slogic->scaflag & BUTS_SENS_STATE) ||
-				(sens->totlinks == 0) ||											/* always display sensor without links so that is can be edited */
-				(sens->flag & SENS_PIN && slogic->scaflag & BUTS_SENS_STATE) ||	/* states can hide some sensors, pinned sensors ignore the visible state */
-				(is_sensor_linked(block, sens))
-				)
-			{	// gotta check if the current state is visible or not
-				uiLayout *split, *col;
-
-				/* make as visible, for move operator */
-				sens->flag |= SENS_VISIBLE;
-
-				split = uiLayoutSplit(layout, 0.95f, false);
-				col = uiLayoutColumn(split, true);
-				uiLayoutSetContextPointer(col, "sensor", &ptr);
-
-				/* should make UI template for sensor header.. function will do for now */
-				draw_sensor_header(col, &ptr, &logic_ptr);
-
-				/* draw the brick contents */
-				draw_brick_sensor(col, &ptr, C);
-
-				/* put link button to the right */
-				col = uiLayoutColumn(split, false);
-				uiLayoutSetActive(col, RNA_boolean_get(&ptr, "active"));
-				but = uiDefIconBut(block, UI_BTYPE_LINK, 0, ICON_LINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
-				if (!RNA_boolean_get(&ptr, "active")) {
-					UI_but_flag_enable(but, UI_BUT_SCA_LINK_GREY);
-				}
-
-				/* use old-school uiButtons for links for now */
-				UI_but_link_set(but, NULL, (void ***)&sens->links, &sens->totlinks, LINK_SENSOR, LINK_CONTROLLER);
-			}
-		}
-	}
-	UI_block_layout_resolve(block, NULL, &yco);	/* stores final height in yco */
-	height = MIN2(height, yco);
-
-	/* ****************** Actuators ****************** */
-
-	xco= 40 * U.widget_unit; yco= -U.widget_unit / 2; width= 17 * U.widget_unit;
-	layout= UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, 0, UI_style_get());
-	row = uiLayoutRow(layout, true);
-
-	uiDefBlockBut(block, actuator_menu, NULL, IFACE_("Actuators"), xco - U.widget_unit / 2, yco, 15 * U.widget_unit, UI_UNIT_Y, "");		/* replace this with uiLayout stuff later */
-
-	uiItemR(row, &logic_ptr, "show_actuators_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_actuators_active_object", 0, IFACE_("Act"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_actuators_linked_controller", 0, IFACE_("Link"), ICON_NONE);
-	uiItemR(row, &logic_ptr, "show_actuators_active_states", 0, IFACE_("State"), ICON_NONE);
-
-	for (a=0; a<count; a++) {
-		bActuator *act;
-		PointerRNA ptr;
-
-		ob= (Object *)idar[a];
-
-		/* only draw the actuator common header if "use_visible" */
-		if ((ob->scavisflag & OB_VIS_ACT) == 0) {
-			continue;
-		}
-
-		row = uiLayoutRow(layout, true);
-		uiDefButBitS(block, UI_BTYPE_TOGGLE, OB_SHOWACT, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide actuators"));
-
-		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
-		uiLayoutSetContextPointer(row, "object", &object_ptr);
-		uiItemMenuEnumO(row, C, "LOGIC_OT_actuator_add", "type", IFACE_("Add Actuator"), ICON_NONE);
-
-		if ((ob->scaflag & OB_SHOWACT) == 0) continue;
-
-		uiItemS(layout);
-
-		for (act= ob->actuators.first; act; act=act->next) {
-
-			RNA_pointer_create((ID *)ob, &RNA_Actuator, act, &ptr);
-
-			if ((ob->scaflag & OB_ALLSTATE) ||
-				!(slogic->scaflag & BUTS_ACT_STATE) ||
-				!(act->flag & ACT_LINKED) ||		/* always display actuators without links so that is can be edited */
-				(act->flag & ACT_VISIBLE) ||		/* this actuator has visible connection, display it */
-				(act->flag & ACT_PIN && slogic->scaflag & BUTS_ACT_STATE)	/* states can hide some sensors, pinned sensors ignore the visible state */
-				)
-			{	// gotta check if the current state is visible or not
-				uiLayout *split, *col;
-
-				/* make as visible, for move operator */
-				act->flag |= ACT_VISIBLE;
-
-				split = uiLayoutSplit(layout, 0.05f, false);
-
-				/* put inlink button to the left */
-				col = uiLayoutColumn(split, false);
-				uiLayoutSetActive(col, RNA_boolean_get(&ptr, "active"));
-				but = uiDefIconBut(block, UI_BTYPE_INLINK, 0, ICON_INLINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, act, LINK_ACTUATOR, 0, 0, 0, "");
-				if (!RNA_boolean_get(&ptr, "active")) {
-					UI_but_flag_enable(but, UI_BUT_SCA_LINK_GREY);
-				}
-
-				col = uiLayoutColumn(split, true);
-				uiLayoutSetContextPointer(col, "actuator", &ptr);
-
-				/* should make UI template for actuator header.. function will do for now */
-				draw_actuator_header(col, &ptr, &logic_ptr);
-
-				/* draw the brick contents */
-				draw_brick_actuator(col, &ptr, C);
-
-			}
-		}
-	}
-	UI_block_layout_resolve(block, NULL, &yco);	/* stores final height in yco */
-	height = MIN2(height, yco);
-
-	UI_view2d_totRect_set(&ar->v2d, 57.5f * U.widget_unit, height - U.widget_unit);
-
-	/* set the view */
-	UI_view2d_view_ortho(&ar->v2d);
-
-	UI_block_links_compose(block);
-
-	UI_block_end(C, block);
-	UI_block_draw(C, block);
-
-	/* restore view matrix */
-	UI_view2d_view_restore(C);
-
-	if (idar) MEM_freeN(idar);
-}
-
diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c
deleted file mode 100644
index 5bc5be28e41..00000000000
--- a/source/blender/editors/space_logic/space_logic.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_logic/space_logic.c
- *  \ingroup splogic
- */
-
-
-#include <string.h>
-#include <stdio.h>
-
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
-#include "DNA_gpencil_types.h"
-
-#include "BKE_context.h"
-#include "BKE_library.h"
-#include "BKE_screen.h"
-
-#include "ED_space_api.h"
-#include "ED_screen.h"
-
-#include "BIF_gl.h"
-
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "logic_intern.h"
-
-/* ******************** manage regions ********************* */
-
-ARegion *logic_has_buttons_region(ScrArea *sa)
-{
-	ARegion *ar, *arnew;
-
-	ar = BKE_area_find_region_type(sa, RGN_TYPE_UI);
-	if (ar) return ar;
-
-	/* add subdiv level; after header */
-	ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
-
-	/* is error! */
-	if (ar == NULL) return NULL;
-
-	arnew= MEM_callocN(sizeof(ARegion), "buttons for image");
-
-	BLI_insertlinkafter(&sa->regionbase, ar, arnew);
-	arnew->regiontype = RGN_TYPE_UI;
-	arnew->alignment = RGN_ALIGN_RIGHT;
-
-	arnew->flag = RGN_FLAG_HIDDEN;
-
-	return arnew;
-}
-
-/* ******************** default callbacks for image space ***************** */
-
-static SpaceLink *logic_new(const bContext *C)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar;
-	SpaceLogic *slogic;
-
-	slogic= MEM_callocN(sizeof(SpaceLogic), "initlogic");
-	slogic->spacetype= SPACE_LOGIC;
-
-	/* default options */
-	slogic->scaflag = ((BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) |
-	                   (BUTS_CONT_SEL|BUTS_CONT_ACT|BUTS_CONT_LINK) |
-	                   (BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_ACT_LINK)    |
-	                   (BUTS_SENS_STATE|BUTS_ACT_STATE));
-
-
-	/* header */
-	ar= MEM_callocN(sizeof(ARegion), "header for logic");
-
-	BLI_addtail(&slogic->regionbase, ar);
-	ar->regiontype= RGN_TYPE_HEADER;
-	ar->alignment= RGN_ALIGN_BOTTOM;
-
-	/* buttons/list view */
-	ar= MEM_callocN(sizeof(ARegion), "buttons for logic");
-
-	BLI_addtail(&slogic->regionbase, ar);
-	ar->regiontype= RGN_TYPE_UI;
-	ar->alignment= RGN_ALIGN_RIGHT;
-
-	/* main region */
-	ar= MEM_callocN(sizeof(ARegion), "main region for logic");
-
-	BLI_addtail(&slogic->regionbase, ar);
-	ar->regiontype= RGN_TYPE_WINDOW;
-
-	ar->v2d.tot.xmin =  0.0f;
-	ar->v2d.tot.ymax =  0.0f;
-	ar->v2d.tot.xmax = 1150.0f;
-	ar->v2d.tot.ymin = ( 1150.0f/(float)sa->winx ) * (float)-sa->winy;
-
-	ar->v2d.cur = ar->v2d.tot;
-
-	ar->v2d.min[0] = 1.0f;
-	ar->v2d.min[1] = 1.0f;
-
-	ar->v2d.max[0] = 32000.0f;
-	ar->v2d.max[1] = 32000.0f;
-
-	ar->v2d.minzoom = 0.5f;
-	ar->v2d.maxzoom = 1.5f;
-
-	ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
-	ar->v2d.keepzoom = V2D_KEEPZOOM | V2D_LIMITZOOM | V2D_KEEPASPECT;
-	ar->v2d.keeptot = V2D_KEEPTOT_BOUNDS;
-	ar->v2d.align = V2D_ALIGN_NO_POS_Y | V2D_ALIGN_NO_NEG_X;
-	ar->v2d.keepofs = V2D_KEEPOFS_Y;
-
-	return (SpaceLink *)slogic;
-}
-
-/* not spacelink itself */
-static void logic_free(SpaceLink *UNUSED(sl))
-{
-//	Spacelogic *slogic= (SpaceLogic *) sl;
-
-//	if (slogic->gpd)
-// XXX		BKE_gpencil_free(slogic->gpd);
-
-}
-
-
-/* spacetype; init callback */
-static void logic_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
-{
-
-}
-
-static SpaceLink *logic_duplicate(SpaceLink *sl)
-{
-	SpaceLogic *slogicn= MEM_dupallocN(sl);
-
-	return (SpaceLink *)slogicn;
-}
-
-static void logic_operatortypes(void)
-{
-	WM_operatortype_append(LOGIC_OT_properties);
-	WM_operatortype_append(LOGIC_OT_links_cut);
-}
-
-static void logic_keymap(struct wmKeyConfig *keyconf)
-{
-	wmKeyMap *keymap = WM_keymap_find(keyconf, "Logic Editor", SPACE_LOGIC, 0);
-
-	WM_keymap_add_item(keymap, "LOGIC_OT_properties", NKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "LOGIC_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_menu(keymap, "LOGIC_MT_logicbricks_add", AKEY, KM_PRESS, KM_SHIFT, 0);
-
-	WM_keymap_add_item(keymap, "LOGIC_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
-#ifdef WITH_INPUT_NDOF
-	WM_keymap_add_item(keymap, "LOGIC_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
-#endif
-}
-
-static void logic_refresh(const bContext *UNUSED(C), ScrArea *UNUSED(sa))
-{
-//	SpaceLogic *slogic= CTX_wm_space_logic(C);
-//	Object *obedit= CTX_data_edit_object(C);
-
-}
-
-static void logic_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_LOGIC:
-			ED_region_tag_redraw(ar);
-			break;
-		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_FRAME:
-					ED_region_tag_redraw(ar);
-					break;
-
-				case ND_OB_ACTIVE:
-					ED_region_tag_redraw(ar);
-					break;
-				}
-				break;
-		case NC_OBJECT:
-			break;
-		case NC_ID:
-			if (wmn->action == NA_RENAME)
-				ED_region_tag_redraw(ar);
-			break;
-	}
-}
-
-static int logic_context(const bContext *UNUSED(C), const char *UNUSED(member), bContextDataResult *UNUSED(result))
-{
-//	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	return 0;
-}
-
-/************************** main region ***************************/
-
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void logic_main_region_init(wmWindowManager *wm, ARegion *ar)
-{
-	wmKeyMap *keymap;
-
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
-
-	/* own keymaps */
-	keymap = WM_keymap_find(wm->defaultconf, "Logic Editor", SPACE_LOGIC, 0);
-	WM_event_add_keymap_handler(&ar->handlers, keymap);
-}
-
-static void logic_main_region_draw(const bContext *C, ARegion *ar)
-{
-	/* draw entirely, view changes should be handled here */
-//	SpaceLogic *slogic= CTX_wm_space_logic(C);
-	View2D *v2d= &ar->v2d;
-	View2DScrollers *scrollers;
-
-	/* clear and setup matrix */
-	UI_ThemeClearColor(TH_BACK);
-	glClear(GL_COLOR_BUFFER_BIT);
-
-	UI_view2d_view_ortho(v2d);
-
-	logic_buttons((bContext *)C, ar);
-
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
-
-	/* scrollers */
-	scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
-	UI_view2d_scrollers_draw(C, v2d, scrollers);
-	UI_view2d_scrollers_free(scrollers);
-
-}
-
-
-/* *********************** buttons region ************************ */
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void logic_buttons_region_init(wmWindowManager *wm, ARegion *ar)
-{
-	wmKeyMap *keymap;
-
-	ED_region_panels_init(wm, ar);
-
-	keymap = WM_keymap_find(wm->defaultconf, "Logic Editor", SPACE_LOGIC, 0);
-	WM_event_add_keymap_handler(&ar->handlers, keymap);
-}
-
-static void logic_buttons_region_draw(const bContext *C, ARegion *ar)
-{
-	ED_region_panels(C, ar, NULL, -1, true);
-}
-
-/************************* header region **************************/
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void logic_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
-{
-	ED_region_header_init(ar);
-}
-
-static void logic_header_region_draw(const bContext *C, ARegion *ar)
-{
-	ED_region_header(C, ar);
-}
-
-/**************************** spacetype *****************************/
-
-static void logic_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
-{
-	SpaceLogic *slog = (SpaceLogic *)slink;
-
-	if (!ELEM(GS(old_id->name), ID_GD)) {
-		return;
-	}
-
-	if ((ID *)slog->gpd == old_id) {
-		slog->gpd = (bGPdata *)new_id;
-		id_us_min(old_id);
-		id_us_plus(new_id);
-	}
-}
-
-/* only called once, from space/spacetypes.c */
-void ED_spacetype_logic(void)
-{
-	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype logic");
-	ARegionType *art;
-
-	st->spaceid = SPACE_LOGIC;
-	strncpy(st->name, "Logic", BKE_ST_MAXNAME);
-
-	st->new = logic_new;
-	st->free = logic_free;
-	st->init = logic_init;
-	st->duplicate = logic_duplicate;
-	st->operatortypes = logic_operatortypes;
-	st->keymap = logic_keymap;
-	st->refresh = logic_refresh;
-	st->context = logic_context;
-	st->id_remap = logic_id_remap;
-
-	/* regions: main window */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype logic region");
-	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES | ED_KEYMAP_VIEW2D;
-	art->init = logic_main_region_init;
-	art->draw = logic_main_region_draw;
-	art->listener = logic_listener;
-
-	BLI_addhead(&st->regiontypes, art);
-
-	/* regions: listview/buttons */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype logic region");
-	art->regionid = RGN_TYPE_UI;
-	art->prefsizex= 220; // XXX
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
-	art->listener = logic_listener;
-	art->init = logic_buttons_region_init;
-	art->draw = logic_buttons_region_draw;
-	BLI_addhead(&st->regiontypes, art);
-
-	/* regions: header */
-	art= MEM_callocN(sizeof(ARegionType), "spacetype logic region");
-	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey = HEADERY;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
-	art->init = logic_header_region_init;
-	art->draw = logic_header_region_draw;
-
-	BLI_addhead(&st->regiontypes, art);
-
-	BKE_spacetype_register(st);
-}
-
-
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index 8fdba4ce60d..d782fe4d7ef 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -45,6 +45,7 @@
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_report.h"
 
@@ -123,40 +124,37 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe
 		}
 		case ANIMTYPE_OBJECT:
 		{
-			bDopeSheet *ads = (bDopeSheet *)ac->data;
-			Scene *sce = (Scene *)ads->source;
+			ViewLayer *view_layer = ac->view_layer;
 			Base *base = (Base *)ale->data;
 			Object *ob = base->object;
 			AnimData *adt = ob->adt;
 
-			if (nlaedit_is_tweakmode_on(ac) == 0 && (ob->restrictflag & OB_RESTRICT_SELECT) == 0) {
+			if (nlaedit_is_tweakmode_on(ac) == 0 && (base->flag & BASE_SELECTABLED)) {
 				/* set selection status */
 				if (selectmode == SELECT_INVERT) {
 					/* swap select */
-					base->flag ^= SELECT;
-					ob->flag = base->flag;
+					ED_object_base_select(base, BA_INVERT);
+					BKE_scene_object_base_flag_sync_from_base(base);
 
 					if (adt) adt->flag ^= ADT_UI_SELECTED;
 				}
 				else {
-					Base *b;
-
 					/* deselect all */
 					/* TODO: should this deselect all other types of channels too? */
-					for (b = sce->base.first; b; b = b->next) {
-						b->flag &= ~SELECT;
-						b->object->flag = b->flag;
+					for (Base *b = view_layer->object_bases.first; b; b = b->next) {
+						ED_object_base_select(b, BA_DESELECT);
+						BKE_scene_object_base_flag_sync_from_base(b);
 						if (b->object->adt) b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE);
 					}
 
 					/* select object now */
-					base->flag |= SELECT;
-					ob->flag |= SELECT;
+					ED_object_base_select(base, BA_SELECT);
+					BKE_scene_object_base_flag_sync_from_base(base);
 					if (adt) adt->flag |= ADT_UI_SELECTED;
 				}
 
 				/* change active object - regardless of whether it is now selected [T37883] */
-				ED_base_object_activate(C, base); /* adds notifier */
+				ED_object_base_activate(C, base); /* adds notifier */
 
 				if ((adt) && (adt->flag & ADT_UI_SELECTED))
 					adt->flag |= ADT_UI_ACTIVE;
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 5d138a939de..3f1ab059a91 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -53,9 +53,12 @@
 #include "ED_anim_api.h"
 #include "ED_keyframes_draw.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_draw.h"
+
 #include "WM_types.h"
 
 #include "UI_interface.h"
@@ -97,14 +100,10 @@ void nla_action_get_color(AnimData *adt, bAction *act, float color[4])
 }
 
 /* draw the keyframes in the specified Action */
-static void nla_action_draw_keyframes(AnimData *adt, bAction *act, View2D *v2d, float y, float ymin, float ymax)
+static void nla_action_draw_keyframes(AnimData *adt, bAction *act, float y, float ymin, float ymax)
 {
-	DLRBT_Tree keys;
-	ActKeyColumn *ak;
-	float xscale, f1, f2;
-	float color[4];
-
 	/* get a list of the keyframes with NLA-scaling applied */
+	DLRBT_Tree keys;
 	BLI_dlrbTree_init(&keys);
 	action_to_keylist(adt, act, &keys, NULL);
 	BLI_dlrbTree_linkedlist_sync(&keys);
@@ -116,30 +115,52 @@ static void nla_action_draw_keyframes(AnimData *adt, bAction *act, View2D *v2d,
 	 *	- get and reset the background color, this time without the alpha to stand out better
 	 *	  (amplified alpha is used instead)
 	 */
+	float color[4];
 	nla_action_get_color(adt, act, color);
 	color[3] *= 2.5f;
 
-	glColor4fv(color);
-	/*  - draw a rect from the first to the last frame (no extra overlaps for now)
-	 *	  that is slightly stumpier than the track background (hardcoded 2-units here)
-	 */
-	f1 = ((ActKeyColumn *)keys.first)->cfra;
-	f2 = ((ActKeyColumn *)keys.last)->cfra;
-
-	glRectf(f1, ymin + 2, f2, ymax - 2);
-
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	/* get View2D scaling factor */
-	UI_view2d_scale_get(v2d, &xscale, NULL);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-	/* for now, color is hardcoded to be black */
-	glColor3f(0.0f, 0.0f, 0.0f);
+	immUniformColor4fv(color);
 
-	/* just draw each keyframe as a simple dot (regardless of the selection status)
-	 *	- size is 3.0f which is smaller than the editable keyframes, so that there is a distinction
+	/*  - draw a rect from the first to the last frame (no extra overlaps for now)
+	 *	  that is slightly stumpier than the track background (hardcoded 2-units here)
 	 */
-	for (ak = keys.first; ak; ak = ak->next)
-		draw_keyframe_shape(ak->cfra, y, xscale, 3.0f, 0, ak->key_type, KEYFRAME_SHAPE_FRAME, 1.0f);
+	float f1 = ((ActKeyColumn *)keys.first)->cfra;
+	float f2 = ((ActKeyColumn *)keys.last)->cfra;
+
+	immRectf(pos_id, f1, ymin + 2, f2, ymax - 2);
+	immUnbindProgram();
+
+	/* count keys before drawing */
+	/* Note: It's safe to cast DLRBT_Tree, as it's designed to degrade down to a ListBase */
+	unsigned int key_ct = BLI_listbase_count((ListBase *)&keys);
+
+	if (key_ct > 0) {
+		format = immVertexFormat();
+		pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		unsigned int size_id = GWN_vertformat_attr_add(format, "size", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
+		unsigned int color_id = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+		unsigned int outline_color_id = GWN_vertformat_attr_add(format, "outlineColor", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
+		immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND);
+		GPU_enable_program_point_size();
+		immBegin(GWN_PRIM_POINTS, key_ct);
+
+		/* - disregard the selection status of keyframes so they draw a certain way
+		 *	- size is 6.0f which is smaller than the editable keyframes, so that there is a distinction
+		 */
+		for (ActKeyColumn *ak = keys.first; ak; ak = ak->next) {
+			draw_keyframe_shape(ak->cfra, y, 6.0f, false, ak->key_type, KEYFRAME_SHAPE_FRAME, 1.0f,
+			                    pos_id, size_id, color_id, outline_color_id);
+		}
+
+		immEnd();
+		GPU_disable_program_point_size();
+		immUnbindProgram();
+	}
 
 	/* free icons */
 	BLI_dlrbTree_free(&keys);
@@ -148,57 +169,70 @@ static void nla_action_draw_keyframes(AnimData *adt, bAction *act, View2D *v2d,
 /* Strip Markers ------------------------ */
 
 /* Markers inside an action strip */
-static void nla_actionclip_draw_markers(NlaStrip *strip, float yminc, float ymaxc)
+static void nla_actionclip_draw_markers(NlaStrip *strip, float yminc, float ymaxc, int shade, const bool dashed)
 {
-	bAction *act = strip->act;
-	TimeMarker *marker;
+	const bAction *act = strip->act;
 
-	if (ELEM(NULL, strip->act, strip->act->markers.first))
+	if (ELEM(NULL, act, act->markers.first))
 		return;
 
-	for (marker = act->markers.first; marker; marker = marker->next) {
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	if (dashed) {
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+		immUniform1i("num_colors", 0);  /* "simple" mode */
+		immUniform1f("dash_width", 6.0f);
+		immUniform1f("dash_factor", 0.5f);
+	}
+	else {
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	}
+	immUniformThemeColorShade(TH_STRIP_SELECT, shade);
+
+	immBeginAtMost(GWN_PRIM_LINES, BLI_listbase_count(&act->markers) * 2);
+	for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
 		if ((marker->frame > strip->actstart) && (marker->frame < strip->actend)) {
 			float frame = nlastrip_get_frame(strip, marker->frame, NLATIME_CONVERT_MAP);
 
 			/* just a simple line for now */
-			// XXX: draw a triangle instead...
-			fdrawline(frame, yminc + 1, frame, ymaxc - 1);
+			/* XXX: draw a triangle instead... */
+			immVertex2f(shdr_pos, frame, yminc + 1);
+			immVertex2f(shdr_pos, frame, ymaxc - 1);
 		}
 	}
+	immEnd();
+
+	immUnbindProgram();
 }
 
 /* Markers inside a NLA-Strip */
 static void nla_strip_draw_markers(NlaStrip *strip, float yminc, float ymaxc)
 {
-	glLineWidth(2.0);
+	glLineWidth(2.0f);
 
 	if (strip->type == NLASTRIP_TYPE_CLIP) {
 		/* try not to be too conspicuous, while being visible enough when transforming */
-		if (strip->flag & NLASTRIP_FLAG_SELECT)
-			UI_ThemeColorShade(TH_STRIP_SELECT, -60);
-		else
-			UI_ThemeColorShade(TH_STRIP_SELECT, -40);
-
-		setlinestyle(3);
+		int shade = (strip->flag & NLASTRIP_FLAG_SELECT) ? -60 : -40;
 
 		/* just draw the markers in this clip */
-		nla_actionclip_draw_markers(strip, yminc, ymaxc);
-
-		setlinestyle(0);
+		nla_actionclip_draw_markers(strip, yminc, ymaxc, shade, true);
 	}
 	else if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
 		/* just a solid color, so that it is very easy to spot */
-		UI_ThemeColorShade(TH_STRIP_SELECT, 20);
-
+		int shade = 20;
 		/* draw the markers in the first level of strips only (if they are actions) */
 		for (NlaStrip *nls = strip->strips.first; nls; nls = nls->next) {
 			if (nls->type == NLASTRIP_TYPE_CLIP) {
-				nla_actionclip_draw_markers(nls, yminc, ymaxc);
+				nla_actionclip_draw_markers(nls, yminc, ymaxc, shade, false);
 			}
 		}
 	}
 
-	glLineWidth(1.0);
+	glLineWidth(1.0f);
 }
 
 /* Strips (Proper) ---------------------- */
@@ -266,14 +300,11 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
 }
 
 /* helper call for drawing influence/time control curves for a given NLA-strip */
-static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
+static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc, unsigned int pos)
 {
 	const float yheight = ymaxc - yminc;
 
-	/* drawing color is simply a light-gray */
-	// TODO: is this color suitable?
-	// XXX nasty hacked color for now... which looks quite bad too...
-	glColor3f(0.7f, 0.7f, 0.7f);
+	immUniformColor3f(0.7f, 0.7f, 0.7f);
 
 	/* draw with AA'd line */
 	glEnable(GL_LINE_SMOOTH);
@@ -286,66 +317,100 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
 
 		/* plot the curve (over the strip's main region) */
 		if (fcu) {
-			glBegin(GL_LINE_STRIP);
+			immBegin(GWN_PRIM_LINE_STRIP, abs((int)(strip->end - strip->start) + 1));
 
 			/* sample at 1 frame intervals, and draw
 			 *	- min y-val is yminc, max is y-maxc, so clamp in those regions
 			 */
 			for (cfra = strip->start; cfra <= strip->end; cfra += 1.0f) {
-				float y = evaluate_fcurve(fcu, cfra);
+				float y = evaluate_fcurve(fcu, cfra); /* assume this to be in 0-1 range */
 				CLAMP(y, 0.0f, 1.0f);
-				glVertex2f(cfra, ((y * yheight) + yminc));
+				immVertex2f(pos, cfra, ((y * yheight) + yminc));
 			}
 
-			glEnd(); // GL_LINE_STRIP
+			immEnd();
 		}
 	}
 	else {
 		/* use blend in/out values only if both aren't zero */
 		if ((IS_EQF(strip->blendin, 0.0f) && IS_EQF(strip->blendout, 0.0f)) == 0) {
-			glBegin(GL_LINE_STRIP);
+			immBeginAtMost(GWN_PRIM_LINE_STRIP, 4);
+
 			/* start of strip - if no blendin, start straight at 1, otherwise from 0 to 1 over blendin frames */
 			if (IS_EQF(strip->blendin, 0.0f) == 0) {
-				glVertex2f(strip->start,                    yminc);
-				glVertex2f(strip->start + strip->blendin,   ymaxc);
+				immVertex2f(pos, strip->start,                    yminc);
+				immVertex2f(pos, strip->start + strip->blendin,   ymaxc);
 			}
 			else
-				glVertex2f(strip->start, ymaxc);
+				immVertex2f(pos, strip->start, ymaxc);
 
 			/* end of strip */
 			if (IS_EQF(strip->blendout, 0.0f) == 0) {
-				glVertex2f(strip->end - strip->blendout,    ymaxc);
-				glVertex2f(strip->end,                      yminc);
+				immVertex2f(pos, strip->end - strip->blendout,    ymaxc);
+				immVertex2f(pos, strip->end,                      yminc);
 			}
 			else
-				glVertex2f(strip->end, ymaxc);
-			glEnd(); // GL_LINE_STRIP
+				immVertex2f(pos, strip->end, ymaxc);
+
+			immEnd();
 		}
 	}
 
-	/* time -------------------------- */
-	// XXX do we want to draw this curve? in a different color too?
-
 	/* turn off AA'd lines */
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
 }
 
+/* helper call to setup dashed-lines for strip outlines */
+static uint nla_draw_use_dashed_outlines(float color[4], bool muted)
+{
+	/* Note that we use dashed shader here, and make it draw solid lines if not muted... */
+	uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* Simple dashes. */
+	immUniformColor3fv(color);
+
+	/* line style: dotted for muted */
+	if (muted) {
+		/* dotted - and slightly thicker for readability of the dashes */
+		immUniform1f("dash_width", 5.0f);
+		immUniform1f("dash_factor", 0.4f);
+		glLineWidth(1.5f);
+	}
+	else {
+		/* solid line */
+		immUniform1f("dash_factor", 2.0f);
+		glLineWidth(1.0f);
+	}
+
+	return shdr_pos;
+}
+
 /* main call for drawing a single NLA-strip */
 static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStrip *strip, View2D *v2d, float yminc, float ymaxc)
 {
 	const bool non_solo = ((adt && (adt->flag & ADT_NLA_SOLO_TRACK)) && (nlt->flag & NLATRACK_SOLO) == 0);
-	float color[3];
+	const bool muted = ((nlt->flag & NLATRACK_MUTED) || (strip->flag & NLASTRIP_FLAG_MUTED));
+	float color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	uint shdr_pos;
 
 	/* get color of strip */
 	nla_strip_get_color_inside(adt, strip, color);
 
+	shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* draw extrapolation info first (as backdrop)
 	 *	- but this should only be drawn if track has some contribution
 	 */
 	if ((strip->extendmode != NLASTRIP_EXTEND_NOTHING) && (non_solo == 0)) {
 		/* enable transparency... */
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
 
 		switch (strip->extendmode) {
@@ -356,15 +421,10 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 				 */
 				if (strip->prev == NULL) {
 					/* set the drawing color to the color of the strip, but with very faint alpha */
-					glColor4f(color[0], color[1], color[2], 0.15f);
+					immUniformColor3fvAlpha(color, 0.15f);
 
 					/* draw the rect to the edge of the screen */
-					glBegin(GL_QUADS);
-					glVertex2f(v2d->cur.xmin, yminc);
-					glVertex2f(v2d->cur.xmin, ymaxc);
-					glVertex2f(strip->start, ymaxc);
-					glVertex2f(strip->start, yminc);
-					glEnd();
+					immRectf(shdr_pos, v2d->cur.xmin, yminc, strip->start, ymaxc);
 				}
 				ATTR_FALLTHROUGH;
 
@@ -373,22 +433,11 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 				/* only need to try and draw if the next strip doesn't occur immediately after */
 				if ((strip->next == NULL) || (IS_EQF(strip->next->start, strip->end) == 0)) {
 					/* set the drawing color to the color of the strip, but this time less faint */
-					glColor4f(color[0], color[1], color[2], 0.3f);
+					immUniformColor3fvAlpha(color, 0.3f);
 
 					/* draw the rect to the next strip or the edge of the screen */
-					glBegin(GL_QUADS);
-					glVertex2f(strip->end, yminc);
-					glVertex2f(strip->end, ymaxc);
-
-					if (strip->next) {
-						glVertex2f(strip->next->start, ymaxc);
-						glVertex2f(strip->next->start, yminc);
-					}
-					else {
-						glVertex2f(v2d->cur.xmax, ymaxc);
-						glVertex2f(v2d->cur.xmax, yminc);
-					}
-					glEnd();
+					float x2 = strip->next ? strip->next->start : v2d->cur.xmax;
+					immRectf(shdr_pos, strip->end, yminc, x2, ymaxc);
 				}
 				break;
 		}
@@ -399,18 +448,22 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 
 	/* draw 'inside' of strip itself */
 	if (non_solo == 0) {
+		immUnbindProgram();
+
 		/* strip is in normal track */
-		glColor3fv(color);
 		UI_draw_roundbox_corner_set(UI_CNR_ALL); /* all corners rounded */
+		UI_draw_roundbox_shade_x(true, strip->start, yminc, strip->end, ymaxc, 0.0, 0.5, 0.1, color);
 
-		UI_draw_roundbox_shade_x(GL_POLYGON, strip->start, yminc, strip->end, ymaxc, 0.0, 0.5, 0.1);
+		/* restore current vertex format & program (roundbox trashes it) */
+		shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 	}
 	else {
 		/* strip is in disabled track - make less visible */
-		glColor4f(color[0], color[1], color[2], 0.1f);
+		immUniformColor3fvAlpha(color, 0.1f);
 
 		glEnable(GL_BLEND);
-		glRectf(strip->start, yminc, strip->end, ymaxc);
+		immRectf(shdr_pos, strip->start, yminc, strip->end, ymaxc);
 		glDisable(GL_BLEND);
 	}
 
@@ -419,8 +472,9 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 	 *	- only if user hasn't hidden them...
 	 */
 	if ((snla->flag & SNLA_NOSTRIPCURVES) == 0)
-		nla_draw_strip_curves(strip, yminc, ymaxc);
+		nla_draw_strip_curves(strip, yminc, ymaxc, shdr_pos);
 
+	immUnbindProgram();
 
 	/* draw markings indicating locations of local markers (useful for lining up different actions) */
 	if ((snla->flag & SNLA_NOLOCALMARKERS) == 0)
@@ -431,59 +485,79 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
 	 */
 	if (strip->flag & NLASTRIP_FLAG_ACTIVE) {
 		/* strip should appear 'sunken', so draw a light border around it */
-		glColor3f(0.9f, 1.0f, 0.9f); // FIXME: hardcoded temp-hack colors
+		color[0] = 0.9f; /* FIXME: hardcoded temp-hack colors */
+		color[1] = 1.0f;
+		color[2] = 0.9f;
 	}
 	else {
 		/* strip should appear to stand out, so draw a dark border around it */
-		glColor3f(0.0f, 0.0f, 0.0f);
+		color[0] = color[1] = color[2] = 0.0f; /* FIXME: or 1.0f ?? */
 	}
 
-	/* - line style: dotted for muted */
-	if ((nlt->flag & NLATRACK_MUTED) || (strip->flag & NLASTRIP_FLAG_MUTED))
-		setlinestyle(4);
+	/* draw outline
+	 * - dashed-line shader is loaded after this block
+	 */
+	if (muted) {
+		/* muted - draw dotted, squarish outline (for simplicity) */
+		shdr_pos = nla_draw_use_dashed_outlines(color, muted);
+		imm_draw_box_wire_2d(shdr_pos, strip->start, yminc, strip->end, ymaxc);
+	}
+	else {
+		/* non-muted - draw solid, rounded outline */
+		UI_draw_roundbox_shade_x(false, strip->start, yminc, strip->end, ymaxc, 0.0, 0.0, 0.1, color);
 
-	/* draw outline */
-	UI_draw_roundbox_shade_x(GL_LINE_LOOP, strip->start, yminc, strip->end, ymaxc, 0.0, 0.0, 0.1);
+		/* restore current vertex format & program (roundbox trashes it) */
+		shdr_pos = nla_draw_use_dashed_outlines(color, muted);
+	}
 
 	/* if action-clip strip, draw lines delimiting repeats too (in the same color as outline) */
 	if ((strip->type == NLASTRIP_TYPE_CLIP) && IS_EQF(strip->repeat, 1.0f) == 0) {
 		float repeatLen = (strip->actend - strip->actstart) * strip->scale;
-		int i;
 
 		/* only draw lines for whole-numbered repeats, starting from the first full-repeat
 		 * up to the last full repeat (but not if it lies on the end of the strip)
 		 */
-		for (i = 1; i < strip->repeat; i++) {
+		immBeginAtMost(GWN_PRIM_LINES, 2 * (strip->repeat - 1));
+		for (int i = 1; i < strip->repeat; i++) {
 			float repeatPos = strip->start + (repeatLen * i);
 
 			/* don't draw if line would end up on or after the end of the strip */
-			if (repeatPos < strip->end)
-				fdrawline(repeatPos, yminc + 4, repeatPos, ymaxc - 4);
+			if (repeatPos < strip->end) {
+				immVertex2f(shdr_pos, repeatPos, yminc + 4);
+				immVertex2f(shdr_pos, repeatPos, ymaxc - 4);
+			}
 		}
+		immEnd();
 	}
 	/* or if meta-strip, draw lines delimiting extents of sub-strips (in same color as outline, if more than 1 exists) */
 	else if ((strip->type == NLASTRIP_TYPE_META) && (strip->strips.first != strip->strips.last)) {
-		NlaStrip *cs;
-		float y = (ymaxc - yminc) / 2.0f + yminc;
+		const float y = (ymaxc - yminc) * 0.5f + yminc;
+
+		immBeginAtMost(GWN_PRIM_LINES, 4 * BLI_listbase_count(&strip->strips)); /* up to 2 lines per strip */
 
 		/* only draw first-level of child-strips, but don't draw any lines on the endpoints */
-		for (cs = strip->strips.first; cs; cs = cs->next) {
+		for (NlaStrip *cs = strip->strips.first; cs; cs = cs->next) {
 			/* draw start-line if not same as end of previous (and only if not the first strip)
 			 *	- on upper half of strip
 			 */
-			if ((cs->prev) && IS_EQF(cs->prev->end, cs->start) == 0)
-				fdrawline(cs->start, y, cs->start, ymaxc);
+			if ((cs->prev) && IS_EQF(cs->prev->end, cs->start) == 0) {
+				immVertex2f(shdr_pos, cs->start, y);
+				immVertex2f(shdr_pos, cs->start, ymaxc);
+			}
 
 			/* draw end-line if not the last strip
 			 *	- on lower half of strip
 			 */
-			if (cs->next)
-				fdrawline(cs->end, yminc, cs->end, y);
+			if (cs->next) {
+				immVertex2f(shdr_pos, cs->end, yminc);
+				immVertex2f(shdr_pos, cs->end, y);
+			}
 		}
+
+		immEnd();
 	}
 
-	/* reset linestyle */
-	setlinestyle(0);
+	immUnbindProgram();
 }
 
 /* add the relevant text to the cache of text-strings to draw in pixelspace */
@@ -495,7 +569,6 @@ static void nla_draw_strip_text(
 	char str[256];
 	size_t str_len;
 	char col[4];
-	rctf rect;
 
 	/* just print the name and the range */
 	if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
@@ -522,11 +595,13 @@ static void nla_draw_strip_text(
 	/* set bounding-box for text
 	 *	- padding of 2 'units' on either side
 	 */
-	// TODO: make this centered?
-	rect.xmin = xminc;
-	rect.ymin = yminc;
-	rect.xmax = xmaxc;
-	rect.ymax = ymaxc;
+	/* TODO: make this centered? */
+	rctf rect = {
+		.xmin = xminc,
+		.ymin = yminc,
+		.xmax = xmaxc,
+		.ymax = ymaxc
+	};
 
 	/* add this string to the cache of texts to draw */
 	UI_view2d_text_cache_add_rectf(v2d, &rect, str, str_len, col);
@@ -542,7 +617,6 @@ static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, V
 	char numstr[32];
 	size_t numstr_len;
 
-
 	/* Always draw times above the strip, whereas sequencer drew below + above.
 	 * However, we should be fine having everything on top, since these tend to be
 	 * quite spaced out.
@@ -562,20 +636,14 @@ static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, V
 
 void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
 	View2D *v2d = &ar->v2d;
-	float y = 0.0f;
-	size_t items;
-	int height;
 	const float pixelx = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
 	const float text_margin_x = (8 * UI_DPI_FAC) * pixelx;
 
 	/* build list of channels to draw */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
-	items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+	ListBase anim_data = {NULL, NULL};
+	int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
+	size_t items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 
 	/* Update max-extent of channels here (taking into account scrollers):
 	 *  - this is done to allow the channel list to be scrollable, but must be done here
@@ -583,16 +651,17 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
 	 *	- offset of NLACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
 	 *	  start of list offset, and the second is as a correction for the scrollers.
 	 */
-	height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
+	int height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
+
 	/* don't use totrect set, as the width stays the same
 	 * (NOTE: this is ok here, the configuration is pretty straightforward)
 	 */
 	v2d->tot.ymin = (float)(-height);
 
 	/* loop through channels, and set up drawing depending on their type  */
-	y = (float)(-NLACHANNEL_HEIGHT(snla));
+	float y = (float)(-NLACHANNEL_HEIGHT(snla));
 
-	for (ale = anim_data.first; ale; ale = ale->next) {
+	for (bAnimListElem *ale = anim_data.first; ale; ale = ale->next) {
 		const float yminc = (float)(y - NLACHANNEL_HEIGHT_HALF(snla));
 		const float ymaxc = (float)(y + NLACHANNEL_HEIGHT_HALF(snla));
 
@@ -635,38 +704,53 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
 				case ANIMTYPE_NLAACTION:
 				{
 					AnimData *adt = ale->adt;
-					float color[4];
+
+					unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+					immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 					/* just draw a semi-shaded rect spanning the width of the viewable area if there's data,
 					 * and a second darker rect within which we draw keyframe indicator dots if there's data
 					 */
-					glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+					glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 					glEnable(GL_BLEND);
 
 					/* get colors for drawing */
+					float color[4];
 					nla_action_get_color(adt, ale->data, color);
-					glColor4fv(color);
+					immUniformColor4fv(color);
 
 					/* draw slightly shifted up for greater separation from standard channels,
 					 * but also slightly shorter for some more contrast when viewing the strips
 					 */
-					glRectf(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
-
-					/* draw keyframes in the action */
-					nla_action_draw_keyframes(adt, ale->data, v2d, y, yminc + NLACHANNEL_SKIP, ymaxc - NLACHANNEL_SKIP);
+					immRectf(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
 
 					/* draw 'embossed' lines above and below the strip for effect */
 					/* white base-lines */
 					glLineWidth(2.0f);
-					glColor4f(1.0f, 1.0f, 1.0f, 0.3);
-					fdrawline(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
-					fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
+					immUniformColor4f(1.0f, 1.0f, 1.0f, 0.3f);
+					immBegin(GWN_PRIM_LINES, 4);
+					immVertex2f(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
+					immEnd();
 
 					/* black top-lines */
 					glLineWidth(1.0f);
-					glColor3f(0.0f, 0.0f, 0.0f);
-					fdrawline(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
-					fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
+					immUniformColor3f(0.0f, 0.0f, 0.0f);
+					immBegin(GWN_PRIM_LINES, 4);
+					immVertex2f(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP);
+					immVertex2f(pos, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
+					immEnd();
+
+					/* TODO: these lines but better --^ */
+
+					immUnbindProgram();
+
+					/* draw keyframes in the action */
+					nla_action_draw_keyframes(adt, ale->data, y, yminc + NLACHANNEL_SKIP, ymaxc - NLACHANNEL_SKIP);
 
 					glDisable(GL_BLEND);
 					break;
@@ -695,7 +779,6 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
 	View2D *v2d = &ar->v2d;
 	float y = 0.0f;
 	size_t items;
-	int height;
 
 	/* build list of channels to draw */
 	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
@@ -707,7 +790,7 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
 	 *	- offset of NLACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
 	 *	  start of list offset, and the second is as a correction for the scrollers.
 	 */
-	height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
+	int height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
 	/* don't use totrect set, as the width stays the same
 	 * (NOTE: this is ok here, the configuration is pretty straightforward)
 	 */
@@ -745,7 +828,7 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
 		y = (float)(-NLACHANNEL_HEIGHT(snla));
 
 		/* set blending again, as may not be set in previous step */
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
 
 		/* loop through channels, and set up drawing depending on their type  */
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
index 88ef4a18142..318d8bf777b 100644
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -55,6 +55,9 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+
+#include "RNA_access.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -91,10 +94,8 @@ ARegion *nla_has_buttons_region(ScrArea *sa)
 
 /* ******************** default callbacks for nla space ***************** */
 
-static SpaceLink *nla_new(const bContext *C)
+static SpaceLink *nla_new(const ScrArea *sa, const Scene *scene)
 {
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar;
 	SpaceNla *snla;
 
@@ -113,7 +114,7 @@ static SpaceLink *nla_new(const bContext *C)
 
 	BLI_addtail(&snla->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* channel list region */
 	ar = MEM_callocN(sizeof(ARegion), "channel list for nla");
@@ -268,11 +269,12 @@ static void nla_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
 	SpaceNla *snla = CTX_wm_space_nla(C);
+	Scene *scene = CTX_data_scene(C);
 	bAnimContext ac;
 	View2D *v2d = &ar->v2d;
 	View2DGrid *grid;
 	View2DScrollers *scrollers;
-	short unit = 0, flag = 0;
+	short unit = 0, cfra_flag = 0;
 
 	/* clear and setup matrix */
 	UI_ThemeClearColor(TH_BACK);
@@ -288,6 +290,9 @@ static void nla_main_region_draw(const bContext *C, ARegion *ar)
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
+	/* start and end frame */
+	ANIM_draw_framerange(scene, v2d);
+
 	/* data */
 	if (ANIM_animdata_get_context(C, &ac)) {
 		/* strips and backdrops */
@@ -300,9 +305,8 @@ static void nla_main_region_draw(const bContext *C, ARegion *ar)
 	UI_view2d_view_ortho(v2d);
 
 	/* current frame */
-	if (snla->flag & SNLA_DRAWTIME) flag |= DRAWCFRA_UNIT_SECONDS;
-	if ((snla->flag & SNLA_NODRAWCFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
-	ANIM_draw_cfra(C, v2d, flag);
+	if (snla->flag & SNLA_DRAWTIME) cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	ANIM_draw_cfra(C, v2d, cfra_flag);
 
 	/* markers */
 	UI_view2d_view_orthoSpecial(ar, v2d, 1);
@@ -323,6 +327,12 @@ static void nla_main_region_draw(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* draw current frame number-indicator on top of scrollers */
+	if ((snla->flag & SNLA_NODRAWCFRANUM) == 0) {
+		UI_view2d_view_orthoSpecial(ar, v2d, 1);
+		ANIM_draw_cfra_number(C, v2d, cfra_flag);
+	}
 }
 
 
@@ -353,7 +363,9 @@ static void nla_buttons_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void nla_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void nla_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -386,7 +398,9 @@ static void nla_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegio
 }
 
 
-static void nla_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void nla_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -398,6 +412,7 @@ static void nla_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), A
 				case ND_RENDER_OPTIONS:
 				case ND_OB_ACTIVE:
 				case ND_FRAME:
+				case ND_FRAME_RANGE:
 				case ND_MARKERS:
 					ED_region_tag_redraw(ar);
 					break;
@@ -424,6 +439,11 @@ static void nla_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), A
 			if (wmn->action == NA_RENAME)
 				ED_region_tag_redraw(ar);
 			break;
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 		default:
 			if (wmn->data == ND_KEYS)
 				ED_region_tag_redraw(ar);
@@ -431,7 +451,49 @@ static void nla_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), A
 	}
 }
 
-static void nla_channel_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void nla_main_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceNLA, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* Timeline depends on scene properties. */
+	{
+		bool use_preview = (scene->r.flag & SCER_PRV_RANGE);
+		extern PropertyRNA rna_Scene_frame_start;
+		extern PropertyRNA rna_Scene_frame_end;
+		extern PropertyRNA rna_Scene_frame_preview_start;
+		extern PropertyRNA rna_Scene_frame_preview_end;
+		extern PropertyRNA rna_Scene_use_preview_range;
+		extern PropertyRNA rna_Scene_frame_current;
+		const PropertyRNA *props[] = {
+			use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start,
+			use_preview ? &rna_Scene_frame_preview_end   : &rna_Scene_frame_end,
+			&rna_Scene_use_preview_range,
+			&rna_Scene_frame_current,
+		};
+
+		PointerRNA idptr;
+		RNA_id_pointer_create(&scene->id, &idptr);
+
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_region_tag_redraw, __func__);
+		}
+	}
+}
+
+static void nla_channel_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -465,8 +527,44 @@ static void nla_channel_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 	}
 }
 
+static void nla_channel_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceNLA, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* All dopesheet filter settings, etc. affect the drawing of this editor,
+	 * so just whitelist the entire struct for updates
+	 */
+	{
+		wmMsgParams_RNA msg_key_params = {{{0}}};
+		StructRNA *type_array[] = {
+			&RNA_DopeSheet,
+		};
+
+		for (int i = 0; i < ARRAY_SIZE(type_array); i++) {
+			msg_key_params.ptr.type = type_array[i];
+			WM_msg_subscribe_rna_params(
+			        mbus,
+			        &msg_key_params,
+			        &msg_sub_value_region_tag_redraw,
+			        __func__);
+		}
+	}
+}
+
 /* editor level listener */
-static void nla_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void nla_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                         WorkSpace *UNUSED(workspace))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -508,7 +606,7 @@ static void nla_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *
 
 	if (snla->ads) {
 		if ((ID *)snla->ads->filter_grp == old_id) {
-			snla->ads->filter_grp = (Group *)new_id;
+			snla->ads->filter_grp = (Collection *)new_id;
 		}
 		if ((ID *)snla->ads->source == old_id) {
 			snla->ads->source = new_id;
@@ -540,6 +638,7 @@ void ED_spacetype_nla(void)
 	art->init = nla_main_region_init;
 	art->draw = nla_main_region_draw;
 	art->listener = nla_main_region_listener;
+	art->message_subscribe = nla_main_region_message_subscribe;
 	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
 
 	BLI_addhead(&st->regiontypes, art);
@@ -564,6 +663,7 @@ void ED_spacetype_nla(void)
 	art->init = nla_channel_region_init;
 	art->draw = nla_channel_region_draw;
 	art->listener = nla_channel_region_listener;
+	art->message_subscribe = nla_channel_region_message_subscribe;
 
 	BLI_addhead(&st->regiontypes, art);
 
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index cde818333e4..77b1351435b 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
@@ -47,6 +48,7 @@ set(SRC
 	node_draw.c
 	node_edit.c
 	node_group.c
+	node_manipulators.c
 	node_ops.c
 	node_relationships.c
 	node_select.c
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 4d12ebfb16b..a9120430128 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -50,9 +50,13 @@
 #include "BLF_api.h"
 #include "BLT_translation.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_draw.h"
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -62,6 +66,7 @@
 #include "WM_types.h"
 
 #include "UI_resources.h"
+#include "UI_view2d.h"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
@@ -80,49 +85,6 @@ static void node_socket_button_label(bContext *UNUSED(C), uiLayout *layout, Poin
 	uiItemL(layout, text, 0);
 }
 
-
-/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */
-
-#if 0 /* UNUSED */
-static void node_draw_socket_new(bNodeSocket *sock, float size)
-{
-	float x = sock->locx, y = sock->locy;
-
-	/* 16 values of sin function */
-	static float si[16] = {
-		0.00000000f, 0.39435585f, 0.72479278f, 0.93775213f,
-		0.99871650f, 0.89780453f, 0.65137248f, 0.29936312f,
-		-0.10116832f, -0.48530196f, -0.79077573f, -0.96807711f,
-		-0.98846832f, -0.84864425f, -0.57126821f, -0.20129852f
-	};
-	/* 16 values of cos function */
-	static float co[16] = {
-		1.00000000f, 0.91895781f, 0.68896691f, 0.34730525f,
-		-0.05064916f, -0.44039415f, -0.75875812f, -0.95413925f,
-		-0.99486932f, -0.87434661f, -0.61210598f, -0.25065253f,
-		0.15142777f, 0.52896401f, 0.82076344f, 0.97952994f,
-	};
-	int a;
-
-	glColor3ub(180, 180, 180);
-
-	glBegin(GL_POLYGON);
-	for (a = 0; a < 16; a++)
-		glVertex2f(x + size * si[a], y + size * co[a]);
-	glEnd();
-
-	glColor4ub(0, 0, 0, 150);
-	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
-	glBegin(GL_LINE_LOOP);
-	for (a = 0; a < 16; a++)
-		glVertex2f(x + size * si[a], y + size * co[a]);
-	glEnd();
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_BLEND);
-}
-#endif
-
 /* ****************** BUTTON CALLBACKS FOR ALL TREES ***************** */
 
 static void node_buts_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -392,6 +354,7 @@ static void node_draw_frame_label(bNodeTree *ntree, bNode *node, const float asp
 	const int font_size = data->label_size / aspect;
 	const float margin = (float)(NODE_DY / 4);
 	int label_height;
+	unsigned char color[3];
 
 	nodeLabel(ntree, node, label, sizeof(label));
 
@@ -400,7 +363,8 @@ static void node_draw_frame_label(bNodeTree *ntree, bNode *node, const float asp
 	BLF_size(fontid, MIN2(24, font_size), U.dpi); /* clamp otherwise it can suck up a LOT of memory */
 
 	/* title color */
-	UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
+	UI_GetThemeColorBlendShade3ubv(TH_TEXT, color_id, 0.4f, 10, color);
+	BLF_color3ubv(fontid, color);
 
 	width = BLF_width(fontid, label, sizeof(label));
 	ascender = BLF_ascender(fontid);
@@ -465,7 +429,7 @@ static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode,
 {
 	rctf *rct = &node->totr;
 	int color_id = node_get_colorid(node);
-	unsigned char color[4];
+	float color[4];
 	float alpha;
 
 	/* skip if out of view */
@@ -475,38 +439,30 @@ static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode,
 		return;
 	}
 
-	UI_GetThemeColor4ubv(TH_NODE_FRAME, color);
-	alpha = (float)(color[3]) / 255.0f;
+	UI_GetThemeColor4fv(TH_NODE_FRAME, color);
+	alpha = color[3];
 
 	/* shadow */
 	node_draw_shadow(snode, node, BASIS_RAD, alpha);
 
 	/* body */
-	if (node->flag & NODE_CUSTOM_COLOR)
-		glColor4f(node->color[0], node->color[1], node->color[2], alpha);
+	if (node->flag & NODE_CUSTOM_COLOR) {
+		rgba_float_args_set(color, node->color[0], node->color[1], node->color[2], alpha);
+	}
 	else
-		UI_ThemeColor4(TH_NODE_FRAME);
-	glEnable(GL_BLEND);
+		UI_GetThemeColor4fv(TH_NODE_FRAME, color);
+
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
-	glDisable(GL_BLEND);
+	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD, color);
 
 	/* outline active and selected emphasis */
 	if (node->flag & SELECT) {
-		glEnable(GL_BLEND);
-		glEnable(GL_LINE_SMOOTH);
-
 		if (node->flag & NODE_ACTIVE)
-			UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -40);
+			UI_GetThemeColorShadeAlpha4fv(TH_ACTIVE, 0, -40, color);
 		else
-			UI_ThemeColorShadeAlpha(TH_SELECT, 0, -40);
-		UI_draw_roundbox_corner_set(UI_CNR_ALL);
-		UI_draw_roundbox_gl_mode(GL_LINE_LOOP,
-		          rct->xmin, rct->ymin,
-		          rct->xmax, rct->ymax, BASIS_RAD);
+			UI_GetThemeColorShadeAlpha4fv(TH_SELECT, 0, -40, color);
 
-		glDisable(GL_LINE_SMOOTH);
-		glDisable(GL_BLEND);
+		UI_draw_roundbox_aa(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD, color);
 	}
 
 	/* label */
@@ -580,15 +536,9 @@ static void node_draw_reroute_prepare(const bContext *UNUSED(C), bNodeTree *UNUS
 static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED(snode),
                               bNodeTree *ntree, bNode *node, bNodeInstanceKey UNUSED(key))
 {
-	bNodeSocket *sock;
 	char showname[128]; /* 128 used below */
 	rctf *rct = &node->totr;
 
-#if 0   /* UNUSED */
-	float size = NODE_REROUTE_SIZE;
-#endif
-	float socket_size = NODE_SOCKSIZE;
-
 	/* skip if out of view */
 	if (node->totr.xmax < ar->v2d.cur.xmin || node->totr.xmin > ar->v2d.cur.xmax ||
 	    node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax)
@@ -602,23 +552,26 @@ static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED(
 	 * selection state is indicated by socket outline below!
 	 */
 #if 0
+	float size = NODE_REROUTE_SIZE;
+
 	/* body */
+	float debug_color[4];
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	UI_ThemeColor4(TH_NODE);
-	glEnable(GL_BLEND);
-	UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
-	glDisable(GL_BLEND);
+	UI_GetThemeColor4fv(TH_NODE, debug_color);
+	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax, size, debug_color);
 
 	/* outline active and selected emphasis */
 	if (node->flag & SELECT) {
 		glEnable(GL_BLEND);
 		glEnable(GL_LINE_SMOOTH);
 		/* using different shades of TH_TEXT_HI for the empasis, like triangle */
-		if (node->flag & NODE_ACTIVE)
-			UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, -40);
-		else
-			UI_ThemeColorShadeAlpha(TH_TEXT_HI, -20, -120);
-		UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
+		if (node->flag & NODE_ACTIVE) {
+			UI_GetThemeColorShadeAlpha4fv(TH_TEXT_HI, 0, -40, debug_color);
+		}
+		else {
+			UI_GetThemeColorShadeAlpha4fv(TH_TEXT_HI, -20, -120, debug_color);
+		}
+		UI_draw_roundbox_4fv(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax, size, debug_color);
 
 		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
@@ -637,9 +590,7 @@ static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED(
 	/* only draw input socket. as they all are placed on the same position.
 	 * highlight also if node itself is selected, since we don't display the node body separately!
 	 */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		node_socket_draw(C, ntree, node, sock, socket_size, (sock->flag & SELECT) || (node->flag & SELECT));
-	}
+	node_draw_sockets(&ar->v2d, C, ntree, node, false, node->flag & SELECT);
 
 	UI_block_end(C, node->block);
 	UI_block_draw(C, node->block);
@@ -728,21 +679,6 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr,
 	}
 }
 
-static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA *ptr)
-{
-	bNode *node = ptr->data;
-	uiLayout *col;
-
-	uiTemplateID(layout, C, ptr, "material", "MATERIAL_OT_new", NULL, NULL, UI_TEMPLATE_ID_FILTER_ALL);
-
-	if (!node->id) return;
-
-	col = uiLayoutColumn(layout, false);
-	uiItemR(col, ptr, "use_diffuse", 0, NULL, ICON_NONE);
-	uiItemR(col, ptr, "use_specular", 0, NULL, ICON_NONE);
-	uiItemR(col, ptr, "invert_normal", 0, NULL, ICON_NONE);
-}
-
 static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiLayout *row, *col, *sub;
@@ -790,30 +726,6 @@ static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C
 	uiItemR(layout, ptr, "convert_to", 0, "", ICON_NONE);
 }
 
-static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
-{
-	PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
-	uiLayout *col;
-
-	col = uiLayoutColumn(layout, false);
-
-	if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
-		PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
-
-		uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", ICON_NONE);
-		uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", ICON_NONE);
-	}
-	else {
-		uiItemR(col, ptr, "uv_layer", 0, IFACE_("UV"), ICON_NONE);
-		uiItemR(col, ptr, "color_layer", 0, IFACE_("VCol"), ICON_NONE);
-	}
-}
-
-static void node_shader_buts_lamp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
-{
-	uiItemR(layout, ptr, "lamp_object", 0, IFACE_("Lamp Object"), ICON_NONE);
-}
-
 static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiItemR(layout, ptr, "attribute_name", 0, IFACE_("Name"), ICON_NONE);
@@ -1022,7 +934,7 @@ static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *pt
 
 		if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
 			PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
-			uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
+			uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_NONE);
 		}
 	}
 }
@@ -1041,7 +953,7 @@ static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRN
 
 		if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
 			PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
-			uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
+			uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_NONE);
 		}
 		else
 			uiItemR(layout, ptr, "uv_map", 0, "", 0);
@@ -1068,7 +980,7 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *
 
 		if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
 			PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
-			uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
+			uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_NONE);
 		}
 		else
 			uiItemR(row, ptr, "uv_map", 0, "", 0);
@@ -1172,13 +1084,6 @@ static void node_shader_buts_bevel(uiLayout *layout, bContext *UNUSED(C), Pointe
 static void node_shader_set_butfunc(bNodeType *ntype)
 {
 	switch (ntype->type) {
-		case SH_NODE_MATERIAL:
-		case SH_NODE_MATERIAL_EXT:
-			ntype->draw_buttons = node_shader_buts_material;
-			break;
-		case SH_NODE_TEXTURE:
-			ntype->draw_buttons = node_buts_texture;
-			break;
 		case SH_NODE_NORMAL:
 			ntype->draw_buttons = node_buts_normal;
 			break;
@@ -1212,12 +1117,6 @@ static void node_shader_set_butfunc(bNodeType *ntype)
 		case SH_NODE_VECT_TRANSFORM:
 			ntype->draw_buttons = node_shader_buts_vect_transform;
 			break;
-		case SH_NODE_GEOMETRY:
-			ntype->draw_buttons = node_shader_buts_geometry;
-			break;
-		case SH_NODE_LAMP:
-			ntype->draw_buttons = node_shader_buts_lamp;
-			break;
 		case SH_NODE_ATTRIBUTE:
 			ntype->draw_buttons = node_shader_buts_attribute;
 			break;
@@ -1363,7 +1262,7 @@ static void node_composit_buts_image_ex(uiLayout *layout, bContext *C, PointerRN
 	uiTemplateImage(layout, C, ptr, "image", &iuserptr, 0, 1);
 }
 
-static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
+static void node_composit_buts_viewlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
 	bNode *node = ptr->data;
 	uiLayout *col, *row;
@@ -2261,14 +2160,21 @@ static void node_composit_backdrop_viewer(SpaceNode *snode, ImBuf *backdrop, bNo
 		const float cy = y + snode->zoom * backdropHeight * node->custom4;
 		const float cross_size = 12 * U.pixelsize;
 
-		glColor3f(1.0, 1.0, 1.0);
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		glBegin(GL_LINES);
-		glVertex2f(cx - cross_size, cy - cross_size);
-		glVertex2f(cx + cross_size, cy + cross_size);
-		glVertex2f(cx + cross_size, cy - cross_size);
-		glVertex2f(cx - cross_size, cy + cross_size);
-		glEnd();
+		immUniformColor3f(1.0f, 1.0f, 1.0f);
+
+		immBegin(GWN_PRIM_LINES, 4);
+		immVertex2f(pos, cx - cross_size, cy - cross_size);
+		immVertex2f(pos, cx + cross_size, cy + cross_size);
+		immVertex2f(pos, cx + cross_size, cy - cross_size);
+		immVertex2f(pos, cx - cross_size, cy + cross_size);
+		immEnd();
+
+		immUnbindProgram();
 	}
 }
 
@@ -2287,9 +2193,6 @@ static void node_composit_backdrop_boxmask(SpaceNode *snode, ImBuf *backdrop, bN
 	float cx, cy, x1, x2, x3, x4;
 	float y1, y2, y3, y4;
 
-
-	glColor3f(1.0, 1.0, 1.0);
-
 	cx  = x + snode->zoom * backdropWidth * boxmask->x;
 	cy = y + snode->zoom * backdropHeight * boxmask->y;
 
@@ -2302,12 +2205,21 @@ static void node_composit_backdrop_boxmask(SpaceNode *snode, ImBuf *backdrop, bN
 	y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 	y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(x1, y1);
-	glVertex2f(x2, y2);
-	glVertex2f(x3, y3);
-	glVertex2f(x4, y4);
-	glEnd();
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor3f(1.0f, 1.0f, 1.0f);
+
+	immBegin(GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x2, y2);
+	immVertex2f(pos, x3, y3);
+	immVertex2f(pos, x4, y4);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 static void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
@@ -2325,9 +2237,6 @@ static void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop
 	float cx, cy, x1, x2, x3, x4;
 	float y1, y2, y3, y4;
 
-
-	glColor3f(1.0, 1.0, 1.0);
-
 	cx  = x + snode->zoom * backdropWidth * ellipsemask->x;
 	cy = y + snode->zoom * backdropHeight * ellipsemask->y;
 
@@ -2340,13 +2249,21 @@ static void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop
 	y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 	y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 
-	glBegin(GL_LINE_LOOP);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	glVertex2f(x1, y1);
-	glVertex2f(x2, y2);
-	glVertex2f(x3, y3);
-	glVertex2f(x4, y4);
-	glEnd();
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformColor3f(1.0f, 1.0f, 1.0f);
+
+	immBegin(GWN_PRIM_LINE_LOOP, 4);
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x2, y2);
+	immVertex2f(pos, x3, y3);
+	immVertex2f(pos, x4, y4);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 static void node_composit_buts_ellipsemask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -2546,7 +2463,7 @@ static void node_composit_set_butfunc(bNodeType *ntype)
 			ntype->draw_buttons_ex = node_composit_buts_image_ex;
 			break;
 		case CMP_NODE_R_LAYERS:
-			ntype->draw_buttons = node_composit_buts_renderlayers;
+			ntype->draw_buttons = node_composit_buts_viewlayers;
 			break;
 		case CMP_NODE_NORMAL:
 			ntype->draw_buttons = node_buts_normal;
@@ -3235,6 +3152,7 @@ void ED_init_node_socket_type_virtual(bNodeSocketType *stype)
 void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeInstanceKey parent_key)
 {
 	bNodeInstanceKey active_viewer_key = (snode->nodetree ? snode->nodetree->active_viewer_key : NODE_INSTANCE_KEY_NONE);
+	float shuffle[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 	Image *ima;
 	void *lock;
 	ImBuf *ibuf;
@@ -3250,14 +3168,10 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	if (ibuf) {
 		float x, y;
 
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
+		gpuPushProjectionMatrix();
+		gpuPushMatrix();
 
 		/* somehow the offset has to be calculated inverse */
-
-		glaDefine2DArea(&ar->winrct);
 		wmOrtho2_region_pixelspace(ar);
 
 		x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof;
@@ -3267,60 +3181,37 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, b
 			unsigned char *display_buffer = NULL;
 			void *cache_handle = NULL;
 
-			if (snode->flag & (SNODE_SHOW_R | SNODE_SHOW_G | SNODE_SHOW_B)) {
-				int ofs;
+			if (snode->flag & (SNODE_SHOW_R | SNODE_SHOW_G | SNODE_SHOW_B | SNODE_SHOW_ALPHA)) {
 
 				display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
 
-#ifdef __BIG_ENDIAN__
-				if      (snode->flag & SNODE_SHOW_R) ofs = 0;
-				else if (snode->flag & SNODE_SHOW_G) ofs = 1;
-				else                                 ofs = 2;
-#else
-				if      (snode->flag & SNODE_SHOW_R) ofs = 1;
-				else if (snode->flag & SNODE_SHOW_G) ofs = 2;
-				else                                 ofs = 3;
-#endif
+				if (snode->flag & SNODE_SHOW_R)
+					shuffle[0] = 1.0f;
+				else if (snode->flag & SNODE_SHOW_G)
+					shuffle[1] = 1.0f;
+				else if (snode->flag & SNODE_SHOW_B)
+					shuffle[2] = 1.0f;
+				else
+					shuffle[3] = 1.0f;
 
-				glPixelZoom(snode->zoom, snode->zoom);
-				/* swap bytes, so alpha is most significant one, then just draw it as luminance int */
+				IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR);
+				GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, shuffle);
 
-				glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT,
-				                  display_buffer - (4 - ofs));
+				immDrawPixelsTex(&state, x, y, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST,
+				                 display_buffer, snode->zoom, snode->zoom, NULL);
 
-				glPixelZoom(1.0f, 1.0f);
-			}
-			else if (snode->flag & SNODE_SHOW_ALPHA) {
-				display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
-
-				glPixelZoom(snode->zoom, snode->zoom);
-				/* swap bytes, so alpha is most significant one, then just draw it as luminance int */
-#ifdef __BIG_ENDIAN__
-				glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
-#endif
-				glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT, display_buffer);
-
-#ifdef __BIG_ENDIAN__
-				glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
-#endif
-				glPixelZoom(1.0f, 1.0f);
+				GPU_shader_unbind();
 			}
 			else if (snode->flag & SNODE_USE_ALPHA) {
 				glEnable(GL_BLEND);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-				glPixelZoom(snode->zoom, snode->zoom);
+				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-				glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST);
+				glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST, snode->zoom, snode->zoom);
 
-				glPixelZoom(1.0f, 1.0f);
 				glDisable(GL_BLEND);
 			}
 			else {
-				glPixelZoom(snode->zoom, snode->zoom);
-
-				glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST);
-
-				glPixelZoom(1.0f, 1.0f);
+				glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST, snode->zoom, snode->zoom);
 			}
 
 			if (cache_handle)
@@ -3345,30 +3236,33 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, b
 			    viewer_border->ymin < viewer_border->ymax)
 			{
 				rcti pixel_border;
-				UI_ThemeColor(TH_ACTIVE);
 				BLI_rcti_init(&pixel_border,
 				              x + snode->zoom * viewer_border->xmin * ibuf->x,
 				              x + snode->zoom * viewer_border->xmax * ibuf->x,
 				              y + snode->zoom * viewer_border->ymin * ibuf->y,
 				              y + snode->zoom * viewer_border->ymax * ibuf->y);
-				glaDrawBorderCorners(&pixel_border, 1.0f, 1.0f);
+
+				unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+				immUniformThemeColor(TH_ACTIVE);
+
+				immDrawBorderCorners(pos, &pixel_border, 1.0f, 1.0f);
+
+				immUnbindProgram();
 			}
 		}
 
-		glMatrixMode(GL_PROJECTION);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPopMatrix();
+		gpuPopProjectionMatrix();
+		gpuPopMatrix();
 	}
 
 	BKE_image_release_ibuf(ima, ibuf, lock);
 }
 
-
-/* if v2d not NULL, it clips and returns 0 if not visible */
-bool node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol)
+/* return quadratic beziers points for a given nodelink and clip if v2d is not NULL. */
+static bool node_link_bezier_handles(View2D *v2d, SpaceNode *snode, bNodeLink *link, float vec[4][2])
 {
-	float dist, vec[4][2];
+	float dist;
 	float deltax, deltay;
 	float cursor[2] = {0.0f, 0.0f};
 	int toreroute, fromreroute;
@@ -3436,13 +3330,23 @@ bool node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, flo
 		vec[2][0] = vec[3][0] - dist;
 		vec[2][1] = vec[3][1];
 	}
+
 	if (v2d && min_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax) {
-		/* clipped */
+		return 0; /* clipped */
 	}
 	else if (v2d && max_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin) {
-		/* clipped */
+		return 0; /* clipped */
 	}
-	else {
+
+	return 1;
+}
+
+/* if v2d not NULL, it clips and returns 0 if not visible */
+bool node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol)
+{
+	float vec[4][2];
+
+	if (node_link_bezier_handles(v2d, snode, link, vec)) {
 		/* always do all three, to prevent data hanging around */
 		BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
 		                              coord_array[0] + 0, resol, sizeof(float) * 2);
@@ -3454,186 +3358,242 @@ bool node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, flo
 	return 0;
 }
 
+#define NODELINK_GROUP_SIZE 256
 #define LINK_RESOL  24
-#define LINK_ARROW  12  /* position of arrow on the link, LINK_RESOL/2 */
-#define ARROW_SIZE (7 * UI_DPI_FAC)
-void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
-                           int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3)
-{
-	float coord_array[LINK_RESOL + 1][2];
-
-	if (node_link_bezier_points(v2d, snode, link, coord_array, LINK_RESOL)) {
-		float dist, spline_step = 0.0f;
-		int i;
-		int drawarrow;
-		/* store current linewidth */
-		float linew;
-		float arrow[2], arrow1[2], arrow2[2];
-		glGetFloatv(GL_LINE_WIDTH, &linew);
+#define LINK_WIDTH  (2.5f * UI_DPI_FAC)
+#define ARROW_SIZE  (7 * UI_DPI_FAC)
+
+static float arrow_verts[3][2] = {{-1.0f, 1.0f}, {0.0f, 0.0f}, {-1.0f, -1.0f}};
+static float arrow_expand_axis[3][2] = {{0.7071f, 0.7071f}, {M_SQRT2, 0.0f}, {0.7071f, -0.7071f}};
+
+struct {
+	Gwn_Batch *batch; /* for batching line together */
+	Gwn_Batch *batch_single; /* for single line */
+	Gwn_VertBuf *inst_vbo;
+	unsigned int p0_id, p1_id, p2_id, p3_id;
+	unsigned int colid_id;
+	Gwn_VertBufRaw p0_step, p1_step, p2_step, p3_step;
+	Gwn_VertBufRaw colid_step;
+	unsigned int count;
+	bool enabled;
+} g_batch_link = {0};
+
+static void nodelink_batch_reset(void)
+{
+	GWN_vertbuf_attr_get_raw_data(g_batch_link.inst_vbo, g_batch_link.p0_id, &g_batch_link.p0_step);
+	GWN_vertbuf_attr_get_raw_data(g_batch_link.inst_vbo, g_batch_link.p1_id, &g_batch_link.p1_step);
+	GWN_vertbuf_attr_get_raw_data(g_batch_link.inst_vbo, g_batch_link.p2_id, &g_batch_link.p2_step);
+	GWN_vertbuf_attr_get_raw_data(g_batch_link.inst_vbo, g_batch_link.p3_id, &g_batch_link.p3_step);
+	GWN_vertbuf_attr_get_raw_data(g_batch_link.inst_vbo, g_batch_link.colid_id, &g_batch_link.colid_step);
+	g_batch_link.count = 0;
+}
+
+static void set_nodelink_vertex(
+        Gwn_VertBuf *vbo,
+        unsigned int uv_id, unsigned int pos_id, unsigned int exp_id, unsigned int v,
+        const unsigned char uv[2], const float pos[2], const float exp[2])
+{
+	GWN_vertbuf_attr_set(vbo, uv_id, v, uv);
+	GWN_vertbuf_attr_set(vbo, pos_id, v, pos);
+	GWN_vertbuf_attr_set(vbo, exp_id, v, exp);
+}
+
+static void nodelink_batch_init(void)
+{
+	Gwn_VertFormat format = {0};
+	unsigned int uv_id = GWN_vertformat_attr_add(&format, "uv", GWN_COMP_U8, 2, GWN_FETCH_INT_TO_FLOAT_UNIT);
+	unsigned int pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int expand_id = GWN_vertformat_attr_add(&format, "expand", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format_ex(&format, GWN_USAGE_STATIC);
+	int vcount = LINK_RESOL * 2; /* curve */
+	vcount += 2; /* restart strip */
+	vcount += 3 * 2; /* arrow */
+	vcount *= 2; /* shadow */
+	vcount += 2; /* restart strip */
+	GWN_vertbuf_data_alloc(vbo, vcount);
+	int v = 0;
+
+	for (int k = 0; k < 2; ++k) {
+		unsigned char uv[2] = {0, 0};
+		float pos[2] = {0.0f, 0.0f};
+		float exp[2] = {0.0f, 1.0f};
+
+		/* restart */
+		if (k == 1)
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+
+		/* curve strip */
+		for (int i = 0; i < LINK_RESOL; ++i) {
+			uv[0] = 255 * (i / (float)(LINK_RESOL - 1));
+			uv[1] = 0;
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+			uv[1] = 255;
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+		}
+		/* restart */
+		set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+
+		uv[0] = 127;
+		uv[1] = 0;
+		copy_v2_v2(pos, arrow_verts[0]);
+		copy_v2_v2(exp, arrow_expand_axis[0]);
+		set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+		/* arrow */
+		for (int i = 0; i < 3; ++i) {
+			uv[1] = 0;
+			copy_v2_v2(pos, arrow_verts[i]);
+			copy_v2_v2(exp, arrow_expand_axis[i]);
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+
+			uv[1] = 255;
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+		}
 
-		/* we can reuse the dist variable here to increment the GL curve eval amount*/
-		dist = 1.0f / (float)LINK_RESOL;
+		/* restart */
+		if (k == 0)
+			set_nodelink_vertex(vbo, uv_id, pos_id, expand_id, v++, uv, pos, exp);
+	}
 
-		glEnable(GL_LINE_SMOOTH);
+	g_batch_link.batch = GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
+	gpu_batch_presets_register(g_batch_link.batch);
 
-		drawarrow = ((link->tonode && (link->tonode->type == NODE_REROUTE)) &&
-		             (link->fromnode && (link->fromnode->type == NODE_REROUTE)));
-
-		if (drawarrow) {
-			/* draw arrow in line segment LINK_ARROW */
-			float d_xy[2], len;
-
-			sub_v2_v2v2(d_xy, coord_array[LINK_ARROW], coord_array[LINK_ARROW - 1]);
-			len = len_v2(d_xy);
-			mul_v2_fl(d_xy, ARROW_SIZE / len);
-			arrow1[0] = coord_array[LINK_ARROW][0] - d_xy[0] + d_xy[1];
-			arrow1[1] = coord_array[LINK_ARROW][1] - d_xy[1] - d_xy[0];
-			arrow2[0] = coord_array[LINK_ARROW][0] - d_xy[0] - d_xy[1];
-			arrow2[1] = coord_array[LINK_ARROW][1] - d_xy[1] + d_xy[0];
-			arrow[0] = coord_array[LINK_ARROW][0];
-			arrow[1] = coord_array[LINK_ARROW][1];
-		}
-		if (do_triple) {
-			UI_ThemeColorShadeAlpha(th_col3, -80, -120);
-			glLineWidth(4.0f);
+	g_batch_link.batch_single = GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, 0);
+	gpu_batch_presets_register(g_batch_link.batch_single);
 
-			glBegin(GL_LINE_STRIP);
-			for (i = 0; i <= LINK_RESOL; i++) {
-				glVertex2fv(coord_array[i]);
-			}
-			glEnd();
-			if (drawarrow) {
-				glBegin(GL_LINE_STRIP);
-				glVertex2fv(arrow1);
-				glVertex2fv(arrow);
-				glVertex2fv(arrow2);
-				glEnd();
-			}
-		}
+	/* Instances data */
+	Gwn_VertFormat format_inst = {0};
+	g_batch_link.p0_id = GWN_vertformat_attr_add(&format_inst, "P0", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	g_batch_link.p1_id = GWN_vertformat_attr_add(&format_inst, "P1", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	g_batch_link.p2_id = GWN_vertformat_attr_add(&format_inst, "P2", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	g_batch_link.p3_id = GWN_vertformat_attr_add(&format_inst, "P3", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	g_batch_link.colid_id = GWN_vertformat_attr_add(&format_inst, "colid_doarrow", GWN_COMP_U8, 4, GWN_FETCH_INT);
+	g_batch_link.inst_vbo = GWN_vertbuf_create_with_format_ex(&format_inst, GWN_USAGE_STREAM);
+	GWN_vertbuf_data_alloc(g_batch_link.inst_vbo, NODELINK_GROUP_SIZE); /* Alloc max count but only draw the range we need. */
 
-		/* XXX using GL_LINES for shaded node lines is a workaround
-		 * for Intel hardware, this breaks with GL_LINE_STRIP and
-		 * changing color in begin/end blocks.
-		 */
-		glLineWidth(1.5f);
-		if (do_shaded) {
-			glBegin(GL_LINES);
-			for (i = 0; i < LINK_RESOL; i++) {
-				UI_ThemeColorBlend(th_col1, th_col2, spline_step);
-				glVertex2fv(coord_array[i]);
-
-				UI_ThemeColorBlend(th_col1, th_col2, spline_step + dist);
-				glVertex2fv(coord_array[i + 1]);
-
-				spline_step += dist;
-			}
-			glEnd();
-		}
-		else {
-			UI_ThemeColor(th_col1);
-			glBegin(GL_LINE_STRIP);
-			for (i = 0; i <= LINK_RESOL; i++) {
-				glVertex2fv(coord_array[i]);
-			}
-			glEnd();
-		}
+	GWN_batch_instbuf_set(g_batch_link.batch, g_batch_link.inst_vbo, true);
 
-		if (drawarrow) {
-			glBegin(GL_LINE_STRIP);
-			glVertex2fv(arrow1);
-			glVertex2fv(arrow);
-			glVertex2fv(arrow2);
-			glEnd();
-		}
+	nodelink_batch_reset();
+}
 
-		glDisable(GL_LINE_SMOOTH);
+static char nodelink_get_color_id(int th_col)
+{
+	switch (th_col) {
+		case TH_WIRE:        return 1;
+		case TH_WIRE_INNER:  return 2;
+		case TH_ACTIVE:      return 3;
+		case TH_EDGE_SELECT: return 4;
+		case TH_REDALERT:    return 5;
 	}
+	return 0;
 }
 
-#if 0 /* not used in 2.5x yet */
-static void node_link_straight_points(View2D *UNUSED(v2d), SpaceNode *snode, bNodeLink *link, float coord_array[][2])
+static void nodelink_batch_draw(SpaceNode *snode)
 {
-	if (link->fromsock) {
-		coord_array[0][0] = link->fromsock->locx;
-		coord_array[0][1] = link->fromsock->locy;
-	}
-	else {
-		if (snode == NULL) return;
-		coord_array[0][0] = snode->mx;
-		coord_array[0][1] = snode->my;
-	}
-	if (link->tosock) {
-		coord_array[1][0] = link->tosock->locx;
-		coord_array[1][1] = link->tosock->locy;
-	}
-	else {
-		if (snode == NULL) return;
-		coord_array[1][0] = snode->mx;
-		coord_array[1][1] = snode->my;
-	}
+	if (g_batch_link.count == 0)
+		return;
+
+	glEnable(GL_BLEND);
+
+	float colors[6][4] = {{0.0f}};
+	UI_GetThemeColor4fv(TH_WIRE_INNER,  colors[nodelink_get_color_id(TH_WIRE_INNER)]);
+	UI_GetThemeColor4fv(TH_WIRE,        colors[nodelink_get_color_id(TH_WIRE)]);
+	UI_GetThemeColor4fv(TH_ACTIVE,      colors[nodelink_get_color_id(TH_ACTIVE)]);
+	UI_GetThemeColor4fv(TH_EDGE_SELECT, colors[nodelink_get_color_id(TH_EDGE_SELECT)]);
+	UI_GetThemeColor4fv(TH_REDALERT,    colors[nodelink_get_color_id(TH_REDALERT)]);
+
+	GWN_vertbuf_vertex_count_set(g_batch_link.inst_vbo, g_batch_link.count);
+	GWN_vertbuf_use(g_batch_link.inst_vbo); /* force update. */
+
+	GWN_batch_program_set_builtin(g_batch_link.batch, GPU_SHADER_2D_NODELINK_INST);
+	GWN_batch_uniform_4fv_array(g_batch_link.batch, "colors", 6, (float *)colors);
+	GWN_batch_uniform_1f(g_batch_link.batch, "expandSize", snode->aspect * LINK_WIDTH);
+	GWN_batch_uniform_1f(g_batch_link.batch, "arrowSize", ARROW_SIZE);
+	GWN_batch_draw(g_batch_link.batch);
+
+	nodelink_batch_reset();
+
+	glDisable(GL_BLEND);
 }
 
-void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link,
-                             int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3)
+void nodelink_batch_start(SpaceNode *UNUSED(snode))
 {
-	float coord_array[2][2];
-	int i;
+	g_batch_link.enabled = true;
+}
 
-	node_link_straight_points(v2d, snode, link, coord_array);
+void nodelink_batch_end(SpaceNode *snode)
+{
+	nodelink_batch_draw(snode);
+	g_batch_link.enabled = false;
+}
 
-	glEnable(GL_LINE_SMOOTH);
+static void nodelink_batch_add_link(
+        SpaceNode *snode,
+        const float p0[2], const float p1[2], const float p2[2], const float p3[2],
+        int th_col1, int th_col2, int th_col3, bool drawarrow)
+{
+	/* Only allow these colors. If more is needed, you need to modify the shader accordingly. */
+	BLI_assert(ELEM(th_col1, TH_WIRE_INNER, TH_WIRE, TH_ACTIVE, TH_EDGE_SELECT, TH_REDALERT));
+	BLI_assert(ELEM(th_col2, TH_WIRE_INNER, TH_WIRE, TH_ACTIVE, TH_EDGE_SELECT, TH_REDALERT));
+	BLI_assert(ELEM(th_col3, TH_WIRE, -1));
 
-	if (do_triple) {
-		UI_ThemeColorShadeAlpha(th_col3, -80, -120);
-		glLineWidth(4.0f);
+	g_batch_link.count++;
+	copy_v2_v2(GWN_vertbuf_raw_step(&g_batch_link.p0_step), p0);
+	copy_v2_v2(GWN_vertbuf_raw_step(&g_batch_link.p1_step), p1);
+	copy_v2_v2(GWN_vertbuf_raw_step(&g_batch_link.p2_step), p2);
+	copy_v2_v2(GWN_vertbuf_raw_step(&g_batch_link.p3_step), p3);
+	char *colid = GWN_vertbuf_raw_step(&g_batch_link.colid_step);
+	colid[0] = nodelink_get_color_id(th_col1);
+	colid[1] = nodelink_get_color_id(th_col2);
+	colid[2] = nodelink_get_color_id(th_col3);
+	colid[3] = drawarrow;
 
-		glBegin(GL_LINES);
-		glVertex2fv(coord_array[0]);
-		glVertex2fv(coord_array[1]);
-		glEnd();
+	if (g_batch_link.count == NODELINK_GROUP_SIZE) {
+		nodelink_batch_draw(snode);
 	}
+}
 
-	UI_ThemeColor(th_col1);
-	glLineWidth(1.5f);
+/* don't do shadows if th_col3 is -1. */
+void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
+                           int th_col1, int th_col2, int th_col3)
+{
+	float vec[4][2];
 
-	/* XXX using GL_LINES for shaded node lines is a workaround
-	 * for Intel hardware, this breaks with GL_LINE_STRIP and
-	 * changing color in begin/end blocks.
-	 */
-	if (do_shaded) {
-		glBegin(GL_LINES);
-		for (i = 0; i < LINK_RESOL - 1; ++i) {
-			float t = (float)i / (float)(LINK_RESOL - 1);
-			UI_ThemeColorBlend(th_col1, th_col2, t);
-			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
-			           (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
-
-			t = (float)(i + 1) / (float)(LINK_RESOL - 1);
-			UI_ThemeColorBlend(th_col1, th_col2, t);
-			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
-			           (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
+	if (node_link_bezier_handles(v2d, snode, link, vec)) {
+		int drawarrow = ((link->tonode && (link->tonode->type == NODE_REROUTE)) &&
+		                 (link->fromnode && (link->fromnode->type == NODE_REROUTE)));
+
+		if (g_batch_link.batch == NULL) {
+			nodelink_batch_init();
 		}
-		glEnd();
-	}
-	else {
-		glBegin(GL_LINE_STRIP);
-		for (i = 0; i < LINK_RESOL; ++i) {
-			float t = (float)i / (float)(LINK_RESOL - 1);
-			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
-			           (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
+
+		if (g_batch_link.enabled) {
+			/* Add link to batch. */
+			nodelink_batch_add_link(snode, vec[0], vec[1], vec[2], vec[3], th_col1, th_col2, th_col3, drawarrow);
+		}
+		else {
+			/* Draw single link. */
+			float colors[3][4] = {{0.0f}};
+			if (th_col3 != -1) {
+				UI_GetThemeColor4fv(th_col3, colors[0]);
+			}
+			UI_GetThemeColor4fv(th_col1, colors[1]);
+			UI_GetThemeColor4fv(th_col2, colors[2]);
+
+			Gwn_Batch *batch = g_batch_link.batch_single;
+			GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_NODELINK);
+			GWN_batch_uniform_2fv_array(batch, "bezierPts", 4, (float *)vec);
+			GWN_batch_uniform_4fv_array(batch, "colors", 3, (float *)colors);
+			GWN_batch_uniform_1f(batch, "expandSize", snode->aspect * LINK_WIDTH);
+			GWN_batch_uniform_1f(batch, "arrowSize", ARROW_SIZE);
+			GWN_batch_uniform_1i(batch, "doArrow", drawarrow);
+			GWN_batch_draw(batch);
 		}
-		glEnd();
 	}
-
-	glDisable(GL_LINE_SMOOTH);
 }
-#endif
 
 /* note; this is used for fake links in groups too */
 void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 {
-	bool do_shaded = false;
-	bool do_triple = false;
 	int th_col1 = TH_WIRE_INNER, th_col2 = TH_WIRE_INNER, th_col3 = TH_WIRE;
 
 	if (link->fromsock == NULL && link->tosock == NULL)
@@ -3641,8 +3601,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 
 	/* new connection */
 	if (!link->fromsock || !link->tosock) {
-		th_col1 = TH_ACTIVE;
-		do_triple = true;
+		th_col1 = th_col2 = TH_ACTIVE;
 	}
 	else {
 		/* going to give issues once... */
@@ -3663,39 +3622,38 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 				if (link->tonode && link->tonode->flag & SELECT)
 					th_col2 = TH_EDGE_SELECT;
 			}
-			do_shaded = true;
-			do_triple = true;
 		}
 		else {
-			th_col1 = TH_REDALERT;
+			th_col1 = th_col2 = TH_REDALERT;
+			// th_col3 = -1; /* no shadow */
 		}
 	}
 
-	node_draw_link_bezier(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
+	node_draw_link_bezier(v2d, snode, link, th_col1, th_col2, th_col3);
 //	node_draw_link_straight(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
 }
 
-void ED_node_draw_snap(View2D *v2d, const float cent[2], float size, NodeBorder border)
+void ED_node_draw_snap(View2D *v2d, const float cent[2], float size, NodeBorder border, unsigned pos)
 {
-	glBegin(GL_LINES);
+	immBegin(GWN_PRIM_LINES, 4);
 
 	if (border & (NODE_LEFT | NODE_RIGHT)) {
-		glVertex2f(cent[0], v2d->cur.ymin);
-		glVertex2f(cent[0], v2d->cur.ymax);
+		immVertex2f(pos, cent[0], v2d->cur.ymin);
+		immVertex2f(pos, cent[0], v2d->cur.ymax);
 	}
 	else {
-		glVertex2f(cent[0], cent[1] - size);
-		glVertex2f(cent[0], cent[1] + size);
+		immVertex2f(pos, cent[0], cent[1] - size);
+		immVertex2f(pos, cent[0], cent[1] + size);
 	}
 
 	if (border & (NODE_TOP | NODE_BOTTOM)) {
-		glVertex2f(v2d->cur.xmin, cent[1]);
-		glVertex2f(v2d->cur.xmax, cent[1]);
+		immVertex2f(pos, v2d->cur.xmin, cent[1]);
+		immVertex2f(pos, v2d->cur.xmax, cent[1]);
 	}
 	else {
-		glVertex2f(cent[0] - size, cent[1]);
-		glVertex2f(cent[0] + size, cent[1]);
+		immVertex2f(pos, cent[0] - size, cent[1]);
+		immVertex2f(pos, cent[0] + size, cent[1]);
 	}
 
-	glEnd();
+	immEnd();
 }
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index edd19617a0f..0a8cc838ce5 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -316,10 +316,7 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
 
 	switch (snode->nodetree->type) {
 		case NTREE_SHADER:
-			if (BKE_scene_use_new_shading_nodes(CTX_data_scene(C)))
-				type = SH_NODE_TEX_IMAGE;
-			else
-				type = SH_NODE_TEXTURE;
+			type = SH_NODE_TEX_IMAGE;
 			break;
 		case NTREE_TEXTURE:
 			type = TEX_NODE_IMAGE;
@@ -340,14 +337,7 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	if (type == SH_NODE_TEXTURE) {
-		Tex *tex = BKE_texture_add(CTX_data_main(C), DATA_(ima->id.name));
-		tex->ima = ima;
-		node->id = (ID *)tex;
-		WM_event_add_notifier(C, NC_TEXTURE | NA_ADDED, node->id);
-	}
-	else
-		node->id = (ID *)ima;
+	node->id = (ID *)ima;
 
 	/* When adding new image file via drag-drop we need to load imbuf in order
 	 * to get proper image source.
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index d1374aab02c..92c055ed12a 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -44,16 +44,21 @@
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BLF_api.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -128,10 +133,10 @@ void ED_node_tag_update_id(ID *id)
 	 * all the users of this tree will have update
 	 * flushed from the tree,
 	 */
-	DAG_id_tag_update(&ntree->id, 0);
+	DEG_id_tag_update(&ntree->id, 0);
 
 	if (ntree->type == NTREE_SHADER) {
-		DAG_id_tag_update(id, 0);
+		DEG_id_tag_update(id, 0);
 
 		if (GS(id->name) == ID_MA)
 			WM_main_add_notifier(NC_MATERIAL | ND_SHADING, id);
@@ -144,12 +149,12 @@ void ED_node_tag_update_id(ID *id)
 		WM_main_add_notifier(NC_SCENE | ND_NODES, id);
 	}
 	else if (ntree->type == NTREE_TEXTURE) {
-		DAG_id_tag_update(id, 0);
+		DEG_id_tag_update(id, 0);
 		WM_main_add_notifier(NC_TEXTURE | ND_NODES, id);
 	}
 	else if (id == &ntree->id) {
 		/* node groups */
-		DAG_id_tag_update(id, 0);
+		DEG_id_tag_update(id, 0);
 	}
 }
 
@@ -616,112 +621,23 @@ static void node_draw_mute_line(View2D *v2d, SpaceNode *snode, bNode *node)
 	bNodeLink *link;
 
 	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
 
 	for (link = node->internal_links.first; link; link = link->next)
-		node_draw_link_bezier(v2d, snode, link, TH_REDALERT, 0, TH_WIRE, 0, TH_WIRE);
-
-	glDisable(GL_BLEND);
-	glDisable(GL_LINE_SMOOTH);
-}
-
-static void node_socket_shape_draw(
-        float x, float y, float size, const float col[4], bool highlight,
-        const float coords[][2], int coords_len)
-{
-	int a;
-
-	glColor4fv(col);
-
-	glEnable(GL_BLEND);
-	glBegin(GL_POLYGON);
-	for (a = 0; a < coords_len; a++) {
-		glVertex2f(x + size * coords[a][0], y + size * coords[a][1]);
-	}
-	glEnd();
-	glDisable(GL_BLEND);
+		node_draw_link_bezier(v2d, snode, link, TH_REDALERT, TH_REDALERT, -1);
 
-	if (highlight) {
-		UI_ThemeColor(TH_TEXT_HI);
-		glLineWidth(1.5f);
-	}
-	else {
-		glColor4ub(0, 0, 0, 150);
-	}
-	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
-	glBegin(GL_LINE_LOOP);
-	for (a = 0; a < coords_len; a++) {
-		glVertex2f(x + size * coords[a][0], y + size * coords[a][1]);
-	}
-	glEnd();
-	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
 }
 
-
-void node_socket_draw(const bContext *C, bNodeTree *ntree, bNode *node, bNodeSocket *sock, float size, bool highlight)
+static void node_socket_circle_draw(const bContext *C, bNodeTree *ntree, PointerRNA node_ptr, bNodeSocket *sock, unsigned pos, unsigned col)
 {
-	PointerRNA ptr, node_ptr;
+	PointerRNA ptr;
 	float color[4];
 
 	RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr);
-	RNA_pointer_create((ID *)ntree, &RNA_Node, node, &node_ptr);
 	sock->typeinfo->draw_color((bContext *)C, &ptr, &node_ptr, color);
 
-	/* 16 values of {sin, cos} function */
-	const float shape_circle[16][2] = {
-		{0.00000000f, 1.00000000f},
-		{0.39435585f, 0.91895781f},
-		{0.72479278f, 0.68896691f},
-		{0.93775213f, 0.34730525f},
-		{0.99871650f, -0.05064916f},
-		{0.89780453f, -0.44039415f},
-		{0.65137248f, -0.75875812f},
-		{0.29936312f, -0.95413925f},
-		{-0.10116832f, -0.99486932f},
-		{-0.48530196f, -0.87434661f},
-		{-0.79077573f, -0.61210598f},
-		{-0.96807711f, -0.25065253f},
-		{-0.98846832f, 0.15142777f},
-		{-0.84864425f, 0.52896401f},
-		{-0.57126821f, 0.82076344f},
-		{-0.20129852f, 0.97952994f }
-	};
-
-	const float shape_diamond[4][2] = {
-		{0.0f, 1.2f},
-		{1.2f, 0.0f},
-		{0.0f, -1.2f},
-		{-1.2f, 0.0f},
-	};
-
-	const float shape_square[4][2] = {
-		{-0.9f, 0.9f},
-		{0.9f, 0.9f},
-		{0.9f, -0.9f},
-		{-0.9f, -0.9f},
-	};
-
-	const float (*shape)[2];
-	int shape_len;
-	switch (sock->draw_shape) {
-		default:
-		case SOCK_DRAW_SHAPE_CIRCLE:
-			shape = shape_circle;
-			shape_len = ARRAY_SIZE(shape_circle);
-			break;
-		case SOCK_DRAW_SHAPE_DIAMOND:
-			shape = shape_diamond;
-			shape_len = ARRAY_SIZE(shape_diamond);
-			break;
-		case SOCK_DRAW_SHAPE_SQUARE:
-			shape = shape_square;
-			shape_len = ARRAY_SIZE(shape_square);
-			break;
-	}
-
-	node_socket_shape_draw(sock->locx, sock->locy, size, color, highlight, shape, shape_len);
+	immAttrib4fv(col, color);
+	immVertex2f(pos, sock->locx, sock->locy);
 }
 
 /* **************  Socket callbacks *********** */
@@ -730,10 +646,15 @@ static void node_draw_preview_background(float tile, rctf *rect)
 {
 	float x, y;
 
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* draw checkerboard backdrop to show alpha */
-	glColor3ub(120, 120, 120);
-	glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
-	glColor3ub(160, 160, 160);
+	immUniformColor3ub(120, 120, 120);
+	immRectf(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+	immUniformColor3ub(160, 160, 160);
 
 	for (y = rect->ymin; y < rect->ymax; y += tile * 2) {
 		for (x = rect->xmin; x < rect->xmax; x += tile * 2) {
@@ -744,7 +665,7 @@ static void node_draw_preview_background(float tile, rctf *rect)
 			if (y + tile > rect->ymax)
 				tiley = rect->ymax - y;
 
-			glRectf(x, y, x + tilex, y + tiley);
+			immRectf(pos, x, y, x + tilex, y + tiley);
 		}
 	}
 	for (y = rect->ymin + tile; y < rect->ymax; y += tile * 2) {
@@ -756,9 +677,10 @@ static void node_draw_preview_background(float tile, rctf *rect)
 			if (y + tile > rect->ymax)
 				tiley = rect->ymax - y;
 
-			glRectf(x, y, x + tilex, y + tiley);
+			immRectf(pos, x, y, x + tilex, y + tiley);
 		}
 	}
+	immUnbindProgram();
 }
 
 /* not a callback */
@@ -789,17 +711,19 @@ static void node_draw_preview(bNodePreview *preview, rctf *prv)
 	node_draw_preview_background(BLI_rctf_size_x(prv) / 10.0f, &draw_rect);
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);  /* premul graphics */
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);  /* premul graphics */
 
-	glColor4f(1.0, 1.0, 1.0, 1.0);
-	glPixelZoom(scale, scale);
-	glaDrawPixelsTex(draw_rect.xmin, draw_rect.ymin, preview->xsize, preview->ysize, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, preview->rect);
-	glPixelZoom(1.0f, 1.0f);
+	IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+	immDrawPixelsTex(&state, draw_rect.xmin, draw_rect.ymin, preview->xsize, preview->ysize, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, preview->rect,
+	                 scale, scale, NULL);
 
 	glDisable(GL_BLEND);
 
-	UI_ThemeColorShadeAlpha(TH_BACK, -15, +100);
-	fdrawbox(draw_rect.xmin, draw_rect.ymin, draw_rect.xmax, draw_rect.ymax);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShadeAlpha(TH_BACK, -15, +100);
+	imm_draw_box_wire_2d(pos, draw_rect.xmin, draw_rect.ymin, draw_rect.xmax, draw_rect.ymax);
+	immUnbindProgram();
 }
 
 /* common handle function for operator buttons that need to select the node first */
@@ -824,32 +748,139 @@ void node_draw_shadow(SpaceNode *snode, bNode *node, float radius, float alpha)
 	else {
 		const float margin = 3.0f;
 
-		glColor4f(0.0f, 0.0f, 0.0f, 0.33f);
-		glEnable(GL_BLEND);
-		UI_draw_roundbox(rct->xmin - margin, rct->ymin - margin,
-		                 rct->xmax + margin, rct->ymax + margin, radius + margin);
-		glDisable(GL_BLEND);
+		float color[4] = {0.0f, 0.0f, 0.0f, 0.33f};
+		UI_draw_roundbox_aa(true, rct->xmin - margin, rct->ymin - margin,
+		                    rct->xmax + margin, rct->ymax + margin, radius + margin, color);
 	}
 }
 
+void node_draw_sockets(View2D *v2d, const bContext *C, bNodeTree *ntree, bNode *node, bool draw_outputs, bool select_all)
+{
+	const unsigned int total_input_ct = BLI_listbase_count(&node->inputs);
+	const unsigned int total_output_ct = BLI_listbase_count(&node->outputs);
+
+	if (total_input_ct + total_output_ct == 0) {
+		return;
+	}
+
+	PointerRNA node_ptr;
+	RNA_pointer_create((ID *)ntree, &RNA_Node, node, &node_ptr);
+
+	float scale;
+	UI_view2d_scale_get(v2d, &scale, NULL);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+	glEnable(GL_BLEND);
+	GPU_enable_program_point_size();
+
+	immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_VARYING_COLOR_OUTLINE_AA);
+
+	/* set handle size */
+	immUniform1f("size", 2.0f * NODE_SOCKSIZE * scale); /* 2 * size to have diameter */
+
+	if (!select_all) {
+		/* outline for unselected sockets */
+		immUniform1f("outlineWidth", 1.0f);
+		immUniform4f("outlineColor", 0.0f, 0.0f, 0.0f, 0.6f);
+
+		immBeginAtMost(GWN_PRIM_POINTS, total_input_ct + total_output_ct);
+	}
+
+	/* socket inputs */
+	short selected_input_ct = 0;
+	bNodeSocket *sock;
+	for (sock = node->inputs.first; sock; sock = sock->next) {
+		if (nodeSocketIsHidden(sock))
+			continue;
+		if (select_all || (sock->flag & SELECT)) {
+			++selected_input_ct;
+			continue;
+		}
+
+		node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
+	}
+
+	/* socket outputs */
+	short selected_output_ct = 0;
+	if (draw_outputs) {
+		for (sock = node->outputs.first; sock; sock = sock->next) {
+			if (nodeSocketIsHidden(sock))
+				continue;
+			if (select_all || (sock->flag & SELECT)) {
+				++selected_output_ct;
+				continue;
+			}
+
+			node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
+		}
+	}
+
+	if (!select_all) {
+		immEnd();
+	}
+
+	/* go back and draw selected sockets */
+	if (selected_input_ct + selected_output_ct > 0) {
+		/* outline for selected sockets */
+		float c[3];
+		UI_GetThemeColor3fv(TH_TEXT_HI, c);
+		immUniform4f("outlineColor", c[0], c[1], c[2], 1.0f);
+		immUniform1f("outlineWidth", 1.5f);
+
+		immBegin(GWN_PRIM_POINTS, selected_input_ct + selected_output_ct);
+
+		if (selected_input_ct) {
+			/* socket inputs */
+			for (sock = node->inputs.first; sock; sock = sock->next) {
+				if (nodeSocketIsHidden(sock))
+					continue;
+				if (select_all || (sock->flag & SELECT)) {
+					node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
+					if (--selected_input_ct == 0)
+						break; /* stop as soon as last one is drawn */
+				}
+			}
+		}
+
+		if (selected_output_ct) {
+			/* socket outputs */
+			for (sock = node->outputs.first; sock; sock = sock->next) {
+				if (nodeSocketIsHidden(sock))
+					continue;
+				if (select_all || (sock->flag & SELECT)) {
+					node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
+					if (--selected_output_ct == 0)
+						break; /* stop as soon as last one is drawn */
+				}
+			}
+		}
+
+		immEnd();
+	}
+
+	immUnbindProgram();
+
+	GPU_disable_program_point_size();
+	glDisable(GL_BLEND);
+}
+
 static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNode *node, bNodeInstanceKey key)
 {
 	bNodeInstanceHash *previews = CTX_data_pointer_get(C, "node_previews").data;
-	bNodeSocket *sock;
 	rctf *rct = &node->totr;
 	float iconofs;
 	/* float socket_size = NODE_SOCKSIZE*U.dpi/72; */ /* UNUSED */
 	float iconbutw = 0.8f * UI_UNIT_X;
 	int color_id = node_get_colorid(node);
+	float color[4];
 	char showname[128]; /* 128 used below */
 	View2D *v2d = &ar->v2d;
 
-	/* XXX hack: copy values from linked ID data where displayed as sockets */
-	if (node->block)
-		nodeSynchronizeID(node, false);
-
 	/* skip if out of view */
-	if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == false) {
+	if (BLI_rctf_isect(&node->totr, &v2d->cur, NULL) == false) {
 		UI_block_end(C, node->block);
 		node->block = NULL;
 		return;
@@ -858,23 +889,24 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	/* shadow */
 	node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
 
-	/* header uses color from backdrop, but we make it opaqie */
-	if (color_id == TH_NODE) {
-		float col[3];
-		UI_GetThemeColorShade3fv(color_id, -20, col);
-		glColor4f(col[0], col[1], col[2], 1.0f);
+	if (node->flag & NODE_MUTED) {
+		UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
+	}
+	else {
+		/* header uses color from backdrop, but we make it opaque */
+		if (color_id == TH_NODE) {
+			UI_GetThemeColorShade3fv(color_id, -20, color);
+			color[3] = 1.0f;
+		}
+		else {
+			UI_GetThemeColor4fv(color_id, color);
+		}
 	}
-	else
-		UI_ThemeColor(color_id);
-
-	if (node->flag & NODE_MUTED)
-		UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
-
 
 	glLineWidth(1.0f);
 
 	UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);
-	UI_draw_roundbox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
+	UI_draw_roundbox_aa(true, rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD, color);
 
 	/* show/hide icons */
 	iconofs = rct->xmax - 0.35f * U.widget_unit;
@@ -907,10 +939,12 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	}
 
 	/* title */
-	if (node->flag & SELECT)
-		UI_ThemeColor(TH_SELECT);
-	else
-		UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
+	if (node->flag & SELECT) {
+		UI_GetThemeColor4fv(TH_SELECT, color);
+	}
+	else {
+		UI_GetThemeColorBlendShade4fv(TH_SELECT, color_id, 0.4f, 10, color);
+	}
 
 	/* open/close entirely? */
 	{
@@ -925,17 +959,9 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		UI_block_emboss_set(node->block, UI_EMBOSS);
 
 		/* custom draw function for this button */
-		UI_draw_icon_tri(rct->xmin + 0.5f * U.widget_unit, rct->ymax - NODE_DY / 2.0f, 'v');
+		UI_draw_icon_tri(rct->xmin + 0.5f * U.widget_unit, rct->ymax - NODE_DY / 2.0f, 'v', color);
 	}
 
-	/* this isn't doing anything for the label, so commenting out */
-#if 0
-	if (node->flag & SELECT)
-		UI_ThemeColor(TH_TEXT_HI);
-	else
-		UI_ThemeColor(TH_TEXT);
-#endif
-
 	nodeLabel(ntree, node, showname, sizeof(showname));
 
 	//if (node->flag & NODE_MUTED)
@@ -948,54 +974,29 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 
 	/* body */
 	if (!nodeIsRegistered(node))
-		UI_ThemeColor4(TH_REDALERT);	/* use warning color to indicate undefined types */
-	else if (node->flag & NODE_CUSTOM_COLOR)
-		glColor3fv(node->color);
+		UI_GetThemeColor4fv(TH_REDALERT, color);	/* use warning color to indicate undefined types */
+	else if (node->flag & NODE_CUSTOM_COLOR) {
+		rgba_float_args_set(color, node->color[0], node->color[1], node->color[2], 1.0f);
+	}
 	else
-		UI_ThemeColor4(TH_NODE);
-	glEnable(GL_BLEND);
+		UI_GetThemeColor4fv(TH_NODE, color);
+
 	UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
-	UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD);
-	glDisable(GL_BLEND);
+	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD, color);
 
 	/* outline active and selected emphasis */
 	if (node->flag & SELECT) {
-
-		glEnable(GL_BLEND);
-		glEnable(GL_LINE_SMOOTH);
-
-		if (node->flag & NODE_ACTIVE)
-			UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -40);
-		else
-			UI_ThemeColorShadeAlpha(TH_SELECT, 0, -40);
+		UI_GetThemeColorShadeAlpha4fv((node->flag & NODE_ACTIVE) ? TH_ACTIVE : TH_SELECT, 0, -40, color);
 
 		UI_draw_roundbox_corner_set(UI_CNR_ALL);
-		UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
-
-		glDisable(GL_LINE_SMOOTH);
-		glDisable(GL_BLEND);
+		UI_draw_roundbox_aa(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD, color);
 	}
 
 	/* disable lines */
 	if (node->flag & NODE_MUTED)
 		node_draw_mute_line(v2d, snode, node);
 
-
-	/* socket inputs, buttons */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		if (nodeSocketIsHidden(sock))
-			continue;
-
-		node_socket_draw(C, ntree, node, sock, NODE_SOCKSIZE, sock->flag & SELECT);
-	}
-
-	/* socket outputs */
-	for (sock = node->outputs.first; sock; sock = sock->next) {
-		if (nodeSocketIsHidden(sock))
-			continue;
-
-		node_socket_draw(C, ntree, node, sock, NODE_SOCKSIZE, sock->flag & SELECT);
-	}
+	node_draw_sockets(v2d, C, ntree, node, true, false);
 
 	/* preview */
 	if (node->flag & NODE_PREVIEW && previews) {
@@ -1016,37 +1017,33 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 
 static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNode *node, bNodeInstanceKey UNUSED(key))
 {
-	bNodeSocket *sock;
 	rctf *rct = &node->totr;
 	float dx, centy = BLI_rctf_cent_y(rct);
 	float hiddenrad = BLI_rctf_size_y(rct) / 2.0f;
-	float socket_size = NODE_SOCKSIZE;
 	int color_id = node_get_colorid(node);
+	float color[4];
 	char showname[128]; /* 128 is used below */
+	View2D *v2d = &ar->v2d;
+	float scale;
+
+	UI_view2d_scale_get(v2d, &scale, NULL);
 
 	/* shadow */
 	node_draw_shadow(snode, node, hiddenrad, 1.0f);
 
 	/* body */
-	UI_ThemeColor(color_id);
 	if (node->flag & NODE_MUTED)
-		UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
+		UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
+	else
+		UI_GetThemeColor4fv(color_id, color);
 
-	UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
+	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad, color);
 
 	/* outline active and selected emphasis */
 	if (node->flag & SELECT) {
-		glEnable(GL_BLEND);
-		glEnable(GL_LINE_SMOOTH);
+		UI_GetThemeColorShadeAlpha4fv((node->flag & NODE_ACTIVE) ? TH_ACTIVE : TH_SELECT, 0, -40, color);
 
-		if (node->flag & NODE_ACTIVE)
-			UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -40);
-		else
-			UI_ThemeColorShadeAlpha(TH_SELECT, 0, -40);
-		UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
-
-		glDisable(GL_LINE_SMOOTH);
-		glDisable(GL_BLEND);
+		UI_draw_roundbox_aa(false, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad, color);
 	}
 
 	/* custom color inline */
@@ -1054,18 +1051,19 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 		glEnable(GL_BLEND);
 		glEnable(GL_LINE_SMOOTH);
 
-		glColor3fv(node->color);
-		UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin + 1, rct->ymin + 1, rct->xmax -1, rct->ymax - 1, hiddenrad);
+		UI_draw_roundbox_3fvAlpha(false, rct->xmin + 1, rct->ymin + 1, rct->xmax -1, rct->ymax - 1, hiddenrad, node->color, 1.0f);
 
 		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
 	}
 
 	/* title */
-	if (node->flag & SELECT)
-		UI_ThemeColor(TH_SELECT);
-	else
-		UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
+	if (node->flag & SELECT) {
+		UI_GetThemeColor4fv(TH_SELECT, color);
+	}
+	else {
+		UI_GetThemeColorBlendShade4fv(TH_SELECT, color_id, 0.4f, 10, color);
+	}
 
 	/* open entirely icon */
 	{
@@ -1080,18 +1078,13 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 		UI_block_emboss_set(node->block, UI_EMBOSS);
 
 		/* custom draw function for this button */
-		UI_draw_icon_tri(rct->xmin + 10.0f, centy, 'h');
+		UI_draw_icon_tri(rct->xmin + 10.0f, centy, 'h', color);
 	}
 
 	/* disable lines */
 	if (node->flag & NODE_MUTED)
 		node_draw_mute_line(&ar->v2d, snode, node);
 
-	if (node->flag & SELECT)
-		UI_ThemeColor(TH_SELECT);
-	else
-		UI_ThemeColor(TH_TEXT);
-
 	if (node->miniwidth > 0.0f) {
 		nodeLabel(ntree, node, showname, sizeof(showname));
 
@@ -1105,28 +1098,34 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	}
 
 	/* scale widget thing */
-	UI_ThemeColorShade(color_id, -10);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformThemeColorShade(color_id, -10);
 	dx = 10.0f;
-	fdrawline(rct->xmax - dx, centy - 4.0f, rct->xmax - dx, centy + 4.0f);
-	fdrawline(rct->xmax - dx - 3.0f * snode->aspect, centy - 4.0f, rct->xmax - dx - 3.0f * snode->aspect, centy + 4.0f);
 
-	UI_ThemeColorShade(color_id, +30);
+	immBegin(GWN_PRIM_LINES, 4);
+	immVertex2f(pos, rct->xmax - dx, centy - 4.0f);
+	immVertex2f(pos, rct->xmax - dx, centy + 4.0f);
+
+	immVertex2f(pos, rct->xmax - dx - 3.0f * snode->aspect, centy - 4.0f);
+	immVertex2f(pos, rct->xmax - dx - 3.0f * snode->aspect, centy + 4.0f);
+	immEnd();
+
+	immUniformThemeColorShade(color_id, 30);
 	dx -= snode->aspect;
-	fdrawline(rct->xmax - dx, centy - 4.0f, rct->xmax - dx, centy + 4.0f);
-	fdrawline(rct->xmax - dx - 3.0f * snode->aspect, centy - 4.0f, rct->xmax - dx - 3.0f * snode->aspect, centy + 4.0f);
 
-	/* sockets */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		if (!nodeSocketIsHidden(sock)) {
-			node_socket_draw(C, ntree, node, sock, socket_size, sock->flag & SELECT);
-		}
-	}
+	immBegin(GWN_PRIM_LINES, 4);
+	immVertex2f(pos, rct->xmax - dx, centy - 4.0f);
+	immVertex2f(pos, rct->xmax - dx, centy + 4.0f);
 
-	for (sock = node->outputs.first; sock; sock = sock->next) {
-		if (!nodeSocketIsHidden(sock)) {
-			node_socket_draw(C, ntree, node, sock, socket_size, sock->flag & SELECT);
-		}
-	}
+	immVertex2f(pos, rct->xmax - dx - 3.0f * snode->aspect, centy - 4.0f);
+	immVertex2f(pos, rct->xmax - dx - 3.0f * snode->aspect, centy + 4.0f);
+	immEnd();
+
+	immUnbindProgram();
+
+	node_draw_sockets(v2d, C, ntree, node, true, false);
 
 	UI_block_end(C, node->block);
 	UI_block_draw(C, node->block);
@@ -1241,12 +1240,12 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT
 
 	/* node lines */
 	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
+	nodelink_batch_start(snode);
 	for (link = ntree->links.first; link; link = link->next) {
 		if (!nodeLinkIsHidden(link))
 			node_draw_link(&ar->v2d, snode, link);
 	}
-	glDisable(GL_LINE_SMOOTH);
+	nodelink_batch_end(snode);
 	glDisable(GL_BLEND);
 
 	/* draw foreground nodes, last nodes in front */
@@ -1268,7 +1267,7 @@ static void draw_tree_path(SpaceNode *snode)
 
 	ED_node_tree_path_get_fixedbuf(snode, info, sizeof(info));
 
-	UI_ThemeColor(TH_TEXT_HI);
+	UI_FontThemeColor(BLF_default(), TH_TEXT_HI);
 	BLF_draw_default(1.5f * UI_UNIT_X, 1.5f * UI_UNIT_Y, 0.0f, info, sizeof(info));
 }
 
@@ -1301,12 +1300,14 @@ static void draw_group_overlay(const bContext *C, ARegion *ar)
 	View2D *v2d = &ar->v2d;
 	rctf rect = v2d->cur;
 	uiBlock *block;
+	float color[4];
 
 	/* shade node groups to separate them visually */
-	UI_ThemeColorShadeAlpha(TH_NODE_GROUP, 0, -70);
 	glEnable(GL_BLEND);
+
+	UI_GetThemeColorShadeAlpha4fv(TH_NODE_GROUP, 0, -70, color);
 	UI_draw_roundbox_corner_set(UI_CNR_NONE);
-	UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 0);
+	UI_draw_roundbox_4fv(true, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 0, color);
 	glDisable(GL_BLEND);
 
 	/* set the block bounds to clip mouse events from underlying nodes */
@@ -1337,8 +1338,7 @@ void drawnodespace(const bContext *C, ARegion *ar)
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
 	/* only set once */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_MAP1_VERTEX_3);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	/* nodes */
 	snode_set_context(C);
@@ -1399,6 +1399,21 @@ void drawnodespace(const bContext *C, ARegion *ar)
 			/* backdrop */
 			draw_nodespace_back_pix(C, ar, snode, path->parent_key);
 
+			{
+				float original_proj[4][4];
+				gpuGetProjectionMatrix(original_proj);
+
+				gpuPushMatrix();
+				gpuLoadIdentity();
+
+				wmOrtho2_pixelspace(ar->winx, ar->winy);
+
+				WM_manipulatormap_draw(ar->manipulator_map, C, WM_MANIPULATORMAP_DRAWSTEP_2D);
+
+				gpuPopMatrix();
+				gpuLoadProjectionMatrix(original_proj);
+			}
+
 			draw_nodetree(C, ar, ntree, path->parent_key);
 		}
 
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 59cfbac2e25..2d1af3f4578 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -41,7 +41,6 @@
 #include "BLI_blenlib.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
@@ -50,6 +49,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
@@ -123,7 +124,7 @@ static int compo_get_recalc_flags(const bContext *C)
 	int recalc_flags = 0;
 
 	for (win = wm->windows.first; win; win = win->next) {
-		bScreen *sc = win->screen;
+		const bScreen *sc = WM_window_get_active_screen(win);
 		ScrArea *sa;
 
 		for (sa = sc->areabase.first; sa; sa = sa->next) {
@@ -328,11 +329,11 @@ void snode_dag_update(bContext *C, SpaceNode *snode)
 	if (snode->edittree != snode->nodetree) {
 		FOREACH_NODETREE(bmain, tntree, id) {
 			if (ntreeHasTree(tntree, snode->edittree))
-				DAG_id_tag_update(id, 0);
+				DEG_id_tag_update(id, 0);
 		} FOREACH_NODETREE_END
 	}
 
-	DAG_id_tag_update(snode->id, 0);
+	DEG_id_tag_update(snode->id, 0);
 }
 
 void snode_notify(bContext *C, SpaceNode *snode)
@@ -382,7 +383,6 @@ bool ED_node_is_texture(struct SpaceNode *snode)
 /* called from shading buttons or header */
 void ED_node_shader_default(const bContext *C, ID *id)
 {
-	Scene *scene = CTX_data_scene(C);
 	bNode *in, *out;
 	bNodeSocket *fromsock, *tosock, *sock;
 	bNodeTree *ntree;
@@ -397,14 +397,8 @@ void ED_node_shader_default(const bContext *C, ID *id)
 			Material *ma = (Material *)id;
 			ma->nodetree = ntree;
 
-			if (BKE_scene_use_new_shading_nodes(scene)) {
-				output_type = SH_NODE_OUTPUT_MATERIAL;
-				shader_type = SH_NODE_BSDF_DIFFUSE;
-			}
-			else {
-				output_type = SH_NODE_OUTPUT;
-				shader_type = SH_NODE_MATERIAL;
-			}
+			output_type = SH_NODE_OUTPUT_MATERIAL;
+			shader_type = SH_NODE_BSDF_PRINCIPLED;
 
 			copy_v3_v3(color, &ma->r);
 			strength = 0.0f;
@@ -455,18 +449,16 @@ void ED_node_shader_default(const bContext *C, ID *id)
 	nodeAddLink(ntree, in, fromsock, out, tosock);
 
 	/* default values */
-	if (BKE_scene_use_new_shading_nodes(scene)) {
-		PointerRNA sockptr;
-		sock = in->inputs.first;
-		RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
+	PointerRNA sockptr;
+	sock = in->inputs.first;
+	RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
 
-		RNA_float_set_array(&sockptr, "default_value", color);
+	RNA_float_set_array(&sockptr, "default_value", color);
 
-		if (strength != 0.0f) {
-			sock = in->inputs.last;
-			RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
-			RNA_float_set(&sockptr, "default_value", strength);
-		}
+	if (strength != 0.0f) {
+		sock = in->inputs.last;
+		RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
+		RNA_float_set(&sockptr, "default_value", strength);
 	}
 
 	ntreeUpdateTree(CTX_data_main(C), ntree);
@@ -545,12 +537,6 @@ void snode_set_context(const bContext *C)
 	bNodeTree *ntree = snode->nodetree;
 	ID *id = snode->id, *from = snode->from;
 
-	/* we use this to signal warnings, when node shaders are drawn in wrong render engine */
-	if (BKE_scene_use_new_shading_nodes(CTX_data_scene(C)))
-		snode->flag |= SNODE_NEW_SHADERS;
-	else
-		snode->flag &= ~SNODE_NEW_SHADERS;
-
 	/* check the tree type */
 	if (!treetype ||
 	    (treetype->poll && !treetype->poll(C, treetype)))
@@ -638,7 +624,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
 			if (node->id && ELEM(GS(node->id->name), ID_MA, ID_LA, ID_WO))
 				nodeClearActiveID(ntree, ID_TE);
 
-			if (ELEM(node->type, SH_NODE_OUTPUT, SH_NODE_OUTPUT_MATERIAL,
+			if (ELEM(node->type, SH_NODE_OUTPUT_MATERIAL,
 			         SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP, SH_NODE_OUTPUT_LINESTYLE))
 			{
 				bNode *tnode;
@@ -689,22 +675,6 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
 				/* addnode() doesnt link this yet... */
 				node->id = (ID *)BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
 			}
-			else if (node->type == CMP_NODE_R_LAYERS) {
-				Scene *scene;
-
-				for (scene = bmain->scene.first; scene; scene = scene->id.next) {
-					if (scene->nodetree && scene->use_nodes && ntreeHasTree(scene->nodetree, ntree)) {
-						if (node->id == NULL || node->id == (ID *)scene) {
-							int num_layers = BLI_listbase_count(&scene->r.layers);
-							scene->r.actlay = node->custom1;
-							/* Clamp the value, because it might have come from a different
-							 * scene which could have more render layers than new one.
-							 */
-							scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
-						}
-					}
-				}
-			}
 			else if (node->type == CMP_NODE_COMPOSITE) {
 				if (was_output == 0) {
 					bNode *tnode;
@@ -1271,7 +1241,7 @@ bool ED_node_select_check(ListBase *lb)
 
 
 /* goes over all scenes, reads render layers */
-static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op))
+static int node_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
 	SpaceNode *snode = CTX_wm_space_node(C);
@@ -1301,48 +1271,14 @@ static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void NODE_OT_read_renderlayers(wmOperatorType *ot)
+void NODE_OT_read_viewlayers(wmOperatorType *ot)
 {
 
-	ot->name = "Read Render Layers";
-	ot->idname = "NODE_OT_read_renderlayers";
+	ot->name = "Read View Layers";
+	ot->idname = "NODE_OT_read_viewlayers";
 	ot->description = "Read all render layers of all used scenes";
 
-	ot->exec = node_read_renderlayers_exec;
-
-	ot->poll = composite_node_active;
-
-	/* flags */
-	ot->flag = 0;
-}
-
-static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Main *bmain = CTX_data_main(C);
-	SpaceNode *snode = CTX_wm_space_node(C);
-	Scene *curscene = CTX_data_scene(C);
-	Render *re = RE_NewSceneRender(curscene);
-
-	WM_cursor_wait(1);
-	RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
-	WM_cursor_wait(0);
-
-	/* note we are careful to send the right notifier, as otherwise the
-	 * compositor would reexecute and overwrite the full sample result */
-	WM_event_add_notifier(C, NC_SCENE | ND_COMPO_RESULT, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-
-void NODE_OT_read_fullsamplelayers(wmOperatorType *ot)
-{
-
-	ot->name = "Read Full Sample Layers";
-	ot->idname = "NODE_OT_read_fullsamplelayers";
-	ot->description = "Read all render layers of current scene, in full sample";
-
-	ot->exec = node_read_fullsamplelayers_exec;
+	ot->exec = node_read_viewlayers_exec;
 
 	ot->poll = composite_node_active;
 
@@ -1361,13 +1297,13 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 	if (node) {
-		SceneRenderLayer *srl = BLI_findlink(&sce->r.layers, node->custom1);
+		ViewLayer *view_layer = BLI_findlink(&sce->view_layers, node->custom1);
 
-		if (srl) {
+		if (view_layer) {
 			PointerRNA op_ptr;
 
 			WM_operator_properties_create(&op_ptr, "RENDER_OT_render");
-			RNA_string_set(&op_ptr, "layer", srl->name);
+			RNA_string_set(&op_ptr, "layer", view_layer->name);
 			RNA_string_set(&op_ptr, "scene", sce->id.name + 2);
 
 			/* to keep keypositions */
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index f2ed1d1b4ec..4440b2c6ecd 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -67,13 +67,11 @@ void snode_group_offset(struct SpaceNode *snode, float *x, float *y);	/* transfo
 
 /* node_draw.c */
 int node_get_colorid(struct bNode *node);
-void node_socket_draw(
-        const struct bContext *C, struct bNodeTree *ntree, struct bNode *node,
-        struct bNodeSocket *sock, float size, bool highlight);
 int node_get_resize_cursor(int directions);
 void node_draw_shadow(struct SpaceNode *snode, struct bNode *node, float radius, float alpha);
 void node_draw_default(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode,
                        struct bNodeTree *ntree, struct bNode *node, bNodeInstanceKey key);
+void node_draw_sockets(struct View2D *v2d, const struct bContext *C, struct bNodeTree *ntree, struct bNode *node, bool draw_outputs, bool select_all);
 void node_update_default(const struct bContext *C, struct bNodeTree *ntree, struct bNode *node);
 int node_select_area_default(struct bNode *node, int x, int y);
 int node_tweak_area_default(struct bNode *node, int x, int y);
@@ -132,8 +130,11 @@ void NODE_OT_backimage_fit(struct wmOperatorType *ot);
 void NODE_OT_backimage_sample(struct wmOperatorType *ot);
 
 /* drawnode.c */
+void nodelink_batch_start(struct SpaceNode *snode);
+void nodelink_batch_end(struct SpaceNode *snode);
+
 void node_draw_link(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link);
-void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3);
+void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, int th_col2, int th_col3);
 bool node_link_bezier_points(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, float coord_array[][2], int resol);
 // void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 );
 void draw_nodespace_back_pix(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode, bNodeInstanceKey parent_key);
@@ -199,7 +200,7 @@ void NODE_OT_options_toggle(struct wmOperatorType *ot);
 void NODE_OT_node_copy_color(struct wmOperatorType *ot);
 
 void NODE_OT_read_fullsamplelayers(struct wmOperatorType *ot);
-void NODE_OT_read_renderlayers(struct wmOperatorType *ot);
+void NODE_OT_read_viewlayers(struct wmOperatorType *ot);
 void NODE_OT_render_changed(struct wmOperatorType *ot);
 
 void NODE_OT_output_file_add_socket(struct wmOperatorType *ot);
@@ -221,6 +222,13 @@ void NODE_OT_shader_script_update(struct wmOperatorType *ot);
 void NODE_OT_viewer_border(struct wmOperatorType *ot);
 void NODE_OT_clear_viewer_border(struct wmOperatorType *ot);
 
+/* node_widgets.c */
+void NODE_WGT_backdrop_transform(struct wmManipulatorGroupType *wgt);
+void NODE_WGT_backdrop_crop(struct wmManipulatorGroupType *wgt);
+void NODE_WGT_backdrop_sun_beams(struct wmManipulatorGroupType *wgt);
+void NODE_WGT_backdrop_corner_pin(struct wmManipulatorGroupType *wgt);
+
+
 extern const char *node_context_dir[];
 
 // XXXXXX
diff --git a/source/blender/editors/space_node/node_manipulators.c b/source/blender/editors/space_node/node_manipulators.c
new file mode 100644
index 00000000000..73b0f44b043
--- /dev/null
+++ b/source/blender/editors/space_node/node_manipulators.c
@@ -0,0 +1,616 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_node/node_manipulators.c
+ *  \ingroup spnode
+ */
+
+#include <math.h>
+
+#include "BLI_utildefines.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
+#include "BLI_rect.h"
+
+#include "BKE_context.h"
+#include "BKE_image.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "IMB_imbuf_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "node_intern.h"
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Local Utilities
+ * \{ */
+
+static void node_manipulator_calc_matrix_space(
+        const SpaceNode *snode, const ARegion *ar, float matrix_space[4][4])
+{
+	unit_m4(matrix_space);
+	mul_v3_fl(matrix_space[0], snode->zoom);
+	mul_v3_fl(matrix_space[1], snode->zoom);
+	matrix_space[3][0] = (ar->winx / 2) + snode->xof;
+	matrix_space[3][1] = (ar->winy / 2) + snode->yof;
+}
+
+static void node_manipulator_calc_matrix_space_with_image_dims(
+        const SpaceNode *snode, const ARegion *ar, const float image_dims[2], float matrix_space[4][4])
+{
+	unit_m4(matrix_space);
+	mul_v3_fl(matrix_space[0], snode->zoom * image_dims[0]);
+	mul_v3_fl(matrix_space[1], snode->zoom * image_dims[1]);
+	matrix_space[3][0] = ((ar->winx / 2) + snode->xof) - ((image_dims[0] / 2.0f) * snode->zoom);
+	matrix_space[3][1] = ((ar->winy / 2) + snode->yof) - ((image_dims[1] / 2.0f) * snode->zoom);
+}
+
+/** \} */
+
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Backdrop Manipulator
+ * \{ */
+
+static void manipulator_node_backdrop_prop_matrix_get(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	const SpaceNode *snode = mpr_prop->custom_func.user_data;
+	matrix[0][0] = snode->zoom;
+	matrix[1][1] = snode->zoom;
+	matrix[3][0] = snode->xof;
+	matrix[3][1] = snode->yof;
+}
+
+static void manipulator_node_backdrop_prop_matrix_set(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	const float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	SpaceNode *snode = mpr_prop->custom_func.user_data;
+	snode->zoom = matrix[0][0];
+	snode->zoom = matrix[1][1];
+	snode->xof  = matrix[3][0];
+	snode->yof  = matrix[3][1];
+}
+
+static bool WIDGETGROUP_node_transform_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	if ((snode->flag & SNODE_BACKDRAW) == 0) {
+		return false;
+	}
+
+	if (snode && snode->edittree && snode->edittree->type == NTREE_COMPOSIT) {
+		bNode *node = nodeGetActive(snode->edittree);
+
+		if (node && ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static void WIDGETGROUP_node_transform_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+
+	wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
+
+	RNA_enum_set(wwrapper->manipulator->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM);
+
+	mgroup->customdata = wwrapper;
+}
+
+static void WIDGETGROUP_node_transform_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmManipulator *cage = ((wmManipulatorWrapper *)mgroup->customdata)->manipulator;
+	const ARegion *ar = CTX_wm_region(C);
+	/* center is always at the origin */
+	const float origin[3] = {ar->winx / 2, ar->winy / 2};
+
+	void *lock;
+	Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
+
+	if (ibuf) {
+		const float dims[2] = {
+			(ibuf->x > 0) ? ibuf->x : 64.0f,
+			(ibuf->y > 0) ? ibuf->y : 64.0f,
+		};
+
+		RNA_float_set_array(cage->ptr, "dimensions", dims);
+		WM_manipulator_set_matrix_location(cage, origin);
+		WM_manipulator_set_flag(cage, WM_MANIPULATOR_HIDDEN, false);
+
+		/* need to set property here for undo. TODO would prefer to do this in _init */
+		SpaceNode *snode = CTX_wm_space_node(C);
+#if 0
+		PointerRNA nodeptr;
+		RNA_pointer_create(snode->id, &RNA_SpaceNodeEditor, snode, &nodeptr);
+		WM_manipulator_target_property_def_rna(cage, "offset", &nodeptr, "backdrop_offset", -1);
+		WM_manipulator_target_property_def_rna(cage, "scale", &nodeptr, "backdrop_zoom", -1);
+#endif
+
+		WM_manipulator_target_property_def_func(
+		        cage, "matrix",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_node_backdrop_prop_matrix_get,
+		            .value_set_fn = manipulator_node_backdrop_prop_matrix_set,
+		            .range_get_fn = NULL,
+		            .user_data = snode,
+		        });
+	}
+	else {
+		WM_manipulator_set_flag(cage, WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	BKE_image_release_ibuf(ima, ibuf, lock);
+}
+
+void NODE_WGT_backdrop_transform(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Backdrop Transform Widget";
+	wgt->idname = "NODE_WGT_backdrop_transform";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_PERSISTENT;
+
+	wgt->poll = WIDGETGROUP_node_transform_poll;
+	wgt->setup = WIDGETGROUP_node_transform_setup;
+	wgt->refresh = WIDGETGROUP_node_transform_refresh;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Crop Manipulator
+ * \{ */
+
+struct NodeCropWidgetGroup {
+	wmManipulator *border;
+
+	struct {
+		float dims[2];
+	} state;
+
+	struct {
+		PointerRNA ptr;
+		PropertyRNA *prop;
+		bContext *context;
+	} update_data;
+};
+
+static void manipulator_node_crop_update(struct NodeCropWidgetGroup *crop_group)
+{
+	RNA_property_update(crop_group->update_data.context, &crop_group->update_data.ptr, crop_group->update_data.prop);
+}
+
+static void two_xy_to_rect(const NodeTwoXYs *nxy, rctf *rect, const float dims[2], bool is_relative)
+{
+	if (is_relative) {
+		rect->xmin = nxy->fac_x1;
+		rect->xmax = nxy->fac_x2;
+		rect->ymin = nxy->fac_y1;
+		rect->ymax = nxy->fac_y2;
+	}
+	else {
+		rect->xmin = nxy->x1 / dims[0];
+		rect->xmax = nxy->x2 / dims[0];
+		rect->ymin = nxy->y1 / dims[1];
+		rect->ymax = nxy->y2 / dims[1];
+	}
+}
+
+static void two_xy_from_rect(NodeTwoXYs *nxy, const rctf *rect, const float dims[2], bool is_relative)
+{
+	if (is_relative) {
+		nxy->fac_x1 = rect->xmin;
+		nxy->fac_x2 = rect->xmax;
+		nxy->fac_y1 = rect->ymin;
+		nxy->fac_y2 = rect->ymax;
+	}
+	else {
+		nxy->x1 = rect->xmin * dims[0];
+		nxy->x2 = rect->xmax * dims[0];
+		nxy->y1 = rect->ymin * dims[1];
+		nxy->y2 = rect->ymax * dims[1];
+	}
+}
+
+/* scale callbacks */
+static void manipulator_node_crop_prop_matrix_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	struct NodeCropWidgetGroup *crop_group = mpr->parent_mgroup->customdata;
+	const float *dims = crop_group->state.dims;
+	const bNode *node = mpr_prop->custom_func.user_data;
+	const NodeTwoXYs *nxy = node->storage;
+	bool is_relative = (bool)node->custom2;
+	rctf rct;
+	two_xy_to_rect(nxy, &rct, dims, is_relative);
+	matrix[0][0] = BLI_rctf_size_x(&rct);
+	matrix[1][1] = BLI_rctf_size_y(&rct);
+	matrix[3][0] = (BLI_rctf_cent_x(&rct) - 0.5f) * dims[0];
+	matrix[3][1] = (BLI_rctf_cent_y(&rct) - 0.5f) * dims[1];
+}
+
+static void manipulator_node_crop_prop_matrix_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	const float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	struct NodeCropWidgetGroup *crop_group = mpr->parent_mgroup->customdata;
+	const float *dims = crop_group->state.dims;
+	bNode *node = mpr_prop->custom_func.user_data;
+	NodeTwoXYs *nxy = node->storage;
+	bool is_relative = (bool)node->custom2;
+	rctf rct;
+	two_xy_to_rect(nxy, &rct, dims, is_relative);
+	BLI_rctf_resize(&rct, matrix[0][0], matrix[1][1]);
+	BLI_rctf_recenter(&rct, (matrix[3][0] / dims[0]) + 0.5f, (matrix[3][1] / dims[1]) + 0.5f);
+	BLI_rctf_isect(&(rctf){.xmin = 0, .ymin = 0, .xmax = 1, .ymax = 1}, &rct, &rct);
+	two_xy_from_rect(nxy, &rct, dims, is_relative);
+	manipulator_node_crop_update(crop_group);
+}
+
+static bool WIDGETGROUP_node_crop_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	if ((snode->flag & SNODE_BACKDRAW) == 0) {
+		return false;
+	}
+
+	if (snode && snode->edittree && snode->edittree->type == NTREE_COMPOSIT) {
+		bNode *node = nodeGetActive(snode->edittree);
+
+		if (node && ELEM(node->type, CMP_NODE_CROP)) {
+			/* ignore 'use_crop_size', we can't usefully edit the crop in this case. */
+			if ((node->custom1 & (0 << 1)) == 0) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+static void WIDGETGROUP_node_crop_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct NodeCropWidgetGroup *crop_group = MEM_mallocN(sizeof(struct NodeCropWidgetGroup), __func__);
+
+	crop_group->border = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
+
+	RNA_enum_set(crop_group->border->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE);
+
+	mgroup->customdata = crop_group;
+}
+
+static void WIDGETGROUP_node_crop_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ARegion *ar = CTX_wm_region(C);
+	wmManipulator *mpr = mgroup->manipulators.first;
+
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	node_manipulator_calc_matrix_space(snode, ar, mpr->matrix_space);
+}
+
+static void WIDGETGROUP_node_crop_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NodeCropWidgetGroup *crop_group = mgroup->customdata;
+	wmManipulator *mpr = crop_group->border;
+
+	void *lock;
+	Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
+
+	if (ibuf) {
+		crop_group->state.dims[0] = (ibuf->x > 0) ? ibuf->x : 64.0f;
+		crop_group->state.dims[1] = (ibuf->y > 0) ? ibuf->y : 64.0f;
+
+		RNA_float_set_array(mpr->ptr, "dimensions", crop_group->state.dims);
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		SpaceNode *snode = CTX_wm_space_node(C);
+		bNode *node = nodeGetActive(snode->edittree);
+
+		crop_group->update_data.context = (bContext *)C;
+		RNA_pointer_create((ID *)snode->edittree, &RNA_CompositorNodeCrop, node, &crop_group->update_data.ptr);
+		crop_group->update_data.prop = RNA_struct_find_property(&crop_group->update_data.ptr, "relative");
+
+		WM_manipulator_target_property_def_func(
+		        mpr, "matrix",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_node_crop_prop_matrix_get,
+		            .value_set_fn = manipulator_node_crop_prop_matrix_set,
+		            .range_get_fn = NULL,
+		            .user_data = node,
+		        });
+	}
+	else {
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	BKE_image_release_ibuf(ima, ibuf, lock);
+}
+
+void NODE_WGT_backdrop_crop(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Backdrop Crop Widget";
+	wgt->idname = "NODE_WGT_backdrop_crop";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_PERSISTENT;
+
+	wgt->poll = WIDGETGROUP_node_crop_poll;
+	wgt->setup = WIDGETGROUP_node_crop_setup;
+	wgt->draw_prepare = WIDGETGROUP_node_crop_draw_prepare;
+	wgt->refresh = WIDGETGROUP_node_crop_refresh;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Sun Beams
+ * \{ */
+
+struct NodeSunBeamsWidgetGroup {
+	wmManipulator *manipulator;
+
+	struct {
+		float dims[2];
+	} state;
+};
+
+static bool WIDGETGROUP_node_sbeam_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	if ((snode->flag & SNODE_BACKDRAW) == 0) {
+		return false;
+	}
+
+	if (snode && snode->edittree && snode->edittree->type == NTREE_COMPOSIT) {
+		bNode *node = nodeGetActive(snode->edittree);
+
+		if (node && ELEM(node->type, CMP_NODE_SUNBEAMS)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static void WIDGETGROUP_node_sbeam_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct NodeSunBeamsWidgetGroup *sbeam_group = MEM_mallocN(sizeof(struct NodeSunBeamsWidgetGroup), __func__);
+
+	sbeam_group->manipulator = WM_manipulator_new("MANIPULATOR_WT_grab_3d", mgroup, NULL);
+	wmManipulator *mpr = sbeam_group->manipulator;
+
+	RNA_enum_set(mpr->ptr, "draw_style",  ED_MANIPULATOR_GRAB_STYLE_CROSS_2D);
+
+	mpr->scale_basis = 0.05f;
+
+	mgroup->customdata = sbeam_group;
+}
+
+static void WIDGETGROUP_node_sbeam_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NodeSunBeamsWidgetGroup *sbeam_group = mgroup->customdata;
+	ARegion *ar = CTX_wm_region(C);
+	wmManipulator *mpr = mgroup->manipulators.first;
+
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	node_manipulator_calc_matrix_space_with_image_dims(snode, ar, sbeam_group->state.dims, mpr->matrix_space);
+}
+
+static void WIDGETGROUP_node_sbeam_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NodeSunBeamsWidgetGroup *sbeam_group = mgroup->customdata;
+	wmManipulator *mpr = sbeam_group->manipulator;
+
+	void *lock;
+	Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
+
+	if (ibuf) {
+		sbeam_group->state.dims[0] = (ibuf->x > 0) ? ibuf->x : 64.0f;
+		sbeam_group->state.dims[1] = (ibuf->y > 0) ? ibuf->y : 64.0f;
+
+		SpaceNode *snode = CTX_wm_space_node(C);
+		bNode *node = nodeGetActive(snode->edittree);
+
+		/* need to set property here for undo. TODO would prefer to do this in _init */
+		PointerRNA nodeptr;
+		RNA_pointer_create((ID *)snode->edittree, &RNA_CompositorNodeSunBeams, node, &nodeptr);
+		WM_manipulator_target_property_def_rna(mpr, "offset", &nodeptr, "source", -1);
+
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_MODAL, true);
+	}
+	else {
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	BKE_image_release_ibuf(ima, ibuf, lock);
+}
+
+void NODE_WGT_backdrop_sun_beams(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Sun Beams Widget";
+	wgt->idname = "NODE_WGT_sbeam";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_PERSISTENT;
+
+	wgt->poll = WIDGETGROUP_node_sbeam_poll;
+	wgt->setup = WIDGETGROUP_node_sbeam_setup;
+	wgt->draw_prepare = WIDGETGROUP_node_sbeam_draw_prepare;
+	wgt->refresh = WIDGETGROUP_node_sbeam_refresh;
+}
+
+/** \} */
+
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Corner Pin
+ * \{ */
+
+struct NodeCornerPinWidgetGroup {
+	wmManipulator *manipulators[4];
+
+	struct {
+		float dims[2];
+	} state;
+};
+
+static bool WIDGETGROUP_node_corner_pin_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	if ((snode->flag & SNODE_BACKDRAW) == 0) {
+		return false;
+	}
+
+	if (snode && snode->edittree && snode->edittree->type == NTREE_COMPOSIT) {
+		bNode *node = nodeGetActive(snode->edittree);
+
+		if (node && ELEM(node->type, CMP_NODE_CORNERPIN)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static void WIDGETGROUP_node_corner_pin_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct NodeCornerPinWidgetGroup *cpin_group = MEM_mallocN(sizeof(struct NodeCornerPinWidgetGroup), __func__);
+	const wmManipulatorType *wt_grab_3d = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", false);
+
+	for (int i = 0; i < 4; i++) {
+		cpin_group->manipulators[i] = WM_manipulator_new_ptr(wt_grab_3d, mgroup, NULL);
+		wmManipulator *mpr = cpin_group->manipulators[i];
+
+		RNA_enum_set(mpr->ptr, "draw_style",  ED_MANIPULATOR_GRAB_STYLE_CROSS_2D);
+
+		mpr->scale_basis = 0.01f;
+	}
+
+	mgroup->customdata = cpin_group;
+}
+
+static void WIDGETGROUP_node_corner_pin_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NodeCornerPinWidgetGroup *cpin_group = mgroup->customdata;
+	ARegion *ar = CTX_wm_region(C);
+
+	SpaceNode *snode = CTX_wm_space_node(C);
+
+	float matrix_space[4][4];
+	node_manipulator_calc_matrix_space_with_image_dims(snode, ar, cpin_group->state.dims, matrix_space);
+
+	for (int i = 0; i < 4; i++) {
+		wmManipulator *mpr = cpin_group->manipulators[i];
+		copy_m4_m4(mpr->matrix_space, matrix_space);
+	}
+}
+
+static void WIDGETGROUP_node_corner_pin_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NodeCornerPinWidgetGroup *cpin_group = mgroup->customdata;
+
+	void *lock;
+	Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
+
+	if (ibuf) {
+		cpin_group->state.dims[0] = (ibuf->x > 0) ? ibuf->x : 64.0f;
+		cpin_group->state.dims[1] = (ibuf->y > 0) ? ibuf->y : 64.0f;
+
+		SpaceNode *snode = CTX_wm_space_node(C);
+		bNode *node = nodeGetActive(snode->edittree);
+
+		/* need to set property here for undo. TODO would prefer to do this in _init */
+		int i = 0;
+		for (bNodeSocket *sock = node->inputs.first; sock && i < 4; sock = sock->next) {
+			if (sock->type == SOCK_VECTOR) {
+				wmManipulator *mpr = cpin_group->manipulators[i++];
+
+				PointerRNA sockptr;
+				RNA_pointer_create((ID *)snode->edittree, &RNA_NodeSocket, sock, &sockptr);
+				WM_manipulator_target_property_def_rna(mpr, "offset", &sockptr, "default_value", -1);
+
+				WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_MODAL, true);
+			}
+		}
+	}
+	else {
+		for (int i = 0; i < 4; i++) {
+			wmManipulator *mpr = cpin_group->manipulators[i];
+			WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+		}
+	}
+
+	BKE_image_release_ibuf(ima, ibuf, lock);
+}
+
+void NODE_WGT_backdrop_corner_pin(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Corner Pin Widget";
+	wgt->idname = "NODE_WGT_backdrop_corner_pin";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_PERSISTENT;
+
+	wgt->poll = WIDGETGROUP_node_corner_pin_poll;
+	wgt->setup = WIDGETGROUP_node_corner_pin_setup;
+	wgt->draw_prepare = WIDGETGROUP_node_corner_pin_draw_prepare;
+	wgt->refresh = WIDGETGROUP_node_corner_pin_refresh;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index d7ded62a988..6f37c32be40 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -94,8 +94,7 @@ void node_operatortypes(void)
 
 	WM_operatortype_append(NODE_OT_insert_offset);
 
-	WM_operatortype_append(NODE_OT_read_renderlayers);
-	WM_operatortype_append(NODE_OT_read_fullsamplelayers);
+	WM_operatortype_append(NODE_OT_read_viewlayers);
 	WM_operatortype_append(NODE_OT_render_changed);
 
 	WM_operatortype_append(NODE_OT_backimage_move);
@@ -335,8 +334,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_CTRL, 0);
 	RNA_boolean_set(kmi->ptr, "exit", true);
 
-	WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_read_viewlayers", RKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_render_changed", ZKEY, KM_PRESS, 0, 0);
 
 	WM_keymap_add_item(keymap, "NODE_OT_clipboard_copy", CKEY, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index 7788c3938e1..bc9513a748d 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -448,10 +448,7 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname)
 	int compatibility = 0;
 
 	if (ntree->type == NTREE_SHADER) {
-		if (BKE_scene_use_new_shading_nodes(arg->scene))
-			compatibility = NODE_NEW_SHADING;
-		else
-			compatibility = NODE_OLD_SHADING;
+		compatibility = NODE_NEW_SHADING;
 	}
 
 	/* generate array of node types sorted by UI name */
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index c954ebad4c9..36886d0ab32 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -49,13 +49,16 @@
 #include "ED_node.h"
 #include "ED_render.h"
 #include "ED_screen.h"
-#include "WM_api.h"
-#include "WM_types.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
 #include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
 
 #include "node_intern.h"  /* own include */
 
@@ -290,7 +293,7 @@ ARegion *node_has_tools_region(ScrArea *sa)
 
 /* ******************** default callbacks for node space ***************** */
 
-static SpaceLink *node_new(const bContext *UNUSED(C))
+static SpaceLink *node_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceNode *snode;
@@ -316,7 +319,7 @@ static SpaceLink *node_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&snode->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* buttons/list view */
 	ar = MEM_callocN(sizeof(ARegion), "buttons for node");
@@ -381,12 +384,13 @@ static void node_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
 
 }
 
-static void node_area_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn)
+static void node_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                               WorkSpace *UNUSED(workspace))
 {
 	/* note, ED_area_tag_refresh will re-execute compositor */
 	SpaceNode *snode = sa->spacedata.first;
 	/* shaderfrom is only used for new shading nodes, otherwise all shaders are from objects */
-	short shader_type = BKE_scene_use_new_shading_nodes(sc->scene) ? snode->shaderfrom : SNODE_SHADER_OBJECT;
+	short shader_type = snode->shaderfrom;
 
 	/* preview renders */
 	switch (wmn->category) {
@@ -643,6 +647,14 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar)
 
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
 
+	/* manipulators stay in the background for now - quick patchjob to make sure nodes themselves work */
+	if (ar->manipulator_map == NULL) {
+		ar->manipulator_map = WM_manipulatormap_new_from_type(
+		        &(const struct wmManipulatorMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
+	}
+
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+
 	/* own keymaps */
 	keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -737,18 +749,32 @@ static void node_header_region_draw(const bContext *C, ARegion *ar)
 }
 
 /* used for header + main region */
-static void node_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void node_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
+	wmManipulatorMap *mmap = ar->manipulator_map;
+
 	/* context changes */
 	switch (wmn->category) {
 		case NC_SPACE:
-			if (wmn->data == ND_SPACE_NODE)
-				ED_region_tag_redraw(ar);
+			switch (wmn->data) {
+				case ND_SPACE_NODE:
+					ED_region_tag_redraw(ar);
+					break;
+				case ND_SPACE_NODE_VIEW:
+					WM_manipulatormap_tag_refresh(mmap);
+					break;
+			}
 			break;
 		case NC_SCREEN:
+			if (wmn->data == ND_LAYOUTSET || wmn->action == NA_EDITED) {
+				WM_manipulatormap_tag_refresh(mmap);
+			}
 			switch (wmn->data) {
 				case ND_SCREENCAST:
 				case ND_ANIMPLAY:
+				case ND_LAYER:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -758,10 +784,20 @@ static void node_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegi
 				ED_region_tag_redraw(ar);
 			break;
 		case NC_SCENE:
+			ED_region_tag_redraw(ar);
+			if (wmn->data == ND_RENDER_RESULT) {
+				WM_manipulatormap_tag_refresh(mmap);
+			}
+			break;
+		case NC_NODE:
+			ED_region_tag_redraw(ar);
+			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
+				WM_manipulatormap_tag_refresh(mmap);
+			}
+			break;
 		case NC_MATERIAL:
 		case NC_TEXTURE:
 		case NC_WORLD:
-		case NC_NODE:
 		case NC_LINESTYLE:
 			ED_region_tag_redraw(ar);
 			break;
@@ -826,6 +862,17 @@ static int node_context(const bContext *C, const char *member, bContextDataResul
 	return 0;
 }
 
+static void node_widgets(void)
+{
+	/* create the widgetmap for the area here */
+	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(
+	        &(const struct wmManipulatorMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
+	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_transform);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_crop);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_sun_beams);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_corner_pin);
+}
+
 static void node_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
 {
 	SpaceNode *snode = (SpaceNode *)slink;
@@ -897,6 +944,32 @@ static void node_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID
 	}
 }
 
+
+static int node_space_subtype_get(ScrArea *sa)
+{
+	SpaceNode *snode = sa->spacedata.first;
+	return rna_node_tree_idname_to_enum(snode->tree_idname);
+}
+
+static void node_space_subtype_set(ScrArea *sa, int value)
+{
+	SpaceNode *snode = sa->spacedata.first;
+	ED_node_set_tree_type(snode, rna_node_tree_type_from_enum(value));
+}
+
+static void node_space_subtype_item_extend(
+        bContext *C, EnumPropertyItem **item, int *totitem)
+{
+	bool free;
+	const EnumPropertyItem *item_src = RNA_enum_node_tree_types_itemf_impl(C, &free);
+	for (const EnumPropertyItem *item_iter = item_src; item_iter->identifier; item_iter++) {
+		RNA_enum_item_add(item, totitem, item_iter);
+	}
+	if (free) {
+		MEM_freeN((void *)item_src);
+	}
+}
+
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_node(void)
 {
@@ -916,7 +989,11 @@ void ED_spacetype_node(void)
 	st->refresh = node_area_refresh;
 	st->context = node_context;
 	st->dropboxes = node_dropboxes;
+	st->manipulators = node_widgets;
 	st->id_remap = node_id_remap;
+	st->space_subtype_item_extend = node_space_subtype_item_extend;
+	st->space_subtype_get = node_space_subtype_get;
+	st->space_subtype_set = node_space_subtype_set;
 
 	/* regions: main window */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype node region");
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 289d6e715e1..96d27c6fd89 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -23,6 +23,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
@@ -37,12 +38,14 @@ set(INC_SYS
 )
 
 set(SRC
+	outliner_collections.c
 	outliner_draw.c
 	outliner_edit.c
 	outliner_ops.c
 	outliner_select.c
 	outliner_tools.c
 	outliner_tree.c
+	outliner_utils.c
 	space_outliner.c
 
 	outliner_intern.h
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
new file mode 100644
index 00000000000..909938ad606
--- /dev/null
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -0,0 +1,716 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Blender Foundation, Dalai Felinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_outliner/outliner_collections.c
+ *  \ingroup spoutliner
+ */
+
+#include <string.h>
+
+#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+
+#include "DNA_group_types.h"
+#include "DNA_object_types.h"
+
+#include "BKE_context.h"
+#include "BKE_collection.h"
+#include "BKE_layer.h"
+#include "BKE_main.h"
+#include "BKE_report.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
+#include "ED_object.h"
+#include "ED_outliner.h"
+#include "ED_screen.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "UI_resources.h"
+
+#include "outliner_intern.h" /* own include */
+
+/* -------------------------------------------------------------------- */
+
+bool outliner_is_collection_tree_element(const TreeElement *te)
+{
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	if (!tselem) {
+		return false;
+	}
+
+	if (ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) {
+		return true;
+	}
+	else if (tselem->type == 0 && te->idcode == ID_GR) {
+		return true;
+	}
+
+	return false;
+}
+
+Collection *outliner_collection_from_tree_element(const TreeElement *te)
+{
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	if (!tselem) {
+		return false;
+	}
+
+	if (tselem->type == TSE_LAYER_COLLECTION) {
+		LayerCollection *lc = te->directdata;
+		return lc->collection;
+	}
+	else if (ELEM(tselem->type, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) {
+		Scene *scene = (Scene *)tselem->id;
+		return BKE_collection_master(scene);
+	}
+	else if (tselem->type == 0 && te->idcode == ID_GR) {
+		return (Collection *)tselem->id;
+	}
+
+	return NULL;
+}
+
+/* -------------------------------------------------------------------- */
+/* Poll functions. */
+
+int ED_outliner_collections_editor_poll(bContext *C)
+{
+	SpaceOops *so = CTX_wm_space_outliner(C);
+	return (so != NULL) && ELEM(so->outlinevis, SO_VIEW_LAYER, SO_SCENES, SO_LIBRARIES);
+}
+
+
+/********************************* New Collection ****************************/
+
+struct CollectionNewData
+{
+	bool error;
+	Collection *collection;
+};
+
+static TreeTraversalAction collection_find_selected_to_add(TreeElement *te, void *customdata)
+{
+	struct CollectionNewData *data = customdata;
+	Collection *collection = outliner_collection_from_tree_element(te);
+
+	if (!collection) {
+		return TRAVERSE_SKIP_CHILDS;
+	}
+
+	if (data->collection != NULL) {
+		data->error = true;
+		return TRAVERSE_BREAK;
+	}
+
+	data->collection = collection;
+	return TRAVERSE_CONTINUE;
+}
+
+static int collection_new_exec(bContext *C, wmOperator *op)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+
+	struct CollectionNewData data = {
+		.error = false,
+		.collection = NULL,
+	};
+
+	if (RNA_boolean_get(op->ptr, "nested")) {
+		outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_find_selected_to_add, &data);
+
+		if (data.error) {
+			BKE_report(op->reports, RPT_ERROR, "More than one collection is selected");
+			return OPERATOR_CANCELLED;
+		}
+	}
+
+	if (!data.collection && (soops->outlinevis == SO_VIEW_LAYER)) {
+		data.collection = BKE_collection_master(scene);
+	}
+
+	BKE_collection_add(
+	            bmain,
+	            data.collection,
+	            NULL);
+
+	outliner_cleanup_tree(soops);
+	DEG_relations_tag_update(bmain);
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_new(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "New Collection";
+	ot->idname = "OUTLINER_OT_collection_new";
+	ot->description = "Add a new collection inside selected collection";
+
+	/* api callbacks */
+	ot->exec = collection_new_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	PropertyRNA *prop = RNA_def_boolean(ot->srna, "nested", true, "Nested", "Add as child of selected collection");;
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+}
+
+/**************************** Delete Collection ******************************/
+
+struct CollectionEditData {
+	Scene *scene;
+	SpaceOops *soops;
+	GSet *collections_to_edit;
+};
+
+static TreeTraversalAction collection_find_data_to_edit(TreeElement *te, void *customdata)
+{
+	struct CollectionEditData *data = customdata;
+	Collection *collection = outliner_collection_from_tree_element(te);
+
+	if (!collection) {
+		return TRAVERSE_SKIP_CHILDS;
+	}
+
+	if (collection == BKE_collection_master(data->scene)) {
+		/* skip - showing warning/error message might be missleading
+		 * when deleting multiple collections, so just do nothing */
+	}
+	else {
+		/* Delete, duplicate and link don't edit children, those will come along
+		 * with the parents. */
+		BLI_gset_add(data->collections_to_edit, collection);
+		return TRAVERSE_SKIP_CHILDS;
+	}
+
+	return TRAVERSE_CONTINUE;
+}
+
+static int collection_delete_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	struct CollectionEditData data = {.scene = scene, .soops = soops};
+	bool hierarchy = RNA_boolean_get(op->ptr, "hierarchy");
+
+	data.collections_to_edit = BLI_gset_ptr_new(__func__);
+
+	/* We first walk over and find the Collections we actually want to delete (ignoring duplicates). */
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_find_data_to_edit, &data);
+
+	/* Effectively delete the collections. */
+	GSetIterator collections_to_edit_iter;
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		/* TODO: what if collection was child and got deleted in the meantime? */
+		Collection *collection = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+		BKE_collection_delete(bmain, collection, hierarchy);
+	}
+
+	BLI_gset_free(data.collections_to_edit, NULL);
+
+	DEG_relations_tag_update(bmain);
+
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(&scene->id, 0);
+
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_delete(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Delete Collection";
+	ot->idname = "OUTLINER_OT_collection_delete";
+	ot->description = "Delete selected collections";
+
+	/* api callbacks */
+	ot->exec = collection_delete_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	PropertyRNA *prop = RNA_def_boolean(ot->srna, "hierarchy", false, "Hierarchy", "Delete child objects and collections");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+}
+
+/****************************** Select Objects *******************************/
+
+struct CollectionObjectsSelectData {
+	bool error;
+	LayerCollection *layer_collection;
+};
+
+static TreeTraversalAction outliner_find_first_selected_layer_collection(TreeElement *te, void *customdata)
+{
+	struct CollectionObjectsSelectData *data = customdata;
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	switch (tselem->type) {
+		case TSE_LAYER_COLLECTION:
+			data->layer_collection = te->directdata;
+			return TRAVERSE_BREAK;
+		case TSE_R_LAYER:
+		case TSE_SCENE_COLLECTION_BASE:
+		case TSE_VIEW_COLLECTION_BASE:
+			return TRAVERSE_CONTINUE;
+		default:
+			return TRAVERSE_SKIP_CHILDS;
+	}
+}
+
+static LayerCollection *outliner_active_layer_collection(bContext *C)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+
+	struct CollectionObjectsSelectData data = {
+		.layer_collection = NULL,
+	};
+
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_first_selected_layer_collection, &data);
+	return data.layer_collection;
+}
+
+static int collection_objects_select_exec(bContext *C, wmOperator *op)
+{
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	LayerCollection *layer_collection = outliner_active_layer_collection(C);
+	bool deselect = STREQ(op->idname, "OUTLINER_OT_collection_objects_deselect");
+
+	if (layer_collection == NULL) {
+		return OPERATOR_CANCELLED;
+	}
+
+	BKE_layer_collection_objects_select(view_layer, layer_collection, deselect);
+	WM_main_add_notifier(NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_objects_select(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Objects";
+	ot->idname = "OUTLINER_OT_collection_objects_select";
+	ot->description = "Select objects in collection";
+
+	/* api callbacks */
+	ot->exec = collection_objects_select_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+void OUTLINER_OT_collection_objects_deselect(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Deselect Objects";
+	ot->idname = "OUTLINER_OT_collection_objects_deselect";
+	ot->description = "Deselect objects in collection";
+
+	/* api callbacks */
+	ot->exec = collection_objects_select_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/************************** Duplicate Collection *****************************/
+
+struct CollectionDuplicateData {
+	TreeElement *te;
+};
+
+static TreeTraversalAction outliner_find_first_selected_collection(TreeElement *te, void *customdata)
+{
+	struct CollectionDuplicateData *data = customdata;
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	switch (tselem->type) {
+		case TSE_LAYER_COLLECTION:
+			data->te = te;
+			return TRAVERSE_BREAK;
+		case TSE_R_LAYER:
+		case TSE_SCENE_COLLECTION_BASE:
+		case TSE_VIEW_COLLECTION_BASE:
+		default:
+			return TRAVERSE_CONTINUE;
+	}
+}
+
+static TreeElement *outliner_active_collection(bContext *C)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+
+	struct CollectionDuplicateData data = {
+		.te = NULL,
+	};
+
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_first_selected_collection, &data);
+	return data.te;
+}
+
+static int collection_duplicate_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te = outliner_active_collection(C);
+	BLI_assert(te != NULL);
+
+	Collection *collection = outliner_collection_from_tree_element(te);
+	Collection *parent = (te->parent) ? outliner_collection_from_tree_element(te->parent) : NULL;
+
+	if (collection->flag & COLLECTION_IS_MASTER) {
+		BKE_report(op->reports, RPT_ERROR, "Can't duplicate the master collection");
+		return OPERATOR_CANCELLED;
+	}
+
+	switch (soops->outlinevis) {
+		case SO_SCENES:
+		case SO_VIEW_LAYER:
+		case SO_LIBRARIES:
+			BKE_collection_copy(bmain, parent, collection);
+			break;
+	}
+
+	DEG_relations_tag_update(bmain);
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, CTX_data_scene(C));
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_duplicate(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Duplicate Collection";
+	ot->idname = "OUTLINER_OT_collection_duplicate";
+	ot->description = "Duplicate selected collections";
+
+	/* api callbacks */
+	ot->exec = collection_duplicate_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/**************************** Link Collection ******************************/
+
+static int collection_link_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	Collection *active_collection = CTX_data_layer_collection(C)->collection;
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	struct CollectionEditData data = {.scene = scene, .soops = soops};
+
+	data.collections_to_edit = BLI_gset_ptr_new(__func__);
+
+	/* We first walk over and find the Collections we actually want to link (ignoring duplicates). */
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_find_data_to_edit, &data);
+
+	/* Effectively link the collections. */
+	GSetIterator collections_to_edit_iter;
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		Collection *collection = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+		BKE_collection_child_add(bmain, active_collection, collection);
+		id_fake_user_clear(&collection->id);
+	}
+
+	BLI_gset_free(data.collections_to_edit, NULL);
+
+	DEG_relations_tag_update(bmain);
+
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(&scene->id, 0);
+
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_link(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Link Collection";
+	ot->idname = "OUTLINER_OT_collection_link";
+	ot->description = "Link selected collections to active scene";
+
+	/* api callbacks */
+	ot->exec = collection_link_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/************************** Instance Collection ******************************/
+
+static int collection_instance_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	struct CollectionEditData data = {.scene = scene, .soops = soops};
+
+	data.collections_to_edit = BLI_gset_ptr_new(__func__);
+
+	/* We first walk over and find the Collections we actually want to instance (ignoring duplicates). */
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_find_data_to_edit, &data);
+
+	/* Find an active collection to add to, that doesn't give dependency cycles. */
+	LayerCollection *active_lc = BKE_layer_collection_get_active(view_layer);
+
+	GSetIterator collections_to_edit_iter;
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		Collection *collection = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+
+		while (BKE_collection_find_cycle(active_lc->collection, collection)) {
+			active_lc = BKE_layer_collection_activate_parent(view_layer, active_lc);
+		}
+	}
+
+	/* Effectively instance the collections. */
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		Collection *collection = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+		Object *ob = ED_object_add_type(C, OB_EMPTY, collection->id.name + 2, scene->cursor.location, NULL, false, scene->layact);
+		ob->dup_group = collection;
+		ob->transflag |= OB_DUPLICOLLECTION;
+		id_lib_extern(&collection->id);
+	}
+
+	BLI_gset_free(data.collections_to_edit, NULL);
+
+	DEG_relations_tag_update(bmain);
+
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(&scene->id, 0);
+
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_instance(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Instance Collection";
+	ot->idname = "OUTLINER_OT_collection_instance";
+	ot->description = "Instance selected collections to active scene";
+
+	/* api callbacks */
+	ot->exec = collection_instance_exec;
+	ot->poll = ED_outliner_collections_editor_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/************************** Exclude Collection ******************************/
+
+static TreeTraversalAction layer_collection_find_data_to_edit(TreeElement *te, void *customdata)
+{
+	struct CollectionEditData *data = customdata;
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	if (!(tselem && tselem->type == TSE_LAYER_COLLECTION)) {
+		return TRAVERSE_CONTINUE;
+	}
+
+	LayerCollection *lc = te->directdata;
+
+	if (lc->collection->flag & COLLECTION_IS_MASTER) {
+		/* skip - showing warning/error message might be missleading
+		 * when deleting multiple collections, so just do nothing */
+	}
+	else {
+		/* Delete, duplicate and link don't edit children, those will come along
+		 * with the parents. */
+		BLI_gset_add(data->collections_to_edit, lc);
+	}
+
+	return TRAVERSE_CONTINUE;
+}
+
+static int collections_view_layer_poll(bContext *C, bool include)
+{
+	/* Poll function so the right click menu show current state of selected collections. */
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	if (!(soops && soops->outlinevis == SO_VIEW_LAYER)) {
+		return false;
+	}
+
+	Scene *scene = CTX_data_scene(C);
+	struct CollectionEditData data = {.scene = scene, .soops = soops};
+	data.collections_to_edit = BLI_gset_ptr_new(__func__);
+	bool result = false;
+
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, layer_collection_find_data_to_edit, &data);
+
+	GSetIterator collections_to_edit_iter;
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		LayerCollection *lc = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+
+		if (include && (lc->flag & LAYER_COLLECTION_EXCLUDE)) {
+			result = true;
+		}
+		else if (!include && !(lc->flag & LAYER_COLLECTION_EXCLUDE)) {
+			result = true;
+		}
+	}
+
+	BLI_gset_free(data.collections_to_edit, NULL);
+	return result;
+}
+
+static int collections_exclude_poll(bContext *C)
+{
+	return collections_view_layer_poll(C, false);
+}
+
+static int collections_include_poll(bContext *C)
+{
+	return collections_view_layer_poll(C, true);
+}
+
+static void layer_collection_exclude_recursive_set(LayerCollection *lc)
+{
+	for (LayerCollection *nlc = lc->layer_collections.first; nlc; nlc = nlc->next) {
+		if (lc->flag & LAYER_COLLECTION_EXCLUDE) {
+			nlc->flag |= LAYER_COLLECTION_EXCLUDE;
+		}
+		else {
+			nlc->flag &= ~LAYER_COLLECTION_EXCLUDE;
+		}
+
+		layer_collection_exclude_recursive_set(nlc);
+	}
+}
+
+static int collection_view_layer_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	struct CollectionEditData data = {.scene = scene, .soops = soops};
+	bool include = STREQ(op->idname, "OUTLINER_OT_collection_include_set");
+
+	data.collections_to_edit = BLI_gset_ptr_new(__func__);
+
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, layer_collection_find_data_to_edit, &data);
+
+	GSetIterator collections_to_edit_iter;
+	GSET_ITER(collections_to_edit_iter, data.collections_to_edit) {
+		LayerCollection *lc = BLI_gsetIterator_getKey(&collections_to_edit_iter);
+
+		if (!(lc->collection->flag & COLLECTION_IS_MASTER)) {
+			if (include) {
+				lc->flag &= ~LAYER_COLLECTION_EXCLUDE;
+			}
+			else {
+				lc->flag |= LAYER_COLLECTION_EXCLUDE;
+			}
+
+			layer_collection_exclude_recursive_set(lc);
+		}
+	}
+
+	BLI_gset_free(data.collections_to_edit, NULL);
+
+	BKE_layer_collection_sync(scene, view_layer);
+	DEG_relations_tag_update(bmain);
+
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OUTLINER_OT_collection_exclude_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Exclude from View Layer";
+	ot->idname = "OUTLINER_OT_collection_exclude_set";
+	ot->description = "Exclude collection from the active view layer";
+
+	/* api callbacks */
+	ot->exec = collection_view_layer_exec;
+	ot->poll = collections_exclude_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+void OUTLINER_OT_collection_include_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Include in View Layer";
+	ot->idname = "OUTLINER_OT_collection_include_set";
+	ot->description = "Include collection in the active view layer";
+
+	/* api callbacks */
+	ot->exec = collection_view_layer_exec;
+	ot->poll = collections_include_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/**
+ * Populates the \param objects ListBase with all the outliner selected objects
+ * We store it as (Object *)LinkData->data
+ * \param objects expected to be empty
+ */
+void ED_outliner_selected_objects_get(const bContext *C, ListBase *objects)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	struct ObjectsSelectedData data = {{NULL}};
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_selected_objects, &data);
+	LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) {
+		TreeElement *ten_selected = (TreeElement *)link->data;
+		Object *ob = (Object *)TREESTORE(ten_selected)->id;
+		BLI_addtail(objects, BLI_genericNodeN(ob));
+	}
+	BLI_freelistN(&data.objects_selected_array);
+}
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 0ea69164034..57fa9353e68 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -34,6 +34,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
@@ -48,9 +49,9 @@
 
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
@@ -58,6 +59,9 @@
 #include "BKE_scene.h"
 #include "BKE_object.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_object.h"
@@ -66,8 +70,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_immediate.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
@@ -135,6 +138,20 @@ static void outliner_rna_width(SpaceOops *soops, ListBase *lb, int *w, int start
 	}
 }
 
+/**
+ * The active object is only needed for reference.
+ */
+static bool is_object_data_in_editmode(const ID *id, const Object *obact)
+{
+	const short id_type = GS(id->name);
+	return (
+	        (obact && (obact->mode & OB_MODE_EDIT)) &&
+	        (id && OB_DATA_SUPPORT_EDITMODE(id_type)) &&
+	        (GS(((ID *)obact->data)->name) == id_type) &&
+	        BKE_object_data_is_in_editmode(id)
+	);
+}
+
 /* ****************************************************** */
 
 static void restrictbutton_recursive_ebone(bContext *C, EditBone *ebone_parent, int flag, bool set_flag)
@@ -172,116 +189,6 @@ static void restrictbutton_recursive_bone(Bone *bone_parent, int flag, bool set_
 
 }
 
-static void restrictbutton_recursive_child(bContext *C, Scene *scene, Object *ob_parent, char flag,
-                                           bool state, bool deselect, const char *rnapropname)
-{
-	Main *bmain = CTX_data_main(C);
-	Object *ob;
-
-	for (ob = bmain->object.first; ob; ob = ob->id.next) {
-		if (BKE_object_is_child_recursive(ob_parent, ob)) {
-			/* only do if child object is selectable */
-			if ((flag == OB_RESTRICT_SELECT) || (ob->restrictflag & OB_RESTRICT_SELECT) == 0) {
-				if (state) {
-					ob->restrictflag |= flag;
-					if (deselect) {
-						ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
-					}
-				}
-				else {
-					ob->restrictflag &= ~flag;
-				}
-			}
-
-			if (rnapropname) {
-				PointerRNA ptr;
-				PropertyRNA *prop;
-				ID *id;
-				bAction *action;
-				FCurve *fcu;
-				bool driven, special;
-
-				RNA_id_pointer_create(&ob->id, &ptr);
-				prop = RNA_struct_find_property(&ptr, rnapropname);
-				fcu = rna_get_fcurve_context_ui(C, &ptr, prop, 0, NULL, &action, &driven, &special);
-
-				if (fcu && !driven) {
-					id = ptr.id.data;
-					if (autokeyframe_cfra_can_key(scene, id)) {
-						ReportList *reports = CTX_wm_reports(C);
-						ToolSettings *ts = scene->toolsettings;
-						eInsertKeyFlags key_flag = ANIM_get_keyframing_flags(scene, 1);
-
-						fcu->flag &= ~FCURVE_SELECTED;
-						insert_keyframe(reports, id, action, ((fcu->grp) ? (fcu->grp->name) : (NULL)),
-						                fcu->rna_path, fcu->array_index, CFRA, ts->keyframe_type, key_flag);
-						/* Assuming this is not necessary here, since 'ancestor' object button will do it anyway. */
-						/* WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); */
-					}
-				}
-			}
-		}
-	}
-}
-
-static void restrictbutton_view_cb(bContext *C, void *poin, void *poin2)
-{
-	Scene *scene = (Scene *)poin;
-	Object *ob = (Object *)poin2;
-
-	if (!common_restrict_check(C, ob)) return;
-
-	/* deselect objects that are invisible */
-	if (ob->restrictflag & OB_RESTRICT_VIEW) {
-		/* Ouch! There is no backwards pointer from Object to Base,
-		 * so have to do loop to find it. */
-		ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
-	}
-
-	if (CTX_wm_window(C)->eventstate->ctrl) {
-		restrictbutton_recursive_child(C, scene, ob, OB_RESTRICT_VIEW,
-		                               (ob->restrictflag & OB_RESTRICT_VIEW) != 0, true, "hide");
-	}
-
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-
-}
-
-static void restrictbutton_sel_cb(bContext *C, void *poin, void *poin2)
-{
-	Scene *scene = (Scene *)poin;
-	Object *ob = (Object *)poin2;
-
-	if (!common_restrict_check(C, ob)) return;
-
-	/* if select restriction has just been turned on */
-	if (ob->restrictflag & OB_RESTRICT_SELECT) {
-		/* Ouch! There is no backwards pointer from Object to Base,
-		 * so have to do loop to find it. */
-		ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
-	}
-
-	if (CTX_wm_window(C)->eventstate->ctrl) {
-		restrictbutton_recursive_child(C, scene, ob, OB_RESTRICT_SELECT,
-		                               (ob->restrictflag & OB_RESTRICT_SELECT) != 0, true, NULL);
-	}
-
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-
-}
-
-static void restrictbutton_rend_cb(bContext *C, void *poin, void *poin2)
-{
-	Object *ob = (Object *)poin2;
-
-	if (CTX_wm_window(C)->eventstate->ctrl) {
-		restrictbutton_recursive_child(C, (Scene *)poin, ob, OB_RESTRICT_RENDER,
-		                               (ob->restrictflag & OB_RESTRICT_RENDER) != 0, false, "hide_render");
-	}
-
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_RENDER, poin);
-}
-
 static void restrictbutton_r_lay_cb(bContext *C, void *poin, void *UNUSED(poin2))
 {
 	WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, poin);
@@ -291,7 +198,7 @@ static void restrictbutton_modifier_cb(bContext *C, void *UNUSED(poin), void *po
 {
 	Object *ob = (Object *)poin2;
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 }
 
@@ -355,98 +262,6 @@ static void restrictbutton_gp_layer_flag_cb(bContext *C, void *UNUSED(poin), voi
 	WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 }
 
-static int group_restrict_flag(Group *gr, int flag)
-{
-	GroupObject *gob;
-
-#ifdef USE_GROUP_SELECT
-	for (gob = gr->gobject.first; gob; gob = gob->next) {
-		if ((gob->ob->restrictflag & flag) == 0)
-			return 0;
-	}
-	return 1;
-#else
-	/* weak but fast */
-	if ((gob = gr->gobject.first))
-		if ((gob->ob->restrictflag & flag) == 0)
-			return 0;
-	return 1;
-#endif
-}
-
-static int group_select_flag(Group *gr)
-{
-	GroupObject *gob;
-
-#ifdef USE_GROUP_SELECT
-	for (gob = gr->gobject.first; gob; gob = gob->next)
-		if ((gob->ob->flag & SELECT))
-			return 1;
-
-	return 0;
-#else
-	/* weak but fast */
-	if ((gob = gr->gobject.first))
-		if (gob->ob->flag & SELECT)
-			return 1;
-	return 0;
-#endif
-}
-
-void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
-{
-	Scene *scene = (Scene *)poin;
-	GroupObject *gob;
-	Group *gr = (Group *)poin2;
-
-	if (group_restrict_flag(gr, flag)) {
-		for (gob = gr->gobject.first; gob; gob = gob->next) {
-			if (ID_IS_LINKED(gob->ob))
-				continue;
-
-			gob->ob->restrictflag &= ~flag;
-
-			if (flag == OB_RESTRICT_VIEW)
-				if (gob->ob->flag & SELECT)
-					ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_DESELECT);
-		}
-	}
-	else {
-		for (gob = gr->gobject.first; gob; gob = gob->next) {
-			if (ID_IS_LINKED(gob->ob))
-				continue;
-
-			/* not in editmode */
-			if (scene->obedit != gob->ob) {
-				gob->ob->restrictflag |= flag;
-
-				if (ELEM(flag, OB_RESTRICT_SELECT, OB_RESTRICT_VIEW)) {
-					if ((gob->ob->flag & SELECT)) {
-						ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_DESELECT);
-					}
-				}
-			}
-		}
-	}
-}
-
-static void restrictbutton_gr_restrict_view(bContext *C, void *poin, void *poin2)
-{
-	restrictbutton_gr_restrict_flag(poin, poin2, OB_RESTRICT_VIEW);
-	WM_event_add_notifier(C, NC_GROUP, NULL);
-	DAG_id_type_tag(CTX_data_main(C), ID_OB);
-}
-static void restrictbutton_gr_restrict_select(bContext *C, void *poin, void *poin2)
-{
-	restrictbutton_gr_restrict_flag(poin, poin2, OB_RESTRICT_SELECT);
-	WM_event_add_notifier(C, NC_GROUP, NULL);
-}
-static void restrictbutton_gr_restrict_render(bContext *C, void *poin, void *poin2)
-{
-	restrictbutton_gr_restrict_flag(poin, poin2, OB_RESTRICT_RENDER);
-	WM_event_add_notifier(C, NC_GROUP, NULL);
-}
-
 static void restrictbutton_id_user_toggle(bContext *UNUSED(C), void *poin, void *UNUSED(poin2))
 {
 	ID *id = (ID *)poin;
@@ -461,12 +276,10 @@ static void restrictbutton_id_user_toggle(bContext *UNUSED(C), void *poin, void
 	}
 }
 
-
 static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 {
 	Main *bmain = CTX_data_main(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BLI_mempool *ts = soops->treestore;
 	TreeStoreElem *tselem = tsep;
@@ -528,37 +341,39 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 						BLI_strncpy(newname, ebone->name, sizeof(ebone->name));
 						BLI_strncpy(ebone->name, oldname, sizeof(ebone->name));
 						ED_armature_bone_rename(obedit->data, oldname, newname);
-						WM_event_add_notifier(C, NC_OBJECT | ND_POSE, OBACT);
+						WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 					}
 					break;
 				}
 
 				case TSE_BONE:
 				{
+					ViewLayer *view_layer = CTX_data_view_layer(C);
+					Scene *scene = CTX_data_scene(C);
+					bArmature *arm = (bArmature *)tselem->id;
 					Bone *bone = te->directdata;
-					Object *ob;
 					char newname[sizeof(bone->name)];
 
 					/* always make current object active */
-					tree_element_active(C, scene, soops, te, OL_SETSEL_NORMAL, true);
-					ob = OBACT;
+					tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NORMAL, true);
 
 					/* restore bone name */
 					BLI_strncpy(newname, bone->name, sizeof(bone->name));
 					BLI_strncpy(bone->name, oldname, sizeof(bone->name));
-					ED_armature_bone_rename(ob->data, oldname, newname);
-					WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+					ED_armature_bone_rename(arm, oldname, newname);
+					WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 					break;
 				}
 				case TSE_POSE_CHANNEL:
 				{
+					Scene *scene = CTX_data_scene(C);
+					ViewLayer *view_layer = CTX_data_view_layer(C);
+					Object *ob = (Object *)tselem->id;
 					bPoseChannel *pchan = te->directdata;
-					Object *ob;
 					char newname[sizeof(pchan->name)];
 
 					/* always make current pose-bone active */
-					tree_element_active(C, scene, soops, te, OL_SETSEL_NORMAL, true);
-					ob = OBACT;
+					tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NORMAL, true);
 
 					BLI_assert(ob->type == OB_ARMATURE);
 
@@ -566,7 +381,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 					BLI_strncpy(newname, pchan->name, sizeof(pchan->name));
 					BLI_strncpy(pchan->name, oldname, sizeof(pchan->name));
 					ED_armature_bone_rename(ob->data, oldname, newname);
-					WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
+					WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 					break;
 				}
 				case TSE_POSEGRP:
@@ -591,7 +406,26 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 					break;
 				}
 				case TSE_R_LAYER:
+				{
+					Scene *scene = (Scene *)tselem->id;
+					ViewLayer *view_layer = te->directdata;
+
+					/* Restore old name. */
+					char newname[sizeof(view_layer->name)];
+					BLI_strncpy(newname, view_layer->name, sizeof(view_layer->name));
+					BLI_strncpy(view_layer->name, oldname, sizeof(view_layer->name));
+
+					/* Rename, preserving animation and compositing data. */
+					BKE_view_layer_rename(bmain, scene, view_layer, newname);
+					WM_event_add_notifier(C, NC_ID | NA_RENAME, NULL);
+					break;
+				}
+				case TSE_LAYER_COLLECTION:
+				{
+					BLI_libblock_ensure_unique_name(bmain, tselem->id->name);
+					WM_event_add_notifier(C, NC_ID | NA_RENAME, NULL);
 					break;
+				}
 			}
 		}
 		tselem->flag &= ~TSE_TEXTBUT;
@@ -604,121 +438,33 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 	TreeElement *te;
 	TreeStoreElem *tselem;
 	Object *ob = NULL;
-	Group  *gr = NULL;
-
-	PropertyRNA *object_prop_hide, *object_prop_hide_select, *object_prop_hide_render;
-
-	/* get RNA properties (once) */
-	object_prop_hide = RNA_struct_type_find_property(&RNA_Object, "hide");
-	object_prop_hide_select = RNA_struct_type_find_property(&RNA_Object, "hide_select");
-	object_prop_hide_render = RNA_struct_type_find_property(&RNA_Object, "hide_render");
-	BLI_assert(object_prop_hide && object_prop_hide_select  && object_prop_hide_render);
 
+	/* get RNA properties (once for speed) */
+	PropertyRNA *collection_prop_hide_viewport;
+	PropertyRNA *collection_prop_hide_select;
+	PropertyRNA *collection_prop_hide_render;
+	collection_prop_hide_select = RNA_struct_type_find_property(&RNA_Collection, "hide_select");
+	collection_prop_hide_viewport = RNA_struct_type_find_property(&RNA_Collection, "hide_viewport");
+	collection_prop_hide_render = RNA_struct_type_find_property(&RNA_Collection, "hide_render");
+	BLI_assert(collection_prop_hide_viewport &&
+	           collection_prop_hide_select &&
+	           collection_prop_hide_render);
 
 	for (te = lb->first; te; te = te->next) {
 		tselem = TREESTORE(te);
 		if (te->ys + 2 * UI_UNIT_Y >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) {
-			/* objects have toggle-able restriction flags */
-			if (tselem->type == 0 && te->idcode == ID_OB) {
-				PointerRNA ptr;
-
-				ob = (Object *)tselem->id;
-				RNA_pointer_create((ID *)ob, &RNA_Object, ob, &ptr);
-
-				UI_block_emboss_set(block, UI_EMBOSS_NONE);
-				bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_VIEW_OFF,
-				                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                        &ptr, object_prop_hide, -1, 0, 0, -1, -1,
-				                        TIP_("Restrict viewport visibility (Ctrl - Recursive)"));
-				UI_but_func_set(bt, restrictbutton_view_cb, scene, ob);
-				UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
-
-				bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_SELECT_OFF,
-				                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                        &ptr, object_prop_hide_select, -1, 0, 0, -1, -1,
-				                        TIP_("Restrict viewport selection (Ctrl - Recursive)"));
-				UI_but_func_set(bt, restrictbutton_sel_cb, scene, ob);
-				UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
-
-				bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_RENDER_OFF,
-				                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                        &ptr, object_prop_hide_render, -1, 0, 0, -1, -1,
-				                        TIP_("Restrict rendering (Ctrl - Recursive)"));
-				UI_but_func_set(bt, restrictbutton_rend_cb, scene, ob);
-				UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
-
-				UI_block_emboss_set(block, UI_EMBOSS);
-
-			}
-			if (tselem->type == 0 && te->idcode == ID_GR) {
-				int restrict_bool;
-				int but_flag = UI_BUT_DRAG_LOCK;
-				gr = (Group *)tselem->id;
-
-				if (ID_IS_LINKED(gr))
-					but_flag |= UI_BUT_DISABLED;
-
-				UI_block_emboss_set(block, UI_EMBOSS_NONE);
-
-				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_VIEW);
-				bt = uiDefIconBut(block, UI_BTYPE_ICON_TOGGLE, 0, restrict_bool ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF,
-				                  (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                  NULL, 0, 0, 0, 0, TIP_("Restrict/Allow visibility in the 3D View"));
-				UI_but_func_set(bt, restrictbutton_gr_restrict_view, scene, gr);
-				UI_but_flag_enable(bt, but_flag);
-
-				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_SELECT);
-				bt = uiDefIconBut(block, UI_BTYPE_ICON_TOGGLE, 0, restrict_bool ? ICON_RESTRICT_SELECT_ON : ICON_RESTRICT_SELECT_OFF,
-				                  (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                  NULL, 0, 0, 0, 0, TIP_("Restrict/Allow selection in the 3D View"));
-				UI_but_func_set(bt, restrictbutton_gr_restrict_select, scene, gr);
-				UI_but_flag_enable(bt, but_flag);
-
-				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_RENDER);
-				bt = uiDefIconBut(block, UI_BTYPE_ICON_TOGGLE, 0, restrict_bool ? ICON_RESTRICT_RENDER_ON : ICON_RESTRICT_RENDER_OFF,
-				                  (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X, UI_UNIT_Y,
-				                  NULL, 0, 0, 0, 0, TIP_("Restrict/Allow renderability"));
-				UI_but_func_set(bt, restrictbutton_gr_restrict_render, scene, gr);
-				UI_but_flag_enable(bt, but_flag);
-
-				UI_block_emboss_set(block, UI_EMBOSS);
-			}
-			/* scene render layers and passes have toggle-able flags too! */
-			else if (tselem->type == TSE_R_LAYER) {
-				UI_block_emboss_set(block, UI_EMBOSS_NONE);
-
-				bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE_N, SCE_LAY_DISABLE, 0, ICON_CHECKBOX_HLT - 1,
-				                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X,
-				                      UI_UNIT_Y, te->directdata, 0, 0, 0, 0, TIP_("Render this RenderLayer"));
-				UI_but_func_set(bt, restrictbutton_r_lay_cb, tselem->id, NULL);
-				UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
-
-				UI_block_emboss_set(block, UI_EMBOSS);
-			}
-			else if (tselem->type == TSE_R_PASS) {
-				int *layflag = te->directdata;
-				int passflag = 1 << tselem->nr;
+			if (tselem->type == TSE_R_LAYER && (soops->outlinevis == SO_SCENES)) {
+				/* View layer render toggle. */
+				ViewLayer *view_layer = te->directdata;
 
 				UI_block_emboss_set(block, UI_EMBOSS_NONE);
 
-
-				bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE, passflag, 0, ICON_CHECKBOX_HLT - 1,
-				                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X,
-				                      UI_UNIT_Y, layflag, 0, 0, 0, 0, TIP_("Render this Pass"));
+				bt = uiDefIconButBitS(block, UI_BTYPE_ICON_TOGGLE_N, VIEW_LAYER_RENDER, 0, ICON_RESTRICT_RENDER_OFF,
+				                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X,
+				                      UI_UNIT_Y, &view_layer->flag, 0, 0, 0, 0, TIP_("Use view layer for rendering"));
 				UI_but_func_set(bt, restrictbutton_r_lay_cb, tselem->id, NULL);
 				UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
 
-				layflag++;  /* is lay_xor */
-				if (ELEM(passflag, SCE_PASS_SPEC, SCE_PASS_SHADOW, SCE_PASS_AO, SCE_PASS_REFLECT, SCE_PASS_REFRACT,
-				          SCE_PASS_INDIRECT, SCE_PASS_EMIT, SCE_PASS_ENVIRONMENT))
-				{
-					bt = uiDefIconButBitI(block, UI_BTYPE_TOGGLE, passflag, 0, (*layflag & passflag) ? ICON_DOT : ICON_BLANK1,
-					                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X,
-					                      UI_UNIT_Y, layflag, 0, 0, 0, 0, TIP_("Exclude this Pass from Combined"));
-					UI_but_func_set(bt, restrictbutton_r_lay_cb, tselem->id, NULL);
-					UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
-				}
-
 				UI_block_emboss_set(block, UI_EMBOSS);
 			}
 			else if (tselem->type == TSE_MODIFIER) {
@@ -806,6 +552,36 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 
 				UI_block_emboss_set(block, UI_EMBOSS);
 			}
+			else if (outliner_is_collection_tree_element(te)) {
+				LayerCollection *lc = (tselem->type == TSE_LAYER_COLLECTION) ? te->directdata : NULL;
+				Collection *collection = outliner_collection_from_tree_element(te);
+
+				UI_block_emboss_set(block, UI_EMBOSS_NONE);
+
+				if ((!lc || !(lc->flag & LAYER_COLLECTION_EXCLUDE)) &&
+				    !(collection->flag & COLLECTION_IS_MASTER))
+				{
+					PointerRNA collection_ptr;
+					RNA_id_pointer_create(&collection->id, &collection_ptr);
+
+					bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_VIEW_OFF,
+					                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X,
+					                        UI_UNIT_Y, &collection_ptr, collection_prop_hide_viewport, -1, 0, 0, 0, 0, NULL);
+					UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
+
+					bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_RENDER_OFF,
+					                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X,
+					                        UI_UNIT_Y, &collection_ptr, collection_prop_hide_render, -1, 0, 0, 0, 0, NULL);
+					UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
+
+					bt = uiDefIconButR_prop(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_RESTRICT_SELECT_OFF,
+					                        (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X,
+					                        UI_UNIT_Y, &collection_ptr, collection_prop_hide_select, -1, 0, 0, 0, 0, NULL);
+					UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
+				}
+
+				UI_block_emboss_set(block, UI_EMBOSS);
+			}
 		}
 
 		if (TSELEM_OPEN(tselem, soops)) outliner_draw_restrictbuts(block, scene, ar, soops, &te->subtree);
@@ -879,18 +655,23 @@ static void outliner_draw_rnacols(ARegion *ar, int sizex)
 	float miny = v2d->cur.ymin;
 	if (miny < v2d->tot.ymin) miny = v2d->tot.ymin;
 
-	UI_ThemeColorShadeAlpha(TH_BACK, -15, -200);
+	glLineWidth(1.0f);
 
-	/* draw column separator lines */
-	fdrawline((float)sizex,
-	          v2d->cur.ymax,
-	          (float)sizex,
-	          miny);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShadeAlpha(TH_BACK, -15, -200);
 
-	fdrawline((float)sizex + OL_RNA_COL_SIZEX,
-	          v2d->cur.ymax,
-	          (float)sizex + OL_RNA_COL_SIZEX,
-	          miny);
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, sizex, v2d->cur.ymax);
+	immVertex2f(pos, sizex, miny);
+
+	immVertex2f(pos, sizex + OL_RNA_COL_SIZEX, v2d->cur.ymax);
+	immVertex2f(pos, sizex + OL_RNA_COL_SIZEX, miny);
+
+	immEnd();
+
+	immUnbindProgram();
 }
 
 static void outliner_draw_rnabuts(uiBlock *block, ARegion *ar, SpaceOops *soops, int sizex, ListBase *lb)
@@ -988,7 +769,7 @@ static void tselem_draw_icon_uibut(struct DrawIconArg *arg, int icon)
 	/* restrict column clip... it has been coded by simply overdrawing, doesnt work for buttons */
 	if (arg->x >= arg->xmax) {
 		glEnable(GL_BLEND);
-		UI_icon_draw_aspect(arg->x, arg->y, icon, 1.0f / UI_DPI_FAC, arg->alpha);
+		UI_icon_draw_alpha(arg->x, arg->y, icon, arg->alpha);
 		glDisable(GL_BLEND);
 	}
 	else {
@@ -1056,184 +837,261 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 	arg.x = x;
 	arg.y = y;
 
+#define ICON_DRAW(_icon) UI_icon_draw_alpha(x, y, _icon, alpha)
+
 	if (tselem->type) {
 		switch (tselem->type) {
 			case TSE_ANIM_DATA:
-				UI_icon_draw(x, y, ICON_ANIM_DATA); break; // xxx
+				ICON_DRAW(ICON_ANIM_DATA); /* XXX */
+				break;
 			case TSE_NLA:
-				UI_icon_draw(x, y, ICON_NLA); break;
+				ICON_DRAW(ICON_NLA);
+				break;
 			case TSE_NLA_TRACK:
-				UI_icon_draw(x, y, ICON_NLA); break; // XXX
+				ICON_DRAW(ICON_NLA); /* XXX */
+				break;
 			case TSE_NLA_ACTION:
-				UI_icon_draw(x, y, ICON_ACTION); break;
+				ICON_DRAW(ICON_ACTION);
+				break;
 			case TSE_DRIVER_BASE:
-				UI_icon_draw(x, y, ICON_DRIVER); break;
+				ICON_DRAW(ICON_DRIVER);
+				break;
 			case TSE_DEFGROUP_BASE:
-				UI_icon_draw(x, y, ICON_GROUP_VERTEX); break;
+				ICON_DRAW(ICON_GROUP_VERTEX);
+				break;
 			case TSE_BONE:
 			case TSE_EBONE:
-				UI_icon_draw(x, y, ICON_BONE_DATA); break;
+				ICON_DRAW(ICON_BONE_DATA);
+				break;
 			case TSE_CONSTRAINT_BASE:
-				UI_icon_draw(x, y, ICON_CONSTRAINT); break;
+				ICON_DRAW(ICON_CONSTRAINT);
+				break;
 			case TSE_MODIFIER_BASE:
-				UI_icon_draw(x, y, ICON_MODIFIER); break;
+				ICON_DRAW(ICON_MODIFIER);
+				break;
 			case TSE_LINKED_OB:
-				UI_icon_draw(x, y, ICON_OBJECT_DATA); break;
+				ICON_DRAW(ICON_OBJECT_DATA);
+				break;
 			case TSE_LINKED_PSYS:
-				UI_icon_draw(x, y, ICON_PARTICLES); break;
+				ICON_DRAW(ICON_PARTICLES);
+				break;
 			case TSE_MODIFIER:
 			{
 				Object *ob = (Object *)tselem->id;
 				ModifierData *md = BLI_findlink(&ob->modifiers, tselem->nr);
 				switch ((ModifierType)md->type) {
 					case eModifierType_Subsurf:
-						UI_icon_draw(x, y, ICON_MOD_SUBSURF); break;
+						ICON_DRAW(ICON_MOD_SUBSURF);
+						break;
 					case eModifierType_Armature:
-						UI_icon_draw(x, y, ICON_MOD_ARMATURE); break;
+						ICON_DRAW(ICON_MOD_ARMATURE);
+						break;
 					case eModifierType_Lattice:
-						UI_icon_draw(x, y, ICON_MOD_LATTICE); break;
+						ICON_DRAW(ICON_MOD_LATTICE);
+						break;
 					case eModifierType_Curve:
-						UI_icon_draw(x, y, ICON_MOD_CURVE); break;
+						ICON_DRAW(ICON_MOD_CURVE);
+						break;
 					case eModifierType_Build:
-						UI_icon_draw(x, y, ICON_MOD_BUILD); break;
+						ICON_DRAW(ICON_MOD_BUILD);
+						break;
 					case eModifierType_Mirror:
-						UI_icon_draw(x, y, ICON_MOD_MIRROR); break;
+						ICON_DRAW(ICON_MOD_MIRROR);
+						break;
 					case eModifierType_Decimate:
-						UI_icon_draw(x, y, ICON_MOD_DECIM); break;
+						ICON_DRAW(ICON_MOD_DECIM);
+						break;
 					case eModifierType_Wave:
-						UI_icon_draw(x, y, ICON_MOD_WAVE); break;
+						ICON_DRAW(ICON_MOD_WAVE);
+						break;
 					case eModifierType_Hook:
-						UI_icon_draw(x, y, ICON_HOOK); break;
+						ICON_DRAW(ICON_HOOK);
+						break;
 					case eModifierType_Softbody:
-						UI_icon_draw(x, y, ICON_MOD_SOFT); break;
+						ICON_DRAW(ICON_MOD_SOFT);
+						break;
 					case eModifierType_Boolean:
-						UI_icon_draw(x, y, ICON_MOD_BOOLEAN); break;
+						ICON_DRAW(ICON_MOD_BOOLEAN);
+						break;
 					case eModifierType_ParticleSystem:
-						UI_icon_draw(x, y, ICON_MOD_PARTICLES); break;
+						ICON_DRAW(ICON_MOD_PARTICLES);
+						break;
 					case eModifierType_ParticleInstance:
-						UI_icon_draw(x, y, ICON_MOD_PARTICLES); break;
+						ICON_DRAW(ICON_MOD_PARTICLES);
+						break;
 					case eModifierType_EdgeSplit:
-						UI_icon_draw(x, y, ICON_MOD_EDGESPLIT); break;
+						ICON_DRAW(ICON_MOD_EDGESPLIT);
+						break;
 					case eModifierType_Array:
-						UI_icon_draw(x, y, ICON_MOD_ARRAY); break;
+						ICON_DRAW(ICON_MOD_ARRAY);
+						break;
 					case eModifierType_UVProject:
 					case eModifierType_UVWarp:  /* TODO, get own icon */
-						UI_icon_draw(x, y, ICON_MOD_UVPROJECT); break;
+						ICON_DRAW(ICON_MOD_UVPROJECT);
+						break;
 					case eModifierType_Displace:
-						UI_icon_draw(x, y, ICON_MOD_DISPLACE); break;
+						ICON_DRAW(ICON_MOD_DISPLACE);
+						break;
 					case eModifierType_Shrinkwrap:
-						UI_icon_draw(x, y, ICON_MOD_SHRINKWRAP); break;
+						ICON_DRAW(ICON_MOD_SHRINKWRAP);
+						break;
 					case eModifierType_Cast:
-						UI_icon_draw(x, y, ICON_MOD_CAST); break;
+						ICON_DRAW(ICON_MOD_CAST);
+						break;
 					case eModifierType_MeshDeform:
 					case eModifierType_SurfaceDeform:
-						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;
+						ICON_DRAW(ICON_MOD_MESHDEFORM);
+						break;
 					case eModifierType_Bevel:
-						UI_icon_draw(x, y, ICON_MOD_BEVEL); break;
+						ICON_DRAW(ICON_MOD_BEVEL);
+						break;
 					case eModifierType_Smooth:
 					case eModifierType_LaplacianSmooth:
 					case eModifierType_CorrectiveSmooth:
-						UI_icon_draw(x, y, ICON_MOD_SMOOTH); break;
+						ICON_DRAW(ICON_MOD_SMOOTH);
+						break;
 					case eModifierType_SimpleDeform:
-						UI_icon_draw(x, y, ICON_MOD_SIMPLEDEFORM); break;
+						ICON_DRAW(ICON_MOD_SIMPLEDEFORM);
+						break;
 					case eModifierType_Mask:
-						UI_icon_draw(x, y, ICON_MOD_MASK); break;
+						ICON_DRAW(ICON_MOD_MASK);
+						break;
 					case eModifierType_Cloth:
-						UI_icon_draw(x, y, ICON_MOD_CLOTH); break;
+						ICON_DRAW(ICON_MOD_CLOTH);
+						break;
 					case eModifierType_Explode:
-						UI_icon_draw(x, y, ICON_MOD_EXPLODE); break;
+						ICON_DRAW(ICON_MOD_EXPLODE);
+						break;
 					case eModifierType_Collision:
 					case eModifierType_Surface:
-						UI_icon_draw(x, y, ICON_MOD_PHYSICS); break;
+						ICON_DRAW(ICON_MOD_PHYSICS);
+						break;
 					case eModifierType_Fluidsim:
-						UI_icon_draw(x, y, ICON_MOD_FLUIDSIM); break;
+						ICON_DRAW(ICON_MOD_FLUIDSIM);
+						break;
 					case eModifierType_Multires:
-						UI_icon_draw(x, y, ICON_MOD_MULTIRES); break;
+						ICON_DRAW(ICON_MOD_MULTIRES);
+						break;
 					case eModifierType_Smoke:
-						UI_icon_draw(x, y, ICON_MOD_SMOKE); break;
+						ICON_DRAW(ICON_MOD_SMOKE);
+						break;
 					case eModifierType_Solidify:
-						UI_icon_draw(x, y, ICON_MOD_SOLIDIFY); break;
+						ICON_DRAW(ICON_MOD_SOLIDIFY);
+						break;
 					case eModifierType_Screw:
-						UI_icon_draw(x, y, ICON_MOD_SCREW); break;
+						ICON_DRAW(ICON_MOD_SCREW);
+						break;
 					case eModifierType_Remesh:
-						UI_icon_draw(x, y, ICON_MOD_REMESH); break;
+						ICON_DRAW(ICON_MOD_REMESH);
+						break;
 					case eModifierType_WeightVGEdit:
 					case eModifierType_WeightVGMix:
 					case eModifierType_WeightVGProximity:
-						UI_icon_draw(x, y, ICON_MOD_VERTEX_WEIGHT); break;
+						ICON_DRAW(ICON_MOD_VERTEX_WEIGHT);
+						break;
 					case eModifierType_DynamicPaint:
-						UI_icon_draw(x, y, ICON_MOD_DYNAMICPAINT); break;
+						ICON_DRAW(ICON_MOD_DYNAMICPAINT);
+						break;
 					case eModifierType_Ocean:
-						UI_icon_draw(x, y, ICON_MOD_OCEAN); break;
+						ICON_DRAW(ICON_MOD_OCEAN);
+						break;
 					case eModifierType_Warp:
-						UI_icon_draw(x, y, ICON_MOD_WARP); break;
+						ICON_DRAW(ICON_MOD_WARP);
+						break;
 					case eModifierType_Skin:
-						UI_icon_draw(x, y, ICON_MOD_SKIN); break;
+						ICON_DRAW(ICON_MOD_SKIN);
+						break;
 					case eModifierType_Triangulate:
-						UI_icon_draw(x, y, ICON_MOD_TRIANGULATE); break;
+						ICON_DRAW(ICON_MOD_TRIANGULATE);
+						break;
 					case eModifierType_MeshCache:
-						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;  /* XXX, needs own icon */
+						ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
+						break;
 					case eModifierType_MeshSequenceCache:
-						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;  /* XXX, needs own icon */
+						ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
+						break;
 					case eModifierType_Wireframe:
-						UI_icon_draw(x, y, ICON_MOD_WIREFRAME); break;
+						ICON_DRAW(ICON_MOD_WIREFRAME);
+						break;
 					case eModifierType_LaplacianDeform:
-						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;  /* XXX, needs own icon */
+						ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
+						break;
 					case eModifierType_DataTransfer:
-						UI_icon_draw(x, y, ICON_MOD_DATA_TRANSFER); break;
+						ICON_DRAW(ICON_MOD_DATA_TRANSFER);
+						break;
 					case eModifierType_NormalEdit:
-						UI_icon_draw(x, y, ICON_MOD_NORMALEDIT); break;
+						ICON_DRAW(ICON_MOD_NORMALEDIT);
+						break;
 					/* Default */
 					case eModifierType_None:
 					case eModifierType_ShapeKey:
 					case NUM_MODIFIER_TYPES:
-						UI_icon_draw(x, y, ICON_DOT); break;
+						ICON_DRAW(ICON_DOT);
+						break;
 				}
 				break;
 			}
 			case TSE_POSE_BASE:
-				UI_icon_draw(x, y, ICON_ARMATURE_DATA); break;
+				ICON_DRAW(ICON_ARMATURE_DATA);
+				break;
 			case TSE_POSE_CHANNEL:
-				UI_icon_draw(x, y, ICON_BONE_DATA); break;
+				ICON_DRAW(ICON_BONE_DATA);
+				break;
 			case TSE_PROXY:
-				UI_icon_draw(x, y, ICON_GHOST); break;
+				ICON_DRAW(ICON_GHOST);
+				break;
 			case TSE_R_LAYER_BASE:
-				UI_icon_draw(x, y, ICON_RENDERLAYERS); break;
+				ICON_DRAW(ICON_RENDERLAYERS);
+				break;
+			case TSE_SCENE_OBJECTS_BASE:
+				ICON_DRAW(ICON_OUTLINER_OB_GROUP_INSTANCE);
+				break;
 			case TSE_R_LAYER:
-				UI_icon_draw(x, y, ICON_RENDERLAYERS); break;
+				ICON_DRAW(ICON_RENDER_RESULT);
+				break;
 			case TSE_LINKED_LAMP:
-				UI_icon_draw(x, y, ICON_LAMP_DATA); break;
+				ICON_DRAW(ICON_LAMP_DATA);
+				break;
 			case TSE_LINKED_MAT:
-				UI_icon_draw(x, y, ICON_MATERIAL_DATA); break;
+				ICON_DRAW(ICON_MATERIAL_DATA);
+				break;
 			case TSE_POSEGRP_BASE:
-				UI_icon_draw(x, y, ICON_GROUP_BONE); break;
+				ICON_DRAW(ICON_GROUP_BONE);
+				break;
 			case TSE_SEQUENCE:
 				if (te->idcode == SEQ_TYPE_MOVIE)
-					UI_icon_draw(x, y, ICON_SEQUENCE);
+					ICON_DRAW(ICON_SEQUENCE);
 				else if (te->idcode == SEQ_TYPE_META)
-					UI_icon_draw(x, y, ICON_DOT);
+					ICON_DRAW(ICON_DOT);
 				else if (te->idcode == SEQ_TYPE_SCENE)
-					UI_icon_draw(x, y, ICON_SCENE);
+					ICON_DRAW(ICON_SCENE);
 				else if (te->idcode == SEQ_TYPE_SOUND_RAM)
-					UI_icon_draw(x, y, ICON_SOUND);
+					ICON_DRAW(ICON_SOUND);
 				else if (te->idcode == SEQ_TYPE_IMAGE)
-					UI_icon_draw(x, y, ICON_IMAGE_COL);
+					ICON_DRAW(ICON_IMAGE_COL);
 				else
-					UI_icon_draw(x, y, ICON_PARTICLES);
+					ICON_DRAW(ICON_PARTICLES);
 				break;
 			case TSE_SEQ_STRIP:
-				UI_icon_draw(x, y, ICON_LIBRARY_DATA_DIRECT);
+				ICON_DRAW(ICON_LIBRARY_DATA_DIRECT);
 				break;
 			case TSE_SEQUENCE_DUP:
-				UI_icon_draw(x, y, ICON_OBJECT_DATA);
+				ICON_DRAW(ICON_OBJECT_DATA);
 				break;
 			case TSE_RNA_STRUCT:
 				if (RNA_struct_is_ID(te->rnaptr.type)) {
 					arg.id = (ID *)te->rnaptr.data;
 					tselem_draw_icon_uibut(&arg, RNA_struct_ui_icon(te->rnaptr.type));
 				}
-				else
-					UI_icon_draw(x, y, RNA_struct_ui_icon(te->rnaptr.type));
+				else {
+					int icon = RNA_struct_ui_icon(te->rnaptr.type);
+					ICON_DRAW(icon);
+				}
+				break;
+			case TSE_LAYER_COLLECTION:
+			case TSE_SCENE_COLLECTION_BASE:
+			case TSE_VIEW_COLLECTION_BASE:
+				ICON_DRAW(ICON_GROUP);
 				break;
 			/* Removed the icons from outliner. Need a better structure with Layers, Palettes and Colors */
 #if 0
@@ -1242,7 +1100,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 				break;
 #endif
 			default:
-				UI_icon_draw(x, y, ICON_DOT); break;
+				ICON_DRAW(ICON_DOT);
+				break;
 		}
 	}
 	else if (tselem->id) {
@@ -1269,8 +1128,16 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
 				case OB_SPEAKER:
 					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
+				case OB_LIGHTPROBE:
+					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_LIGHTPROBE); break;
 				case OB_EMPTY:
-					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
+					if (ob->dup_group) {
+						tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_GROUP_INSTANCE);
+					}
+					else {
+						tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY);
+					}
+					break;
 			}
 		}
 		else {
@@ -1347,22 +1214,45 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 					tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;
 				case ID_GD:
 					tselem_draw_icon_uibut(&arg, ICON_GREASEPENCIL); break;
+				case ID_LP:
+				{
+					LightProbe * lp = (LightProbe *)tselem->id;
+					switch (lp->type) {
+						case LIGHTPROBE_TYPE_CUBE:
+							tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+						case LIGHTPROBE_TYPE_PLANAR:
+							tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_PLANAR); break;
+						case LIGHTPROBE_TYPE_GRID:
+							tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_GRID); break;
+						default:
+							tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+					}
+					break;
+				}
+				case ID_BR:
+					tselem_draw_icon_uibut(&arg, ICON_BRUSH_DATA); break;
+				case ID_SCR:
+				case ID_WS:
+					tselem_draw_icon_uibut(&arg, ICON_SPLITSCREEN); break;
 				default:
 					break;
 			}
 		}
 	}
+
+#undef ICON_DRAW
 }
 
-static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, SpaceOops *soops, ListBase *lb, int level,
-                                  int xmax, int *offsx, int ys)
+static void outliner_draw_iconrow(
+        bContext *C, uiBlock *block, Scene *scene, ViewLayer *view_layer, SpaceOops *soops,
+        ListBase *lb, int level, int xmax, int *offsx, int ys, float alpha_fac)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
 	eOLDrawState active;
+	const Object *obact = OBACT(view_layer);
 
 	for (te = lb->first; te; te = te->next) {
-
 		/* exit drawing early */
 		if ((*offsx) - UI_UNIT_X > xmax)
 			break;
@@ -1371,38 +1261,41 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa
 
 		/* object hierarchy always, further constrained on level */
 		if (level < 1 || (tselem->type == 0 && te->idcode == ID_OB)) {
-
 			/* active blocks get white circle */
 			if (tselem->type == 0) {
 				if (te->idcode == ID_OB) {
-					active = (OBACT == (Object *)tselem->id) ? OL_DRAWSEL_NORMAL : OL_DRAWSEL_NONE;
+					active = (OBACT(view_layer) == (Object *)tselem->id) ? OL_DRAWSEL_NORMAL : OL_DRAWSEL_NONE;
 				}
-				else if (scene->obedit && scene->obedit->data == tselem->id) {
+				else if (is_object_data_in_editmode(tselem->id, obact)) {
 					active = OL_DRAWSEL_NORMAL;
 				}
 				else {
-					active = tree_element_active(C, scene, soops, te, OL_SETSEL_NONE, false);
+					active = tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NONE, false);
 				}
 			}
 			else {
-				active = tree_element_type_active(NULL, scene, soops, te, tselem, OL_SETSEL_NONE, false);
+				active = tree_element_type_active(C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false);
 			}
 
 			if (active != OL_DRAWSEL_NONE) {
 				float ufac = UI_UNIT_X / 20.0f;
+				float color[4] = {1.0f, 1.0f, 1.0f, 0.4f};
 
 				UI_draw_roundbox_corner_set(UI_CNR_ALL);
-				glColor4ub(255, 255, 255, 100);
-				UI_draw_roundbox(
+				color[3] *= alpha_fac;
+
+				UI_draw_roundbox_aa(
+				        true,
 				        (float) *offsx + 1.0f * ufac,
 				        (float)ys + 1.0f * ufac,
 				        (float)*offsx + UI_UNIT_X - 1.0f * ufac,
 				        (float)ys + UI_UNIT_Y - ufac,
-				        (float)UI_UNIT_Y / 2.0f - ufac);
+				        (float)UI_UNIT_Y / 2.0f - ufac,
+				        color);
 				glEnable(GL_BLEND); /* roundbox disables */
 			}
 
-			tselem_draw_icon(block, xmax, (float)*offsx, (float)ys, tselem, te, 0.5f);
+			tselem_draw_icon(block, xmax, (float)*offsx, (float)ys, tselem, te, 0.5f * alpha_fac);
 			te->xs = *offsx;
 			te->ys = ys;
 			te->xend = (short)*offsx + UI_UNIT_X;
@@ -1412,8 +1305,11 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa
 		}
 
 		/* this tree element always has same amount of branches, so don't draw */
-		if (tselem->type != TSE_R_LAYER)
-			outliner_draw_iconrow(C, block, scene, soops, &te->subtree, level + 1, xmax, offsx, ys);
+		if (tselem->type != TSE_R_LAYER) {
+			outliner_draw_iconrow(
+			        C, block, scene, view_layer, soops,
+			        &te->subtree, level + 1, xmax, offsx, ys, alpha_fac);
+		}
 	}
 
 }
@@ -1423,9 +1319,12 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
 {
 	TreeElement *ten;
 
-	/* store coord and continue, we need coordinates for elements outside view too */
-	te->xs = startx;
-	te->ys = starty;
+	/* closed items may be displayed in row of parent, don't change their coordinate! */
+	if ((te->flag & TE_ICONROW) == 0) {
+		/* store coord and continue, we need coordinates for elements outside view too */
+		te->xs = startx;
+		te->ys = starty;
+	}
 
 	for (ten = te->subtree.first; ten; ten = ten->next) {
 		outliner_set_coord_tree_element(ten, startx + UI_UNIT_X, starty);
@@ -1434,24 +1333,28 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
 
 
 static void outliner_draw_tree_element(
-        bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, ARegion *ar, SpaceOops *soops,
-        TreeElement *te, int startx, int *starty, TreeElement **te_edit)
+        bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, ViewLayer *view_layer,
+        ARegion *ar, SpaceOops *soops, TreeElement *te, bool draw_grayed_out,
+        int startx, int *starty, TreeElement **te_edit, TreeElement **te_floating)
 {
-	TreeElement *ten;
 	TreeStoreElem *tselem;
 	float ufac = UI_UNIT_X / 20.0f;
 	int offsx = 0;
 	eOLDrawState active = OL_DRAWSEL_NONE;
-
+	float color[4];
 	tselem = TREESTORE(te);
 
 	if (*starty + 2 * UI_UNIT_Y >= ar->v2d.cur.ymin && *starty <= ar->v2d.cur.ymax) {
+		const float alpha_fac = ((te->flag & TE_DISABLED) || draw_grayed_out) ? 0.5f : 1.0f;
+		const float alpha = 0.5f * alpha_fac;
 		int xmax = ar->v2d.cur.xmax;
-		unsigned char alpha = 128;
 
 		if ((tselem->flag & TSE_TEXTBUT) && (*te_edit == NULL)) {
 			*te_edit = te;
 		}
+		if ((te->drag_data != NULL) && (*te_floating == NULL)) {
+			*te_floating = te;
+		}
 
 		/* icons can be ui buts, we don't want it to overlap with restrict */
 		if ((soops->flag & SO_HIDE_RESTRICTCOLS) == 0)
@@ -1459,151 +1362,137 @@ static void outliner_draw_tree_element(
 
 		glEnable(GL_BLEND);
 
-		/* start by highlighting search matches
-		 *	we don't expand items when searching in the datablocks but we
-		 *	still want to highlight any filter matches.
-		 */
-		if ((SEARCHING_OUTLINER(soops) || (soops->outlinevis == SO_DATABLOCKS && soops->search_string[0] != 0)) &&
-		    (tselem->flag & TSE_SEARCHMATCH))
-		{
-			char col[4];
-			UI_GetThemeColorType4ubv(TH_MATCH, SPACE_OUTLINER, col);
-			col[3] = alpha;
-			glColor4ubv((GLubyte *)col);
-			glRecti(startx, *starty + 1, ar->v2d.cur.xmax, *starty + UI_UNIT_Y - 1);
-		}
-
 		/* colors for active/selected data */
 		if (tselem->type == 0) {
-
+			const Object *obact = OBACT(view_layer);
 			if (te->idcode == ID_SCE) {
 				if (tselem->id == (ID *)scene) {
-					glColor4ub(255, 255, 255, alpha);
-					active = OL_DRAWSEL_ACTIVE;
-				}
-			}
-			else if (te->idcode == ID_GR) {
-				Group *gr = (Group *)tselem->id;
-				if (group_select_flag(gr)) {
-					char col[4];
-					UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col);
-					col[3] = alpha;
-					glColor4ubv((GLubyte *)col);
-
+					rgba_float_args_set(color, 1.0f, 1.0f, 1.0f, alpha);
 					active = OL_DRAWSEL_ACTIVE;
 				}
 			}
 			else if (te->idcode == ID_OB) {
 				Object *ob = (Object *)tselem->id;
+				Base *base = (Base *)te->directdata;
+				const bool is_selected = (base != NULL) && ((base->flag & BASE_SELECTED) != 0);
 
-				if (ob == OBACT || (ob->flag & SELECT)) {
+				if (ob == obact || is_selected) {
 					char col[4] = {0, 0, 0, 0};
 
 					/* outliner active ob: always white text, circle color now similar to view3d */
 
 					active = OL_DRAWSEL_ACTIVE;
-					if (ob == OBACT) {
-						if (ob->flag & SELECT) {
+					if (ob == obact) {
+						if (is_selected) {
 							UI_GetThemeColorType4ubv(TH_ACTIVE, SPACE_VIEW3D, col);
 							col[3] = alpha;
 						}
 
 						active = OL_DRAWSEL_NORMAL;
 					}
-					else if (ob->flag & SELECT) {
+					else if (is_selected) {
 						UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col);
 						col[3] = alpha;
 					}
-
-					glColor4ubv((GLubyte *)col);
+					rgba_float_args_set(color, (float)col[0] / 255, (float)col[1] / 255, (float)col[2] / 255, alpha);
 				}
-
 			}
-			else if (scene->obedit && scene->obedit->data == tselem->id) {
-				glColor4ub(255, 255, 255, alpha);
+			else if (is_object_data_in_editmode(tselem->id, obact)) {
+				rgba_float_args_set(color, 1.0f, 1.0f, 1.0f, alpha);
 				active = OL_DRAWSEL_ACTIVE;
 			}
 			else {
-				if (tree_element_active(C, scene, soops, te, OL_SETSEL_NONE, false)) {
-					glColor4ub(220, 220, 255, alpha);
+				if (tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NONE, false)) {
+					rgba_float_args_set(color, 0.85f, 0.85f, 1.0f, alpha);
 					active = OL_DRAWSEL_ACTIVE;
 				}
 			}
 		}
 		else {
-			if (tree_element_type_active(NULL, scene, soops, te, tselem, OL_SETSEL_NONE, false) != OL_DRAWSEL_NONE) {
-				active = OL_DRAWSEL_ACTIVE;
-			}
-			glColor4ub(220, 220, 255, alpha);
+			active = tree_element_type_active(C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false);
+			rgba_float_args_set(color, 0.85f, 0.85f, 1.0f, alpha);
 		}
 
 		/* active circle */
 		if (active != OL_DRAWSEL_NONE) {
 			UI_draw_roundbox_corner_set(UI_CNR_ALL);
-			UI_draw_roundbox(
+			UI_draw_roundbox_aa(
+			        true,
 			        (float)startx + UI_UNIT_X + 1.0f * ufac,
 			        (float)*starty + 1.0f * ufac,
 			        (float)startx + 2.0f * UI_UNIT_X - 1.0f * ufac,
 			        (float)*starty + UI_UNIT_Y - 1.0f * ufac,
-			        UI_UNIT_Y / 2.0f - 1.0f * ufac);
+			        UI_UNIT_Y / 2.0f - 1.0f * ufac, color);
 			glEnable(GL_BLEND); /* roundbox disables it */
 
 			te->flag |= TE_ACTIVE; // for lookup in display hierarchies
 		}
 
-		/* open/close icon, only when sublevels, except for scene */
-		if (te->subtree.first || (tselem->type == 0 && te->idcode == ID_SCE) || (te->flag & TE_LAZY_CLOSED)) {
-			int icon_x;
-			icon_x = startx;
+		if (tselem->type == TSE_VIEW_COLLECTION_BASE) {
+			/* Scene collection in view layer can't expand/collapse. */
+		}
+		else if (te->subtree.first || (tselem->type == 0 && te->idcode == ID_SCE) || (te->flag & TE_LAZY_CLOSED)) {
+			/* open/close icon, only when sublevels, except for scene */
+			int icon_x = startx;
 
 			// icons a bit higher
 			if (TSELEM_OPEN(tselem, soops))
-				UI_icon_draw((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_DOWN);
+				UI_icon_draw_alpha((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_DOWN,
+				                   alpha_fac);
 			else
-				UI_icon_draw((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_RIGHT);
+				UI_icon_draw_alpha((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_RIGHT,
+				                   alpha_fac);
 		}
 		offsx += UI_UNIT_X;
 
 		/* datatype icon */
 
-		if (!(ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))) {
-
-			tselem_draw_icon(block, xmax, (float)startx + offsx, (float)*starty, tselem, te, 1.0f);
-
+		if (!(ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, TSE_ID_BASE))) {
+			tselem_draw_icon(block, xmax, (float)startx + offsx, (float)*starty, tselem, te, alpha_fac);
 			offsx += UI_UNIT_X + 2 * ufac;
 		}
 		else
 			offsx += 2 * ufac;
 
-		if (tselem->type == 0 && ID_IS_LINKED(tselem->id)) {
-			glPixelTransferf(GL_ALPHA_SCALE, 0.5f);
+		if (ELEM(tselem->type, 0, TSE_LAYER_COLLECTION) && ID_IS_LINKED(tselem->id)) {
 			if (tselem->id->tag & LIB_TAG_MISSING) {
-				UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_BROKEN);
+				UI_icon_draw_alpha((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_BROKEN,
+				                   alpha_fac);
 			}
 			else if (tselem->id->tag & LIB_TAG_INDIRECT) {
-				UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_INDIRECT);
+				UI_icon_draw_alpha((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_INDIRECT,
+				                   alpha_fac);
 			}
 			else {
-				UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_DIRECT);
+				UI_icon_draw_alpha((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_DIRECT,
+				                   alpha_fac);
 			}
-			glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
+			offsx += UI_UNIT_X + 2 * ufac;
+		}
+		else if (ELEM(tselem->type, 0, TSE_LAYER_COLLECTION) && ID_IS_STATIC_OVERRIDE(tselem->id)) {
+			UI_icon_draw_alpha((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_OVERRIDE,
+			                   alpha_fac);
 			offsx += UI_UNIT_X + 2 * ufac;
 		}
 		glDisable(GL_BLEND);
 
 		/* name */
 		if ((tselem->flag & TSE_TEXTBUT) == 0) {
+			unsigned char text_col[4];
+
 			if (active == OL_DRAWSEL_NORMAL) {
-				UI_ThemeColor(TH_TEXT_HI);
+				UI_GetThemeColor4ubv(TH_TEXT_HI, text_col);
 			}
 			else if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) {
-				UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.75f);
+				UI_GetThemeColorBlend3ubv(TH_BACK, TH_TEXT, 0.75f, text_col);
+				text_col[3] = 255;
 			}
 			else {
-				UI_ThemeColor(TH_TEXT);
+				UI_GetThemeColor4ubv(TH_TEXT, text_col);
 			}
+			text_col[3] *= alpha_fac;
 
-			UI_fontstyle_draw_simple(fstyle, startx + offsx, *starty + 5 * ufac, te->name);
+			UI_fontstyle_draw_simple(fstyle, startx + offsx, *starty + 5 * ufac, te->name, text_col);
 		}
 
 		offsx += (int)(UI_UNIT_X + UI_fontstyle_string_width(fstyle, te->name));
@@ -1614,24 +1503,34 @@ static void outliner_draw_tree_element(
 				if (tselem->type == 0 && te->idcode == ID_SCE) {
 					/* pass */
 				}
+				/* this tree element always has same amount of branches, so don't draw */
 				else if (tselem->type != TSE_R_LAYER) {
-					/* this tree element always has same amount of branches, so don't draw */
-
 					int tempx = startx + offsx;
 
-					/* divider */
-					UI_ThemeColorShade(TH_BACK, -40);
-					glRecti(tempx   - 10.0f * ufac,
-					        *starty +  4.0f * ufac,
-					        tempx   -  8.0f * ufac,
-					        *starty + UI_UNIT_Y - 4.0f * ufac);
-
 					glEnable(GL_BLEND);
-					glPixelTransferf(GL_ALPHA_SCALE, 0.5);
 
-					outliner_draw_iconrow(C, block, scene, soops, &te->subtree, 0, xmax, &tempx, *starty);
+					/* divider */
+					{
+						Gwn_VertFormat *format = immVertexFormat();
+						unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+						unsigned char col[4];
+
+						immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+						UI_GetThemeColorShade4ubv(TH_BACK, -40, col);
+						col[3] *= alpha_fac;
+
+						immUniformColor4ubv(col);
+						immRecti(pos, tempx   - 10.0f * ufac,
+						         *starty +  4.0f * ufac,
+						         tempx   -  8.0f * ufac,
+						         *starty + UI_UNIT_Y - 4.0f * ufac);
+						immUnbindProgram();
+					}
+
+					outliner_draw_iconrow(
+					        C, block, scene, view_layer, soops, &te->subtree, 0, xmax, &tempx,
+					        *starty, alpha_fac);
 
-					glPixelTransferf(GL_ALPHA_SCALE, 1.0);
 					glDisable(GL_BLEND);
 				}
 			}
@@ -1645,12 +1544,18 @@ static void outliner_draw_tree_element(
 	if (TSELEM_OPEN(tselem, soops)) {
 		*starty -= UI_UNIT_Y;
 
-		for (ten = te->subtree.first; ten; ten = ten->next) {
-			outliner_draw_tree_element(C, block, fstyle, scene, ar, soops, ten, startx + UI_UNIT_X, starty, te_edit);
+		for (TreeElement *ten = te->subtree.first; ten; ten = ten->next) {
+			/* check if element needs to be drawn grayed out, but also gray out
+			 * childs of a grayed out parent (pass on draw_grayed_out to childs) */
+			bool draw_childs_grayed_out = draw_grayed_out || (ten->drag_data != NULL);
+			outliner_draw_tree_element(
+			        C, block, fstyle, scene, view_layer,
+			        ar, soops, ten, draw_childs_grayed_out,
+			        startx + UI_UNIT_X, starty, te_edit, te_floating);
 		}
 	}
 	else {
-		for (ten = te->subtree.first; ten; ten = ten->next) {
+		for (TreeElement *ten = te->subtree.first; ten; ten = ten->next) {
 			outliner_set_coord_tree_element(ten, startx, *starty);
 		}
 
@@ -1658,40 +1563,130 @@ static void outliner_draw_tree_element(
 	}
 }
 
-static void outliner_draw_hierarchy(SpaceOops *soops, ListBase *lb, int startx, int *starty)
+static void outliner_draw_tree_element_floating(
+        const ARegion *ar, const TreeElement *te_floating)
 {
-	TreeElement *te;
+	const TreeElement *te_insert = te_floating->drag_data->insert_handle;
+	const int line_width = 2;
+
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	int coord_y = te_insert->ys;
+	int coord_x = te_insert->xs;
+	float col[4];
+
+	if (te_insert == te_floating) {
+		/* don't draw anything */
+		return;
+	}
+
+	UI_GetThemeColorShade4fv(TH_BACK, -40, col);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	glEnable(GL_BLEND);
+
+	if (ELEM(te_floating->drag_data->insert_type, TE_INSERT_BEFORE, TE_INSERT_AFTER)) {
+		if (te_floating->drag_data->insert_type == TE_INSERT_BEFORE) {
+			coord_y += UI_UNIT_Y;
+		}
+		immUniformColor4fv(col);
+		glLineWidth(line_width);
+
+		immBegin(GWN_PRIM_LINE_STRIP, 2);
+		immVertex2f(pos, coord_x, coord_y);
+		immVertex2f(pos, ar->v2d.cur.xmax, coord_y);
+		immEnd();
+	}
+	else {
+		BLI_assert(te_floating->drag_data->insert_type == TE_INSERT_INTO);
+		immUniformColor3fvAlpha(col, col[3] * 0.5f);
+
+		immBegin(GWN_PRIM_TRI_STRIP, 4);
+		immVertex2f(pos, coord_x, coord_y + UI_UNIT_Y);
+		immVertex2f(pos, coord_x, coord_y);
+		immVertex2f(pos, ar->v2d.cur.xmax, coord_y + UI_UNIT_Y);
+		immVertex2f(pos, ar->v2d.cur.xmax, coord_y);
+		immEnd();
+	}
+
+	glDisable(GL_BLEND);
+	immUnbindProgram();
+}
+
+static void outliner_draw_hierarchy_lines_recursive(unsigned pos, SpaceOops *soops, ListBase *lb, int startx,
+                                                    const unsigned char col[4], bool draw_grayed_out,
+                                                    int *starty)
+{
+	TreeElement *te, *te_vertical_line_last = NULL;
 	TreeStoreElem *tselem;
 	int y1, y2;
 
-	if (BLI_listbase_is_empty(lb)) return;
+	if (BLI_listbase_is_empty(lb)) {
+		return;
+	}
+
+	const unsigned char grayed_alpha = col[3] / 2;
 
-	y1 = y2 = *starty; /* for vertical lines between objects */
+	/* For vertical lines between objects. */
+	y1 = y2 = *starty;
 	for (te = lb->first; te; te = te->next) {
-		y2 = *starty;
+		bool draw_childs_grayed_out = draw_grayed_out || (te->drag_data != NULL);
 		tselem = TREESTORE(te);
 
-		/* horizontal line? */
-		if (tselem->type == 0 && (te->idcode == ID_OB || te->idcode == ID_SCE))
-			glRecti(startx, *starty, startx + UI_UNIT_X, *starty - 1);
+		if (draw_childs_grayed_out) {
+			immUniformColor3ubvAlpha(col, grayed_alpha);
+		}
+		else {
+			immUniformColor4ubv(col);
+		}
+
+		/* Horizontal Line? */
+		if (tselem->type == 0 && (te->idcode == ID_OB || te->idcode == ID_SCE)) {
+			immRecti(pos, startx, *starty, startx + UI_UNIT_X, *starty - 1);
+
+			/* Vertical Line? */
+			if (te->idcode == ID_OB) {
+				te_vertical_line_last = te;
+				y2 = *starty;
+			}
+		}
 
 		*starty -= UI_UNIT_Y;
 
 		if (TSELEM_OPEN(tselem, soops))
-			outliner_draw_hierarchy(soops, &te->subtree, startx + UI_UNIT_X, starty);
+			outliner_draw_hierarchy_lines_recursive(pos, soops, &te->subtree, startx + UI_UNIT_X,
+			                                        col, draw_childs_grayed_out, starty);
 	}
 
-	/* vertical line */
-	te = lb->last;
-	if (te->parent || lb->first != lb->last) {
-		tselem = TREESTORE(te);
-		if (tselem->type == 0 && te->idcode == ID_OB) {
+	if (draw_grayed_out) {
+		immUniformColor3ubvAlpha(col, grayed_alpha);
+	}
+	else {
+		immUniformColor4ubv(col);
+	}
 
-			glRecti(startx, y1 + UI_UNIT_Y, startx + 1, y2);
-		}
+	/* Vertical line. */
+	te = te_vertical_line_last;
+	if ((te != NULL) && (te->parent || lb->first != lb->last)) {
+		immRecti(pos, startx, y1 + UI_UNIT_Y, startx + 1, y2);
 	}
 }
 
+static void outliner_draw_hierarchy_lines(SpaceOops *soops, ListBase *lb, int startx, int *starty)
+{
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	unsigned char col[4];
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	UI_GetThemeColorBlend3ubv(TH_BACK, TH_TEXT, 0.4f, col);
+	col[3] = 255;
+
+	glEnable(GL_BLEND);
+	outliner_draw_hierarchy_lines_recursive(pos, soops, lb, startx, col, false, starty);
+	glDisable(GL_BLEND);
+
+	immUnbindProgram();
+}
+
 static void outliner_draw_struct_marks(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty)
 {
 	TreeElement *te;
@@ -1702,71 +1697,152 @@ static void outliner_draw_struct_marks(ARegion *ar, SpaceOops *soops, ListBase *
 
 		/* selection status */
 		if (TSELEM_OPEN(tselem, soops))
-			if (tselem->type == TSE_RNA_STRUCT)
-				glRecti(0, *starty + 1, (int)ar->v2d.cur.xmax, *starty + UI_UNIT_Y - 1);
+			if (tselem->type == TSE_RNA_STRUCT) {
+				Gwn_VertFormat *format = immVertexFormat();
+				unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+				immThemeColorShadeAlpha(TH_BACK, -15, -200);
+				immRecti(pos, 0, *starty + 1, (int)ar->v2d.cur.xmax, *starty + UI_UNIT_Y - 1);
+				immUnbindProgram();
+			}
 
 		*starty -= UI_UNIT_Y;
 		if (TSELEM_OPEN(tselem, soops)) {
 			outliner_draw_struct_marks(ar, soops, &te->subtree, starty);
-			if (tselem->type == TSE_RNA_STRUCT)
-				fdrawline(0, (float)*starty + UI_UNIT_Y, ar->v2d.cur.xmax, (float)*starty + UI_UNIT_Y);
+			if (tselem->type == TSE_RNA_STRUCT) {
+				Gwn_VertFormat *format = immVertexFormat();
+				unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+				immThemeColorShadeAlpha(TH_BACK, -15, -200);
+
+				immBegin(GWN_PRIM_LINES, 2);
+				immVertex2f(pos, 0, (float)*starty + UI_UNIT_Y);
+				immVertex2f(pos, ar->v2d.cur.xmax, (float)*starty + UI_UNIT_Y);
+				immEnd();
+
+				immUnbindProgram();
+			}
 		}
 	}
 }
 
-static void outliner_draw_selection(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty)
+static void outliner_draw_highlights_recursive(
+        unsigned pos, const ARegion *ar, const SpaceOops *soops, const ListBase *lb,
+        const float col_selection[4], const float col_highlight[4], const float col_searchmatch[4],
+        int start_x, int *io_start_y)
 {
-	TreeElement *te;
-	TreeStoreElem *tselem;
+	const bool is_searching = SEARCHING_OUTLINER(soops) ||
+	                          (soops->outlinevis == SO_DATA_API &&
+	                           (soops->filter & SO_FILTER_SEARCH) &&
+	                           soops->search_string[0] != 0);
 
-	for (te = lb->first; te; te = te->next) {
-		tselem = TREESTORE(te);
+	for (TreeElement *te = lb->first; te; te = te->next) {
+		const TreeStoreElem *tselem = TREESTORE(te);
+		const int start_y = *io_start_y;
 
 		/* selection status */
 		if (tselem->flag & TSE_SELECTED) {
-			glRecti(0, *starty + 1, (int)ar->v2d.cur.xmax, *starty + UI_UNIT_Y - 1);
+			immUniformColor4fv(col_selection);
+			immRecti(pos, 0, start_y + 1, (int)ar->v2d.cur.xmax, start_y + UI_UNIT_Y - 1);
+		}
+
+		/* search match highlights
+		 *   we don't expand items when searching in the datablocks but we
+		 *   still want to highlight any filter matches. */
+		if (is_searching && (tselem->flag & TSE_SEARCHMATCH)) {
+			immUniformColor4fv(col_searchmatch);
+			immRecti(pos, start_x, start_y + 1, ar->v2d.cur.xmax, start_y + UI_UNIT_Y - 1);
+		}
+
+		/* mouse hover highlights */
+		if ((tselem->flag & TSE_HIGHLIGHTED) || (te->drag_data != NULL)) {
+			immUniformColor4fv(col_highlight);
+			immRecti(pos, 0, start_y + 1, (int)ar->v2d.cur.xmax, start_y + UI_UNIT_Y - 1);
+		}
+
+		*io_start_y -= UI_UNIT_Y;
+		if (TSELEM_OPEN(tselem, soops)) {
+			outliner_draw_highlights_recursive(
+			        pos, ar, soops, &te->subtree, col_selection, col_highlight, col_searchmatch,
+			        start_x + UI_UNIT_X, io_start_y);
 		}
-		*starty -= UI_UNIT_Y;
-		if (TSELEM_OPEN(tselem, soops)) outliner_draw_selection(ar, soops, &te->subtree, starty);
 	}
 }
 
+static void outliner_draw_highlights(ARegion *ar, SpaceOops *soops, int startx, int *starty)
+{
+	const float col_highlight[4] = {1.0f, 1.0f, 1.0f, 0.13f};
+	float col_selection[4], col_searchmatch[4];
+
+	UI_GetThemeColor3fv(TH_SELECT_HIGHLIGHT, col_selection);
+	col_selection[3] = 1.0f; /* no alpha */
+	UI_GetThemeColor4fv(TH_MATCH, col_searchmatch);
+	col_searchmatch[3] = 0.5f;
+
+	glEnable(GL_BLEND);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	outliner_draw_highlights_recursive(pos, ar, soops, &soops->tree, col_selection, col_highlight, col_searchmatch,
+	                                   startx, starty);
+	immUnbindProgram();
+	glDisable(GL_BLEND);
+}
 
-static void outliner_draw_tree(bContext *C, uiBlock *block, Scene *scene, ARegion *ar,
-                               SpaceOops *soops, TreeElement **te_edit)
+static void outliner_draw_tree(
+        bContext *C, uiBlock *block, Scene *scene, ViewLayer *view_layer,
+        ARegion *ar, SpaceOops *soops, const bool has_restrict_icons,
+        TreeElement **te_edit)
 {
 	const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
-	TreeElement *te;
+	TreeElement *te_floating = NULL;
 	int starty, startx;
-	float col[3];
 
-	glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA); // only once
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); // only once
 
-	if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
+	if (soops->outlinevis == SO_DATA_API) {
 		/* struct marks */
-		UI_ThemeColorShadeAlpha(TH_BACK, -15, -200);
-		//UI_ThemeColorShade(TH_BACK, -20);
 		starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
 		outliner_draw_struct_marks(ar, soops, &soops->tree, &starty);
 	}
 
-	/* always draw selection fill before hierarchy */
-	UI_GetThemeColor3fv(TH_SELECT_HIGHLIGHT, col);
-	glColor3fv(col);
+	/* draw highlights before hierarchy */
 	starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
-	outliner_draw_selection(ar, soops, &soops->tree, &starty);
+	startx = 0;
+	outliner_draw_highlights(ar, soops, startx, &starty);
+
+	/* set scissor so tree elements or lines can't overlap restriction icons */
+	GLfloat scissor[4] = {0};
+	if (has_restrict_icons) {
+		int mask_x = BLI_rcti_size_x(&ar->v2d.mask) - (int)OL_TOGW + 1;
+		CLAMP_MIN(mask_x, 0);
+
+		glGetFloatv(GL_SCISSOR_BOX, scissor);
+		glScissor(0, 0, mask_x, ar->winy);
+	}
 
 	// gray hierarchy lines
-	UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.4f);
+
 	starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y / 2 - OL_Y_OFFSET;
 	startx = UI_UNIT_X / 2 - 1.0f;
-	outliner_draw_hierarchy(soops, &soops->tree, startx, &starty);
+	outliner_draw_hierarchy_lines(soops, &soops->tree, startx, &starty);
 
 	// items themselves
 	starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
 	startx = 0;
-	for (te = soops->tree.first; te; te = te->next) {
-		outliner_draw_tree_element(C, block, fstyle, scene, ar, soops, te, startx, &starty, te_edit);
+	for (TreeElement *te = soops->tree.first; te; te = te->next) {
+		outliner_draw_tree_element(
+		        C, block, fstyle, scene, view_layer,
+		        ar, soops, te, te->drag_data != NULL,
+		        startx, &starty, te_edit, &te_floating);
+	}
+	if (te_floating && te_floating->drag_data->insert_handle) {
+		outliner_draw_tree_element_floating(ar, te_floating);
+	}
+
+	if (has_restrict_icons) {
+		/* reset scissor */
+		glScissor(UNPACK4(scissor));
 	}
 }
 
@@ -1775,53 +1851,57 @@ static void outliner_back(ARegion *ar)
 {
 	int ystart;
 
-	UI_ThemeColorShade(TH_BACK, 6);
 	ystart = (int)ar->v2d.tot.ymax;
 	ystart = UI_UNIT_Y * (ystart / (UI_UNIT_Y)) - OL_Y_OFFSET;
 
-	while (ystart + 2 * UI_UNIT_Y > ar->v2d.cur.ymin) {
-		glRecti(0, ystart, (int)ar->v2d.cur.xmax, ystart + UI_UNIT_Y);
-		ystart -= 2 * UI_UNIT_Y;
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShade(TH_BACK, 6);
+
+	const float x1 = 0.0f, x2 = ar->v2d.cur.xmax;
+	float y1 = ystart, y2;
+	int tot = (int)floor(ystart - ar->v2d.cur.ymin + 2 * UI_UNIT_Y) / (2 * UI_UNIT_Y);
+
+	if (tot > 0) {
+		immBegin(GWN_PRIM_TRIS, 6 * tot);
+		while (tot--) {
+			y1 -= 2 * UI_UNIT_Y;
+			y2 = y1 + UI_UNIT_Y;
+			immVertex2f(pos, x1, y1);
+			immVertex2f(pos, x2, y1);
+			immVertex2f(pos, x2, y2);
+
+			immVertex2f(pos, x1, y1);
+			immVertex2f(pos, x2, y2);
+			immVertex2f(pos, x1, y2);
+		}
+		immEnd();
 	}
+	immUnbindProgram();
 }
 
 static void outliner_draw_restrictcols(ARegion *ar)
 {
-	int ystart;
+	glLineWidth(1.0f);
 
-	/* background underneath */
-	UI_ThemeColor(TH_BACK);
-	glRecti((int)(ar->v2d.cur.xmax - OL_TOGW),
-	        (int)(ar->v2d.cur.ymin - 1), (int)ar->v2d.cur.xmax, (int)ar->v2d.cur.ymax);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColorShadeAlpha(TH_BACK, -15, -200);
+	immBegin(GWN_PRIM_LINES, 6);
 
-	UI_ThemeColorShade(TH_BACK, 6);
-	ystart = (int)ar->v2d.tot.ymax;
-	ystart = UI_UNIT_Y * (ystart / (UI_UNIT_Y)) - OL_Y_OFFSET;
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), (int)ar->v2d.cur.ymax);
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), (int)ar->v2d.cur.ymin);
 
-	while (ystart + 2 * UI_UNIT_Y > ar->v2d.cur.ymin) {
-		glRecti((int)ar->v2d.cur.xmax - OL_TOGW, ystart, (int)ar->v2d.cur.xmax, ystart + UI_UNIT_Y);
-		ystart -= 2 * UI_UNIT_Y;
-	}
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), (int)ar->v2d.cur.ymax);
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), (int)ar->v2d.cur.ymin);
 
-	UI_ThemeColorShadeAlpha(TH_BACK, -15, -200);
-
-	/* view */
-	sdrawline((int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX),
-	          (int)ar->v2d.cur.ymax,
-	          (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX),
-	          (int)ar->v2d.cur.ymin);
-
-	/* render */
-	sdrawline((int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX),
-	          (int)ar->v2d.cur.ymax,
-	          (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX),
-	          (int)ar->v2d.cur.ymin);
-
-	/* render */
-	sdrawline((int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX),
-	          (int)ar->v2d.cur.ymax,
-	          (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX),
-	          (int)ar->v2d.cur.ymin);
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), (int)ar->v2d.cur.ymax);
+	immVertex2i(pos, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), (int)ar->v2d.cur.ymin);
+
+	immEnd();
+	immUnbindProgram();
 }
 
 /* ****************************************************** */
@@ -1831,19 +1911,21 @@ void draw_outliner(const bContext *C)
 {
 	Main *mainvar = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	uiBlock *block;
 	int sizey = 0, sizex = 0, sizex_rna = 0;
 	TreeElement *te_edit = NULL;
+	bool has_restrict_icons;
 
-	outliner_build_tree(mainvar, scene, soops); // always
+	outliner_build_tree(mainvar, scene, view_layer, soops, ar); // always
 
 	/* get extents of data */
 	outliner_height(soops, &soops->tree, &sizey);
 
-	if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
+	if (soops->outlinevis == SO_DATA_API) {
 		/* RNA has two columns:
 		 *  - column 1 is (max_width + OL_RNA_COL_SPACEX) or
 		 *				 (OL_RNA_COL_X), whichever is wider...
@@ -1858,6 +1940,7 @@ void draw_outliner(const bContext *C)
 
 		/* get width of data (for setting 'tot' rect, this is column 1 + column 2 + a bit extra) */
 		sizex = sizex_rna + OL_RNA_COL_SIZEX + 50;
+		has_restrict_icons = false;
 	}
 	else {
 		/* width must take into account restriction columns (if visible) so that entries will still be visible */
@@ -1867,9 +1950,11 @@ void draw_outliner(const bContext *C)
 
 		/* constant offset for restriction columns */
 		// XXX this isn't that great yet...
-		if ((soops->flag & SO_HIDE_RESTRICTCOLS) == 0)
+		if ((soops->flag & SO_HIDE_RESTRICTCOLS) == 0) {
 			sizex += OL_TOGW * 3;
+		}
 
+		has_restrict_icons = !(soops->flag & SO_HIDE_RESTRICTCOLS);
 	}
 
 	/* adds vertical offset */
@@ -1886,19 +1971,21 @@ void draw_outliner(const bContext *C)
 	/* draw outliner stuff (background, hierarchy lines and names) */
 	outliner_back(ar);
 	block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
-	outliner_draw_tree((bContext *)C, block, scene, ar, soops, &te_edit);
+	outliner_draw_tree(
+	        (bContext *)C, block, scene, view_layer,
+	        ar, soops, has_restrict_icons, &te_edit);
 
-	if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
+	if (soops->outlinevis == SO_DATA_API) {
 		/* draw rna buttons */
 		outliner_draw_rnacols(ar, sizex_rna);
 		outliner_draw_rnabuts(block, ar, soops, sizex_rna, &soops->tree);
 	}
-	else if ((soops->outlinevis == SO_ID_ORPHANS) && !(soops->flag & SO_HIDE_RESTRICTCOLS)) {
+	else if ((soops->outlinevis == SO_ID_ORPHANS) && has_restrict_icons) {
 		/* draw user toggle columns */
 		outliner_draw_restrictcols(ar);
 		outliner_draw_userbuts(block, ar, soops, &soops->tree);
 	}
-	else if (!(soops->flag & SO_HIDE_RESTRICTCOLS)) {
+	else if (has_restrict_icons) {
 		/* draw restriction columns */
 		outliner_draw_restrictcols(ar);
 		outliner_draw_restrictbuts(block, scene, ar, soops, &soops->tree);
@@ -1911,7 +1998,4 @@ void draw_outliner(const bContext *C)
 
 	UI_block_end(C, block);
 	UI_block_draw(C, block);
-
-	/* clear flag that allows quick redraws */
-	soops->storeflag &= ~SO_TREESTORE_REDRAW;
 }
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 7d5ff560b28..2a694e2e2e3 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -50,9 +50,10 @@
 #include "BLT_translation.h"
 
 #include "BKE_animsys.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idcode.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
@@ -61,7 +62,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_material.h"
-#include "BKE_group.h"
+
+#include "DEG_depsgraph_build.h"
 
 #include "../blenloader/BLO_readfile.h"
 
@@ -147,8 +149,45 @@ TreeElement *outliner_dropzone_find(const SpaceOops *soops, const float fmval[2]
 	return NULL;
 }
 
+
 /* ************************************************************** */
-/* Click Activated */
+
+/* Highlight --------------------------------------------------- */
+
+static int outliner_highlight_update(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	const float my = UI_view2d_region_to_view_y(&ar->v2d, event->mval[1]);
+
+	TreeElement *hovered_te = outliner_find_item_at_y(soops, &soops->tree, my);
+	bool changed = false;
+
+	if (!hovered_te || !(hovered_te->store_elem->flag & TSE_HIGHLIGHTED)) {
+		changed = outliner_set_flag(&soops->tree, TSE_HIGHLIGHTED, false);
+		if (hovered_te) {
+			hovered_te->store_elem->flag |= TSE_HIGHLIGHTED;
+			changed = true;
+		}
+	}
+
+	if (changed) {
+		ED_region_tag_redraw_no_rebuild(ar);
+	}
+
+	return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
+}
+
+void OUTLINER_OT_highlight_update(wmOperatorType *ot)
+{
+	ot->name = "Update Highlight";
+	ot->idname = "OUTLINER_OT_highlight_update";
+	ot->description = "Update the item highlight based on the current mouse position";
+
+	ot->invoke = outliner_highlight_update;
+
+	ot->poll = ED_operator_outliner_active;
+}
 
 /* Toggle Open/Closed ------------------------------------------- */
 
@@ -215,20 +254,34 @@ void OUTLINER_OT_item_openclose(wmOperatorType *ot)
 
 /* Rename --------------------------------------------------- */
 
-static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem, ReportList *reports)
+static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem,
+                           ReportList *reports)
 {
+	bool add_textbut = false;
+
 	/* can't rename rna datablocks entries or listbases */
-	if (ELEM(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, TSE_ID_BASE)) {
+	if (ELEM(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, TSE_ID_BASE, TSE_SCENE_OBJECTS_BASE)) {
 		/* do nothing */;
 	}
 	else if (ELEM(tselem->type, TSE_ANIM_DATA, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE,
-	              TSE_DRIVER_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_R_PASS))
+	              TSE_DRIVER_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_SCENE_COLLECTION_BASE,
+	              TSE_VIEW_COLLECTION_BASE))
 	{
 		BKE_report(reports, RPT_WARNING, "Cannot edit builtin name");
 	}
 	else if (ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP)) {
 		BKE_report(reports, RPT_WARNING, "Cannot edit sequence name");
 	}
+	else if (outliner_is_collection_tree_element(te)) {
+		Collection *collection = outliner_collection_from_tree_element(te);
+
+		if (collection->flag & COLLECTION_IS_MASTER) {
+			BKE_report(reports, RPT_WARNING, "Cannot edit name of master collection");
+		}
+		else {
+			add_textbut = true;
+		}
+	}
 	else if (ID_IS_LINKED(tselem->id)) {
 		BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
 	}
@@ -236,6 +289,10 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem,
 		BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library");
 	}
 	else {
+		add_textbut = true;
+	}
+
+	if (add_textbut) {
 		tselem->flag |= TSE_TEXTBUT;
 		ED_region_tag_redraw(ar);
 	}
@@ -249,7 +306,8 @@ void item_rename_cb(
 	do_item_rename(ar, te, tselem, reports);
 }
 
-static int do_outliner_item_rename(ReportList *reports, ARegion *ar, TreeElement *te, const float mval[2])
+static int do_outliner_item_rename(ReportList *reports, ARegion *ar, TreeElement *te,
+                                   const float mval[2])
 {
 	if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
 		TreeStoreElem *tselem = TREESTORE(te);
@@ -402,7 +460,6 @@ void OUTLINER_OT_id_delete(wmOperatorType *ot)
 static int outliner_id_remap_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 
 	const short id_type = (short)RNA_enum_get(op->ptr, "id_type");
@@ -432,7 +489,7 @@ static int outliner_id_remap_exec(bContext *C, wmOperator *op)
 	BKE_main_lib_objects_recalc_all(bmain);
 
 	/* recreate dependency graph to include new objects */
-	DAG_scene_relations_rebuild(bmain, scene);
+	DEG_relations_tag_update(bmain);
 
 	/* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */
 	GPU_materials_free();
@@ -743,17 +800,34 @@ int outliner_has_one_flag(ListBase *lb, short flag, const int curlevel)
 	return 0;
 }
 
-void outliner_set_flag(ListBase *lb, short flag, short set)
+/**
+ * Set or unset \a flag for all outliner elements in \a lb and sub-trees.
+ * \return if any flag was modified.
+ */
+bool outliner_set_flag(ListBase *lb, short flag, short set)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
+	bool changed = false;
+	bool has_flag;
 
 	for (te = lb->first; te; te = te->next) {
 		tselem = TREESTORE(te);
-		if (set == 0) tselem->flag &= ~flag;
-		else tselem->flag |= flag;
-		outliner_set_flag(&te->subtree, flag, set);
+		has_flag = (tselem->flag & flag);
+		if (set == 0) {
+			if (has_flag) {
+				tselem->flag &= ~flag;
+				changed = true;
+			}
+		}
+		else if (!has_flag) {
+			tselem->flag |= flag;
+			changed = true;
+		}
+		changed |= outliner_set_flag(&te->subtree, flag, set);
 	}
+
+	return changed;
 }
 
 /* Restriction Columns ------------------------------- */
@@ -781,181 +855,6 @@ int common_restrict_check(bContext *C, Object *ob)
 }
 
 /* =============================================== */
-/* Restriction toggles */
-
-/* Toggle Visibility ---------------------------------------- */
-
-void object_toggle_visibility_cb(
-        bContext *C, ReportList *reports, Scene *scene, TreeElement *te,
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Base *base = (Base *)te->directdata;
-	Object *ob = (Object *)tselem->id;
-
-	if (ID_IS_LINKED(tselem->id)) {
-		BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
-		return;
-	}
-
-	/* add check for edit mode */
-	if (!common_restrict_check(C, ob)) return;
-
-	if (base || (base = BKE_scene_base_find(scene, ob))) {
-		if ((base->object->restrictflag ^= OB_RESTRICT_VIEW)) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-	}
-}
-
-void group_toggle_visibility_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Group *group = (Group *)tselem->id;
-	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_VIEW);
-}
-
-static int outliner_toggle_visibility_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
-	SpaceOops *soops = CTX_wm_space_outliner(C);
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar = CTX_wm_region(C);
-
-	outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_visibility_cb);
-
-	DAG_id_type_tag(bmain, ID_OB);
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_VISIBLE, scene);
-	ED_region_tag_redraw(ar);
-
-	return OPERATOR_FINISHED;
-}
-
-void OUTLINER_OT_visibility_toggle(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Toggle Visibility";
-	ot->idname = "OUTLINER_OT_visibility_toggle";
-	ot->description = "Toggle the visibility of selected items";
-
-	/* callbacks */
-	ot->exec = outliner_toggle_visibility_exec;
-	ot->poll = ED_operator_outliner_active_no_editobject;
-
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* Toggle Selectability ---------------------------------------- */
-
-void object_toggle_selectability_cb(
-        bContext *UNUSED(C), ReportList *reports, Scene *scene, TreeElement *te,
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Base *base = (Base *)te->directdata;
-
-	if (ID_IS_LINKED(tselem->id)) {
-		BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
-		return;
-	}
-
-	if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
-	if (base) {
-		base->object->restrictflag ^= OB_RESTRICT_SELECT;
-	}
-}
-
-void group_toggle_selectability_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Group *group = (Group *)tselem->id;
-	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_SELECT);
-}
-
-static int outliner_toggle_selectability_exec(bContext *C, wmOperator *op)
-{
-	SpaceOops *soops = CTX_wm_space_outliner(C);
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar = CTX_wm_region(C);
-
-	outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_selectability_cb);
-
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-	ED_region_tag_redraw(ar);
-
-	return OPERATOR_FINISHED;
-}
-
-void OUTLINER_OT_selectability_toggle(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Toggle Selectability";
-	ot->idname = "OUTLINER_OT_selectability_toggle";
-	ot->description = "Toggle the selectability";
-
-	/* callbacks */
-	ot->exec = outliner_toggle_selectability_exec;
-	ot->poll = ED_operator_outliner_active_no_editobject;
-
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* Toggle Renderability ---------------------------------------- */
-
-void object_toggle_renderability_cb(
-        bContext *UNUSED(C), ReportList *reports, Scene *scene, TreeElement *te,
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Base *base = (Base *)te->directdata;
-
-	if (ID_IS_LINKED(tselem->id)) {
-		BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
-		return;
-	}
-
-	if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
-	if (base) {
-		base->object->restrictflag ^= OB_RESTRICT_RENDER;
-	}
-}
-
-void group_toggle_renderability_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Group *group = (Group *)tselem->id;
-	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_RENDER);
-}
-
-static int outliner_toggle_renderability_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
-	SpaceOops *soops = CTX_wm_space_outliner(C);
-	Scene *scene = CTX_data_scene(C);
-
-	outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_renderability_cb);
-
-	DAG_id_type_tag(bmain, ID_OB);
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_RENDER, scene);
-
-	return OPERATOR_FINISHED;
-}
-
-void OUTLINER_OT_renderability_toggle(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Toggle Renderability";
-	ot->idname = "OUTLINER_OT_renderability_toggle";
-	ot->description = "Toggle the renderability of selected items";
-
-	/* callbacks */
-	ot->exec = outliner_toggle_renderability_exec;
-	ot->poll = ED_operator_outliner_active;
-
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* =============================================== */
 /* Outliner setting toggles */
 
 /* Toggle Expanded (Outliner) ---------------------------------------- */
@@ -1002,10 +901,8 @@ static int outliner_toggle_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	else
 		outliner_set_flag(&soops->tree, TSE_SELECTED, 1);
 
-	soops->storeflag |= SO_TREESTORE_REDRAW;
-
 	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-	ED_region_tag_redraw(ar);
+	ED_region_tag_redraw_no_rebuild(ar);
 
 	return OPERATOR_FINISHED;
 }
@@ -1047,7 +944,7 @@ static void outliner_set_coordinates_element_recursive(SpaceOops *soops, TreeEle
 }
 
 /* to retrieve coordinates with redrawing the entire tree */
-static void outliner_set_coordinates(ARegion *ar, SpaceOops *soops)
+void outliner_set_coordinates(ARegion *ar, SpaceOops *soops)
 {
 	TreeElement *te;
 	int starty = (int)(ar->v2d.tot.ymax) - UI_UNIT_Y;
@@ -1076,14 +973,14 @@ static int outliner_open_back(TreeElement *te)
 static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceOops *so = CTX_wm_space_outliner(C);
-	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 
 	TreeElement *te;
 	int xdelta, ytop;
 
-	Object *obact = OBACT;
+	Object *obact = OBACT(view_layer);
 
 	if (!obact)
 		return OPERATOR_CANCELLED;
@@ -1126,11 +1023,9 @@ static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 		xdelta = (int)(te->xs - v2d->cur.xmin);
 		v2d->cur.xmin += xdelta;
 		v2d->cur.xmax += xdelta;
-
-		so->storeflag |= SO_TREESTORE_REDRAW;
 	}
 
-	ED_region_tag_redraw(ar);
+	ED_region_tag_redraw_no_rebuild(ar);
 
 	return OPERATOR_FINISHED;
 }
@@ -1162,7 +1057,7 @@ static int outliner_scroll_page_exec(bContext *C, wmOperator *op)
 	ar->v2d.cur.ymin += dy;
 	ar->v2d.cur.ymax += dy;
 
-	ED_region_tag_redraw(ar);
+	ED_region_tag_redraw_no_rebuild(ar);
 
 	return OPERATOR_FINISHED;
 }
@@ -1286,7 +1181,7 @@ static void outliner_find_panel(Scene *UNUSED(scene), ARegion *ar, SpaceOops *so
 			soops->search_flags = flags;
 
 			/* redraw */
-			soops->storeflag |= SO_TREESTORE_REDRAW;
+			ED_region_tag_redraw_no_rebuild(ar);
 		}
 	}
 	else {
@@ -1444,7 +1339,7 @@ static int ed_operator_outliner_datablocks_active(bContext *C)
 	ScrArea *sa = CTX_wm_area(C);
 	if ((sa) && (sa->spacetype == SPACE_OUTLINER)) {
 		SpaceOops *so = CTX_wm_space_outliner(C);
-		return (so->outlinevis == SO_DATABLOCKS);
+		return (so->outlinevis == SO_DATA_API);
 	}
 	return 0;
 }
@@ -2001,9 +1896,9 @@ static int parent_drop_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, false, false, NULL);
+	ED_object_parent_set(op->reports, C, scene, ob, par, partype, false, false, NULL);
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 
@@ -2061,8 +1956,8 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		}
 
 		if ((par->type != OB_ARMATURE) && (par->type != OB_CURVE) && (par->type != OB_LATTICE)) {
-			if (ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, false, false, NULL)) {
-				DAG_relations_tag_update(bmain);
+			if (ED_object_parent_set(op->reports, C, scene, ob, par, partype, false, false, NULL)) {
+				DEG_relations_tag_update(bmain);
 				WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 				WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 			}
@@ -2169,7 +2064,14 @@ static int outliner_parenting_poll(bContext *C)
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 
 	if (soops) {
-		return ELEM(soops->outlinevis, SO_ALL_SCENES, SO_CUR_SCENE, SO_VISIBLE, SO_GROUPS);
+		if (soops->outlinevis == SO_SCENES) {
+			return true;
+		}
+		else if ((soops->outlinevis == SO_VIEW_LAYER) &&
+		         (soops->filter & SO_FILTER_NO_COLLECTION))
+		{
+			return true;
+		}
 	}
 
 	return false;
@@ -2190,7 +2092,7 @@ static int parent_clear_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
 
 	ED_object_parent_clear(ob, RNA_enum_get(op->ptr, "type"));
 
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 	return OPERATOR_FINISHED;
@@ -2233,8 +2135,6 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	te = outliner_dropzone_find(soops, fmval, false);
 
 	if (te) {
-		Base *base;
-
 		RNA_string_set(op->ptr, "scene", te->name);
 		scene = (Scene *)BKE_libblock_find_name(bmain, ID_SCE, te->name);
 
@@ -2245,19 +2145,29 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 			return OPERATOR_CANCELLED;
 		}
 
-		base = ED_object_scene_link(scene, ob);
-
-		if (base == NULL) {
+		if (BKE_scene_has_object(scene, ob)) {
 			return OPERATOR_CANCELLED;
 		}
 
-		if (scene == CTX_data_scene(C)) {
-			/* when linking to an inactive scene don't touch the layer */
-			ob->lay = base->lay;
-			ED_base_object_select(base, BA_SELECT);
+		Collection *collection;
+		if (scene != CTX_data_scene(C)) {
+			/* when linking to an inactive scene link to the master collection */
+			collection = BKE_collection_master(scene);
+		}
+		else {
+			collection = CTX_data_collection(C);
 		}
 
-		DAG_relations_tag_update(bmain);
+		BKE_collection_object_add(bmain, collection, ob);
+
+		for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+			Base *base = BKE_view_layer_base_find(view_layer, ob);
+			if (base) {
+				ED_object_base_select(base, BA_SELECT);
+			}
+		}
+
+		DEG_relations_tag_update(bmain);
 
 		WM_main_add_notifier(NC_SCENE | ND_OB_SELECT, scene);
 
@@ -2345,59 +2255,81 @@ void OUTLINER_OT_material_drop(wmOperatorType *ot)
 	RNA_def_string(ot->srna, "material", "Material", MAX_ID_NAME, "Material", "Target Material");
 }
 
-static int group_link_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+/* ******************** Collection Drop Operator *********************** */
+
+static int collection_drop_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
 {
+	/* TODO: implement */
+#if 0
+	Object *par = NULL, *ob = NULL;
 	Main *bmain = CTX_data_main(C);
-	Group *group = NULL;
-	Object *ob = NULL;
 	Scene *scene = CTX_data_scene(C);
+	int partype = -1;
+	char parname[MAX_ID_NAME], childname[MAX_ID_NAME];
+
+	RNA_string_get(op->ptr, "parent", parname);
+	par = (Object *)BKE_libblock_find_name(ID_OB, parname);
+	RNA_string_get(op->ptr, "child", childname);
+	ob = (Object *)BKE_libblock_find_name(ID_OB, childname);
+
+	if (ID_IS_LINKED(ob)) {
+		BKE_report(op->reports, RPT_INFO, "Can't edit library linked object");
+		return OPERATOR_CANCELLED;
+	}
+
+	ED_object_parent_set(op->reports, C, scene, ob, par, partype, false, false, NULL);
+
+	DEG_relations_tag_update(bmain);
+	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
+#endif
+
+	return OPERATOR_FINISHED;
+}
+
+static int collection_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	ARegion *ar = CTX_wm_region(C);
-	TreeElement *te = NULL;
-	char ob_name[MAX_ID_NAME - 2];
+	Main *bmain = CTX_data_main(C);
+	char childname[MAX_ID_NAME];
 	float fmval[2];
 
 	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
 
 	/* Find object hovered over */
-	te = outliner_dropzone_find(soops, fmval, true);
-
-	if (te) {
-		group = (Group *)BKE_libblock_find_name(bmain, ID_GR, te->name);
+	TreeElement *te = outliner_dropzone_find(soops, fmval, true);
 
-		RNA_string_get(op->ptr, "object", ob_name);
-		ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, ob_name);
-
-		if (ELEM(NULL, group, ob)) {
-			return OPERATOR_CANCELLED;
-		}
-		if (BKE_group_object_exists(group, ob)) {
-			return OPERATOR_FINISHED;
-		}
+	if (!te || !outliner_is_collection_tree_element(te)) {
+		return OPERATOR_CANCELLED;
+	}
 
-		if (BKE_group_object_cyclic_check(bmain, ob, group)) {
-			BKE_report(op->reports, RPT_ERROR, "Could not add the group because of dependency cycle detected");
-			return OPERATOR_CANCELLED;
-		}
+	Collection *collection = outliner_collection_from_tree_element(te);
 
-		BKE_group_object_add(group, ob, scene, NULL);
-		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+	// TODO: don't use scene, makes no sense anymore
+	// TODO: move rather than link, change hover text
+	Scene *scene = BKE_scene_find_from_collection(bmain, collection);
+	BLI_assert(scene);
+	RNA_string_get(op->ptr, "child", childname);
+	Object *ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, childname);
+	BKE_collection_object_add(bmain, collection, ob);
 
-		return OPERATOR_FINISHED;
-	}
+	DEG_relations_tag_update(bmain);
+	WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 
-	return OPERATOR_CANCELLED;
+	return OPERATOR_FINISHED;
 }
 
-void OUTLINER_OT_group_link(wmOperatorType *ot)
+void OUTLINER_OT_collection_drop(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Link Object to Group";
-	ot->description = "Link Object to Group in Outliner";
-	ot->idname = "OUTLINER_OT_group_link";
+	ot->name = "Link to Collection"; // TODO: rename to move?
+	ot->description = "Drag to move to collection in Outliner";
+	ot->idname = "OUTLINER_OT_collection_drop";
 
 	/* api callbacks */
-	ot->invoke = group_link_invoke;
+	ot->invoke = collection_drop_invoke;
+	ot->exec = collection_drop_exec;
 
 	ot->poll = ED_operator_outliner_active;
 
@@ -2405,5 +2337,6 @@ void OUTLINER_OT_group_link(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
 
 	/* properties */
-	RNA_def_string(ot->srna, "object", "Object", MAX_ID_NAME, "Object", "Target Object");
+	RNA_def_string(ot->srna, "child", "Object", MAX_ID_NAME, "Child", "Child Object");
+	RNA_def_string(ot->srna, "parent", "Collection", MAX_ID_NAME, "Parent", "Parent Collection");
 }
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 9bf2231b313..8ac09648d60 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -36,14 +36,56 @@
 
 /* internal exports only */
 
+struct ARegion;
+struct ListBase;
 struct wmOperatorType;
+struct TreeElement;
 struct TreeStoreElem;
+struct Main;
 struct bContext;
 struct Scene;
+struct ViewLayer;
 struct ID;
 struct Object;
 struct bPoseChannel;
 struct EditBone;
+struct wmEvent;
+struct wmKeyConfig;
+
+typedef enum TreeElementInsertType {
+	TE_INSERT_BEFORE,
+	TE_INSERT_AFTER,
+	TE_INSERT_INTO,
+} TreeElementInsertType;
+
+typedef enum TreeTraversalAction {
+	/* Continue traversal regularly, don't skip children. */
+	TRAVERSE_CONTINUE = 0,
+	/* Stop traversal */
+	TRAVERSE_BREAK,
+	/* Continue traversal, but skip childs of traversed element */
+	TRAVERSE_SKIP_CHILDS,
+} TreeTraversalAction;
+
+/**
+ * Callback type for reinserting elements at a different position, used to allow user customizable element order.
+ */
+typedef void (*TreeElementReinsertFunc)(struct Main *bmain,
+                                        struct Scene *scene,
+                                        struct SpaceOops *soops,
+                                        struct TreeElement *insert_element,
+                                        struct TreeElement *insert_handle,
+                                        TreeElementInsertType action,
+                                        const struct wmEvent *event);
+/**
+ * Executed on (almost) each mouse move while dragging. It's supposed to give info
+ * if reinserting insert_element before/after/into insert_handle would be allowed.
+ * It's allowed to change the reinsert info here for non const pointers.
+ */
+typedef bool (*TreeElementReinsertPollFunc)(const struct TreeElement *insert_element,
+                                            struct TreeElement **io_insert_handle, TreeElementInsertType *io_action);
+typedef TreeTraversalAction (*TreeTraversalFunc)(struct TreeElement *te, void *customdata);
+
 
 typedef struct TreeElement {
 	struct TreeElement *next, *prev, *parent;
@@ -57,18 +99,34 @@ typedef struct TreeElement {
 	const char *name;
 	void *directdata;          // Armature Bones, Base, Sequence, Strip...
 	PointerRNA rnaptr;         // RNA Pointer
-}  TreeElement;
+
+	/* callbacks - TODO should be moved into a type (like TreeElementType) */
+	TreeElementReinsertFunc reinsert;
+	TreeElementReinsertPollFunc reinsert_poll;
+
+	struct {
+		TreeElementInsertType insert_type;
+		/* the element before/after/into which we may insert the dragged one (NULL to insert at top) */
+		struct TreeElement *insert_handle;
+		void *tooltip_draw_handle;
+	} *drag_data;
+} TreeElement;
 
 #define TREESTORE_ID_TYPE(_id) \
 	(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
-	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS) || \
-	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC))  /* Only in 'blendfile' mode ... :/ */
+	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \
+	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS))  /* Only in 'blendfile' mode ... :/ */
 
 /* TreeElement->flag */
-#define TE_ACTIVE       1
-#define TE_ICONROW      2
-#define TE_LAZY_CLOSED  4
-#define TE_FREE_NAME    8
+enum {
+	TE_ACTIVE      = (1 << 0),
+	/* Closed items display their children as icon within the row. TE_ICONROW is for
+	 * these child-items that are visible but only within the row of the closed parent. */
+	TE_ICONROW     = (1 << 1),
+	TE_LAZY_CLOSED = (1 << 2),
+	TE_FREE_NAME   = (1 << 3),
+	TE_DISABLED    = (1 << 4),
+};
 
 /* button events */
 #define OL_NAMEBUTTON       1
@@ -93,16 +151,19 @@ typedef enum {
 /* size constants */
 #define OL_Y_OFFSET 2
 
-#define OL_TOG_RESTRICT_VIEWX   (UI_UNIT_X * 3.0f)
-#define OL_TOG_RESTRICT_SELECTX (UI_UNIT_X * 2.0f)
+#define OL_TOG_RESTRICT_SELECTX (UI_UNIT_X * 3.0f)
+#define OL_TOG_RESTRICT_VIEWX   (UI_UNIT_X * 2.0f)
 #define OL_TOG_RESTRICT_RENDERX UI_UNIT_X
 
-#define OL_TOGW OL_TOG_RESTRICT_VIEWX
+#define OL_TOGW OL_TOG_RESTRICT_SELECTX
 
 #define OL_RNA_COLX         (UI_UNIT_X * 15)
 #define OL_RNA_COL_SIZEX    (UI_UNIT_X * 7.5f)
 #define OL_RNA_COL_SPACEX   (UI_UNIT_X * 2.5f)
 
+/* The outliner display modes that support the filter system.
+ * Note: keep it synced with space_outliner.py */
+#define SUPPORT_FILTER_OUTLINER(soops_) (ELEM((soops_)->outlinevis, SO_VIEW_LAYER))
 
 /* Outliner Searching --
  *
@@ -120,24 +181,27 @@ typedef enum {
  * - not searching into RNA items helps but isn't the complete solution
  */
 
-#define SEARCHING_OUTLINER(sov)   (sov->search_flags & SO_SEARCH_RECURSIVE)
+#define SEARCHING_OUTLINER(sov)   ((sov->search_flags & SO_SEARCH_RECURSIVE) && (sov->filter & SO_FILTER_SEARCH))
 
 /* is the currrent element open? if so we also show children */
 #define TSELEM_OPEN(telm, sv)    ( (telm->flag & TSE_CLOSED) == 0 || (SEARCHING_OUTLINER(sv) && (telm->flag & TSE_CHILDSEARCH)) )
 
 /* outliner_tree.c ----------------------------------------------- */
 
-void outliner_free_tree(ListBase *lb);
+void outliner_free_tree(ListBase *tree);
 void outliner_cleanup_tree(struct SpaceOops *soops);
+void outliner_free_tree_element(TreeElement *element, ListBase *parent_subtree);
 
-TreeElement *outliner_find_tse(struct SpaceOops *soops, const TreeStoreElem *tse);
-TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem);
-TreeElement *outliner_find_id(struct SpaceOops *soops, ListBase *lb, const struct ID *id);
-TreeElement *outliner_find_posechannel(ListBase *lb, const struct bPoseChannel *pchan);
-TreeElement *outliner_find_editbone(ListBase *lb, const struct EditBone *ebone);
-struct ID *outliner_search_back(SpaceOops *soops, TreeElement *te, short idcode);
+void outliner_build_tree(
+        struct Main *mainvar,
+        struct Scene *scene, struct ViewLayer *view_layer,
+        struct SpaceOops *soops, struct ARegion *ar);
+
+typedef struct ObjectsSelectedData {
+	struct ListBase objects_selected_array;
+} ObjectsSelectedData;
 
-void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct SpaceOops *soops);
+TreeTraversalAction outliner_find_selected_objects(struct TreeElement *te, void *customdata);
 
 /* outliner_draw.c ---------------------------------------------- */
 
@@ -146,9 +210,9 @@ void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag);
 
 /* outliner_select.c -------------------------------------------- */
 eOLDrawState tree_element_type_active(
-        struct bContext *C, struct Scene *scene, struct SpaceOops *soops,
+        struct bContext *C, struct Scene *scene, struct ViewLayer *view_layer, struct SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive);
-eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, SpaceOops *soops,
+eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct ViewLayer *view_layer, SpaceOops *soops,
                                  TreeElement *te, const eOLSetState set, const bool handle_all_types);
 
 void outliner_item_do_activate_from_tree_element(
@@ -158,22 +222,26 @@ int outliner_item_do_activate_from_cursor(
         struct bContext *C, const int mval[2],
         bool extend, bool recursive);
 
+void outliner_item_select(
+        struct SpaceOops *soops, const struct TreeElement *te,
+        const bool extend, const bool toggle);
+
 /* outliner_edit.c ---------------------------------------------- */
 typedef void (*outliner_operation_cb)(
         struct bContext *C, struct ReportList *, struct Scene *scene,
         struct TreeElement *, struct TreeStoreElem *, TreeStoreElem *, void *);
 
 void outliner_do_object_operation_ex(
-        struct bContext *C, ReportList *reports, struct Scene *scene, struct SpaceOops *soops, struct ListBase *lb,
-        outliner_operation_cb operation_cb, bool recurse_selected);
+        struct bContext *C, struct ReportList *reports, struct Scene *scene, struct SpaceOops *soops,
+        struct ListBase *lb, outliner_operation_cb operation_cb, bool recurse_selected);
 void outliner_do_object_operation(
-        struct bContext *C, ReportList *reports, struct Scene *scene, struct SpaceOops *soops, struct ListBase *lb,
-        outliner_operation_cb operation_cb);
+        struct bContext *C, struct ReportList *reports, struct Scene *scene, struct SpaceOops *soops,
+        struct ListBase *lb, outliner_operation_cb operation_cb);
 
 int common_restrict_check(struct bContext *C, struct Object *ob);
 
 int outliner_has_one_flag(ListBase *lb, short flag, const int curlevel);
-void outliner_set_flag(ListBase *lb, short flag, short set);
+bool outliner_set_flag(ListBase *lb, short flag, short set);
 
 void object_toggle_visibility_cb(
         struct bContext *C, struct ReportList *reports, struct Scene *scene,
@@ -186,16 +254,6 @@ void object_toggle_renderability_cb(
         TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
 
 
-void group_toggle_visibility_cb(
-        struct bContext *C, struct ReportList *reports, struct Scene *scene,
-        TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
-void group_toggle_selectability_cb(
-        struct bContext *C, struct ReportList *reports, struct Scene *scene,
-        TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
-void group_toggle_renderability_cb(
-        struct bContext *C, struct ReportList *reports, struct Scene *scene,
-        TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
-
 void item_rename_cb(
         struct bContext *C, struct ReportList *reports, struct Scene *scene,
         TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
@@ -214,8 +272,13 @@ void id_remap_cb(
         struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
 
 TreeElement *outliner_dropzone_find(const struct SpaceOops *soops, const float fmval[2], const bool children);
+
+void outliner_set_coordinates(struct ARegion *ar, struct SpaceOops *soops);
+
 /* ...................................................... */
 
+void OUTLINER_OT_highlight_update(struct wmOperatorType *ot);
+
 void OUTLINER_OT_item_activate(struct wmOperatorType *ot);
 void OUTLINER_OT_item_openclose(struct wmOperatorType *ot);
 void OUTLINER_OT_item_rename(struct wmOperatorType *ot);
@@ -235,10 +298,6 @@ void OUTLINER_OT_expanded_toggle(struct wmOperatorType *ot);
 
 void OUTLINER_OT_scroll_page(struct wmOperatorType *ot);
 
-void OUTLINER_OT_renderability_toggle(struct wmOperatorType *ot);
-void OUTLINER_OT_selectability_toggle(struct wmOperatorType *ot);
-void OUTLINER_OT_visibility_toggle(struct wmOperatorType *ot);
-
 void OUTLINER_OT_keyingset_add_selected(struct wmOperatorType *ot);
 void OUTLINER_OT_keyingset_remove_selected(struct wmOperatorType *ot);
 
@@ -251,14 +310,13 @@ void OUTLINER_OT_parent_drop(struct wmOperatorType *ot);
 void OUTLINER_OT_parent_clear(struct wmOperatorType *ot);
 void OUTLINER_OT_scene_drop(struct wmOperatorType *ot);
 void OUTLINER_OT_material_drop(struct wmOperatorType *ot);
-void OUTLINER_OT_group_link(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_drop(struct wmOperatorType *ot);
 
 /* outliner_tools.c ---------------------------------------------- */
 
 void OUTLINER_OT_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_scene_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_object_operation(struct wmOperatorType *ot);
-void OUTLINER_OT_group_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_lib_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_id_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_id_remap(struct wmOperatorType *ot);
@@ -267,10 +325,41 @@ void OUTLINER_OT_animdata_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_action_set(struct wmOperatorType *ot);
 void OUTLINER_OT_constraint_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_modifier_operation(struct wmOperatorType *ot);
+
 /* ---------------------------------------------------------------- */
 
 /* outliner_ops.c */
 void outliner_operatortypes(void);
 void outliner_keymap(struct wmKeyConfig *keyconf);
 
+/* outliner_collections.c */
+
+bool outliner_is_collection_tree_element(const TreeElement *te);
+struct Collection *outliner_collection_from_tree_element(const TreeElement *te);
+
+void OUTLINER_OT_collection_new(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_duplicate(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_delete(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_objects_select(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_objects_deselect(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_link(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_instance(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_exclude_set(struct wmOperatorType *ot);
+void OUTLINER_OT_collection_include_set(struct wmOperatorType *ot);
+
+/* outliner_utils.c ---------------------------------------------- */
+
+TreeElement *outliner_find_item_at_y(const SpaceOops *soops, const ListBase *tree, float view_co_y);
+TreeElement *outliner_find_item_at_x_in_row(const SpaceOops *soops, const TreeElement *parent_te, float view_co_x);
+TreeElement *outliner_find_tse(struct SpaceOops *soops, const TreeStoreElem *tse);
+TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem);
+TreeElement *outliner_find_parent_element(ListBase *lb, TreeElement *parent_te, const TreeElement *child_te);
+TreeElement *outliner_find_id(struct SpaceOops *soops, ListBase *lb, const struct ID *id);
+TreeElement *outliner_find_posechannel(ListBase *lb, const struct bPoseChannel *pchan);
+TreeElement *outliner_find_editbone(ListBase *lb, const struct EditBone *ebone);
+struct ID *outliner_search_back(SpaceOops *soops, TreeElement *te, short idcode);
+bool outliner_tree_traverse(const SpaceOops *soops, ListBase *tree, int filter_te_flag, int filter_tselem_flag,
+                            TreeTraversalFunc func, void *customdata);
+
+
 #endif /* __OUTLINER_INTERN_H__ */
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index ad2b8008db6..ecfd12618e5 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -28,29 +28,392 @@
  *  \ingroup spoutliner
  */
 
-#include "DNA_space_types.h"
+#include "MEM_guardedalloc.h"
 
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "DNA_group_types.h"
+
+#include "BLT_translation.h"
+
+#include "BKE_context.h"
+#include "BKE_main.h"
+
+#include "GPU_immediate.h"
 
 #include "RNA_access.h"
 
+#include "UI_interface.h"
+#include "UI_view2d.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+
 #include "outliner_intern.h"
 
+typedef struct OutlinerDragDropTooltip {
+	TreeElement *te;
+	void *handle;
+} OutlinerDragDropTooltip;
+
+enum {
+	OUTLINER_ITEM_DRAG_CANCEL,
+	OUTLINER_ITEM_DRAG_CONFIRM,
+};
+
+static int outliner_item_drag_drop_poll(bContext *C)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	return ED_operator_outliner_active(C) &&
+	       /* Only collection display modes supported for now. Others need more design work */
+	       ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_LIBRARIES);
+}
+
+static TreeElement *outliner_item_drag_element_find(SpaceOops *soops, ARegion *ar, const wmEvent *event)
+{
+	/* note: using EVT_TWEAK_ events to trigger dragging is fine,
+	 * it sends coordinates from where dragging was started */
+	const float my = UI_view2d_region_to_view_y(&ar->v2d, event->mval[1]);
+	return outliner_find_item_at_y(soops, &soops->tree, my);
+}
+
+static void outliner_item_drag_end(wmWindow *win, OutlinerDragDropTooltip *data)
+{
+	MEM_SAFE_FREE(data->te->drag_data);
+
+	if (data->handle) {
+		WM_draw_cb_exit(win, data->handle);
+	}
+
+	MEM_SAFE_FREE(data);
+}
+
+static void outliner_item_drag_get_insert_data(
+        const SpaceOops *soops, ARegion *ar, const wmEvent *event, TreeElement *te_dragged,
+        TreeElement **r_te_insert_handle, TreeElementInsertType *r_insert_type)
+{
+	TreeElement *te_hovered;
+	float view_mval[2];
+
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &view_mval[0], &view_mval[1]);
+	te_hovered = outliner_find_item_at_y(soops, &soops->tree, view_mval[1]);
+
+	if (te_hovered) {
+		/* mouse hovers an element (ignoring x-axis), now find out how to insert the dragged item exactly */
+
+		if (te_hovered == te_dragged) {
+			*r_te_insert_handle = te_dragged;
+		}
+		else if (te_hovered != te_dragged) {
+			const float margin = UI_UNIT_Y * (1.0f / 4);
+
+			*r_te_insert_handle = te_hovered;
+			if (view_mval[1] < (te_hovered->ys + margin)) {
+				if (TSELEM_OPEN(TREESTORE(te_hovered), soops)) {
+					/* inserting after a open item means we insert into it, but as first child */
+					if (BLI_listbase_is_empty(&te_hovered->subtree)) {
+						*r_insert_type = TE_INSERT_INTO;
+					}
+					else {
+						*r_insert_type = TE_INSERT_BEFORE;
+						*r_te_insert_handle = te_hovered->subtree.first;
+					}
+				}
+				else {
+					*r_insert_type = TE_INSERT_AFTER;
+				}
+			}
+			else if (view_mval[1] > (te_hovered->ys + (3 * margin))) {
+				*r_insert_type = TE_INSERT_BEFORE;
+			}
+			else {
+				*r_insert_type = TE_INSERT_INTO;
+			}
+		}
+	}
+	else {
+		/* mouse doesn't hover any item (ignoring x-axis), so it's either above list bounds or below. */
+
+		TreeElement *first = soops->tree.first;
+		TreeElement *last = soops->tree.last;
+
+		if (view_mval[1] < last->ys) {
+			*r_te_insert_handle = last;
+			*r_insert_type = TE_INSERT_AFTER;
+		}
+		else if (view_mval[1] > (first->ys + UI_UNIT_Y)) {
+			*r_te_insert_handle = first;
+			*r_insert_type = TE_INSERT_BEFORE;
+		}
+		else {
+			BLI_assert(0);
+		}
+	}
+}
+
+static void outliner_item_drag_handle(
+        SpaceOops *soops, ARegion *ar, const wmEvent *event, TreeElement *te_dragged)
+{
+	TreeElement *te_insert_handle;
+	TreeElementInsertType insert_type;
+
+	outliner_item_drag_get_insert_data(soops, ar, event, te_dragged, &te_insert_handle, &insert_type);
+
+	if (!te_dragged->reinsert_poll &&
+	    /* there is no reinsert_poll, so we do some generic checks (same types and reinsert callback is available) */
+	    (TREESTORE(te_dragged)->type == TREESTORE(te_insert_handle)->type) &&
+	    te_dragged->reinsert)
+	{
+		/* pass */
+	}
+	else if (te_dragged == te_insert_handle) {
+		/* nothing will happen anyway, no need to do poll check */
+	}
+	else if (!te_dragged->reinsert_poll ||
+	         !te_dragged->reinsert_poll(te_dragged, &te_insert_handle, &insert_type))
+	{
+		te_insert_handle = NULL;
+	}
+	te_dragged->drag_data->insert_type = insert_type;
+	te_dragged->drag_data->insert_handle = te_insert_handle;
+}
+
+/**
+ * Returns true if it is a collection and empty.
+ */
+static bool is_empty_collection(TreeElement *te)
+{
+	Collection *collection = outliner_collection_from_tree_element(te);
+
+	if (!collection) {
+		return false;
+	}
+
+	return BLI_listbase_is_empty(&collection->gobject) &&
+	       BLI_listbase_is_empty(&collection->children);
+}
+
+static bool outliner_item_drag_drop_apply(
+        Main *bmain,
+        Scene *scene,
+        SpaceOops *soops,
+        OutlinerDragDropTooltip *data,
+        const wmEvent *event)
+{
+	TreeElement *dragged_te = data->te;
+	TreeElement *insert_handle = dragged_te->drag_data->insert_handle;
+	TreeElementInsertType insert_type = dragged_te->drag_data->insert_type;
+
+	if ((insert_handle == dragged_te) || !insert_handle) {
+		/* No need to do anything */
+	}
+	else if (dragged_te->reinsert) {
+		BLI_assert(!dragged_te->reinsert_poll || dragged_te->reinsert_poll(dragged_te, &insert_handle,
+		                                                                   &insert_type));
+		/* call of assert above should not have changed insert_handle and insert_type at this point */
+		BLI_assert(dragged_te->drag_data->insert_handle == insert_handle &&
+		           dragged_te->drag_data->insert_type == insert_type);
+
+		/* If the collection was just created and you moved objects/collections inside it,
+		 * it is strange to have it closed and we not see the newly dragged elements. */
+		const bool should_open_collection = (insert_type == TE_INSERT_INTO) && is_empty_collection(insert_handle);
+
+		dragged_te->reinsert(bmain, scene, soops, dragged_te, insert_handle, insert_type, event);
+
+		if (should_open_collection && !is_empty_collection(insert_handle)) {
+			TREESTORE(insert_handle)->flag &= ~TSE_CLOSED;
+		}
+		return true;
+	}
+
+	return false;
+}
+
+static int outliner_item_drag_drop_modal(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	OutlinerDragDropTooltip *data = op->customdata;
+	TreeElement *te_dragged = data->te;
+	int retval = OPERATOR_RUNNING_MODAL;
+	bool redraw = false;
+	bool skip_rebuild = true;
+
+	switch (event->type) {
+		case EVT_MODAL_MAP:
+			if (event->val == OUTLINER_ITEM_DRAG_CONFIRM) {
+				if (outliner_item_drag_drop_apply(bmain, scene, soops, data, event)) {
+					skip_rebuild = false;
+				}
+				retval = OPERATOR_FINISHED;
+			}
+			else if (event->val == OUTLINER_ITEM_DRAG_CANCEL) {
+				retval = OPERATOR_CANCELLED;
+			}
+			else {
+				BLI_assert(0);
+			}
+			WM_event_add_mousemove(C); /* update highlight */
+			outliner_item_drag_end(CTX_wm_window(C), data);
+			redraw = true;
+			break;
+		case MOUSEMOVE:
+			outliner_item_drag_handle(soops, ar, event, te_dragged);
+			redraw = true;
+			break;
+	}
+
+	if (redraw) {
+		if (skip_rebuild) {
+			ED_region_tag_redraw_no_rebuild(ar);
+		}
+		else {
+			ED_region_tag_redraw(ar);
+		}
+	}
+
+	return retval;
+}
+
+static const char *outliner_drag_drop_tooltip_get(
+        const TreeElement *te_float)
+{
+	const char *name = NULL;
+
+	const TreeElement *te_insert = te_float->drag_data->insert_handle;
+	if (te_float && outliner_is_collection_tree_element(te_float)) {
+		if (te_insert == NULL) {
+			name = TIP_("Move collection");
+		}
+		else {
+			switch (te_float->drag_data->insert_type) {
+				case TE_INSERT_BEFORE:
+					if (te_insert->prev && outliner_is_collection_tree_element(te_insert->prev)) {
+						name = TIP_("Move between collections");
+					}
+					else {
+						name = TIP_("Move before collection");
+					}
+					break;
+				case TE_INSERT_AFTER:
+					if (te_insert->next && outliner_is_collection_tree_element(te_insert->next)) {
+						name = TIP_("Move between collections");
+					}
+					else {
+						name = TIP_("Move after collection");
+					}
+					break;
+				case TE_INSERT_INTO:
+					name = TIP_("Move inside collection");
+					break;
+			}
+		}
+	}
+	else if ((TREESTORE(te_float)->type == 0) && (te_float->idcode == ID_OB)) {
+		name = TIP_("Move to collection (Ctrl to link)");
+	}
+
+	return name;
+}
+
+static void outliner_drag_drop_tooltip_cb(const wmWindow *win, void *vdata)
+{
+	OutlinerDragDropTooltip *data = vdata;
+	const char *tooltip;
+
+	int cursorx, cursory;
+	int x, y;
+
+	tooltip = outliner_drag_drop_tooltip_get(data->te);
+	if (tooltip == NULL) {
+		return;
+	}
+
+	cursorx = win->eventstate->x;
+	cursory = win->eventstate->y;
+
+	x = cursorx + U.widget_unit;
+	y = cursory - U.widget_unit;
+
+	/* Drawing. */
+	const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
+
+	const float col_fg[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	const float col_bg[4] = {0.0f, 0.0f, 0.0f, 0.2f};
+
+	glEnable(GL_BLEND);
+	UI_fontstyle_draw_simple_backdrop(fstyle, x, y, tooltip, col_fg, col_bg);
+	glDisable(GL_BLEND);
+}
+
+static int outliner_item_drag_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te_dragged = outliner_item_drag_element_find(soops, ar, event);
+
+	if (!te_dragged) {
+		return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
+	}
+
+	OutlinerDragDropTooltip *data = MEM_mallocN(sizeof(OutlinerDragDropTooltip), __func__);
+	data->te = te_dragged;
+
+	op->customdata = data;
+	te_dragged->drag_data = MEM_callocN(sizeof(*te_dragged->drag_data), __func__);
+	/* by default we don't change the item position */
+	te_dragged->drag_data->insert_handle = te_dragged;
+	/* unset highlighted tree element, dragged one will be highlighted instead */
+	outliner_set_flag(&soops->tree, TSE_HIGHLIGHTED, false);
+
+	ED_region_tag_redraw_no_rebuild(ar);
+
+	WM_event_add_modal_handler(C, op);
+
+	data->handle = WM_draw_cb_activate(CTX_wm_window(C), outliner_drag_drop_tooltip_cb, data);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+/**
+ * Notes about Outliner Item Drag 'n Drop:
+ * Right now only collections display mode is supported. But ideally all/most modes would support this. There are
+ * just some open design questions that have to be answered: do we want to allow mixing order of different data types
+ * (like render-layers and objects)? Would that be a purely visual change or would that have any other effect? ...
+ */
+static void OUTLINER_OT_item_drag_drop(wmOperatorType *ot)
+{
+	ot->name = "Drag and Drop Item";
+	ot->idname = "OUTLINER_OT_item_drag_drop";
+	ot->description = "Change the hierarchical position of an item by repositioning it using drag and drop";
+
+	ot->invoke = outliner_item_drag_drop_invoke;
+	ot->modal = outliner_item_drag_drop_modal;
+
+	ot->poll = outliner_item_drag_drop_poll;
+
+	ot->flag = OPTYPE_UNDO;
+}
+
 
 /* ************************** registration **********************************/
 
 void outliner_operatortypes(void)
 {
+	WM_operatortype_append(OUTLINER_OT_highlight_update);
 	WM_operatortype_append(OUTLINER_OT_item_activate);
 	WM_operatortype_append(OUTLINER_OT_select_border);
 	WM_operatortype_append(OUTLINER_OT_item_openclose);
 	WM_operatortype_append(OUTLINER_OT_item_rename);
+	WM_operatortype_append(OUTLINER_OT_item_drag_drop);
 	WM_operatortype_append(OUTLINER_OT_operation);
 	WM_operatortype_append(OUTLINER_OT_scene_operation);
 	WM_operatortype_append(OUTLINER_OT_object_operation);
-	WM_operatortype_append(OUTLINER_OT_group_operation);
 	WM_operatortype_append(OUTLINER_OT_lib_operation);
 	WM_operatortype_append(OUTLINER_OT_lib_relocate);
 	WM_operatortype_append(OUTLINER_OT_id_operation);
@@ -70,10 +433,6 @@ void outliner_operatortypes(void)
 	WM_operatortype_append(OUTLINER_OT_selected_toggle);
 	WM_operatortype_append(OUTLINER_OT_expanded_toggle);
 
-	WM_operatortype_append(OUTLINER_OT_renderability_toggle);
-	WM_operatortype_append(OUTLINER_OT_selectability_toggle);
-	WM_operatortype_append(OUTLINER_OT_visibility_toggle);
-
 	WM_operatortype_append(OUTLINER_OT_keyingset_add_selected);
 	WM_operatortype_append(OUTLINER_OT_keyingset_remove_selected);
 
@@ -86,7 +445,48 @@ void outliner_operatortypes(void)
 	WM_operatortype_append(OUTLINER_OT_parent_clear);
 	WM_operatortype_append(OUTLINER_OT_scene_drop);
 	WM_operatortype_append(OUTLINER_OT_material_drop);
-	WM_operatortype_append(OUTLINER_OT_group_link);
+	WM_operatortype_append(OUTLINER_OT_collection_drop);
+
+	/* collections */
+	WM_operatortype_append(OUTLINER_OT_collection_new);
+	WM_operatortype_append(OUTLINER_OT_collection_duplicate);
+	WM_operatortype_append(OUTLINER_OT_collection_delete);
+	WM_operatortype_append(OUTLINER_OT_collection_objects_select);
+	WM_operatortype_append(OUTLINER_OT_collection_objects_deselect);
+	WM_operatortype_append(OUTLINER_OT_collection_link);
+	WM_operatortype_append(OUTLINER_OT_collection_instance);
+	WM_operatortype_append(OUTLINER_OT_collection_exclude_set);
+	WM_operatortype_append(OUTLINER_OT_collection_include_set);
+}
+
+static wmKeyMap *outliner_item_drag_drop_modal_keymap(wmKeyConfig *keyconf)
+{
+	static EnumPropertyItem modal_items[] = {
+		{OUTLINER_ITEM_DRAG_CANCEL,  "CANCEL",  0, "Cancel", ""},
+		{OUTLINER_ITEM_DRAG_CONFIRM, "CONFIRM", 0, "Confirm/Drop", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	const char *map_name = "Outliner Item Drap 'n Drop Modal Map";
+
+	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, map_name);
+
+	/* this function is called for each spacetype, only needs to add map once */
+	if (keymap && keymap->modal_items)
+		return NULL;
+
+	keymap = WM_modalkeymap_add(keyconf, map_name, modal_items);
+
+	/* items for modal map */
+	WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, OUTLINER_ITEM_DRAG_CANCEL);
+	WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_PRESS, KM_ANY, 0, OUTLINER_ITEM_DRAG_CANCEL);
+
+	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, OUTLINER_ITEM_DRAG_CONFIRM);
+	WM_modalkeymap_add_item(keymap, RETKEY, KM_RELEASE, KM_ANY, 0, OUTLINER_ITEM_DRAG_CONFIRM);
+	WM_modalkeymap_add_item(keymap, PADENTER, KM_RELEASE, KM_ANY, 0, OUTLINER_ITEM_DRAG_CONFIRM);
+
+	WM_modalkeymap_assign(keymap, "OUTLINER_OT_item_drag_drop");
+
+	return keymap;
 }
 
 void outliner_keymap(wmKeyConfig *keyconf)
@@ -94,6 +494,8 @@ void outliner_keymap(wmKeyConfig *keyconf)
 	wmKeyMap *keymap = WM_keymap_find(keyconf, "Outliner", SPACE_OUTLINER, 0);
 	wmKeyMapItem *kmi;
 
+	WM_keymap_add_item(keymap, "OUTLINER_OT_highlight_update", MOUSEMOVE, KM_ANY, KM_ANY, 0);
+
 	WM_keymap_add_item(keymap, "OUTLINER_OT_item_rename", LEFTMOUSE, KM_DBL_CLICK, 0, 0);
 
 	kmi = WM_keymap_add_item(keymap, "OUTLINER_OT_item_activate", LEFTMOUSE, KM_CLICK, 0, 0);
@@ -123,6 +525,8 @@ void outliner_keymap(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "OUTLINER_OT_item_rename", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "OUTLINER_OT_operation", RIGHTMOUSE, KM_PRESS, 0, 0);
 
+	WM_keymap_add_item(keymap, "OUTLINER_OT_item_drag_drop", EVT_TWEAK_L, KM_ANY, 0, 0);
+
 	WM_keymap_add_item(keymap, "OUTLINER_OT_show_hierarchy", HOMEKEY, KM_PRESS, 0, 0);
 
 	WM_keymap_add_item(keymap, "OUTLINER_OT_show_active", PERIODKEY, KM_PRESS, 0, 0);
@@ -140,11 +544,6 @@ void outliner_keymap(wmKeyConfig *keyconf)
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_selected_toggle", AKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_expanded_toggle", AKEY, KM_PRESS, KM_SHIFT, 0);
 
-	WM_keymap_verify_item(keymap, "OUTLINER_OT_renderability_toggle", RKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "OUTLINER_OT_selectability_toggle", SKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "OUTLINER_OT_visibility_toggle", VKEY, KM_PRESS, 0, 0);
-
-
 	/* keying sets - only for databrowse */
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_add_selected", KKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_remove_selected", KKEY, KM_PRESS, KM_ALT, 0);
@@ -154,5 +553,13 @@ void outliner_keymap(wmKeyConfig *keyconf)
 
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_drivers_add_selected", DKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "OUTLINER_OT_drivers_delete_selected", DKEY, KM_PRESS, KM_ALT, 0);
+
+	WM_keymap_verify_item(keymap, "OUTLINER_OT_collection_new", CKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "OUTLINER_OT_collection_delete", XKEY, KM_PRESS, 0, 0);
+
+	WM_keymap_verify_item(keymap, "OBJECT_OT_move_to_collection", MKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_link_to_collection", MKEY, KM_PRESS, KM_SHIFT, 0);
+
+	outliner_item_drag_drop_modal_keymap(keyconf);
 }
 
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 5149715740f..441765528d1 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -43,12 +43,16 @@
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 
+#include "BKE_armature.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
-#include "BKE_armature.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph.h"
 
 #include "ED_armature.h"
 #include "ED_object.h"
@@ -68,61 +72,88 @@
 
 #include "outliner_intern.h"
 
-/* ****************************************************** */
-/* Outliner Selection (gray-blue highlight for rows) */
-
-static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *selecting)
+static void do_outliner_activate_obdata(bContext *C, Scene *scene, ViewLayer *view_layer, Base *base)
 {
-	TreeElement *te;
-	TreeStoreElem *tselem;
-	bool changed = false;
-
-	for (te = lb->first; te && *index >= 0; te = te->next, (*index)--) {
-		tselem = TREESTORE(te);
-
-		/* if we've encountered the right item, set its 'Outliner' selection status */
-		if (*index == 0) {
-			/* this should be the last one, so no need to do anything with index */
-			if ((te->flag & TE_ICONROW) == 0) {
-				/* -1 value means toggle testing for now... */
-				if (*selecting == -1) {
-					if (tselem->flag & TSE_SELECTED)
-						*selecting = 0;
-					else
-						*selecting = 1;
-				}
+	Object *obact = OBACT(view_layer);
+	bool use_all = false;
 
-				/* set selection */
-				if (*selecting)
-					tselem->flag |= TSE_SELECTED;
-				else
-					tselem->flag &= ~TSE_SELECTED;
+	if (obact == NULL) {
+		ED_object_base_activate(C, base);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+		obact = base->object;
+		use_all = true;
+	}
+	else if (obact->data == base->object->data) {
+		use_all = true;
+	}
 
-				changed |= true;
+	if (use_all) {
+		WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
+	}
+	else {
+		Object *ob = base->object;
+		if (ob->type == obact->type) {
+			bool ok;
+			if (BKE_object_is_in_editmode(ob)) {
+				ok = ED_object_editmode_exit_ex(scene, ob, EM_FREEDATA | EM_WAITCURSOR);
+			}
+			else {
+				ok = ED_object_editmode_enter_ex(CTX_data_main(C), scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT);
+			}
+			if (ok) {
+				ED_object_base_select(base, (ob->mode & OB_MODE_EDIT) ? BA_SELECT : BA_DESELECT);
+				WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 			}
 		}
-		else if (TSELEM_OPEN(tselem, soops)) {
-			/* Only try selecting sub-elements if we haven't hit the right element yet
-			 *
-			 * Hack warning:
-			 *  Index must be reduced before supplying it to the sub-tree to try to do
-			 *  selection, however, we need to increment it again for the next loop to
-			 *  function correctly
-			 */
-			(*index)--;
-			changed |= outliner_select(soops, &te->subtree, index, selecting);
-			(*index)++;
-		}
+	}
+}
+
+static void do_outliner_activate_pose(bContext *C, ViewLayer *view_layer, Base *base)
+{
+	Object *obact = OBACT(view_layer);
+	bool use_all = false;
+
+	if (obact == NULL) {
+		ED_object_base_activate(C, base);
+		Scene *scene = CTX_data_scene(C);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+		obact = base->object;
+		use_all = true;
+	}
+	else if (obact->data == base->object->data) {
+		use_all = true;
 	}
 
-	return changed;
+	if (use_all) {
+		WM_operator_name_call(C, "OBJECT_OT_posemode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
+	}
+	else {
+		Object *ob = base->object;
+		if (ob->type == obact->type) {
+			struct Main *bmain = CTX_data_main(C);
+			bool ok = false;
+			if (ob->mode & OB_MODE_POSE) {
+				ok = ED_object_posemode_exit_ex(bmain, ob);
+			}
+			else {
+				ok = ED_object_posemode_enter_ex(bmain, ob);
+			}
+			if (ok) {
+				ED_object_base_select(base, (ob->mode & OB_MODE_POSE) ? BA_SELECT : BA_DESELECT);
+
+				Scene *scene = CTX_data_scene(C);
+				WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, NULL);
+				WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+			}
+		}
+	}
 }
 
 /* ****************************************************** */
 /* Outliner Element Selection/Activation on Click */
 
-static eOLDrawState tree_element_active_renderlayer(
-        bContext *C, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+static eOLDrawState active_viewlayer(
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Scene *sce;
 
@@ -131,12 +162,15 @@ static eOLDrawState tree_element_active_renderlayer(
 		return OL_DRAWSEL_NONE;
 	sce = (Scene *)tselem->id;
 
+	WorkSpace *workspace = CTX_wm_workspace(C);
+	ViewLayer *view_layer = te->directdata;
+
 	if (set != OL_SETSEL_NONE) {
-		sce->r.actlay = tselem->nr;
-		WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, sce);
+		BKE_workspace_view_layer_set(workspace, view_layer, sce);
+		WM_event_add_notifier(C, NC_SCREEN | ND_LAYER, NULL);
 	}
 	else {
-		return sce->r.actlay == tselem->nr;
+		return BKE_workspace_view_layer_get(workspace, sce) == view_layer;
 	}
 	return OL_DRAWSEL_NONE;
 }
@@ -146,14 +180,14 @@ static eOLDrawState tree_element_active_renderlayer(
  * CTRL+LMB: Select/Deselect object and all children.
  * CTRL+SHIFT+LMB: Add/Remove object and all children.
  */
-static void do_outliner_object_select_recursive(Scene *scene, Object *ob_parent, bool select)
+static void do_outliner_object_select_recursive(ViewLayer *view_layer, Object *ob_parent, bool select)
 {
 	Base *base;
 
-	for (base = FIRSTBASE; base; base = base->next) {
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
 		Object *ob = base->object;
-		if ((((ob->restrictflag & OB_RESTRICT_VIEW) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) {
-			ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT);
+		if ((((base->flag & BASE_VISIBLED) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) {
+			ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT);
 		}
 	}
 }
@@ -184,7 +218,7 @@ static void do_outliner_ebone_select_recursive(bArmature *arm, EditBone *ebone_p
 }
 
 static eOLDrawState tree_element_set_active_object(
-        bContext *C, Scene *scene, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *view_layer, SpaceOops *soops,
         TreeElement *te, const eOLSetState set, bool recursive)
 {
 	TreeStoreElem *tselem = TREESTORE(te);
@@ -198,7 +232,7 @@ static eOLDrawState tree_element_set_active_object(
 	}
 	else {
 		ob = (Object *)outliner_search_back(soops, te, ID_OB);
-		if (ob == OBACT) {
+		if (ob == OBACT(view_layer)) {
 			return OL_DRAWSEL_NONE;
 		}
 	}
@@ -208,46 +242,71 @@ static eOLDrawState tree_element_set_active_object(
 
 	sce = (Scene *)outliner_search_back(soops, te, ID_SCE);
 	if (sce && scene != sce) {
-		ED_screen_set_scene(C, CTX_wm_screen(C), sce);
+		WM_window_change_active_scene(CTX_data_main(C), C, CTX_wm_window(C), sce);
 		scene = sce;
 	}
 
 	/* find associated base in current scene */
-	base = BKE_scene_base_find(scene, ob);
+	base = BKE_view_layer_base_find(view_layer, ob);
+
+#ifdef USE_OBJECT_MODE_STRICT
+	if (base != NULL) {
+		Object *obact = OBACT(view_layer);
+		const eObjectMode object_mode = obact ? obact->mode : OB_MODE_OBJECT;
+		if (base && !BKE_object_is_mode_compat(base->object, object_mode)) {
+			if (object_mode == OB_MODE_OBJECT) {
+				struct Main *bmain = CTX_data_main(C);
+				Depsgraph *depsgraph = CTX_data_depsgraph(C);
+				ED_object_mode_generic_exit(bmain, depsgraph, scene, base->object);
+			}
+			if (!BKE_object_is_mode_compat(base->object, object_mode)) {
+				base = NULL;
+			}
+		}
+	}
+#endif
 
 	if (base) {
 		if (set == OL_SETSEL_EXTEND) {
 			/* swap select */
-			if (base->flag & SELECT)
-				ED_base_object_select(base, BA_DESELECT);
+			if (base->flag & BASE_SELECTED)
+				ED_object_base_select(base, BA_DESELECT);
 			else
-				ED_base_object_select(base, BA_SELECT);
+				ED_object_base_select(base, BA_SELECT);
 		}
 		else {
 			/* deleselect all */
-			BKE_scene_base_deselect_all(scene);
-			ED_base_object_select(base, BA_SELECT);
+#ifdef USE_OBJECT_MODE_STRICT
+			/* Only in object mode so we can switch the active object,
+			 * keeping all objects in the current 'mode' selected, useful for multi-pose/edit mode.
+			 * This keeps the convention that all objects in the current mode are also selected. see T55246. */
+			if (ob->mode == OB_MODE_OBJECT)
+#endif
+			{
+				BKE_view_layer_base_deselect_all(view_layer);
+			}
+			ED_object_base_select(base, BA_SELECT);
 		}
 
 		if (recursive) {
 			/* Recursive select/deselect for Object hierarchies */
-			do_outliner_object_select_recursive(scene, ob, (ob->flag & SELECT) != 0);
+			do_outliner_object_select_recursive(view_layer, ob, (base->flag & BASE_SELECTED) != 0);
 		}
 
-		if (C) {
-			ED_base_object_activate(C, base); /* adds notifier */
+		if (set != OL_SETSEL_NONE) {
+			ED_object_base_activate(C, base); /* adds notifier */
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 		}
-	}
-
-	if (ob != scene->obedit)
-		ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
 
+		if (ob != OBEDIT_FROM_VIEW_LAYER(view_layer)) {
+			ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
+		}
+	}
 	return OL_DRAWSEL_NORMAL;
 }
 
 static eOLDrawState tree_element_active_material(
-        bContext *C, Scene *scene, SpaceOops *soops,
+        bContext *C, Scene *UNUSED(scene), ViewLayer *view_layer, SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	TreeElement *tes;
@@ -256,7 +315,7 @@ static eOLDrawState tree_element_active_material(
 	/* we search for the object parent */
 	ob = (Object *)outliner_search_back(soops, te, ID_OB);
 	// note: ob->matbits can be NULL when a local object points to a library mesh.
-	if (ob == NULL || ob != OBACT || ob->matbits == NULL) {
+	if (ob == NULL || ob != OBACT(view_layer) || ob->matbits == NULL) {
 		return OL_DRAWSEL_NONE;  /* just paranoia */
 	}
 
@@ -293,108 +352,21 @@ static eOLDrawState tree_element_active_material(
 		/* Tagging object for update seems a bit stupid here, but looks like we have to do it
 		 * for render views to update. See T42973.
 		 * Note that RNA material update does it too, see e.g. rna_MaterialSlot_update(). */
-		DAG_id_tag_update((ID *)ob, OB_RECALC_OB);
+		DEG_id_tag_update((ID *)ob, OB_RECALC_OB);
 		WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_LINKS, NULL);
 	}
 	return OL_DRAWSEL_NONE;
 }
 
-static eOLDrawState tree_element_active_texture(
-        bContext *C, Scene *scene, SpaceOops *UNUSED(soops),
-        TreeElement *te, const eOLSetState set)
-{
-	TreeElement *tep;
-	TreeStoreElem /* *tselem,*/ *tselemp;
-	Object *ob = OBACT;
-	SpaceButs *sbuts = NULL;
-
-	if (ob == NULL) {
-		/* no active object */
-		return OL_DRAWSEL_NONE;
-	}
-
-	/*tselem = TREESTORE(te);*/ /*UNUSED*/
-
-	/* find buttons region (note, this is undefined really still, needs recode in blender) */
-	/* XXX removed finding sbuts */
-
-	/* where is texture linked to? */
-	tep = te->parent;
-	tselemp = TREESTORE(tep);
-
-	if (tep->idcode == ID_WO) {
-		World *wrld = (World *)tselemp->id;
-
-		if (set != OL_SETSEL_NONE) {
-			if (sbuts) {
-				// XXX sbuts->tabo = TAB_SHADING_TEX;	// hack from header_buttonswin.c
-				// XXX sbuts->texfrom = 1;
-			}
-// XXX			extern_set_butspace(F6KEY, 0);	// force shading buttons texture
-			wrld->texact = te->index;
-		}
-		else if (tselemp->id == (ID *)(scene->world)) {
-			if (wrld->texact == te->index) {
-				return OL_DRAWSEL_NORMAL;
-			}
-		}
-	}
-	else if (tep->idcode == ID_LA) {
-		Lamp *la = (Lamp *)tselemp->id;
-		if (set != OL_SETSEL_NONE) {
-			if (sbuts) {
-				// XXX sbuts->tabo = TAB_SHADING_TEX;	// hack from header_buttonswin.c
-				// XXX sbuts->texfrom = 2;
-			}
-// XXX			extern_set_butspace(F6KEY, 0);	// force shading buttons texture
-			la->texact = te->index;
-		}
-		else {
-			if (tselemp->id == ob->data) {
-				if (la->texact == te->index) {
-					return OL_DRAWSEL_NORMAL;
-				}
-			}
-		}
-	}
-	else if (tep->idcode == ID_MA) {
-		Material *ma = (Material *)tselemp->id;
-		if (set != OL_SETSEL_NONE) {
-			if (sbuts) {
-				//sbuts->tabo = TAB_SHADING_TEX;	// hack from header_buttonswin.c
-				// XXX sbuts->texfrom = 0;
-			}
-// XXX			extern_set_butspace(F6KEY, 0);	// force shading buttons texture
-			ma->texact = (char)te->index;
-
-			/* also set active material */
-			ob->actcol = tep->index + 1;
-		}
-		else if (tep->flag & TE_ACTIVE) {   // this is active material
-			if (ma->texact == te->index) {
-				return OL_DRAWSEL_NORMAL;
-			}
-		}
-	}
-
-	if (set != OL_SETSEL_NONE) {
-		WM_event_add_notifier(C, NC_TEXTURE, NULL);
-	}
-
-	/* no active object */
-	return OL_DRAWSEL_NONE;
-}
-
-
 static eOLDrawState tree_element_active_lamp(
-        bContext *UNUSED(C), Scene *scene, SpaceOops *soops,
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *view_layer, SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	Object *ob;
 
 	/* we search for the object parent */
 	ob = (Object *)outliner_search_back(soops, te, ID_OB);
-	if (ob == NULL || ob != OBACT) {
+	if (ob == NULL || ob != OBACT(view_layer)) {
 		/* just paranoia */
 		return OL_DRAWSEL_NONE;
 	}
@@ -410,7 +382,7 @@ static eOLDrawState tree_element_active_lamp(
 }
 
 static eOLDrawState tree_element_active_camera(
-        bContext *UNUSED(C), Scene *scene, SpaceOops *soops,
+        bContext *UNUSED(C), Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	Object *ob = (Object *)outliner_search_back(soops, te, ID_OB);
@@ -423,7 +395,7 @@ static eOLDrawState tree_element_active_camera(
 }
 
 static eOLDrawState tree_element_active_world(
-        bContext *C, Scene *scene, SpaceOops *UNUSED(soops),
+        bContext *C, Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
         TreeElement *te, const eOLSetState set)
 {
 	TreeElement *tep;
@@ -440,7 +412,7 @@ static eOLDrawState tree_element_active_world(
 	if (set != OL_SETSEL_NONE) {
 		/* make new scene active */
 		if (sce && scene != sce) {
-			ED_screen_set_scene(C, CTX_wm_screen(C), sce);
+			WM_window_change_active_scene(CTX_data_main(C), C, CTX_wm_window(C), sce);
 		}
 	}
 
@@ -456,7 +428,7 @@ static eOLDrawState tree_element_active_world(
 }
 
 static eOLDrawState tree_element_active_defgroup(
-        bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, ViewLayer *view_layer, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob;
 
@@ -466,21 +438,20 @@ static eOLDrawState tree_element_active_defgroup(
 		BLI_assert(te->index + 1 >= 0);
 		ob->actdef = te->index + 1;
 
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
 	}
 	else {
-		if (ob == OBACT) {
+		if (ob == OBACT(view_layer))
 			if (ob->actdef == te->index + 1) {
 				return OL_DRAWSEL_NORMAL;
 			}
-		}
 	}
 	return OL_DRAWSEL_NONE;
 }
 
 static eOLDrawState tree_element_active_posegroup(
-        bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *view_layer, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob = (Object *)tselem->id;
 
@@ -491,7 +462,7 @@ static eOLDrawState tree_element_active_posegroup(
 		}
 	}
 	else {
-		if (ob == OBACT && ob->pose) {
+		if (ob == OBACT(view_layer) && ob->pose) {
 			if (ob->pose->active_group == te->index + 1) {
 				return OL_DRAWSEL_NORMAL;
 			}
@@ -501,7 +472,7 @@ static eOLDrawState tree_element_active_posegroup(
 }
 
 static eOLDrawState tree_element_active_posechannel(
-        bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *view_layer, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	Object *ob = (Object *)tselem->id;
 	bArmature *arm = ob->data;
@@ -535,7 +506,7 @@ static eOLDrawState tree_element_active_posechannel(
 		}
 	}
 	else {
-		if (ob == OBACT && ob->pose) {
+		if (ob == OBACT(view_layer) && ob->pose) {
 			if (pchan->bone->flag & BONE_SELECTED) {
 				return OL_DRAWSEL_NORMAL;
 			}
@@ -545,14 +516,14 @@ static eOLDrawState tree_element_active_posechannel(
 }
 
 static eOLDrawState tree_element_active_bone(
-        bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
+        bContext *C, ViewLayer *view_layer, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	bArmature *arm = (bArmature *)tselem->id;
 	Bone *bone = te->directdata;
 
 	if (set != OL_SETSEL_NONE) {
 		if (!(bone->flag & BONE_HIDDEN_P)) {
-			Object *ob = OBACT;
+			Object *ob = OBACT(view_layer);
 			if (ob) {
 				if (set != OL_SETSEL_EXTEND) {
 					/* single select forces all other bones to get unselected */
@@ -581,7 +552,7 @@ static eOLDrawState tree_element_active_bone(
 		}
 	}
 	else {
-		Object *ob = OBACT;
+		Object *ob = OBACT(view_layer);
 
 		if (ob && ob->data == arm) {
 			if (bone->flag & BONE_SELECTED) {
@@ -594,7 +565,7 @@ static eOLDrawState tree_element_active_bone(
 
 
 /* ebones only draw in editmode armature */
-static void tree_element_active_ebone__sel(bContext *C, Scene *scene, bArmature *arm, EditBone *ebone, short sel)
+static void tree_element_active_ebone__sel(bContext *C, Object *obedit, bArmature *arm, EditBone *ebone, short sel)
 {
 	if (sel) {
 		ebone->flag |= BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL;
@@ -608,34 +579,34 @@ static void tree_element_active_ebone__sel(bContext *C, Scene *scene, bArmature
 		if (ebone->parent && (ebone->flag & BONE_CONNECTED)) ebone->parent->flag &= ~BONE_TIPSEL;
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, scene->obedit);
+	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, obedit);
 }
 static eOLDrawState tree_element_active_ebone(
-        bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set, bool recursive)
+        bContext *C, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set, bool recursive)
 {
-	BLI_assert(scene->obedit != NULL);
-
-	bArmature *arm = scene->obedit->data;
+	Object *obedit = CTX_data_edit_object(C);
+	BLI_assert(obedit != NULL);
+	bArmature *arm = obedit->data;
 	EditBone *ebone = te->directdata;
 	eOLDrawState status = OL_DRAWSEL_NONE;
 
 	if (set != OL_SETSEL_NONE) {
 		if (set == OL_SETSEL_NORMAL) {
 			if (!(ebone->flag & BONE_HIDDEN_A)) {
-				ED_armature_edit_deselect_all(scene->obedit);
-				tree_element_active_ebone__sel(C, scene, arm, ebone, true);
+				ED_armature_edit_deselect_all(obedit);
+				tree_element_active_ebone__sel(C, obedit, arm, ebone, true);
 				status = OL_DRAWSEL_NORMAL;
 			}
 		}
 		else if (set == OL_SETSEL_EXTEND) {
 			if (!(ebone->flag & BONE_HIDDEN_A)) {
 				if (!(ebone->flag & BONE_SELECTED)) {
-					tree_element_active_ebone__sel(C, scene, arm, ebone, true);
+					tree_element_active_ebone__sel(C, obedit, arm, ebone, true);
 					status = OL_DRAWSEL_NORMAL;
 				}
 				else {
 					/* entirely selected, so de-select */
-					tree_element_active_ebone__sel(C, scene, arm, ebone, false);
+					tree_element_active_ebone__sel(C, obedit, arm, ebone, false);
 					status = OL_DRAWSEL_NONE;
 				}
 			}
@@ -654,7 +625,7 @@ static eOLDrawState tree_element_active_ebone(
 }
 
 static eOLDrawState tree_element_active_modifier(
-        bContext *C, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	if (set != OL_SETSEL_NONE) {
 		Object *ob = (Object *)tselem->id;
@@ -682,7 +653,7 @@ static eOLDrawState tree_element_active_psys(
 }
 
 static int tree_element_active_constraint(
-        bContext *C, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	if (set != OL_SETSEL_NONE) {
 		Object *ob = (Object *)tselem->id;
@@ -695,7 +666,7 @@ static int tree_element_active_constraint(
 }
 
 static eOLDrawState tree_element_active_text(
-        bContext *UNUSED(C), Scene *UNUSED(scene), SpaceOops *UNUSED(soops),
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
         TreeElement *UNUSED(te), int UNUSED(set))
 {
 	// XXX removed
@@ -703,10 +674,10 @@ static eOLDrawState tree_element_active_text(
 }
 
 static eOLDrawState tree_element_active_pose(
-        bContext *C, Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, ViewLayer *view_layer, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob = (Object *)tselem->id;
-	Base *base = BKE_scene_base_find(scene, ob);
+	Base *base = BKE_view_layer_base_find(view_layer, ob);
 
 	if (base == NULL) {
 		/* Armature not instantiated in current scene (e.g. inside an appended group...). */
@@ -714,16 +685,7 @@ static eOLDrawState tree_element_active_pose(
 	}
 
 	if (set != OL_SETSEL_NONE) {
-		if (scene->obedit) {
-			ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
-		}
-
-		if (ob->mode & OB_MODE_POSE) {
-			ED_object_posemode_exit(C, ob);
-		}
-		else {
-			ED_object_posemode_enter(C, ob);
-		}
+		do_outliner_activate_pose(C, view_layer, base);
 	}
 	else {
 		if (ob->mode & OB_MODE_POSE) {
@@ -795,7 +757,7 @@ static eOLDrawState tree_element_active_sequence_dup(
 }
 
 static eOLDrawState tree_element_active_keymap_item(
-        bContext *UNUSED(C), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set)
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set)
 {
 	wmKeyMapItem *kmi = te->directdata;
 
@@ -811,84 +773,125 @@ static eOLDrawState tree_element_active_keymap_item(
 	return OL_DRAWSEL_NONE;
 }
 
+static eOLDrawState tree_element_active_master_collection(
+        bContext *C, TreeElement *UNUSED(te), const eOLSetState set)
+{
+	if (set == OL_SETSEL_NONE) {
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		LayerCollection *active = CTX_data_layer_collection(C);
+
+		if (active == view_layer->layer_collections.first) {
+			return OL_DRAWSEL_NORMAL;
+		}
+	}
+	else {
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		LayerCollection *layer_collection = view_layer->layer_collections.first;
+		BKE_layer_collection_activate(view_layer, layer_collection);
+		WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+	}
+
+	return OL_DRAWSEL_NONE;
+}
+
+static eOLDrawState tree_element_active_layer_collection(
+        bContext *C, TreeElement *te, const eOLSetState set)
+{
+	if (set == OL_SETSEL_NONE) {
+		LayerCollection *active = CTX_data_layer_collection(C);
+
+		if (active == te->directdata) {
+			return OL_DRAWSEL_NORMAL;
+		}
+	}
+	else {
+		Scene *scene = CTX_data_scene(C);
+		LayerCollection *layer_collection = te->directdata;
+		ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, layer_collection);
+		BKE_layer_collection_activate(view_layer, layer_collection);
+		WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+	}
+
+	return OL_DRAWSEL_NONE;
+}
+
 /* ---------------------------------------------- */
 
 /* generic call for ID data check or make/check active in UI */
-eOLDrawState tree_element_active(bContext *C, Scene *scene, SpaceOops *soops, TreeElement *te,
+eOLDrawState tree_element_active(bContext *C, Scene *scene, ViewLayer *view_layer, SpaceOops *soops, TreeElement *te,
                                  const eOLSetState set, const bool handle_all_types)
 {
 	switch (te->idcode) {
 		/* Note: ID_OB only if handle_all_type is true, else objects are handled specially to allow multiple
-		 * selection. See do_outliner_item_activate_from_cursor. */
+		 * selection. See do_outliner_item_activate. */
 		case ID_OB:
 			if (handle_all_types) {
-				return tree_element_set_active_object(C, scene, soops, te, set, false);
+				return tree_element_set_active_object(C, scene, view_layer, soops, te, set, false);
 			}
 			break;
 		case ID_MA:
-			return tree_element_active_material(C, scene, soops, te, set);
+			return tree_element_active_material(C, scene, view_layer, soops, te, set);
 		case ID_WO:
-			return tree_element_active_world(C, scene, soops, te, set);
+			return tree_element_active_world(C, scene, view_layer, soops, te, set);
 		case ID_LA:
-			return tree_element_active_lamp(C, scene, soops, te, set);
-		case ID_TE:
-			return tree_element_active_texture(C, scene, soops, te, set);
+			return tree_element_active_lamp(C, scene, view_layer, soops, te, set);
 		case ID_TXT:
-			return tree_element_active_text(C, scene, soops, te, set);
+			return tree_element_active_text(C, scene, view_layer, soops, te, set);
 		case ID_CA:
-			return tree_element_active_camera(C, scene, soops, te, set);
+			return tree_element_active_camera(C, scene, view_layer, soops, te, set);
 	}
 	return OL_DRAWSEL_NONE;
 }
 
 /**
  * Generic call for non-id data to make/check active in UI
- *
- * \note Context can be NULL when ``(set == OL_SETSEL_NONE)``
  */
 eOLDrawState tree_element_type_active(
-        bContext *C, Scene *scene, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *view_layer, SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	switch (tselem->type) {
 		case TSE_DEFGROUP:
-			return tree_element_active_defgroup(C, scene, te, tselem, set);
+			return tree_element_active_defgroup(C, view_layer, te, tselem, set);
 		case TSE_BONE:
-			return tree_element_active_bone(C, scene, te, tselem, set, recursive);
+			return tree_element_active_bone(C, view_layer, te, tselem, set, recursive);
 		case TSE_EBONE:
-			return tree_element_active_ebone(C, scene, te, tselem, set, recursive);
+			return tree_element_active_ebone(C, te, tselem, set, recursive);
 		case TSE_MODIFIER:
-			return tree_element_active_modifier(C, te, tselem, set);
+			return tree_element_active_modifier(C, scene, view_layer, te, tselem, set);
 		case TSE_LINKED_OB:
 			if (set != OL_SETSEL_NONE) {
-				tree_element_set_active_object(C, scene, soops, te, set, false);
+				tree_element_set_active_object(C, scene, view_layer, soops, te, set, false);
 			}
-			else if (tselem->id == (ID *)OBACT) {
+			else if (tselem->id == (ID *)OBACT(view_layer)) {
 				return OL_DRAWSEL_NORMAL;
 			}
 			break;
 		case TSE_LINKED_PSYS:
 			return tree_element_active_psys(C, scene, te, tselem, set);
 		case TSE_POSE_BASE:
-			return tree_element_active_pose(C, scene, te, tselem, set);
+			return tree_element_active_pose(C, view_layer, te, tselem, set);
 		case TSE_POSE_CHANNEL:
-			return tree_element_active_posechannel(C, scene, te, tselem, set, recursive);
+			return tree_element_active_posechannel(C, scene, view_layer, te, tselem, set, recursive);
 		case TSE_CONSTRAINT:
-			return tree_element_active_constraint(C, te, tselem, set);
+			return tree_element_active_constraint(C, scene, view_layer, te, tselem, set);
 		case TSE_R_LAYER:
-			return tree_element_active_renderlayer(C, te, tselem, set);
+			return active_viewlayer(C, scene, view_layer, te, tselem, set);
 		case TSE_POSEGRP:
-			return tree_element_active_posegroup(C, scene, te, tselem, set);
+			return tree_element_active_posegroup(C, scene, view_layer, te, tselem, set);
 		case TSE_SEQUENCE:
 			return tree_element_active_sequence(C, scene, te, tselem, set);
 		case TSE_SEQUENCE_DUP:
 			return tree_element_active_sequence_dup(scene, te, tselem, set);
 		case TSE_KEYMAP_ITEM:
-			return tree_element_active_keymap_item(C, te, tselem, set);
+			return tree_element_active_keymap_item(C, scene, view_layer, te, tselem, set);
 		case TSE_GP_LAYER:
-			//return tree_element_active_gplayer(C, scene, te, tselem, set);
+			//return tree_element_active_gplayer(C, scene, s, te, tselem, set);
 			break;
-
+		case TSE_VIEW_COLLECTION_BASE:
+			return tree_element_active_master_collection(C, te, set);
+		case TSE_LAYER_COLLECTION:
+			return tree_element_active_layer_collection(C, te, set);
 	}
 	return OL_DRAWSEL_NONE;
 }
@@ -902,16 +905,24 @@ eOLDrawState tree_element_type_active(
  * Needed to run from operators accessed from a menu.
  */
 static void do_outliner_item_activate_tree_element(
-        bContext *C, Scene *scene, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *view_layer, SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem,
-        bool extend, bool recursive)
+        const bool extend, const bool recursive)
 {
-	/* always makes active object, except for some specific types.
-	 * Note about TSE_EBONE: In case of a same ID_AR datablock shared among several objects, we do not want
-	 * to switch out of edit mode (see T48328 for details). */
-	if (!ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, TSE_EBONE)) {
+	/* Always makes active object, except for some specific types. */
+	if (ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, TSE_EBONE, TSE_LAYER_COLLECTION)) {
+		/* Note about TSE_EBONE: In case of a same ID_AR datablock shared among several objects, we do not want
+		 * to switch out of edit mode (see T48328 for details). */
+	}
+	else if (tselem->id && OB_DATA_SUPPORT_EDITMODE(te->idcode)) {
+		/* Support edit-mode toggle, keeping the active object as is. */
+	}
+	else if (tselem->type == TSE_POSE_BASE) {
+		/* Support pose mode toggle, keeping the active object as is. */
+	}
+	else {
 		tree_element_set_active_object(
-		        C, scene, soops, te,
+		        C, scene, view_layer, soops, te,
 		        (extend && tselem->type == 0) ? OL_SETSEL_EXTEND : OL_SETSEL_NORMAL,
 		        recursive && tselem->type == 0);
 	}
@@ -920,100 +931,107 @@ static void do_outliner_item_activate_tree_element(
 		/* editmode? */
 		if (te->idcode == ID_SCE) {
 			if (scene != (Scene *)tselem->id) {
-				ED_screen_set_scene(C, CTX_wm_screen(C), (Scene *)tselem->id);
+				WM_window_change_active_scene(CTX_data_main(C), C, CTX_wm_window(C), (Scene *)tselem->id);
 			}
 		}
 		else if (te->idcode == ID_GR) {
-			Group *gr = (Group *)tselem->id;
-			GroupObject *gob;
+			Collection *gr = (Collection *)tselem->id;
 
 			if (extend) {
 				int sel = BA_SELECT;
-				for (gob = gr->gobject.first; gob; gob = gob->next) {
-					if (gob->ob->flag & SELECT) {
+				FOREACH_COLLECTION_BASE_RECURSIVE_BEGIN(gr, base)
+				{
+					if (base->flag & BASE_SELECTED) {
 						sel = BA_DESELECT;
 						break;
 					}
 				}
+				FOREACH_COLLECTION_BASE_RECURSIVE_END
 
-				for (gob = gr->gobject.first; gob; gob = gob->next) {
-					ED_base_object_select(BKE_scene_base_find(scene, gob->ob), sel);
+				FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(gr, object)
+				{
+					ED_object_base_select(BKE_view_layer_base_find(view_layer, object), sel);
 				}
+				FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 			}
 			else {
-				BKE_scene_base_deselect_all(scene);
-
-				for (gob = gr->gobject.first; gob; gob = gob->next) {
-					if ((gob->ob->flag & SELECT) == 0)
-						ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_SELECT);
+				BKE_view_layer_base_deselect_all(view_layer);
+
+				FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(gr, object)
+				{
+					Base *base = BKE_view_layer_base_find(view_layer, object);
+					/* Object may not be in this scene */
+					if (base != NULL) {
+						if ((base->flag & BASE_SELECTED) == 0) {
+							ED_object_base_select(base, BA_SELECT);
+						}
+					}
 				}
+				FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 			}
 
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 		}
 		else if (OB_DATA_SUPPORT_EDITMODE(te->idcode)) {
-			WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
+			Object *ob = (Object *)outliner_search_back(soops, te, ID_OB);
+			if ((ob != NULL) && (ob->data == tselem->id)) {
+				Base *base = BKE_view_layer_base_find(view_layer, ob);
+				if ((base != NULL) && (base->flag & BASE_VISIBLED)) {
+					do_outliner_activate_obdata(C, scene, view_layer, base);
+				}
+			}
 		}
 		else {  // rest of types
-			tree_element_active(C, scene, soops, te, OL_SETSEL_NORMAL, false);
+			tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NORMAL, false);
 		}
 
 	}
 	else {
-		tree_element_type_active(
-		        C, scene, soops, te, tselem,
-		        extend ? OL_SETSEL_EXTEND : OL_SETSEL_NORMAL,
-		        recursive);
+		tree_element_type_active(C, scene, view_layer, soops, te, tselem,
+		                         extend ? OL_SETSEL_EXTEND : OL_SETSEL_NORMAL,
+		                         recursive);
 	}
 }
 
 /**
- * Activates tree items, also handles clicking on arrows.
+ * \param extend: Don't deselect other items, only modify \a te.
+ * \param toggle: Select \a te when not selected, deselect when selected.
  */
-static bool do_outliner_item_activate_from_cursor(
-        bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops,
-        TreeElement *te, bool extend, bool recursive, const float mval[2])
+void outliner_item_select(SpaceOops *soops, const TreeElement *te, const bool extend, const bool toggle)
 {
-	if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
-		TreeStoreElem *tselem = TREESTORE(te);
-		bool openclose = false;
-
-		/* open close icon */
-		if ((te->flag & TE_ICONROW) == 0) {               // hidden icon, no open/close
-			if (mval[0] > te->xs && mval[0] < te->xs + UI_UNIT_X)
-				openclose = true;
-		}
+	TreeStoreElem *tselem = TREESTORE(te);
+	const short new_flag = toggle ? (tselem->flag ^ TSE_SELECTED) : (tselem->flag | TSE_SELECTED);
 
-		if (openclose) {
-			/* all below close/open? */
-			if (extend) {
-				tselem->flag &= ~TSE_CLOSED;
-				outliner_set_flag(&te->subtree, TSE_CLOSED, !outliner_has_one_flag(&te->subtree, TSE_CLOSED, 1));
-			}
-			else {
-				if (tselem->flag & TSE_CLOSED) tselem->flag &= ~TSE_CLOSED;
-				else tselem->flag |= TSE_CLOSED;
+	if (extend == false) {
+		outliner_set_flag(&soops->tree, TSE_SELECTED, false);
+	}
+	tselem->flag = new_flag;
+}
 
-			}
+static void outliner_item_toggle_closed(TreeElement *te, const bool toggle_children)
+{
+	TreeStoreElem *tselem = TREESTORE(te);
+	if (toggle_children) {
+		tselem->flag &= ~TSE_CLOSED;
 
-			return true;
-		}
-		/* name and first icon */
-		else if (mval[0] > te->xs + UI_UNIT_X && mval[0] < te->xend) {
-			do_outliner_item_activate_tree_element(
-			        C, scene, soops,
-			        te, tselem,
-			        extend, recursive);
-			return true;
-		}
+		const bool all_opened = !outliner_has_one_flag(&te->subtree, TSE_CLOSED, 1);
+		outliner_set_flag(&te->subtree, TSE_CLOSED, all_opened);
 	}
-
-	for (te = te->subtree.first; te; te = te->next) {
-		if (do_outliner_item_activate_from_cursor(C, scene, ar, soops, te, extend, recursive, mval)) {
-			return true;
-		}
+	else {
+		tselem->flag ^= TSE_CLOSED;
 	}
-	return false;
+}
+
+static bool outliner_item_is_co_within_close_toggle(TreeElement *te, float view_co_x)
+{
+	return ((te->flag & TE_ICONROW) == 0) && (view_co_x > te->xs) && (view_co_x < te->xs + UI_UNIT_X);
+}
+
+static bool outliner_is_co_within_restrict_columns(const SpaceOops *soops, const ARegion *ar, float view_co_x)
+{
+	return ((soops->outlinevis != SO_DATA_API) &&
+	        !(soops->flag & SO_HIDE_RESTRICTCOLS) &&
+	        (view_co_x > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX));
 }
 
 /**
@@ -1027,10 +1045,11 @@ void outliner_item_do_activate_from_tree_element(
         bool extend, bool recursive)
 {
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 
 	do_outliner_item_activate_tree_element(
-	        C, scene, soops,
+	        C, scene, view_layer, soops,
 	        te, tselem,
 	        extend, recursive);
 }
@@ -1044,56 +1063,53 @@ int outliner_item_do_activate_from_cursor(
         bContext *C, const int mval[2],
         bool extend, bool recursive)
 {
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar = CTX_wm_region(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	TreeElement *te;
-	float fmval[2];
+	float view_mval[2];
+	bool changed = false, rebuild_tree = false;
 
-	UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &fmval[0], &fmval[1]);
+	UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &view_mval[0], &view_mval[1]);
 
-	if (!ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF) &&
-	    !(soops->flag & SO_HIDE_RESTRICTCOLS) &&
-	    (fmval[0] > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX))
-	{
+	if (outliner_is_co_within_restrict_columns(soops, ar, view_mval[0])) {
 		return OPERATOR_CANCELLED;
 	}
 
-	for (te = soops->tree.first; te; te = te->next) {
-		if (do_outliner_item_activate_from_cursor(C, scene, ar, soops, te, extend, recursive, fmval)) {
-			break;
-		}
+	if (!(te = outliner_find_item_at_y(soops, &soops->tree, view_mval[1]))) {
+		/* skip */
 	}
-
-	if (te) {
-		ED_undo_push(C, "Outliner click event");
+	else if (outliner_item_is_co_within_close_toggle(te, view_mval[0])) {
+		outliner_item_toggle_closed(te, extend);
+		changed = true;
+		rebuild_tree = true;
 	}
 	else {
-		short selecting = -1;
-		int row;
-
-		/* get row number - 100 here is just a dummy value since we don't need the column */
-		UI_view2d_listview_view_to_cell(&ar->v2d, 1000, UI_UNIT_Y, 0.0f, OL_Y_OFFSET,
-		                                fmval[0], fmval[1], NULL, &row);
-
-		/* select relevant row */
-		if (outliner_select(soops, &soops->tree, &row, &selecting)) {
+		Scene *scene = CTX_data_scene(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		/* the row may also contain children, if one is hovered we want this instead of current te */
+		TreeElement *activate_te = outliner_find_item_at_x_in_row(soops, te, view_mval[0]);
+		TreeStoreElem *activate_tselem = TREESTORE(activate_te);
 
-			soops->storeflag |= SO_TREESTORE_REDRAW;
+		outliner_item_select(soops, activate_te, extend, extend);
+		do_outliner_item_activate_tree_element(C, scene, view_layer, soops, activate_te, activate_tselem, extend, recursive);
+		changed = true;
+	}
 
-			/* no need for undo push here, only changing outliner data which is
-			 * scene level - campbell */
-			/* ED_undo_push(C, "Outliner selection event"); */
+	if (changed) {
+		if (rebuild_tree) {
+			ED_region_tag_redraw(ar);
+		}
+		else {
+			ED_region_tag_redraw_no_rebuild(ar);
 		}
+		ED_undo_push(C, "Outliner selection change");
 	}
 
-	ED_region_tag_redraw(ar);
-
 	return OPERATOR_FINISHED;
 }
 
 /* event can enterkey, then it opens/closes */
-static int outliner_item_activate(bContext *C, wmOperator *op, const wmEvent *event)
+static int outliner_item_activate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	bool extend    = RNA_boolean_get(op->ptr, "extend");
 	bool recursive = RNA_boolean_get(op->ptr, "recursive");
@@ -1106,7 +1122,7 @@ void OUTLINER_OT_item_activate(wmOperatorType *ot)
 	ot->idname = "OUTLINER_OT_item_activate";
 	ot->description = "Handle mouse clicks to activate/select items";
 
-	ot->invoke = outliner_item_activate;
+	ot->invoke = outliner_item_activate_invoke;
 
 	ot->poll = ED_operator_outliner_active;
 
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 75151325bdf..8a01e5a7f2f 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -51,12 +51,13 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_constraint.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
-#include "BKE_group.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
+#include "BKE_library_override.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
@@ -64,8 +65,12 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_armature.h"
 #include "ED_object.h"
+#include "ED_scene.h"
 #include "ED_screen.h"
 #include "ED_sequencer.h"
 #include "ED_undo.h"
@@ -100,7 +105,8 @@ static void set_operation_types(SpaceOops *soops, ListBase *lb,
 	for (te = lb->first; te; te = te->next) {
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
-			if (tselem->type) {
+			/* Layer collection points to collection ID. */
+			if (!ELEM(tselem->type, 0, TSE_LAYER_COLLECTION)) {
 				if (*datalevel == 0)
 					*datalevel = tselem->type;
 				else if (*datalevel != tselem->type)
@@ -124,6 +130,9 @@ static void set_operation_types(SpaceOops *soops, ListBase *lb,
 					case ID_LI:
 						if (*idlevel == 0) *idlevel = idcode;
 						else if (*idlevel != idcode) *idlevel = -1;
+						if (ELEM(*datalevel, TSE_VIEW_COLLECTION_BASE, TSE_SCENE_COLLECTION_BASE)) {
+							*datalevel = 0;
+						}
 						break;
 				}
 			}
@@ -191,19 +200,7 @@ static void unlink_texture_cb(
 	MTex **mtex = NULL;
 	int a;
 
-	if (GS(tsep->id->name) == ID_MA) {
-		Material *ma = (Material *)tsep->id;
-		mtex = ma->mtex;
-	}
-	else if (GS(tsep->id->name) == ID_LA) {
-		Lamp *la = (Lamp *)tsep->id;
-		mtex = la->mtex;
-	}
-	else if (GS(tsep->id->name) == ID_WO) {
-		World *wrld = (World *)tsep->id;
-		mtex = wrld->mtex;
-	}
-	else if (GS(tsep->id->name) == ID_LS) {
+	if (GS(tsep->id->name) == ID_LS) {
 		FreestyleLineStyle *ls = (FreestyleLineStyle *)tsep->id;
 		mtex = ls->mtex;
 	}
@@ -221,21 +218,52 @@ static void unlink_texture_cb(
 	}
 }
 
-static void unlink_group_cb(
+static void unlink_collection_cb(
         bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *tsep, TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	Group *group = (Group *)tselem->id;
+	Main *bmain = CTX_data_main(C);
+	Collection *collection = (Collection *)tselem->id;
 
 	if (tsep) {
 		if (GS(tsep->id->name) == ID_OB) {
 			Object *ob = (Object *)tsep->id;
 			ob->dup_group = NULL;
+			DEG_relations_tag_update(bmain);
+		}
+		else if (GS(tsep->id->name) == ID_GR) {
+			Collection *parent = (Collection *)tsep->id;
+			id_fake_user_set(&collection->id);
+			BKE_collection_child_remove(bmain, parent, collection);
+			DEG_relations_tag_update(bmain);
+		}
+		else if (GS(tsep->id->name) == ID_SCE) {
+			Collection *parent = BKE_collection_master((Scene *)tsep->id);
+			id_fake_user_set(&collection->id);
+			BKE_collection_child_remove(bmain, parent, collection);
+			DEG_relations_tag_update(bmain);
 		}
 	}
-	else {
-		Main *bmain = CTX_data_main(C);
-		BKE_libblock_delete(bmain, group);
+}
+
+static void unlink_object_cb(
+        bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+        TreeStoreElem *tsep, TreeStoreElem *tselem, void *UNUSED(user_data))
+{
+	Main *bmain = CTX_data_main(C);
+	Object *ob = (Object *)tselem->id;
+
+	if (tsep) {
+		if (GS(tsep->id->name) == ID_GR) {
+			Collection *parent = (Collection *)tsep->id;
+			BKE_collection_object_remove(bmain, parent, ob, true);
+			DEG_relations_tag_update(bmain);
+		}
+		else if (GS(tsep->id->name) == ID_SCE) {
+			Collection *parent = BKE_collection_master((Scene *)tsep->id);
+			BKE_collection_object_remove(bmain, parent, ob, true);
+			DEG_relations_tag_update(bmain);
+		}
 	}
 }
 
@@ -262,7 +290,7 @@ static void outliner_do_libdata_operation(
 	for (te = lb->first; te; te = te->next) {
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
-			if (tselem->type == 0) {
+			if (ELEM(tselem->type, 0, TSE_LAYER_COLLECTION)) {
 				TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL;
 				operation_cb(C, reports, scene, te, tsep, tselem, user_data);
 			}
@@ -308,7 +336,7 @@ static bool scene_cb(bContext *C, eOutliner_PropSceneOps event, TreeElement *UNU
 	Scene *scene = (Scene *)tselem->id;
 
 	if (event == OL_SCENE_OP_DELETE) {
-		if (ED_screen_delete_scene(C, scene)) {
+		if (ED_scene_delete(C, CTX_data_main(C), CTX_wm_window(C), scene)) {
 			WM_event_add_notifier(C, NC_SCENE | NA_REMOVED, scene);
 		}
 		else {
@@ -359,15 +387,15 @@ void OUTLINER_OT_scene_operation(wmOperatorType *ot)
 /* ******************************************** */
 
 static void object_select_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *te,
+        bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	Base *base = (Base *)te->directdata;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = (Object *)tselem->id;
+	Base *base = BKE_view_layer_base_find(view_layer, ob);
 
-	if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
-	if (base && ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0)) {
-		base->flag |= SELECT;
-		base->object->flag |= SELECT;
+	if (base && ((base->flag & BASE_VISIBLED) != 0)) {
+		base->flag |= BASE_SELECTED;
 	}
 }
 
@@ -381,15 +409,15 @@ static void object_select_hierarchy_cb(
 }
 
 static void object_deselect_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *te,
+        bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	Base *base = (Base *)te->directdata;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = (Object *)tselem->id;
+	Base *base = BKE_view_layer_base_find(view_layer, ob);
 
-	if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
 	if (base) {
-		base->flag &= ~SELECT;
-		base->object->flag &= ~SELECT;
+		base->flag &= ~BASE_SELECTED;
 	}
 }
 
@@ -397,31 +425,27 @@ static void object_delete_cb(
         bContext *C, ReportList *reports, Scene *scene, TreeElement *te,
         TreeStoreElem *tsep, TreeStoreElem *tselem, void *user_data)
 {
-	Base *base = (Base *)te->directdata;
-
-	if (base == NULL)
-		base = BKE_scene_base_find(scene, (Object *)tselem->id);
-	if (base) {
+	Object *ob = (Object *)tselem->id;
+	if (ob) {
 		Main *bmain = CTX_data_main(C);
-		if (base->object->id.tag & LIB_TAG_INDIRECT) {
-			BKE_reportf(reports, RPT_WARNING, "Cannot delete indirectly linked object '%s'", base->object->id.name + 2);
+		if (ob->id.tag & LIB_TAG_INDIRECT) {
+			BKE_reportf(reports, RPT_WARNING, "Cannot delete indirectly linked object '%s'", ob->id.name + 2);
 			return;
 		}
-		else if (BKE_library_ID_is_indirectly_used(bmain, base->object) &&
-		         ID_REAL_USERS(base->object) <= 1 && ID_EXTRA_USERS(base->object) == 0)
+		else if (BKE_library_ID_is_indirectly_used(bmain, ob) &&
+		         ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0)
 		{
 			BKE_reportf(reports, RPT_WARNING,
 			            "Cannot delete object '%s' from scene '%s', indirectly used objects need at least one user",
-			            base->object->id.name + 2, scene->id.name + 2);
+			            ob->id.name + 2, scene->id.name + 2);
 			return;
 		}
 
 		// check also library later
-		if (scene->obedit == base->object) {
+		if (ob == CTX_data_edit_object(C)) {
 			ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR);
 		}
-
-		ED_base_object_free_and_unlink(CTX_data_main(C), scene, base);
+		ED_object_base_free_and_unlink(CTX_data_main(C), scene, ob);
 		/* leave for ED_outliner_id_unref to handle */
 #if 0
 		te->directdata = NULL;
@@ -454,6 +478,19 @@ static void id_local_cb(
 	}
 }
 
+static void id_static_override_cb(
+        bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
+{
+	if (ID_IS_LINKED(tselem->id) && (tselem->id->tag & LIB_TAG_EXTERN)) {
+		Main *bmain = CTX_data_main(C);
+		ID *override_id = BKE_override_static_create_from_id(bmain, tselem->id);
+		if (override_id != NULL) {
+			BKE_main_id_clear_newpoins(bmain);
+		}
+	}
+}
+
 static void id_fake_user_set_cb(
         bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
@@ -518,38 +555,6 @@ static void singleuser_world_cb(
 	}
 }
 
-static void group_linkobs2scene_cb(
-        bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Group *group = (Group *)tselem->id;
-	GroupObject *gob;
-	Base *base;
-
-	for (gob = group->gobject.first; gob; gob = gob->next) {
-		base = BKE_scene_base_find(scene, gob->ob);
-		if (!base) {
-			/* link to scene */
-			base = BKE_scene_base_add(scene, gob->ob);
-			id_us_plus(&gob->ob->id);
-		}
-		base->object->flag |= SELECT;
-		base->flag |= SELECT;
-	}
-}
-
-static void group_instance_cb(
-        bContext *C, ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
-        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
-{
-	Group *group = (Group *)tselem->id;
-
-	Object *ob = ED_object_add_type(C, OB_EMPTY, group->id.name + 2, scene->cursor, NULL, false, scene->layact);
-	ob->dup_group = group;
-	ob->transflag |= OB_DUPLIGROUP;
-	id_lib_extern(&group->id);
-}
-
 /**
  * \param select_recurse: Set to false for operations which are already recursively operating on their children.
  */
@@ -567,7 +572,7 @@ void outliner_do_object_operation_ex(
 				// when objects selected in other scenes... dunno if that should be allowed
 				Scene *scene_owner = (Scene *)outliner_search_back(soops, te, ID_SCE);
 				if (scene_owner && scene_act != scene_owner) {
-					ED_screen_set_scene(C, CTX_wm_screen(C), scene_owner);
+					WM_window_change_active_scene(CTX_data_main(C), C, CTX_wm_window(C), scene_owner);
 				}
 				/* important to use 'scene_owner' not scene_act else deleting objects can crash.
 				 * only use 'scene_act' when 'scene_owner' is NULL, which can happen when the
@@ -790,12 +795,12 @@ static void modifier_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem
 
 	if (event == OL_MODIFIER_OP_TOGVIS) {
 		md->mode ^= eModifierMode_Realtime;
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 	}
 	else if (event == OL_MODIFIER_OP_TOGREN) {
 		md->mode ^= eModifierMode_Render;
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 	}
 	else if (event == OL_MODIFIER_OP_DELETE) {
@@ -829,12 +834,13 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s
 {
 	Base *child_base, *base_next;
 	Object *parent;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	if (!base) {
 		return NULL;
 	}
 
-	for (child_base = scene->base.first; child_base; child_base = base_next) {
+	for (child_base = view_layer->object_bases.first; child_base; child_base = base_next) {
 		base_next = child_base->next;
 		for (parent = child_base->object->parent; parent && (parent != base->object); parent = parent->parent);
 		if (parent) {
@@ -857,7 +863,7 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s
 		            base->object->id.name + 2, scene->id.name + 2);
 		return base_next;
 	}
-	ED_base_object_free_and_unlink(CTX_data_main(C), scene, base);
+	ED_object_base_free_and_unlink(CTX_data_main(C), scene, base->object);
 	return base_next;
 }
 
@@ -865,11 +871,12 @@ static void object_delete_hierarchy_cb(
         bContext *C, ReportList *reports, Scene *scene,
         TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Base *base = (Base *)te->directdata;
-	Object *obedit = scene->obedit;
+	Object *obedit = CTX_data_edit_object(C);
 
 	if (!base) {
-		base = BKE_scene_base_find(scene, (Object *)tselem->id);
+		base = BKE_view_layer_base_find(view_layer, (Object *)tselem->id);
 	}
 	if (base) {
 		/* Check also library later. */
@@ -913,9 +920,6 @@ static const EnumPropertyItem prop_object_op_types[] = {
 	{OL_OP_DELETE_HIERARCHY, "DELETE_HIERARCHY", 0, "Delete Hierarchy", ""},
 	{OL_OP_REMAP, "REMAP",   0, "Remap Users",
 	 "Make all users of selected data-blocks to use instead a new chosen one"},
-	{OL_OP_TOGVIS, "TOGVIS", 0, "Toggle Visible", ""},
-	{OL_OP_TOGSEL, "TOGSEL", 0, "Toggle Selectable", ""},
-	{OL_OP_TOGREN, "TOGREN", 0, "Toggle Renderable", ""},
 	{OL_OP_RENAME, "RENAME", 0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
 };
@@ -924,6 +928,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	wmWindow *win = CTX_wm_window(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	int event;
 	const char *str = NULL;
@@ -938,7 +943,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		Scene *sce = scene;  // to be able to delete, scenes are set...
 		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_select_cb);
 		if (scene != sce) {
-			ED_screen_set_scene(C, CTX_wm_screen(C), sce);
+			WM_window_change_active_scene(bmain, C, win, sce);
 		}
 
 		str = "Select Objects";
@@ -948,7 +953,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		Scene *sce = scene;  // to be able to delete, scenes are set...
 		outliner_do_object_operation_ex(C, op->reports, scene, soops, &soops->tree, object_select_hierarchy_cb, false);
 		if (scene != sce) {
-			ED_screen_set_scene(C, CTX_wm_screen(C), sce);
+			WM_window_change_active_scene(bmain, C, win, sce);
 		}
 		str = "Select Object Hierarchy";
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
@@ -968,7 +973,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		 *      cleanup tree here to prevent such cases. */
 		outliner_cleanup_tree(soops);
 
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 		str = "Delete Objects";
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 	}
@@ -978,7 +983,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		/* XXX: See OL_OP_DELETE comment above. */
 		outliner_cleanup_tree(soops);
 
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 		str = "Delete Object Hierarchy";
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 	}
@@ -990,21 +995,6 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, id_local_cb);
 		str = "Localized Objects";
 	}
-	else if (event == OL_OP_TOGVIS) {
-		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_visibility_cb);
-		str = "Toggle Visibility";
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_VISIBLE, scene);
-	}
-	else if (event == OL_OP_TOGSEL) {
-		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_selectability_cb);
-		str = "Toggle Selectability";
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-	}
-	else if (event == OL_OP_TOGREN) {
-		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_toggle_renderability_cb);
-		str = "Toggle Renderability";
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_RENDER, scene);
-	}
 	else if (event == OL_OP_RENAME) {
 		outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, item_rename_cb);
 		str = "Rename Object";
@@ -1039,114 +1029,12 @@ void OUTLINER_OT_object_operation(wmOperatorType *ot)
 
 /* **************************************** */
 
-typedef enum eOutliner_PropGroupOps {
-	OL_GROUPOP_UNLINK = 1,
-	OL_GROUPOP_LOCAL,
-	OL_GROUPOP_LINK,
-	OL_GROUPOP_DELETE,
-	OL_GROUPOP_REMAP,
-	OL_GROUPOP_INSTANCE,
-	OL_GROUPOP_TOGVIS,
-	OL_GROUPOP_TOGSEL,
-	OL_GROUPOP_TOGREN,
-	OL_GROUPOP_RENAME,
-} eOutliner_PropGroupOps;
-
-static const EnumPropertyItem prop_group_op_types[] = {
-	{OL_GROUPOP_UNLINK, "UNLINK",     0, "Unlink Group", ""},
-	{OL_GROUPOP_LOCAL, "LOCAL",       0, "Make Local Group", ""},
-	{OL_GROUPOP_LINK, "LINK",         0, "Link Group Objects to Scene", ""},
-	{OL_GROUPOP_DELETE, "DELETE",     0, "Delete Group", ""},
-	{OL_GROUPOP_REMAP, "REMAP",       0, "Remap Users",
-	 "Make all users of selected data-blocks to use instead current (clicked) one"},
-	{OL_GROUPOP_INSTANCE, "INSTANCE", 0, "Instance Groups in Scene", ""},
-	{OL_GROUPOP_TOGVIS, "TOGVIS",     0, "Toggle Visible Group", ""},
-	{OL_GROUPOP_TOGSEL, "TOGSEL",     0, "Toggle Selectable", ""},
-	{OL_GROUPOP_TOGREN, "TOGREN",     0, "Toggle Renderable", ""},
-	{OL_GROUPOP_RENAME, "RENAME",     0, "Rename", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int outliner_group_operation_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene = CTX_data_scene(C);
-	SpaceOops *soops = CTX_wm_space_outliner(C);
-	int event;
-
-	/* check for invalid states */
-	if (soops == NULL)
-		return OPERATOR_CANCELLED;
-
-	event = RNA_enum_get(op->ptr, "type");
-
-	switch (event) {
-		case OL_GROUPOP_UNLINK:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, unlink_group_cb, NULL);
-			break;
-		case OL_GROUPOP_LOCAL:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, id_local_cb, NULL);
-			break;
-		case OL_GROUPOP_LINK:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, group_linkobs2scene_cb, NULL);
-			break;
-		case OL_GROUPOP_INSTANCE:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, group_instance_cb, NULL);
-			/* works without this except if you try render right after, see: 22027 */
-			DAG_relations_tag_update(CTX_data_main(C));
-			break;
-		case OL_GROUPOP_DELETE:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, id_delete_cb, NULL);
-			break;
-		case OL_GROUPOP_REMAP:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, id_remap_cb, NULL);
-			break;
-		case OL_GROUPOP_TOGVIS:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, group_toggle_visibility_cb, NULL);
-			break;
-		case OL_GROUPOP_TOGSEL:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, group_toggle_selectability_cb, NULL);
-			break;
-		case OL_GROUPOP_TOGREN:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, group_toggle_renderability_cb, NULL);
-			break;
-		case OL_GROUPOP_RENAME:
-			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, item_rename_cb, NULL);
-			break;
-		default:
-			BLI_assert(0);
-	}
-
-	ED_undo_push(C, prop_group_op_types[event - 1].name);
-	WM_event_add_notifier(C, NC_GROUP, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-
-void OUTLINER_OT_group_operation(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Outliner Group Operation";
-	ot->idname = "OUTLINER_OT_group_operation";
-	ot->description = "";
-
-	/* callbacks */
-	ot->invoke = WM_menu_invoke;
-	ot->exec = outliner_group_operation_exec;
-	ot->poll = ED_operator_outliner_active;
-
-	ot->flag = 0;
-
-	ot->prop = RNA_def_enum(ot->srna, "type", prop_group_op_types, 0, "Group Operation", "");
-}
-
-/* **************************************** */
-
 typedef enum eOutlinerIdOpTypes {
 	OUTLINER_IDOP_INVALID = 0,
 
 	OUTLINER_IDOP_UNLINK,
 	OUTLINER_IDOP_LOCAL,
+	OUTLINER_IDOP_STATIC_OVERRIDE,
 	OUTLINER_IDOP_SINGLE,
 	OUTLINER_IDOP_DELETE,
 	OUTLINER_IDOP_REMAP,
@@ -1162,6 +1050,8 @@ typedef enum eOutlinerIdOpTypes {
 static const EnumPropertyItem prop_id_op_types[] = {
 	{OUTLINER_IDOP_UNLINK, "UNLINK", 0, "Unlink", ""},
 	{OUTLINER_IDOP_LOCAL, "LOCAL", 0, "Make Local", ""},
+	{OUTLINER_IDOP_STATIC_OVERRIDE, "STATIC_OVERRIDE",
+	 0, "Add Static Override", "Add a local static override of this data-block"},
 	{OUTLINER_IDOP_SINGLE, "SINGLE", 0, "Make Single User", ""},
 	{OUTLINER_IDOP_DELETE, "DELETE", 0, "Delete", "WARNING: no undo"},
 	{OUTLINER_IDOP_REMAP, "REMAP", 0, "Remap Users",
@@ -1193,6 +1083,14 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
 		case OUTLINER_IDOP_UNLINK:
 		{
 			/* unlink datablock from its parent */
+			if (objectlevel) {
+				outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, unlink_object_cb, NULL);
+
+				WM_event_add_notifier(C, NC_SCENE | ND_LAYER, NULL);
+				ED_undo_push(C, "Unlink Object");
+				break;
+			}
+
 			switch (idlevel) {
 				case ID_AC:
 					outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, unlink_action_cb, NULL);
@@ -1218,6 +1116,12 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
 					WM_event_add_notifier(C, NC_SCENE | ND_WORLD, NULL);
 					ED_undo_push(C, "Unlink world");
 					break;
+				case ID_GR:
+					outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, unlink_collection_cb, NULL);
+
+					WM_event_add_notifier(C, NC_SCENE | ND_LAYER, NULL);
+					ED_undo_push(C, "Unlink Collection");
+					break;
 				default:
 					BKE_report(op->reports, RPT_WARNING, "Not yet implemented");
 					break;
@@ -1231,6 +1135,13 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
 			ED_undo_push(C, "Localized Data");
 			break;
 		}
+		case OUTLINER_IDOP_STATIC_OVERRIDE:
+		{
+			/* make local */
+			outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, id_static_override_cb, NULL);
+			ED_undo_push(C, "Overrided Data");
+			break;
+		}
 		case OUTLINER_IDOP_SINGLE:
 		{
 			/* make single user */
@@ -1630,7 +1541,7 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
 	/* update dependencies */
 	if (updateDeps) {
 		/* rebuild depsgraph for the new deps */
-		DAG_relations_tag_update(CTX_data_main(C));
+		DEG_relations_tag_update(CTX_data_main(C));
 	}
 
 	return OPERATOR_FINISHED;
@@ -1864,9 +1775,10 @@ static int do_outliner_operation_event(bContext *C, ARegion *ar, SpaceOops *soop
 				outliner_set_flag(&soops->tree, TSE_SELECTED, 0);
 
 			tselem->flag |= TSE_SELECTED;
-			/* redraw, same as outliner_select function */
-			soops->storeflag |= SO_TREESTORE_REDRAW;
-			ED_region_tag_redraw(ar);
+
+			/* Only redraw, don't rebuild here because TreeElement pointers will
+			 * become invalid and operations will crash. */
+			ED_region_tag_redraw_no_rebuild(ar);
 		}
 
 		set_operation_types(soops, &soops->tree, &scenelevel, &objectlevel, &idlevel, &datalevel);
@@ -1880,7 +1792,7 @@ static int do_outliner_operation_event(bContext *C, ARegion *ar, SpaceOops *soop
 			}
 		}
 		else if (objectlevel) {
-			WM_operator_name_call(C, "OUTLINER_OT_object_operation", WM_OP_INVOKE_REGION_WIN, NULL);
+			WM_menu_name_call(C, "OUTLINER_MT_object", WM_OP_INVOKE_REGION_WIN);
 		}
 		else if (idlevel) {
 			if (idlevel == -1 || datalevel) {
@@ -1889,7 +1801,7 @@ static int do_outliner_operation_event(bContext *C, ARegion *ar, SpaceOops *soop
 			else {
 				switch (idlevel) {
 					case ID_GR:
-						WM_operator_name_call(C, "OUTLINER_OT_group_operation", WM_OP_INVOKE_REGION_WIN, NULL);
+						WM_menu_name_call(C, "OUTLINER_MT_collection", WM_OP_INVOKE_REGION_WIN);
 						break;
 					case ID_LI:
 						WM_operator_name_call(C, "OUTLINER_OT_lib_operation", WM_OP_INVOKE_REGION_WIN, NULL);
@@ -1910,8 +1822,11 @@ static int do_outliner_operation_event(bContext *C, ARegion *ar, SpaceOops *soop
 				else if (datalevel == TSE_DRIVER_BASE) {
 					/* do nothing... no special ops needed yet */
 				}
-				else if (ELEM(datalevel, TSE_R_LAYER_BASE, TSE_R_LAYER, TSE_R_PASS)) {
-					/*WM_operator_name_call(C, "OUTLINER_OT_renderdata_operation", WM_OP_INVOKE_REGION_WIN, NULL)*/
+				else if (datalevel == TSE_LAYER_COLLECTION) {
+					WM_menu_name_call(C, "OUTLINER_MT_collection", WM_OP_INVOKE_REGION_WIN);
+				}
+				else if (ELEM(datalevel, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) {
+					WM_menu_name_call(C, "OUTLINER_MT_collection_new", WM_OP_INVOKE_REGION_WIN);
 				}
 				else if (datalevel == TSE_ID_BASE) {
 					/* do nothing... there are no ops needed here yet */
@@ -1946,6 +1861,7 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent
 	uiBut *but = UI_context_active_but_get(C);
 	TreeElement *te;
 	float fmval[2];
+	bool found = false;
 
 	if (but) {
 		UI_but_tooltip_timer_remove(C, but);
@@ -1955,10 +1871,18 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent
 
 	for (te = soops->tree.first; te; te = te->next) {
 		if (do_outliner_operation_event(C, ar, soops, te, fmval)) {
+			found = true;
 			break;
 		}
 	}
 
+	if (!found) {
+		/* Menus for clicking in empty space. */
+		if (soops->outlinevis == SO_VIEW_LAYER) {
+			WM_menu_name_call(C, "OUTLINER_MT_collection_new", WM_OP_INVOKE_REGION_WIN);
+		}
+	}
+
 	return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index b54a7705686..d155457a208 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -46,6 +46,7 @@
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
@@ -63,12 +64,16 @@
 
 #include "BKE_fcurve.h"
 #include "BKE_main.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_modifier.h"
 #include "BKE_sequencer.h"
 #include "BKE_idcode.h"
 #include "BKE_outliner_treehash.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_armature.h"
 #include "ED_screen.h"
 
@@ -77,12 +82,19 @@
 
 #include "RNA_access.h"
 
+#include "UI_interface.h"
+
 #include "outliner_intern.h"
 
 #ifdef WIN32
 #  include "BLI_math_base.h" /* M_PI */
 #endif
 
+/* prototypes */
+static TreeElement *outliner_add_collection_recursive(
+        SpaceOops *soops, Collection *collection, TreeElement *ten);
+static void outliner_make_object_parent_hierarchy(ListBase *lb);
+
 /* ********************************************************* */
 /* Persistent Data */
 
@@ -141,6 +153,9 @@ static void outliner_storage_cleanup(SpaceOops *soops)
 				}
 			}
 		}
+		else if (soops->treehash) {
+			BKE_outliner_treehash_clear_used(soops->treehash);
+		}
 	}
 }
 
@@ -180,16 +195,11 @@ static void check_persistent(SpaceOops *soops, TreeElement *te, ID *id, short ty
 /* ********************************************************* */
 /* Tree Management */
 
-void outliner_free_tree(ListBase *lb)
+void outliner_free_tree(ListBase *tree)
 {
-	while (lb->first) {
-		TreeElement *te = lb->first;
-
-		outliner_free_tree(&te->subtree);
-		BLI_remlink(lb, te);
-
-		if (te->flag & TE_FREE_NAME) MEM_freeN((void *)te->name);
-		MEM_freeN(te);
+	for (TreeElement *element = tree->first, *element_next; element; element = element_next) {
+		element_next = element->next;
+		outliner_free_tree_element(element, tree);
 	}
 }
 
@@ -199,103 +209,23 @@ void outliner_cleanup_tree(SpaceOops *soops)
 	outliner_storage_cleanup(soops);
 }
 
-/* Find specific item from the treestore */
-TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem)
-{
-	TreeElement *te, *tes;
-	for (te = lb->first; te; te = te->next) {
-		if (te->store_elem == store_elem) return te;
-		tes = outliner_find_tree_element(&te->subtree, store_elem);
-		if (tes) return tes;
-	}
-	return NULL;
-}
-
-/* tse is not in the treestore, we use its contents to find a match */
-TreeElement *outliner_find_tse(SpaceOops *soops, const TreeStoreElem *tse)
-{
-	TreeStoreElem *tselem;
-
-	if (tse->id == NULL) return NULL;
-
-	/* check if 'tse' is in treestore */
-	tselem = BKE_outliner_treehash_lookup_any(soops->treehash, tse->type, tse->nr, tse->id);
-	if (tselem)
-		return outliner_find_tree_element(&soops->tree, tselem);
-
-	return NULL;
-}
-
-/* Find treestore that refers to given ID */
-TreeElement *outliner_find_id(SpaceOops *soops, ListBase *lb, const ID *id)
-{
-	for (TreeElement *te = lb->first; te; te = te->next) {
-		TreeStoreElem *tselem = TREESTORE(te);
-		if (tselem->type == 0) {
-			if (tselem->id == id) {
-				return te;
-			}
-			/* only deeper on scene or object */
-			if (ELEM(te->idcode, ID_OB, ID_SCE) ||
-			    ((soops->outlinevis == SO_GROUPS) && (te->idcode == ID_GR)))
-			{
-				TreeElement *tes = outliner_find_id(soops, &te->subtree, id);
-				if (tes) {
-					return tes;
-				}
-			}
-		}
-	}
-	return NULL;
-}
-
-TreeElement *outliner_find_posechannel(ListBase *lb, const bPoseChannel *pchan)
+/**
+ * Free \a element and its sub-tree and remove its link in \a parent_subtree.
+ *
+ * \note Does not remove the TreeStoreElem of \a element!
+ * \param parent_subtree Subtree of the parent element, so the list containing \a element.
+ */
+void outliner_free_tree_element(TreeElement *element, ListBase *parent_subtree)
 {
-	for (TreeElement *te = lb->first; te; te = te->next) {
-		if (te->directdata == pchan) {
-			return te;
-		}
+	BLI_assert(BLI_findindex(parent_subtree, element) > -1);
+	BLI_remlink(parent_subtree, element);
 
-		TreeStoreElem *tselem = TREESTORE(te);
-		if (ELEM(tselem->type, TSE_POSE_BASE, TSE_POSE_CHANNEL)) {
-			TreeElement *tes = outliner_find_posechannel(&te->subtree, pchan);
-			if (tes) {
-				return tes;
-			}
-		}
-	}
-	return NULL;
-}
+	outliner_free_tree(&element->subtree);
 
-TreeElement *outliner_find_editbone(ListBase *lb, const EditBone *ebone)
-{
-	for (TreeElement *te = lb->first; te; te = te->next) {
-		if (te->directdata == ebone) {
-			return te;
-		}
-
-		TreeStoreElem *tselem = TREESTORE(te);
-		if (ELEM(tselem->type, 0, TSE_EBONE)) {
-			TreeElement *tes = outliner_find_editbone(&te->subtree, ebone);
-			if (tes) {
-				return tes;
-			}
-		}
+	if (element->flag & TE_FREE_NAME) {
+		MEM_freeN((void *)element->name);
 	}
-	return NULL;
-}
-
-ID *outliner_search_back(SpaceOops *UNUSED(soops), TreeElement *te, short idcode)
-{
-	TreeStoreElem *tselem;
-	te = te->parent;
-
-	while (te) {
-		tselem = TREESTORE(te);
-		if (tselem->type == 0 && te->idcode == idcode) return tselem->id;
-		te = te->parent;
-	}
-	return NULL;
+	MEM_freeN(element);
 }
 
 
@@ -322,98 +252,6 @@ static void outliner_add_bone(SpaceOops *soops, ListBase *lb, ID *id, Bone *curB
 	}
 }
 
-/* -------------------------------------------------------- */
-
-#define LOG2I(x) (int)(log(x) / M_LN2)
-
-static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl)
-{
-	TreeStoreElem *tselem = NULL;
-	TreeElement *te = NULL;
-
-	/* log stuff is to convert bitflags (powers of 2) to small integers,
-	 * in order to not overflow short tselem->nr */
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_COMBINED));
-	te->name = IFACE_("Combined");
-	te->directdata = &srl->passflag;
-
-	/* save cpu cycles, but we add the first to invoke an open/close triangle */
-	tselem = TREESTORE(tenla);
-	if (tselem->flag & TSE_CLOSED)
-		return;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_Z));
-	te->name = IFACE_("Z");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_VECTOR));
-	te->name = IFACE_("Vector");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_NORMAL));
-	te->name = IFACE_("Normal");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_UV));
-	te->name = IFACE_("UV");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_MIST));
-	te->name = IFACE_("Mist");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXOB));
-	te->name = IFACE_("Index Object");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXMA));
-	te->name = IFACE_("Index Material");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_RGBA));
-	te->name = IFACE_("Color");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_DIFFUSE));
-	te->name = IFACE_("Diffuse");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SPEC));
-	te->name = IFACE_("Specular");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SHADOW));
-	te->name = IFACE_("Shadow");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_AO));
-	te->name = IFACE_("AO");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFLECT));
-	te->name = IFACE_("Reflection");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFRACT));
-	te->name = IFACE_("Refraction");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDIRECT));
-	te->name = IFACE_("Indirect");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_ENVIRONMENT));
-	te->name = IFACE_("Environment");
-	te->directdata = &srl->passflag;
-
-	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_EMIT));
-	te->name = IFACE_("Emit");
-	te->directdata = &srl->passflag;
-}
-
-#undef LOG2I
-
 static bool outliner_animdata_test(AnimData *adt)
 {
 	if (adt)
@@ -424,19 +262,19 @@ static bool outliner_animdata_test(AnimData *adt)
 #ifdef WITH_FREESTYLE
 static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
-	SceneRenderLayer *srl;
+	ViewLayer *view_layer;
 	FreestyleLineSet *lineset;
 
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
-		for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			if (linestyle) {
 				linestyle->id.tag |= LIB_TAG_DOIT;
 			}
 		}
 	}
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
-		for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			if (linestyle) {
 				if (!(linestyle->id.tag & LIB_TAG_DOIT))
@@ -451,41 +289,142 @@ static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce,
 
 static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
-	SceneRenderLayer *srl;
-	TreeElement *tenla = outliner_add_element(soops, lb, sce, te, TSE_R_LAYER_BASE, 0);
-	int a;
+	/* View layers */
+	TreeElement *ten = outliner_add_element(soops, lb, sce, te, TSE_R_LAYER_BASE, 0);
+	ten->name = IFACE_("View Layers");
 
-	tenla->name = IFACE_("RenderLayers");
-	for (a = 0, srl = sce->r.layers.first; srl; srl = srl->next, a++) {
-		TreeElement *tenlay = outliner_add_element(soops, &tenla->subtree, sce, te, TSE_R_LAYER, a);
-		tenlay->name = srl->name;
-		tenlay->directdata = &srl->layflag;
+	ViewLayer *view_layer;
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		TreeElement *tenlay = outliner_add_element(soops, &ten->subtree, sce, te, TSE_R_LAYER, 0);
+		tenlay->name = view_layer->name;
+		tenlay->directdata = view_layer;
+	}
 
-		if (srl->light_override)
-			outliner_add_element(soops, &tenlay->subtree, srl->light_override, tenlay, TSE_LINKED_LAMP, 0);
-		if (srl->mat_override)
-			outliner_add_element(soops, &tenlay->subtree, srl->mat_override, tenlay, TSE_LINKED_MAT, 0);
+	/* Collections */
+	ten = outliner_add_element(soops, lb, &sce->id, te, TSE_SCENE_COLLECTION_BASE, 0);
+	ten->name = IFACE_("Scene Collection");
+	outliner_add_collection_recursive(soops, sce->master_collection, ten);
 
-		outliner_add_passes(soops, tenlay, &sce->id, srl);
+	/* Objects */
+	ten = outliner_add_element(soops, lb, sce, te, TSE_SCENE_OBJECTS_BASE, 0);
+	ten->name = IFACE_("Objects");
+	FOREACH_SCENE_OBJECT_BEGIN(sce, ob)
+	{
+		outliner_add_element(soops, &ten->subtree, ob, NULL, 0, 0);
 	}
+	FOREACH_SCENE_OBJECT_END;
+	outliner_make_object_parent_hierarchy(&ten->subtree);
 
-	// TODO: move this to the front?
+	/* Animation Data */
 	if (outliner_animdata_test(sce->adt))
 		outliner_add_element(soops, lb, sce, te, TSE_ANIM_DATA, 0);
 
+	/* Grease Pencil */
 	outliner_add_element(soops, lb, sce->gpd, te, 0, 0);
+}
 
-	outliner_add_element(soops,  lb, sce->world, te, 0, 0);
+TreeTraversalAction outliner_find_selected_objects(TreeElement *te, void *customdata)
+{
+	struct ObjectsSelectedData *data = customdata;
+	TreeStoreElem *tselem = TREESTORE(te);
 
-#ifdef WITH_FREESTYLE
-	if (STREQ(sce->r.engine, RE_engine_id_BLENDER_RENDER) && (sce->r.mode & R_EDGE_FRS))
-		outliner_add_line_styles(soops, lb, sce, te);
-#endif
+	if (outliner_is_collection_tree_element(te)) {
+		return TRAVERSE_CONTINUE;
+	}
+
+	if (tselem->type || (tselem->id == NULL) || (GS(tselem->id->name) != ID_OB)) {
+		return TRAVERSE_SKIP_CHILDS;
+	}
+
+	BLI_addtail(&data->objects_selected_array, BLI_genericNodeN(te));
+
+	return TRAVERSE_CONTINUE;
+}
+
+/**
+ * Move objects from a collection to another.
+ * We ignore the original object being inserted, we used it for polling only.
+ * Instead we move all the selected objects around.
+ */
+static void outliner_object_reorder(
+        Main *bmain, Scene *scene,
+        SpaceOops *soops,
+        TreeElement *insert_element,
+        TreeElement *insert_handle, TreeElementInsertType action,
+        const wmEvent *event)
+{
+	Collection *collection = outliner_collection_from_tree_element(insert_handle);
+	Collection *collection_ob_parent = NULL;
+	ID *id = insert_handle->store_elem->id;
+
+	BLI_assert(action == TE_INSERT_INTO);
+	UNUSED_VARS_NDEBUG(action);
+
+	struct ObjectsSelectedData data = {
+		.objects_selected_array  = {NULL, NULL},
+	};
+
+	const bool is_append = event->ctrl;
+
+	/* Make sure we include the originally inserted element as well. */
+	TREESTORE(insert_element)->flag |= TSE_SELECTED;
+
+	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_selected_objects, &data);
+	LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) {
+		TreeElement *ten_selected = (TreeElement *)link->data;
+		Object *ob = (Object *)TREESTORE(ten_selected)->id;
+
+		if (is_append) {
+			BKE_collection_object_add(bmain, collection, ob);
+			continue;
+		}
+
+		/* Find parent collection of object. */
+		if (ten_selected->parent) {
+			for (TreeElement *te_ob_parent = ten_selected->parent; te_ob_parent; te_ob_parent = te_ob_parent->parent) {
+				if (outliner_is_collection_tree_element(te_ob_parent)) {
+					collection_ob_parent = outliner_collection_from_tree_element(te_ob_parent);
+					break;
+				}
+			}
+		}
+		else {
+			collection_ob_parent = BKE_collection_master(scene);
+		}
+
+		BKE_collection_object_move(bmain, scene, collection, collection_ob_parent, ob);
+	}
+
+	BLI_freelistN(&data.objects_selected_array);
+
+	DEG_relations_tag_update(bmain);
+
+	/* TODO(sergey): Use proper flag for tagging here. */
+	DEG_id_tag_update(id, 0);
+
+	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
+}
+
+static bool outliner_object_reorder_poll(
+        const TreeElement *insert_element,
+        TreeElement **io_insert_handle, TreeElementInsertType *io_action)
+{
+	if (outliner_is_collection_tree_element(*io_insert_handle) &&
+	    (insert_element->parent != *io_insert_handle))
+	{
+		*io_action = TE_INSERT_INTO;
+		return true;
+	}
+
+	return false;
 }
 
 // can be inlined if necessary
 static void outliner_add_object_contents(SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, Object *ob)
 {
+	te->reinsert = outliner_object_reorder;
+	te->reinsert_poll = outliner_object_reorder_poll;
+
 	if (outliner_animdata_test(ob->adt))
 		outliner_add_element(soops, &te->subtree, ob, te, TSE_ANIM_DATA, 0);
 
@@ -719,14 +658,9 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 		case ID_MA:
 		{
 			Material *ma = (Material *)id;
-			int a;
 
 			if (outliner_animdata_test(ma->adt))
 				outliner_add_element(soops, &te->subtree, ma, te, TSE_ANIM_DATA, 0);
-
-			for (a = 0; a < MAX_MTEX; a++) {
-				if (ma->mtex[a]) outliner_add_element(soops, &te->subtree, ma->mtex[a]->tex, te, 0, a);
-			}
 			break;
 		}
 		case ID_TE:
@@ -760,14 +694,9 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 		case ID_LA:
 		{
 			Lamp *la = (Lamp *)id;
-			int a;
 
 			if (outliner_animdata_test(la->adt))
 				outliner_add_element(soops, &te->subtree, la, te, TSE_ANIM_DATA, 0);
-
-			for (a = 0; a < MAX_MTEX; a++) {
-				if (la->mtex[a]) outliner_add_element(soops, &te->subtree, la->mtex[a]->tex, te, 0, a);
-			}
 			break;
 		}
 		case ID_SPK:
@@ -778,17 +707,20 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 				outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0);
 			break;
 		}
+		case ID_LP:
+		{
+			LightProbe *prb = (LightProbe *)id;
+
+			if (outliner_animdata_test(prb->adt))
+				outliner_add_element(soops, &te->subtree, prb, te, TSE_ANIM_DATA, 0);
+			break;
+		}
 		case ID_WO:
 		{
 			World *wrld = (World *)id;
-			int a;
 
 			if (outliner_animdata_test(wrld->adt))
 				outliner_add_element(soops, &te->subtree, wrld, te, TSE_ANIM_DATA, 0);
-
-			for (a = 0; a < MAX_MTEX; a++) {
-				if (wrld->mtex[a]) outliner_add_element(soops, &te->subtree, wrld->mtex[a]->tex, te, 0, a);
-			}
 			break;
 		}
 		case ID_KE:
@@ -882,6 +814,14 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 			}
 			break;
 		}
+		case ID_GR:
+		{
+			/* Don't expand for instances, creates too many elements. */
+			if (!(te->parent && te->parent->idcode == ID_OB)) {
+				Collection *collection = (Collection *)id;
+				outliner_add_collection_recursive(soops, collection, te);
+			}
+		}
 		default:
 			break;
 	}
@@ -905,7 +845,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 		id = TREESTORE(parent)->id;
 	}
 
-	/* One exception */
+	/* exceptions */
 	if (type == TSE_ID_BASE) {
 		/* pass */
 	}
@@ -943,6 +883,9 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 	else if (type == TSE_GP_LAYER) {
 		/* pass */
 	}
+	else if (ELEM(type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) {
+		/* pass */
+	}
 	else if (type == TSE_ID_BASE) {
 		/* pass */
 	}
@@ -959,8 +902,9 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 		TreeStoreElem *tsepar = parent ? TREESTORE(parent) : NULL;
 
 		/* ID datablock */
-		if (tsepar == NULL || tsepar->type != TSE_ID_BASE)
+		if (tsepar == NULL || tsepar->type != TSE_ID_BASE || soops->filter_id_type) {
 			outliner_add_id_contents(soops, te, tselem, id);
+		}
 	}
 	else if (type == TSE_ANIM_DATA) {
 		IdAdtTemplate *iat = (IdAdtTemplate *)idv;
@@ -1306,16 +1250,56 @@ static void outliner_add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *t
 
 /* ----------------------------------------------- */
 
+static const char *outliner_idcode_to_plural(short idcode)
+{
+	const char *propname = BKE_idcode_to_name_plural(idcode);
+	PropertyRNA *prop = RNA_struct_type_find_property(&RNA_BlendData, propname);
+	return (prop) ? RNA_property_ui_name(prop) : "UNKNOWN";
+}
 
-static void outliner_add_library_contents(Main *mainvar, SpaceOops *soops, TreeElement *te, Library *lib)
+static bool outliner_library_id_show(Library *lib, ID *id, short filter_id_type)
 {
-	TreeElement *ten;
+	if (id->lib != lib) {
+		return false;
+	}
+
+	if (filter_id_type == ID_GR) {
+		/* Don't show child collections of non-scene master collection,
+		 * they are already shown as children. */
+		Collection *collection = (Collection *)id;
+		bool has_non_scene_parent = false;
+
+		for (CollectionParent *cparent = collection->parents.first; cparent; cparent = cparent->next) {
+			if (!(cparent->collection->flag & COLLECTION_IS_MASTER)) {
+				has_non_scene_parent = true;
+			}
+		}
+
+		if (has_non_scene_parent) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static TreeElement *outliner_add_library_contents(Main *mainvar, SpaceOops *soops, ListBase *lb, Library *lib)
+{
+	TreeElement *ten, *tenlib = NULL;
 	ListBase *lbarray[MAX_LIBARRAY];
 	int a, tot;
+	short filter_id_type = (soops->filter & SO_FILTER_ID_TYPE) ? soops->filter_id_type : 0;
+
+	if (filter_id_type) {
+		lbarray[0] = which_libbase(mainvar, soops->filter_id_type);
+		tot = 1;
+	}
+	else {
+		tot = set_listbasepointers(mainvar, lbarray);
+	}
 
-	tot = set_listbasepointers(mainvar, lbarray);
 	for (a = 0; a < tot; a++) {
-		if (lbarray[a]->first) {
+		if (lbarray[a] && lbarray[a]->first) {
 			ID *id = lbarray[a]->first;
 
 			/* check if there's data in current lib */
@@ -1324,21 +1308,37 @@ static void outliner_add_library_contents(Main *mainvar, SpaceOops *soops, TreeE
 					break;
 
 			if (id) {
-				ten = outliner_add_element(soops, &te->subtree, lbarray[a], NULL, TSE_ID_BASE, 0);
-				ten->directdata = lbarray[a];
+				if (!tenlib) {
+					/* Create library tree element on demand, depending if there are any datablocks. */
+					if (lib) {
+						tenlib = outliner_add_element(soops, lb, lib, NULL, 0, 0);
+					}
+					else {
+						tenlib = outliner_add_element(soops, lb, mainvar, NULL, TSE_ID_BASE, 0);
+						tenlib->name = IFACE_("Current File");
+					}
+				}
 
-				ten->name = BKE_idcode_to_name_plural(GS(id->name));
-				if (ten->name == NULL)
-					ten->name = "UNKNOWN";
+				/* Create datablock list parent element on demand. */
+				if (filter_id_type) {
+					ten = tenlib;
+				}
+				else {
+					ten = outliner_add_element(soops, &tenlib->subtree, lbarray[a], NULL, TSE_ID_BASE, 0);
+					ten->directdata = lbarray[a];
+					ten->name = outliner_idcode_to_plural(GS(id->name));
+				}
 
 				for (id = lbarray[a]->first; id; id = id->next) {
-					if (id->lib == lib)
+					if (outliner_library_id_show(lib, id, filter_id_type)) {
 						outliner_add_element(soops, &ten->subtree, id, ten, 0, 0);
+					}
 				}
 			}
 		}
 	}
 
+	return tenlib;
 }
 
 static void outliner_add_orphaned_datablocks(Main *mainvar, SpaceOops *soops)
@@ -1346,10 +1346,18 @@ static void outliner_add_orphaned_datablocks(Main *mainvar, SpaceOops *soops)
 	TreeElement *ten;
 	ListBase *lbarray[MAX_LIBARRAY];
 	int a, tot;
+	short filter_id_type = (soops->filter & SO_FILTER_ID_TYPE) ? soops->filter_id_type : 0;
+
+	if (filter_id_type) {
+		lbarray[0] = which_libbase(mainvar, soops->filter_id_type);
+		tot = 1;
+	}
+	else {
+		tot = set_listbasepointers(mainvar, lbarray);
+	}
 
-	tot = set_listbasepointers(mainvar, lbarray);
 	for (a = 0; a < tot; a++) {
-		if (lbarray[a]->first) {
+		if (lbarray[a] && lbarray[a]->first) {
 			ID *id = lbarray[a]->first;
 
 			/* check if there are any datablocks of this type which are orphans */
@@ -1360,34 +1368,196 @@ static void outliner_add_orphaned_datablocks(Main *mainvar, SpaceOops *soops)
 
 			if (id) {
 				/* header for this type of datablock */
-				/* TODO's:
-				 *   - Add a parameter to BKE_idcode_to_name_plural to get a sane "user-visible" name instead?
-				 *   - Ensure that this uses nice icons for the datablock type involved instead of the dot?
-				 */
-				ten = outliner_add_element(soops, &soops->tree, lbarray[a], NULL, TSE_ID_BASE, 0);
-				ten->directdata = lbarray[a];
-
-				ten->name = BKE_idcode_to_name_plural(GS(id->name));
-				if (ten->name == NULL)
-					ten->name = "UNKNOWN";
+				if (filter_id_type) {
+					ten = NULL;
+				}
+				else {
+					ten = outliner_add_element(soops, &soops->tree, lbarray[a], NULL, TSE_ID_BASE, 0);
+					ten->directdata = lbarray[a];
+					ten->name = outliner_idcode_to_plural(GS(id->name));
+				}
 
 				/* add the orphaned datablocks - these will not be added with any subtrees attached */
 				for (id = lbarray[a]->first; id; id = id->next) {
 					if (ID_REAL_USERS(id) <= 0)
-						outliner_add_element(soops, &ten->subtree, id, ten, 0, 0);
+						outliner_add_element(soops, (ten) ? &ten->subtree : &soops->tree, id, ten, 0, 0);
 				}
 			}
 		}
 	}
 }
 
+static void outliner_collections_reorder(
+        Main *bmain,
+        Scene *UNUSED(scene),
+        SpaceOops *soops,
+        TreeElement *insert_element,
+        TreeElement *insert_handle,
+        TreeElementInsertType action,
+        const wmEvent *UNUSED(event))
+{
+	TreeElement *from_parent_te, *to_parent_te;
+	Collection *from_parent, *to_parent;
+
+	Collection *collection = outliner_collection_from_tree_element(insert_element);
+	Collection *relative = NULL;
+	bool relative_after = false;
+
+	from_parent_te = outliner_find_parent_element(&soops->tree, NULL, insert_element);
+	from_parent = (from_parent_te) ? outliner_collection_from_tree_element(from_parent_te) : NULL;
+
+	if (ELEM(action, TE_INSERT_BEFORE, TE_INSERT_AFTER)) {
+		to_parent_te = outliner_find_parent_element(&soops->tree, NULL, insert_handle);
+		to_parent = (to_parent_te) ? outliner_collection_from_tree_element(to_parent_te) : NULL;
+
+		relative = outliner_collection_from_tree_element(insert_handle);
+		relative_after = (action == TE_INSERT_AFTER);
+	}
+	else if (action == TE_INSERT_INTO) {
+		to_parent = outliner_collection_from_tree_element(insert_handle);
+	}
+	else {
+		BLI_assert(0);
+		return;
+	}
+
+	if (!to_parent) {
+		return;
+	}
+
+	BKE_collection_move(bmain, to_parent, from_parent, relative, relative_after, collection);
+
+	DEG_relations_tag_update(bmain);
+}
+
+static bool outliner_collections_reorder_poll(
+        const TreeElement *insert_element,
+        TreeElement **io_insert_handle,
+        TreeElementInsertType *io_action)
+{
+	/* Can't move master collection. */
+	Collection *collection = outliner_collection_from_tree_element(insert_element);
+	if (collection->flag & COLLECTION_IS_MASTER) {
+		return false;
+	}
+
+	/* Can only move into collections. */
+	Collection *collection_handle = outliner_collection_from_tree_element(*io_insert_handle);
+	if (collection_handle == NULL) {
+		return false;
+	}
+
+	/* We can't insert/before after master collection. */
+	if (collection_handle->flag & COLLECTION_IS_MASTER) {
+		if (*io_action == TE_INSERT_BEFORE) {
+			/* can't go higher than master collection, insert into it */
+			*io_action = TE_INSERT_INTO;
+		}
+		else if (*io_action == TE_INSERT_AFTER) {
+			*io_insert_handle = (*io_insert_handle)->subtree.last;
+		}
+	}
+
+	return true;
+}
+
+static void outliner_add_layer_collection_objects(
+        SpaceOops *soops, ListBase *tree, ViewLayer *layer,
+        LayerCollection *lc, TreeElement *ten)
+{
+	for (CollectionObject *cob = lc->collection->gobject.first; cob; cob = cob->next) {
+		Base *base = BKE_view_layer_base_find(layer, cob->ob);
+		TreeElement *te_object = outliner_add_element(soops, tree, base->object, ten, 0, 0);
+		te_object->directdata = base;
+	}
+}
+
+static void outliner_add_layer_collections_recursive(
+        SpaceOops *soops, ListBase *tree, ViewLayer *layer,
+        ListBase *layer_collections, TreeElement *parent_ten,
+        const bool show_objects)
+{
+	for (LayerCollection *lc = layer_collections->first; lc; lc = lc->next) {
+		ID *id = &lc->collection->id;
+		TreeElement *ten = outliner_add_element(soops, tree, id, parent_ten, TSE_LAYER_COLLECTION, 0);
+
+		ten->name = id->name + 2;
+		ten->directdata = lc;
+		ten->reinsert = outliner_collections_reorder;
+		ten->reinsert_poll = outliner_collections_reorder_poll;
+
+		const bool exclude = (lc->flag & LAYER_COLLECTION_EXCLUDE) != 0;
+		if (exclude) {
+			ten->flag |= TE_DISABLED;
+		}
+
+		outliner_add_layer_collections_recursive(soops, &ten->subtree, layer, &lc->layer_collections, ten, show_objects);
+		if (!exclude && show_objects) {
+			outliner_add_layer_collection_objects(soops, &ten->subtree, layer, lc, ten);
+		}
+	}
+}
+
+static void outliner_add_view_layer(SpaceOops *soops, ListBase *tree, TreeElement *parent,
+                                    ViewLayer *layer, const bool show_objects)
+{
+	/* First layer collection is for master collection, don't show it. */
+	LayerCollection *lc = layer->layer_collections.first;
+	if (lc == NULL) {
+		return;
+	}
+
+	outliner_add_layer_collections_recursive(soops, tree, layer, &lc->layer_collections, parent, show_objects);
+	if (show_objects) {
+		outliner_add_layer_collection_objects(soops, tree, layer, lc, parent);
+	}
+}
+
+BLI_INLINE void outliner_add_collection_init(TreeElement *te, Collection *collection)
+{
+	if (collection->flag & COLLECTION_IS_MASTER) {
+		te->name = IFACE_("Scene Collection");
+	}
+	else {
+		te->name = collection->id.name + 2;
+	}
+
+	te->directdata = collection;
+	te->reinsert = outliner_collections_reorder;
+	te->reinsert_poll = outliner_collections_reorder_poll;
+}
+
+BLI_INLINE void outliner_add_collection_objects(
+        SpaceOops *soops, ListBase *tree, Collection *collection, TreeElement *parent)
+{
+	for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+		outliner_add_element(soops, tree, cob->ob, parent, 0, 0);
+	}
+}
+
+static TreeElement *outliner_add_collection_recursive(
+        SpaceOops *soops, Collection *collection, TreeElement *ten)
+{
+	outliner_add_collection_init(ten, collection);
+
+	for (CollectionChild *child = collection->children.first; child; child = child->next) {
+		outliner_add_element(soops, &ten->subtree, &child->collection->id, ten, 0, 0);
+	}
+
+	if (soops->outlinevis != SO_SCENES) {
+		outliner_add_collection_objects(soops, &ten->subtree, collection, ten);
+	}
+
+	return ten;
+}
+
 /* ======================================================= */
 /* Generic Tree Building helpers - order these are called is top to bottom */
 
 /* Hierarchy --------------------------------------------- */
 
 /* make sure elements are correctly nested */
-static void outliner_make_hierarchy(ListBase *lb)
+static void outliner_make_object_parent_hierarchy(ListBase *lb)
 {
 	TreeElement *te, *ten, *tep;
 	TreeStoreElem *tselem;
@@ -1494,17 +1664,14 @@ static void outliner_sort(ListBase *lb)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
-	int totelem = 0;
 
 	te = lb->last;
 	if (te == NULL) return;
 	tselem = TREESTORE(te);
 
 	/* sorting rules; only object lists, ID lists, or deformgroups */
-	if ( ELEM(tselem->type, TSE_DEFGROUP, TSE_ID_BASE) || (tselem->type == 0 && te->idcode == ID_OB)) {
-
-		/* count first */
-		for (te = lb->first; te; te = te->next) totelem++;
+	if (ELEM(tselem->type, TSE_DEFGROUP, TSE_ID_BASE) || (tselem->type == 0 && te->idcode == ID_OB)) {
+		int totelem = BLI_listbase_count(lb);
 
 		if (totelem > 1) {
 			tTreeSort *tear = MEM_mallocN(totelem * sizeof(tTreeSort), "tree sort array");
@@ -1555,6 +1722,296 @@ static void outliner_sort(ListBase *lb)
 
 /* Filtering ----------------------------------------------- */
 
+typedef struct OutlinerTreeElementFocus {
+	TreeStoreElem *tselem;
+	int ys;
+} OutlinerTreeElementFocus;
+
+/**
+ * Bring the outliner scrolling back to where it was in relation to the original focus element
+ * Caller is expected to handle redrawing of ARegion.
+ */
+static void outliner_restore_scrolling_position(SpaceOops *soops, ARegion *ar, OutlinerTreeElementFocus *focus)
+{
+	View2D *v2d = &ar->v2d;
+	int ytop;
+
+	if (focus->tselem != NULL) {
+		outliner_set_coordinates(ar, soops);
+
+		TreeElement *te_new = outliner_find_tree_element(&soops->tree, focus->tselem);
+
+		if (te_new != NULL) {
+			int ys_new, ys_old;
+
+			ys_new = te_new->ys;
+			ys_old = focus->ys;
+
+			ytop = v2d->cur.ymax + (ys_new - ys_old) -1;
+			if (ytop > 0) ytop = 0;
+
+			v2d->cur.ymax = (float)ytop;
+			v2d->cur.ymin = (float)(ytop - BLI_rcti_size_y(&v2d->mask));
+		}
+		else {
+			return;
+		}
+	}
+}
+
+static bool test_collection_callback(TreeElement *te)
+{
+	return outliner_is_collection_tree_element(te);
+}
+
+static bool test_object_callback(TreeElement *te)
+{
+	TreeStoreElem *tselem = TREESTORE(te);
+	return ((tselem->type == 0) && (te->idcode == ID_OB));
+}
+
+/**
+ * See if TreeElement or any of its children pass the callback_test.
+ */
+static TreeElement *outliner_find_first_desired_element_at_y_recursive(
+        const SpaceOops *soops,
+        TreeElement *te,
+        const float limit,
+        bool (*callback_test)(TreeElement *))
+{
+	if (callback_test(te)) {
+		return te;
+	}
+
+	if (TSELEM_OPEN(te->store_elem, soops)) {
+		TreeElement *te_iter, *te_sub;
+		for (te_iter = te->subtree.first; te_iter; te_iter = te_iter->next) {
+			te_sub = outliner_find_first_desired_element_at_y_recursive(soops, te_iter, limit, callback_test);
+			if (te_sub != NULL) {
+				return te_sub;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * Find the first element that passes a test starting from a reference vertical coordinate
+ *
+ * If the element that is in the position is not what we are looking for, keep looking for its
+ * children, siblings, and eventually, aunts, cousins, disntant families, ...
+ *
+ * Basically we keep going up and down the outliner tree from that point forward, until we find
+ * what we are looking for. If we are past the visible range and we can't find a valid element
+ * we return NULL.
+ */
+static TreeElement *outliner_find_first_desired_element_at_y(
+        const SpaceOops *soops,
+        const float view_co,
+        const float view_co_limit)
+{
+	TreeElement *te, *te_sub;
+	te = outliner_find_item_at_y(soops, &soops->tree, view_co);
+
+	bool (*callback_test)(TreeElement *);
+	if ((soops->outlinevis == SO_VIEW_LAYER) &&
+	     (soops->filter & SO_FILTER_NO_COLLECTION))
+	{
+		callback_test = test_object_callback;
+	}
+	else {
+		callback_test = test_collection_callback;
+	}
+
+	while (te != NULL) {
+		te_sub = outliner_find_first_desired_element_at_y_recursive(soops, te, view_co_limit, callback_test);
+		if (te_sub != NULL) {
+			/* Skip the element if it was not visible to start with. */
+			if (te->ys + UI_UNIT_Y > view_co_limit) {
+				return te_sub;
+			}
+			else {
+				return NULL;
+			}
+		}
+
+		if (te->next) {
+			te = te->next;
+			continue;
+		}
+
+		if (te->parent == NULL) {
+			break;
+		}
+
+		while (te->parent) {
+			if (te->parent->next) {
+				te = te->parent->next;
+				break;
+			}
+			te = te->parent;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * Store information of current outliner scrolling status to be restored later
+ *
+ * Finds the top-most collection visible in the outliner and populates the OutlinerTreeElementFocus
+ * struct to retrieve this element later to make sure it is in the same original position as before filtering
+ */
+static void outliner_store_scrolling_position(SpaceOops *soops, ARegion *ar, OutlinerTreeElementFocus *focus)
+{
+	TreeElement *te;
+	float limit = ar->v2d.cur.ymin;
+
+	outliner_set_coordinates(ar, soops);
+
+	te = outliner_find_first_desired_element_at_y(soops, ar->v2d.cur.ymax, limit);
+
+	if (te != NULL) {
+		focus->tselem = TREESTORE(te);
+		focus->ys = te->ys;
+	}
+	else {
+		focus->tselem = NULL;
+	}
+}
+
+static int outliner_exclude_filter_get(SpaceOops *soops)
+{
+	int exclude_filter = soops->filter & ~SO_FILTER_OB_STATE;
+
+	if (soops->filter & SO_FILTER_SEARCH) {
+		if (soops->search_string[0] == 0) {
+			exclude_filter &= ~SO_FILTER_SEARCH;
+		}
+	}
+
+	/* Let's have this for the collection options at first. */
+	if (!SUPPORT_FILTER_OUTLINER(soops)) {
+		return (exclude_filter & SO_FILTER_SEARCH);
+	}
+
+	if (soops->filter & SO_FILTER_NO_OBJECT) {
+		exclude_filter |= SO_FILTER_OB_TYPE;
+	}
+
+	switch (soops->filter_state) {
+		case SO_FILTER_OB_VISIBLE:
+			exclude_filter |= SO_FILTER_OB_STATE_VISIBLE;
+			break;
+		case SO_FILTER_OB_SELECTED:
+			exclude_filter |= SO_FILTER_OB_STATE_SELECTED;
+			break;
+		case SO_FILTER_OB_ACTIVE:
+			exclude_filter |= SO_FILTER_OB_STATE_ACTIVE;
+			break;
+	}
+
+	return exclude_filter;
+}
+
+static bool outliner_element_visible_get(ViewLayer *view_layer, TreeElement *te, const int exclude_filter)
+{
+	if ((exclude_filter & SO_FILTER_ANY) == 0) {
+		return true;
+	}
+
+	TreeStoreElem *tselem = TREESTORE(te);
+	if ((tselem->type == 0) && (te->idcode == ID_OB)) {
+		if ((exclude_filter & SO_FILTER_OB_TYPE) == SO_FILTER_OB_TYPE) {
+			return false;
+		}
+
+		Object *ob = (Object *)tselem->id;
+		Base *base = (Base *)te->directdata;
+		BLI_assert((base == NULL) || (base->object == ob));
+
+		if (exclude_filter & SO_FILTER_OB_TYPE) {
+			switch (ob->type) {
+				case OB_MESH:
+					if (exclude_filter & SO_FILTER_NO_OB_MESH) {
+						return false;
+					}
+					break;
+				case OB_ARMATURE:
+					if (exclude_filter & SO_FILTER_NO_OB_ARMATURE) {
+						return false;
+					}
+					break;
+				case OB_EMPTY:
+					if (exclude_filter & SO_FILTER_NO_OB_EMPTY) {
+						return false;
+					}
+					break;
+				case OB_LAMP:
+					if (exclude_filter & SO_FILTER_NO_OB_LAMP) {
+						return false;
+					}
+					break;
+				case OB_CAMERA:
+					if (exclude_filter & SO_FILTER_NO_OB_CAMERA) {
+						return false;
+					}
+					break;
+				default:
+					if (exclude_filter & SO_FILTER_NO_OB_OTHERS) {
+						return false;
+					}
+					break;
+			}
+		}
+
+		if (exclude_filter & SO_FILTER_OB_STATE) {
+			if (base == NULL) {
+				base = BKE_view_layer_base_find(view_layer, ob);
+
+				if (base == NULL) {
+					return false;
+				}
+			}
+
+			if (exclude_filter & SO_FILTER_OB_STATE_VISIBLE) {
+				if ((base->flag & BASE_VISIBLED) == 0) {
+					return false;
+				}
+			}
+			else if (exclude_filter & SO_FILTER_OB_STATE_SELECTED) {
+				if ((base->flag & BASE_SELECTED) == 0) {
+					return false;
+				}
+			}
+			else {
+				BLI_assert(exclude_filter & SO_FILTER_OB_STATE_ACTIVE);
+				if (base != BASACT(view_layer)) {
+					return false;
+				}
+			}
+		}
+
+		if ((te->parent != NULL) &&
+		    (TREESTORE(te->parent)->type == 0) && (te->parent->idcode == ID_OB))
+		{
+			if (exclude_filter & SO_FILTER_NO_CHILDREN) {
+				return false;
+			}
+		}
+	}
+	else if (te->parent != NULL &&
+	         TREESTORE(te->parent)->type == 0 && te->parent->idcode == ID_OB)
+	{
+		if (exclude_filter & SO_FILTER_NO_OB_CONTENT) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
 static bool outliner_filter_has_name(TreeElement *te, const char *name, int flags)
 {
 	int fn_flag = 0;
@@ -1565,30 +2022,24 @@ static bool outliner_filter_has_name(TreeElement *te, const char *name, int flag
 	return fnmatch(name, te->name, fn_flag) == 0;
 }
 
-static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
+static int outliner_filter_subtree(
+        SpaceOops *soops, ViewLayer *view_layer, ListBase *lb, const char *search_string, const int exclude_filter)
 {
-	TreeElement *te, *ten;
+	TreeElement *te, *te_next;
 	TreeStoreElem *tselem;
-	char search_buff[sizeof(((struct SpaceOops *)NULL)->search_string) + 2];
-	char *search_string;
 
-	/* although we don't have any search string, we return true
-	 * since the entire tree is ok then...
-	 */
-	if (soops->search_string[0] == 0)
-		return 1;
+	for (te = lb->first; te; te = te_next) {
+		te_next = te->next;
 
-	if (soops->search_flags & SO_FIND_COMPLETE) {
-		search_string = soops->search_string;
-	}
-	else {
-		/* Implicitly add heading/trailing wildcards if needed. */
-		BLI_strncpy_ensure_pad(search_buff, soops->search_string, '*', sizeof(search_buff));
-		search_string = search_buff;
-	}
-
-	for (te = lb->first; te; te = ten) {
-		ten = te->next;
+		if ((outliner_element_visible_get(view_layer, te, exclude_filter) == false)) {
+			outliner_free_tree_element(te, lb);
+			continue;
+		}
+		else if ((exclude_filter & SO_FILTER_SEARCH) == 0) {
+			/* Filter subtree too. */
+			outliner_filter_subtree(soops, view_layer, &te->subtree, search_string, exclude_filter);
+			continue;
+		}
 
 		if (!outliner_filter_has_name(te, search_string, soops->search_flags)) {
 			/* item isn't something we're looking for, but...
@@ -1602,12 +2053,10 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
 			/* flag as not a found item */
 			tselem->flag &= ~TSE_SEARCHMATCH;
 
-			if ((!TSELEM_OPEN(tselem, soops)) || outliner_filter_tree(soops, &te->subtree) == 0) {
-				outliner_free_tree(&te->subtree);
-				BLI_remlink(lb, te);
-
-				if (te->flag & TE_FREE_NAME) MEM_freeN((void *)te->name);
-				MEM_freeN(te);
+			if ((!TSELEM_OPEN(tselem, soops)) ||
+			    outliner_filter_subtree(soops, view_layer, &te->subtree, search_string, exclude_filter) == 0)
+			{
+				outliner_free_tree_element(te, lb);
 			}
 		}
 		else {
@@ -1617,7 +2066,7 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
 			tselem->flag |= TSE_SEARCHMATCH;
 
 			/* filter subtree too */
-			outliner_filter_tree(soops, &te->subtree);
+			outliner_filter_subtree(soops, view_layer, &te->subtree, search_string, exclude_filter);
 		}
 	}
 
@@ -1625,14 +2074,36 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
 	return (BLI_listbase_is_empty(lb) == false);
 }
 
+static void outliner_filter_tree(SpaceOops *soops, ViewLayer *view_layer)
+{
+	char search_buff[sizeof(((struct SpaceOops *)NULL)->search_string) + 2];
+	char *search_string;
+
+	const int exclude_filter = outliner_exclude_filter_get(soops);
+
+	if (exclude_filter == 0) {
+		return;
+	}
+
+	if (soops->search_flags & SO_FIND_COMPLETE) {
+		search_string = soops->search_string;
+	}
+	else {
+		/* Implicitly add heading/trailing wildcards if needed. */
+		BLI_strncpy_ensure_pad(search_buff, soops->search_string, '*', sizeof(search_buff));
+		search_string = search_buff;
+	}
+
+	outliner_filter_subtree(soops, view_layer, &soops->tree, search_string, exclude_filter);
+}
+
 /* ======================================================= */
 /* Main Tree Building API */
 
 /* Main entry point for building the tree data-structure that the outliner represents */
 // TODO: split each mode into its own function?
-void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
+void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, SpaceOops *soops, ARegion *ar)
 {
-	Base *base;
 	TreeElement *te = NULL, *ten;
 	TreeStoreElem *tselem;
 	int show_opened = !soops->treestore || !BLI_mempool_len(soops->treestore); /* on first view, we open scenes */
@@ -1640,7 +2111,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 	/* Are we looking for something - we want to tag parents to filter child matches
 	 * - NOT in datablocks view - searching all datablocks takes way too long to be useful
 	 * - this variable is only set once per tree build */
-	if (soops->search_string[0] != 0 && soops->outlinevis != SO_DATABLOCKS)
+	if (soops->search_string[0] != 0 && soops->outlinevis != SO_DATA_API)
 		soops->search_flags |= SO_SEARCH_RECURSIVE;
 	else
 		soops->search_flags &= ~SO_SEARCH_RECURSIVE;
@@ -1650,8 +2121,12 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 		BKE_outliner_treehash_rebuild_from_treestore(soops->treehash, soops->treestore);
 	}
 
-	if (soops->tree.first && (soops->storeflag & SO_TREESTORE_REDRAW))
+	if (ar->do_draw & RGN_DRAW_NO_REBUILD) {
 		return;
+	}
+
+	OutlinerTreeElementFocus focus;
+	outliner_store_scrolling_position(soops, ar, &focus);
 
 	outliner_free_tree(&soops->tree);
 	outliner_storage_cleanup(soops);
@@ -1661,20 +2136,18 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 		Library *lib;
 
 		/* current file first - mainvar provides tselem with unique pointer - not used */
-		ten = outliner_add_element(soops, &soops->tree, mainvar, NULL, TSE_ID_BASE, 0);
-		ten->name = IFACE_("Current File");
-
-		tselem = TREESTORE(ten);
-		if (!tselem->used)
-			tselem->flag &= ~TSE_CLOSED;
-
-		outliner_add_library_contents(mainvar, soops, ten, NULL);
+		ten = outliner_add_library_contents(mainvar, soops, &soops->tree, NULL);
+		if (ten) {
+			tselem = TREESTORE(ten);
+			if (!tselem->used)
+				tselem->flag &= ~TSE_CLOSED;
+		}
 
 		for (lib = mainvar->library.first; lib; lib = lib->id.next) {
-			ten = outliner_add_element(soops, &soops->tree, lib, NULL, 0, 0);
-			lib->id.newid = (ID *)ten;
-
-			outliner_add_library_contents(mainvar, soops, ten, lib);
+			ten = outliner_add_library_contents(mainvar, soops, &soops->tree, lib);
+			if (ten) {
+				lib->id.newid = (ID *)ten;
+			}
 
 		}
 		/* make hierarchy */
@@ -1694,9 +2167,10 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 				}
 				else {
 					/* Else, make a new copy of the libtree for our parent. */
-					TreeElement *dupten = outliner_add_element(soops, &par->subtree, lib, NULL, 0, 0);
-					outliner_add_library_contents(mainvar, soops, dupten, lib);
-					dupten->parent = par;
+					TreeElement *dupten = outliner_add_library_contents(mainvar, soops, &par->subtree, lib);
+					if (dupten) {
+						dupten->parent = par;
+					}
 				}
 			}
 			ten = nten;
@@ -1706,81 +2180,19 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 			lib->id.newid = NULL;
 
 	}
-	else if (soops->outlinevis == SO_ALL_SCENES) {
+	else if (soops->outlinevis == SO_SCENES) {
 		Scene *sce;
 		for (sce = mainvar->scene.first; sce; sce = sce->id.next) {
 			te = outliner_add_element(soops, &soops->tree, sce, NULL, 0, 0);
 			tselem = TREESTORE(te);
-			if (sce == scene && show_opened)
-				tselem->flag &= ~TSE_CLOSED;
 
-			for (base = sce->base.first; base; base = base->next) {
-				ten = outliner_add_element(soops, &te->subtree, base->object, te, 0, 0);
-				ten->directdata = base;
+			if (sce == scene && show_opened) {
+				tselem->flag &= ~TSE_CLOSED;
 			}
-			outliner_make_hierarchy(&te->subtree);
-			/* clear id.newid, to prevent objects be inserted in wrong scenes (parent in other scene) */
-			for (base = sce->base.first; base; base = base->next) base->object->id.newid = NULL;
-		}
-	}
-	else if (soops->outlinevis == SO_CUR_SCENE) {
-
-		outliner_add_scene_contents(soops, &soops->tree, scene, NULL);
-
-		for (base = scene->base.first; base; base = base->next) {
-			ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
-			ten->directdata = base;
-		}
-		outliner_make_hierarchy(&soops->tree);
-	}
-	else if (soops->outlinevis == SO_VISIBLE) {
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & scene->lay)
-				outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
-		}
-		outliner_make_hierarchy(&soops->tree);
-	}
-	else if (soops->outlinevis == SO_GROUPS) {
-		Group *group;
-		GroupObject *go;
 
-		for (group = mainvar->group.first; group; group = group->id.next) {
-			if (group->gobject.first) {
-				te = outliner_add_element(soops, &soops->tree, group, NULL, 0, 0);
-
-				for (go = group->gobject.first; go; go = go->next) {
-					ten = outliner_add_element(soops, &te->subtree, go->ob, te, 0, 0);
-					ten->directdata = NULL; /* eh, why? */
-				}
-				outliner_make_hierarchy(&te->subtree);
-				/* clear id.newid, to prevent objects be inserted in wrong scenes (parent in other scene) */
-				for (go = group->gobject.first; go; go = go->next) go->ob->id.newid = NULL;
-			}
+			outliner_make_object_parent_hierarchy(&te->subtree);
 		}
 	}
-	else if (soops->outlinevis == SO_SAME_TYPE) {
-		Object *ob = OBACT;
-		if (ob) {
-			for (base = scene->base.first; base; base = base->next) {
-				if (base->object->type == ob->type) {
-					ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
-					ten->directdata = base;
-				}
-			}
-			outliner_make_hierarchy(&soops->tree);
-		}
-	}
-	else if (soops->outlinevis == SO_SELECTED) {
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & scene->lay) {
-				if (base->flag & SELECT) {
-					ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
-					ten->directdata = base;
-				}
-			}
-		}
-		outliner_make_hierarchy(&soops->tree);
-	}
 	else if (soops->outlinevis == SO_SEQUENCE) {
 		Sequence *seq;
 		Editing *ed = BKE_sequencer_editing_get(scene, false);
@@ -1805,7 +2217,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 			seq = seq->next;
 		}
 	}
-	else if (soops->outlinevis == SO_DATABLOCKS) {
+	else if (soops->outlinevis == SO_DATA_API) {
 		PointerRNA mainptr;
 
 		RNA_main_pointer_create(mainvar, &mainptr);
@@ -1817,30 +2229,36 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
 			tselem->flag &= ~TSE_CLOSED;
 		}
 	}
-	else if (soops->outlinevis == SO_USERDEF) {
-		PointerRNA userdefptr;
-
-		RNA_pointer_create(NULL, &RNA_UserPreferences, &U, &userdefptr);
-
-		ten = outliner_add_element(soops, &soops->tree, (void *)&userdefptr, NULL, TSE_RNA_STRUCT, -1);
-
-		if (show_opened) {
-			tselem = TREESTORE(ten);
-			tselem->flag &= ~TSE_CLOSED;
-		}
-	}
 	else if (soops->outlinevis == SO_ID_ORPHANS) {
 		outliner_add_orphaned_datablocks(mainvar, soops);
 	}
-	else {
-		ten = outliner_add_element(soops, &soops->tree, OBACT, NULL, 0, 0);
-		if (ten) ten->directdata = BASACT;
+	else if (soops->outlinevis == SO_VIEW_LAYER) {
+		if (soops->filter & SO_FILTER_NO_COLLECTION) {
+			/* Show objects in the view layer. */
+			for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+				TreeElement *te_object = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
+				te_object->directdata = base;
+			}
+
+			outliner_make_object_parent_hierarchy(&soops->tree);
+		}
+		else {
+			/* Show collections in the view layer. */
+			ten = outliner_add_element(soops, &soops->tree, scene, NULL, TSE_VIEW_COLLECTION_BASE, 0);
+			ten->name = IFACE_("Scene Collection");
+			TREESTORE(ten)->flag &= ~TSE_CLOSED;
+
+			bool show_objects = !(soops->filter & SO_FILTER_NO_OBJECT);
+			outliner_add_view_layer(soops, &ten->subtree, ten, view_layer, show_objects);
+		}
 	}
 
 	if ((soops->flag & SO_SKIP_SORT_ALPHA) == 0) {
 		outliner_sort(&soops->tree);
 	}
-	outliner_filter_tree(soops, &soops->tree);
+
+	outliner_filter_tree(soops, view_layer);
+	outliner_restore_scrolling_position(soops, ar, &focus);
 
 	BKE_main_id_clear_newpoins(mainvar);
 }
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
new file mode 100644
index 00000000000..6b7035dd326
--- /dev/null
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -0,0 +1,246 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2017 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_outliner/outliner_utils.c
+ *  \ingroup spoutliner
+ */
+
+#include "BLI_utildefines.h"
+
+#include "DNA_action_types.h"
+#include "DNA_space_types.h"
+
+#include "BKE_outliner_treehash.h"
+
+#include "ED_armature.h"
+
+#include "UI_interface.h"
+
+#include "outliner_intern.h"
+
+/**
+ * Try to find an item under y-coordinate \a view_co_y (view-space).
+ * \note Recursive
+ */
+TreeElement *outliner_find_item_at_y(const SpaceOops *soops, const ListBase *tree, float view_co_y)
+{
+	for (TreeElement *te_iter = tree->first; te_iter; te_iter = te_iter->next) {
+		if (view_co_y < (te_iter->ys + UI_UNIT_Y)) {
+			if (view_co_y >= te_iter->ys) {
+				/* co_y is inside this element */
+				return te_iter;
+			}
+			else if (TSELEM_OPEN(te_iter->store_elem, soops)) {
+				/* co_y is lower than current element, possibly inside children */
+				TreeElement *te_sub = outliner_find_item_at_y(soops, &te_iter->subtree, view_co_y);
+				if (te_sub) {
+					return te_sub;
+				}
+			}
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * Collapsed items can show their children as click-able icons. This function tries to find
+ * such an icon that represents the child item at x-coordinate \a view_co_x (view-space).
+ *
+ * \return a hovered child item or \a parent_te (if no hovered child found).
+ */
+TreeElement *outliner_find_item_at_x_in_row(const SpaceOops *soops, const TreeElement *parent_te, float view_co_x)
+{
+	if (!TSELEM_OPEN(TREESTORE(parent_te), soops)) { /* if parent_te is opened, it doesn't show childs in row */
+		/* no recursion, items can only display their direct children in the row */
+		for (TreeElement *child_te = parent_te->subtree.first;
+		     child_te && view_co_x >= child_te->xs; /* don't look further if co_x is smaller than child position*/
+		     child_te = child_te->next)
+		{
+			if ((child_te->flag & TE_ICONROW) && (view_co_x > child_te->xs) && (view_co_x < child_te->xend)) {
+				return child_te;
+			}
+		}
+	}
+
+	/* return parent if no child is hovered */
+	return (TreeElement *)parent_te;
+}
+
+/* Find specific item from the treestore */
+TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem)
+{
+	TreeElement *te, *tes;
+	for (te = lb->first; te; te = te->next) {
+		if (te->store_elem == store_elem) return te;
+		tes = outliner_find_tree_element(&te->subtree, store_elem);
+		if (tes) return tes;
+	}
+	return NULL;
+}
+
+/* Find parent element of te */
+TreeElement *outliner_find_parent_element(ListBase *lb, TreeElement *parent_te, const TreeElement *child_te)
+{
+	TreeElement *te;
+	for (te = lb->first; te; te = te->next) {
+		if (te == child_te) {
+			return parent_te;
+		}
+
+		TreeElement *find_te = outliner_find_parent_element(&te->subtree, te, child_te);
+		if (find_te) {
+			return find_te;
+		}
+	}
+	return NULL;
+}
+
+/* tse is not in the treestore, we use its contents to find a match */
+TreeElement *outliner_find_tse(SpaceOops *soops, const TreeStoreElem *tse)
+{
+	TreeStoreElem *tselem;
+
+	if (tse->id == NULL) return NULL;
+
+	/* check if 'tse' is in treestore */
+	tselem = BKE_outliner_treehash_lookup_any(soops->treehash, tse->type, tse->nr, tse->id);
+	if (tselem)
+		return outliner_find_tree_element(&soops->tree, tselem);
+
+	return NULL;
+}
+
+/* Find treestore that refers to given ID */
+TreeElement *outliner_find_id(SpaceOops *soops, ListBase *lb, const ID *id)
+{
+	for (TreeElement *te = lb->first; te; te = te->next) {
+		TreeStoreElem *tselem = TREESTORE(te);
+		if (tselem->type == 0) {
+			if (tselem->id == id) {
+				return te;
+			}
+		}
+
+		TreeElement *tes = outliner_find_id(soops, &te->subtree, id);
+		if (tes) {
+			return tes;
+		}
+	}
+	return NULL;
+}
+
+TreeElement *outliner_find_posechannel(ListBase *lb, const bPoseChannel *pchan)
+{
+	for (TreeElement *te = lb->first; te; te = te->next) {
+		if (te->directdata == pchan) {
+			return te;
+		}
+
+		TreeStoreElem *tselem = TREESTORE(te);
+		if (ELEM(tselem->type, TSE_POSE_BASE, TSE_POSE_CHANNEL)) {
+			TreeElement *tes = outliner_find_posechannel(&te->subtree, pchan);
+			if (tes) {
+				return tes;
+			}
+		}
+	}
+	return NULL;
+}
+
+TreeElement *outliner_find_editbone(ListBase *lb, const EditBone *ebone)
+{
+	for (TreeElement *te = lb->first; te; te = te->next) {
+		if (te->directdata == ebone) {
+			return te;
+		}
+
+		TreeStoreElem *tselem = TREESTORE(te);
+		if (ELEM(tselem->type, 0, TSE_EBONE)) {
+			TreeElement *tes = outliner_find_editbone(&te->subtree, ebone);
+			if (tes) {
+				return tes;
+			}
+		}
+	}
+	return NULL;
+}
+
+ID *outliner_search_back(SpaceOops *UNUSED(soops), TreeElement *te, short idcode)
+{
+	TreeStoreElem *tselem;
+	te = te->parent;
+
+	while (te) {
+		tselem = TREESTORE(te);
+		if (tselem->type == 0 && te->idcode == idcode) return tselem->id;
+		te = te->parent;
+	}
+	return NULL;
+}
+
+/**
+ * Iterate over all tree elements (pre-order traversal), executing \a func callback for
+ * each tree element matching the optional filters.
+ *
+ * \param filter_te_flag: If not 0, only TreeElements with this flag will be visited.
+ * \param filter_tselem_flag: Same as \a filter_te_flag, but for the TreeStoreElem.
+ * \param func: Custom callback to execute for each visited item.
+ */
+bool outliner_tree_traverse(const SpaceOops *soops, ListBase *tree, int filter_te_flag, int filter_tselem_flag,
+                            TreeTraversalFunc func, void *customdata)
+{
+	for (TreeElement *te = tree->first, *te_next; te; te = te_next) {
+		TreeTraversalAction func_retval = TRAVERSE_CONTINUE;
+		/* in case te is freed in callback */
+		TreeStoreElem *tselem = TREESTORE(te);
+		ListBase subtree = te->subtree;
+		te_next = te->next;
+
+		if (filter_te_flag && (te->flag & filter_te_flag) == 0) {
+			/* skip */
+		}
+		else if (filter_tselem_flag && (tselem->flag & filter_tselem_flag) == 0) {
+			/* skip */
+		}
+		else {
+			func_retval = func(te, customdata);
+		}
+		/* Don't access te or tselem from now on! Might've been freed... */
+
+		if (func_retval == TRAVERSE_BREAK) {
+			return false;
+		}
+
+		if (func_retval == TRAVERSE_SKIP_CHILDS) {
+			/* skip */
+		}
+		else if (!outliner_tree_traverse(soops, &subtree, filter_te_flag, filter_tselem_flag, func, customdata)) {
+			return false;
+		}
+	}
+
+	return true;
+}
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 0cf4fd09555..71ae7eeeb3d 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -39,6 +39,7 @@
 #include "BLI_mempool.h"
 
 #include "BKE_context.h"
+#include "BKE_layer.h"
 #include "BKE_screen.h"
 #include "BKE_scene.h"
 #include "BKE_outliner_treehash.h"
@@ -47,6 +48,7 @@
 #include "ED_screen.h"
 
 #include "WM_api.h"
+#include "WM_message.h"
 #include "WM_types.h"
 
 #include "BIF_gl.h"
@@ -102,10 +104,14 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, const wmEvent *e
 		if (GS(id->name) == ID_OB) {
 			/* Ensure item under cursor is valid drop target */
 			TreeElement *te = outliner_dropzone_find(soops, fmval, true);
+			TreeStoreElem *tselem = te ? TREESTORE(te) : NULL;
 
-			if (te && te->idcode == ID_OB && TREESTORE(te)->type == 0) {
+			if (!te) {
+				/* pass */
+			}
+			else if (te->idcode == ID_OB && tselem->type == 0) {
 				Scene *scene;
-				ID *te_id = TREESTORE(te)->id;
+				ID *te_id = tselem->id;
 
 				/* check if dropping self or parent */
 				if (te_id == id || (Object *)te_id == ((Object *)id)->parent)
@@ -118,9 +124,19 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, const wmEvent *e
 				 * element for object it means that all displayed objects belong to
 				 * active scene and parenting them is allowed (sergey)
 				 */
-				if (!scene || BKE_scene_base_find(scene, (Object *)id)) {
+				if (!scene) {
 					return 1;
 				}
+				else {
+					for (ViewLayer *view_layer = scene->view_layers.first;
+					     view_layer;
+					     view_layer = view_layer->next)
+					{
+						if (BKE_view_layer_base_find(view_layer, (Object *)id)) {
+							return 1;
+						}
+					}
+				}
 			}
 		}
 	}
@@ -143,7 +159,7 @@ static int outliner_parent_clear_poll(bContext *C, wmDrag *drag, const wmEvent *
 
 	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
 
-	if (!ELEM(soops->outlinevis, SO_ALL_SCENES, SO_CUR_SCENE, SO_VISIBLE, SO_GROUPS)) {
+	if (!ELEM(soops->outlinevis, SO_VIEW_LAYER)) {
 		return false;
 	}
 
@@ -156,7 +172,7 @@ static int outliner_parent_clear_poll(bContext *C, wmDrag *drag, const wmEvent *
 
 					switch (te->idcode) {
 						case ID_SCE:
-							return (ELEM(tselem->type, TSE_R_LAYER_BASE, TSE_R_LAYER, TSE_R_PASS));
+							return (ELEM(tselem->type, TSE_R_LAYER_BASE, TSE_R_LAYER));
 						case ID_OB:
 							return (ELEM(tselem->type, TSE_MODIFIER_BASE, TSE_CONSTRAINT_BASE));
 						/* Other codes to ignore? */
@@ -230,7 +246,7 @@ static void outliner_material_drop_copy(wmDrag *drag, wmDropBox *drop)
 	RNA_string_set(drop->ptr, "material", id->name + 2);
 }
 
-static int outliner_group_link_poll(bContext *C, wmDrag *drag, const wmEvent *event)
+static int outliner_collection_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 {
 	ARegion *ar = CTX_wm_region(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
@@ -239,19 +255,19 @@ static int outliner_group_link_poll(bContext *C, wmDrag *drag, const wmEvent *ev
 
 	if (drag->type == WM_DRAG_ID) {
 		ID *id = drag->poin;
-		if (GS(id->name) == ID_OB) {
+		if (ELEM(GS(id->name), ID_OB, ID_GR)) {
 			/* Ensure item under cursor is valid drop target */
 			TreeElement *te = outliner_dropzone_find(soops, fmval, true);
-			return (te && te->idcode == ID_GR && TREESTORE(te)->type == 0);
+			return (te && outliner_is_collection_tree_element(te));
 		}
 	}
 	return 0;
 }
 
-static void outliner_group_link_copy(wmDrag *drag, wmDropBox *drop)
+static void outliner_collection_drop_copy(wmDrag *drag, wmDropBox *drop)
 {
 	ID *id = drag->poin;
-	RNA_string_set(drop->ptr, "object", id->name + 2);
+	RNA_string_set(drop->ptr, "child", id->name + 2);
 }
 
 /* region dropbox definition */
@@ -263,7 +279,7 @@ static void outliner_dropboxes(void)
 	WM_dropbox_add(lb, "OUTLINER_OT_parent_clear", outliner_parent_clear_poll, outliner_parent_clear_copy);
 	WM_dropbox_add(lb, "OUTLINER_OT_scene_drop", outliner_scene_drop_poll, outliner_scene_drop_copy);
 	WM_dropbox_add(lb, "OUTLINER_OT_material_drop", outliner_material_drop_poll, outliner_material_drop_copy);
-	WM_dropbox_add(lb, "OUTLINER_OT_group_link", outliner_group_link_poll, outliner_group_link_copy);
+	WM_dropbox_add(lb, "OUTLINER_OT_collection_drop", outliner_collection_drop_poll, outliner_collection_drop_copy);
 }
 
 static void outliner_main_region_draw(const bContext *C, ARegion *ar)
@@ -292,7 +308,9 @@ static void outliner_main_region_free(ARegion *UNUSED(ar))
 
 }
 
-static void outliner_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void outliner_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -308,7 +326,9 @@ static void outliner_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(s
 				case ND_RENDER_OPTIONS:
 				case ND_SEQUENCER:
 				case ND_LAYER:
+				case ND_LAYER_CONTENT:
 				case ND_WORLD:
+				case ND_SCENEBROWSE:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -392,10 +412,33 @@ static void outliner_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(s
 			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED))
 				ED_region_tag_redraw(ar);
 			break;
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 	}
 
 }
 
+static void outliner_main_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	SpaceOops *soops = sa->spacedata.first;
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	if (ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_SCENES)) {
+		WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
+	}
+}
+
 
 /* ************************ header outliner area region *********************** */
 
@@ -414,7 +457,9 @@ static void outliner_header_region_free(ARegion *UNUSED(ar))
 {
 }
 
-static void outliner_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void outliner_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -431,20 +476,21 @@ static void outliner_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED
 
 /* ******************** default callbacks for outliner space ***************** */
 
-static SpaceLink *outliner_new(const bContext *UNUSED(C))
+static SpaceLink *outliner_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceOops *soutliner;
 
 	soutliner = MEM_callocN(sizeof(SpaceOops), "initoutliner");
 	soutliner->spacetype = SPACE_OUTLINER;
+	soutliner->filter_id_type = ID_GR;
 
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for outliner");
 
 	BLI_addtail(&soutliner->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* main region */
 	ar = MEM_callocN(sizeof(ARegion), "main region for outliner");
@@ -547,6 +593,7 @@ void ED_spacetype_outliner(void)
 	art->draw = outliner_main_region_draw;
 	art->free = outliner_main_region_free;
 	art->listener = outliner_main_region_listener;
+	art->message_subscribe = outliner_main_region_message_subscribe;
 	BLI_addhead(&st->regiontypes, art);
 
 	/* regions: header */
diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c
index cd77e3032f1..c8e5a4bdf87 100644
--- a/source/blender/editors/space_script/space_script.c
+++ b/source/blender/editors/space_script/space_script.c
@@ -62,7 +62,7 @@
 
 /* ******************** default callbacks for script space ***************** */
 
-static SpaceLink *script_new(const bContext *UNUSED(C))
+static SpaceLink *script_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceScript *sscript;
@@ -76,7 +76,7 @@ static SpaceLink *script_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&sscript->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* main region */
 	ar = MEM_callocN(sizeof(ARegion), "main region for script");
@@ -176,7 +176,9 @@ static void script_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void script_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void script_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 	/* context changes */
 	// XXX - Todo, need the ScriptSpace accessible to get the python script to run.
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 6dce962ee02..6b8108a1265 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -54,7 +54,7 @@ set(SRC
 )
 
 if(WITH_AUDASPACE)
-	add_definitions(${AUDASPACE_DEFINITIONS})
+	add_definitions(-DWITH_AUDASPACE)
 
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 98370ea9dee..bf1ca68745f 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -69,7 +69,7 @@
 #include "BKE_sound.h"
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SEQUENCE_H
+#  include <AUD_Sequence.h>
 #endif
 
 /* own include */
@@ -693,7 +693,7 @@ static void sequencer_add_draw(bContext *UNUSED(C), wmOperator *op)
 
 	/* main draw call */
 	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
-	uiDefAutoButsRNA(layout, &ptr, sequencer_add_draw_check_prop, '\0');
+	uiDefAutoButsRNA(layout, &ptr, sequencer_add_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 
 	/* image template */
 	RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 7c32895afb4..ffcb4329726 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -56,11 +56,11 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
-#include "GPU_compositing.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
 
 #include "ED_anim_api.h"
 #include "ED_gpencil.h"
@@ -194,18 +194,24 @@ void color3ubv_from_seq(Scene *curscene, Sequence *seq, unsigned char col[3])
 	}
 }
 
-static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequence *seq, float x1, float y1, float x2, float y2, float stepsize)
+static void drawseqwave(View2D *v2d, const bContext *C, SpaceSeq *sseq, Scene *scene, Sequence *seq,
+                        float x1, float y1, float x2, float y2, float stepsize, unsigned int pos)
 {
 	/*
 	 * x1 is the starting x value to draw the wave,
 	 * x2 the end x value, same for y1 and y2
 	 * stepsize is width of a pixel.
 	 */
+
+	/* offset x1 and x2 values, to match view min/max, if strip is out of bounds */
+	int x1_offset = max_ff(v2d->cur.xmin, x1);
+	int x2_offset = min_ff(v2d->cur.xmax + 1.0f, x2);
+
 	if (seq->sound && ((sseq->flag & SEQ_ALL_WAVEFORMS) || (seq->flag & SEQ_AUDIO_DRAW_WAVEFORM))) {
-		int i, j, pos;
-		int length = floor((x2 - x1) / stepsize) + 1;
-		float ymid = (y1 + y2) / 2;
-		float yscale = (y2 - y1) / 2;
+		int i, j, p;
+		int length = floor((x2_offset - x1_offset) / stepsize) + 1;
+		float ymid = (y1 + y2) / 2.0f;
+		float yscale = (y2 - y1) / 2.0f;
 		float samplestep;
 		float startsample, endsample;
 		float value1, value2;
@@ -213,6 +219,10 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
 
 		SoundWaveform *waveform;
 
+		if (length < 2) {
+			return;
+		}
+
 		if (!sound->spinlock) {
 			sound->spinlock = MEM_mallocN(sizeof(SpinLock), "sound_spinlock");
 			BLI_spin_init(sound->spinlock);
@@ -245,21 +255,27 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
 		endsample = ceil((seq->startofs + seq->anim_startofs + seq->enddisp - seq->startdisp) / FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
 		samplestep = (endsample - startsample) * stepsize / (x2 - x1);
 
-		if (length > floor((waveform->length - startsample) / samplestep))
-			length = floor((waveform->length - startsample) / samplestep);
+		length = min_ii(floor((waveform->length - startsample) / samplestep), length);
+
+		if (length < 2) {
+			return;
+		}
+
+		immUniformColor4f(1.0f, 1.0f, 1.0f, 0.5f);
 
-		glColor4f(1.0f, 1.0f, 1.0f, 0.5);
 		glEnable(GL_BLEND);
-		glBegin(GL_TRIANGLE_STRIP);
+
+		immBegin(GWN_PRIM_TRI_STRIP, length * 2);
+
 		for (i = 0; i < length; i++) {
-			float sampleoffset = startsample + i * samplestep;
-			pos = sampleoffset;
+			float sampleoffset = startsample + ((x1_offset - x1) / stepsize + i) * samplestep;
+			p = sampleoffset;
 
-			value1 = waveform->data[pos * 3];
-			value2 = waveform->data[pos * 3 + 1];
+			value1 = waveform->data[p * 3];
+			value2 = waveform->data[p * 3 + 1];
 
 			if (samplestep > 1.0f) {
-				for (j = pos + 1; (j < waveform->length) && (j < pos + samplestep); j++) {
+				for (j = p + 1; (j < waveform->length) && (j < p + samplestep); j++) {
 					if (value1 > waveform->data[j * 3])
 						value1 = waveform->data[j * 3];
 
@@ -269,34 +285,20 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
 			}
 			else {
 				/* use simple linear interpolation */
-				float f = sampleoffset - pos;
-				value1 = (1.0f - f) * value1 + f * waveform->data[pos * 3 + 3];
-				value2 = (1.0f - f) * value2 + f * waveform->data[pos * 3 + 4];
+				float f = sampleoffset - p;
+				value1 = (1.0f - f) * value1 + f * waveform->data[p * 3 + 3];
+				value2 = (1.0f - f) * value2 + f * waveform->data[p * 3 + 4];
 			}
 
-			glVertex2f(x1 + i * stepsize, ymid + value1 * yscale);
-			glVertex2f(x1 + i * stepsize, ymid + value2 * yscale);
+			immVertex2f(pos, x1_offset + i * stepsize, ymid + value1 * yscale);
+			immVertex2f(pos, x1_offset + i * stepsize, ymid + value2 * yscale);
 		}
-		glEnd();
-		glDisable(GL_BLEND);
-	}
-}
 
-static void drawmeta_stipple(int value)
-{
-	if (value) {
-		GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-		GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_HALFTONE);
+		immEnd();
 
-		glEnable(GL_LINE_STIPPLE);
-		glLineStipple(1, 0x8888);
-	}
-	else {
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-		glDisable(GL_LINE_STIPPLE);
+		glDisable(GL_BLEND);
 	}
 }
-
 static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, float x2, float y2)
 {
 	/* note: this used to use SEQ_BEGIN/SEQ_END, but it messes up the
@@ -327,10 +329,7 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 	}
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	if (seqm->flag & SEQ_MUTE)
-		drawmeta_stipple(1);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	for (seq = seqbase->first; seq; seq = seq->next) {
 		chan_min = min_ii(chan_min, seq->machine);
@@ -342,6 +341,10 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 
 	col[3] = 196; /* alpha, used for all meta children */
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	for (seq = seqbase->first; seq; seq = seq->next) {
 		const int startdisp = seq->startdisp + offset;
 		const int enddisp   = seq->enddisp   + offset;
@@ -352,12 +355,16 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 			float x2_chan = enddisp;
 			float y1_chan, y2_chan;
 
-			if ((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE))
-				drawmeta_stipple(1);
-
 			color3ubv_from_seq(scene, seq, col);
 
-			glColor4ubv(col);
+			if ((seqm->flag & SEQ_MUTE) || (seq->flag & SEQ_MUTE)) {
+				col[3] = 64;
+			}
+			else {
+				col[3] = 196;
+			}
+
+			immUniformColor4ubv(col);
 
 			/* clamp within parent sequence strip bounds */
 			if (x1_chan < x1) x1_chan = x1;
@@ -366,19 +373,11 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 			y1_chan = y1 + y_chan + (draw_height * SEQ_STRIP_OFSBOTTOM);
 			y2_chan = y1 + y_chan + (draw_height * SEQ_STRIP_OFSTOP);
 
-			glRectf(x1_chan,  y1_chan, x2_chan,  y2_chan);
-
-			UI_GetColorPtrShade3ubv(col, col, -30);
-			glColor4ubv(col);
-			fdrawbox(x1_chan,  y1_chan, x2_chan,  y2_chan);
-
-			if ((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE))
-				drawmeta_stipple(0);
+			immRectf(pos, x1_chan,  y1_chan, x2_chan,  y2_chan);
 		}
 	}
 
-	if (seqm->flag & SEQ_MUTE)
-		drawmeta_stipple(0);
+	immUnbindProgram();
 
 	glDisable(GL_BLEND);
 }
@@ -395,7 +394,7 @@ static float draw_seq_handle_size_get_clamped(Sequence *seq, const float pixelx)
 }
 
 /* draw a handle, for each end of a sequence strip */
-static void draw_seq_handle(View2D *v2d, Sequence *seq, const float handsize_clamped, const short direction)
+static void draw_seq_handle(View2D *v2d, Sequence *seq, const float handsize_clamped, const short direction, unsigned int pos)
 {
 	float v1[2], v2[2], v3[2], rx1 = 0, rx2 = 0; //for triangles and rect
 	float x1, x2, y1, y2;
@@ -435,23 +434,33 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, const float handsize_cla
 	{
 		glEnable(GL_BLEND);
 
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-		if (seq->flag & whichsel) glColor4ub(0, 0, 0, 80);
-		else if (seq->flag & SELECT) glColor4ub(255, 255, 255, 30);
-		else glColor4ub(0, 0, 0, 22);
+		if (seq->flag & whichsel) {
+			immUniformColor4ub(0, 0, 0, 80);
+		}
+		else if (seq->flag & SELECT) {
+			immUniformColor4ub(255, 255, 255, 30);
+		}
+		else {
+			immUniformColor4ub(0, 0, 0, 22);
+		}
 
-		glRectf(rx1, y1, rx2, y2);
+		immRectf(pos, rx1, y1, rx2, y2);
 
-		if (seq->flag & whichsel) glColor4ub(255, 255, 255, 200);
-		else glColor4ub(0, 0, 0, 50);
+		if (seq->flag & whichsel) {
+			immUniformColor4ub(255, 255, 255, 200);
+		}
+		else {
+			immUniformColor4ub(0, 0, 0, 50);
+		}
 
-		glEnable(GL_POLYGON_SMOOTH);
-		glBegin(GL_TRIANGLES);
-		glVertex2fv(v1); glVertex2fv(v2); glVertex2fv(v3);
-		glEnd();
+		immBegin(GWN_PRIM_TRIS, 3);
+		immVertex2fv(pos, v1);
+		immVertex2fv(pos, v2);
+		immVertex2fv(pos, v3);
+		immEnd();
 
-		glDisable(GL_POLYGON_SMOOTH);
 		glDisable(GL_BLEND);
 	}
 
@@ -590,67 +599,10 @@ static void draw_seq_text(View2D *v2d, SpaceSeq *sseq, Sequence *seq, float x1,
 	UI_view2d_text_cache_add_rectf(v2d, &rect, str, str_len, col);
 }
 
-/* draws a shaded strip, made from gradient + flat color + gradient */
-void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2)
+static void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq, unsigned int pos)
 {
-	float ymid1, ymid2;
-
-	if (seq->flag & SEQ_MUTE) {
-		GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-		GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_HALFTONE);
-	}
-
-	ymid1 = (y2 - y1) * 0.25f + y1;
-	ymid2 = (y2 - y1) * 0.65f + y1;
-
-	glBegin(GL_QUADS);
-
-	if (seq->flag & SEQ_INVALID_EFFECT) { col[0] = 255; col[1] = 0; col[2] = 255; }
-	else if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -50);
-	/* else UI_GetColorPtrShade3ubv(col, col, 0); */ /* DO NOTHING */
-
-	glColor3ubv(col);
-
-	glVertex2f(x1, y1);
-	glVertex2f(x2, y1);
-
-	if (seq->flag & SEQ_INVALID_EFFECT) { col[0] = 255; col[1] = 0; col[2] = 255; }
-	else if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5);
-	else UI_GetColorPtrShade3ubv(col, col, -5);
-
-	glColor3ubv((GLubyte *)col);
-
-	glVertex2f(x2, ymid1);
-	glVertex2f(x1, ymid1);
-
-	glEnd();
-
-	glRectf(x1,  ymid1,  x2,  ymid2);
-
-	glBegin(GL_QUADS);
-
-	glVertex2f(x1, ymid2);
-	glVertex2f(x2, ymid2);
-
-	if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -15);
-	else UI_GetColorPtrShade3ubv(col, col, 25);
-
-	glColor3ubv((GLubyte *)col);
-
-	glVertex2f(x2, y2);
-	glVertex2f(x1, y2);
-
-	glEnd();
-
-	if (seq->flag & SEQ_MUTE) {
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	}
-}
-
-void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq)
-{
-	float x1, x2, y1, y2, pixely, a;
-	unsigned char col[3], blendcol[3];
+	float x1, x2, y1, y2, pixely;
+	unsigned char col[4], blendcol[3];
 	View2D *v2d = &ar->v2d;
 
 	x1 = seq->startdisp;
@@ -665,89 +617,81 @@ void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 
 	blendcol[0] = blendcol[1] = blendcol[2] = 120;
 
-	if (seq->startofs) {
+	if (seq->startofs || seq->endofs) {
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 		color3ubv_from_seq(scene, seq, col);
 
 		if (seq->flag & SELECT) {
-			UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40);
-			glColor4ub(col[0], col[1], col[2], 170);
+			UI_GetColorPtrShade3ubv(col, col, -50);
+		}
+
+		if (seq->flag & SEQ_MUTE) {
+			col[3] = 64;
 		}
 		else {
-			UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0);
-			glColor4ub(col[0], col[1], col[2], 110);
+			if (seq->flag & SELECT) {
+				col[3] = 170;
+			}
+			else {
+				col[3] = 80;
+			}
 		}
+	}
+
+	if (seq->startofs) {
+		immUniformColor4ubv(col);
+		immRectf(pos, (float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);
 
-		glRectf((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);
+		immUniformColor3ubvAlpha(col, col[3] + 50);
 
-		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
-		else glColor4ub(col[0], col[1], col[2], 160);
+		imm_draw_box_wire_2d(pos, (float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);  /* outline */
+	}
+	if (seq->endofs) {
+		immUniformColor4ubv(col);
+		immRectf(pos, x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM);
+
+		immUniformColor3ubvAlpha(col, col[3] + 50);
 
-		fdrawbox((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);  //outline
+		imm_draw_box_wire_2d(pos, x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM); /* outline */
+	}
 
+	if (seq->startofs || seq->endofs) {
 		glDisable(GL_BLEND);
 	}
-	if (seq->endofs) {
+
+	if (seq->startstill || seq->endstill) {
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 		color3ubv_from_seq(scene, seq, col);
+		UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5f, 60);
 
-		if (seq->flag & SELECT) {
-			UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40);
-			glColor4ub(col[0], col[1], col[2], 170);
+		if (seq->flag & SEQ_MUTE) {
+			col[3] = 96;
 		}
 		else {
-			UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0);
-			glColor4ub(col[0], col[1], col[2], 110);
+			if (seq->flag & SELECT) {
+				col[3] = 255;
+			}
+			else {
+				col[3] = 170;
+			}
 		}
 
-		glRectf(x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM);
-
-		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
-		else glColor4ub(col[0], col[1], col[2], 160);
-
-		fdrawbox(x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM); //outline
-
-		glDisable(GL_BLEND);
+		immUniformColor4ubv(col);
 	}
-	if (seq->startstill) {
-		color3ubv_from_seq(scene, seq, col);
-		UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
-		glColor3ubv((GLubyte *)col);
-
-		draw_shadedstrip(seq, col, x1, y1, (float)(seq->start), y2);
-
-		/* feint pinstripes, helps see exactly which is extended and which isn't,
-		 * especially when the extension is very small */
-		if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 24);
-		else UI_GetColorPtrShade3ubv(col, col, -16);
-
-		glColor3ubv((GLubyte *)col);
 
-		for (a = y1; a < y2; a += pixely * 2.0f) {
-			fdrawline(x1,  a,  (float)(seq->start),  a);
-		}
+	if (seq->startstill) {
+		immRectf(pos, x1, y1, (float)(seq->start), y2);
 	}
 	if (seq->endstill) {
-		color3ubv_from_seq(scene, seq, col);
-		UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
-		glColor3ubv((GLubyte *)col);
-
-		draw_shadedstrip(seq, col, (float)(seq->start + seq->len), y1, x2, y2);
-
-		/* feint pinstripes, helps see exactly which is extended and which isn't,
-		 * especially when the extension is very small */
-		if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, 24);
-		else UI_GetColorPtrShade3ubv(col, col, -16);
-
-		glColor3ubv((GLubyte *)col);
+		immRectf(pos, (float)(seq->start + seq->len), y1, x2, y2);
+	}
 
-		for (a = y1; a < y2; a += pixely * 2.0f) {
-			fdrawline((float)(seq->start + seq->len),  a,  x2,  a);
-		}
+	if (seq->startstill || seq->endstill) {
+		glDisable(GL_BLEND);
 	}
 }
 
@@ -761,7 +705,7 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
 {
 	View2D *v2d = &ar->v2d;
 	float x1, x2, y1, y2;
-	unsigned char col[3], background_col[3], is_single_image;
+	unsigned char col[4], background_col[4], is_single_image;
 	const float handsize_clamped = draw_seq_handle_size_get_clamped(seq, pixelx);
 
 	/* we need to know if this is a single image/color or not for drawing */
@@ -773,72 +717,105 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
 	x2 = (seq->endstill) ? (seq->start + seq->len) : seq->enddisp;
 	y2 = seq->machine + SEQ_STRIP_OFSTOP;
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* get the correct color per strip type*/
 	//color3ubv_from_seq(scene, seq, col);
 	color3ubv_from_seq(scene, seq, background_col);
 
+	if (seq->flag & SEQ_MUTE) {
+		background_col[3] = 128;
+
+		glEnable(GL_BLEND);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	else {
+		background_col[3] = 255;
+	}
+
+	if (seq->flag & SELECT) {
+		UI_GetColorPtrShade3ubv(background_col, background_col, -50);
+	}
+
+	immUniformColor4ubv(background_col);
+
 	/* draw the main strip body */
 	if (is_single_image) {  /* single image */
-		draw_shadedstrip(seq, background_col,
-		                 BKE_sequence_tx_get_final_left(seq, false), y1,
-		                 BKE_sequence_tx_get_final_right(seq, false), y2);
+		immRectf(pos, BKE_sequence_tx_get_final_left(seq, false),  y1,
+		              BKE_sequence_tx_get_final_right(seq, false),  y2);
 	}
 	else {  /* normal operation */
-		draw_shadedstrip(seq, background_col, x1, y1, x2, y2);
+		immRectf(pos, x1, y1, x2, y2);
+	}
+
+	if (seq->flag & SEQ_MUTE) {
+		glDisable(GL_BLEND);
 	}
 
 	if (!is_single_image) {
 		if ((sseq->draw_flag & SEQ_DRAW_OFFSET_EXT) || (seq == special_seq_update)) {
-			draw_sequence_extensions(scene, ar, seq);
+			draw_sequence_extensions(scene, ar, seq, pos);
 		}
 	}
 
-	draw_seq_handle(v2d, seq, handsize_clamped, SEQ_LEFTHANDLE);
-	draw_seq_handle(v2d, seq, handsize_clamped, SEQ_RIGHTHANDLE);
+	draw_seq_handle(v2d, seq, handsize_clamped, SEQ_LEFTHANDLE, pos);
+	draw_seq_handle(v2d, seq, handsize_clamped, SEQ_RIGHTHANDLE, pos);
 
-	/* draw the strip outline */
 	x1 = seq->startdisp;
 	x2 = seq->enddisp;
 
 	/* draw sound wave */
 	if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		if (!(sseq->flag & SEQ_NO_WAVEFORMS)) {
-			drawseqwave(C, sseq, scene, seq, x1, y1, x2, y2, BLI_rctf_size_x(&ar->v2d.cur) / ar->winx);
+			drawseqwave(v2d, C, sseq, scene, seq, x1, y1, x2, y2, BLI_rctf_size_x(&ar->v2d.cur) / ar->winx, pos);
 		}
 	}
 
+	immUnbindProgram();
+
 	/* draw lock */
 	if (seq->flag & SEQ_LOCK) {
-		GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
 		glEnable(GL_BLEND);
 
-		/* light stripes */
-		glColor4ub(255, 255, 255, 32);
-		GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_DIAG_STRIPES);
-		glRectf(x1, y1, x2, y2);
+		pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_DIAG_STRIPES);
+
+		immUniform4f("color1", 1.0f, 1.0f, 1.0f, 0.125f);
+		immUniform4f("color2", 0.0f, 0.0f, 0.0f, 0.125f);
+		immUniform1i("size1", 8);
+		immUniform1i("size2", 8);
+
+		immRectf(pos, x1, y1, x2, y2);
 
-		/* dark stripes */
-		glColor4ub(0, 0, 0, 32);
-		GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_DIAG_STRIPES_SWAP);
-		glRectf(x1, y1, x2, y2);
+		immUnbindProgram();
 
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
 		glDisable(GL_BLEND);
 	}
 
 	if (!BKE_sequence_is_valid_check(seq)) {
-		GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
+		glEnable(GL_BLEND);
+
+		pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_DIAG_STRIPES);
+
+		immUniform4f("color1", 1.0f, 0.0f, 0.0f, 1.0f);
+		immUniform4f("color2", 0.0f, 0.0f, 0.0f, 0.0f);
+		immUniform1i("size1", 8);
+		immUniform1i("size2", 8);
 
-		/* panic! */
-		glColor4ub(255, 0, 0, 255);
-		GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_DIAG_STRIPES);
-		glRectf(x1, y1, x2, y2);
+		immRectf(pos, x1, y1, x2, y2);
 
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+		immUnbindProgram();
+
+		glDisable(GL_BLEND);
 	}
 
 	color3ubv_from_seq(scene, seq, col);
+
+	/* draw the strip outline */
+	color3ubv_from_seq(scene, seq, col);
 	if ((G.moving & G_TRANSFORM_SEQ) && (seq->flag & SELECT)) {
 		if (seq->flag & SEQ_OVERLAP) {
 			col[0] = 255; col[1] = col[2] = 40;
@@ -855,19 +832,27 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
 		drawmeta_contents(scene, seq, x1, y1, x2, y2);
 	}
 
-	if (seq->flag & SEQ_MUTE) {
-		glEnable(GL_LINE_STIPPLE);
-		glLineStipple(1, 0x8888);
-	}
-
-	glColor3ubv((GLubyte *)col);
+	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	UI_draw_roundbox_shade_x(GL_LINE_LOOP, x1, y1, x2, y2, 0.0, 0.1, 0.0);
+	/* TODO: add back stippled line for muted strips? */
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	if (seq->flag & SEQ_MUTE) {
-		glDisable(GL_LINE_STIPPLE);
+		col[3] = 96;
+
+		glEnable(GL_BLEND);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+		immUniformColor4ubv(col);
+	}
+	else {
+		immUniformColor3ubv(col);
 	}
 
+	imm_draw_box_wire_2d(pos, x1, y1, x2, y2); /* outline */
+
+	immUnbindProgram();
+
 	/* calculate if seq is long enough to print a name */
 	x1 = seq->startdisp + handsize_clamped;
 	x2 = seq->enddisp   - handsize_clamped;
@@ -909,7 +894,9 @@ void ED_sequencer_special_preview_clear(void)
 	sequencer_special_update_set(NULL);
 }
 
-ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int cfra, int frame_ofs, const char *viewname)
+ImBuf *sequencer_ibuf_get(
+        struct Main *bmain, struct Depsgraph *depsgraph, Scene *scene,
+        SpaceSeq *sseq, int cfra, int frame_ofs, const char *viewname)
 {
 	SeqRenderData context = {0};
 	ImBuf *ibuf;
@@ -934,16 +921,10 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int
 	recty = (render_size * (float)scene->r.ysch) / 100.0f + 0.5f;
 
 	BKE_sequencer_new_render_data(
-	        bmain->eval_ctx, bmain, scene,
-	        rectx, recty, proxy_size,
+	        bmain, depsgraph, scene,
+	        rectx, recty, proxy_size, false,
 	        &context);
 	context.view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname);
-	if (scene->r.seq_flag & R_SEQ_CAMERA_DOF) {
-		if (sseq->compositor == NULL) {
-			sseq->compositor = GPU_fx_compositor_create();
-		}
-		context.gpu_fx = sseq->compositor;
-	}
 
 	/* sequencer could start rendering, in this case we need to be sure it wouldn't be canceled
 	 * by Esc pressed somewhere in the past
@@ -1057,33 +1038,39 @@ static void sequencer_draw_borders(const SpaceSeq *sseq, const View2D *v2d, cons
 	glLineWidth(1.0f);
 
 	/* border */
-	setlinestyle(3);
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-	UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 1.0, 0);
+	immUniformThemeColor(TH_BACK);
+	immUniform1i("num_colors", 0);  /* Simple dashes. */
+	immUniform1f("dash_width", 6.0f);
+	immUniform1f("dash_factor", 0.5f);
 
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(x1 - 0.5f, y1 - 0.5f);
-	glVertex2f(x1 - 0.5f, y2 + 0.5f);
-	glVertex2f(x2 + 0.5f, y2 + 0.5f);
-	glVertex2f(x2 + 0.5f, y1 - 0.5f);
-	glEnd();
+	imm_draw_box_wire_2d(shdr_pos, x1 - 0.5f, y1 - 0.5f, x2 + 0.5f, y2 + 0.5f);
 
 	/* safety border */
 	if (sseq->flag & SEQ_SHOW_SAFE_MARGINS) {
+		immUniformThemeColorBlend(TH_VIEW_OVERLAY, TH_BACK, 0.25f);
+
 		UI_draw_safe_areas(
-		        x1, x2, y1, y2,
+		        shdr_pos, x1, x2, y1, y2,
 		        scene->safe_areas.title,
 		        scene->safe_areas.action);
 
 		if (sseq->flag & SEQ_SHOW_SAFE_CENTER) {
 			UI_draw_safe_areas(
-			        x1, x2, y1, y2,
+			        shdr_pos, x1, x2, y1, y2,
 			        scene->safe_areas.title_center,
 			        scene->safe_areas.action_center);
 		}
 	}
 
-	setlinestyle(0);
+	immUnbindProgram();
 }
 
 /* draws checkerboard background for transparent content */
@@ -1098,11 +1085,7 @@ static void sequencer_draw_background(
 	/* only draw alpha for main buffer */
 	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
 		if ((sseq->flag & SEQ_USE_ALPHA) && !draw_overlay) {
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-			fdrawcheckerboard(v2d->tot.xmin, v2d->tot.ymin, v2d->tot.xmax, v2d->tot.ymax);
-			glColor4f(1.0, 1.0, 1.0, 1.0);
+			imm_draw_box_checker_2d(v2d->tot.xmin, v2d->tot.ymin, v2d->tot.xmax, v2d->tot.ymax);
 		}
 	}
 }
@@ -1110,6 +1093,7 @@ static void sequencer_draw_background(
 void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs, bool draw_overlay, bool draw_backdrop)
 {
 	struct Main *bmain = CTX_data_main(C);
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	struct ImBuf *ibuf = NULL;
 	struct ImBuf *scope = NULL;
 	struct View2D *v2d = &ar->v2d;
@@ -1144,9 +1128,6 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		glClear(GL_COLOR_BUFFER_BIT);
 	}
 
-	/* without this colors can flicker from previous opengl state */
-	glColor4ub(255, 255, 255, 255);
-
 	/* only initialize the preview if a render is in progress */
 	if (G.is_rendering)
 		return;
@@ -1156,20 +1137,21 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	}
 
 	/* for now we only support Left/Right */
-	ibuf = sequencer_ibuf_get(bmain, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
+	ibuf = sequencer_ibuf_get(bmain, depsgraph, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
 
 	if ((ibuf == NULL) ||
 	    (ibuf->rect == NULL && ibuf->rect_float == NULL))
 	{
-		/* gpencil can also be drawn without a valid imbuf */
-		if ((draw_gpencil && is_imbuf) && !draw_overlay) {
-			sequencer_display_size(scene, sseq, viewrect);
+		sequencer_display_size(scene, sseq, viewrect);
 
-			sequencer_draw_background(sseq, v2d, viewrect, false);
-			sequencer_draw_borders(sseq, v2d, scene);
+		sequencer_draw_background(sseq, v2d, viewrect, false);
+		sequencer_draw_borders(sseq, v2d, scene);
 
+		/* gpencil can also be drawn without a valid imbuf */
+		if ((draw_gpencil && is_imbuf) && !draw_overlay) {
 			sequencer_draw_gpencil(C);
 		}
+
 		return;
 	}
 
@@ -1238,6 +1220,18 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		sequencer_draw_background(sseq, v2d, viewrect, draw_overlay);
 	}
 
+	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF && sseq->flag & SEQ_USE_ALPHA) {
+		glEnable(GL_BLEND);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	}
+
+	/* Format needs to be created prior to any immBindProgram call.
+	 * Do it here because OCIO binds it's own shader.
+	 */
+	Gwn_VertFormat *imm_format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(imm_format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int texCoord = GWN_vertformat_attr_add(imm_format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
 	if (scope) {
 		IMB_freeImBuf(ibuf);
 		ibuf = scope;
@@ -1310,30 +1304,32 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		}
 	}
 
-	glColor4f(1.0, 1.0, 1.0, 1.0);
+	if (draw_backdrop) {
+		/* XXX: need to load identity projection too? */
+		gpuPushMatrix();
+		gpuLoadIdentity();
+	}
 
-	GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
 	glGenTextures(1, (GLuint *)&texid);
 
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, texid);
 
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
 	if (type == GL_FLOAT)
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, ibuf->x, ibuf->y, 0, format, type, display_buffer);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, ibuf->x, ibuf->y, 0, format, type, display_buffer);
 	else
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, format, type, display_buffer);
 
-	if (draw_backdrop) {
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-		glLoadIdentity();
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
-		glLoadIdentity();
+	if (!glsl_used) {
+		immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
+		immUniformColor3f(1.0f, 1.0f, 1.0f);
+		immUniform1i("image", 0);
 	}
-	glBegin(GL_QUADS);
+
+	immBegin(GWN_PRIM_TRI_FAN, 4);
 
 	if (draw_overlay) {
 		if (sseq->overlay_type == SEQ_DRAW_OVERLAY_RECT) {
@@ -1343,16 +1339,30 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 			tot_clip.xmax = v2d->tot.xmin + (fabsf(BLI_rctf_size_x(&v2d->tot)) * scene->ed->over_border.xmax);
 			tot_clip.ymax = v2d->tot.ymin + (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->over_border.ymax);
 
-			glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymin); glVertex2f(tot_clip.xmin, tot_clip.ymin);
-			glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymax); glVertex2f(tot_clip.xmin, tot_clip.ymax);
-			glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymax); glVertex2f(tot_clip.xmax, tot_clip.ymax);
-			glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymin); glVertex2f(tot_clip.xmax, tot_clip.ymin);
+			immAttrib2f(texCoord, scene->ed->over_border.xmin, scene->ed->over_border.ymin);
+			immVertex2f(pos, tot_clip.xmin, tot_clip.ymin);
+
+			immAttrib2f(texCoord, scene->ed->over_border.xmin, scene->ed->over_border.ymax);
+			immVertex2f(pos, tot_clip.xmin, tot_clip.ymax);
+
+			immAttrib2f(texCoord, scene->ed->over_border.xmax, scene->ed->over_border.ymax);
+			immVertex2f(pos, tot_clip.xmax, tot_clip.ymax);
+
+			immAttrib2f(texCoord, scene->ed->over_border.xmax, scene->ed->over_border.ymin);
+			immVertex2f(pos, tot_clip.xmax, tot_clip.ymin);
 		}
 		else if (sseq->overlay_type == SEQ_DRAW_OVERLAY_REFERENCE) {
-			glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
-			glTexCoord2f(0.0f, 1.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymax);
-			glTexCoord2f(1.0f, 1.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymax);
-			glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
+			immAttrib2f(texCoord, 0.0f, 0.0f);
+			immVertex2f(pos, v2d->tot.xmin, v2d->tot.ymin);
+
+			immAttrib2f(texCoord, 0.0f, 1.0f);
+			immVertex2f(pos, v2d->tot.xmin, v2d->tot.ymax);
+
+			immAttrib2f(texCoord, 1.0f, 1.0f);
+			immVertex2f(pos, v2d->tot.xmax, v2d->tot.ymax);
+
+			immAttrib2f(texCoord, 1.0f, 0.0f);
+			immVertex2f(pos, v2d->tot.xmax, v2d->tot.ymin);
 		}
 	}
 	else if (draw_backdrop) {
@@ -1371,25 +1381,46 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 			imagey = aspect / image_aspect;
 		}
 
-		glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex, -imagey);
-		glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex, imagey);
-		glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex, imagey);
-		glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex, -imagey);
+		immAttrib2f(texCoord, 0.0f, 0.0f);
+		immVertex2f(pos, -imagex, -imagey);
+
+		immAttrib2f(texCoord, 0.0f, 1.0f);
+		immVertex2f(pos, -imagex, imagey);
+
+		immAttrib2f(texCoord, 1.0f, 1.0f);
+		immVertex2f(pos, imagex, imagey);
+
+		immAttrib2f(texCoord, 1.0f, 0.0f);
+		immVertex2f(pos, imagex, -imagey);
 	}
 	else {
 		draw_metadata = ((sseq->flag & SEQ_SHOW_METADATA) != 0);
 
-		glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
-		glTexCoord2f(0.0f, 1.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymax);
-		glTexCoord2f(1.0f, 1.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymax);
-		glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
+		immAttrib2f(texCoord, 0.0f, 0.0f);
+		immVertex2f(pos, v2d->tot.xmin, v2d->tot.ymin);
+
+		immAttrib2f(texCoord, 0.0f, 1.0f);
+		immVertex2f(pos, v2d->tot.xmin, v2d->tot.ymax);
+
+		immAttrib2f(texCoord, 1.0f, 1.0f);
+		immVertex2f(pos, v2d->tot.xmax, v2d->tot.ymax);
+
+		immAttrib2f(texCoord, 1.0f, 0.0f);
+		immVertex2f(pos, v2d->tot.xmax, v2d->tot.ymin);
 	}
-	glEnd();
+
+	immEnd();
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF && sseq->flag & SEQ_USE_ALPHA)
+
+	if (!glsl_used) {
+		immUnbindProgram();
+	}
+
+	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF && sseq->flag & SEQ_USE_ALPHA) {
 		glDisable(GL_BLEND);
+	}
+
 	glDeleteTextures(1, &texid);
 
 	if (glsl_used)
@@ -1406,10 +1437,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	}
 
 	if (draw_backdrop) {
-		glPopMatrix();
-		glMatrixMode(GL_PROJECTION);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
+		gpuPopMatrix();
 		return;
 	}
 
@@ -1484,41 +1512,41 @@ static void draw_seq_backdrop(View2D *v2d)
 {
 	int i;
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* darker gray overlay over the view backdrop */
-	UI_ThemeColorShade(TH_BACK, -20);
-	glRectf(v2d->cur.xmin,  -1.0,  v2d->cur.xmax,  1.0);
+	immUniformThemeColorShade(TH_BACK, -20);
+	immRectf(pos, v2d->cur.xmin,  -1.0,  v2d->cur.xmax,  1.0);
 
 	/* Alternating horizontal stripes */
 	i = max_ii(1, ((int)v2d->cur.ymin) - 1);
 
-	glBegin(GL_QUADS);
 	while (i < v2d->cur.ymax) {
-		if (((int)i) & 1)
-			UI_ThemeColorShade(TH_BACK, -15);
-		else
-			UI_ThemeColorShade(TH_BACK, -25);
+		if (i & 1) {
+			immUniformThemeColorShade(TH_BACK, -15);
+		}
+		else {
+			immUniformThemeColorShade(TH_BACK, -25);
+		}
 
-		glVertex2f(v2d->cur.xmax, i);
-		glVertex2f(v2d->cur.xmin, i);
-		glVertex2f(v2d->cur.xmin, i + 1);
-		glVertex2f(v2d->cur.xmax, i + 1);
+		immRectf(pos, v2d->cur.xmin,  i,  v2d->cur.xmax,  i + 1);
 
-		i += 1.0;
+		i++;
 	}
-	glEnd();
 
 	/* Darker lines separating the horizontal bands */
 	i = max_ii(1, ((int)v2d->cur.ymin) - 1);
-	UI_ThemeColor(TH_GRID);
-
-	glBegin(GL_LINES);
-	while (i < v2d->cur.ymax) {
-		glVertex2f(v2d->cur.xmax, i);
-		glVertex2f(v2d->cur.xmin, i);
-
-		i += 1.0;
+	int line_ct = (int)v2d->cur.ymax - i + 1;
+	immUniformThemeColor(TH_GRID);
+	immBegin(GWN_PRIM_LINES, line_ct * 2);
+	while (line_ct--) {
+		immVertex2f(pos, v2d->cur.xmax, i);
+		immVertex2f(pos, v2d->cur.xmin, i);
 	}
-	glEnd();
+	immEnd();
+
+	immUnbindProgram();
 }
 
 /* draw the contents of the sequencer strips view */
@@ -1534,7 +1562,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar)
 	/* loop through twice, first unselected, then selected */
 	for (j = 0; j < 2; j++) {
 		Sequence *seq;
-		int outline_tint = (j) ? -60 : -150; /* highlighting around strip edges indicating selection */
+		int outline_tint = (j) ? 40 : -40; /* highlighting around strip edges indicating selection */
 
 		/* loop through strips, checking for those that are visible */
 		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
@@ -1562,8 +1590,15 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar)
 	if (special_seq_update) {
 		const Sequence *seq = special_seq_update;
 		glEnable(GL_BLEND);
-		glColor4ub(255, 255, 255, 48);
-		glRectf(seq->startdisp, seq->machine + SEQ_STRIP_OFSBOTTOM, seq->enddisp, seq->machine + SEQ_STRIP_OFSTOP);
+
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformColor4ub(255, 255, 255, 48);
+		immRectf(pos, seq->startdisp, seq->machine + SEQ_STRIP_OFSBOTTOM, seq->enddisp, seq->machine + SEQ_STRIP_OFSTOP);
+
+		immUnbindProgram();
+
 		glDisable(GL_BLEND);
 	}
 }
@@ -1576,35 +1611,55 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
 
 	glEnable(GL_BLEND);
 
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* draw darkened area outside of active timeline
 	 * frame range used is preview range or scene range */
-	UI_ThemeColorShadeAlpha(TH_BACK, -25, -100);
+	immUniformThemeColorShadeAlpha(TH_BACK, -25, -100);
 
 	if (frame_sta < frame_end) {
-		glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)frame_sta, v2d->cur.ymax);
-		glRectf((float)frame_end, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)frame_sta, v2d->cur.ymax);
+		immRectf(pos, (float)frame_end, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 	}
 	else {
-		glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 	}
 
-	UI_ThemeColorShade(TH_BACK, -60);
+	immUniformThemeColorShade(TH_BACK, -60);
+
 	/* thin lines where the actual frames are */
-	fdrawline(frame_sta, v2d->cur.ymin, frame_sta, v2d->cur.ymax);
-	fdrawline(frame_end, v2d->cur.ymin, frame_end, v2d->cur.ymax);
+	immBegin(GWN_PRIM_LINES, 4);
+
+	immVertex2f(pos, frame_sta, v2d->cur.ymin);
+	immVertex2f(pos, frame_sta, v2d->cur.ymax);
+
+	immVertex2f(pos, frame_end, v2d->cur.ymin);
+	immVertex2f(pos, frame_end, v2d->cur.ymax);
+
+	immEnd();
 
 	if (ed && !BLI_listbase_is_empty(&ed->metastack)) {
 		MetaStack *ms = ed->metastack.last;
 
-		glColor4ub(255, 255, 255, 8);
-		glRectf(ms->disp_range[0], v2d->cur.ymin, ms->disp_range[1], v2d->cur.ymax);
+		immUniformColor4ub(255, 255, 255, 8);
+		immRectf(pos, ms->disp_range[0], v2d->cur.ymin, ms->disp_range[1], v2d->cur.ymax);
+
+		immUniformThemeColorShade(TH_BACK, -40);
+
+		immBegin(GWN_PRIM_LINES, 4);
 
-		UI_ThemeColorShade(TH_BACK, -40);
+		immVertex2f(pos, ms->disp_range[0], v2d->cur.ymin);
+		immVertex2f(pos, ms->disp_range[0], v2d->cur.ymax);
 
-		fdrawline(ms->disp_range[0], v2d->cur.ymin, ms->disp_range[0], v2d->cur.ymax);
-		fdrawline(ms->disp_range[1], v2d->cur.ymin, ms->disp_range[1], v2d->cur.ymax);
+		immVertex2f(pos, ms->disp_range[1], v2d->cur.ymin);
+		immVertex2f(pos, ms->disp_range[1], v2d->cur.ymax);
+
+		immEnd();
 	}
 
+	immUnbindProgram();
+
 	glDisable(GL_BLEND);
 }
 
@@ -1616,7 +1671,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	SpaceSeq *sseq = CTX_wm_space_seq(C);
 	View2D *v2d = &ar->v2d;
 	View2DScrollers *scrollers;
-	short unit = 0, flag = 0;
+	short unit = 0, cfra_flag = 0;
 	float col[3];
 
 	/* clear and setup matrix */
@@ -1663,9 +1718,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 
 	/* current frame */
 	UI_view2d_view_ortho(v2d);
-	if ((sseq->flag & SEQ_DRAWFRAMES) == 0)      flag |= DRAWCFRA_UNIT_SECONDS;
-	if ((sseq->flag & SEQ_NO_DRAW_CFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
-	ANIM_draw_cfra(C, v2d, flag);
+	if ((sseq->flag & SEQ_DRAWFRAMES) == 0)      cfra_flag |= DRAWCFRA_UNIT_SECONDS;
+	ANIM_draw_cfra(C, v2d, cfra_flag);
 
 	/* markers */
 	UI_view2d_view_orthoSpecial(ar, v2d, 1);
@@ -1678,14 +1732,18 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	/* overlap playhead */
 	if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) {
 		int cfra_over = (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ? scene->ed->over_cfra : scene->r.cfra + scene->ed->over_ofs;
-		glColor3f(0.2, 0.2, 0.2);
-		// glRectf(cfra_over, v2d->cur.ymin, scene->ed->over_ofs + scene->r.cfra + 1, v2d->cur.ymax);
 
-		glBegin(GL_LINES);
-		glVertex2f(cfra_over, v2d->cur.ymin);
-		glVertex2f(cfra_over, v2d->cur.ymax);
-		glEnd();
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformColor3f(0.2f, 0.2f, 0.2f);
 
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex2f(pos, cfra_over, v2d->cur.ymin);
+		immVertex2f(pos, cfra_over, v2d->cur.ymax);
+		immEnd();
+
+		immUnbindProgram();
 	}
 
 	/* callback */
@@ -1699,6 +1757,12 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_UNIT_VALUES, V2D_GRID_CLAMP);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
+
+	/* draw current frame number-indicator on top of scrollers */
+	if ((sseq->flag & SEQ_NO_DRAW_CFRANUM) == 0) {
+		UI_view2d_view_orthoSpecial(ar, v2d, 1);
+		ANIM_draw_cfra_number(C, v2d, cfra_flag);
+	}
 }
 
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 97ff55bf883..cc0f352a51e 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -71,7 +71,6 @@
 #include "UI_view2d.h"
 #include "UI_interface.h"
 
-
 /* own include */
 #include "sequencer_intern.h"
 
@@ -129,8 +128,9 @@ typedef struct TransSeq {
 /* ***************** proxy job manager ********************** */
 
 typedef struct ProxyBuildJob {
-	Scene *scene;
 	struct Main *main;
+	struct Depsgraph *depsgraph;
+	Scene *scene;
 	ListBase queue;
 	int stop;
 } ProxyJob;
@@ -182,6 +182,7 @@ static void seq_proxy_build_job(const bContext *C)
 {
 	wmJob *wm_job;
 	ProxyJob *pj;
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Editing *ed = BKE_sequencer_editing_get(scene, false);
 	ScrArea *sa = CTX_wm_area(C);
@@ -200,6 +201,7 @@ static void seq_proxy_build_job(const bContext *C)
 	if (!pj) {
 		pj = MEM_callocN(sizeof(ProxyJob), "proxy rebuild job");
 
+		pj->depsgraph = depsgraph;
 		pj->scene = scene;
 		pj->main = CTX_data_main(C);
 
@@ -212,7 +214,7 @@ static void seq_proxy_build_job(const bContext *C)
 	SEQP_BEGIN (ed, seq)
 	{
 		if ((seq->flag & SELECT)) {
-			BKE_sequencer_proxy_rebuild_context(pj->main, pj->scene, seq, file_list, &pj->queue);
+			BKE_sequencer_proxy_rebuild_context(pj->main, pj->depsgraph, pj->scene, seq, file_list, &pj->queue);
 		}
 	}
 	SEQ_END
@@ -1288,7 +1290,6 @@ typedef struct SlipData {
 	int num_seq;
 	bool slow;
 	int slow_offset; /* offset at the point where offset was turned on */
-	void *draw_handle;
 	NumInput num_input;
 } SlipData;
 
@@ -1323,21 +1324,6 @@ static void transseq_restore(TransSeq *ts, Sequence *seq)
 	seq->len = ts->len;
 }
 
-static void draw_slip_extensions(const bContext *C, ARegion *ar, void *data)
-{
-	Scene *scene = CTX_data_scene(C);
-	SlipData *td = data;
-	int i;
-
-	for (i = 0; i < td->num_seq; i++) {
-		Sequence *seq = td->seq_array[i];
-
-		if ((seq->type != SEQ_TYPE_META) && td->trim[i]) {
-			draw_sequence_extensions(scene, ar, seq);
-		}
-	}
-}
-
 static int slip_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool *trim, int offset, bool do_trim)
 {
 	Sequence *seq;
@@ -1386,7 +1372,6 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve
 	SlipData *data;
 	Scene *scene = CTX_data_scene(C);
 	Editing *ed = BKE_sequencer_editing_get(scene, false);
-	ARegion *ar = CTX_wm_region(C);
 	float mouseloc[2];
 	int num_seq, i;
 	View2D *v2d = UI_view2d_fromcontext(C);
@@ -1416,8 +1401,6 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve
 		transseq_backup(data->ts + i, data->seq_array[i]);
 	}
 
-	data->draw_handle = ED_region_draw_cb_activate(ar->type, draw_slip_extensions, data, REGION_DRAW_POST_VIEW);
-
 	UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &mouseloc[0], &mouseloc[1]);
 
 	copy_v2_v2_int(data->init_mouse, event->mval);
@@ -1559,7 +1542,6 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
 	Scene *scene = CTX_data_scene(C);
 	SlipData *data = (SlipData *)op->customdata;
 	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
 	const bool has_numInput = hasNumInput(&data->num_input);
 	bool handled = true;
 
@@ -1617,7 +1599,6 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
 		case RETKEY:
 		case SPACEKEY:
 		{
-			ED_region_draw_cb_exit(ar->type, data->draw_handle);
 			MEM_freeN(data->seq_array);
 			MEM_freeN(data->trim);
 			MEM_freeN(data->ts);
@@ -1646,8 +1627,6 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
 				BKE_sequence_calc(scene, seq);
 			}
 
-			ED_region_draw_cb_exit(ar->type, data->draw_handle);
-
 			MEM_freeN(data->seq_array);
 			MEM_freeN(data->ts);
 			MEM_freeN(data->trim);
@@ -3480,6 +3459,7 @@ static int sequencer_rebuild_proxy_invoke(bContext *C, wmOperator *UNUSED(op),
 static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Editing *ed = BKE_sequencer_editing_get(scene, false);
 	Sequence *seq;
@@ -3499,7 +3479,7 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
 			short stop = 0, do_update;
 			float progress;
 
-			BKE_sequencer_proxy_rebuild_context(bmain, scene, seq, file_list, &queue);
+			BKE_sequencer_proxy_rebuild_context(bmain, depsgraph, scene, seq, file_list, &queue);
 
 			for (link = queue.first; link; link = link->next) {
 				struct SeqIndexBuildContext *context = link->data;
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 713aa8994b3..41fc98fbe4e 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -36,6 +36,7 @@
 
 /* internal exports only */
 
+struct Depsgraph;
 struct Sequence;
 struct bContext;
 struct rctf;
@@ -56,15 +57,13 @@ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa);
 void draw_timeline_seq(const struct bContext *C, struct ARegion *ar);
 void draw_image_seq(const struct bContext *C, struct Scene *scene, struct  ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, bool draw_overlay, bool draw_backdrop);
 void color3ubv_from_seq(struct Scene *curscene, struct Sequence *seq, unsigned char col[3]);
-void draw_shadedstrip(struct Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2);
-void draw_sequence_extensions(struct Scene *scene, struct ARegion *ar, struct Sequence *seq);
 
 void sequencer_special_update_set(Sequence *seq);
 
 /* UNUSED */
 // void seq_reset_imageofs(struct SpaceSeq *sseq);
 
-struct ImBuf *sequencer_ibuf_get(struct Main *bmain, struct Scene *scene, struct SpaceSeq *sseq, int cfra, int frame_ofs, const char *viewname);
+struct ImBuf *sequencer_ibuf_get(struct Main *bmain, struct Depsgraph *depsgraph, struct Scene *scene, struct SpaceSeq *sseq, int cfra, int frame_ofs, const char *viewname);
 
 /* sequencer_edit.c */
 struct View2D;
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index 4acda8799cb..88dcc3a8821 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -91,10 +91,11 @@ static void sample_draw(const bContext *C, ARegion *ar, void *arg_info)
 static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	Main *bmain = CTX_data_main(C);
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	SpaceSeq *sseq = (SpaceSeq *) CTX_wm_space_data(C);
 	ARegion *ar = CTX_wm_region(C);
-	ImBuf *ibuf = sequencer_ibuf_get(bmain, scene, sseq, CFRA, 0, NULL);
+	ImBuf *ibuf = sequencer_ibuf_get(bmain, depsgraph, scene, sseq, CFRA, 0, NULL);
 	ImageSampleInfo *info = op->customdata;
 	float fx, fy;
 
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 47c134d02e1..75734963a0e 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -53,6 +53,9 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+
+#include "RNA_access.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -60,8 +63,6 @@
 
 #include "IMB_imbuf.h"
 
-#include "GPU_compositing.h"
-
 #include "sequencer_intern.h"   // own include
 
 /**************************** common state *****************************/
@@ -112,9 +113,8 @@ static ARegion *sequencer_find_region(ScrArea *sa, short type)
 
 /* ******************** default callbacks for sequencer space ***************** */
 
-static SpaceLink *sequencer_new(const bContext *C)
+static SpaceLink *sequencer_new(const ScrArea *UNUSED(sa), const Scene *scene)
 {
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar;
 	SpaceSeq *sseq;
 
@@ -130,7 +130,7 @@ static SpaceLink *sequencer_new(const bContext *C)
 
 	BLI_addtail(&sseq->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* buttons/list view */
 	ar = MEM_callocN(sizeof(ARegion), "buttons for sequencer");
@@ -220,11 +220,6 @@ static void sequencer_free(SpaceLink *sl)
 
 	if (scopes->histogram_ibuf)
 		IMB_freeImBuf(scopes->histogram_ibuf);
-
-	if (sseq->compositor != NULL) {
-		GPU_fx_compositor_destroy(sseq->compositor);
-		sseq->compositor = NULL;
-	}
 }
 
 
@@ -344,7 +339,9 @@ static SpaceLink *sequencer_duplicate(SpaceLink *sl)
 	return (SpaceLink *)sseqn;
 }
 
-static void sequencer_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void sequencer_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+        WorkSpace *UNUSED(workspace))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -498,7 +495,9 @@ static void sequencer_main_region_draw(const bContext *C, ARegion *ar)
 	draw_timeline_seq(C, ar);
 }
 
-static void sequencer_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void sequencer_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -536,6 +535,46 @@ static void sequencer_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(
 	}
 }
 
+static void sequencer_main_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *scene,
+        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	PointerRNA ptr;
+	RNA_pointer_create(&screen->id, &RNA_SpaceSequenceEditor, sa->spacedata.first, &ptr);
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	/* Timeline depends on scene properties. */
+	{
+		bool use_preview = (scene->r.flag & SCER_PRV_RANGE);
+		extern PropertyRNA rna_Scene_frame_start;
+		extern PropertyRNA rna_Scene_frame_end;
+		extern PropertyRNA rna_Scene_frame_preview_start;
+		extern PropertyRNA rna_Scene_frame_preview_end;
+		extern PropertyRNA rna_Scene_use_preview_range;
+		extern PropertyRNA rna_Scene_frame_current;
+		const PropertyRNA *props[] = {
+			use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start,
+			use_preview ? &rna_Scene_frame_preview_end   : &rna_Scene_frame_end,
+			&rna_Scene_use_preview_range,
+			&rna_Scene_frame_current,
+		};
+
+		PointerRNA idptr;
+		RNA_id_pointer_create(&scene->id, &idptr);
+
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_region_tag_redraw, __func__);
+		}
+	}
+}
+
 /* *********************** header region ************************ */
 /* add handlers, stuff you only do once or on area/region changes */
 static void sequencer_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
@@ -604,7 +643,9 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar)
 	}
 }
 
-static void sequencer_preview_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void sequencer_preview_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -670,7 +711,9 @@ static void sequencer_buttons_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void sequencer_buttons_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void sequencer_buttons_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -742,6 +785,7 @@ void ED_spacetype_sequencer(void)
 	art->init = sequencer_main_region_init;
 	art->draw = sequencer_main_region_draw;
 	art->listener = sequencer_main_region_listener;
+	art->message_subscribe = sequencer_main_region_message_subscribe;
 	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_FRAMES | ED_KEYMAP_ANIMATION;
 
 	BLI_addhead(&st->regiontypes, art);
diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt
index 349c003cf56..31439942397 100644
--- a/source/blender/editors/space_logic/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -20,9 +20,9 @@
 
 set(INC
 	../include
-	../interface
 	../../blenkernel
 	../../blenlib
+	../../blenloader
 	../../blentranslation
 	../../gpu
 	../../makesdna
@@ -37,22 +37,9 @@ set(INC_SYS
 )
 
 set(SRC
-	logic_buttons.c
-	logic_ops.c
-	logic_window.c
-	space_logic.c
-
-	logic_intern.h
+	space_statusbar.c
 )
 
-if(WITH_GAMEENGINE)
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 add_definitions(${GL_DEFINITIONS})
 
-if(WITH_INTERNATIONAL)
-	add_definitions(-DWITH_INTERNATIONAL)
-endif()
-
-blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_statusbar/space_statusbar.c b/source/blender/editors/space_statusbar/space_statusbar.c
new file mode 100644
index 00000000000..4c6a2eea469
--- /dev/null
+++ b/source/blender/editors/space_statusbar/space_statusbar.c
@@ -0,0 +1,200 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_statusbar/space_statusbar.c
+ *  \ingroup spstatusbar
+ */
+
+
+#include <string.h>
+#include <stdio.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_context.h"
+#include "BKE_screen.h"
+
+#include "ED_screen.h"
+#include "ED_space_api.h"
+
+#include "RNA_access.h"
+
+#include "UI_interface.h"
+#include "UI_view2d.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_message.h"
+
+
+/* ******************** default callbacks for statusbar space ********************  */
+
+static SpaceLink *statusbar_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
+{
+	ARegion *ar;
+	SpaceStatusBar *sstatusbar;
+
+	sstatusbar = MEM_callocN(sizeof(*sstatusbar), "init statusbar");
+	sstatusbar->spacetype = SPACE_STATUSBAR;
+
+	/* header regions */
+	/* *** NOTE: ***
+	 * Python layout code (space_statusbar.py) depends on the list order of
+	 * these! Not nice at all, but the only way to identify the correct header
+	 * to draw to is using alignment + list position. It can't use alignment
+	 * only since code below has to set two right aligned regions - XXX. */
+	ar = MEM_callocN(sizeof(*ar), "right aligned header for statusbar");
+	BLI_addtail(&sstatusbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_RIGHT;
+	ar = MEM_callocN(sizeof(*ar), "center header for statusbar");
+	BLI_addtail(&sstatusbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_RIGHT; /* Right aligned too, so region layout code scales it correctly. */
+	ar = MEM_callocN(sizeof(*ar), "left aligned header for statusbar");
+	BLI_addtail(&sstatusbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_NONE;
+
+	return (SpaceLink *)sstatusbar;
+}
+
+/* not spacelink itself */
+static void statusbar_free(SpaceLink *UNUSED(sl))
+{
+
+}
+
+
+/* spacetype; init callback */
+static void statusbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
+{
+
+}
+
+static SpaceLink *statusbar_duplicate(SpaceLink *sl)
+{
+	SpaceStatusBar *sstatusbarn = MEM_dupallocN(sl);
+
+	/* clear or remove stuff from old */
+
+	return (SpaceLink *)sstatusbarn;
+}
+
+
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void statusbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region)
+{
+	if (ELEM(region->alignment, RGN_ALIGN_RIGHT)) {
+		region->flag |= RGN_FLAG_DYNAMIC_SIZE;
+	}
+	ED_region_header_init(region);
+}
+
+static void statusbar_operatortypes(void)
+{
+
+}
+
+static void statusbar_keymap(struct wmKeyConfig *UNUSED(keyconf))
+{
+
+}
+
+static void statusbar_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCREEN:
+			if (ELEM(wmn->data, ND_LAYER, ND_SCREENCAST, ND_ANIMPLAY)) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
+		case NC_WM:
+			if (wmn->data == ND_JOB)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_SCENE:
+			if (wmn->data == ND_RENDER_RESULT)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_SPACE:
+			if (wmn->data == ND_SPACE_INFO)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_ID:
+			if (wmn->action == NA_RENAME)
+				ED_region_tag_redraw(ar);
+			break;
+	}
+}
+
+static void statusbar_header_region_message_subscribe(
+        const bContext *UNUSED(C),
+        WorkSpace *UNUSED(workspace), Scene *UNUSED(scene),
+        bScreen *UNUSED(screen), ScrArea *UNUSED(sa), ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw);
+}
+
+/* only called once, from space/spacetypes.c */
+void ED_spacetype_statusbar(void)
+{
+	SpaceType *st = MEM_callocN(sizeof(*st), "spacetype statusbar");
+	ARegionType *art;
+
+	st->spaceid = SPACE_STATUSBAR;
+	strncpy(st->name, "Status Bar", BKE_ST_MAXNAME);
+
+	st->new = statusbar_new;
+	st->free = statusbar_free;
+	st->init = statusbar_init;
+	st->duplicate = statusbar_duplicate;
+	st->operatortypes = statusbar_operatortypes;
+	st->keymap = statusbar_keymap;
+
+	/* regions: header window */
+	art = MEM_callocN(sizeof(*art), "spacetype statusbar header region");
+	art->regionid = RGN_TYPE_HEADER;
+	art->prefsizey = HEADERY;
+	art->prefsizex = UI_UNIT_X * 5; /* Mainly to avoid glitches */
+	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
+	art->init = statusbar_header_region_init;
+	art->layout = ED_region_header_layout;
+	art->draw = ED_region_header_draw;
+	art->listener = statusbar_header_region_listener;
+	art->message_subscribe = statusbar_header_region_message_subscribe;
+	BLI_addhead(&st->regiontypes, art);
+
+	BKE_spacetype_register(st);
+}
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 01e4bc4917e..5885312e255 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -62,7 +62,7 @@
 
 /* ******************** default callbacks for text space ***************** */
 
-static SpaceLink *text_new(const bContext *UNUSED(C))
+static SpaceLink *text_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceText *stext;
@@ -79,7 +79,7 @@ static SpaceLink *text_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&stext->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* properties region */
 	ar = MEM_callocN(sizeof(ARegion), "properties region for text");
@@ -125,7 +125,8 @@ static SpaceLink *text_duplicate(SpaceLink *sl)
 	return (SpaceLink *)stextn;
 }
 
-static void text_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
+static void text_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
+                          WorkSpace *UNUSED(workspace))
 {
 	SpaceText *st = sa->spacedata.first;
 
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 9a3dcddf804..c1b49fbd32a 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -49,6 +49,8 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -123,38 +125,38 @@ static void txt_format_text(SpaceText *st)
 #endif
 
 /* Sets the current drawing color based on the format character specified */
-static void format_draw_color(char formatchar)
+static void format_draw_color(const TextDrawContext *tdc, char formatchar)
 {
 	switch (formatchar) {
 		case FMT_TYPE_WHITESPACE:
 			break;
 		case FMT_TYPE_SYMBOL:
-			UI_ThemeColor(TH_SYNTAX_S);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_S);
 			break;
 		case FMT_TYPE_COMMENT:
-			UI_ThemeColor(TH_SYNTAX_C);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_C);
 			break;
 		case FMT_TYPE_NUMERAL:
-			UI_ThemeColor(TH_SYNTAX_N);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_N);
 			break;
 		case FMT_TYPE_STRING:
-			UI_ThemeColor(TH_SYNTAX_L);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_L);
 			break;
 		case FMT_TYPE_DIRECTIVE:
-			UI_ThemeColor(TH_SYNTAX_D);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_D);
 			break;
 		case FMT_TYPE_SPECIAL:
-			UI_ThemeColor(TH_SYNTAX_V);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_V);
 			break;
 		case FMT_TYPE_RESERVED:
-			UI_ThemeColor(TH_SYNTAX_R);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_R);
 			break;
 		case FMT_TYPE_KEYWORD:
-			UI_ThemeColor(TH_SYNTAX_B);
+			UI_FontThemeColor(tdc->font_id, TH_SYNTAX_B);
 			break;
 		case FMT_TYPE_DEFAULT:
 		default:
-			UI_ThemeColor(TH_TEXT);
+			UI_FontThemeColor(tdc->font_id, TH_TEXT);
 			break;
 	}
 }
@@ -429,7 +431,7 @@ static int text_draw_wrapped(
 			/* Draw the visible portion of text on the overshot line */
 			for (a = fstart, ma = mstart; ma < mend; a++, ma += BLI_str_utf8_size_safe(str + ma)) {
 				if (use_syntax) {
-					if (fmt_prev != format[a]) format_draw_color(fmt_prev = format[a]);
+					if (fmt_prev != format[a]) format_draw_color(tdc, fmt_prev = format[a]);
 				}
 				x += text_font_draw_character_utf8(tdc, x, y, str + ma);
 				fpos++;
@@ -452,7 +454,7 @@ static int text_draw_wrapped(
 	/* Draw the remaining text */
 	for (a = fstart, ma = mstart; str[ma] && y > clip_min_y; a++, ma += BLI_str_utf8_size_safe(str + ma)) {
 		if (use_syntax) {
-			if (fmt_prev != format[a]) format_draw_color(fmt_prev = format[a]);
+			if (fmt_prev != format[a]) format_draw_color(tdc, fmt_prev = format[a]);
 		}
 
 		x += text_font_draw_character_utf8(tdc, x, y, str + ma);
@@ -505,7 +507,7 @@ static void text_draw(
 		char fmt_prev = 0xff;
 
 		for (a = 0; a < amount; a++) {
-			if (format[a] != fmt_prev) format_draw_color(fmt_prev = format[a]);
+			if (format[a] != fmt_prev) format_draw_color(tdc, fmt_prev = format[a]);
 			x += text_font_draw_character_utf8(tdc, x, y, in + str_shift);
 			str_shift += BLI_str_utf8_size_safe(in + str_shift);
 		}
@@ -906,22 +908,23 @@ static void draw_textscroll(const SpaceText *st, rcti *scroll, rcti *back)
 {
 	bTheme *btheme = UI_GetTheme();
 	uiWidgetColors wcol = btheme->tui.wcol_scroll;
-	unsigned char col[4];
+	float col[4];
 	float rad;
 
-	UI_ThemeColor(TH_BACK);
-	glRecti(back->xmin, back->ymin, back->xmax, back->ymax);
+	/* background so highlights don't go behind the scrollbar */
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+	immUniformThemeColor(TH_BACK);
+	immRecti(pos, back->xmin, back->ymin, back->xmax, back->ymax);
+	immUnbindProgram();
 
 	UI_draw_widget_scroll(&wcol, scroll, &st->txtbar, (st->flags & ST_SCROLL_SELECT) ? UI_SCROLL_PRESSED : 0);
 
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
 	rad = 0.4f * min_ii(BLI_rcti_size_x(&st->txtscroll), BLI_rcti_size_y(&st->txtscroll));
-	UI_GetThemeColor3ubv(TH_HILITE, col);
-	col[3] = 48;
-	glColor4ubv(col);
-	glEnable(GL_BLEND);
-	UI_draw_roundbox(st->txtscroll.xmin + 1, st->txtscroll.ymin, st->txtscroll.xmax - 1, st->txtscroll.ymax, rad);
-	glDisable(GL_BLEND);
+	UI_GetThemeColor3fv(TH_HILITE, col);
+	col[3] = 0.18f;
+	UI_draw_roundbox_aa(true, st->txtscroll.xmin + 1, st->txtscroll.ymin, st->txtscroll.xmax - 1, st->txtscroll.ymax, rad, col);
 }
 
 /*********************** draw documentation *******************************/
@@ -963,26 +966,32 @@ static void draw_documentation(const SpaceText *st, ARegion *ar)
 	boxh = (DOC_HEIGHT + 1) * (st->lheight_dpi + TXT_LINE_SPACING);
 
 	/* Draw panel */
-	UI_ThemeColor(TH_BACK);
-	glRecti(x, y, x + boxw, y - boxh);
-	UI_ThemeColor(TH_SHADE1);
-	glBegin(GL_LINE_LOOP);
-	glVertex2i(x, y);
-	glVertex2i(x + boxw, y);
-	glVertex2i(x + boxw, y - boxh);
-	glVertex2i(x, y - boxh);
-	glEnd();
-	glBegin(GL_LINE_LOOP);
-	glVertex2i(x + boxw - 10, y - 7);
-	glVertex2i(x + boxw - 4, y - 7);
-	glVertex2i(x + boxw - 7, y - 2);
-	glEnd();
-	glBegin(GL_LINE_LOOP);
-	glVertex2i(x + boxw - 10, y - boxh + 7);
-	glVertex2i(x + boxw - 4, y - boxh + 7);
-	glVertex2i(x + boxw - 7, y - boxh + 2);
-	glEnd();
-	UI_ThemeColor(TH_TEXT);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformThemeColor(TH_BACK);
+	immRecti(pos, x, y, x + boxw, y - boxh);
+	immUniformThemeColor(TH_SHADE1);
+	immBegin(GWN_PRIM_LINE_LOOP, 4);
+	immVertex2i(pos, x, y);
+	immVertex2i(pos, x + boxw, y);
+	immVertex2i(pos, x + boxw, y - boxh);
+	immVertex2i(pos, x, y - boxh);
+	immEnd();
+	immBegin(GWN_PRIM_LINE_LOOP, 3);
+	immVertex2i(pos, x + boxw - 10, y - 7);
+	immVertex2i(pos, x + boxw - 4, y - 7);
+	immVertex2i(pos, x + boxw - 7, y - 2);
+	immEnd();
+	immBegin(GWN_PRIM_LINE_LOOP, 3);
+	immVertex2i(pos, x + boxw - 10, y - boxh + 7);
+	immVertex2i(pos, x + boxw - 4, y - boxh + 7);
+	immVertex2i(pos, x + boxw - 7, y - boxh + 2);
+	immEnd();
+
+	immUnbindProgram();
+
+	UI_FontThemeColor(tdc.font_id, TH_TEXT);
 
 	i = 0; br = DOC_WIDTH; lines = 0; // XXX -doc_scroll;
 	for (p = docs; *p; p++) {
@@ -1009,11 +1018,6 @@ static void draw_documentation(const SpaceText *st, ARegion *ar)
 		}
 		if (lines >= DOC_HEIGHT) break;
 	}
-
-	if (0 /* XXX doc_scroll*/ /* > 0 && lines < DOC_HEIGHT */) {
-		// XXX doc_scroll--;
-		draw_documentation(st, ar);
-	}
 }
 #endif
 
@@ -1061,10 +1065,15 @@ static void draw_suggestion_list(const SpaceText *st, const TextDrawContext *tdc
 	/* not needed but stands out nicer */
 	UI_draw_box_shadow(220, x, y - boxh, x + boxw, y);
 
-	UI_ThemeColor(TH_SHADE1);
-	glRecti(x - 1, y + 1, x + boxw + 1, y - boxh - 1);
-	UI_ThemeColorShade(TH_BACK, 16);
-	glRecti(x, y, x + boxw, y - boxh);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformThemeColor(TH_SHADE1);
+	immRecti(pos, x - 1, y + 1, x + boxw + 1, y - boxh - 1);
+	immUniformThemeColorShade(TH_BACK, 16);
+	immRecti(pos, x, y, x + boxw, y - boxh);
+
+	immUnbindProgram();
 
 	/* Set the top 'item' of the visible list */
 	for (i = 0, item = first; i < *top && item->next; i++, item = item->next) ;
@@ -1079,11 +1088,16 @@ static void draw_suggestion_list(const SpaceText *st, const TextDrawContext *tdc
 		w = st->cwidth * text_get_char_pos(st, str, len);
 
 		if (item == sel) {
-			UI_ThemeColor(TH_SHADE2);
-			glRecti(x + margin_x, y - 3, x + margin_x + w, y + lheight - 3);
+			unsigned int posi = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+			immUniformThemeColor(TH_SHADE2);
+			immRecti(posi, x + margin_x, y - 3, x + margin_x + w, y + lheight - 3);
+
+			immUnbindProgram();
 		}
 
-		format_draw_color(item->type);
+		format_draw_color(tdc, item->type);
 		text_draw(st, tdc, str, 0, 0, x + margin_x, y - 1, NULL);
 
 		if (item == last) break;
@@ -1092,42 +1106,57 @@ static void draw_suggestion_list(const SpaceText *st, const TextDrawContext *tdc
 
 /*********************** draw cursor ************************/
 
-static void draw_cursor(SpaceText *st, ARegion *ar)
+static void draw_text_decoration(SpaceText *st, ARegion *ar)
 {
 	Text *text = st->text;
 	int vcurl, vcurc, vsell, vselc, hidden = 0;
 	int x, y, w, i;
+	int offl, offc;
 	const int lheight = st->lheight_dpi + TXT_LINE_SPACING;
 
+	/* Convert to view space character coordinates to determine if cursor is hidden */
+	wrap_offset(st, ar, text->sell, text->selc, &offl, &offc);
+	vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
+	vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
+
+	if (vselc < 0) {
+		vselc = 0;
+		hidden = 1;
+	}
+
+	if (text->curl == text->sell && text->curc == text->selc && !st->line_hlight && hidden) {
+		/* Nothing to draw here */
+		return;
+	}
+
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 	/* Draw the selection */
 	if (text->curl != text->sell || text->curc != text->selc) {
-		int offl, offc;
 		/* Convert all to view space character coordinates */
 		wrap_offset(st, ar, text->curl, text->curc, &offl, &offc);
 		vcurl = txt_get_span(text->lines.first, text->curl) - st->top + offl;
 		vcurc = text_get_char_pos(st, text->curl->line, text->curc) - st->left + offc;
-		wrap_offset(st, ar, text->sell, text->selc, &offl, &offc);
-		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
-		vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
 
 		if (vcurc < 0) {
 			vcurc = 0;
 		}
-		if (vselc < 0) {
-			vselc = 0;
-			hidden = 1;
-		}
 
-		UI_ThemeColor(TH_SHADE2);
+		immUniformThemeColor(TH_SHADE2);
+
 		x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 		y = ar->winy;
 
 		if (vcurl == vsell) {
 			y -= vcurl * lheight;
-			if (vcurc < vselc)
-				glRecti(x + vcurc * st->cwidth - 1, y, x + vselc * st->cwidth, y - lheight);
-			else
-				glRecti(x + vselc * st->cwidth - 1, y, x + vcurc * st->cwidth, y - lheight);
+
+			if (vcurc < vselc) {
+				immRecti(pos, x + vcurc * st->cwidth - 1, y, x + vselc * st->cwidth, y - lheight);
+			}
+			else {
+				immRecti(pos, x + vselc * st->cwidth - 1, y, x + vcurc * st->cwidth, y - lheight);
+			}
 		}
 		else {
 			int froml, fromc, tol, toc;
@@ -1143,35 +1172,24 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 
 			y -= froml * lheight;
 
-			glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight);
+			immRecti(pos, x + fromc * st->cwidth - 1, y, ar->winx, y - lheight);
 			y -= lheight;
+
 			for (i = froml + 1; i < tol; i++) {
-				glRecti(x - 4, y, ar->winx, y - lheight);
+				immRecti(pos, x - 4, y, ar->winx, y - lheight);
 				y -= lheight;
 			}
 
-			glRecti(x - 4, y, x + toc * st->cwidth, y - lheight);
+			immRecti(pos, x - 4, y, x + toc * st->cwidth, y - lheight);
 			y -= lheight;
 		}
 	}
-	else {
-		int offl, offc;
-		wrap_offset(st, ar, text->sell, text->selc, &offl, &offc);
-		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
-		vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
-
-		if (vselc < 0) {
-			vselc = 0;
-			hidden = 1;
-		}
-	}
 
 	if (st->line_hlight) {
 		int x1, x2, y1, y2;
 
 		if (st->wordwrap) {
 			int visible_lines = text_get_visible_lines(st, ar, text->sell->line);
-			int offl, offc;
 
 			wrap_offset_in_line(st, ar, text->sell, text->selc, &offl, &offc);
 
@@ -1187,11 +1205,11 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 			x1 = 0; // st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 			x2 = x1 + ar->winx;
 
-			glColor4ub(255, 255, 255, 32);
+			immUniformColor4ub(255, 255, 255, 32);
 
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 			glEnable(GL_BLEND);
-			glRecti(x1 - 4, y1, x2, y2);
+			immRecti(pos, x1 - 4, y1, x2, y2);
 			glDisable(GL_BLEND);
 		}
 	}
@@ -1202,6 +1220,8 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 		x += vselc * st->cwidth;
 		y = ar->winy - vsell * lheight;
 
+		immUniformThemeColor(TH_HILITE);
+
 		if (st->overwrite) {
 			char ch = text->sell->line[text->selc];
 
@@ -1209,14 +1229,14 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 			w = st->cwidth;
 			if (ch == '\t') w *= st->tabnumber - (vselc + st->left) % st->tabnumber;
 
-			UI_ThemeColor(TH_HILITE);
-			glRecti(x, y - lheight - 1, x + w, y - lheight + 1);
+			immRecti(pos, x, y - lheight - 1, x + w, y - lheight + 1);
 		}
 		else {
-			UI_ThemeColor(TH_HILITE);
-			glRecti(x - 1, y, x + 1, y - lheight);
+			immRecti(pos, x - 1, y, x + 1, y - lheight);
 		}
 	}
+
+	immUnbindProgram();
 }
 
 /******************* draw matching brackets *********************/
@@ -1317,7 +1337,7 @@ static void draw_brackets(const SpaceText *st, const TextDrawContext *tdc, ARegi
 	if (!endl || endc == -1)
 		return;
 
-	UI_ThemeColor(TH_HILITE);
+	UI_FontThemeColor(tdc->font_id, TH_HILITE);
 	x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 	y = ar->winy - st->lheight_dpi;
 
@@ -1422,8 +1442,11 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 	if (st->showlinenrs) {
 		x = TXT_OFFSET + TEXTXLOC;
 
-		UI_ThemeColor(TH_GRID);
-		glRecti((TXT_OFFSET - 12), 0, (TXT_OFFSET - 5) + TEXTXLOC, ar->winy - 2);
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_GRID);
+		immRecti(pos, (TXT_OFFSET - 12), 0, (TXT_OFFSET - 5) + TEXTXLOC, ar->winy - 2);
+		immUnbindProgram();
 	}
 	else {
 		st->linenrs_tot = 0; /* not used */
@@ -1432,11 +1455,11 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 	y = ar->winy - st->lheight_dpi;
 	winx = ar->winx - TXT_SCROLL_WIDTH;
 
-	/* draw cursor */
-	draw_cursor(st, ar);
+	/* draw cursor, margin, selection and highlight */
+	draw_text_decoration(st, ar);
 
 	/* draw the text */
-	UI_ThemeColor(TH_TEXT);
+	UI_FontThemeColor(tdc.font_id, TH_TEXT);
 
 	for (i = 0; y > clip_min_y && i < st->viewlines && tmp; i++, tmp = tmp->next) {
 		if (st->showsyntax && !tmp->format)
@@ -1444,16 +1467,20 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 
 		if (st->showlinenrs && !wrap_skip) {
 			/* draw line number */
-			if (tmp == text->curl)
-				UI_ThemeColor(TH_HILITE);
-			else
-				UI_ThemeColor(TH_TEXT);
+			if (tmp == text->curl) {
+				UI_FontThemeColor(tdc.font_id, TH_HILITE);
+			}
+			else {
+				UI_FontThemeColor(tdc.font_id, TH_TEXT);
+			}
 
 			BLI_snprintf(linenr, sizeof(linenr), "%*d", st->linenrs_tot, i + linecount + 1);
 			/* itoa(i + linecount + 1, linenr, 10); */ /* not ansi-c :/ */
 			text_font_draw(&tdc, TXT_OFFSET - 7, y, linenr);
 
-			UI_ThemeColor(TH_TEXT);
+			if (tmp == text->curl) {
+				UI_FontThemeColor(tdc.font_id, TH_TEXT);
+			}
 		}
 
 		if (st->wordwrap) {
@@ -1474,15 +1501,24 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 		margin_column_x = x + st->cwidth * (st->margin_column - st->left);
 
 		if (margin_column_x >= x) {
-			/* same color as line number background */
-			UI_ThemeColor(TH_GRID);
-
-			setlinestyle(1);
-			glBegin(GL_LINES);
-			glVertex2i(margin_column_x, 0);
-			glVertex2i(margin_column_x, ar->winy - 2);
-			glEnd();
-			setlinestyle(0);
+			const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+			immUniform1i("num_colors", 0);  /* "simple" mode */
+			immUniformThemeColor(TH_GRID);  /* same color as line number background */
+			immUniform1f("dash_width", 2.0f);
+			immUniform1f("dash_factor", 0.5f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2i(shdr_pos, margin_column_x, 0);
+			immVertex2i(shdr_pos, margin_column_x, ar->winy - 2);
+			immEnd();
+			immUnbindProgram();
 		}
 	}
 
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index fe15d9165b7..38f0393858d 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -698,7 +698,7 @@ static int text_refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUS
 		}
 
 		if (update) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 #endif
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
deleted file mode 100644
index 03045364e5b..00000000000
--- a/source/blender/editors/space_time/space_time.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_time/space_time.c
- *  \ingroup sptime
- */
-
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_cachefile_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_dlrbTree.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_constraint.h"
-#include "BKE_context.h"
-#include "BKE_main.h"
-#include "BKE_modifier.h"
-#include "BKE_screen.h"
-#include "BKE_pointcache.h"
-
-#include "ED_anim_api.h"
-#include "ED_keyframes_draw.h"
-#include "ED_screen.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "UI_resources.h"
-#include "UI_view2d.h"
-#include "UI_interface.h"
-
-#include "ED_space_api.h"
-#include "ED_markers.h"
-
-#include "time_intern.h"
-
-/* ************************ main time area region *********************** */
-
-static void time_draw_sfra_efra(Scene *scene, View2D *v2d)
-{
-	/* draw darkened area outside of active timeline
-	 * frame range used is preview range or scene range
-	 */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
-
-	if (PSFRA < PEFRA) {
-		glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-		glRectf((float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
-	}
-	else {
-		glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
-	}
-	glDisable(GL_BLEND);
-
-	UI_ThemeColorShade(TH_BACK, -60);
-	/* thin lines where the actual frames are */
-	fdrawline((float)PSFRA, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-	fdrawline((float)PEFRA, v2d->cur.ymin, (float)PEFRA, v2d->cur.ymax);
-}
-
-static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
-{
-	PTCacheID *pid;
-	ListBase pidlist;
-	SpaceTimeCache *stc = stime->caches.first;
-	const float cache_draw_height = (4.0f * UI_DPI_FAC * U.pixelsize);
-	float yoffs = 0.f;
-
-	if (!(stime->cache_display & TIME_CACHE_DISPLAY) || (!ob))
-		return;
-
-	BKE_ptcache_ids_from_object(&pidlist, ob, scene, 0);
-
-	/* iterate over pointcaches on the active object,
-	 * add spacetimecache and vertex array for each */
-	for (pid = pidlist.first; pid; pid = pid->next) {
-		float col[4], *fp;
-		int i, sta = pid->cache->startframe, end = pid->cache->endframe;
-		int len = (end - sta + 1) * 4;
-
-		switch (pid->type) {
-			case PTCACHE_TYPE_SOFTBODY:
-				if (!(stime->cache_display & TIME_CACHE_SOFTBODY)) continue;
-				break;
-			case PTCACHE_TYPE_PARTICLES:
-				if (!(stime->cache_display & TIME_CACHE_PARTICLES)) continue;
-				break;
-			case PTCACHE_TYPE_CLOTH:
-				if (!(stime->cache_display & TIME_CACHE_CLOTH)) continue;
-				break;
-			case PTCACHE_TYPE_SMOKE_DOMAIN:
-			case PTCACHE_TYPE_SMOKE_HIGHRES:
-				if (!(stime->cache_display & TIME_CACHE_SMOKE)) continue;
-				break;
-			case PTCACHE_TYPE_DYNAMICPAINT:
-				if (!(stime->cache_display & TIME_CACHE_DYNAMICPAINT)) continue;
-				break;
-			case PTCACHE_TYPE_RIGIDBODY:
-				if (!(stime->cache_display & TIME_CACHE_RIGIDBODY)) continue;
-				break;
-		}
-
-		if (pid->cache->cached_frames == NULL)
-			continue;
-
-		/* make sure we have stc with correct array length */
-		if (stc == NULL || MEM_allocN_len(stc->array) != len * 2 * sizeof(float)) {
-			if (stc) {
-				MEM_freeN(stc->array);
-			}
-			else {
-				stc = MEM_callocN(sizeof(SpaceTimeCache), "spacetimecache");
-				BLI_addtail(&stime->caches, stc);
-			}
-
-			stc->array = MEM_callocN(len * 2 * sizeof(float), "SpaceTimeCache array");
-		}
-
-		/* fill the vertex array with a quad for each cached frame */
-		for (i = sta, fp = stc->array; i <= end; i++) {
-			if (pid->cache->cached_frames[i - sta]) {
-				fp[0] = (float)i - 0.5f;
-				fp[1] = 0.0;
-				fp += 2;
-
-				fp[0] = (float)i - 0.5f;
-				fp[1] = 1.0;
-				fp += 2;
-
-				fp[0] = (float)i + 0.5f;
-				fp[1] = 1.0;
-				fp += 2;
-
-				fp[0] = (float)i + 0.5f;
-				fp[1] = 0.0;
-				fp += 2;
-			}
-		}
-
-		glPushMatrix();
-		glTranslatef(0.0, (float)V2D_SCROLL_HEIGHT + yoffs, 0.0);
-		glScalef(1.0, cache_draw_height, 0.0);
-
-		switch (pid->type) {
-			case PTCACHE_TYPE_SOFTBODY:
-				col[0] = 1.0;   col[1] = 0.4;   col[2] = 0.02;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_PARTICLES:
-				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.02;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_CLOTH:
-				col[0] = 0.1;   col[1] = 0.1;   col[2] = 0.75;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_SMOKE_DOMAIN:
-			case PTCACHE_TYPE_SMOKE_HIGHRES:
-				col[0] = 0.2;   col[1] = 0.2;   col[2] = 0.2;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_DYNAMICPAINT:
-				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.75;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_RIGIDBODY:
-				col[0] = 1.0;   col[1] = 0.6;   col[2] = 0.0;
-				col[3] = 0.1;
-				break;
-			default:
-				col[0] = 1.0;   col[1] = 0.0;   col[2] = 1.0;
-				col[3] = 0.1;
-				BLI_assert(0);
-				break;
-		}
-		glColor4fv(col);
-
-		glEnable(GL_BLEND);
-
-		glRectf((float)sta, 0.0, (float)end, 1.0);
-
-		col[3] = 0.4f;
-		if (pid->cache->flag & PTCACHE_BAKED) {
-			col[0] -= 0.4f; col[1] -= 0.4f; col[2] -= 0.4f;
-		}
-		else if (pid->cache->flag & PTCACHE_OUTDATED) {
-			col[0] += 0.4f; col[1] += 0.4f; col[2] += 0.4f;
-		}
-		glColor4fv(col);
-
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glVertexPointer(2, GL_FLOAT, 0, stc->array);
-		glDrawArrays(GL_QUADS, 0, (fp - stc->array) / 2);
-		glDisableClientState(GL_VERTEX_ARRAY);
-
-		glDisable(GL_BLEND);
-
-		glPopMatrix();
-
-		yoffs += cache_draw_height;
-
-		stc = stc->next;
-	}
-
-	BLI_freelistN(&pidlist);
-
-	/* free excessive caches */
-	while (stc) {
-		SpaceTimeCache *tmp = stc->next;
-		BLI_remlink(&stime->caches, stc);
-		MEM_freeN(stc->array);
-		MEM_freeN(stc);
-		stc = tmp;
-	}
-}
-
-static void time_cache_free(SpaceTime *stime)
-{
-	SpaceTimeCache *stc;
-
-	for (stc = stime->caches.first; stc; stc = stc->next) {
-		if (stc->array) {
-			MEM_freeN(stc->array);
-			stc->array = NULL;
-		}
-	}
-
-	BLI_freelistN(&stime->caches);
-}
-
-static void time_cache_refresh(SpaceTime *stime)
-{
-	/* Free previous caches to indicate full refresh */
-	time_cache_free(stime);
-}
-
-/* helper function - find actkeycolumn that occurs on cframe, or the nearest one if not found */
-static ActKeyColumn *time_cfra_find_ak(ActKeyColumn *ak, float cframe)
-{
-	ActKeyColumn *akn = NULL;
-
-	/* sanity checks */
-	if (ak == NULL)
-		return NULL;
-
-	/* check if this is a match, or whether it is in some subtree */
-	if (cframe < ak->cfra)
-		akn = time_cfra_find_ak(ak->left, cframe);
-	else if (cframe > ak->cfra)
-		akn = time_cfra_find_ak(ak->right, cframe);
-
-	/* if no match found (or found match), just use the current one */
-	if (akn == NULL)
-		return ak;
-	else
-		return akn;
-}
-
-/* helper for time_draw_keyframes() */
-static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel)
-{
-	bDopeSheet ads = {NULL};
-	DLRBT_Tree keys;
-	ActKeyColumn *ak;
-
-	float fac1 = (GS(id->name) == ID_GD) ? 0.8f : 0.6f; /* draw GPencil keys taller, to help distinguish them */
-	float fac2 = 1.0f - fac1;
-
-	float ymin = v2d->tot.ymin;
-	float ymax = v2d->tot.ymax * fac1 + ymin * fac2;
-
-	/* init binarytree-list for getting keyframes */
-	BLI_dlrbTree_init(&keys);
-
-	/* init dopesheet settings */
-	if (onlysel)
-		ads.filterflag |= ADS_FILTER_ONLYSEL;
-
-	/* populate tree with keyframe nodes */
-	switch (GS(id->name)) {
-		case ID_SCE:
-			scene_to_keylist(&ads, (Scene *)id, &keys, NULL);
-			break;
-		case ID_OB:
-			ob_to_keylist(&ads, (Object *)id, &keys, NULL);
-			break;
-		case ID_GD:
-			gpencil_to_keylist(&ads, (bGPdata *)id, &keys);
-			break;
-		case ID_CF:
-			cachefile_to_keylist(&ads, (CacheFile *)id, &keys, NULL);
-			break;
-		default:
-			break;
-	}
-
-	/* build linked-list for searching */
-	BLI_dlrbTree_linkedlist_sync(&keys);
-
-	/* start drawing keyframes
-	 *	- we use the binary-search capabilities of the tree to only start from
-	 *	  the first visible keyframe (last one can then be easily checked)
-	 *	- draw within a single GL block to be faster
-	 */
-	glBegin(GL_LINES);
-	for (ak = time_cfra_find_ak(keys.root, v2d->cur.xmin);
-	     (ak) && (ak->cfra <= v2d->cur.xmax);
-	     ak = ak->next)
-	{
-		glVertex2f(ak->cfra, ymin);
-		glVertex2f(ak->cfra, ymax);
-	}
-	glEnd(); // GL_LINES
-
-	/* free temp stuff */
-	BLI_dlrbTree_free(&keys);
-}
-
-static void time_draw_caches_keyframes(Main *bmain, Scene *scene, View2D *v2d, bool onlysel)
-{
-	CacheFile *cache_file;
-
-	for (cache_file = bmain->cachefiles.first;
-	     cache_file;
-	     cache_file = cache_file->id.next)
-	{
-		cache_file->draw_flag &= ~CACHEFILE_KEYFRAME_DRAWN;
-	}
-
-	for (Base *base = scene->base.first; base; base = base->next) {
-		Object *ob = base->object;
-
-		ModifierData *md = modifiers_findByType(ob, eModifierType_MeshSequenceCache);
-
-		if (md) {
-			MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
-
-			cache_file = mcmd->cache_file;
-
-			if (!cache_file || (cache_file->draw_flag & CACHEFILE_KEYFRAME_DRAWN) != 0) {
-				continue;
-			}
-
-			cache_file->draw_flag |= CACHEFILE_KEYFRAME_DRAWN;
-
-			time_draw_idblock_keyframes(v2d, (ID *)cache_file, onlysel);
-		}
-
-		for (bConstraint *con = ob->constraints.first; con; con = con->next) {
-			if (con->type != CONSTRAINT_TYPE_TRANSFORM_CACHE) {
-				continue;
-			}
-
-			bTransformCacheConstraint *data = con->data;
-
-			cache_file = data->cache_file;
-
-			if (!cache_file || (cache_file->draw_flag & CACHEFILE_KEYFRAME_DRAWN) != 0) {
-				continue;
-			}
-
-			cache_file->draw_flag |= CACHEFILE_KEYFRAME_DRAWN;
-
-			time_draw_idblock_keyframes(v2d, (ID *)cache_file, onlysel);
-		}
-	}
-}
-
-/* draw keyframe lines for timeline */
-static void time_draw_keyframes(const bContext *C, ARegion *ar)
-{
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_active_object(C);
-	View2D *v2d = &ar->v2d;
-	bool onlysel = ((scene->flag & SCE_KEYS_NO_SELONLY) == 0);
-
-	/* set this for all keyframe lines once and for all */
-	glLineWidth(1.0);
-
-	/* draw cache files keyframes (if available) */
-	UI_ThemeColor(TH_TIME_KEYFRAME);
-	time_draw_caches_keyframes(CTX_data_main(C), scene, v2d, onlysel);
-
-	/* draw grease pencil keyframes (if available) */
-	UI_ThemeColor(TH_TIME_GP_KEYFRAME);
-	if (scene->gpd) {
-		time_draw_idblock_keyframes(v2d, (ID *)scene->gpd, onlysel);
-	}
-	if (ob && ob->gpd) {
-		time_draw_idblock_keyframes(v2d, (ID *)ob->gpd, onlysel);
-	}
-
-	/* draw scene keyframes first
-	 *	- don't try to do this when only drawing active/selected data keyframes,
-	 *	  since this can become quite slow
-	 */
-	if (onlysel == 0) {
-		/* set draw color */
-		UI_ThemeColorShade(TH_TIME_KEYFRAME, -50);
-		time_draw_idblock_keyframes(v2d, (ID *)scene, onlysel);
-	}
-
-	/* draw keyframes from selected objects
-	 *  - only do the active object if in posemode (i.e. showing only keyframes for the bones)
-	 *    OR the onlysel flag was set, which means that only active object's keyframes should
-	 *    be considered
-	 */
-	UI_ThemeColor(TH_TIME_KEYFRAME);
-
-	if (ob && ((ob->mode == OB_MODE_POSE) || onlysel)) {
-		/* draw keyframes for active object only */
-		time_draw_idblock_keyframes(v2d, (ID *)ob, onlysel);
-	}
-	else {
-		bool active_done = false;
-
-		/* draw keyframes from all selected objects */
-		CTX_DATA_BEGIN (C, Object *, obsel, selected_objects)
-		{
-			/* last arg is 0, since onlysel doesn't apply here... */
-			time_draw_idblock_keyframes(v2d, (ID *)obsel, 0);
-
-			/* if this object is the active one, set flag so that we don't draw again */
-			if (obsel == ob)
-				active_done = true;
-		}
-		CTX_DATA_END;
-
-		/* if active object hasn't been done yet, draw it... */
-		if (ob && (active_done == 0))
-			time_draw_idblock_keyframes(v2d, (ID *)ob, 0);
-	}
-}
-
-/* ---------------- */
-
-static void time_refresh(const bContext *UNUSED(C), ScrArea *sa)
-{
-	/* find the main timeline region and refresh cache display*/
-	ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
-	if (ar) {
-		SpaceTime *stime = (SpaceTime *)sa->spacedata.first;
-		time_cache_refresh(stime);
-	}
-}
-
-/* editor level listener */
-static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
-{
-
-	/* mainly for updating cache display */
-	switch (wmn->category) {
-		case NC_OBJECT:
-		{
-			switch (wmn->data) {
-				case ND_BONE_SELECT:
-				case ND_BONE_ACTIVE:
-				case ND_POINTCACHE:
-				case ND_MODIFIER:
-				case ND_PARTICLE:
-				case ND_KEYS:
-					ED_area_tag_refresh(sa);
-					ED_area_tag_redraw(sa);
-					break;
-			}
-			break;
-		}
-		case NC_SCENE:
-		{
-			switch (wmn->data) {
-				case ND_RENDER_RESULT:
-					ED_area_tag_redraw(sa);
-					break;
-				case ND_OB_ACTIVE:
-				case ND_FRAME:
-					ED_area_tag_refresh(sa);
-					break;
-				case ND_FRAME_RANGE:
-				{
-					ARegion *ar;
-					Scene *scene = wmn->reference;
-
-					for (ar = sa->regionbase.first; ar; ar = ar->next) {
-						if (ar->regiontype == RGN_TYPE_WINDOW) {
-							ar->v2d.tot.xmin = (float)(SFRA - 4);
-							ar->v2d.tot.xmax = (float)(EFRA + 4);
-							break;
-						}
-					}
-					break;
-				}
-			}
-			break;
-		}
-		case NC_SPACE:
-		{
-			switch (wmn->data) {
-				case ND_SPACE_CHANGED:
-					ED_area_tag_refresh(sa);
-					break;
-			}
-			break;
-		}
-		case NC_WM:
-		{
-			switch (wmn->data) {
-				case ND_FILEREAD:
-					ED_area_tag_refresh(sa);
-					break;
-			}
-			break;
-		}
-	}
-}
-
-/* ---------------- */
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void time_main_region_init(wmWindowManager *wm, ARegion *ar)
-{
-	wmKeyMap *keymap;
-
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
-
-	/* own keymap */
-	keymap = WM_keymap_find(wm->defaultconf, "Timeline", SPACE_TIME, 0);
-	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
-}
-
-static void time_main_region_draw(const bContext *C, ARegion *ar)
-{
-	/* draw entirely, view changes should be handled here */
-	Scene *scene = CTX_data_scene(C);
-	SpaceTime *stime = CTX_wm_space_time(C);
-	Object *obact = CTX_data_active_object(C);
-	View2D *v2d = &ar->v2d;
-	View2DGrid *grid;
-	View2DScrollers *scrollers;
-	int unit, flag = 0;
-
-	/* clear and setup matrix */
-	UI_ThemeClearColor(TH_BACK);
-	glClear(GL_COLOR_BUFFER_BIT);
-
-	UI_view2d_view_ortho(v2d);
-
-	/* grid */
-	unit = (stime->flag & TIME_DRAWFRAMES) ? V2D_UNIT_FRAMES : V2D_UNIT_SECONDS;
-	grid = UI_view2d_grid_calc(scene, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY, ar->winx, ar->winy);
-	UI_view2d_grid_draw(v2d, grid, (V2D_VERTICAL_LINES | V2D_VERTICAL_AXIS));
-	UI_view2d_grid_free(grid);
-
-	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
-
-	/* start and end frame */
-	time_draw_sfra_efra(scene, v2d);
-
-	/* current frame */
-	flag = DRAWCFRA_WIDE; /* this is only really needed on frames where there's a keyframe, but this will do... */
-	if ((stime->flag & TIME_DRAWFRAMES) == 0)  flag |= DRAWCFRA_UNIT_SECONDS;
-	if (stime->flag & TIME_CFRA_NUM)           flag |= DRAWCFRA_SHOW_NUMBOX;
-	ANIM_draw_cfra(C, v2d, flag);
-
-	UI_view2d_view_ortho(v2d);
-
-	/* keyframes */
-	time_draw_keyframes(C, ar);
-
-	/* markers */
-	UI_view2d_view_orthoSpecial(ar, v2d, 1);
-	ED_markers_draw(C, 0);
-
-	/* caches */
-	time_draw_cache(stime, obact, scene);
-
-	/* callback */
-	UI_view2d_view_ortho(v2d);
-	ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
-
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
-
-	/* scrollers */
-	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
-	UI_view2d_scrollers_draw(C, v2d, scrollers);
-	UI_view2d_scrollers_free(scrollers);
-}
-
-static void time_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SPACE:
-			if (wmn->data == ND_SPACE_TIME)
-				ED_region_tag_redraw(ar);
-			break;
-
-		case NC_ANIMATION:
-			ED_region_tag_redraw(ar);
-			break;
-
-		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_OB_SELECT:
-				case ND_OB_ACTIVE:
-				case ND_FRAME:
-				case ND_FRAME_RANGE:
-				case ND_KEYINGSET:
-				case ND_RENDER_OPTIONS:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_GPENCIL:
-			if (wmn->data == ND_DATA)
-				ED_region_tag_redraw(ar);
-			break;
-	}
-}
-
-/* ************************ header time area region *********************** */
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void time_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
-{
-	ED_region_header_init(ar);
-}
-
-static void time_header_region_draw(const bContext *C, ARegion *ar)
-{
-	ED_region_header(C, ar);
-}
-
-static void time_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SCREEN:
-		{
-			if (wmn->data == ND_ANIMPLAY)
-				ED_region_tag_redraw(ar);
-			break;
-		}
-		case NC_SCENE:
-		{
-			switch (wmn->data) {
-				case ND_RENDER_RESULT:
-				case ND_OB_SELECT:
-				case ND_FRAME:
-				case ND_FRAME_RANGE:
-				case ND_KEYINGSET:
-				case ND_RENDER_OPTIONS:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		}
-		case NC_SPACE:
-		{
-			if (wmn->data == ND_SPACE_TIME)
-				ED_region_tag_redraw(ar);
-			break;
-		}
-	}
-}
-
-/* ******************** default callbacks for time space ***************** */
-
-static SpaceLink *time_new(const bContext *C)
-{
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar;
-	SpaceTime *stime;
-
-	stime = MEM_callocN(sizeof(SpaceTime), "inittime");
-
-	stime->spacetype = SPACE_TIME;
-	stime->flag |= TIME_DRAWFRAMES;
-
-	/* header */
-	ar = MEM_callocN(sizeof(ARegion), "header for time");
-
-	BLI_addtail(&stime->regionbase, ar);
-	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
-
-	/* main region */
-	ar = MEM_callocN(sizeof(ARegion), "main region for time");
-
-	BLI_addtail(&stime->regionbase, ar);
-	ar->regiontype = RGN_TYPE_WINDOW;
-
-	ar->v2d.tot.xmin = (float)(SFRA - 4);
-	ar->v2d.tot.ymin = 0.0f;
-	ar->v2d.tot.xmax = (float)(EFRA + 4);
-	ar->v2d.tot.ymax = 50.0f;
-
-	ar->v2d.cur = ar->v2d.tot;
-
-	ar->v2d.min[0] = 1.0f;
-	ar->v2d.min[1] = 50.0f;
-
-	ar->v2d.max[0] = MAXFRAMEF;
-	ar->v2d.max[1] = 50.0;
-
-	ar->v2d.minzoom = 0.1f;
-	ar->v2d.maxzoom = 10.0;
-
-	ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_SCALE_HORIZONTAL);
-	ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;
-	ar->v2d.keepofs |= V2D_LOCKOFS_Y;
-	ar->v2d.keepzoom |= V2D_LOCKZOOM_Y;
-
-
-	return (SpaceLink *)stime;
-}
-
-/* not spacelink itself */
-static void time_free(SpaceLink *sl)
-{
-	SpaceTime *stime = (SpaceTime *)sl;
-
-	time_cache_free(stime);
-}
-/* spacetype; init callback in ED_area_initialize() */
-/* init is called to (re)initialize an existing editor (file read, screen changes) */
-/* validate spacedata, add own area level handlers */
-static void time_init(wmWindowManager *UNUSED(wm), ScrArea *sa)
-{
-	SpaceTime *stime = (SpaceTime *)sa->spacedata.first;
-
-	time_cache_free(stime);
-
-	/* enable all cache display */
-	stime->cache_display |= TIME_CACHE_DISPLAY;
-	stime->cache_display |= (TIME_CACHE_SOFTBODY | TIME_CACHE_PARTICLES);
-	stime->cache_display |= (TIME_CACHE_CLOTH | TIME_CACHE_SMOKE | TIME_CACHE_DYNAMICPAINT);
-	stime->cache_display |= TIME_CACHE_RIGIDBODY;
-}
-
-static SpaceLink *time_duplicate(SpaceLink *sl)
-{
-	SpaceTime *stime = (SpaceTime *)sl;
-	SpaceTime *stimen = MEM_dupallocN(stime);
-
-	BLI_listbase_clear(&stimen->caches);
-
-	return (SpaceLink *)stimen;
-}
-
-/* only called once, from space_api/spacetypes.c */
-/* it defines all callbacks to maintain spaces */
-void ED_spacetype_time(void)
-{
-	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype time");
-	ARegionType *art;
-
-	st->spaceid = SPACE_TIME;
-	strncpy(st->name, "Timeline", BKE_ST_MAXNAME);
-
-	st->new = time_new;
-	st->free = time_free;
-	st->init = time_init;
-	st->duplicate = time_duplicate;
-	st->operatortypes = time_operatortypes;
-	st->keymap = NULL;
-	st->listener = time_listener;
-	st->refresh = time_refresh;
-
-	/* regions: main window */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype time region");
-	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
-
-	art->init = time_main_region_init;
-	art->draw = time_main_region_draw;
-	art->listener = time_main_region_listener;
-	art->keymap = time_keymap;
-	art->lock = 1;   /* Due to pointcache, see T4960. */
-	BLI_addhead(&st->regiontypes, art);
-
-	/* regions: header */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype time region");
-	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey = HEADERY;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
-
-	art->init = time_header_region_init;
-	art->draw = time_header_region_draw;
-	art->listener = time_header_region_listener;
-	BLI_addhead(&st->regiontypes, art);
-
-	BKE_spacetype_register(st);
-}
diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c
deleted file mode 100644
index 85e8ca110ef..00000000000
--- a/source/blender/editors/space_time/time_ops.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_time/time_ops.c
- *  \ingroup sptime
- */
-
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "DNA_scene_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_context.h"
-
-#include "ED_anim_api.h"
-#include "ED_screen.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "time_intern.h"
-
-/* ****************** Start/End Frame Operators *******************************/
-static int time_set_sfra_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Scene *scene = CTX_data_scene(C);
-	int frame;
-
-	if (scene == NULL)
-		return OPERATOR_CANCELLED;
-
-	frame = CFRA;
-
-	/* if Preview Range is defined, set the 'start' frame for that */
-	if (PRVRANGEON)
-		scene->r.psfra = frame;
-	else
-		scene->r.sfra = frame;
-
-	if (PEFRA < frame) {
-		if (PRVRANGEON)
-			scene->r.pefra = frame;
-		else
-			scene->r.efra = frame;
-	}
-
-	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
-
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_start_frame_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Set Start Frame";
-	ot->idname = "TIME_OT_start_frame_set";
-	ot->description = "Set the start frame";
-
-	/* api callbacks */
-	ot->exec = time_set_sfra_exec;
-	ot->poll = ED_operator_timeline_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-
-static int time_set_efra_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Scene *scene = CTX_data_scene(C);
-	int frame;
-
-	if (scene == NULL)
-		return OPERATOR_CANCELLED;
-
-	frame = CFRA;
-
-	/* if Preview Range is defined, set the 'end' frame for that */
-	if (PRVRANGEON)
-		scene->r.pefra = frame;
-	else
-		scene->r.efra = frame;
-
-	if (PSFRA > frame) {
-		if (PRVRANGEON)
-			scene->r.psfra = frame;
-		else
-			scene->r.sfra = frame;
-	}
-
-	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
-
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_end_frame_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Set End Frame";
-	ot->idname = "TIME_OT_end_frame_set";
-	ot->description = "Set the end frame";
-
-	/* api callbacks */
-	ot->exec = time_set_efra_exec;
-	ot->poll = ED_operator_timeline_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* ************************ View All Operator *******************************/
-
-static int time_view_all_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar = CTX_wm_region(C);
-
-	if (ELEM(NULL, scene, ar))
-		return OPERATOR_CANCELLED;
-
-	View2D *v2d = &ar->v2d;
-
-	/* set extents of view to start/end frames (Preview Range too) */
-	v2d->cur.xmin = (float)PSFRA;
-	v2d->cur.xmax = (float)PEFRA;
-
-	/* we need an extra "buffer" factor on either side so that the endpoints are visible */
-	const float extra = 0.01f * BLI_rctf_size_x(&v2d->cur);
-	v2d->cur.xmin -= extra;
-	v2d->cur.xmax += extra;
-
-	/* this only affects this TimeLine instance, so just force redraw of this region */
-	ED_region_tag_redraw(ar);
-
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_view_all(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "View All";
-	ot->idname = "TIME_OT_view_all";
-	ot->description = "Show the entire playable frame range";
-
-	/* api callbacks */
-	ot->exec = time_view_all_exec;
-	ot->poll = ED_operator_timeline_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* ************************ View Frame Operator *******************************/
-
-static int time_view_frame_exec(bContext *C, wmOperator *op)
-{
-	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
-	ANIM_center_frame(C, smooth_viewtx);
-
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_view_frame(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "View Frame";
-	ot->idname = "TIME_OT_view_frame";
-	ot->description = "Reset viewable area to show range around current frame";
-
-	/* api callbacks */
-	ot->exec = time_view_frame_exec;
-	ot->poll = ED_operator_timeline_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* ************************** registration **********************************/
-
-void time_operatortypes(void)
-{
-	WM_operatortype_append(TIME_OT_start_frame_set);
-	WM_operatortype_append(TIME_OT_end_frame_set);
-	WM_operatortype_append(TIME_OT_view_all);
-	WM_operatortype_append(TIME_OT_view_frame);
-}
-
-void time_keymap(wmKeyConfig *keyconf)
-{
-	wmKeyMap *keymap = WM_keymap_find(keyconf, "Timeline", SPACE_TIME, 0);
-
-	WM_keymap_add_item(keymap, "TIME_OT_start_frame_set", SKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "TIME_OT_end_frame_set", EKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "TIME_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
-#ifdef WITH_INPUT_NDOF
-	WM_keymap_add_item(keymap, "TIME_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
-#endif
-	WM_keymap_add_item(keymap, "TIME_OT_view_frame", PAD0, KM_PRESS, 0, 0);
-}
-
diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt
index 90af405eaa8..9559c28de0a 100644
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -22,6 +22,8 @@ set(INC
 	../include
 	../../blenkernel
 	../../blenlib
+	../../blenloader
+	../../blentranslation
 	../../gpu
 	../../makesdna
 	../../makesrna
@@ -35,12 +37,9 @@ set(INC_SYS
 )
 
 set(SRC
-	space_time.c
-	time_ops.c
-
-	time_intern.h
+	space_topbar.c
 )
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c
new file mode 100644
index 00000000000..4342fa87f89
--- /dev/null
+++ b/source/blender/editors/space_topbar/space_topbar.c
@@ -0,0 +1,340 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2017 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_topbar/space_topbar.c
+ *  \ingroup sptopbar
+ */
+
+
+#include <string.h>
+#include <stdio.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
+#include "BLO_readfile.h"
+#include "BLT_translation.h"
+
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_screen.h"
+
+#include "ED_screen.h"
+#include "ED_space_api.h"
+#include "ED_undo.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_message.h"
+
+
+void topbar_panels_register(ARegionType *art);
+
+/* ******************** default callbacks for topbar space ***************** */
+
+static SpaceLink *topbar_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
+{
+	ARegion *ar;
+	SpaceTopBar *stopbar;
+
+	stopbar = MEM_callocN(sizeof(*stopbar), "init topbar");
+	stopbar->spacetype = SPACE_TOPBAR;
+
+	/* header */
+	ar = MEM_callocN(sizeof(ARegion), "left aligned header for topbar");
+	BLI_addtail(&stopbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_TOP;
+	ar = MEM_callocN(sizeof(ARegion), "right aligned header for topbar");
+	BLI_addtail(&stopbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_RIGHT | RGN_SPLIT_PREV;
+
+	/* main regions */
+	ar = MEM_callocN(sizeof(ARegion), "left aligned main region for topbar");
+	BLI_addtail(&stopbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_WINDOW;
+	ar->alignment = RGN_ALIGN_LEFT;
+	ar = MEM_callocN(sizeof(ARegion), "right aligned main region for topbar");
+	BLI_addtail(&stopbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_WINDOW;
+	ar->alignment = RGN_ALIGN_RIGHT;
+	ar = MEM_callocN(sizeof(ARegion), "center main region for topbar");
+	BLI_addtail(&stopbar->regionbase, ar);
+	ar->regiontype = RGN_TYPE_WINDOW;
+
+	return (SpaceLink *)stopbar;
+}
+
+/* not spacelink itself */
+static void topbar_free(SpaceLink *UNUSED(sl))
+{
+
+}
+
+
+/* spacetype; init callback */
+static void topbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
+{
+
+}
+
+static SpaceLink *topbar_duplicate(SpaceLink *sl)
+{
+	SpaceTopBar *stopbarn = MEM_dupallocN(sl);
+
+	/* clear or remove stuff from old */
+
+	return (SpaceLink *)stopbarn;
+}
+
+
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void topbar_main_region_init(wmWindowManager *wm, ARegion *region)
+{
+	wmKeyMap *keymap;
+
+	/* force delayed UI_view2d_region_reinit call */
+	if (ELEM(region->alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
+		region->flag |= RGN_FLAG_DYNAMIC_SIZE;
+	}
+	UI_view2d_region_reinit(&region->v2d, V2D_COMMONVIEW_HEADER, region->winx, region->winy);
+
+	keymap = WM_keymap_find(wm->defaultconf, "View2D Buttons List", 0, 0);
+	WM_event_add_keymap_handler(&region->handlers, keymap);
+}
+
+static void topbar_operatortypes(void)
+{
+
+}
+
+static void topbar_keymap(struct wmKeyConfig *UNUSED(keyconf))
+{
+
+}
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void topbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
+{
+	if ((ar->alignment & ~RGN_SPLIT_PREV) == RGN_ALIGN_RIGHT) {
+		ar->flag |= RGN_FLAG_DYNAMIC_SIZE;
+	}
+	ED_region_header_init(ar);
+}
+
+static void topbar_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+                                        wmNotifier *wmn, const Scene *UNUSED(scene))
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_WM:
+			if (wmn->data == ND_HISTORY)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_SCENE:
+			if (wmn->data == ND_MODE)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_SPACE:
+			if (wmn->data == ND_SPACE_VIEW3D)
+				ED_region_tag_redraw(ar);
+			break;
+	}
+}
+
+static void topbar_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+                                   wmNotifier *wmn, const Scene *UNUSED(scene))
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCREEN:
+			if (wmn->data == ND_LAYER)
+				ED_region_tag_redraw(ar);
+			break;
+		case NC_SCENE:
+			if (wmn->data == ND_SCENEBROWSE)
+				ED_region_tag_redraw(ar);
+			break;
+	}
+}
+
+static void topbar_header_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *workspace, struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *UNUSED(sa), struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	WM_msg_subscribe_rna_prop(
+	        mbus, &workspace->id, workspace,
+	        WorkSpace, tools, &msg_sub_value_region_tag_redraw);
+}
+
+static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
+{
+	struct RecentFile *recent;
+	uiLayout *layout = menu->layout;
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_REGION_WIN);
+	if (!BLI_listbase_is_empty(&G.recent_files)) {
+		for (recent = G.recent_files.first; (recent); recent = recent->next) {
+			const char *file = BLI_path_basename(recent->filepath);
+			const int icon = BLO_has_bfile_extension(file) ? ICON_FILE_BLEND : ICON_FILE_BACKUP;
+			uiItemStringO(layout, file, icon, "WM_OT_open_mainfile", "filepath", recent->filepath);
+		}
+	}
+	else {
+		uiItemL(layout, IFACE_("No Recent Files"), ICON_NONE);
+	}
+}
+
+static void recent_files_menu_register(void)
+{
+	MenuType *mt;
+
+	mt = MEM_callocN(sizeof(MenuType), "spacetype info menu recent files");
+	strcpy(mt->idname, "TOPBAR_MT_file_open_recent");
+	strcpy(mt->label, N_("Open Recent..."));
+	strcpy(mt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
+	mt->draw = recent_files_menu_draw;
+	WM_menutype_add(mt);
+}
+
+
+/* only called once, from space/spacetypes.c */
+void ED_spacetype_topbar(void)
+{
+	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype topbar");
+	ARegionType *art;
+
+	st->spaceid = SPACE_TOPBAR;
+	strncpy(st->name, "Top Bar", BKE_ST_MAXNAME);
+
+	st->new = topbar_new;
+	st->free = topbar_free;
+	st->init = topbar_init;
+	st->duplicate = topbar_duplicate;
+	st->operatortypes = topbar_operatortypes;
+	st->keymap = topbar_keymap;
+
+	/* regions: main window */
+	art = MEM_callocN(sizeof(ARegionType), "spacetype topbar main region");
+	art->regionid = RGN_TYPE_WINDOW;
+	art->init = topbar_main_region_init;
+	art->layout = ED_region_header_layout;
+	art->draw = ED_region_header_draw;
+	art->listener = topbar_main_region_listener;
+	art->prefsizex = UI_UNIT_X * 5; /* Mainly to avoid glitches */
+	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
+
+	BLI_addhead(&st->regiontypes, art);
+
+	/* regions: header */
+	art = MEM_callocN(sizeof(ARegionType), "spacetype topbar header region");
+	art->regionid = RGN_TYPE_HEADER;
+	art->prefsizey = HEADERY;
+	art->prefsizex = UI_UNIT_X * 5; /* Mainly to avoid glitches */
+	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
+	art->listener = topbar_header_listener;
+	art->message_subscribe = topbar_header_region_message_subscribe;
+	art->init = topbar_header_region_init;
+	art->layout = ED_region_header_layout;
+	art->draw = ED_region_header_draw;
+
+	/* For popovers. */
+	topbar_panels_register(art);
+
+	BLI_addhead(&st->regiontypes, art);
+
+	recent_files_menu_register();
+
+	BKE_spacetype_register(st);
+}
+
+
+/* -------------------------------------------------------------------- */
+/** \name Redo Panel
+ * \{ */
+
+static int topbar_panel_operator_redo_poll(const bContext *C, PanelType *UNUSED(pt))
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	if (op == NULL) {
+		return false;
+	}
+
+	bool success = false;
+	if (!WM_operator_check_ui_empty(op->type)) {
+		const OperatorRepeatContextHandle *context_info;
+		context_info = ED_operator_repeat_prepare_context((bContext *)C, op);
+		success = WM_operator_poll((bContext *)C, op->type);
+		ED_operator_repeat_reset_context((bContext *)C, context_info);
+	}
+	return success;
+}
+
+static void topbar_panel_operator_redo(const bContext *C, Panel *pa)
+{
+	wmOperator *op = WM_operator_last_redo(C);
+	if (op == NULL) {
+		return;
+	}
+	if (!WM_operator_check_ui_enabled(C, op->type->name)) {
+		uiLayoutSetEnabled(pa->layout, false);
+	}
+	uiLayout *col = uiLayoutColumn(pa->layout, false);
+	uiTemplateOperatorRedoProperties(col, C);
+}
+
+void topbar_panels_register(ARegionType *art)
+{
+	PanelType *pt;
+
+	pt = MEM_callocN(sizeof(PanelType), __func__);
+	strcpy(pt->idname, "TOPBAR_PT_redo");
+	strcpy(pt->label, N_("Redo"));
+	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
+	pt->draw = topbar_panel_operator_redo;
+	pt->poll = topbar_panel_operator_redo_poll;
+	pt->space_type = SPACE_TOPBAR;
+	pt->region_type = RGN_TYPE_HEADER;
+	BLI_addtail(&art->paneltypes, pt);
+}
+
+/** \} */
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c
index 209b32f45f3..b3f45de518b 100644
--- a/source/blender/editors/space_userpref/space_userpref.c
+++ b/source/blender/editors/space_userpref/space_userpref.c
@@ -51,7 +51,7 @@
 
 /* ******************** default callbacks for userpref space ***************** */
 
-static SpaceLink *userpref_new(const bContext *UNUSED(C))
+static SpaceLink *userpref_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
 	ARegion *ar;
 	SpaceUserPref *spref;
@@ -64,7 +64,7 @@ static SpaceLink *userpref_new(const bContext *UNUSED(C))
 
 	BLI_addtail(&spref->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* main region */
 	ar = MEM_callocN(sizeof(ARegion), "main region for userpref");
@@ -136,12 +136,16 @@ static void userpref_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void userpref_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void userpref_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 	/* context changes */
 }
 
-static void userpref_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
+static void userpref_header_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
+        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
 {
 	/* context changes */
 #if 0
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index e25a9c04f15..f8e38587117 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -25,6 +25,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../draw
 	../../gpu
 	../../imbuf
 	../../makesdna
@@ -42,21 +43,26 @@ set(INC_SYS
 )
 
 set(SRC
-	drawanimviz.c
-	drawarmature.c
-	drawmesh.c
 	drawobject.c
-	drawsimdebug.c
 	drawvolume.c
 	space_view3d.c
 	view3d_buttons.c
 	view3d_camera_control.c
 	view3d_draw.c
+	view3d_draw_legacy.c
 	view3d_edit.c
 	view3d_fly.c
 	view3d_walk.c
 	view3d_header.c
 	view3d_iterators.c
+	view3d_manipulator_armature.c
+	view3d_manipulator_camera.c
+	view3d_manipulator_empty.c
+	view3d_manipulator_forcefield.c
+	view3d_manipulator_lamp.c
+	view3d_manipulator_navigate.c
+	view3d_manipulator_navigate_type.c
+	view3d_manipulator_ruler.c
 	view3d_ops.c
 	view3d_project.c
 	view3d_ruler.c
@@ -74,13 +80,6 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-if(WITH_GAMEENGINE)
-	list(APPEND INC
-		../../../gameengine/BlenderRoutines
-	)
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 add_definitions(${GL_DEFINITIONS})
 
 if(WITH_INTERNATIONAL)
@@ -95,8 +94,4 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c
deleted file mode 100644
index ba75ae6f766..00000000000
--- a/source/blender/editors/space_view3d/drawanimviz.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2009 by the Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Joshua Leung
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_view3d/drawanimviz.c
- *  \ingroup spview3d
- */
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "BLI_sys_types.h"
-
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_object_types.h"
-
-#include "BLI_math.h"
-#include "BLI_dlrbTree.h"
-
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-
-#include "BIF_gl.h"
-
-#include "ED_keyframes_draw.h"
-
-
-#include "UI_resources.h"
-
-#include "view3d_intern.h"
-
-/* ************************************ Motion Paths ************************************* */
-
-/* TODO:
- * - options to draw paths with lines
- * - include support for editing the path verts */
-
-/* Set up drawing environment for drawing motion paths */
-void draw_motion_paths_init(View3D *v3d, ARegion *ar)
-{
-	RegionView3D *rv3d = ar->regiondata;
-
-	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-	glPushMatrix();
-	glLoadMatrixf(rv3d->viewmat);
-}
-
-/* set color
- * - more intense for active/selected bones, less intense for unselected bones
- * - black for before current frame, green for current frame, blue for after current frame
- * - intensity decreases as distance from current frame increases
- *
- * If the user select custom color, the color is replaced for the color selected in UI panel
- * - 75% Darker color is used for previous frames
- * - 50% Darker color for current frame
- * - User selected color for next frames
- */
-static void set_motion_path_color(Scene *scene, bMotionPath *mpath, int i, short sel, int sfra, int efra,
-	float prev_color[3], float frame_color[3], float next_color[3])
-{
-	int frame = sfra + i;
-	int blend_base = (abs(frame - CFRA) == 1) ? TH_CFRAME : TH_BACK; /* "bleed" cframe color to ease color blending */
-
-#define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min)
-	float intensity;  /* how faint */
-
-	if (frame < CFRA) {
-		if (mpath->flag & MOTIONPATH_FLAG_CUSTOM) {
-			/* Custom color: previous frames color is darker than current frame */
-			glColor3fv(prev_color);
-		}
-		else {
-			/* black - before cfra */
-			if (sel) {
-				/* intensity = 0.5f; */
-				intensity = SET_INTENSITY(sfra, i, CFRA, 0.25f, 0.75f);
-			}
-			else {
-				/* intensity = 0.8f; */
-				intensity = SET_INTENSITY(sfra, i, CFRA, 0.68f, 0.92f);
-			}
-			UI_ThemeColorBlend(TH_WIRE, blend_base, intensity);
-		}
-	}
-	else if (frame > CFRA) {
-		if (mpath->flag & MOTIONPATH_FLAG_CUSTOM) {
-			/* Custom color: next frames color is equal to user selected color */
-			glColor3fv(next_color);
-		}
-		else {
-			/* blue - after cfra */
-			if (sel) {
-				/* intensity = 0.5f; */
-				intensity = SET_INTENSITY(CFRA, i, efra, 0.25f, 0.75f);
-			}
-			else {
-				/* intensity = 0.8f; */
-				intensity = SET_INTENSITY(CFRA, i, efra, 0.68f, 0.92f);
-			}
-			UI_ThemeColorBlend(TH_BONE_POSE, blend_base, intensity);
-		}
-	}
-	else {
-		if (mpath->flag & MOTIONPATH_FLAG_CUSTOM) {
-			/* Custom color: current frame color is slightly darker than user selected color */
-			glColor3fv(frame_color);
-		}
-		else {
-			/* green - on cfra */
-			if (sel) {
-				intensity = 0.5f;
-			}
-			else {
-				intensity = 0.99f;
-			}
-			UI_ThemeColorBlendShade(TH_CFRAME, TH_BACK, intensity, 10);
-		}
-	}
-#undef SET_INTENSITY
-}
-
-/* Draw the given motion path for an Object or a Bone
- *  - assumes that the viewport has already been initialized properly
- *    i.e. draw_motion_paths_init() has been called
- */
-void draw_motion_path_instance(Scene *scene,
-                               Object *ob, bPoseChannel *pchan, bAnimVizSettings *avs, bMotionPath *mpath)
-{
-	//RegionView3D *rv3d = ar->regiondata;
-	bMotionPathVert *mpv, *mpv_start;
-	int i, stepsize = avs->path_step;
-	int sfra, efra, sind, len;
-	float prev_color[3];
-	float frame_color[3];
-	float next_color[3];
-
-	/* Custom color - Previous frames: color is darker than current frame */
-	prev_color[0] = mpath->color[0] * 0.25f;
-	prev_color[1] = mpath->color[1] * 0.25f;
-	prev_color[2] = mpath->color[2] * 0.25f;
-
-	/* Custom color - Current frame: color is slightly darker than user selected color */
-	frame_color[0] = mpath->color[0] * 0.50f;
-	frame_color[1] = mpath->color[1] * 0.50f;
-	frame_color[2] = mpath->color[2] * 0.50f;
-
-	/* Custom color - Next frames: color is equal to user selection */
-	next_color[0] = mpath->color[0];
-	next_color[1] = mpath->color[1];
-	next_color[2] = mpath->color[2];
-
-	/* Save old line width */
-	GLfloat old_width;
-	glGetFloatv(GL_LINE_WIDTH, &old_width);
-
-	/* get frame ranges */
-	if (avs->path_type == MOTIONPATH_TYPE_ACFRA) {
-		/* With "Around Current", we only choose frames from around
-		 * the current frame to draw.
-		 */
-		sfra = CFRA - avs->path_bc;
-		efra = CFRA + avs->path_ac;
-	}
-	else {
-		/* Use the current display range */
-		sfra = avs->path_sf;
-		efra = avs->path_ef;
-	}
-
-	/* no matter what, we can only show what is in the cache and no more
-	 * - abort if whole range is past ends of path
-	 * - otherwise clamp endpoints to extents of path
-	 */
-	if (sfra < mpath->start_frame) {
-		/* start clamp */
-		sfra = mpath->start_frame;
-	}
-	if (efra > mpath->end_frame) {
-		/* end clamp */
-		efra = mpath->end_frame;
-	}
-
-	if ((sfra > mpath->end_frame) || (efra < mpath->start_frame)) {
-		/* whole path is out of bounds */
-		return;
-	}
-
-	len = efra - sfra;
-
-	if ((len <= 0) || (mpath->points == NULL)) {
-		return;
-	}
-
-	/* get pointers to parts of path */
-	sind = sfra - mpath->start_frame;
-	mpv_start = (mpath->points + sind);
-
-	/* draw curve-line of path */
-	/* Draw lines only if line drawing option is enabled */
-	if (mpath->flag & MOTIONPATH_FLAG_LINES) {
-		/* set line thickness */
-		glLineWidth(mpath->line_thickness);
-
-		glBegin(GL_LINE_STRIP);
-		for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
-			short sel = (pchan) ? (pchan->bone->flag & BONE_SELECTED) : (ob->flag & SELECT);
-			/* Set color */
-			set_motion_path_color(scene, mpath, i, sel, sfra, efra, prev_color, frame_color, next_color);
-			/* draw a vertex with this color */
-			glVertex3fv(mpv->co);
-		}
-
-		glEnd();
-		/* back to old line thickness */
-		glLineWidth(old_width);
-	}
-
-	/* Point must be bigger than line thickness */
-	glPointSize(mpath->line_thickness + 1.0);
-
-	/* draw little black point at each frame
-	 * NOTE: this is not really visible/noticeable
-	 */
-	glBegin(GL_POINTS);
-	for (i = 0, mpv = mpv_start; i < len; i++, mpv++)
-		glVertex3fv(mpv->co);
-	glEnd();
-
-	/* Draw little white dots at each framestep value or replace with custom color */
-	if (mpath->flag & MOTIONPATH_FLAG_CUSTOM) {
-		glColor4fv(mpath->color);
-	}
-	else {
-		UI_ThemeColor(TH_TEXT_HI);
-	}
-	glBegin(GL_POINTS);
-	for (i = 0, mpv = mpv_start; i < len; i += stepsize, mpv += stepsize)
-		glVertex3fv(mpv->co);
-	glEnd();
-
-	/* Draw big green dot where the current frame is
-	 * NOTE: this is only done when keyframes are shown, since this adds similar types of clutter
-	 */
-	if ((avs->path_viewflag & MOTIONPATH_VIEW_KFRAS) &&
-	    (sfra < CFRA) && (CFRA <= efra))
-	{
-		UI_ThemeColor(TH_CFRAME);
-
-		glPointSize(mpath->line_thickness + 5.0);
-		glBegin(GL_POINTS);
-		mpv = mpv_start + (CFRA - sfra);
-		glVertex3fv(mpv->co);
-		glEnd();
-
-		UI_ThemeColor(TH_TEXT_HI);
-	}
-
-	/* XXX, this isn't up to date but probably should be kept so. */
-	invert_m4_m4(ob->imat, ob->obmat);
-
-	/* Draw frame numbers at each framestep value */
-	if (avs->path_viewflag & MOTIONPATH_VIEW_FNUMS) {
-		unsigned char col[4];
-		UI_GetThemeColor3ubv(TH_TEXT_HI, col);
-		col[3] = 255;
-
-		for (i = 0, mpv = mpv_start; i < len; i += stepsize, mpv += stepsize) {
-			int frame = sfra + i;
-			char numstr[32];
-			size_t numstr_len;
-			float co[3];
-
-			/* only draw framenum if several consecutive highlighted points don't occur on same point */
-			if (i == 0) {
-				numstr_len = sprintf(numstr, " %d", frame);
-				mul_v3_m4v3(co, ob->imat, mpv->co);
-				view3d_cached_text_draw_add(co, numstr, numstr_len,
-				                            0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
-			}
-			else if ((i >= stepsize) && (i < len - stepsize)) {
-				bMotionPathVert *mpvP = (mpv - stepsize);
-				bMotionPathVert *mpvN = (mpv + stepsize);
-
-				if ((equals_v3v3(mpv->co, mpvP->co) == 0) || (equals_v3v3(mpv->co, mpvN->co) == 0)) {
-					numstr_len = sprintf(numstr, " %d", frame);
-					mul_v3_m4v3(co, ob->imat, mpv->co);
-					view3d_cached_text_draw_add(co, numstr, numstr_len,
-					                            0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
-				}
-			}
-		}
-	}
-
-	/* Keyframes - dots and numbers */
-	if (avs->path_viewflag & MOTIONPATH_VIEW_KFRAS) {
-		unsigned char col[4];
-
-		AnimData *adt = BKE_animdata_from_id(&ob->id);
-		DLRBT_Tree keys;
-
-		/* build list of all keyframes in active action for object or pchan */
-		BLI_dlrbTree_init(&keys);
-
-		if (adt) {
-			/* it is assumed that keyframes for bones are all grouped in a single group
-			 * unless an option is set to always use the whole action
-			 */
-			if ((pchan) && (avs->path_viewflag & MOTIONPATH_VIEW_KFACT) == 0) {
-				bActionGroup *agrp = BKE_action_group_find_name(adt->action, pchan->name);
-
-				if (agrp) {
-					agroup_to_keylist(adt, agrp, &keys, NULL);
-					BLI_dlrbTree_linkedlist_sync(&keys);
-				}
-			}
-			else {
-				action_to_keylist(adt, adt->action, &keys, NULL);
-				BLI_dlrbTree_linkedlist_sync(&keys);
-			}
-		}
-
-		/* Draw slightly-larger yellow dots at each keyframe */
-		UI_GetThemeColor3ubv(TH_VERTEX_SELECT, col);
-		col[3] = 255;
-
-		/* if custom, point must be bigger than line */
-		if (mpath->flag & MOTIONPATH_FLAG_CUSTOM) {
-			glPointSize(mpath->line_thickness + 3.0);
-		}
-		else {
-			glPointSize(4.0f);
-		}
-		glColor3ubv(col);
-
-		glBegin(GL_POINTS);
-		for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
-			int    frame = sfra + i;
-			float mframe = (float)(frame);
-
-			if (BLI_dlrbTree_search_exact(&keys, compare_ak_cfraPtr, &mframe))
-				glVertex3fv(mpv->co);
-		}
-		glEnd();
-
-		/* Draw frame numbers of keyframes  */
-		if (avs->path_viewflag & MOTIONPATH_VIEW_KFNOS) {
-			float co[3];
-			for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
-				float mframe = (float)(sfra + i);
-
-				if (BLI_dlrbTree_search_exact(&keys, compare_ak_cfraPtr, &mframe)) {
-					char numstr[32];
-					size_t numstr_len;
-
-					numstr_len = sprintf(numstr, " %d", (sfra + i));
-					mul_v3_m4v3(co, ob->imat, mpv->co);
-					view3d_cached_text_draw_add(co, numstr, numstr_len,
-					                            0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
-				}
-			}
-		}
-
-		BLI_dlrbTree_free(&keys);
-	}
-}
-
-/* Clean up drawing environment after drawing motion paths */
-void draw_motion_paths_cleanup(View3D *v3d)
-{
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-	glPopMatrix();
-}
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
deleted file mode 100644
index bbda002eb8d..00000000000
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ /dev/null
@@ -1,2793 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2005 by the Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_view3d/drawarmature.c
- *  \ingroup spview3d
- */
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_object_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_dlrbTree.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_armature.h"
-#include "BKE_global.h"
-#include "BKE_modifier.h"
-#include "BKE_nla.h"
-#include "BKE_curve.h"
-
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "ED_armature.h"
-#include "ED_keyframes_draw.h"
-
-#include "GPU_basic_shader.h"
-
-#include "UI_resources.h"
-
-#include "view3d_intern.h"
-
-#include "GPU_select.h"
-
-/* *************** Armature Drawing - Coloring API ***************************** */
-
-/* global here is reset before drawing each bone */
-static ThemeWireColor *bcolor = NULL;
-
-/* values of colCode for set_pchan_glcolor */
-enum {
-	PCHAN_COLOR_NORMAL  = 0,        /* normal drawing */
-	PCHAN_COLOR_SOLID,              /* specific case where "solid" color is needed */
-	PCHAN_COLOR_CONSTS,             /* "constraint" colors (which may/may-not be suppressed) */
-
-	PCHAN_COLOR_SPHEREBONE_BASE,    /* for the 'stick' of sphere (envelope) bones */
-	PCHAN_COLOR_SPHEREBONE_END,     /* for the ends of sphere (envelope) bones */
-	PCHAN_COLOR_LINEBONE            /* for the middle of line-bones */
-};
-
-/* This function sets the color-set for coloring a certain bone */
-static void set_pchan_colorset(Object *ob, bPoseChannel *pchan)
-{
-	bPose *pose = (ob) ? ob->pose : NULL;
-	bArmature *arm = (ob) ? ob->data : NULL;
-	bActionGroup *grp = NULL;
-	short color_index = 0;
-
-	/* sanity check */
-	if (ELEM(NULL, ob, arm, pose, pchan)) {
-		bcolor = NULL;
-		return;
-	}
-
-	/* only try to set custom color if enabled for armature */
-	if (arm->flag & ARM_COL_CUSTOM) {
-		/* currently, a bone can only use a custom color set if it's group (if it has one),
-		 * has been set to use one
-		 */
-		if (pchan->agrp_index) {
-			grp = (bActionGroup *)BLI_findlink(&pose->agroups, (pchan->agrp_index - 1));
-			if (grp)
-				color_index = grp->customCol;
-		}
-	}
-
-	/* bcolor is a pointer to the color set to use. If NULL, then the default
-	 * color set (based on the theme colors for 3d-view) is used.
-	 */
-	if (color_index > 0) {
-		bTheme *btheme = UI_GetTheme();
-		bcolor = &btheme->tarm[(color_index - 1)];
-	}
-	else if (color_index == -1) {
-		/* use the group's own custom color set (grp is always != NULL here) */
-		bcolor = &grp->cs;
-	}
-	else {
-		bcolor = NULL;
-	}
-}
-
-/* This function is for brightening/darkening a given color (like UI_ThemeColorShade()) */
-static void cp_shade_color3ub(unsigned char cp[3], const int offset)
-{
-	int r, g, b;
-
-	r = offset + (int) cp[0];
-	CLAMP(r, 0, 255);
-	g = offset + (int) cp[1];
-	CLAMP(g, 0, 255);
-	b = offset + (int) cp[2];
-	CLAMP(b, 0, 255);
-
-	cp[0] = r;
-	cp[1] = g;
-	cp[2] = b;
-}
-
-/* This function sets the gl-color for coloring a certain bone (based on bcolor) */
-static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
-{
-	switch (colCode) {
-		case PCHAN_COLOR_NORMAL:
-		{
-			if (bcolor) {
-				unsigned char cp[3];
-
-				if (boneflag & BONE_DRAW_ACTIVE) {
-					copy_v3_v3_char((char *)cp, bcolor->active);
-					if (!(boneflag & BONE_SELECTED)) {
-						cp_shade_color3ub(cp, -80);
-					}
-				}
-				else if (boneflag & BONE_SELECTED) {
-					copy_v3_v3_char((char *)cp, bcolor->select);
-				}
-				else {
-					/* a bit darker than solid */
-					copy_v3_v3_char((char *)cp, bcolor->solid);
-					cp_shade_color3ub(cp, -50);
-				}
-
-				glColor3ubv(cp);
-			}
-			else {
-				if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) {
-					UI_ThemeColor(TH_BONE_POSE_ACTIVE);
-				}
-				else if (boneflag & BONE_DRAW_ACTIVE) {
-					UI_ThemeColorBlend(TH_WIRE, TH_BONE_POSE, 0.15f); /* unselected active */
-				}
-				else if (boneflag & BONE_SELECTED) {
-					UI_ThemeColor(TH_BONE_POSE);
-				}
-				else {
-					UI_ThemeColor(TH_WIRE);
-				}
-			}
-
-			return true;
-		}
-		case PCHAN_COLOR_SOLID:
-		{
-			if (bcolor) {
-				glColor3ubv((unsigned char *)bcolor->solid);
-			}
-			else
-				UI_ThemeColor(TH_BONE_SOLID);
-
-			return true;
-		}
-		case PCHAN_COLOR_CONSTS:
-		{
-			if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
-				if (constflag & PCHAN_HAS_TARGET) glColor4ub(255, 150, 0, 80);
-				else if (constflag & PCHAN_HAS_IK) glColor4ub(255, 255, 0, 80);
-				else if (constflag & PCHAN_HAS_SPLINEIK) glColor4ub(200, 255, 0, 80);
-				else if (constflag & PCHAN_HAS_CONST) glColor4ub(0, 255, 120, 80);
-
-				return true;
-			}
-			return false;
-		}
-		case PCHAN_COLOR_SPHEREBONE_BASE:
-		{
-			if (bcolor) {
-				unsigned char cp[3];
-
-				if (boneflag & BONE_DRAW_ACTIVE) {
-					copy_v3_v3_char((char *)cp, bcolor->active);
-				}
-				else if (boneflag & BONE_SELECTED) {
-					copy_v3_v3_char((char *)cp, bcolor->select);
-				}
-				else {
-					copy_v3_v3_char((char *)cp, bcolor->solid);
-				}
-
-				glColor3ubv(cp);
-			}
-			else {
-				if (boneflag & BONE_DRAW_ACTIVE) UI_ThemeColorShade(TH_BONE_POSE, 40);
-				else if (boneflag & BONE_SELECTED) UI_ThemeColor(TH_BONE_POSE);
-				else UI_ThemeColor(TH_BONE_SOLID);
-			}
-
-			return true;
-		}
-		case PCHAN_COLOR_SPHEREBONE_END:
-		{
-			if (bcolor) {
-				unsigned char cp[3];
-
-				if (boneflag & BONE_DRAW_ACTIVE) {
-					copy_v3_v3_char((char *)cp, bcolor->active);
-					cp_shade_color3ub(cp, 10);
-				}
-				else if (boneflag & BONE_SELECTED) {
-					copy_v3_v3_char((char *)cp, bcolor->select);
-					cp_shade_color3ub(cp, -30);
-				}
-				else {
-					copy_v3_v3_char((char *)cp, bcolor->solid);
-					cp_shade_color3ub(cp, -30);
-				}
-
-				glColor3ubv(cp);
-			}
-			else {
-				if (boneflag & BONE_DRAW_ACTIVE) UI_ThemeColorShade(TH_BONE_POSE, 10);
-				else if (boneflag & BONE_SELECTED) UI_ThemeColorShade(TH_BONE_POSE, -30);
-				else UI_ThemeColorShade(TH_BONE_SOLID, -30);
-			}
-			break;
-		}
-		case PCHAN_COLOR_LINEBONE:
-		{
-			/* inner part in background color or constraint */
-			if ((constflag) && ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS))) {
-				if (constflag & PCHAN_HAS_TARGET) glColor3ub(255, 150, 0);
-				else if (constflag & PCHAN_HAS_IK) glColor3ub(255, 255, 0);
-				else if (constflag & PCHAN_HAS_SPLINEIK) glColor3ub(200, 255, 0);
-				else if (constflag & PCHAN_HAS_CONST) glColor3ub(0, 255, 120);
-				else if (constflag) UI_ThemeColor(TH_BONE_POSE);  /* PCHAN_HAS_ACTION */
-			}
-			else {
-				if (bcolor) {
-					const char *cp = bcolor->solid;
-					glColor4ub(cp[0], cp[1], cp[2], 204);
-				}
-				else
-					UI_ThemeColorShade(TH_BACK, -30);
-			}
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static void set_ebone_glColor(const unsigned int boneflag)
-{
-	if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) {
-		UI_ThemeColor(TH_EDGE_SELECT);
-	}
-	else if (boneflag & BONE_DRAW_ACTIVE) {
-		UI_ThemeColorBlend(TH_WIRE_EDIT, TH_EDGE_SELECT, 0.15f); /* unselected active */
-	}
-	else if (boneflag & BONE_SELECTED) {
-		UI_ThemeColorShade(TH_EDGE_SELECT, -20);
-	}
-	else {
-		UI_ThemeColor(TH_WIRE_EDIT);
-	}
-}
-
-/* *************** Armature drawing, helper calls for parts ******************* */
-
-/* half the cube, in Y */
-static const float cube[8][3] = {
-	{-1.0,  0.0, -1.0},
-	{-1.0,  0.0,  1.0},
-	{-1.0,  1.0,  1.0},
-	{-1.0,  1.0, -1.0},
-	{ 1.0,  0.0, -1.0},
-	{ 1.0,  0.0,  1.0},
-	{ 1.0,  1.0,  1.0},
-	{ 1.0,  1.0, -1.0},
-};
-
-static void drawsolidcube_size(float xsize, float ysize, float zsize)
-{
-	static GLuint displist = 0;
-	float n[3] = {0.0f};
-
-	glScalef(xsize, ysize, zsize);
-
-	if (displist == 0) {
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		glBegin(GL_QUADS);
-		n[0] = -1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-		n[0] = 0;
-		n[1] = -1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
-		n[1] = 0;
-		n[0] = 1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
-		n[0] = 0;
-		n[1] = 1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
-		n[1] = 0;
-		n[2] = 1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
-		n[2] = -1.0;
-		glNormal3fv(n);
-		glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
-		glEnd();
-
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-static void drawcube_size(float xsize, float ysize, float zsize)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		glBegin(GL_LINE_STRIP);
-		glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-		glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[6]);
-		glVertex3fv(cube[7]); glVertex3fv(cube[4]);
-		glEnd();
-
-		glBegin(GL_LINES);
-		glVertex3fv(cube[1]); glVertex3fv(cube[5]);
-		glVertex3fv(cube[2]); glVertex3fv(cube[6]);
-		glVertex3fv(cube[3]); glVertex3fv(cube[7]);
-		glEnd();
-
-		glEndList();
-	}
-
-	glScalef(xsize, ysize, zsize);
-	glCallList(displist);
-
-}
-
-
-static void draw_bonevert(void)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		GLUquadricObj   *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		glPushMatrix();
-
-		qobj    = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-		gluDisk(qobj, 0.0,  0.05, 16, 1);
-
-		glRotatef(90, 0, 1, 0);
-		gluDisk(qobj, 0.0,  0.05, 16, 1);
-
-		glRotatef(90, 1, 0, 0);
-		gluDisk(qobj, 0.0,  0.05, 16, 1);
-
-		gluDeleteQuadric(qobj);
-
-		glPopMatrix();
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-static void draw_bonevert_solid(void)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-		/* Draw tips of a bone */
-		gluSphere(qobj, 0.05, 8, 5);
-		gluDeleteQuadric(qobj);
-
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-static const float bone_octahedral_verts[6][3] = {
-	{ 0.0f, 0.0f,  0.0f},
-	{ 0.1f, 0.1f,  0.1f},
-	{ 0.1f, 0.1f, -0.1f},
-	{-0.1f, 0.1f, -0.1f},
-	{-0.1f, 0.1f,  0.1f},
-	{ 0.0f, 1.0f,  0.0f}
-};
-
-static const unsigned int bone_octahedral_wire_sides[8] = {0, 1, 5, 3, 0, 4, 5, 2};
-static const unsigned int bone_octahedral_wire_square[8] = {1, 2, 3, 4, 1};
-
-static const unsigned int bone_octahedral_solid_tris[8][3] = {
-	{2, 1, 0}, /* bottom */
-	{3, 2, 0},
-	{4, 3, 0},
-	{1, 4, 0},
-
-	{5, 1, 2}, /* top */
-	{5, 2, 3},
-	{5, 3, 4},
-	{5, 4, 1}
-};
-
-/* aligned with bone_octahedral_solid_tris */
-static const float bone_octahedral_solid_normals[8][3] = {
-	{ M_SQRT1_2,   -M_SQRT1_2,    0.00000000f},
-	{-0.00000000f, -M_SQRT1_2,   -M_SQRT1_2},
-	{-M_SQRT1_2,   -M_SQRT1_2,    0.00000000f},
-	{ 0.00000000f, -M_SQRT1_2,    M_SQRT1_2},
-	{ 0.99388373f,  0.11043154f, -0.00000000f},
-	{ 0.00000000f,  0.11043154f, -0.99388373f},
-	{-0.99388373f,  0.11043154f,  0.00000000f},
-	{ 0.00000000f,  0.11043154f,  0.99388373f}
-};
-
-static void draw_bone_octahedral(void)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		/*	Section 1, sides */
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glVertexPointer(3, GL_FLOAT, 0, bone_octahedral_verts);
-		glDrawElements(GL_LINE_LOOP,
-		               sizeof(bone_octahedral_wire_sides) / sizeof(*bone_octahedral_wire_sides),
-		               GL_UNSIGNED_INT,
-		               bone_octahedral_wire_sides);
-
-		/*	Section 1, square */
-		glDrawElements(GL_LINE_LOOP,
-		               sizeof(bone_octahedral_wire_square) / sizeof(*bone_octahedral_wire_square),
-		               GL_UNSIGNED_INT,
-		               bone_octahedral_wire_square);
-		glDisableClientState(GL_VERTEX_ARRAY);
-
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-static void draw_bone_solid_octahedral(void)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		int i;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-#if 1
-		glBegin(GL_TRIANGLES);
-		for (i = 0; i < 8; i++) {
-			glNormal3fv(bone_octahedral_solid_normals[i]);
-			glVertex3fv(bone_octahedral_verts[bone_octahedral_solid_tris[i][0]]);
-			glVertex3fv(bone_octahedral_verts[bone_octahedral_solid_tris[i][1]]);
-			glVertex3fv(bone_octahedral_verts[bone_octahedral_solid_tris[i][2]]);
-		}
-
-		glEnd();
-
-#else   /* not working because each vert needs a different normal */
-		glEnableClientState(GL_NORMAL_ARRAY);
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glNormalPointer(GL_FLOAT, 0, bone_octahedral_solid_normals);
-		glVertexPointer(3, GL_FLOAT, 0, bone_octahedral_verts);
-		glDrawElements(GL_TRIANGLES, sizeof(bone_octahedral_solid_tris) / sizeof(unsigned int),
-		               GL_UNSIGNED_INT, bone_octahedral_solid_tris);
-		glDisableClientState(GL_NORMAL_ARRAY);
-		glDisableClientState(GL_VERTEX_ARRAY);
-#endif
-
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-/* *************** Armature drawing, bones ******************* */
-
-
-static void draw_bone_points(const short dt, int armflag, unsigned int boneflag, int id)
-{
-	/*	Draw root point if we are not connected */
-	if ((boneflag & BONE_CONNECTED) == 0) {
-		if (id != -1)
-			GPU_select_load_id(id | BONESEL_ROOT);
-
-		if (dt <= OB_WIRE) {
-			if (armflag & ARM_EDITMODE) {
-				if (boneflag & BONE_ROOTSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-				else UI_ThemeColor(TH_VERTEX);
-			}
-		}
-		else {
-			if (armflag & ARM_POSEMODE)
-				set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, 0);
-			else
-				UI_ThemeColor(TH_BONE_SOLID);
-		}
-
-		if (dt > OB_WIRE)
-			draw_bonevert_solid();
-		else
-			draw_bonevert();
-	}
-
-	/*	Draw tip point */
-	if (id != -1)
-		GPU_select_load_id(id | BONESEL_TIP);
-
-	if (dt <= OB_WIRE) {
-		if (armflag & ARM_EDITMODE) {
-			if (boneflag & BONE_TIPSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-			else UI_ThemeColor(TH_VERTEX);
-		}
-	}
-	else {
-		if (armflag & ARM_POSEMODE)
-			set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, 0);
-		else
-			UI_ThemeColor(TH_BONE_SOLID);
-	}
-
-	glTranslatef(0.0f, 1.0f, 0.0f);
-	if (dt > OB_WIRE)
-		draw_bonevert_solid();
-	else
-		draw_bonevert();
-	glTranslatef(0.0f, -1.0f, 0.0f);
-
-}
-
-/* 16 values of sin function (still same result!) */
-static const float si[16] = {
-	0.00000000f,
-	0.20129852f, 0.39435585f,
-	0.57126821f, 0.72479278f,
-	0.84864425f, 0.93775213f,
-	0.98846832f, 0.99871650f,
-	0.96807711f, 0.89780453f,
-	0.79077573f, 0.65137248f,
-	0.48530196f, 0.29936312f,
-	0.10116832f
-};
-/* 16 values of cos function (still same result!) */
-static const float co[16] = {
-	1.00000000f,
-	0.97952994f, 0.91895781f,
-	0.82076344f, 0.68896691f,
-	0.52896401f, 0.34730525f,
-	0.15142777f, -0.05064916f,
-	-0.25065253f, -0.44039415f,
-	-0.61210598f, -0.75875812f,
-	-0.87434661f, -0.95413925f,
-	-0.99486932f
-};
-
-
-
-/* smat, imat = mat & imat to draw screenaligned */
-static void draw_sphere_bone_dist(float smat[4][4], float imat[4][4], bPoseChannel *pchan, EditBone *ebone)
-{
-	float head, tail, dist /*, length*/;
-	float *headvec, *tailvec, dirvec[3];
-
-	/* figure out the sizes of spheres */
-	if (ebone) {
-		/* this routine doesn't call get_matrix_editbone() that calculates it */
-		ebone->length = len_v3v3(ebone->head, ebone->tail);
-
-		/*length = ebone->length;*/ /*UNUSED*/
-		tail = ebone->rad_tail;
-		dist = ebone->dist;
-		if (ebone->parent && (ebone->flag & BONE_CONNECTED))
-			head = ebone->parent->rad_tail;
-		else
-			head = ebone->rad_head;
-		headvec = ebone->head;
-		tailvec = ebone->tail;
-	}
-	else {
-		/*length = pchan->bone->length;*/ /*UNUSED*/
-		tail = pchan->bone->rad_tail;
-		dist = pchan->bone->dist;
-		if (pchan->parent && (pchan->bone->flag & BONE_CONNECTED))
-			head = pchan->parent->bone->rad_tail;
-		else
-			head = pchan->bone->rad_head;
-		headvec = pchan->pose_head;
-		tailvec = pchan->pose_tail;
-	}
-
-	/* ***** draw it ***** */
-
-	/* move vector to viewspace */
-	sub_v3_v3v3(dirvec, tailvec, headvec);
-	mul_mat3_m4_v3(smat, dirvec);
-	/* clear zcomp */
-	dirvec[2] = 0.0f;
-
-	if (head != tail) {
-		/* correction when viewing along the bones axis
-		 * it pops in and out but better then artifacts, [#23841] */
-		float view_dist = len_v2(dirvec);
-
-		if (head - view_dist > tail) {
-			tailvec = headvec;
-			tail = head;
-			zero_v3(dirvec);
-			dirvec[0] = 0.00001;  /* XXX. weak but ok */
-		}
-		else if (tail - view_dist > head) {
-			headvec = tailvec;
-			head = tail;
-			zero_v3(dirvec);
-			dirvec[0] = 0.00001;  /* XXX. weak but ok */
-		}
-	}
-
-	/* move vector back */
-	mul_mat3_m4_v3(imat, dirvec);
-
-	if (0.0f != normalize_v3(dirvec)) {
-		float norvec[3], vec1[3], vec2[3], vec[3];
-		int a;
-
-		//mul_v3_fl(dirvec, head);
-		cross_v3_v3v3(norvec, dirvec, imat[2]);
-
-		glBegin(GL_QUAD_STRIP);
-
-		for (a = 0; a < 16; a++) {
-			vec[0] = -si[a] * dirvec[0] + co[a] * norvec[0];
-			vec[1] = -si[a] * dirvec[1] + co[a] * norvec[1];
-			vec[2] = -si[a] * dirvec[2] + co[a] * norvec[2];
-
-			madd_v3_v3v3fl(vec1, headvec, vec, head);
-			madd_v3_v3v3fl(vec2, headvec, vec, head + dist);
-
-			glColor4ub(255, 255, 255, 50);
-			glVertex3fv(vec1);
-			//glColor4ub(255, 255, 255, 0);
-			glVertex3fv(vec2);
-		}
-
-		for (a = 15; a >= 0; a--) {
-			vec[0] = si[a] * dirvec[0] + co[a] * norvec[0];
-			vec[1] = si[a] * dirvec[1] + co[a] * norvec[1];
-			vec[2] = si[a] * dirvec[2] + co[a] * norvec[2];
-
-			madd_v3_v3v3fl(vec1, tailvec, vec, tail);
-			madd_v3_v3v3fl(vec2, tailvec, vec, tail + dist);
-
-			//glColor4ub(255, 255, 255, 50);
-			glVertex3fv(vec1);
-			//glColor4ub(255, 255, 255, 0);
-			glVertex3fv(vec2);
-		}
-		/* make it cyclic... */
-
-		vec[0] = -si[0] * dirvec[0] + co[0] * norvec[0];
-		vec[1] = -si[0] * dirvec[1] + co[0] * norvec[1];
-		vec[2] = -si[0] * dirvec[2] + co[0] * norvec[2];
-
-		madd_v3_v3v3fl(vec1, headvec, vec, head);
-		madd_v3_v3v3fl(vec2, headvec, vec, head + dist);
-
-		//glColor4ub(255, 255, 255, 50);
-		glVertex3fv(vec1);
-		//glColor4ub(255, 255, 255, 0);
-		glVertex3fv(vec2);
-
-		glEnd();
-	}
-}
-
-
-/* smat, imat = mat & imat to draw screenaligned */
-static void draw_sphere_bone_wire(float smat[4][4], float imat[4][4],
-                                  int armflag, int boneflag, short constflag, unsigned int id,
-                                  bPoseChannel *pchan, EditBone *ebone)
-{
-	float head, tail /*, length*/;
-	float *headvec, *tailvec, dirvec[3];
-
-	/* figure out the sizes of spheres */
-	if (ebone) {
-		/* this routine doesn't call get_matrix_editbone() that calculates it */
-		ebone->length = len_v3v3(ebone->head, ebone->tail);
-
-		/*length = ebone->length;*/ /*UNUSED*/
-		tail = ebone->rad_tail;
-		if (ebone->parent && (boneflag & BONE_CONNECTED))
-			head = ebone->parent->rad_tail;
-		else
-			head = ebone->rad_head;
-		headvec = ebone->head;
-		tailvec = ebone->tail;
-	}
-	else {
-		/*length = pchan->bone->length;*/ /*UNUSED*/
-		tail = pchan->bone->rad_tail;
-		if ((pchan->parent) && (boneflag & BONE_CONNECTED))
-			head = pchan->parent->bone->rad_tail;
-		else
-			head = pchan->bone->rad_head;
-		headvec = pchan->pose_head;
-		tailvec = pchan->pose_tail;
-	}
-
-	/* sphere root color */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_ROOTSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-		else UI_ThemeColor(TH_VERTEX);
-	}
-	else if (armflag & ARM_POSEMODE)
-		set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-
-	/*	Draw root point if we are not connected */
-	if ((boneflag & BONE_CONNECTED) == 0) {
-		if (id != -1)
-			GPU_select_load_id(id | BONESEL_ROOT);
-
-		drawcircball(GL_LINE_LOOP, headvec, head, imat);
-	}
-
-	/*	Draw tip point */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_TIPSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-		else UI_ThemeColor(TH_VERTEX);
-	}
-
-	if (id != -1)
-		GPU_select_load_id(id | BONESEL_TIP);
-
-	drawcircball(GL_LINE_LOOP, tailvec, tail, imat);
-
-	/* base */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_SELECTED) UI_ThemeColor(TH_SELECT);
-		else UI_ThemeColor(TH_WIRE_EDIT);
-	}
-
-	sub_v3_v3v3(dirvec, tailvec, headvec);
-
-	/* move vector to viewspace */
-	mul_mat3_m4_v3(smat, dirvec);
-	/* clear zcomp */
-	dirvec[2] = 0.0f;
-	/* move vector back */
-	mul_mat3_m4_v3(imat, dirvec);
-
-	if (0.0f != normalize_v3(dirvec)) {
-		float norvech[3], norvect[3], vec[3];
-
-		copy_v3_v3(vec, dirvec);
-
-		mul_v3_fl(dirvec, head);
-		cross_v3_v3v3(norvech, dirvec, imat[2]);
-
-		mul_v3_fl(vec, tail);
-		cross_v3_v3v3(norvect, vec, imat[2]);
-
-		if (id != -1)
-			GPU_select_load_id(id | BONESEL_BONE);
-
-		glBegin(GL_LINES);
-
-		add_v3_v3v3(vec, headvec, norvech);
-		glVertex3fv(vec);
-
-		add_v3_v3v3(vec, tailvec, norvect);
-		glVertex3fv(vec);
-
-		sub_v3_v3v3(vec, headvec, norvech);
-		glVertex3fv(vec);
-
-		sub_v3_v3v3(vec, tailvec, norvect);
-		glVertex3fv(vec);
-
-		glEnd();
-	}
-}
-
-/* does wire only for outline selecting */
-static void draw_sphere_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
-                             bPoseChannel *pchan, EditBone *ebone)
-{
-	GLUquadricObj *qobj;
-	float head, tail, length;
-	float fac1, fac2;
-
-	glPushMatrix();
-	qobj = gluNewQuadric();
-
-	/* figure out the sizes of spheres */
-	if (ebone) {
-		length = ebone->length;
-		tail = ebone->rad_tail;
-		if (ebone->parent && (boneflag & BONE_CONNECTED))
-			head = ebone->parent->rad_tail;
-		else
-			head = ebone->rad_head;
-	}
-	else {
-		length = pchan->bone->length;
-		tail = pchan->bone->rad_tail;
-		if (pchan->parent && (boneflag & BONE_CONNECTED))
-			head = pchan->parent->bone->rad_tail;
-		else
-			head = pchan->bone->rad_head;
-	}
-
-	/* move to z-axis space */
-	glRotatef(-90.0f, 1.0f, 0.0f, 0.0f);
-
-	if (dt == OB_SOLID) {
-		/* set up solid drawing */
-		GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-	}
-	else {
-		gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-	}
-
-	/* sphere root color */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_ROOTSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-		else UI_ThemeColorShade(TH_BONE_SOLID, -30);
-	}
-	else if (armflag & ARM_POSEMODE)
-		set_pchan_glColor(PCHAN_COLOR_SPHEREBONE_END, boneflag, constflag);
-	else if (dt == OB_SOLID)
-		UI_ThemeColorShade(TH_BONE_SOLID, -30);
-
-	/*	Draw root point if we are not connected */
-	if ((boneflag & BONE_CONNECTED) == 0) {
-		if (id != -1)
-			GPU_select_load_id(id | BONESEL_ROOT);
-		gluSphere(qobj, head, 16, 10);
-	}
-
-	/*	Draw tip point */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_TIPSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-		else UI_ThemeColorShade(TH_BONE_SOLID, -30);
-	}
-
-	if (id != -1)
-		GPU_select_load_id(id | BONESEL_TIP);
-
-	glTranslatef(0.0f, 0.0f, length);
-	gluSphere(qobj, tail, 16, 10);
-	glTranslatef(0.0f, 0.0f, -length);
-
-	/* base */
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_SELECTED) UI_ThemeColor(TH_SELECT);
-		else UI_ThemeColor(TH_BONE_SOLID);
-	}
-	else if (armflag & ARM_POSEMODE)
-		set_pchan_glColor(PCHAN_COLOR_SPHEREBONE_BASE, boneflag, constflag);
-	else if (dt == OB_SOLID)
-		UI_ThemeColor(TH_BONE_SOLID);
-
-	fac1 = (length - head) / length;
-	fac2 = (length - tail) / length;
-
-	if (length > (head + tail)) {
-		if (id != -1)
-			GPU_select_load_id(id | BONESEL_BONE);
-
-		glEnable(GL_POLYGON_OFFSET_FILL);
-		glPolygonOffset(-1.0f, -1.0f);
-
-		glTranslatef(0.0f, 0.0f, head);
-		gluCylinder(qobj, fac1 * head + (1.0f - fac1) * tail, fac2 * tail + (1.0f - fac2) * head, length - head - tail, 16, 1);
-		glTranslatef(0.0f, 0.0f, -head);
-
-		glDisable(GL_POLYGON_OFFSET_FILL);
-
-		/* draw sphere on extrema */
-		glTranslatef(0.0f, 0.0f, length - tail);
-		gluSphere(qobj, fac2 * tail + (1.0f - fac2) * head, 16, 10);
-		glTranslatef(0.0f, 0.0f, -length + tail);
-
-		glTranslatef(0.0f, 0.0f, head);
-		gluSphere(qobj, fac1 * head + (1.0f - fac1) * tail, 16, 10);
-	}
-	else {
-		/* 1 sphere in center */
-		glTranslatef(0.0f, 0.0f, (head + length - tail) / 2.0f);
-		gluSphere(qobj, fac1 * head + (1.0f - fac1) * tail, 16, 10);
-	}
-
-	/* restore */
-	if (dt == OB_SOLID) {
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	}
-
-	glPopMatrix();
-	gluDeleteQuadric(qobj);
-}
-
-static GLubyte bm_dot6[] = {0x0, 0x18, 0x3C, 0x7E, 0x7E, 0x3C, 0x18, 0x0};
-static GLubyte bm_dot8[] = {0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C};
-
-static GLubyte bm_dot5[] = {0x0, 0x0, 0x10, 0x38, 0x7c, 0x38, 0x10, 0x0};
-static GLubyte bm_dot7[] = {0x0, 0x38, 0x7C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38};
-
-
-static void draw_line_bone(int armflag, int boneflag, short constflag, unsigned int id,
-                           bPoseChannel *pchan, EditBone *ebone)
-{
-	/* call this once, avoid constant changing */
-	BLI_assert(glaGetOneInt(GL_UNPACK_ALIGNMENT) == 1);
-
-	float length;
-
-	if (pchan)
-		length = pchan->bone->length;
-	else
-		length = ebone->length;
-
-	glPushMatrix();
-	glScalef(length, length, length);
-
-	/* this chunk not in object mode */
-	if (armflag & (ARM_EDITMODE | ARM_POSEMODE)) {
-		glLineWidth(4.0f);
-		if (G.f & G_PICKSEL) {
-			/* no bitmap in selection mode, crashes 3d cards...
-			 * instead draw a solid point the same size */
-			glPointSize(8.0f);
-		}
-
-		if (armflag & ARM_POSEMODE)
-			set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-		else if (armflag & ARM_EDITMODE) {
-			UI_ThemeColor(TH_WIRE_EDIT);
-		}
-
-		/*	Draw root point if we are not connected */
-		if ((boneflag & BONE_CONNECTED) == 0) {
-			if (G.f & G_PICKSEL) {
-				GPU_select_load_id(id | BONESEL_ROOT);
-				glBegin(GL_POINTS);
-				glVertex3f(0.0f, 0.0f, 0.0f);
-				glEnd();
-			}
-			else {
-				glRasterPos3f(0.0f, 0.0f, 0.0f);
-				glBitmap(8, 8, 4, 4, 0, 0, bm_dot8);
-			}
-		}
-
-		if (id != -1)
-			GPU_select_load_id((GLuint) id | BONESEL_BONE);
-
-		glBegin(GL_LINES);
-		glVertex3f(0.0f, 0.0f, 0.0f);
-		glVertex3f(0.0f, 1.0f, 0.0f);
-		glEnd();
-
-		/* tip */
-		if (G.f & G_PICKSEL) {
-			/* no bitmap in selection mode, crashes 3d cards... */
-			GPU_select_load_id(id | BONESEL_TIP);
-			glBegin(GL_POINTS);
-			glVertex3f(0.0f, 1.0f, 0.0f);
-			glEnd();
-		}
-		else {
-			glRasterPos3f(0.0f, 1.0f, 0.0f);
-			glBitmap(8, 8, 4, 4, 0, 0, bm_dot7);
-		}
-
-		/* further we send no names */
-		if (id != -1)
-			GPU_select_load_id(id & 0xFFFF);  /* object tag, for bordersel optim */
-
-		if (armflag & ARM_POSEMODE)
-			set_pchan_glColor(PCHAN_COLOR_LINEBONE, boneflag, constflag);
-	}
-
-	glLineWidth(2.0);
-
-	/*Draw root point if we are not connected */
-	if ((boneflag & BONE_CONNECTED) == 0) {
-		if ((G.f & G_PICKSEL) == 0) {
-			/* no bitmap in selection mode, crashes 3d cards... */
-			if (armflag & ARM_EDITMODE) {
-				if (boneflag & BONE_ROOTSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-				else UI_ThemeColor(TH_VERTEX);
-			}
-			glRasterPos3f(0.0f, 0.0f, 0.0f);
-			glBitmap(8, 8, 4, 4, 0, 0, bm_dot6);
-		}
-	}
-
-	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_SELECTED) UI_ThemeColor(TH_EDGE_SELECT);
-		else UI_ThemeColorShade(TH_BACK, -30);
-	}
-	glBegin(GL_LINES);
-	glVertex3f(0.0f, 0.0f, 0.0f);
-	glVertex3f(0.0f, 1.0f, 0.0f);
-	glEnd();
-
-	/* tip */
-	if ((G.f & G_PICKSEL) == 0) {
-		/* no bitmap in selection mode, crashes 3d cards... */
-		if (armflag & ARM_EDITMODE) {
-			if (boneflag & BONE_TIPSEL) UI_ThemeColor(TH_VERTEX_SELECT);
-			else UI_ThemeColor(TH_VERTEX);
-		}
-		glRasterPos3f(0.0f, 1.0f, 0.0f);
-		glBitmap(8, 8, 4, 4, 0, 0, bm_dot5);
-	}
-
-	glPopMatrix();
-}
-
-/* A partial copy of b_bone_spline_setup(), with just the parts for previewing editmode curve settings
- *
- * This assumes that prev/next bones don't have any impact (since they should all still be in the "straight"
- * position here anyway), and that we can simply apply the bbone settings to get the desired effect...
- */
-static void ebone_spline_preview(EditBone *ebone, Mat4 result_array[MAX_BBONE_SUBDIV])
-{
-	float h1[3], h2[3], length, hlength1, hlength2, roll1 = 0.0f, roll2 = 0.0f;
-	float mat3[3][3];
-	float data[MAX_BBONE_SUBDIV + 1][4], *fp;
-	int a;
-
-	length = ebone->length;
-
-	hlength1 = ebone->ease1 * length * 0.390464f; /* 0.5f * sqrt(2) * kappa, the handle length for near-perfect circles */
-	hlength2 = ebone->ease2 * length * 0.390464f;
-
-	/* find the handle points, since this is inside bone space, the
-	 * first point = (0, 0, 0)
-	 * last point =  (0, length, 0)
-	 *
-	 * we also just apply all the "extra effects", since they're the whole reason we're doing this...
-	 */
-	h1[0] = ebone->curveInX;
-	h1[1] = hlength1;
-	h1[2] = ebone->curveInY;
-	roll1 = ebone->roll1;
-
-	h2[0] = ebone->curveOutX;
-	h2[1] = -hlength2;
-	h2[2] = ebone->curveOutY;
-	roll2 = ebone->roll2;
-
-	/* make curve */
-	if (ebone->segments > MAX_BBONE_SUBDIV)
-		ebone->segments = MAX_BBONE_SUBDIV;
-
-	BKE_curve_forward_diff_bezier(0.0f,  h1[0],                               h2[0],                               0.0f,   data[0],     MAX_BBONE_SUBDIV, 4 * sizeof(float));
-	BKE_curve_forward_diff_bezier(0.0f,  h1[1],                               length + h2[1],                      length, data[0] + 1, MAX_BBONE_SUBDIV, 4 * sizeof(float));
-	BKE_curve_forward_diff_bezier(0.0f,  h1[2],                               h2[2],                               0.0f,   data[0] + 2, MAX_BBONE_SUBDIV, 4 * sizeof(float));
-	BKE_curve_forward_diff_bezier(roll1, roll1 + 0.390464f * (roll2 - roll1), roll2 - 0.390464f * (roll2 - roll1), roll2,  data[0] + 3, MAX_BBONE_SUBDIV, 4 * sizeof(float));
-
-	equalize_bbone_bezier(data[0], ebone->segments); /* note: does stride 4! */
-
-	/* make transformation matrices for the segments for drawing */
-	for (a = 0, fp = data[0]; a < ebone->segments; a++, fp += 4) {
-		sub_v3_v3v3(h1, fp + 4, fp);
-		vec_roll_to_mat3(h1, fp[3], mat3); /* fp[3] is roll */
-
-		copy_m4_m3(result_array[a].mat, mat3);
-		copy_v3_v3(result_array[a].mat[3], fp);
-
-		/* "extra" scale facs... */
-		{
-			const int num_segments = ebone->segments;
-
-			const float scaleFactorIn  = 1.0f + (ebone->scaleIn  - 1.0f) * ((float)(num_segments - a) / (float)num_segments);
-			const float scaleFactorOut = 1.0f + (ebone->scaleOut - 1.0f) * ((float)(a + 1)            / (float)num_segments);
-
-			const float scalefac = scaleFactorIn * scaleFactorOut;
-			float bscalemat[4][4], bscale[3];
-
-			bscale[0] = scalefac;
-			bscale[1] = 1.0f;
-			bscale[2] = scalefac;
-
-			size_to_mat4(bscalemat, bscale);
-
-			/* Note: don't multiply by inverse scale mat here, as it causes problems with scaling shearing and breaking segment chains */
-			mul_m4_series(result_array[a].mat, result_array[a].mat, bscalemat);
-		}
-	}
-}
-
-static void draw_b_bone_boxes(const short dt, bPoseChannel *pchan, EditBone *ebone, float xwidth, float length, float zwidth)
-{
-	int segments = 0;
-
-	if (pchan)
-		segments = pchan->bone->segments;
-	else if (ebone)
-		segments = ebone->segments;
-
-	if (segments > 1) {
-		float dlen = length / (float)segments;
-		Mat4 bbone[MAX_BBONE_SUBDIV];
-		int a;
-
-		if (pchan) {
-			b_bone_spline_setup(pchan, 0, bbone);
-		}
-		else if (ebone) {
-			ebone_spline_preview(ebone, bbone);
-		}
-
-		for (a = 0; a < segments; a++) {
-			glPushMatrix();
-			glMultMatrixf(bbone[a].mat);
-			if (dt == OB_SOLID) drawsolidcube_size(xwidth, dlen, zwidth);
-			else drawcube_size(xwidth, dlen, zwidth);
-			glPopMatrix();
-		}
-	}
-	else {
-		glPushMatrix();
-		if (dt == OB_SOLID) drawsolidcube_size(xwidth, length, zwidth);
-		else drawcube_size(xwidth, length, zwidth);
-		glPopMatrix();
-	}
-}
-
-static void draw_b_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
-                        bPoseChannel *pchan, EditBone *ebone)
-{
-	float xwidth, length, zwidth;
-
-	if (pchan) {
-		xwidth = pchan->bone->xwidth;
-		length = pchan->bone->length;
-		zwidth = pchan->bone->zwidth;
-	}
-	else {
-		xwidth = ebone->xwidth;
-		length = ebone->length;
-		zwidth = ebone->zwidth;
-	}
-
-	/* draw points only if... */
-	if (armflag & ARM_EDITMODE) {
-		/* move to unitspace */
-		glPushMatrix();
-		glScalef(length, length, length);
-		draw_bone_points(dt, armflag, boneflag, id);
-		glPopMatrix();
-		length *= 0.95f;  /* make vertices visible */
-	}
-
-	/* colors for modes */
-	if (armflag & ARM_POSEMODE) {
-		if (dt <= OB_WIRE)
-			set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-		else
-			set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, constflag);
-	}
-	else if (armflag & ARM_EDITMODE) {
-		if (dt == OB_WIRE) {
-			set_ebone_glColor(boneflag);
-		}
-		else
-			UI_ThemeColor(TH_BONE_SOLID);
-	}
-
-	if (id != -1) {
-		GPU_select_load_id((GLuint) id | BONESEL_BONE);
-	}
-
-	/* set up solid drawing */
-	if (dt > OB_WIRE) {
-		GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-
-		if (armflag & ARM_POSEMODE)
-			set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, constflag);
-		else
-			UI_ThemeColor(TH_BONE_SOLID);
-
-		draw_b_bone_boxes(OB_SOLID, pchan, ebone, xwidth, length, zwidth);
-
-		/* disable solid drawing */
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	}
-	else {
-		/* wire */
-		if (armflag & ARM_POSEMODE) {
-			if (constflag && ((G.f & G_PICKSEL) == 0)) {
-				/* set constraint colors */
-				if (set_pchan_glColor(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
-					glEnable(GL_BLEND);
-
-					draw_b_bone_boxes(OB_SOLID, pchan, ebone, xwidth, length, zwidth);
-
-					glDisable(GL_BLEND);
-				}
-
-				/* restore colors */
-				set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-			}
-		}
-
-		draw_b_bone_boxes(OB_WIRE, pchan, ebone, xwidth, length, zwidth);
-	}
-}
-
-static void draw_wire_bone_segments(bPoseChannel *pchan, Mat4 *bbones, float length, int segments)
-{
-	if ((segments > 1) && (pchan)) {
-		float dlen = length / (float)segments;
-		Mat4 *bbone = bbones;
-		int a;
-
-		for (a = 0; a < segments; a++, bbone++) {
-			glPushMatrix();
-			glMultMatrixf(bbone->mat);
-
-			glBegin(GL_LINES);
-			glVertex3f(0.0f, 0.0f, 0.0f);
-			glVertex3f(0.0f, dlen, 0.0f);
-			glEnd();  /* GL_LINES */
-
-			glPopMatrix();
-		}
-	}
-	else {
-		glPushMatrix();
-
-		glBegin(GL_LINES);
-		glVertex3f(0.0f, 0.0f, 0.0f);
-		glVertex3f(0.0f, length, 0.0f);
-		glEnd();
-
-		glPopMatrix();
-	}
-}
-
-static void draw_wire_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
-                           bPoseChannel *pchan, EditBone *ebone)
-{
-	Mat4 bbones_array[MAX_BBONE_SUBDIV];
-	Mat4 *bbones = NULL;
-	int segments = 0;
-	float length;
-
-	if (pchan) {
-		segments = pchan->bone->segments;
-		length = pchan->bone->length;
-
-		if (segments > 1) {
-			b_bone_spline_setup(pchan, 0, bbones_array);
-			bbones = bbones_array;
-		}
-	}
-	else
-		length = ebone->length;
-
-	/* draw points only if... */
-	if (armflag & ARM_EDITMODE) {
-		/* move to unitspace */
-		glPushMatrix();
-		glScalef(length, length, length);
-		draw_bone_points(dt, armflag, boneflag, id);
-		glPopMatrix();
-		length *= 0.95f;  /* make vertices visible */
-	}
-
-	/* this chunk not in object mode */
-	if (armflag & (ARM_EDITMODE | ARM_POSEMODE)) {
-		if (id != -1)
-			GPU_select_load_id((GLuint) id | BONESEL_BONE);
-
-		draw_wire_bone_segments(pchan, bbones, length, segments);
-
-		/* further we send no names */
-		if (id != -1)
-			GPU_select_load_id(id & 0xFFFF);    /* object tag, for bordersel optim */
-	}
-
-	/* colors for modes */
-	if (armflag & ARM_POSEMODE) {
-		set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-	}
-	else if (armflag & ARM_EDITMODE) {
-		set_ebone_glColor(boneflag);
-	}
-
-	/* draw normal */
-	draw_wire_bone_segments(pchan, bbones, length, segments);
-}
-
-static void draw_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id, float length)
-{
-
-	/* Draw a 3d octahedral bone, we use normalized space based on length,
-	 * for display-lists */
-
-	glScalef(length, length, length);
-
-	/* set up solid drawing */
-	if (dt > OB_WIRE) {
-		GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-		UI_ThemeColor(TH_BONE_SOLID);
-	}
-
-	/* colors for posemode */
-	if (armflag & ARM_POSEMODE) {
-		if (dt <= OB_WIRE)
-			set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-		else
-			set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, constflag);
-	}
-
-
-	draw_bone_points(dt, armflag, boneflag, id);
-
-	/* now draw the bone itself */
-	if (id != -1) {
-		GPU_select_load_id((GLuint) id | BONESEL_BONE);
-	}
-
-	/* wire? */
-	if (dt <= OB_WIRE) {
-		/* colors */
-		if (armflag & ARM_EDITMODE) {
-			set_ebone_glColor(boneflag);
-		}
-		else if (armflag & ARM_POSEMODE) {
-			if (constflag && ((G.f & G_PICKSEL) == 0)) {
-				/* draw constraint colors */
-				if (set_pchan_glColor(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
-					glEnable(GL_BLEND);
-
-					draw_bone_solid_octahedral();
-
-					glDisable(GL_BLEND);
-				}
-
-				/* restore colors */
-				set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, constflag);
-			}
-		}
-		draw_bone_octahedral();
-	}
-	else {
-		/* solid */
-		if (armflag & ARM_POSEMODE)
-			set_pchan_glColor(PCHAN_COLOR_SOLID, boneflag, constflag);
-		else
-			UI_ThemeColor(TH_BONE_SOLID);
-		draw_bone_solid_octahedral();
-	}
-
-	/* disable solid drawing */
-	if (dt > OB_WIRE) {
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	}
-}
-
-static void draw_custom_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob,
-                             const short dt, int armflag, int boneflag, unsigned int id, float length)
-{
-	if (ob == NULL) return;
-
-	glScalef(length, length, length);
-
-	/* colors for posemode */
-	if (armflag & ARM_POSEMODE) {
-		set_pchan_glColor(PCHAN_COLOR_NORMAL, boneflag, 0);
-	}
-
-	if (id != -1) {
-		GPU_select_load_id((GLuint) id | BONESEL_BONE);
-	}
-
-	draw_object_instance(scene, v3d, rv3d, ob, dt, armflag & ARM_POSEMODE);
-}
-
-
-static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
-{
-	bConstraint *con;
-	bPoseChannel *parchan;
-
-	for (con = pchan->constraints.first; con; con = con->next) {
-		if (con->enforce == 0.0f)
-			continue;
-
-		switch (con->type) {
-			case CONSTRAINT_TYPE_KINEMATIC:
-			{
-				bKinematicConstraint *data = (bKinematicConstraint *)con->data;
-				int segcount = 0;
-
-				/* if only_temp, only draw if it is a temporary ik-chain */
-				if ((only_temp) && !(data->flag & CONSTRAINT_IK_TEMP))
-					continue;
-
-				setlinestyle(3);
-				glBegin(GL_LINES);
-
-				/* exclude tip from chain? */
-				if ((data->flag & CONSTRAINT_IK_TIP) == 0)
-					parchan = pchan->parent;
-				else
-					parchan = pchan;
-
-				glVertex3fv(parchan->pose_tail);
-
-				/* Find the chain's root */
-				while (parchan->parent) {
-					segcount++;
-					if (segcount == data->rootbone || segcount > 255) {
-						break;  /* 255 is weak */
-					}
-					parchan = parchan->parent;
-				}
-				if (parchan)
-					glVertex3fv(parchan->pose_head);
-
-				glEnd();
-				setlinestyle(0);
-				break;
-			}
-			case CONSTRAINT_TYPE_SPLINEIK:
-			{
-				bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
-				int segcount = 0;
-
-				setlinestyle(3);
-				glBegin(GL_LINES);
-
-				parchan = pchan;
-				glVertex3fv(parchan->pose_tail);
-
-				/* Find the chain's root */
-				while (parchan->parent) {
-					segcount++;
-					/* FIXME: revise the breaking conditions */
-					if (segcount == data->chainlen || segcount > 255) break;  /* 255 is weak */
-					parchan = parchan->parent;
-				}
-				/* Only draw line in case our chain is more than one bone long! */
-				if (parchan != pchan)  /* XXX revise the breaking conditions to only stop at the tail? */
-					glVertex3fv(parchan->pose_head);
-
-				glEnd();
-				setlinestyle(0);
-				break;
-			}
-		}
-	}
-}
-
-static void bgl_sphere_project(float ax, float az)
-{
-	float dir[3], sine, q3;
-
-	sine = 1.0f - ax * ax - az * az;
-	q3 = (sine < 0.0f) ? 0.0f : (2.0f * sqrtf(sine));
-
-	dir[0] = -az * q3;
-	dir[1] = 1.0f - 2.0f * sine;
-	dir[2] = ax * q3;
-
-	glVertex3fv(dir);
-}
-
-static void draw_dof_ellipse(float ax, float az)
-{
-	const float staticSine[16] = {
-		0.0f, 0.104528463268f, 0.207911690818f, 0.309016994375f,
-		0.406736643076f, 0.5f, 0.587785252292f, 0.669130606359f,
-		0.743144825477f, 0.809016994375f, 0.866025403784f,
-		0.913545457643f, 0.951056516295f, 0.978147600734f,
-		0.994521895368f, 1.0f
-	};
-
-	int i, j, n = 16;
-	float x, z, px, pz;
-
-	glEnable(GL_BLEND);
-	glDepthMask(0);
-
-	glColor4ub(70, 70, 70, 50);
-
-	glBegin(GL_QUADS);
-	pz = 0.0f;
-	for (i = 1; i < n; i++) {
-		z = staticSine[i];
-
-		px = 0.0f;
-		for (j = 1; j <= (n - i); j++) {
-			x = staticSine[j];
-
-			if (j == n - i) {
-				glEnd();
-				glBegin(GL_TRIANGLES);
-				bgl_sphere_project(ax * px, az * z);
-				bgl_sphere_project(ax * px, az * pz);
-				bgl_sphere_project(ax * x, az * pz);
-				glEnd();
-				glBegin(GL_QUADS);
-			}
-			else {
-				bgl_sphere_project(ax * x, az * z);
-				bgl_sphere_project(ax * x, az * pz);
-				bgl_sphere_project(ax * px, az * pz);
-				bgl_sphere_project(ax * px, az * z);
-			}
-
-			px = x;
-		}
-		pz = z;
-	}
-	glEnd();
-
-	glDisable(GL_BLEND);
-	glDepthMask(1);
-
-	glColor3ub(0, 0, 0);
-
-	glBegin(GL_LINE_STRIP);
-	for (i = 0; i < n; i++)
-		bgl_sphere_project(staticSine[n - i - 1] * ax, staticSine[i] * az);
-	glEnd();
-}
-
-static void draw_pose_dofs(Object *ob)
-{
-	bArmature *arm = ob->data;
-	bPoseChannel *pchan;
-	Bone *bone;
-
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		bone = pchan->bone;
-
-		if ((bone != NULL) && !(bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) {
-			if (bone->flag & BONE_SELECTED) {
-				if (bone->layer & arm->layer) {
-					if (pchan->ikflag & (BONE_IK_XLIMIT | BONE_IK_ZLIMIT)) {
-						if (BKE_pose_channel_in_IK_chain(ob, pchan)) {
-							float corner[4][3], posetrans[3], mat[4][4];
-							float phi = 0.0f, theta = 0.0f, scale;
-							int a, i;
-
-							/* in parent-bone pose, but own restspace */
-							glPushMatrix();
-
-							copy_v3_v3(posetrans, pchan->pose_mat[3]);
-							glTranslate3fv(posetrans);
-
-							if (pchan->parent) {
-								copy_m4_m4(mat, pchan->parent->pose_mat);
-								mat[3][0] = mat[3][1] = mat[3][2] = 0.0f;
-								glMultMatrixf(mat);
-							}
-
-							copy_m4_m3(mat, pchan->bone->bone_mat);
-							glMultMatrixf(mat);
-
-							scale = bone->length * pchan->size[1];
-							glScalef(scale, scale, scale);
-
-							if (pchan->ikflag & BONE_IK_XLIMIT) {
-								if (pchan->ikflag & BONE_IK_ZLIMIT) {
-									float amin[3], amax[3];
-
-									for (i = 0; i < 3; i++) {
-										/* *0.5f here comes from M_PI/360.0f when rotations were still in degrees */
-										amin[i] = sinf(pchan->limitmin[i] * 0.5f);
-										amax[i] = sinf(pchan->limitmax[i] * 0.5f);
-									}
-
-									glScalef(1.0f, -1.0f, 1.0f);
-									if ((amin[0] != 0.0f) && (amin[2] != 0.0f))
-										draw_dof_ellipse(amin[0], amin[2]);
-									if ((amin[0] != 0.0f) && (amax[2] != 0.0f))
-										draw_dof_ellipse(amin[0], amax[2]);
-									if ((amax[0] != 0.0f) && (amin[2] != 0.0f))
-										draw_dof_ellipse(amax[0], amin[2]);
-									if ((amax[0] != 0.0f) && (amax[2] != 0.0f))
-										draw_dof_ellipse(amax[0], amax[2]);
-									glScalef(1.0f, -1.0f, 1.0f);
-								}
-							}
-
-							/* arcs */
-							if (pchan->ikflag & BONE_IK_ZLIMIT) {
-								/* OpenGL requires rotations in degrees; so we're taking the average angle here */
-								theta = RAD2DEGF(0.5f * (pchan->limitmin[2] + pchan->limitmax[2]));
-								glRotatef(theta, 0.0f, 0.0f, 1.0f);
-
-								glColor3ub(50, 50, 255);  /* blue, Z axis limit */
-								glBegin(GL_LINE_STRIP);
-								for (a = -16; a <= 16; a++) {
-									/* *0.5f here comes from M_PI/360.0f when rotations were still in degrees */
-									float fac = ((float)a) / 16.0f * 0.5f;
-
-									phi = fac * (pchan->limitmax[2] - pchan->limitmin[2]);
-
-									i = (a == -16) ? 0 : 1;
-									corner[i][0] = sinf(phi);
-									corner[i][1] = cosf(phi);
-									corner[i][2] = 0.0f;
-									glVertex3fv(corner[i]);
-								}
-								glEnd();
-
-								glRotatef(-theta, 0.0f, 0.0f, 1.0f);
-							}
-
-							if (pchan->ikflag & BONE_IK_XLIMIT) {
-								/* OpenGL requires rotations in degrees; so we're taking the average angle here */
-								theta = RAD2DEGF(0.5f * (pchan->limitmin[0] + pchan->limitmax[0]));
-								glRotatef(theta, 1.0f, 0.0f, 0.0f);
-
-								glColor3ub(255, 50, 50);  /* Red, X axis limit */
-								glBegin(GL_LINE_STRIP);
-								for (a = -16; a <= 16; a++) {
-									/* *0.5f here comes from M_PI/360.0f when rotations were still in degrees */
-									float fac = ((float)a) / 16.0f * 0.5f;
-									phi = (float)M_PI_2 + fac * (pchan->limitmax[0] - pchan->limitmin[0]);
-
-									i = (a == -16) ? 2 : 3;
-									corner[i][0] = 0.0f;
-									corner[i][1] = sinf(phi);
-									corner[i][2] = cosf(phi);
-									glVertex3fv(corner[i]);
-								}
-								glEnd();
-
-								glRotatef(-theta, 1.0f, 0.0f, 0.0f);
-							}
-
-							/* out of cone, out of bone */
-							glPopMatrix();
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-static void bone_matrix_translate_y(float mat[4][4], float y)
-{
-	float trans[3];
-
-	copy_v3_v3(trans, mat[1]);
-	mul_v3_fl(trans, y);
-	add_v3_v3(mat[3], trans);
-}
-
-/* assumes object is Armature with pose */
-static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
-                            const short dt, const unsigned char ob_wire_col[4],
-                            const bool do_const_color, const bool is_outline)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	Object *ob = base->object;
-	bArmature *arm = ob->data;
-	bPoseChannel *pchan;
-	Bone *bone;
-	float smat[4][4], imat[4][4], bmat[4][4];
-	int index = -1;
-	const enum {
-		DASH_RELATIONSHIP_LINES = 1,
-		DASH_HELP_LINES = 2,
-	} do_dashed = (
-	        (is_outline ? 0 : DASH_RELATIONSHIP_LINES) |
-	        ((v3d->flag & V3D_HIDE_HELPLINES) ? 0 : DASH_HELP_LINES));
-	bool draw_wire = false;
-	int flag;
-	bool is_cull_enabled;
-
-	/* being set below */
-	arm->layer_used = 0;
-
-	/* precalc inverse matrix for drawing screen aligned */
-	if (arm->drawtype == ARM_ENVELOPE) {
-		/* precalc inverse matrix for drawing screen aligned */
-		copy_m4_m4(smat, rv3d->viewmatob);
-		mul_mat3_m4_fl(smat, 1.0f / len_v3(ob->obmat[0]));
-		invert_m4_m4(imat, smat);
-
-		/* and draw blended distances */
-		if (arm->flag & ARM_POSEMODE) {
-			glEnable(GL_BLEND);
-
-			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-				bone = pchan->bone;
-				if (bone) {
-					/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194]
-					 * NOTE: this is the only case with (NO_DEFORM == 0) flag, as this is for envelope influence drawing
-					 */
-					if (((bone->flag & (BONE_HIDDEN_P | BONE_NO_DEFORM | BONE_HIDDEN_PG)) == 0) &&
-					    ((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0))
-					{
-						if (bone->flag & (BONE_SELECTED)) {
-							if (bone->layer & arm->layer)
-								draw_sphere_bone_dist(smat, imat, pchan, NULL);
-						}
-					}
-				}
-			}
-
-			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-			glDisable(GL_BLEND);
-		}
-	}
-
-	/* little speedup, also make sure transparent only draws once */
-	glCullFace(GL_BACK);
-	if (v3d->flag2 & V3D_BACKFACE_CULLING) {
-		glEnable(GL_CULL_FACE);
-		is_cull_enabled = true;
-	}
-	else {
-		is_cull_enabled = false;
-	}
-
-	/* if solid we draw that first, with selection codes, but without names, axes etc */
-	if (dt > OB_WIRE) {
-		if (arm->flag & ARM_POSEMODE)
-			index = base->selcol;
-
-		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-			bone = pchan->bone;
-			arm->layer_used |= bone->layer;
-
-			/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194] */
-			if (((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0) &&
-			    ((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0))
-			{
-				if (bone->layer & arm->layer) {
-					const bool use_custom = (pchan->custom) && !(arm->flag & ARM_NO_CUSTOM);
-					glPushMatrix();
-
-					if (use_custom && pchan->custom_tx) {
-						glMultMatrixf(pchan->custom_tx->pose_mat);
-					}
-					else {
-						glMultMatrixf(pchan->pose_mat);
-					}
-
-					/* catch exception for bone with hidden parent */
-					flag = bone->flag;
-					if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) {
-						flag &= ~BONE_CONNECTED;
-					}
-
-					/* set temporary flag for drawing bone as active, but only if selected */
-					if (bone == arm->act_bone)
-						flag |= BONE_DRAW_ACTIVE;
-
-					if (do_const_color) {
-						/* keep color */
-					}
-					else {
-						/* set color-set to use */
-						set_pchan_colorset(ob, pchan);
-					}
-
-					/* may be 2x width from custom bone's outline option */
-					glLineWidth(1.0f);
-
-					if (use_custom) {
-						/* if drawwire, don't try to draw in solid */
-						if (pchan->bone->flag & BONE_DRAWWIRE) {
-							draw_wire = true;
-						}
-						else {
-							if (is_cull_enabled && (v3d->flag2 & V3D_BACKFACE_CULLING) == 0) {
-								is_cull_enabled = false;
-								glDisable(GL_CULL_FACE);
-							}
-
-							draw_custom_bone(scene, v3d, rv3d, pchan->custom,
-							                 OB_SOLID, arm->flag, flag, index, PCHAN_CUSTOM_DRAW_SIZE(pchan));
-						}
-					}
-					else {
-						if (is_cull_enabled == false) {
-							is_cull_enabled = true;
-							glEnable(GL_CULL_FACE);
-						}
-
-						if (arm->drawtype == ARM_LINE) {
-							/* nothing in solid */
-						}
-						else if (arm->drawtype == ARM_WIRE) {
-							/* nothing in solid */
-						}
-						else if (arm->drawtype == ARM_ENVELOPE) {
-							draw_sphere_bone(OB_SOLID, arm->flag, flag, 0, index, pchan, NULL);
-						}
-						else if (arm->drawtype == ARM_B_BONE) {
-							draw_b_bone(OB_SOLID, arm->flag, flag, 0, index, pchan, NULL);
-						}
-						else {
-							draw_bone(OB_SOLID, arm->flag, flag, 0, index, bone->length);
-						}
-					}
-
-					glPopMatrix();
-				}
-			}
-
-			if (index != -1)
-				index += 0x10000;  /* pose bones count in higher 2 bytes only */
-		}
-
-		/* very very confusing... but in object mode, solid draw, we cannot do GPU_select_load_id yet,
-		 * stick bones and/or wire custom-shapes are drawn in next loop
-		 */
-		if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE) == 0 && (draw_wire == false) && index != -1) {
-			/* object tag, for bordersel optim */
-			GPU_select_load_id(index & 0xFFFF);
-			index = -1;
-		}
-	}
-
-	/* custom bone may draw outline double-width */
-	if (arm->flag & ARM_POSEMODE) {
-		glLineWidth(1.0f);
-	}
-
-	/* draw custom bone shapes as wireframes */
-	if (!(arm->flag & ARM_NO_CUSTOM) &&
-	    (draw_wire || (dt <= OB_WIRE)) )
-	{
-		if (arm->flag & ARM_POSEMODE)
-			index = base->selcol;
-
-		/* only draw custom bone shapes that need to be drawn as wires */
-		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-			bone = pchan->bone;
-
-			/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194] */
-			if (((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0) &&
-			    ((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0) )
-			{
-				if (bone->layer & arm->layer) {
-					if (pchan->custom) {
-						if ((dt < OB_SOLID) || (bone->flag & BONE_DRAWWIRE)) {
-							glPushMatrix();
-
-							if (pchan->custom_tx) {
-								glMultMatrixf(pchan->custom_tx->pose_mat);
-							}
-							else {
-								glMultMatrixf(pchan->pose_mat);
-							}
-
-							/* prepare colors */
-							if (do_const_color) {
-								/* 13 October 2009, Disabled this to make ghosting show the right colors (Aligorith) */
-							}
-							else if (arm->flag & ARM_POSEMODE)
-								set_pchan_colorset(ob, pchan);
-							else {
-								glColor3ubv(ob_wire_col);
-							}
-
-							/* catch exception for bone with hidden parent */
-							flag = bone->flag;
-							if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)))
-								flag &= ~BONE_CONNECTED;
-
-							/* set temporary flag for drawing bone as active, but only if selected */
-							if (bone == arm->act_bone)
-								flag |= BONE_DRAW_ACTIVE;
-
-							draw_custom_bone(scene, v3d, rv3d, pchan->custom,
-							                 OB_WIRE, arm->flag, flag, index, PCHAN_CUSTOM_DRAW_SIZE(pchan));
-
-							glPopMatrix();
-						}
-					}
-				}
-			}
-
-			if (index != -1)
-				index += 0x10000;  /* pose bones count in higher 2 bytes only */
-		}
-		/* stick or wire bones have not been drawn yet so don't clear object selection in this case */
-		if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE) == 0 && draw_wire && index != -1) {
-			/* object tag, for bordersel optim */
-			GPU_select_load_id(index & 0xFFFF);
-			index = -1;
-		}
-	}
-
-	/* wire draw over solid only in posemode */
-	if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
-		/* draw line check first. we do selection indices */
-		if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
-			if (arm->flag & ARM_POSEMODE)
-				index = base->selcol;
-		}
-		/* if solid && posemode, we draw again with polygonoffset */
-		else if ((dt > OB_WIRE) && (arm->flag & ARM_POSEMODE)) {
-			ED_view3d_polygon_offset(rv3d, 1.0);
-		}
-		else {
-			/* and we use selection indices if not done yet */
-			if (arm->flag & ARM_POSEMODE)
-				index = base->selcol;
-		}
-
-		if (is_cull_enabled == false) {
-			is_cull_enabled = true;
-			glEnable(GL_CULL_FACE);
-		}
-
-		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-			bone = pchan->bone;
-			arm->layer_used |= bone->layer;
-
-			/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194] */
-			if (((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0) &&
-			    ((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0))
-			{
-				if (bone->layer & arm->layer) {
-					const short constflag = pchan->constflag;
-					if ((do_dashed & DASH_RELATIONSHIP_LINES) && (pchan->parent)) {
-						/* Draw a line from our root to the parent's tip
-						 * - only if V3D_HIDE_HELPLINES is enabled...
-						 */
-						if ((do_dashed & DASH_HELP_LINES) && ((bone->flag & BONE_CONNECTED) == 0)) {
-							if (arm->flag & ARM_POSEMODE) {
-								GPU_select_load_id(index & 0xFFFF);  /* object tag, for bordersel optim */
-								UI_ThemeColor(TH_WIRE);
-							}
-							setlinestyle(3);
-							glBegin(GL_LINES);
-							glVertex3fv(pchan->pose_head);
-							glVertex3fv(pchan->parent->pose_tail);
-							glEnd();
-							setlinestyle(0);
-						}
-
-						/* Draw a line to IK root bone
-						 *  - only if temporary chain (i.e. "autoik")
-						 */
-						if (arm->flag & ARM_POSEMODE) {
-							if (constflag & PCHAN_HAS_IK) {
-								if (bone->flag & BONE_SELECTED) {
-									if (constflag & PCHAN_HAS_TARGET) glColor3ub(200, 120, 0);
-									else glColor3ub(200, 200, 50);  /* add theme! */
-
-									GPU_select_load_id(index & 0xFFFF);
-									pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));
-								}
-							}
-							else if (constflag & PCHAN_HAS_SPLINEIK) {
-								if (bone->flag & BONE_SELECTED) {
-									glColor3ub(150, 200, 50);  /* add theme! */
-
-									GPU_select_load_id(index & 0xFFFF);
-									pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));
-								}
-							}
-						}
-					}
-
-					glPushMatrix();
-					if (arm->drawtype != ARM_ENVELOPE)
-						glMultMatrixf(pchan->pose_mat);
-
-					/* catch exception for bone with hidden parent */
-					flag = bone->flag;
-					if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)))
-						flag &= ~BONE_CONNECTED;
-
-					/* set temporary flag for drawing bone as active, but only if selected */
-					if (bone == arm->act_bone)
-						flag |= BONE_DRAW_ACTIVE;
-
-					/* extra draw service for pose mode */
-
-					/* set color-set to use */
-					if (do_const_color) {
-						/* keep color */
-					}
-					else {
-						set_pchan_colorset(ob, pchan);
-					}
-
-					if ((pchan->custom) && !(arm->flag & ARM_NO_CUSTOM)) {
-						/* custom bone shapes should not be drawn here! */
-					}
-					else if (arm->drawtype == ARM_ENVELOPE) {
-						if (dt < OB_SOLID)
-							draw_sphere_bone_wire(smat, imat, arm->flag, flag, constflag, index, pchan, NULL);
-					}
-					else if (arm->drawtype == ARM_LINE)
-						draw_line_bone(arm->flag, flag, constflag, index, pchan, NULL);
-					else if (arm->drawtype == ARM_WIRE)
-						draw_wire_bone(dt, arm->flag, flag, constflag, index, pchan, NULL);
-					else if (arm->drawtype == ARM_B_BONE)
-						draw_b_bone(OB_WIRE, arm->flag, flag, constflag, index, pchan, NULL);
-					else
-						draw_bone(OB_WIRE, arm->flag, flag, constflag, index, bone->length);
-
-					glPopMatrix();
-				}
-			}
-
-			/* pose bones count in higher 2 bytes only */
-			if (index != -1)
-				index += 0x10000;
-		}
-		/* restore things */
-		if (!ELEM(arm->drawtype, ARM_WIRE, ARM_LINE) && (dt > OB_WIRE) && (arm->flag & ARM_POSEMODE))
-			ED_view3d_polygon_offset(rv3d, 0.0);
-	}
-
-	/* restore */
-	if (is_cull_enabled) {
-		glDisable(GL_CULL_FACE);
-	}
-
-	/* draw DoFs */
-	if (arm->flag & ARM_POSEMODE) {
-		if (((base->flag & OB_FROMDUPLI) == 0) && ((v3d->flag & V3D_HIDE_HELPLINES) == 0)) {
-			draw_pose_dofs(ob);
-		}
-	}
-
-	/* finally names and axes */
-	if ((arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) &&
-	    (is_outline == 0) &&
-	    ((base->flag & OB_FROMDUPLI) == 0))
-	{
-		/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
-		if ((G.f & G_PICKSEL) == 0) {
-			float vec[3];
-
-			unsigned char col[4];
-			if (do_const_color) {
-				/* so we can draw bone names in current const color */
-				float tcol[4];
-				glGetFloatv(GL_CURRENT_COLOR, tcol);
-				rgb_float_to_uchar(col, tcol);
-				col[3] = 255;
-			}
-			else {
-				col[0] = ob_wire_col[0];
-				col[1] = ob_wire_col[1];
-				col[2] = ob_wire_col[2];
-				col[3] = 255;
-			}
-
-			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-				if ((pchan->bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0) {
-					if (pchan->bone->layer & arm->layer) {
-						if (arm->flag & (ARM_EDITMODE | ARM_POSEMODE)) {
-							bone = pchan->bone;
-							UI_GetThemeColor3ubv((bone->flag & BONE_SELECTED) ? TH_TEXT_HI : TH_TEXT, col);
-						}
-						else if (dt > OB_WIRE) {
-							UI_GetThemeColor3ubv(TH_TEXT, col);
-						}
-
-						/*  Draw names of bone  */
-						if (arm->flag & ARM_DRAWNAMES) {
-							mid_v3_v3v3(vec, pchan->pose_head, pchan->pose_tail);
-							view3d_cached_text_draw_add(vec, pchan->name, strlen(pchan->name), 10, 0, col);
-						}
-
-						/*	Draw additional axes on the bone tail  */
-						if ((arm->flag & ARM_DRAWAXES) && (arm->flag & ARM_POSEMODE)) {
-							glPushMatrix();
-							copy_m4_m4(bmat, pchan->pose_mat);
-							bone_matrix_translate_y(bmat, pchan->bone->length);
-							glMultMatrixf(bmat);
-
-							glColor3ubv(col);
-
-							float viewmat_pchan[4][4];
-							mul_m4_m4m4(viewmat_pchan, rv3d->viewmatob, bmat);
-							drawaxes(viewmat_pchan, pchan->bone->length * 0.25f, OB_ARROWS);
-
-							glPopMatrix();
-						}
-					}
-				}
-			}
-
-			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-		}
-	}
-
-	if (index != -1) {
-		GPU_select_load_id(-1);
-	}
-}
-
-/* in editmode, we don't store the bone matrix... */
-static void get_matrix_editbone(EditBone *ebone, float bmat[4][4])
-{
-	ebone->length = len_v3v3(ebone->tail, ebone->head);
-	ED_armature_ebone_to_mat4(ebone, bmat);
-}
-
-static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, const short dt)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	EditBone *eBone;
-	bArmature *arm = ob->data;
-	float smat[4][4], imat[4][4], bmat[4][4];
-	unsigned int index;
-	int flag;
-
-	/* being set in code below */
-	arm->layer_used = 0;
-
-	ED_view3d_check_mats_rv3d(rv3d);
-
-	/* envelope (deform distance) */
-	if (arm->drawtype == ARM_ENVELOPE) {
-		/* precalc inverse matrix for drawing screen aligned */
-		copy_m4_m4(smat, rv3d->viewmatob);
-		mul_mat3_m4_fl(smat, 1.0f / len_v3(ob->obmat[0]));
-		invert_m4_m4(imat, smat);
-
-		/* and draw blended distances */
-		glEnable(GL_BLEND);
-
-		if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-		for (eBone = arm->edbo->first; eBone; eBone = eBone->next) {
-			if (eBone->layer & arm->layer) {
-				if ((eBone->flag & (BONE_HIDDEN_A | BONE_NO_DEFORM)) == 0) {
-					if (eBone->flag & (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL))
-						draw_sphere_bone_dist(smat, imat, NULL, eBone);
-				}
-			}
-		}
-
-		if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-		glDisable(GL_BLEND);
-	}
-
-	/* if solid we draw it first */
-	if ((dt > OB_WIRE) && (arm->drawtype != ARM_LINE)) {
-		for (eBone = arm->edbo->first, index = 0; eBone; eBone = eBone->next, index++) {
-			if (eBone->layer & arm->layer) {
-				if ((eBone->flag & BONE_HIDDEN_A) == 0) {
-					glPushMatrix();
-					get_matrix_editbone(eBone, bmat);
-					glMultMatrixf(bmat);
-
-					/* catch exception for bone with hidden parent */
-					flag = eBone->flag;
-					if ((eBone->parent) && !EBONE_VISIBLE(arm, eBone->parent)) {
-						flag &= ~BONE_CONNECTED;
-					}
-
-					/* set temporary flag for drawing bone as active, but only if selected */
-					if (eBone == arm->act_edbone)
-						flag |= BONE_DRAW_ACTIVE;
-
-					if (arm->drawtype == ARM_ENVELOPE)
-						draw_sphere_bone(OB_SOLID, arm->flag, flag, 0, index, NULL, eBone);
-					else if (arm->drawtype == ARM_B_BONE)
-						draw_b_bone(OB_SOLID, arm->flag, flag, 0, index, NULL, eBone);
-					else if (arm->drawtype == ARM_WIRE)
-						draw_wire_bone(OB_SOLID, arm->flag, flag, 0, index, NULL, eBone);
-					else {
-						draw_bone(OB_SOLID, arm->flag, flag, 0, index, eBone->length);
-					}
-
-					glPopMatrix();
-				}
-			}
-		}
-	}
-
-	/* if wire over solid, set offset */
-	index = -1;
-	GPU_select_load_id(-1);
-	if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
-		if (G.f & G_PICKSEL)
-			index = 0;
-	}
-	else if (dt > OB_WIRE)
-		ED_view3d_polygon_offset(rv3d, 1.0);
-	else if (arm->flag & ARM_EDITMODE)
-		index = 0;  /* do selection codes */
-
-	for (eBone = arm->edbo->first; eBone; eBone = eBone->next) {
-		arm->layer_used |= eBone->layer;
-		if (eBone->layer & arm->layer) {
-			if ((eBone->flag & BONE_HIDDEN_A) == 0) {
-
-				/* catch exception for bone with hidden parent */
-				flag = eBone->flag;
-				if ((eBone->parent) && !EBONE_VISIBLE(arm, eBone->parent)) {
-					flag &= ~BONE_CONNECTED;
-				}
-
-				/* set temporary flag for drawing bone as active, but only if selected */
-				if (eBone == arm->act_edbone)
-					flag |= BONE_DRAW_ACTIVE;
-
-				if (arm->drawtype == ARM_ENVELOPE) {
-					if (dt < OB_SOLID)
-						draw_sphere_bone_wire(smat, imat, arm->flag, flag, 0, index, NULL, eBone);
-				}
-				else {
-					glPushMatrix();
-					get_matrix_editbone(eBone, bmat);
-					glMultMatrixf(bmat);
-
-					if (arm->drawtype == ARM_LINE)
-						draw_line_bone(arm->flag, flag, 0, index, NULL, eBone);
-					else if (arm->drawtype == ARM_WIRE)
-						draw_wire_bone(OB_WIRE, arm->flag, flag, 0, index, NULL, eBone);
-					else if (arm->drawtype == ARM_B_BONE)
-						draw_b_bone(OB_WIRE, arm->flag, flag, 0, index, NULL, eBone);
-					else
-						draw_bone(OB_WIRE, arm->flag, flag, 0, index, eBone->length);
-
-					glPopMatrix();
-				}
-
-				/* offset to parent */
-				if (eBone->parent) {
-					UI_ThemeColor(TH_WIRE_EDIT);
-					GPU_select_load_id(-1);  /* -1 here is OK! */
-					setlinestyle(3);
-
-					glBegin(GL_LINES);
-					glVertex3fv(eBone->parent->tail);
-					glVertex3fv(eBone->head);
-					glEnd();
-
-					setlinestyle(0);
-				}
-			}
-		}
-		if (index != -1) index++;
-	}
-
-	/* restore */
-	if (index != -1) {
-		GPU_select_load_id(-1);
-	}
-
-	if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
-		/* pass */
-	}
-	else if (dt > OB_WIRE) {
-		ED_view3d_polygon_offset(rv3d, 0.0);
-	}
-
-	/* finally names and axes */
-	if (arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) {
-		/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
-		if ((G.f & G_PICKSEL) == 0) {
-			float vec[3];
-			unsigned char col[4];
-			col[3] = 255;
-
-			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-			for (eBone = arm->edbo->first; eBone; eBone = eBone->next) {
-				if (eBone->layer & arm->layer) {
-					if ((eBone->flag & BONE_HIDDEN_A) == 0) {
-
-						UI_GetThemeColor3ubv((eBone->flag & BONE_SELECTED) ? TH_TEXT_HI : TH_TEXT, col);
-
-						/*	Draw name */
-						if (arm->flag & ARM_DRAWNAMES) {
-							mid_v3_v3v3(vec, eBone->head, eBone->tail);
-							view3d_cached_text_draw_add(vec, eBone->name, strlen(eBone->name), 10, 0, col);
-						}
-						/*	Draw additional axes */
-						if (arm->flag & ARM_DRAWAXES) {
-							glPushMatrix();
-							get_matrix_editbone(eBone, bmat);
-							bone_matrix_translate_y(bmat, eBone->length);
-							glMultMatrixf(bmat);
-
-							glColor3ubv(col);
-
-							float viewmat_ebone[4][4];
-							mul_m4_m4m4(viewmat_ebone, rv3d->viewmatob, bmat);
-							drawaxes(viewmat_ebone, eBone->length * 0.25f, OB_ARROWS);
-
-							glPopMatrix();
-						}
-
-					}
-				}
-			}
-
-			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-		}
-	}
-}
-
-/* ****************************** Armature Visualization ******************************** */
-
-/* ---------- Paths --------- */
-
-/* draw bone paths
- *	- in view space
- */
-static void draw_pose_paths(Scene *scene, View3D *v3d, ARegion *ar, Object *ob)
-{
-	bAnimVizSettings *avs = &ob->pose->avs;
-	bArmature *arm = ob->data;
-	bPoseChannel *pchan;
-
-	/* setup drawing environment for paths */
-	draw_motion_paths_init(v3d, ar);
-
-	/* draw paths where they exist and they releated bone is visible */
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		if ((pchan->bone->layer & arm->layer) && (pchan->mpath))
-			draw_motion_path_instance(scene, ob, pchan, avs, pchan->mpath);
-	}
-
-	/* cleanup after drawing */
-	draw_motion_paths_cleanup(v3d);
-}
-
-
-/* ---------- Ghosts --------- */
-
-/* helper function for ghost drawing - sets/removes flags for temporarily
- * hiding unselected bones while drawing ghosts
- */
-static void ghost_poses_tag_unselected(Object *ob, short unset)
-{
-	bArmature *arm = ob->data;
-	bPose *pose = ob->pose;
-	bPoseChannel *pchan;
-
-	/* don't do anything if no hiding any bones */
-	if ((arm->flag & ARM_GHOST_ONLYSEL) == 0)
-		return;
-
-	/* loop over all pchans, adding/removing tags as appropriate */
-	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-		if ((pchan->bone) && (arm->layer & pchan->bone->layer)) {
-			if (unset) {
-				/* remove tags from all pchans if cleaning up */
-				pchan->bone->flag &= ~BONE_HIDDEN_PG;
-			}
-			else {
-				/* set tags on unselected pchans only */
-				if ((pchan->bone->flag & BONE_SELECTED) == 0)
-					pchan->bone->flag |= BONE_HIDDEN_PG;
-			}
-		}
-	}
-}
-
-/* draw ghosts that occur within a frame range
- *  note: object should be in posemode
- */
-static void draw_ghost_poses_range(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
-{
-	Object *ob = base->object;
-	AnimData *adt = BKE_animdata_from_id(&ob->id);
-	bArmature *arm = ob->data;
-	bPose *posen, *poseo;
-	float start, end, stepsize, range, colfac;
-	int cfrao, flago;
-
-	start = (float)arm->ghostsf;
-	end = (float)arm->ghostef;
-	if (end <= start)
-		return;
-
-	/* prevent infinite loops if this is set to 0 - T49527 */
-	if (arm->ghostsize < 1)
-		arm->ghostsize = 1;
-
-	stepsize = (float)(arm->ghostsize);
-	range = (float)(end - start);
-
-	/* store values */
-	ob->mode &= ~OB_MODE_POSE;
-	cfrao = CFRA;
-	flago = arm->flag;
-	arm->flag &= ~(ARM_DRAWNAMES | ARM_DRAWAXES);
-
-	/* copy the pose */
-	poseo = ob->pose;
-	BKE_pose_copy_data(&posen, ob->pose, 1);
-	ob->pose = posen;
-	BKE_pose_rebuild(ob, ob->data);    /* child pointers for IK */
-	ghost_poses_tag_unselected(ob, 0);      /* hide unselected bones if need be */
-
-	glEnable(GL_BLEND);
-	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-	/* draw from first frame of range to last */
-	for (CFRA = (int)start; CFRA <= end; CFRA += (int)stepsize) {
-		colfac = (end - (float)CFRA) / range;
-		UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac)));
-
-		BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
-		BKE_pose_where_is(scene, ob);
-		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, true, false);
-	}
-	glDisable(GL_BLEND);
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-	/* before disposing of temp pose, use it to restore object to a sane state */
-	BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)cfrao, ADT_RECALC_ALL);
-
-	/* clean up temporary pose */
-	ghost_poses_tag_unselected(ob, 1);      /* unhide unselected bones if need be */
-	BKE_pose_free(posen);
-
-	/* restore */
-	CFRA = cfrao;
-	ob->pose = poseo;
-	arm->flag = flago;
-	ob->mode |= OB_MODE_POSE;
-}
-
-/* draw ghosts on keyframes in action within range
- *	- object should be in posemode
- */
-static void draw_ghost_poses_keys(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
-{
-	Object *ob = base->object;
-	AnimData *adt = BKE_animdata_from_id(&ob->id);
-	bAction *act = (adt) ? adt->action : NULL;
-	bArmature *arm = ob->data;
-	bPose *posen, *poseo;
-	DLRBT_Tree keys;
-	ActKeyColumn *ak, *akn;
-	float start, end, range, colfac, i;
-	int cfrao, flago;
-
-	start = (float)arm->ghostsf;
-	end = (float)arm->ghostef;
-	if (end <= start)
-		return;
-
-	/* get keyframes - then clip to only within range */
-	BLI_dlrbTree_init(&keys);
-	action_to_keylist(adt, act, &keys, NULL);
-	BLI_dlrbTree_linkedlist_sync(&keys);
-
-	range = 0;
-	for (ak = keys.first; ak; ak = akn) {
-		akn = ak->next;
-
-		if ((ak->cfra < start) || (ak->cfra > end))
-			BLI_freelinkN((ListBase *)&keys, ak);
-		else
-			range++;
-	}
-	if (range == 0) return;
-
-	/* store values */
-	ob->mode &= ~OB_MODE_POSE;
-	cfrao = CFRA;
-	flago = arm->flag;
-	arm->flag &= ~(ARM_DRAWNAMES | ARM_DRAWAXES);
-
-	/* copy the pose */
-	poseo = ob->pose;
-	BKE_pose_copy_data(&posen, ob->pose, 1);
-	ob->pose = posen;
-	BKE_pose_rebuild(ob, ob->data);  /* child pointers for IK */
-	ghost_poses_tag_unselected(ob, 0);    /* hide unselected bones if need be */
-
-	glEnable(GL_BLEND);
-	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-	/* draw from first frame of range to last */
-	for (ak = keys.first, i = 0; ak; ak = ak->next, i++) {
-		colfac = i / range;
-		UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac)));
-
-		CFRA = (int)ak->cfra;
-
-		BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
-		BKE_pose_where_is(scene, ob);
-		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, true, false);
-	}
-	glDisable(GL_BLEND);
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-	/* before disposing of temp pose, use it to restore object to a sane state */
-	BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)cfrao, ADT_RECALC_ALL);
-
-	/* clean up temporary pose */
-	ghost_poses_tag_unselected(ob, 1);  /* unhide unselected bones if need be */
-	BLI_dlrbTree_free(&keys);
-	BKE_pose_free(posen);
-
-	/* restore */
-	CFRA = cfrao;
-	ob->pose = poseo;
-	arm->flag = flago;
-	ob->mode |= OB_MODE_POSE;
-}
-
-/* draw ghosts around current frame
- *  - object is supposed to be armature in posemode
- */
-static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
-{
-	Object *ob = base->object;
-	AnimData *adt = BKE_animdata_from_id(&ob->id);
-	bArmature *arm = ob->data;
-	bPose *posen, *poseo;
-	float cur, start, end, stepsize, range, colfac, actframe, ctime;
-	int cfrao, flago;
-
-	/* pre conditions, get an action with sufficient frames */
-	if (ELEM(NULL, adt, adt->action))
-		return;
-
-	calc_action_range(adt->action, &start, &end, 0);
-	if (start == end)
-		return;
-
-	/* prevent infinite loops if this is set to 0 - T49527 */
-	if (arm->ghostsize < 1)
-		arm->ghostsize = 1;
-
-	stepsize = (float)(arm->ghostsize);
-	range = (float)(arm->ghostep) * stepsize + 0.5f;   /* plus half to make the for loop end correct */
-
-	/* store values */
-	ob->mode &= ~OB_MODE_POSE;
-	cfrao = CFRA;
-	actframe = BKE_nla_tweakedit_remap(adt, (float)CFRA, 0);
-	flago = arm->flag;
-	arm->flag &= ~(ARM_DRAWNAMES | ARM_DRAWAXES);
-
-	/* copy the pose */
-	poseo = ob->pose;
-	BKE_pose_copy_data(&posen, ob->pose, 1);
-	ob->pose = posen;
-	BKE_pose_rebuild(ob, ob->data);    /* child pointers for IK */
-	ghost_poses_tag_unselected(ob, 0);      /* hide unselected bones if need be */
-
-	glEnable(GL_BLEND);
-	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-	/* draw from darkest blend to lowest */
-	for (cur = stepsize; cur < range; cur += stepsize) {
-		ctime = cur - (float)fmod(cfrao, stepsize);  /* ensures consistent stepping */
-		colfac = ctime / range;
-		UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac)));
-
-		/* only within action range */
-		if (actframe + ctime >= start && actframe + ctime <= end) {
-			CFRA = (int)BKE_nla_tweakedit_remap(adt, actframe + ctime, NLATIME_CONVERT_MAP);
-
-			if (CFRA != cfrao) {
-				BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
-				BKE_pose_where_is(scene, ob);
-				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, true, false);
-			}
-		}
-
-		ctime = cur + (float)fmod((float)cfrao, stepsize) - stepsize + 1.0f;   /* ensures consistent stepping */
-		colfac = ctime / range;
-		UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128 - (int)(120.0f * sqrtf(colfac)));
-
-		/* only within action range */
-		if ((actframe - ctime >= start) && (actframe - ctime <= end)) {
-			CFRA = (int)BKE_nla_tweakedit_remap(adt, actframe - ctime, NLATIME_CONVERT_MAP);
-
-			if (CFRA != cfrao) {
-				BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
-				BKE_pose_where_is(scene, ob);
-				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, true, false);
-			}
-		}
-	}
-	glDisable(GL_BLEND);
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-	/* before disposing of temp pose, use it to restore object to a sane state */
-	BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)cfrao, ADT_RECALC_ALL);
-
-	/* clean up temporary pose */
-	ghost_poses_tag_unselected(ob, 1);      /* unhide unselected bones if need be */
-	BKE_pose_free(posen);
-
-	/* restore */
-	CFRA = cfrao;
-	ob->pose = poseo;
-	arm->flag = flago;
-	ob->mode |= OB_MODE_POSE;
-}
-
-/* ********************************** Armature Drawing - Main ************************* */
-
-/* called from drawobject.c, return true if nothing was drawn
- * (ob_wire_col == NULL) when drawing ghost */
-bool draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
-                   const short dt, const short dflag, const unsigned char ob_wire_col[4],
-                   const bool is_outline)
-{
-	Object *ob = base->object;
-	bArmature *arm = ob->data;
-	bool retval = false;
-
-	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
-		return true;
-
-	/* needed for 'draw_line_bone' which draws pixel. */
-	if (arm->drawtype == ARM_LINE) {
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	}
-
-	if (dt > OB_WIRE) {
-		/* we use color for solid lighting */
-		if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
-			const float diffuse[3] = {0.64f, 0.64f, 0.64f};
-			const float specular[3] = {0.5f, 0.5f, 0.5f};
-			GPU_basic_shader_colors(diffuse, specular, 35, 1.0f);
-		}
-		else {
-			const float diffuse[3] = {1.0f, 1.0f, 1.0f};
-			const float specular[3] = {1.0f, 1.0f, 1.0f};
-			GPU_basic_shader_colors(diffuse, specular, 35, 1.0f);
-			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);  /* only for lighting... */
-		}
-	}
-
-	/* arm->flag is being used to detect mode... */
-	/* editmode? */
-	if (arm->edbo) {
-		arm->flag |= ARM_EDITMODE;
-		draw_ebones(v3d, ar, ob, dt);
-		arm->flag &= ~ARM_EDITMODE;
-	}
-	else {
-		/*	Draw Pose */
-		if (ob->pose && ob->pose->chanbase.first) {
-			/* We can't safely draw non-updated pose, might contain NULL bone pointers... */
-			if (ob->pose->flag & POSE_RECALC) {
-				BKE_pose_rebuild(ob, arm);
-			}
-
-			/* drawing posemode selection indices or colors only in these cases */
-			if (!(base->flag & OB_FROMDUPLI)) {
-				if (G.f & G_PICKSEL) {
-#if 0
-					/* nifty but actually confusing to allow bone selection out of posemode */
-					if (OBACT && (OBACT->mode & OB_MODE_WEIGHT_PAINT)) {
-						if (ob == modifiers_isDeformedByArmature(OBACT))
-							arm->flag |= ARM_POSEMODE;
-					}
-					else
-#endif
-					if (ob->mode & OB_MODE_POSE) {
-						arm->flag |= ARM_POSEMODE;
-					}
-				}
-				else if (ob->mode & OB_MODE_POSE) {
-					if (arm->ghosttype == ARM_GHOST_RANGE) {
-						draw_ghost_poses_range(scene, v3d, ar, base);
-					}
-					else if (arm->ghosttype == ARM_GHOST_KEYS) {
-						draw_ghost_poses_keys(scene, v3d, ar, base);
-					}
-					else if (arm->ghosttype == ARM_GHOST_CUR) {
-						if (arm->ghostep)
-							draw_ghost_poses(scene, v3d, ar, base);
-					}
-					if ((dflag & DRAW_SCENESET) == 0) {
-						if (ob == OBACT)
-							arm->flag |= ARM_POSEMODE;
-						else if (OBACT && (OBACT->mode & OB_MODE_WEIGHT_PAINT)) {
-							if (ob == modifiers_isDeformedByArmature(OBACT))
-								arm->flag |= ARM_POSEMODE;
-						}
-						draw_pose_paths(scene, v3d, ar, ob);
-					}
-				}
-			}
-			draw_pose_bones(scene, v3d, ar, base, dt, ob_wire_col, (dflag & DRAW_CONSTCOLOR), is_outline);
-			arm->flag &= ~ARM_POSEMODE;
-
-			if (ob->mode & OB_MODE_POSE)
-				UI_ThemeColor(TH_WIRE);  /* restore, for extra draw stuff */
-		}
-		else {
-			retval = true;
-		}
-	}
-	/* restore */
-	glFrontFace(GL_CCW);
-
-	if (arm->drawtype == ARM_LINE) {
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-	}
-
-	return retval;
-}
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
deleted file mode 100644
index 27180097107..00000000000
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ /dev/null
@@ -1,1406 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * Contributor(s): Blender Foundation, full update, glsl support
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_view3d/drawmesh.c
- *  \ingroup spview3d
- */
-
-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-#include "BLI_bitmap.h"
-#include "BLI_math.h"
-
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_types.h"
-#include "DNA_property_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-
-#include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
-#include "BKE_image.h"
-#include "BKE_material.h"
-#include "BKE_paint.h"
-#include "BKE_property.h"
-#include "BKE_editmesh.h"
-#include "BKE_scene.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "UI_resources.h"
-
-#include "GPU_draw.h"
-#include "GPU_material.h"
-#include "GPU_basic_shader.h"
-#include "GPU_shader.h"
-
-#include "RE_engine.h"
-
-#include "ED_uvedit.h"
-
-#include "view3d_intern.h"  /* own include */
-
-/* user data structures for derived mesh callbacks */
-typedef struct drawMeshFaceSelect_userData {
-	Mesh *me;
-	BLI_bitmap *edge_flags; /* pairs of edge options (visible, select) */
-} drawMeshFaceSelect_userData;
-
-typedef struct drawEMTFMapped_userData {
-	BMEditMesh *em;
-	bool has_mcol;
-	int cd_poly_tex_offset;
-	const MPoly *mpoly;
-	const MTexPoly *mtexpoly;
-} drawEMTFMapped_userData;
-
-typedef struct drawTFace_userData {
-	const Mesh *me;
-	const MPoly *mpoly;
-	const MTexPoly *mtexpoly;
-} drawTFace_userData;
-
-/**************************** Face Select Mode *******************************/
-
-/* mainly to be less confusing */
-BLI_INLINE int edge_vis_index(const int index) { return index * 2; }
-BLI_INLINE int edge_sel_index(const int index) { return index * 2 + 1; }
-
-static BLI_bitmap *get_tface_mesh_marked_edge_info(Mesh *me, bool draw_select_edges)
-{
-	BLI_bitmap *bitmap_edge_flags = BLI_BITMAP_NEW(me->totedge * 2, __func__);
-	MPoly *mp;
-	MLoop *ml;
-	int i, j;
-	bool select_set;
-
-	for (i = 0; i < me->totpoly; i++) {
-		mp = &me->mpoly[i];
-
-		if (!(mp->flag & ME_HIDE)) {
-			select_set = (mp->flag & ME_FACE_SEL) != 0;
-
-			ml = me->mloop + mp->loopstart;
-			for (j = 0; j < mp->totloop; j++, ml++) {
-				if ((draw_select_edges == false) &&
-				    (select_set && BLI_BITMAP_TEST(bitmap_edge_flags, edge_sel_index(ml->e))))
-				{
-					BLI_BITMAP_DISABLE(bitmap_edge_flags, edge_vis_index(ml->e));
-				}
-				else {
-					BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_vis_index(ml->e));
-					if (select_set) {
-						BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_sel_index(ml->e));
-					}
-				}
-			}
-		}
-	}
-
-	return bitmap_edge_flags;
-}
-
-
-static DMDrawOption draw_mesh_face_select__setHiddenOpts(void *userData, int index)
-{
-	drawMeshFaceSelect_userData *data = userData;
-	Mesh *me = data->me;
-
-	if (me->drawflag & ME_DRAWEDGES) {
-		if ((BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index))))
-			return DM_DRAW_OPTION_NORMAL;
-		else
-			return DM_DRAW_OPTION_SKIP;
-	}
-	else if (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index)) &&
-	         BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index)))
-	{
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static DMDrawOption draw_mesh_face_select__setSelectOpts(void *userData, int index)
-{
-	drawMeshFaceSelect_userData *data = userData;
-	return (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index)) &&
-	        BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index))) ? DM_DRAW_OPTION_NORMAL : DM_DRAW_OPTION_SKIP;
-}
-
-/* draws unselected */
-static DMDrawOption draw_mesh_face_select__drawFaceOptsInv(void *userData, int index)
-{
-	Mesh *me = (Mesh *)userData;
-
-	MPoly *mpoly = &me->mpoly[index];
-	if (!(mpoly->flag & ME_HIDE) && !(mpoly->flag & ME_FACE_SEL))
-		return DM_DRAW_OPTION_NORMAL;
-	else
-		return DM_DRAW_OPTION_SKIP;
-}
-
-void draw_mesh_face_select(RegionView3D *rv3d, Mesh *me, DerivedMesh *dm, bool draw_select_edges)
-{
-	drawMeshFaceSelect_userData data;
-
-	data.me = me;
-	data.edge_flags = get_tface_mesh_marked_edge_info(me, draw_select_edges);
-
-	glEnable(GL_DEPTH_TEST);
-	ED_view3d_polygon_offset(rv3d, 1.0);
-
-	/* Draw (Hidden) Edges */
-	setlinestyle(1);
-	UI_ThemeColor(TH_EDGE_FACESEL);
-	dm->drawMappedEdges(dm, draw_mesh_face_select__setHiddenOpts, &data);
-	setlinestyle(0);
-
-	/* Draw Selected Faces */
-	if (me->drawflag & ME_DRAWFACES) {
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		/* dull unselected faces so as not to get in the way of seeing color */
-		glColor4ub(96, 96, 96, 64);
-		dm->drawMappedFaces(dm, draw_mesh_face_select__drawFaceOptsInv, NULL, NULL, (void *)me, DM_DRAW_SKIP_HIDDEN);
-		glDisable(GL_BLEND);
-	}
-
-	ED_view3d_polygon_offset(rv3d, 1.0);
-
-	/* Draw Stippled Outline for selected faces */
-	glColor3ub(255, 255, 255);
-	setlinestyle(1);
-	dm->drawMappedEdges(dm, draw_mesh_face_select__setSelectOpts, &data);
-	setlinestyle(0);
-
-	ED_view3d_polygon_offset(rv3d, 0.0);  /* resets correctly now, even after calling accumulated offsets */
-
-	MEM_freeN(data.edge_flags);
-}
-
-/***************************** Texture Drawing ******************************/
-
-static Material *give_current_material_or_def(Object *ob, int matnr)
-{
-	extern Material defmaterial;  /* render module abuse... */
-	Material *ma = give_current_material(ob, matnr);
-
-	return ma ? ma : &defmaterial;
-}
-
-/* Icky globals, fix with userdata parameter */
-
-static struct TextureDrawState {
-	Object *ob;
-	Image *stencil; /* texture painting stencil */
-	Image *canvas;  /* texture painting canvas, for image mode */
-	bool use_game_mat;
-	int is_lit, is_tex;
-	int color_profile;
-	bool use_backface_culling;
-	bool two_sided_lighting;
-	unsigned char obcol[4];
-	bool is_texpaint;
-	bool texpaint_material; /* use material slots for texture painting */
-} Gtexdraw = {NULL, NULL, NULL, false, 0, 0, 0, false, false, {0, 0, 0, 0}, false, false};
-
-static bool set_draw_settings_cached(
-        int clearcache, MTexPoly *texface, Material *ma,
-        const struct TextureDrawState *gtexdraw)
-{
-	static Material *c_ma;
-	static int c_textured;
-	static MTexPoly c_texface;
-	static int c_backculled;
-	static bool c_badtex;
-	static int c_lit;
-	static int c_has_texface;
-
-	int backculled = 1;
-	int alphablend = GPU_BLEND_SOLID;
-	int textured = 0;
-	int lit = 0;
-	int has_texface = texface != NULL;
-	bool need_set_tpage = false;
-	bool texpaint = ((gtexdraw->ob->mode & OB_MODE_TEXTURE_PAINT) != 0);
-
-	Image *ima = NULL;
-
-	if (ma != NULL) {
-		if (ma->mode & MA_TRANSP) {
-			alphablend = GPU_BLEND_ALPHA;
-		}
-	}
-
-	if (clearcache) {
-		c_textured = c_lit = c_backculled = -1;
-		memset(&c_texface, 0, sizeof(c_texface));
-		c_badtex = false;
-		c_has_texface = -1;
-		c_ma = NULL;
-	}
-	else {
-		textured = gtexdraw->is_tex;
-	}
-
-	/* convert number of lights into boolean */
-	if (gtexdraw->is_lit) {
-		lit = 1;
-	}
-
-	backculled = gtexdraw->use_backface_culling;
-	if (ma) {
-		if (ma->mode & MA_SHLESS) lit = 0;
-		if (gtexdraw->use_game_mat) {
-			backculled = backculled || (ma->game.flag & GEMAT_BACKCULL);
-			alphablend = ma->game.alpha_blend;
-		}
-	}
-
-	if (texface && !texpaint) {
-		textured = textured && (texface->tpage);
-
-		/* no material, render alpha if texture has depth=32 */
-		if (!ma && BKE_image_has_alpha(texface->tpage))
-			alphablend = GPU_BLEND_ALPHA;
-	}
-	else if (texpaint) {
-		if (gtexdraw->texpaint_material)
-			ima = ma && ma->texpaintslot ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
-		else
-			ima = gtexdraw->canvas;
-	}
-	else
-		textured = 0;
-
-	if (backculled != c_backculled) {
-		if (backculled) glEnable(GL_CULL_FACE);
-		else glDisable(GL_CULL_FACE);
-
-		c_backculled = backculled;
-	}
-
-	/* need to re-set tpage if textured flag changed or existsment of texface changed..  */
-	need_set_tpage = textured != c_textured || has_texface != c_has_texface;
-	/* ..or if settings inside texface were changed (if texface was used) */
-	need_set_tpage |= (texpaint && c_ma != ma) || (texface && memcmp(&c_texface, texface, sizeof(c_texface)));
-
-	if (need_set_tpage) {
-		if (textured) {
-			if (texpaint) {
-				c_badtex = false;
-				if (GPU_verify_image(ima, NULL, GL_TEXTURE_2D, 0, 1, 0, false)) {
-					glEnable(GL_TEXTURE_2D);
-					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
-
-					glActiveTexture(GL_TEXTURE1);
-					glEnable(GL_TEXTURE_2D);
-					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_PREVIOUS);
-					glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-					glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
-					glBindTexture(GL_TEXTURE_2D, ima->bindcode[TEXTARGET_TEXTURE_2D]);
-					glActiveTexture(GL_TEXTURE0);
-				}
-				else {
-					glActiveTexture(GL_TEXTURE1);
-					glDisable(GL_TEXTURE_2D);
-					glBindTexture(GL_TEXTURE_2D, 0);
-					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-					glActiveTexture(GL_TEXTURE0);
-
-					c_badtex = true;
-					GPU_clear_tpage(true);
-					glDisable(GL_TEXTURE_2D);
-					glBindTexture(GL_TEXTURE_2D, 0);
-					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-				}
-			}
-			else {
-				c_badtex = !GPU_set_tpage(texface, !texpaint, alphablend);
-			}
-		}
-		else {
-			GPU_set_tpage(NULL, 0, 0);
-			c_badtex = false;
-		}
-		c_textured = textured;
-		c_has_texface = has_texface;
-		if (texface)
-			memcpy(&c_texface, texface, sizeof(c_texface));
-	}
-
-	if (c_badtex) lit = 0;
-	if (lit != c_lit || ma != c_ma || textured != c_textured) {
-		int options = GPU_SHADER_USE_COLOR;
-
-		if (c_textured && !c_badtex) {
-			options |= GPU_SHADER_TEXTURE_2D;
-		}
-		if (gtexdraw->two_sided_lighting) {
-			options |= GPU_SHADER_TWO_SIDED;
-		}
-
-		if (lit) {
-			options |= GPU_SHADER_LIGHTING;
-			if (!ma)
-				ma = give_current_material_or_def(NULL, 0);  /* default material */
-
-			float specular[3];
-			mul_v3_v3fl(specular, &ma->specr, ma->spec);
-
-			GPU_basic_shader_colors(NULL, specular, ma->har, 1.0f);
-		}
-
-		GPU_basic_shader_bind(options);
-
-		c_lit = lit;
-		c_ma = ma;
-	}
-
-	return c_badtex;
-}
-
-static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
-{
-	unsigned char obcol[4];
-	bool is_tex, solidtex;
-	Mesh *me = ob->data;
-	ImagePaintSettings *imapaint = &scene->toolsettings->imapaint;
-
-	/* XXX scene->obedit warning */
-
-	/* texture draw is abused for mask selection mode, do this so wire draw
-	 * with face selection in weight paint is not lit. */
-	if ((v3d->drawtype <= OB_WIRE) && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT))) {
-		solidtex = false;
-		Gtexdraw.is_lit = 0;
-	}
-	else if ((ob->mode & OB_MODE_TEXTURE_PAINT) && BKE_scene_use_new_shading_nodes(scene)) {
-		solidtex = true;
-		if (v3d->flag2 & V3D_SHADELESS_TEX)
-			Gtexdraw.is_lit = 0;
-		else
-			Gtexdraw.is_lit = -1;
-	}
-	else if ((v3d->drawtype == OB_SOLID) ||
-	         ((ob->mode & OB_MODE_EDIT) && (v3d->drawtype != OB_TEXTURE)))
-	{
-		/* draw with default lights in solid draw mode and edit mode */
-		solidtex = true;
-		Gtexdraw.is_lit = -1;
-	}
-	else {
-		/* draw with lights in the scene otherwise */
-		solidtex = false;
-		if (v3d->flag2 & V3D_SHADELESS_TEX) {
-			Gtexdraw.is_lit = 0;
-		}
-		else {
-			Gtexdraw.is_lit = GPU_scene_object_lights(
-			                      scene, ob, v3d->localvd ? v3d->localvd->lay : v3d->lay,
-			                      rv3d->viewmat, !rv3d->is_persp);
-		}
-	}
-
-	rgba_float_to_uchar(obcol, ob->col);
-
-	if (solidtex || v3d->drawtype == OB_TEXTURE) is_tex = true;
-	else is_tex = false;
-
-	Gtexdraw.ob = ob;
-	Gtexdraw.stencil = (imapaint->flag & IMAGEPAINT_PROJECT_LAYER_STENCIL) ? imapaint->stencil : NULL;
-	Gtexdraw.is_texpaint = (ob->mode == OB_MODE_TEXTURE_PAINT);
-	Gtexdraw.texpaint_material = (imapaint->mode == IMAGEPAINT_MODE_MATERIAL);
-	Gtexdraw.canvas = (Gtexdraw.texpaint_material) ? NULL : imapaint->canvas;
-	Gtexdraw.is_tex = is_tex;
-
-	/* naughty multitexturing hacks to quickly support stencil + shading + alpha blending
-	 * in new texpaint code. The better solution here would be to support GLSL */
-	if (Gtexdraw.is_texpaint) {
-		glActiveTexture(GL_TEXTURE1);
-		glEnable(GL_TEXTURE_2D);
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-		glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
-		glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
-		glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_PREVIOUS);
-		glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-		glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
-
-		/* load the stencil texture here */
-		if (Gtexdraw.stencil != NULL) {
-			glActiveTexture(GL_TEXTURE2);
-			if (GPU_verify_image(Gtexdraw.stencil, NULL, GL_TEXTURE_2D, false, false, false, false)) {
-				float col[4] = {imapaint->stencil_col[0], imapaint->stencil_col[1], imapaint->stencil_col[2], 1.0f};
-				glEnable(GL_TEXTURE_2D);
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_CONSTANT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_TEXTURE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_TEXTURE);
-				glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, col);
-				if ((imapaint->flag & IMAGEPAINT_PROJECT_LAYER_STENCIL_INV) == 0) {
-					glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_ONE_MINUS_SRC_COLOR);
-				}
-				else {
-					glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-				}
-			}
-		}
-		glActiveTexture(GL_TEXTURE0);
-	}
-
-	Gtexdraw.color_profile = BKE_scene_check_color_management_enabled(scene);
-	Gtexdraw.use_game_mat = (RE_engines_find(scene->r.engine)->flag & RE_GAME) != 0;
-	Gtexdraw.use_backface_culling = (v3d->flag2 & V3D_BACKFACE_CULLING) != 0;
-	Gtexdraw.two_sided_lighting = (me->flag & ME_TWOSIDED);
-
-	memcpy(Gtexdraw.obcol, obcol, sizeof(obcol));
-	set_draw_settings_cached(1, NULL, NULL, &Gtexdraw);
-	glCullFace(GL_BACK);
-}
-
-static void draw_textured_end(void)
-{
-	if (Gtexdraw.ob->mode & OB_MODE_TEXTURE_PAINT) {
-		glActiveTexture(GL_TEXTURE1);
-		glDisable(GL_TEXTURE_2D);
-		glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		glBindTexture(GL_TEXTURE_2D, 0);
-
-		if (Gtexdraw.stencil != NULL) {
-			glActiveTexture(GL_TEXTURE2);
-			glDisable(GL_TEXTURE_2D);
-			glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			glBindTexture(GL_TEXTURE_2D, 0);
-		}
-		glActiveTexture(GL_TEXTURE0);
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		/* manual reset, since we don't use tpage */
-		glBindTexture(GL_TEXTURE_2D, 0);
-		/* force switch off textures */
-		GPU_clear_tpage(true);
-	}
-	else {
-		/* switch off textures */
-		GPU_set_tpage(NULL, 0, 0);
-	}
-
-	glDisable(GL_CULL_FACE);
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-
-	/* XXX, bad patch - GPU_default_lights() calls
-	 * glLightfv(GL_POSITION, ...) which
-	 * is transformed by the current matrix... we
-	 * need to make sure that matrix is identity.
-	 *
-	 * It would be better if drawmesh.c kept track
-	 * of and restored the light settings it changed.
-	 *  - zr
-	 */
-	glPushMatrix();
-	glLoadIdentity();
-	GPU_default_lights();
-	glPopMatrix();
-}
-
-static DMDrawOption draw_tface__set_draw_legacy(MTexPoly *mtexpoly, const bool has_mcol, int matnr)
-{
-	Material *ma = give_current_material(Gtexdraw.ob, matnr + 1);
-	bool invalidtexture = false;
-
-	if (ma && (ma->game.flag & GEMAT_INVISIBLE))
-		return DM_DRAW_OPTION_SKIP;
-
-	invalidtexture = set_draw_settings_cached(0, mtexpoly, ma, &Gtexdraw);
-
-	if (mtexpoly && invalidtexture) {
-		glColor3ub(0xFF, 0x00, 0xFF);
-		return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */
-	}
-	else if (!has_mcol) {
-		if (mtexpoly) {
-			glColor3f(1.0, 1.0, 1.0);
-		}
-		else {
-			if (ma) {
-				if (ma->shade_flag & MA_OBCOLOR) {
-					glColor3ubv(Gtexdraw.obcol);
-				}
-				else {
-					float col[3];
-					if (Gtexdraw.color_profile) linearrgb_to_srgb_v3_v3(col, &ma->r);
-					else copy_v3_v3(col, &ma->r);
-
-					glColor3fv(col);
-				}
-			}
-			else {
-				glColor3f(1.0, 1.0, 1.0);
-			}
-		}
-		return DM_DRAW_OPTION_NORMAL; /* normal drawing (no mcols anyway, no need to turn off) */
-	}
-	else {
-		return DM_DRAW_OPTION_NORMAL; /* Set color from mcol */
-	}
-}
-
-static DMDrawOption draw_tface__set_draw(MTexPoly *mtexpoly, const bool UNUSED(has_mcol), int matnr)
-{
-	Material *ma = give_current_material(Gtexdraw.ob, matnr + 1);
-
-	if (ma && (ma->game.flag & GEMAT_INVISIBLE)) return DM_DRAW_OPTION_SKIP;
-
-	if (mtexpoly || Gtexdraw.is_texpaint)
-		set_draw_settings_cached(0, mtexpoly, ma, &Gtexdraw);
-
-	/* always use color from mcol, as set in update_tface_color_layer */
-	return DM_DRAW_OPTION_NORMAL;
-}
-
-static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol)
-{
-	const MPoly *mp = dm->getPolyArray(dm);
-	const int mpoly_num = dm->getNumPolys(dm);
-	MTexPoly *mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
-	MLoopCol *finalCol;
-	int i, j;
-	MLoopCol *mloopcol = NULL;
-
-	/* cache material values to avoid a lot of lookups */
-	Material *ma = NULL;
-	short mat_nr_prev = -1;
-	enum {
-		COPY_CALC,
-		COPY_ORIG,
-		COPY_PREV,
-	} copy_mode = COPY_CALC;
-
-	if (use_mcol) {
-		mloopcol = dm->getLoopDataArray(dm, CD_PREVIEW_MLOOPCOL);
-		if (!mloopcol)
-			mloopcol = dm->getLoopDataArray(dm, CD_MLOOPCOL);
-	}
-
-	if (CustomData_has_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL)) {
-		finalCol = CustomData_get_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL);
-	}
-	else {
-		finalCol = MEM_mallocN(sizeof(MLoopCol) * dm->numLoopData, "add_tface_color_layer");
-		CustomData_add_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL, CD_ASSIGN, finalCol, dm->numLoopData);
-	}
-
-	for (i = mpoly_num; i--; mp++) {
-		const short mat_nr = mp->mat_nr;
-
-		if (UNLIKELY(mat_nr_prev != mat_nr)) {
-			ma = give_current_material(Gtexdraw.ob, mat_nr + 1);
-			copy_mode = COPY_CALC;
-			mat_nr_prev = mat_nr;
-		}
-
-		/* avoid lookups  */
-		if (copy_mode == COPY_ORIG) {
-			memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
-		}
-		else if (copy_mode == COPY_PREV) {
-			int loop_index = mp->loopstart;
-			const MLoopCol *lcol_prev = &finalCol[(mp - 1)->loopstart];
-			for (j = 0; j < mp->totloop; j++, loop_index++) {
-				finalCol[loop_index] = *lcol_prev;
-			}
-		}
-
-		/* (copy_mode == COPY_CALC) */
-		else if (ma && (ma->game.flag & GEMAT_INVISIBLE)) {
-			if (mloopcol) {
-				memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
-				copy_mode = COPY_ORIG;
-			}
-			else {
-				memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
-				copy_mode = COPY_PREV;
-			}
-		}
-		else if (mtexpoly && set_draw_settings_cached(0, mtexpoly, ma, &Gtexdraw)) {
-			int loop_index = mp->loopstart;
-			for (j = 0; j < mp->totloop; j++, loop_index++) {
-				finalCol[loop_index].r = 255;
-				finalCol[loop_index].g = 0;
-				finalCol[loop_index].b = 255;
-				finalCol[loop_index].a = 255;
-			}
-			copy_mode = COPY_PREV;
-		}
-		else if (ma && (ma->shade_flag & MA_OBCOLOR)) {
-			int loop_index = mp->loopstart;
-			for (j = 0; j < mp->totloop; j++, loop_index++) {
-				copy_v3_v3_uchar(&finalCol[loop_index].r, Gtexdraw.obcol);
-				finalCol[loop_index].a = 255;
-			}
-			copy_mode = COPY_PREV;
-		}
-		else {
-			if (mloopcol) {
-				memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
-				copy_mode = COPY_ORIG;
-			}
-			else if (mtexpoly) {
-				memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
-				copy_mode = COPY_PREV;
-			}
-			else {
-				float col[3];
-
-				if (ma) {
-					int loop_index = mp->loopstart;
-					MLoopCol lcol;
-
-					if (Gtexdraw.color_profile) linearrgb_to_srgb_v3_v3(col, &ma->r);
-					else copy_v3_v3(col, &ma->r);
-					rgb_float_to_uchar((unsigned char *)&lcol.r, col);
-					lcol.a = 255;
-
-					for (j = 0; j < mp->totloop; j++, loop_index++) {
-						finalCol[loop_index] = lcol;
-					}
-				}
-				else {
-					memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
-				}
-				copy_mode = COPY_PREV;
-			}
-		}
-	}
-
-	dm->dirty |= DM_DIRTY_MCOL_UPDATE_DRAW;
-}
-
-static DMDrawOption draw_tface_mapped__set_draw(void *userData, int origindex, int UNUSED(mat_nr))
-{
-	const Mesh *me = ((drawTFace_userData *)userData)->me;
-
-	/* array checked for NULL before calling */
-	MPoly *mpoly = &me->mpoly[origindex];
-
-	BLI_assert(origindex >= 0 && origindex < me->totpoly);
-
-	if (mpoly->flag & ME_HIDE) {
-		return DM_DRAW_OPTION_SKIP;
-	}
-	else {
-		MTexPoly *tpoly = (me->mtpoly) ? &me->mtpoly[origindex] : NULL;
-		int matnr = mpoly->mat_nr;
-
-		return draw_tface__set_draw(tpoly, (me->mloopcol != NULL), matnr);
-	}
-}
-
-static DMDrawOption draw_em_tf_mapped__set_draw(void *userData, int origindex, int mat_nr)
-{
-	drawEMTFMapped_userData *data = userData;
-	BMEditMesh *em = data->em;
-	BMFace *efa;
-
-	if (UNLIKELY(origindex >= em->bm->totface))
-		return DM_DRAW_OPTION_NORMAL;
-
-	efa = BM_face_at_index(em->bm, origindex);
-
-	if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		return DM_DRAW_OPTION_SKIP;
-	}
-	else {
-		MTexPoly *mtexpoly = (data->cd_poly_tex_offset != -1) ?
-		        BM_ELEM_CD_GET_VOID_P(efa, data->cd_poly_tex_offset) : NULL;
-		int matnr = (mat_nr != -1) ? mat_nr : efa->mat_nr;
-
-		return draw_tface__set_draw_legacy(mtexpoly, data->has_mcol, matnr);
-	}
-}
-
-/* when face select is on, use face hidden flag */
-static DMDrawOption wpaint__setSolidDrawOptions_facemask(void *userData, int index)
-{
-	Mesh *me = (Mesh *)userData;
-	MPoly *mp = &me->mpoly[index];
-	if (mp->flag & ME_HIDE)
-		return DM_DRAW_OPTION_SKIP;
-	return DM_DRAW_OPTION_NORMAL;
-}
-
-static void draw_mesh_text(Scene *scene, Object *ob, int glsl)
-{
-	Mesh *me = ob->data;
-	DerivedMesh *ddm;
-	MPoly *mp, *mface  = me->mpoly;
-	MTexPoly *mtpoly   = me->mtpoly;
-	MLoopUV *mloopuv   = me->mloopuv;
-	MLoopUV *luv;
-	MLoopCol *mloopcol = me->mloopcol;  /* why does mcol exist? */
-	MLoopCol *lcol;
-
-	bProperty *prop = BKE_bproperty_object_get(ob, "Text");
-	GPUVertexAttribs gattribs;
-	int a, totpoly = me->totpoly;
-
-	/* fake values to pass to GPU_render_text() */
-	MCol  tmp_mcol[4]  = {{0}};
-	MCol *tmp_mcol_pt  = mloopcol ? tmp_mcol : NULL;
-
-	/* don't draw without tfaces */
-	if (!mtpoly || !mloopuv)
-		return;
-
-	/* don't draw when editing */
-	if (ob->mode & OB_MODE_EDIT)
-		return;
-	else if (ob == OBACT)
-		if (BKE_paint_select_elem_test(ob))
-			return;
-
-	ddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
-
-	for (a = 0, mp = mface; a < totpoly; a++, mtpoly++, mp++) {
-		short matnr = mp->mat_nr;
-		const bool mf_smooth = (mp->flag & ME_SMOOTH) != 0;
-		Material *mat = (me->mat) ? me->mat[matnr] : NULL;
-		int mode = mat ? mat->game.flag : GEMAT_INVISIBLE;
-
-
-		if (!(mode & GEMAT_INVISIBLE) && (mode & GEMAT_TEXT) && mp->totloop >= 3) {
-			/* get the polygon as a tri/quad */
-			int mp_vi[4];
-			float   v_quad_data[4][3];
-			const float  *v_quad[4];
-			const float *uv_quad[4];
-			char string[MAX_PROPSTRING];
-			int characters, i, glattrib = -1, badtex = 0;
-
-
-			/* TEXFACE */
-			if (glsl) {
-				GPU_object_material_bind(matnr + 1, &gattribs);
-
-				for (i = 0; i < gattribs.totlayer; i++) {
-					if (gattribs.layer[i].type == CD_MTFACE) {
-						glattrib = gattribs.layer[i].glindex;
-						break;
-					}
-				}
-			}
-			else {
-				badtex = set_draw_settings_cached(0, mtpoly, mat, &Gtexdraw);
-				if (badtex) {
-					continue;
-				}
-			}
-
-			mp_vi[0] = me->mloop[mp->loopstart + 0].v;
-			mp_vi[1] = me->mloop[mp->loopstart + 1].v;
-			mp_vi[2] = me->mloop[mp->loopstart + 2].v;
-			mp_vi[3] = (mp->totloop >= 4) ? me->mloop[mp->loopstart + 3].v : 0;
-
-			/* UV */
-			luv = &mloopuv[mp->loopstart];
-			uv_quad[0] = luv->uv; luv++;
-			uv_quad[1] = luv->uv; luv++;
-			uv_quad[2] = luv->uv; luv++;
-			if (mp->totloop >= 4) {
-				uv_quad[3] = luv->uv;
-			}
-			else {
-				uv_quad[3] = NULL;
-			}
-
-
-			/* COLOR */
-			if (mloopcol) {
-				unsigned int totloop_clamp = min_ii(4, mp->totloop);
-				unsigned int j;
-				lcol = &mloopcol[mp->loopstart];
-
-				for (j = 0; j < totloop_clamp; j++, lcol++) {
-					MESH_MLOOPCOL_TO_MCOL(lcol, &tmp_mcol[j]);
-				}
-			}
-
-			/* LOCATION */
-			ddm->getVertCo(ddm, mp_vi[0], v_quad_data[0]);
-			ddm->getVertCo(ddm, mp_vi[1], v_quad_data[1]);
-			ddm->getVertCo(ddm, mp_vi[2], v_quad_data[2]);
-			if (mp->totloop >= 4) {
-				ddm->getVertCo(ddm, mp_vi[3], v_quad_data[3]);
-			}
-
-			v_quad[0] = v_quad_data[0];
-			v_quad[1] = v_quad_data[1];
-			v_quad[2] = v_quad_data[2];
-			if (mp->totloop >= 4) {
-				v_quad[3] = v_quad_data[2];
-			}
-			else {
-				v_quad[3] = NULL;
-			}
-
-
-			/* The BM_FONT handling is in the gpu module, shared with the
-			 * game engine, was duplicated previously */
-
-			BKE_bproperty_set_valstr(prop, string);
-			characters = strlen(string);
-
-			if (!BKE_image_has_ibuf(mtpoly->tpage, NULL))
-				characters = 0;
-
-			if (!mf_smooth) {
-				float nor[3];
-
-				normal_tri_v3(nor, v_quad[0], v_quad[1], v_quad[2]);
-
-				glNormal3fv(nor);
-			}
-
-			GPU_render_text(
-			        mtpoly, mode, string, characters,
-			        (unsigned int *)tmp_mcol_pt,
-			        v_quad, uv_quad,
-			        glattrib);
-		}
-	}
-
-	ddm->release(ddm);
-}
-
-static int compareDrawOptions(void *userData, int cur_index, int next_index)
-{
-	drawTFace_userData *data = userData;
-
-	if (data->mpoly && data->mpoly[cur_index].mat_nr != data->mpoly[next_index].mat_nr)
-		return 0;
-
-	if (data->mtexpoly && data->mtexpoly[cur_index].tpage != data->mtexpoly[next_index].tpage)
-		return 0;
-
-	return 1;
-}
-
-
-static int compareDrawOptionsEm(void *userData, int cur_index, int next_index)
-{
-	drawEMTFMapped_userData *data = userData;
-
-	if (data->mpoly && data->mpoly[cur_index].mat_nr != data->mpoly[next_index].mat_nr)
-		return 0;
-
-	if (data->mtexpoly && data->mtexpoly[cur_index].tpage != data->mtexpoly[next_index].tpage)
-		return 0;
-
-	return 1;
-}
-
-static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                                   Object *ob, DerivedMesh *dm, const int draw_flags)
-{
-	Mesh *me = ob->data;
-
-	/* correct for negative scale */
-	if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
-	else glFrontFace(GL_CCW);
-
-	/* draw the textured mesh */
-	draw_textured_begin(scene, v3d, rv3d, ob);
-
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-
-	if (ob->mode & OB_MODE_EDIT) {
-		drawEMTFMapped_userData data;
-
-		data.em = me->edit_btmesh;
-		data.has_mcol = CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_MLOOPCOL);
-		data.cd_poly_tex_offset = CustomData_get_offset(&me->edit_btmesh->bm->pdata, CD_MTEXPOLY);
-
-		data.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
-		data.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
-
-		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, compareDrawOptionsEm, &data, 0);
-	}
-	else {
-		DMDrawFlag dm_draw_flag;
-		drawTFace_userData userData;
-
-		if (ob->mode & OB_MODE_TEXTURE_PAINT) {
-			dm_draw_flag = DM_DRAW_USE_TEXPAINT_UV;
-		}
-		else {
-			dm_draw_flag = DM_DRAW_USE_ACTIVE_UV;
-		}
-
-		if (ob == OBACT) {
-			if (ob->mode & OB_MODE_WEIGHT_PAINT) {
-				dm_draw_flag |= DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN;
-			}
-			else if (ob->mode & OB_MODE_SCULPT) {
-				dm_draw_flag |= DM_DRAW_SKIP_HIDDEN | DM_DRAW_USE_COLORS;
-			}
-			else if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
-				dm_draw_flag |= DM_DRAW_USE_COLORS;
-			}
-		}
-		else {
-			if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
-				dm_draw_flag |= DM_DRAW_USE_COLORS;
-			}
-		}
-
-
-		userData.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
-		userData.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
-
-		if (draw_flags & DRAW_FACE_SELECT) {
-			userData.me = me;
-
-			dm->drawMappedFacesTex(
-			        dm, me->mpoly ? draw_tface_mapped__set_draw : NULL, compareDrawOptions,
-			        &userData, dm_draw_flag);
-		}
-		else {
-			userData.me = NULL;
-
-			/* if ((ob->mode & OB_MODE_ALL_PAINT) == 0) */ {
-
-				/* Note: this isn't efficient and runs on every redraw,
-				 * its needed so material colors are used for vertex colors.
-				 * In the future we will likely remove 'texface' so, just avoid running this where possible,
-				 * (when vertex paint or weight paint are used).
-				 *
-				 * Note 2: We disable optimization for now since it causes T48788
-				 * and it is now too close to release to do something smarter.
-				 *
-				 * TODO(sergey): Find some real solution here.
-				 */
-
-				update_tface_color_layer(dm, !(ob->mode & OB_MODE_TEXTURE_PAINT));
-			}
-
-			dm->drawFacesTex(
-			        dm, draw_tface__set_draw, compareDrawOptions,
-			        &userData, dm_draw_flag);
-		}
-	}
-
-	/* draw game engine text hack */
-	if (rv3d->rflag & RV3D_IS_GAME_ENGINE) {
-		if (BKE_bproperty_object_get(ob, "Text")) {
-			draw_mesh_text(scene, ob, 0);
-		}
-	}
-
-	draw_textured_end();
-
-	/* draw edges and selected faces over textured mesh */
-	if (!(ob == scene->obedit) && (draw_flags & DRAW_FACE_SELECT)) {
-		bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
-		draw_mesh_face_select(rv3d, me, dm, draw_select_edges);
-	}
-
-	/* reset from negative scale correction */
-	glFrontFace(GL_CCW);
-
-	/* in editmode, the blend mode needs to be set in case it was ADD */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-}
-
-/************************** NEW SHADING NODES ********************************/
-
-typedef struct TexMatCallback {
-	Scene *scene;
-	Object *ob;
-	Mesh *me;
-	DerivedMesh *dm;
-	bool shadeless;
-	bool two_sided_lighting;
-} TexMatCallback;
-
-static void tex_mat_set_material_cb(void *UNUSED(userData), int mat_nr, void *attribs)
-{
-	/* all we have to do here is simply enable the GLSL material, but note
-	 * that the GLSL code will give different result depending on the drawtype,
-	 * in texture draw mode it will output the active texture node, in material
-	 * draw mode it will show the full material. */
-	GPU_object_material_bind(mat_nr, attribs);
-}
-
-static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs)
-{
-	/* texture draw mode without GLSL */
-	TexMatCallback *data = (TexMatCallback *)userData;
-	GPUVertexAttribs *gattribs = attribs;
-	Image *ima;
-	ImageUser *iuser;
-	bNode *node;
-
-	/* draw image texture if we find one */
-	if (ED_object_get_active_image(data->ob, mat_nr, &ima, &iuser, &node, NULL)) {
-		/* get openl texture */
-		int mipmap = 1;
-		int bindcode = (ima) ? GPU_verify_image(ima, iuser, GL_TEXTURE_2D, 0, 0, mipmap, false) : 0;
-
-		if (bindcode) {
-			NodeTexBase *texbase = node->storage;
-
-			/* disable existing material */
-			GPU_object_material_unbind();
-
-			/* bind texture */
-			glBindTexture(GL_TEXTURE_2D, ima->bindcode[TEXTARGET_TEXTURE_2D]);
-
-			glMatrixMode(GL_TEXTURE);
-			glLoadMatrixf(texbase->tex_mapping.mat);
-			glMatrixMode(GL_MODELVIEW);
-
-			/* use active UV texture layer */
-			memset(gattribs, 0, sizeof(*gattribs));
-
-			gattribs->layer[0].type = CD_MTFACE;
-			gattribs->layer[0].name[0] = '\0';
-			gattribs->layer[0].gltexco = 1;
-			gattribs->layer[0].glinfoindoex = -1;
-			gattribs->totlayer = 1;
-
-			/* bind material */
-			float diffuse[3] = {1.0f, 1.0f, 1.0f};
-
-			int options = GPU_SHADER_TEXTURE_2D;
-			if (!data->shadeless)
-				options |= GPU_SHADER_LIGHTING;
-			if (data->two_sided_lighting)
-				options |= GPU_SHADER_TWO_SIDED;
-
-			GPU_basic_shader_colors(diffuse, NULL, 0, 1.0f);
-			GPU_basic_shader_bind(options);
-
-			return;
-		}
-	}
-
-	/* disable texture material */
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-
-	if (data->shadeless) {
-		glColor3f(1.0f, 1.0f, 1.0f);
-		memset(gattribs, 0, sizeof(*gattribs));
-	}
-	else {
-		glMatrixMode(GL_TEXTURE);
-		glLoadIdentity();
-		glMatrixMode(GL_MODELVIEW);
-
-		/* enable solid material */
-		GPU_object_material_bind(mat_nr, attribs);
-	}
-}
-
-static bool tex_mat_set_face_mesh_cb(void *userData, int index)
-{
-	/* faceselect mode face hiding */
-	TexMatCallback *data = (TexMatCallback *)userData;
-	Mesh *me = (Mesh *)data->me;
-	MPoly *mp = &me->mpoly[index];
-
-	return !(mp->flag & ME_HIDE);
-}
-
-static bool tex_mat_set_face_editmesh_cb(void *userData, int index)
-{
-	/* editmode face hiding */
-	TexMatCallback *data = (TexMatCallback *)userData;
-	Mesh *me = (Mesh *)data->me;
-	BMEditMesh *em = me->edit_btmesh;
-	BMFace *efa;
-
-	if (UNLIKELY(index >= em->bm->totface))
-		return DM_DRAW_OPTION_NORMAL;
-
-	efa = BM_face_at_index(em->bm, index);
-
-	return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN);
-}
-
-void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                        Object *ob, DerivedMesh *dm, const int draw_flags)
-{
-	/* if not cycles, or preview-modifiers, or drawing matcaps */
-	if ((draw_flags & DRAW_MODIFIERS_PREVIEW) ||
-	    (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) ||
-	    (BKE_scene_use_new_shading_nodes(scene) == false) ||
-	    ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID)))
-	{
-		draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
-		return;
-	}
-	else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
-		draw_mesh_paint(v3d, rv3d, ob, dm, draw_flags);
-		return;
-	}
-
-	/* set opengl state for negative scale & color */
-	if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
-	else glFrontFace(GL_CCW);
-
-	Mesh *me = ob->data;
-
-	bool shadeless = ((v3d->flag2 & V3D_SHADELESS_TEX) &&
-	    ((v3d->drawtype == OB_TEXTURE) || (ob->mode & OB_MODE_TEXTURE_PAINT)));
-	bool two_sided_lighting = (me->flag & ME_TWOSIDED) != 0;
-
-	TexMatCallback data = {scene, ob, me, dm, shadeless, two_sided_lighting};
-	bool (*set_face_cb)(void *, int);
-	bool picking = (G.f & G_PICKSEL) != 0;
-
-	/* face hiding callback depending on mode */
-	if (ob == scene->obedit)
-		set_face_cb = tex_mat_set_face_editmesh_cb;
-	else if (draw_flags & DRAW_FACE_SELECT)
-		set_face_cb = tex_mat_set_face_mesh_cb;
-	else
-		set_face_cb = NULL;
-
-	/* test if we can use glsl */
-	const int drawtype = view3d_effective_drawtype(v3d);
-	bool glsl = (drawtype == OB_MATERIAL) && !picking;
-
-	GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
-
-	if (glsl || picking) {
-		/* draw glsl or solid */
-		dm->drawMappedFacesMat(dm,
-		                       tex_mat_set_material_cb,
-		                       set_face_cb, &data);
-	}
-	else {
-		/* draw textured */
-		dm->drawMappedFacesMat(dm,
-		                       tex_mat_set_texture_cb,
-		                       set_face_cb, &data);
-	}
-
-	GPU_end_object_materials();
-
-	/* reset opengl state */
-	GPU_end_object_materials();
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	glFrontFace(GL_CCW);
-
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-	glMatrixMode(GL_MODELVIEW);
-
-	/* faceselect mode drawing over textured mesh */
-	if (!(ob == scene->obedit) && (draw_flags & DRAW_FACE_SELECT)) {
-		bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
-		draw_mesh_face_select(rv3d, ob->data, dm, draw_select_edges);
-	}
-}
-
-/* Vertex Paint and Weight Paint */
-static void draw_mesh_paint_light_begin(void)
-{
-	/* get material diffuse color from vertex colors but set default spec */
-	const float specular[3] = {0.47f, 0.47f, 0.47f};
-	GPU_basic_shader_colors(NULL, specular, 35, 1.0f);
-	GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-}
-
-static void draw_mesh_paint_light_end(void)
-{
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-}
-
-void draw_mesh_paint_weight_faces(DerivedMesh *dm, const bool use_light,
-                                  void *facemask_cb, void *user_data)
-{
-	DMSetMaterial setMaterial = GPU_object_materials_check() ? GPU_object_material_bind : NULL;
-	int flags = DM_DRAW_USE_COLORS;
-
-	if (use_light) {
-		draw_mesh_paint_light_begin();
-		flags |= DM_DRAW_NEED_NORMALS;
-	}
-
-	dm->drawMappedFaces(dm, (DMSetDrawOptions)facemask_cb, setMaterial, NULL, user_data, flags);
-
-	if (use_light) {
-		draw_mesh_paint_light_end();
-	}
-}
-
-void draw_mesh_paint_vcolor_faces(DerivedMesh *dm, const bool use_light,
-                                  void *facemask_cb, void *user_data,
-                                  const Mesh *me)
-{
-	DMSetMaterial setMaterial = GPU_object_materials_check() ? GPU_object_material_bind : NULL;
-	int flags = 0;
-
-	if (use_light) {
-		draw_mesh_paint_light_begin();
-		flags |= DM_DRAW_NEED_NORMALS;
-	}
-
-	/* Don't show alpha in wire mode. */
-	const bool show_alpha = use_light;
-	if (show_alpha) {
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-
-	if (me->mloopcol) {
-		dm->drawMappedFaces(dm, facemask_cb, setMaterial, NULL, user_data,
-		                    DM_DRAW_USE_COLORS | flags);
-	}
-	else {
-		glColor3f(1.0f, 1.0f, 1.0f);
-		dm->drawMappedFaces(dm, facemask_cb, setMaterial, NULL, user_data, flags);
-	}
-
-	if (show_alpha) {
-		glDisable(GL_BLEND);
-	}
-
-	if (use_light) {
-		draw_mesh_paint_light_end();
-	}
-}
-
-void draw_mesh_paint_weight_edges(RegionView3D *rv3d, DerivedMesh *dm,
-                                  const bool use_depth, const bool use_alpha,
-                                  void *edgemask_cb, void *user_data)
-{
-	/* weight paint in solid mode, special case. focus on making the weights clear
-	 * rather than the shading, this is also forced in wire view */
-
-	if (use_depth) {
-		ED_view3d_polygon_offset(rv3d, 1.0);
-		glDepthMask(0);  /* disable write in zbuffer, selected edge wires show better */
-	}
-	else {
-		glDisable(GL_DEPTH_TEST);
-	}
-
-	if (use_alpha) {
-		glEnable(GL_BLEND);
-	}
-
-	glColor4ub(255, 255, 255, 96);
-	GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-	GPU_basic_shader_line_stipple(1, 0xAAAA);
-
-	dm->drawMappedEdges(dm, (DMSetDrawOptions)edgemask_cb, user_data);
-
-	if (use_depth) {
-		ED_view3d_polygon_offset(rv3d, 0.0);
-		glDepthMask(1);
-	}
-	else {
-		glEnable(GL_DEPTH_TEST);
-	}
-
-	GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-
-	if (use_alpha) {
-		glDisable(GL_BLEND);
-	}
-}
-
-void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
-                     Object *ob, DerivedMesh *dm, const int draw_flags)
-{
-	DMSetDrawOptions facemask = NULL;
-	Mesh *me = ob->data;
-	const bool use_light = (v3d->drawtype >= OB_SOLID);
-
-	/* hide faces in face select mode */
-	if (me->editflag & (ME_EDIT_PAINT_VERT_SEL | ME_EDIT_PAINT_FACE_SEL))
-		facemask = wpaint__setSolidDrawOptions_facemask;
-
-	if (ob->mode & OB_MODE_WEIGHT_PAINT) {
-		draw_mesh_paint_weight_faces(dm, use_light, facemask, me);
-	}
-	else if (ob->mode & OB_MODE_VERTEX_PAINT) {
-		draw_mesh_paint_vcolor_faces(dm, use_light, facemask, me, me);
-	}
-
-	/* draw face selection on top */
-	if (draw_flags & DRAW_FACE_SELECT) {
-		bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
-		draw_mesh_face_select(rv3d, me, dm, draw_select_edges);
-	}
-	else if ((use_light == false) || (ob->dtx & OB_DRAWWIRE)) {
-		const bool use_depth = (v3d->flag & V3D_ZBUF_SELECT) || !(ob->mode & OB_MODE_WEIGHT_PAINT);
-		const bool use_alpha = (ob->mode & OB_MODE_VERTEX_PAINT) == 0;
-
-		if (use_alpha == false) {
-			set_inverted_drawing(1);
-		}
-
-		draw_mesh_paint_weight_edges(rv3d, dm, use_depth, use_alpha, NULL, NULL);
-
-		if (use_alpha == false) {
-			set_inverted_drawing(0);
-		}
-	}
-}
-
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index cb45a049e11..7de7aa77ba3 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -54,6 +54,7 @@
 #include "BKE_camera.h"
 #include "BKE_colortools.h"
 #include "BKE_constraint.h"  /* for the get_constraint_target function */
+#include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_deform.h"
@@ -62,6 +63,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
@@ -80,6 +82,9 @@
 
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
@@ -90,6 +95,10 @@
 #include "GPU_select.h"
 #include "GPU_basic_shader.h"
 #include "GPU_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_batch.h"
+#include "GPU_matrix.h"
 
 #include "ED_mesh.h"
 #include "ED_particle.h"
@@ -105,127 +114,7 @@
 
 #include "view3d_intern.h"  /* bad level include */
 
-/* Workaround for sequencer scene render mode.
- *
- * Strips doesn't use DAG to update objects or so, which
- * might lead to situations when object is drawing without
- * curve cache ready.
- *
- * Ideally we don't want to evaluate objects from drawing,
- * but it'll require some major sequencer re-design. So
- * for now just fallback to legacy behavior with calling
- * display ist creating from draw().
- */
-#define SEQUENCER_DAG_WORKAROUND
-
-typedef enum eWireDrawMode {
-	OBDRAW_WIRE_OFF = 0,
-	OBDRAW_WIRE_ON = 1,
-	OBDRAW_WIRE_ON_DEPTH = 2
-} eWireDrawMode;
-
-typedef struct drawDMVerts_userData {
-	BMesh *bm;
-
-	BMVert *eve_act;
-	char sel;
-
-	/* cached theme values */
-	unsigned char th_editmesh_active[4];
-	unsigned char th_vertex_select[4];
-	unsigned char th_vertex[4];
-	unsigned char th_skin_root[4];
-
-	/* for skin node drawing */
-	int cd_vskin_offset;
-	float imat[4][4];
-} drawDMVerts_userData;
-
-typedef struct drawDMEdgesSel_userData {
-	BMesh *bm;
-
-	unsigned char *baseCol, *selCol, *actCol;
-	BMEdge *eed_act;
-} drawDMEdgesSel_userData;
-
-typedef struct drawDMEdgesSelInterp_userData {
-	BMesh *bm;
-
-	unsigned char *baseCol, *selCol;
-	unsigned char *lastCol;
-} drawDMEdgesSelInterp_userData;
-
-typedef struct drawDMEdgesWeightInterp_userData {
-	BMesh *bm;
-
-	int cd_dvert_offset;
-	int defgroup_tot;
-	int vgroup_index;
-	char weight_user;
-	float alert_color[3];
-
-} drawDMEdgesWeightInterp_userData;
-
-typedef struct drawDMFacesSel_userData {
-#ifdef WITH_FREESTYLE
-	unsigned char *cols[4];
-#else
-	unsigned char *cols[3];
-#endif
-
-	DerivedMesh *dm;
-	BMesh *bm;
-
-	BMFace *efa_act;
-	const int *orig_index_mp_to_orig;
-} drawDMFacesSel_userData;
-
-typedef struct drawDMNormal_userData {
-	BMesh *bm;
-	int uniform_scale;
-	float normalsize;
-	float tmat[3][3];
-	float imat[3][3];
-} drawDMNormal_userData;
-
-typedef struct drawMVertOffset_userData {
-	MVert *mvert;
-	int offset;
-} drawMVertOffset_userData;
-
-typedef struct drawDMLayer_userData {
-	BMesh *bm;
-	int cd_layer_offset;
-} drawDMLayer_userData;
-
-typedef struct drawBMOffset_userData {
-	BMesh *bm;
-	int offset;
-} drawBMOffset_userData;
-
-typedef struct drawBMSelect_userData {
-	BMesh *bm;
-	bool select;
-} drawBMSelect_userData;
-
-static void draw_bounding_volume(Object *ob, char type);
-
-static void drawcube_size(float size);
-static void drawcircle_size(float size);
-static void draw_empty_sphere(float size);
-static void draw_empty_cone(float size);
-static void draw_box(const float vec[8][3], bool solid);
-
-static void ob_wire_color_blend_theme_id(const unsigned char ob_wire_col[4], const int theme_id, float fac)
-{
-	float col_wire[3], col_bg[3], col[3];
-
-	rgb_uchar_to_float(col_wire, ob_wire_col);
-
-	UI_GetThemeColor3fv(theme_id, col_bg);
-	interp_v3_v3v3(col, col_bg, col_wire, fac);
-	glColor3fv(col);
-}
+#include "../../draw/intern/draw_cache_impl.h"  /* bad level include (temporary) */
 
 int view3d_effective_drawtype(const struct View3D *v3d)
 {
@@ -235,42 +124,6 @@ int view3d_effective_drawtype(const struct View3D *v3d)
 	return v3d->drawtype;
 }
 
-/* this condition has been made more complex since editmode can draw textures */
-bool check_object_draw_texture(Scene *scene, View3D *v3d, const char drawtype)
-{
-	const int v3d_drawtype = view3d_effective_drawtype(v3d);
-	/* texture and material draw modes */
-	if (ELEM(v3d_drawtype, OB_TEXTURE, OB_MATERIAL) && drawtype > OB_SOLID) {
-		return true;
-	}
-
-	/* textured solid */
-	if ((v3d_drawtype == OB_SOLID) &&
-	    (v3d->flag2 & V3D_SOLID_TEX) &&
-	    (BKE_scene_use_new_shading_nodes(scene) == false))
-	{
-		return true;
-	}
-
-	if (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) {
-		return true;
-	}
-
-	return false;
-}
-
-static bool check_object_draw_editweight(Mesh *me, DerivedMesh *finalDM)
-{
-	if (me->drawflag & ME_DRAWEIGHT) {
-		/* editmesh handles its own weight drawing */
-		if (finalDM->type != DM_TYPE_EDITBMESH) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
 {
 	if ((sce->toolsettings->selectmode & SCE_SELECT_FACE) == 0)
@@ -292,49 +145,6 @@ static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
 	return true;
 }
 
-/* ************************ */
-
-/* check for glsl drawing */
-
-bool draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const char dt)
-{
-	if (G.f & G_PICKSEL)
-		return false;
-	if (!check_object_draw_texture(scene, v3d, dt))
-		return false;
-	if (ob == OBACT && (ob && ob->mode & OB_MODE_WEIGHT_PAINT))
-		return false;
-
-	if (v3d->flag2 & V3D_SHOW_SOLID_MATCAP)
-		return true;
-
-	if (v3d->drawtype == OB_TEXTURE)
-		return (scene->gm.matmode == GAME_MAT_GLSL && !BKE_scene_use_new_shading_nodes(scene));
-	else if (v3d->drawtype == OB_MATERIAL && dt > OB_SOLID)
-		return true;
-	else
-		return false;
-}
-
-static bool check_alpha_pass(Base *base)
-{
-	if (base->flag & OB_FROMDUPLI)
-		return false;
-
-	if (G.f & G_PICKSEL)
-		return false;
-
-	if (base->object->mode & OB_MODE_ALL_PAINT)
-		return false;
-
-	return (base->object->dtx & OB_DRAWTRANSP);
-}
-
-/***/
-static const unsigned int colortab[] = {
-	0x0, 0x403000, 0xFFFF88
-};
-
 /* ----------------- OpenGL Circle Drawing - Tables for Optimized Drawing Speed ------------------ */
 /* 32 values of sin function (still same result!) */
 #define CIRCLE_RESOL 32
@@ -410,328 +220,6 @@ static const float cosval[CIRCLE_RESOL] = {
 	1.00000000
 };
 
-/**
- * \param viewmat_local_unit is typically the 'rv3d->viewmatob'
- * copied into a 3x3 matrix and normalized.
- */
-static void draw_xyz_wire(const float viewmat_local_unit[3][3], const float c[3], float size, int axis)
-{
-	int line_type;
-	float buffer[4][3];
-	int n = 0;
-
-	float v1[3] = {0.0f, 0.0f, 0.0f}, v2[3] = {0.0f, 0.0f, 0.0f};
-	float dim = size * 0.1f;
-	float dx[3], dy[3];
-
-	dx[0] = dim;  dx[1] = 0.0f; dx[2] = 0.0f;
-	dy[0] = 0.0f; dy[1] = dim;  dy[2] = 0.0f;
-
-	switch (axis) {
-		case 0:     /* x axis */
-			line_type = GL_LINES;
-
-			/* bottom left to top right */
-			negate_v3_v3(v1, dx);
-			sub_v3_v3(v1, dy);
-			copy_v3_v3(v2, dx);
-			add_v3_v3(v2, dy);
-
-			copy_v3_v3(buffer[n++], v1);
-			copy_v3_v3(buffer[n++], v2);
-
-			/* top left to bottom right */
-			mul_v3_fl(dy, 2.0f);
-			add_v3_v3(v1, dy);
-			sub_v3_v3(v2, dy);
-
-			copy_v3_v3(buffer[n++], v1);
-			copy_v3_v3(buffer[n++], v2);
-
-			break;
-		case 1:     /* y axis */
-			line_type = GL_LINES;
-
-			/* bottom left to top right */
-			mul_v3_fl(dx, 0.75f);
-			negate_v3_v3(v1, dx);
-			sub_v3_v3(v1, dy);
-			copy_v3_v3(v2, dx);
-			add_v3_v3(v2, dy);
-
-			copy_v3_v3(buffer[n++], v1);
-			copy_v3_v3(buffer[n++], v2);
-
-			/* top left to center */
-			mul_v3_fl(dy, 2.0f);
-			add_v3_v3(v1, dy);
-			zero_v3(v2);
-
-			copy_v3_v3(buffer[n++], v1);
-			copy_v3_v3(buffer[n++], v2);
-
-			break;
-		case 2:     /* z axis */
-			line_type = GL_LINE_STRIP;
-
-			/* start at top left */
-			negate_v3_v3(v1, dx);
-			add_v3_v3(v1, dy);
-
-			copy_v3_v3(buffer[n++], v1);
-
-			mul_v3_fl(dx, 2.0f);
-			add_v3_v3(v1, dx);
-
-			copy_v3_v3(buffer[n++], v1);
-
-			mul_v3_fl(dy, 2.0f);
-			sub_v3_v3(v1, dx);
-			sub_v3_v3(v1, dy);
-
-			copy_v3_v3(buffer[n++], v1);
-
-			add_v3_v3(v1, dx);
-
-			copy_v3_v3(buffer[n++], v1);
-
-			break;
-		default:
-			BLI_assert(0);
-			return;
-	}
-
-	for (int i = 0; i < n; i++) {
-		mul_transposed_m3_v3((float (*)[3])viewmat_local_unit, buffer[i]);
-		add_v3_v3(buffer[i], c);
-	}
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, 0, buffer);
-	glDrawArrays(line_type, 0, n);
-	glDisableClientState(GL_VERTEX_ARRAY);
-}
-
-void drawaxes(const float viewmat_local[4][4], float size, char drawtype)
-{
-	int axis;
-	float v1[3] = {0.0, 0.0, 0.0};
-	float v2[3] = {0.0, 0.0, 0.0};
-	float v3[3] = {0.0, 0.0, 0.0};
-
-	glLineWidth(1);
-
-	switch (drawtype) {
-
-		case OB_PLAINAXES:
-			for (axis = 0; axis < 3; axis++) {
-				glBegin(GL_LINES);
-
-				v1[axis] = size;
-				v2[axis] = -size;
-				glVertex3fv(v1);
-				glVertex3fv(v2);
-
-				/* reset v1 & v2 to zero */
-				v1[axis] = v2[axis] = 0.0f;
-
-				glEnd();
-			}
-			break;
-		case OB_SINGLE_ARROW:
-
-			glBegin(GL_LINES);
-			/* in positive z direction only */
-			v1[2] = size;
-			glVertex3fv(v1);
-			glVertex3fv(v2);
-			glEnd();
-
-			/* square pyramid */
-			glBegin(GL_TRIANGLES);
-
-			v2[0] = size * 0.035f; v2[1] = size * 0.035f;
-			v3[0] = size * -0.035f; v3[1] = size * 0.035f;
-			v2[2] = v3[2] = size * 0.75f;
-
-			for (axis = 0; axis < 4; axis++) {
-				if (axis % 2 == 1) {
-					v2[0] = -v2[0];
-					v3[1] = -v3[1];
-				}
-				else {
-					v2[1] = -v2[1];
-					v3[0] = -v3[0];
-				}
-
-				glVertex3fv(v1);
-				glVertex3fv(v2);
-				glVertex3fv(v3);
-
-			}
-			glEnd();
-
-			break;
-		case OB_CUBE:
-			drawcube_size(size);
-			break;
-
-		case OB_CIRCLE:
-			drawcircle_size(size);
-			break;
-
-		case OB_EMPTY_SPHERE:
-			draw_empty_sphere(size);
-			break;
-
-		case OB_EMPTY_CONE:
-			draw_empty_cone(size);
-			break;
-
-		case OB_ARROWS:
-		default:
-		{
-			float viewmat_local_unit[3][3];
-
-			copy_m3_m4(viewmat_local_unit, (float (*)[4])viewmat_local);
-			normalize_m3(viewmat_local_unit);
-
-			for (axis = 0; axis < 3; axis++) {
-				const int arrow_axis = (axis == 0) ? 1 : 0;
-
-				glBegin(GL_LINES);
-
-				v2[axis] = size;
-				glVertex3fv(v1);
-				glVertex3fv(v2);
-
-				v1[axis] = size * 0.85f;
-				v1[arrow_axis] = -size * 0.08f;
-				glVertex3fv(v1);
-				glVertex3fv(v2);
-
-				v1[arrow_axis] = size * 0.08f;
-				glVertex3fv(v1);
-				glVertex3fv(v2);
-
-				glEnd();
-
-				v2[axis] += size * 0.125f;
-
-				draw_xyz_wire(viewmat_local_unit, v2, size, axis);
-
-
-				/* reset v1 & v2 to zero */
-				v1[arrow_axis] = v1[axis] = v2[axis] = 0.0f;
-			}
-			break;
-		}
-	}
-}
-
-
-/* Function to draw an Image on an empty Object */
-static void draw_empty_image(Object *ob, const short dflag, const unsigned char ob_wire_col[4], eStereoViews sview)
-{
-	Image *ima = ob->data;
-	ImBuf *ibuf;
-	ImageUser iuser = *ob->iuser;
-
-	/* Support multi-view */
-	if (ima && (sview == STEREO_RIGHT_ID)) {
-		iuser.multiview_eye = sview;
-		iuser.flag |= IMA_SHOW_STEREO;
-		BKE_image_multiview_index(ima, &iuser);
-	}
-
-	ibuf = BKE_image_acquire_ibuf(ima, &iuser, NULL);
-
-	if (ibuf && (ibuf->rect == NULL) && (ibuf->rect_float != NULL)) {
-		IMB_rect_from_float(ibuf);
-	}
-
-	int ima_x, ima_y;
-
-	/* Get the buffer dimensions so we can fallback to fake ones */
-	if (ibuf && ibuf->rect) {
-		ima_x = ibuf->x;
-		ima_y = ibuf->y;
-	}
-	else {
-		ima_x = 1;
-		ima_y = 1;
-	}
-
-	float sca_x = 1.0f;
-	float sca_y = 1.0f;
-
-	/* Get the image aspect even if the buffer is invalid */
-	if (ima) {
-		if (ima->aspx > ima->aspy) {
-			sca_y = ima->aspy / ima->aspx;
-		}
-		else if (ima->aspx < ima->aspy) {
-			sca_x = ima->aspx / ima->aspy;
-		}
-	}
-
-	/* Calculate the scale center based on object's origin */
-	float ofs_x = ob->ima_ofs[0] * ima_x;
-	float ofs_y = ob->ima_ofs[1] * ima_y;
-
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	/* Calculate Image scale */
-	float scale = ob->empty_drawsize / max_ff((float)ima_x * sca_x, (float)ima_y * sca_y);
-
-	/* Set the object scale */
-	glScalef(scale * sca_x, scale * sca_y, 1.0f);
-
-	if (ibuf && ibuf->rect) {
-		const bool use_clip = (U.glalphaclip != 1.0f);
-		int zoomfilter = (U.gameflags & USER_DISABLE_MIPMAP) ? GL_NEAREST : GL_LINEAR;
-		/* Setup GL params */
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-		if (use_clip) {
-			glEnable(GL_ALPHA_TEST);
-			glAlphaFunc(GL_GREATER, U.glalphaclip);
-		}
-
-		/* Use the object color and alpha */
-		glColor4fv(ob->col);
-
-		/* Draw the Image on the screen */
-		glaDrawPixelsTex(ofs_x, ofs_y, ima_x, ima_y, GL_RGBA, GL_UNSIGNED_BYTE, zoomfilter, ibuf->rect);
-
-		glDisable(GL_BLEND);
-
-		if (use_clip) {
-			glDisable(GL_ALPHA_TEST);
-			glAlphaFunc(GL_ALWAYS, 0.0f);
-		}
-	}
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		glColor3ubv(ob_wire_col);
-	}
-
-	/* Calculate the outline vertex positions */
-	glBegin(GL_LINE_LOOP);
-	glVertex2f(ofs_x, ofs_y);
-	glVertex2f(ofs_x + ima_x, ofs_y);
-	glVertex2f(ofs_x + ima_x, ofs_y + ima_y);
-	glVertex2f(ofs_x, ofs_y + ima_y);
-	glEnd();
-
-	/* Reset GL settings */
-	glPopMatrix();
-
-	BKE_image_release_ibuf(ima, ibuf, NULL);
-}
-
 static void circball_array_fill(float verts[CIRCLE_RESOL][3], const float cent[3], float rad, const float tmat[4][4])
 {
 	float vx[3], vy[3];
@@ -747,838 +235,17 @@ static void circball_array_fill(float verts[CIRCLE_RESOL][3], const float cent[3
 	}
 }
 
-void drawcircball(int mode, const float cent[3], float rad, const float tmat[4][4])
+void imm_drawcircball(const float cent[3], float rad, const float tmat[4][4], unsigned pos)
 {
 	float verts[CIRCLE_RESOL][3];
 
 	circball_array_fill(verts, cent, rad, tmat);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, 0, verts);
-	glDrawArrays(mode, 0, CIRCLE_RESOL);
-	glDisableClientState(GL_VERTEX_ARRAY);
-}
-
-/* circle for object centers, special_color is for library or ob users */
-static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], int selstate, bool special_color)
-{
-	const float size = ED_view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f;
-	float verts[CIRCLE_RESOL][3];
-
-	/* using glDepthFunc guarantees that it does write z values,
-	 * but not checks for it, so centers remain visible independent of draw order */
-	if (v3d->zbuf) glDepthFunc(GL_ALWAYS);
-	/* write to near buffer always */
-	glDepthRange(0.0, 0.0);
-	glEnable(GL_BLEND);
-
-	if (special_color) {
-		if (selstate == ACTIVE || selstate == SELECT) glColor4ub(0x88, 0xFF, 0xFF, 155);
-		else glColor4ub(0x55, 0xCC, 0xCC, 155);
-	}
-	else {
-		if (selstate == ACTIVE) UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -80);
-		else if (selstate == SELECT) UI_ThemeColorShadeAlpha(TH_SELECT, 0, -80);
-		else if (selstate == DESELECT) UI_ThemeColorShadeAlpha(TH_TRANSFORM, 0, -80);
-	}
-
-	circball_array_fill(verts, co, size, rv3d->viewinv);
-
-	/* enable vertex array */
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, 0, verts);
-
-	/* 1. draw filled, blended polygon */
-	glDrawArrays(GL_POLYGON, 0, CIRCLE_RESOL);
-
-	/* 2. draw outline */
-	glLineWidth(1);
-	UI_ThemeColorShadeAlpha(TH_WIRE, 0, -30);
-	glDrawArrays(GL_LINE_LOOP, 0, CIRCLE_RESOL);
-
-	/* finish up */
-	glDisableClientState(GL_VERTEX_ARRAY);
-
-	glDepthRange(0.0, 1.0);
-	glDisable(GL_BLEND);
-
-	if (v3d->zbuf) glDepthFunc(GL_LEQUAL);
-}
-
-/* *********** text drawing for object/particles/armature ************* */
-
-typedef struct ViewCachedString {
-	struct ViewCachedString *next;
-	float vec[3];
-	union {
-		unsigned char ub[4];
-		int pack;
-	} col;
-	short sco[2];
-	short xoffs;
-	short flag;
-	int str_len;
-
-	/* str is allocated past the end */
-	char str[0];
-} ViewCachedString;
-
-/* one arena for all 3 string lists */
-static MemArena         *g_v3d_strings_arena = NULL;
-static ViewCachedString *g_v3d_strings[3] = {NULL, NULL, NULL};
-static int g_v3d_string_level = -1;
-
-void view3d_cached_text_draw_begin(void)
-{
-	g_v3d_string_level++;
-
-	BLI_assert(g_v3d_string_level >= 0);
-
-	if (g_v3d_string_level == 0) {
-		BLI_assert(g_v3d_strings_arena == NULL);
-	}
-}
-
-void view3d_cached_text_draw_add(const float co[3],
-                                 const char *str, const size_t str_len,
-                                 short xoffs, short flag,
-                                 const unsigned char col[4])
-{
-	int alloc_len = str_len + 1;
-	ViewCachedString *vos;
-
-	BLI_assert(str_len == strlen(str));
-
-	if (g_v3d_strings_arena == NULL) {
-		g_v3d_strings_arena = BLI_memarena_new(MEM_SIZE_OPTIMAL(1 << 14), __func__);
-	}
-
-	vos = BLI_memarena_alloc(g_v3d_strings_arena, sizeof(ViewCachedString) + alloc_len);
-
-	BLI_LINKS_PREPEND(g_v3d_strings[g_v3d_string_level], vos);
-
-	copy_v3_v3(vos->vec, co);
-	copy_v4_v4_uchar(vos->col.ub, col);
-	vos->xoffs = xoffs;
-	vos->flag = flag;
-	vos->str_len = str_len;
-
-	/* allocate past the end */
-	memcpy(vos->str, str, alloc_len);
-}
-
-void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	ViewCachedString *vos;
-	int tot = 0;
-
-	BLI_assert(g_v3d_string_level >= 0 && g_v3d_string_level <= 2);
-
-	/* project first and test */
-	for (vos = g_v3d_strings[g_v3d_string_level]; vos; vos = vos->next) {
-		if (ED_view3d_project_short_ex(ar,
-		                               (vos->flag & V3D_CACHE_TEXT_GLOBALSPACE) ? rv3d->persmat : rv3d->persmatob,
-		                               (vos->flag & V3D_CACHE_TEXT_LOCALCLIP) != 0,
-		                               vos->vec, vos->sco,
-		                               V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
-		{
-			tot++;
-		}
-		else {
-			vos->sco[0] = IS_CLIPPED;
-		}
-	}
-
-	if (tot) {
-		int col_pack_prev = 0;
-
-#if 0
-		bglMats mats; /* ZBuffer depth vars */
-		double ux, uy, uz;
-		float depth;
-
-		if (v3d->zbuf)
-			bgl_get_mats(&mats);
-#endif
-		if (rv3d->rflag & RV3D_CLIPPING) {
-			ED_view3d_clipping_disable();
-		}
-
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
-		wmOrtho2_region_pixelspace(ar);
-		glLoadIdentity();
-
-		if (depth_write) {
-			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-		}
-		else {
-			glDepthMask(0);
-		}
-
-		for (vos = g_v3d_strings[g_v3d_string_level]; vos; vos = vos->next) {
-			if (vos->sco[0] != IS_CLIPPED) {
-				if (col_pack_prev != vos->col.pack) {
-					glColor3ubv(vos->col.ub);
-					col_pack_prev = vos->col.pack;
-				}
-
-				((vos->flag & V3D_CACHE_TEXT_ASCII) ? BLF_draw_default_ascii : BLF_draw_default)(
-				        (float)(vos->sco[0] + vos->xoffs),
-				        (float)(vos->sco[1]),
-				        (depth_write) ? 0.0f : 2.0f,
-				        vos->str,
-				        vos->str_len);
-			}
-		}
-
-		if (depth_write) {
-			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-		}
-		else {
-			glDepthMask(1);
-		}
-
-		glMatrixMode(GL_PROJECTION);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPopMatrix();
-
-		if (rv3d->rflag & RV3D_CLIPPING) {
-			ED_view3d_clipping_enable();
-		}
-	}
-
-	g_v3d_strings[g_v3d_string_level] = NULL;
-
-	if (g_v3d_string_level == 0) {
-		if (g_v3d_strings_arena) {
-			BLI_memarena_free(g_v3d_strings_arena);
-			g_v3d_strings_arena = NULL;
-		}
-	}
-
-	g_v3d_string_level--;
-}
-
-/* ******************** primitive drawing ******************* */
-
-/* draws a cube given the scaling of the cube, assuming that
- * all required matrices have been set (used for drawing empties)
- */
-static void drawcube_size(float size)
-{
-	const GLfloat pos[8][3] = {
-		{-size, -size, -size},
-		{-size, -size,  size},
-		{-size,  size, -size},
-		{-size,  size,  size},
-		{ size, -size, -size},
-		{ size, -size,  size},
-		{ size,  size, -size},
-		{ size,  size,  size}
-	};
-
-	const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6};
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, 0, pos);
-	glDrawRangeElements(GL_LINES, 0, 7, 24, GL_UNSIGNED_BYTE, indices);
-	glDisableClientState(GL_VERTEX_ARRAY);
-}
-
-static void drawshadbuflimits(Lamp *la, float mat[4][4])
-{
-	float sta[3], end[3], lavec[3];
-
-	negate_v3_v3(lavec, mat[2]);
-	normalize_v3(lavec);
-
-	madd_v3_v3v3fl(sta, mat[3], lavec, la->clipsta);
-	madd_v3_v3v3fl(end, mat[3], lavec, la->clipend);
-
-	glBegin(GL_LINES);
-	glVertex3fv(sta);
-	glVertex3fv(end);
-	glEnd();
-
-	glPointSize(3.0);
-	glBegin(GL_POINTS);
-	glVertex3fv(sta);
-	glVertex3fv(end);
-	glEnd();
-}
-
-static void spotvolume(float lvec[3], float vvec[3], const float inp)
-{
-	/* camera is at 0,0,0 */
-	float temp[3], plane[3], mat1[3][3], mat2[3][3], mat3[3][3], mat4[3][3], q[4], co, si, angle;
-
-	normalize_v3(lvec);
-	normalize_v3(vvec);             /* is this the correct vector ? */
-
-	cross_v3_v3v3(temp, vvec, lvec);      /* equation for a plane through vvec and lvec */
-	cross_v3_v3v3(plane, lvec, temp);     /* a plane perpendicular to this, parallel with lvec */
-
-	/* vectors are exactly aligned, use the X axis, this is arbitrary */
-	if (normalize_v3(plane) == 0.0f)
-		plane[1] = 1.0f;
-
-	/* now we've got two equations: one of a cone and one of a plane, but we have
-	 * three unknowns. We remove one unknown by rotating the plane to z=0 (the plane normal) */
-
-	/* rotate around cross product vector of (0,0,1) and plane normal, dot product degrees */
-	/* according definition, we derive cross product is (plane[1],-plane[0],0), en cos = plane[2]);*/
-
-	/* translating this comment to english didnt really help me understanding the math! :-) (ton) */
-
-	q[1] =  plane[1];
-	q[2] = -plane[0];
-	q[3] =  0;
-	normalize_v3(&q[1]);
-
-	angle = saacos(plane[2]) / 2.0f;
-	co = cosf(angle);
-	si = sqrtf(1 - co * co);
-
-	q[0] =  co;
-	q[1] *= si;
-	q[2] *= si;
-	q[3] =  0;
-
-	quat_to_mat3(mat1, q);
-
-	/* rotate lamp vector now over acos(inp) degrees */
-	copy_v3_v3(vvec, lvec);
-
-	unit_m3(mat2);
-	co = inp;
-	si = sqrtf(1.0f - inp * inp);
-
-	mat2[0][0] =  co;
-	mat2[1][0] = -si;
-	mat2[0][1] =  si;
-	mat2[1][1] =  co;
-	mul_m3_m3m3(mat3, mat2, mat1);
-
-	mat2[1][0] =  si;
-	mat2[0][1] = -si;
-	mul_m3_m3m3(mat4, mat2, mat1);
-	transpose_m3(mat1);
-
-	mul_m3_m3m3(mat2, mat1, mat3);
-	mul_m3_v3(mat2, lvec);
-	mul_m3_m3m3(mat2, mat1, mat4);
-	mul_m3_v3(mat2, vvec);
-}
-
-static void draw_spot_cone(Lamp *la, float x, float z)
-{
-	z = fabsf(z);
-
-	glBegin(GL_TRIANGLE_FAN);
-	glVertex3f(0.0f, 0.0f, -x);
-
-	if (la->mode & LA_SQUARE) {
-		glVertex3f(z, z, 0);
-		glVertex3f(-z, z, 0);
-		glVertex3f(-z, -z, 0);
-		glVertex3f(z, -z, 0);
-		glVertex3f(z, z, 0);
-	}
-	else {
-		for (int a = 0; a < 33; a++) {
-			float angle = a * M_PI * 2 / (33 - 1);
-			glVertex3f(z * cosf(angle), z * sinf(angle), 0);
-		}
-	}
-
-	glEnd();
-}
-
-static void draw_transp_spot_volume(Lamp *la, float x, float z)
-{
-	glEnable(GL_CULL_FACE);
-	glEnable(GL_BLEND);
-	glDepthMask(0);
-
-	/* draw backside darkening */
-	glCullFace(GL_FRONT);
-
-	glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
-
-	draw_spot_cone(la, x, z);
-
-	/* draw front side lighting */
-	glCullFace(GL_BACK);
-
-	glBlendFunc(GL_ONE, GL_ONE);
-	glColor4f(0.2f, 0.2f, 0.2f, 1.0f);
-
-	draw_spot_cone(la, x, z);
-
-	/* restore state */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable(GL_BLEND);
-	glDepthMask(1);
-	glDisable(GL_CULL_FACE);
-	glCullFace(GL_BACK);
-}
-
-#ifdef WITH_GAMEENGINE
-static void draw_transp_sun_volume(Lamp *la)
-{
-	float box[8][3];
-
-	/* construct box */
-	box[0][0] = box[1][0] = box[2][0] = box[3][0] = -la->shadow_frustum_size;
-	box[4][0] = box[5][0] = box[6][0] = box[7][0] = +la->shadow_frustum_size;
-	box[0][1] = box[1][1] = box[4][1] = box[5][1] = -la->shadow_frustum_size;
-	box[2][1] = box[3][1] = box[6][1] = box[7][1] = +la->shadow_frustum_size;
-	box[0][2] = box[3][2] = box[4][2] = box[7][2] = -la->clipend;
-	box[1][2] = box[2][2] = box[5][2] = box[6][2] = -la->clipsta;
-
-	/* draw edges */
-	draw_box(box, false);
-
-	/* draw faces */
-	glEnable(GL_CULL_FACE);
-	glEnable(GL_BLEND);
-	glDepthMask(0);
-
-	/* draw backside darkening */
-	glCullFace(GL_FRONT);
-
-	glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
-	glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
-
-	draw_box(box, true);
-
-	/* draw front side lighting */
-	glCullFace(GL_BACK);
-
-	glBlendFunc(GL_ONE, GL_ONE);
-	glColor4f(0.2f, 0.2f, 0.2f, 1.0f);
-
-	draw_box(box, true);
-
-	/* restore state */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable(GL_BLEND);
-	glDepthMask(1);
-	glDisable(GL_CULL_FACE);
-	glCullFace(GL_BACK);
-}
-#endif
-
-static void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base,
-                     const char dt, const short dflag, const unsigned char ob_wire_col[4], const bool is_obact)
-{
-	Object *ob = base->object;
-	const float pixsize = ED_view3d_pixel_size(rv3d, ob->obmat[3]);
-	Lamp *la = ob->data;
-	float vec[3], lvec[3], vvec[3], circrad;
-	float lampsize;
-	float imat[4][4];
-
-	unsigned char curcol[4];
-	unsigned char col[4];
-	/* cone can't be drawn for duplicated lamps, because duplilist would be freed */
-	/* the moment of view3d_draw_transp() call */
-	const bool is_view = (rv3d->persp == RV3D_CAMOB && v3d->camera == base->object);
-	const bool drawcone = ((dt > OB_WIRE) &&
-	                       !(G.f & G_PICKSEL) &&
-	                       (la->type == LA_SPOT) &&
-	                       (la->mode & LA_SHOW_CONE) &&
-	                       !(base->flag & OB_FROMDUPLI) &&
-	                       !is_view);
-
-#ifdef WITH_GAMEENGINE
-	const bool drawshadowbox = (
-	        (rv3d->rflag & RV3D_IS_GAME_ENGINE) &&
-	        (dt > OB_WIRE) &&
-	        !(G.f & G_PICKSEL) &&
-	        (la->type == LA_SUN) &&
-	        ((la->mode & LA_SHAD_BUF) ||
-	        (la->mode & LA_SHAD_RAY)) &&
-	        (la->mode & LA_SHOW_SHADOW_BOX) &&
-	        !(base->flag & OB_FROMDUPLI) &&
-	        !is_view);
-#else
-	const bool drawshadowbox = false;
-#endif
-
-	if ((drawcone || drawshadowbox) && !v3d->transp) {
-		/* in this case we need to draw delayed */
-		ED_view3d_after_add(v3d->xray ? &v3d->afterdraw_xraytransp : &v3d->afterdraw_transp, base, dflag);
-		return;
-	}
-
-	/* we first draw only the screen aligned & fixed scale stuff */
-	glPushMatrix();
-	glLoadMatrixf(rv3d->viewmat);
-
-	/* lets calculate the scale: */
-	lampsize = pixsize * ((float)U.obcenter_dia * 0.5f);
-
-	/* and view aligned matrix: */
-	copy_m4_m4(imat, rv3d->viewinv);
-	normalize_v3(imat[0]);
-	normalize_v3(imat[1]);
-
-	/* lamp center */
-	copy_v3_v3(vec, ob->obmat[3]);
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		/* for AA effects */
-		curcol[0] = ob_wire_col[0];
-		curcol[1] = ob_wire_col[1];
-		curcol[2] = ob_wire_col[2];
-		curcol[3] = 154;
-		glColor4ubv(curcol);
-	}
-
-	glLineWidth(1);
-
-	if (lampsize > 0.0f) {
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			if (ob->id.us > 1) {
-				if (is_obact || (ob->flag & SELECT)) {
-					glColor4ub(0x88, 0xFF, 0xFF, 155);
-				}
-				else {
-					glColor4ub(0x77, 0xCC, 0xCC, 155);
-				}
-			}
-		}
-
-		/* Inner Circle */
-		glEnable(GL_BLEND);
-		drawcircball(GL_LINE_LOOP, vec, lampsize, imat);
-		glDisable(GL_BLEND);
-		drawcircball(GL_POLYGON, vec, lampsize, imat);
-
-		/* restore */
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			if (ob->id.us > 1)
-				glColor4ubv(curcol);
-		}
-
-		/* Outer circle */
-		circrad = 3.0f * lampsize;
-		setlinestyle(3);
-
-		drawcircball(GL_LINE_LOOP, vec, circrad, imat);
-
-		/* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
-		if (la->type != LA_HEMI) {
-			if ((la->mode & LA_SHAD_RAY) || ((la->mode & LA_SHAD_BUF) && (la->type == LA_SPOT))) {
-				drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f * pixsize, imat);
-			}
-		}
-	}
-	else {
-		setlinestyle(3);
-		circrad = 0.0f;
-	}
-
-	/* draw the pretty sun rays */
-	if (la->type == LA_SUN) {
-		float v1[3], v2[3], mat[3][3];
-		short axis;
-
-		/* setup a 45 degree rotation matrix */
-		axis_angle_normalized_to_mat3_ex(mat, imat[2], M_SQRT1_2, M_SQRT1_2);
-
-		/* vectors */
-		mul_v3_v3fl(v1, imat[0], circrad * 1.2f);
-		mul_v3_v3fl(v2, imat[0], circrad * 2.5f);
-
-		/* center */
-		glTranslate3fv(vec);
-
-		setlinestyle(3);
-
-		glBegin(GL_LINES);
-		for (axis = 0; axis < 8; axis++) {
-			glVertex3fv(v1);
-			glVertex3fv(v2);
-			mul_m3_v3(mat, v1);
-			mul_m3_v3(mat, v2);
-		}
-		glEnd();
-
-		glTranslatef(-vec[0], -vec[1], -vec[2]);
-
-	}
-
-	if (la->type == LA_LOCAL) {
-		if (la->mode & LA_SPHERE) {
-			drawcircball(GL_LINE_LOOP, vec, la->dist, imat);
-		}
-	}
-
-	glPopMatrix();  /* back in object space */
-	zero_v3(vec);
-
-	if (is_view) {
-		/* skip drawing extra info */
-	}
-	else if (la->type == LA_SPOT) {
-		float x, y, z, z_abs;
-		copy_v3_fl3(lvec, 0.0f, 0.0f, 1.0f);
-		copy_v3_fl3(vvec, rv3d->persmat[0][2], rv3d->persmat[1][2], rv3d->persmat[2][2]);
-		mul_transposed_mat3_m4_v3(ob->obmat, vvec);
-
-		x = -la->dist;
-		y = cosf(la->spotsize * 0.5f);
-		z = x * sqrtf(1.0f - y * y);
-
-		spotvolume(lvec, vvec, y);
-		mul_v3_fl(lvec, x);
-		mul_v3_fl(vvec, x);
-
-		x *= y;
-
-		z_abs = fabsf(z);
-
-		if (la->mode & LA_SQUARE) {
-			/* draw pyramid */
-			const float vertices[5][3] = {
-			    /* 5 of vertex coords of pyramid */
-			    {0.0f, 0.0f, 0.0f},
-			    {z_abs, z_abs, x},
-			    {-z_abs, -z_abs, x},
-			    {z_abs, -z_abs, x},
-			    {-z_abs, z_abs, x},
-			};
-			const unsigned char indices[] = {
-			    0, 1, 3,
-			    0, 3, 2,
-			    0, 2, 4,
-			    0, 1, 4,
-			};
-
-			/* Draw call:
-			 * activate and specify pointer to vertex array */
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(3, GL_FLOAT, 0, vertices);
-			/* draw the pyramid */
-			glDrawElements(GL_LINE_STRIP, 12, GL_UNSIGNED_BYTE, indices);
-
-			/* deactivate vertex arrays after drawing */
-			glDisableClientState(GL_VERTEX_ARRAY);
-
-			glTranslatef(0.0f, 0.0f, x);
-
-			/* draw the square representing spotbl */
-			if (la->type == LA_SPOT) {
-				float blend = z_abs * (1.0f - pow2f(la->spotblend));
-
-				/* hide line if it is zero size or overlaps with outer border,
-				 * previously it adjusted to always to show it but that seems
-				 * confusing because it doesn't show the actual blend size */
-				if (blend != 0.0f && blend != z_abs) {
-					fdrawbox(blend, -blend, -blend, blend);
-				}
-			}
-		}
-		else {
-
-			/* draw the angled sides of the cone */
-			glBegin(GL_LINE_STRIP);
-			glVertex3fv(vvec);
-			glVertex3fv(vec);
-			glVertex3fv(lvec);
-			glEnd();
-
-			/* draw the circle at the end of the cone */
-			glTranslatef(0.0f, 0.0f, x);
-			circ(0.0f, 0.0f, z_abs);
-
-			/* draw the circle representing spotbl */
-			if (la->type == LA_SPOT) {
-				float blend = z_abs * (1.0f - pow2f(la->spotblend));
-
-				/* hide line if it is zero size or overlaps with outer border,
-				 * previously it adjusted to always to show it but that seems
-				 * confusing because it doesn't show the actual blend size */
-				if (blend != 0.0f && blend != z_abs) {
-					circ(0.0f, 0.0f, blend);
-				}
-			}
-		}
-
-		if (drawcone)
-			draw_transp_spot_volume(la, x, z);
-
-		/* draw clip start, useful for wide cones where its not obvious where the start is */
-		glTranslatef(0.0, 0.0, -x);  /* reverse translation above */
-		glBegin(GL_LINES);
-		if (la->type == LA_SPOT && (la->mode & LA_SHAD_BUF)) {
-			float lvec_clip[3];
-			float vvec_clip[3];
-			float clipsta_fac = la->clipsta / -x;
-
-			interp_v3_v3v3(lvec_clip, vec, lvec, clipsta_fac);
-			interp_v3_v3v3(vvec_clip, vec, vvec, clipsta_fac);
-
-			glVertex3fv(lvec_clip);
-			glVertex3fv(vvec_clip);
-		}
-		/* Else, draw spot direction (using distance as end limit, same as for Area lamp). */
-		else {
-			glVertex3f(0.0, 0.0, -circrad);
-			glVertex3f(0.0, 0.0, -la->dist);
-		}
-		glEnd();
-	}
-	else if (ELEM(la->type, LA_HEMI, LA_SUN)) {
-
-		/* draw the line from the circle along the dist */
-		glBegin(GL_LINES);
-		vec[2] = -circrad;
-		glVertex3fv(vec);
-		vec[2] = -la->dist;
-		glVertex3fv(vec);
-		glEnd();
-
-		if (la->type == LA_HEMI) {
-			/* draw the hemisphere curves */
-			short axis, steps, dir;
-			float outdist, zdist, mul;
-			zero_v3(vec);
-			outdist = 0.14; mul = 1.4; dir = 1;
-
-			setlinestyle(4);
-			/* loop over the 4 compass points, and draw each arc as a LINE_STRIP */
-			for (axis = 0; axis < 4; axis++) {
-				float v[3] = {0.0, 0.0, 0.0};
-				zdist = 0.02;
-
-				glBegin(GL_LINE_STRIP);
-
-				for (steps = 0; steps < 6; steps++) {
-					if (axis == 0 || axis == 1) {       /* x axis up, x axis down */
-						/* make the arcs start at the edge of the energy circle */
-						if (steps == 0) v[0] = dir * circrad;
-						else v[0] = v[0] + dir * (steps * outdist);
-					}
-					else if (axis == 2 || axis == 3) {      /* y axis up, y axis down */
-						/* make the arcs start at the edge of the energy circle */
-						v[1] = (steps == 0) ? (dir * circrad) : (v[1] + dir * (steps * outdist));
-					}
-
-					v[2] = v[2] - steps * zdist;
-
-					glVertex3fv(v);
-
-					zdist = zdist * mul;
-				}
-
-				glEnd();
-				/* flip the direction */
-				dir = -dir;
-			}
-		}
-
-#ifdef WITH_GAMEENGINE
-		if (drawshadowbox) {
-			draw_transp_sun_volume(la);
-		}
-#endif
-
-	}
-	else if (la->type == LA_AREA) {
-		setlinestyle(3);
-		if (la->area_shape == LA_AREA_SQUARE)
-			fdrawbox(-la->area_size * 0.5f, -la->area_size * 0.5f, la->area_size * 0.5f, la->area_size * 0.5f);
-		else if (la->area_shape == LA_AREA_RECT)
-			fdrawbox(-la->area_size * 0.5f, -la->area_sizey * 0.5f, la->area_size * 0.5f, la->area_sizey * 0.5f);
-
-		glBegin(GL_LINES);
-		glVertex3f(0.0, 0.0, -circrad);
-		glVertex3f(0.0, 0.0, -la->dist);
-		glEnd();
-	}
-
-	/* and back to viewspace */
-	glPushMatrix();
-	glLoadMatrixf(rv3d->viewmat);
-	copy_v3_v3(vec, ob->obmat[3]);
-
-	setlinestyle(0);
-
-	if ((la->type == LA_SPOT) && (la->mode & LA_SHAD_BUF) && (is_view == false)) {
-		drawshadbuflimits(la, ob->obmat);
-	}
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		UI_GetThemeColor4ubv(TH_LAMP, col);
-		glColor4ubv(col);
-	}
-
-	glEnable(GL_BLEND);
-
-	if (vec[2] > 0) vec[2] -= circrad;
-	else vec[2] += circrad;
-
-	glBegin(GL_LINES);
-	glVertex3fv(vec);
-	vec[2] = 0;
-	glVertex3fv(vec);
-	glEnd();
-
-	glPointSize(2.0);
-	glBegin(GL_POINTS);
-	glVertex3fv(vec);
-	glEnd();
-
-	glDisable(GL_BLEND);
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		/* restore for drawing extra stuff */
-		glColor3ubv(ob_wire_col);
-	}
-	/* and finally back to org object space! */
-	glPopMatrix();
-}
-
-static void draw_limit_line(float sta, float end, const short dflag, const unsigned char col[3])
-{
-	glBegin(GL_LINES);
-	glVertex3f(0.0, 0.0, -sta);
-	glVertex3f(0.0, 0.0, -end);
-	glEnd();
-
-	if (!(dflag & DRAW_PICKING)) {
-		glPointSize(3.0);
-		glBegin(GL_POINTS);
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			glColor3ubv(col);
-		}
-		glVertex3f(0.0, 0.0, -sta);
-		glVertex3f(0.0, 0.0, -end);
-		glEnd();
+	immBegin(GWN_PRIM_LINE_LOOP, CIRCLE_RESOL);
+	for (int i = 0; i < CIRCLE_RESOL; ++i) {
+		immVertex3fv(pos, verts[i]);
 	}
-}
-
-
-/* yafray: draw camera focus point (cross, similar to aqsis code in tuhopuu) */
-/* qdn: now also enabled for Blender to set focus point for defocus composite node */
-static void draw_focus_cross(float dist, float size)
-{
-	glBegin(GL_LINES);
-	glVertex3f(-size, 0.0f, -dist);
-	glVertex3f(size, 0.0f, -dist);
-	glVertex3f(0.0f, -size, -dist);
-	glVertex3f(0.0f, size, -dist);
-	glEnd();
+	immEnd();
 }
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
@@ -1586,6779 +253,290 @@ unsigned char view3d_camera_border_hack_col[3];
 bool view3d_camera_border_hack_test = false;
 #endif
 
-/* ****************** draw clip data *************** */
-
-static void draw_bundle_sphere(void)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-		gluSphere(qobj, 0.05, 8, 8);
-		gluDeleteQuadric(qobj);
-
-		glEndList();
-	}
-
-	glCallList(displist);
-}
-
-static void draw_viewport_object_reconstruction(
-        Scene *scene, Base *base, const View3D *v3d, const RegionView3D *rv3d,
-        MovieClip *clip, MovieTrackingObject *tracking_object,
-        const short dflag, const unsigned char ob_wire_col[4],
-        int *global_track_index, bool draw_selected)
-{
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track;
-	float mat[4][4], imat[4][4];
-	unsigned char col_unsel[4], col_sel[4];
-	int tracknr = *global_track_index;
-	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
-	float camera_size[3];
-
-	UI_GetThemeColor4ubv(TH_TEXT, col_unsel);
-	UI_GetThemeColor4ubv(TH_SELECT, col_sel);
-
-	BKE_tracking_get_camera_object_matrix(scene, base->object, mat);
-
-	/* we're compensating camera size for bundles size,
-	 * to make it so bundles are always displayed with the same size */
-	copy_v3_v3(camera_size, base->object->size);
-	if ((tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0)
-		mul_v3_fl(camera_size, tracking_object->scale);
-
-	glPushMatrix();
-
-	if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
-		/* current ogl matrix is translated in camera space, bundles should
-		 * be rendered in world space, so camera matrix should be "removed"
-		 * from current ogl matrix */
-		invert_m4_m4(imat, base->object->obmat);
-
-		glMultMatrixf(imat);
-		glMultMatrixf(mat);
-	}
-	else {
-		float obmat[4][4];
-		int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scene->r.cfra);
-
-		BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, framenr, obmat);
-
-		invert_m4_m4(imat, obmat);
-		glMultMatrixf(imat);
-	}
-
-	for (track = tracksbase->first; track; track = track->next) {
-		bool selected = TRACK_SELECTED(track);
-
-		if (draw_selected && !selected)
-			continue;
-
-		if ((track->flag & TRACK_HAS_BUNDLE) == 0)
-			continue;
-
-		if (dflag & DRAW_PICKING)
-			GPU_select_load_id(base->selcol + (tracknr << 16));
-
-		glPushMatrix();
-		glTranslate3fv(track->bundle_pos);
-		glScalef(v3d->bundle_size / 0.05f / camera_size[0],
-		         v3d->bundle_size / 0.05f / camera_size[1],
-		         v3d->bundle_size / 0.05f / camera_size[2]);
-
-		const int v3d_drawtype = view3d_effective_drawtype(v3d);
-		if (v3d_drawtype == OB_WIRE) {
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				if (selected && (track->flag & TRACK_CUSTOMCOLOR) == 0) {
-					glColor3ubv(ob_wire_col);
-				}
-				else {
-					glColor3fv(track->color);
-				}
-			}
-
-			drawaxes(rv3d->viewmatob, 0.05f, v3d->bundle_drawtype);
-		}
-		else if (v3d_drawtype > OB_WIRE) {
-			if (v3d->bundle_drawtype == OB_EMPTY_SPHERE) {
-				/* selection outline */
-				if (selected) {
-					if ((dflag & DRAW_CONSTCOLOR) == 0) {
-						glColor3ubv(ob_wire_col);
-					}
-
-					glLineWidth(2.0f);
-					glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-
-					draw_bundle_sphere();
-
-					glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-				}
-
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					if (track->flag & TRACK_CUSTOMCOLOR) glColor3fv(track->color);
-					else UI_ThemeColor(TH_BUNDLE_SOLID);
-				}
-
-				draw_bundle_sphere();
-			}
-			else {
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					if (selected) {
-						glColor3ubv(ob_wire_col);
-					}
-					else {
-						if (track->flag & TRACK_CUSTOMCOLOR) glColor3fv(track->color);
-						else UI_ThemeColor(TH_WIRE);
-					}
-				}
-
-				drawaxes(rv3d->viewmatob, 0.05f, v3d->bundle_drawtype);
-			}
-		}
-
-		glPopMatrix();
-
-		if ((dflag & DRAW_PICKING) == 0 && (v3d->flag2 & V3D_SHOW_BUNDLENAME)) {
-			float pos[3];
-
-			mul_v3_m4v3(pos, mat, track->bundle_pos);
-			view3d_cached_text_draw_add(pos,
-			                            track->name, strlen(track->name),
-			                            10, V3D_CACHE_TEXT_GLOBALSPACE,
-			                            selected ? col_sel : col_unsel);
-		}
-
-		tracknr++;
-	}
-
-	if ((dflag & DRAW_PICKING) == 0) {
-		if ((v3d->flag2 & V3D_SHOW_CAMERAPATH) && (tracking_object->flag & TRACKING_OBJECT_CAMERA)) {
-			MovieTrackingReconstruction *reconstruction;
-			reconstruction = BKE_tracking_object_get_reconstruction(tracking, tracking_object);
-
-			if (reconstruction->camnr) {
-				MovieReconstructedCamera *camera = reconstruction->cameras;
-
-				UI_ThemeColor(TH_CAMERA_PATH);
-				glLineWidth(2.0f);
-
-				glBegin(GL_LINE_STRIP);
-				for (int a = 0; a < reconstruction->camnr; a++, camera++) {
-					glVertex3fv(camera->mat[3]);
-				}
-				glEnd();
-			}
-		}
-	}
-
-	glPopMatrix();
-
-	*global_track_index = tracknr;
-}
-
-static void draw_viewport_reconstruction(
-        Scene *scene, Base *base, const View3D *v3d, const RegionView3D *rv3d, MovieClip *clip,
-        const short dflag, const unsigned char ob_wire_col[4],
-        const bool draw_selected)
-{
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *tracking_object;
-	int global_track_index = 1;
-
-	if ((v3d->flag2 & V3D_SHOW_RECONSTRUCTION) == 0)
-		return;
-
-	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
-		return;
-
-	GPU_basic_shader_colors(NULL, NULL, 0, 1.0f);
-	GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-
-	tracking_object = tracking->objects.first;
-	while (tracking_object) {
-		draw_viewport_object_reconstruction(
-		        scene, base, v3d, rv3d, clip, tracking_object,
-		        dflag, ob_wire_col, &global_track_index, draw_selected);
-
-		tracking_object = tracking_object->next;
-	}
-
-	/* restore */
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		glColor3ubv(ob_wire_col);
-	}
-
-	if (dflag & DRAW_PICKING)
-		GPU_select_load_id(base->selcol);
-}
-
-static void drawcamera_volume(float near_plane[4][3], float far_plane[4][3], const GLenum mode)
-{
-	glBegin(mode);
-	glVertex3fv(near_plane[0]);
-	glVertex3fv(far_plane[0]);
-	glVertex3fv(far_plane[1]);
-	glVertex3fv(near_plane[1]);
-	glEnd();
-
-	glBegin(mode);
-	glVertex3fv(near_plane[1]);
-	glVertex3fv(far_plane[1]);
-	glVertex3fv(far_plane[2]);
-	glVertex3fv(near_plane[2]);
-	glEnd();
-
-	glBegin(mode);
-	glVertex3fv(near_plane[2]);
-	glVertex3fv(far_plane[2]);
-	glVertex3fv(far_plane[3]);
-	glVertex3fv(near_plane[3]);
-	glEnd();
-
-	glBegin(mode);
-	glVertex3fv(far_plane[3]);
-	glVertex3fv(near_plane[3]);
-	glVertex3fv(near_plane[0]);
-	glVertex3fv(far_plane[0]);
-	glEnd();
-}
-
-/* camera frame */
-static void drawcamera_frame(float vec[4][3], const GLenum mode)
-{
-	glBegin(mode);
-	glVertex3fv(vec[0]);
-	glVertex3fv(vec[1]);
-	glVertex3fv(vec[2]);
-	glVertex3fv(vec[3]);
-	glEnd();
-}
-
-/* center point to camera frame */
-static void drawcamera_framelines(float vec[4][3], float origin[3])
-{
-	glBegin(GL_LINE_STRIP);
-	glVertex3fv(vec[1]);
-	glVertex3fv(origin);
-	glVertex3fv(vec[0]);
-	glVertex3fv(vec[3]);
-	glVertex3fv(origin);
-	glVertex3fv(vec[2]);
-	glEnd();
-}
-
-static bool drawcamera_is_stereo3d(Scene *scene, View3D *v3d, Object *ob)
-{
-	return (ob == v3d->camera) &&
-	        (scene->r.scemode & R_MULTIVIEW) != 0 &&
-	        (v3d->stereo3d_flag);
-}
-
-static void drawcamera_stereo3d(
-        Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const Camera *cam,
-        float vec[4][3], float drawsize, const float scale[3])
-{
-	float obmat[4][4];
-	float vec_lr[2][4][3];
-	const float fac = (cam->stereo.pivot == CAM_S3D_PIVOT_CENTER) ? 2.0f : 1.0f;
-	float origin[2][3] = {{0}};
-	float tvec[3];
-	const Camera *cam_lr[2];
-	const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
-
-	const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
-	const bool is_stereo3d_plane = (v3d->stereo3d_flag & V3D_S3D_DISPPLANE) && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
-	const bool is_stereo3d_volume = (v3d->stereo3d_flag & V3D_S3D_DISPVOLUME);
-
-	zero_v3(tvec);
-
-	glPushMatrix();
-
-	for (int i = 0; i < 2; i++) {
-		ob = BKE_camera_multiview_render(scene, ob, names[i]);
-		cam_lr[i] = ob->data;
-
-		glLoadMatrixf(rv3d->viewmat);
-		BKE_camera_multiview_model_matrix(&scene->r, ob, names[i], obmat);
-		glMultMatrixf(obmat);
-
-		copy_m3_m3(vec_lr[i], vec);
-		copy_v3_v3(vec_lr[i][3], vec[3]);
-
-		if (cam->stereo.convergence_mode == CAM_S3D_OFFAXIS) {
-			const float shift_x =
-			        ((BKE_camera_multiview_shift_x(&scene->r, ob, names[i]) - cam->shiftx) *
-			         (drawsize * scale[0] * fac));
-
-			for (int j = 0; j < 4; j++) {
-				vec_lr[i][j][0] += shift_x;
-			}
-		}
-
-		if (is_stereo3d_cameras) {
-			/* camera frame */
-			drawcamera_frame(vec_lr[i], GL_LINE_LOOP);
-
-			/* center point to camera frame */
-			drawcamera_framelines(vec_lr[i], tvec);
-		}
-
-		/* connecting line */
-		mul_m4_v3(obmat, origin[i]);
-
-		/* convergence plane */
-		if (is_stereo3d_plane || is_stereo3d_volume) {
-			for (int j = 0; j < 4; j++) {
-				mul_m4_v3(obmat, vec_lr[i][j]);
-			}
-		}
-	}
-
-
-	/* the remaining drawing takes place in the view space */
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (is_stereo3d_cameras) {
-		/* draw connecting lines */
-		GPU_basic_shader_bind_enable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-		GPU_basic_shader_line_stipple(2, 0xAAAA);
-
-		glBegin(GL_LINES);
-		glVertex3fv(origin[0]);
-		glVertex3fv(origin[1]);
-		glEnd();
-
-		GPU_basic_shader_bind_disable(GPU_SHADER_LINE | GPU_SHADER_STIPPLE);
-	}
-
-	/* draw convergence plane */
-	if (is_stereo3d_plane) {
-		float axis_center[3], screen_center[3];
-		float world_plane[4][3];
-		float local_plane[4][3];
-		float offset;
-
-		mid_v3_v3v3(axis_center, origin[0], origin[1]);
-
-		for (int i = 0; i < 4; i++) {
-			mid_v3_v3v3(world_plane[i], vec_lr[0][i], vec_lr[1][i]);
-			sub_v3_v3v3(local_plane[i], world_plane[i], axis_center);
-		}
-
-		mid_v3_v3v3(screen_center, world_plane[0], world_plane[2]);
-		offset = cam->stereo.convergence_distance / len_v3v3(screen_center, axis_center);
-
-		for (int i = 0; i < 4; i++) {
-			mul_v3_fl(local_plane[i], offset);
-			add_v3_v3(local_plane[i], axis_center);
-		}
-
-		glColor3f(0.0f, 0.0f, 0.0f);
-
-		/* camera frame */
-		drawcamera_frame(local_plane, GL_LINE_LOOP);
-
-		if (v3d->stereo3d_convergence_alpha > 0.0f) {
-			glEnable(GL_BLEND);
-			glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
-
-			glColor4f(0.0f, 0.0f, 0.0f, v3d->stereo3d_convergence_alpha);
-
-			drawcamera_frame(local_plane, GL_QUADS);
-
-			glDisable(GL_BLEND);
-			glDepthMask(1);  /* restore write in zbuffer */
-		}
-	}
-
-	/* draw convergence plane */
-	if (is_stereo3d_volume) {
-		float screen_center[3];
-		float near_plane[4][3], far_plane[4][3];
-
-		for (int i = 0; i < 2; i++) {
-			mid_v3_v3v3(screen_center, vec_lr[i][0], vec_lr[i][2]);
-
-			float offset = len_v3v3(screen_center, origin[i]);
-
-			for (int j = 0; j < 4; j++) {
-				sub_v3_v3v3(near_plane[j], vec_lr[i][j], origin[i]);
-				mul_v3_fl(near_plane[j], cam_lr[i]->clipsta / offset);
-				add_v3_v3(near_plane[j], origin[i]);
-
-				sub_v3_v3v3(far_plane[j], vec_lr[i][j], origin[i]);
-				mul_v3_fl(far_plane[j], cam_lr[i]->clipend / offset);
-				add_v3_v3(far_plane[j], origin[i]);
-			}
-
-			/* camera frame */
-			glColor3f(0.0f, 0.0f, 0.0f);
-
-			drawcamera_frame(near_plane, GL_LINE_LOOP);
-			drawcamera_frame(far_plane, GL_LINE_LOOP);
-			drawcamera_volume(near_plane, far_plane, GL_LINE_LOOP);
-
-			if (v3d->stereo3d_volume_alpha > 0.0f) {
-				glEnable(GL_BLEND);
-				glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
-
-				if (i == 0)
-					glColor4f(0.0f, 1.0f, 1.0f, v3d->stereo3d_volume_alpha);
-				else
-					glColor4f(1.0f, 0.0f, 0.0f, v3d->stereo3d_volume_alpha);
-
-				drawcamera_frame(near_plane, GL_QUADS);
-				drawcamera_frame(far_plane, GL_QUADS);
-				drawcamera_volume(near_plane, far_plane, GL_QUADS);
-
-				glDisable(GL_BLEND);
-				glDepthMask(1);  /* restore write in zbuffer */
-			}
-		}
-	}
-
-	glPopMatrix();
-}
-
-/* flag similar to draw_object() */
-static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
-                       const short dflag, const unsigned char ob_wire_col[4])
-{
-	/* a standing up pyramid with (0,0,0) as top */
-	Camera *cam;
-	Object *ob = base->object;
-	float tvec[3];
-	float vec[4][3], asp[2], shift[2], scale[3];
-	MovieClip *clip = BKE_object_movieclip_get(scene, base->object, false);
-
-	const bool is_active = (ob == v3d->camera);
-	const bool is_view = (rv3d->persp == RV3D_CAMOB && is_active);
-	const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
-	const bool is_stereo3d = drawcamera_is_stereo3d(scene, v3d, ob);
-	const bool is_stereo3d_view = (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
-	const bool is_stereo3d_cameras = (ob == scene->camera) &&
-	                                 is_multiview &&
-	                                 is_stereo3d_view &&
-	                                 (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS);
-	const bool is_selection_camera_stereo = (G.f & G_PICKSEL) &&
-	                                        is_view && is_multiview &&
-	                                        is_stereo3d_view;
-
-	/* draw data for movie clip set as active for scene */
-	if (clip) {
-		draw_viewport_reconstruction(scene, base, v3d, rv3d, clip, dflag, ob_wire_col, false);
-		draw_viewport_reconstruction(scene, base, v3d, rv3d, clip, dflag, ob_wire_col, true);
-	}
-
-#ifdef VIEW3D_CAMERA_BORDER_HACK
-	if (is_view && !(G.f & G_PICKSEL)) {
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			view3d_camera_border_hack_col[0] = ob_wire_col[0];
-			view3d_camera_border_hack_col[1] = ob_wire_col[1];
-			view3d_camera_border_hack_col[2] = ob_wire_col[2];
-		}
-		else {
-			float col[4];
-			glGetFloatv(GL_CURRENT_COLOR, col);
-			rgb_float_to_uchar(view3d_camera_border_hack_col, col);
-		}
-		view3d_camera_border_hack_test = true;
-		return;
-	}
-#endif
-
-	cam = ob->data;
-
-	/* BKE_camera_multiview_model_matrix already accounts for scale, don't do it here */
-	if (is_selection_camera_stereo) {
-		scale[0] = 1.0f;
-		scale[1] = 1.0f;
-		scale[2] = 1.0f;
-	}
-	else {
-		scale[0] = 1.0f / len_v3(ob->obmat[0]);
-		scale[1] = 1.0f / len_v3(ob->obmat[1]);
-		scale[2] = 1.0f / len_v3(ob->obmat[2]);
-	}
-
-	float drawsize;
-	BKE_camera_view_frame_ex(scene, cam, cam->drawsize, is_view, scale,
-	                         asp, shift, &drawsize, vec);
-
-	glDisable(GL_CULL_FACE);
-	glLineWidth(1);
-
-	/* camera frame */
-	if (!is_stereo3d_cameras) {
-		/* make sure selection uses the same matrix for camera as the one used while viewing */
-		if (is_selection_camera_stereo) {
-			float obmat[4][4];
-			bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
-
-			glPushMatrix();
-			glLoadMatrixf(rv3d->viewmat);
-			BKE_camera_multiview_model_matrix(&scene->r, ob, is_left ? STEREO_LEFT_NAME : STEREO_RIGHT_NAME, obmat);
-			glMultMatrixf(obmat);
-
-			drawcamera_frame(vec, GL_LINE_LOOP);
-			glPopMatrix();
-		}
-		else {
-			drawcamera_frame(vec, GL_LINE_LOOP);
-		}
-	}
-
-	if (is_view)
-		return;
-
-	zero_v3(tvec);
-
-	/* center point to camera frame */
-	if (!is_stereo3d_cameras)
-		drawcamera_framelines(vec, tvec);
-
-	/* arrow on top */
-	tvec[2] = vec[1][2]; /* copy the depth */
-
-	/* draw an outline arrow for inactive cameras and filled
-	 * for active cameras. We actually draw both outline+filled
-	 * for active cameras so the wire can be seen side-on */
-	for (int i = 0; i < 2; i++) {
-		if (i == 0) glBegin(GL_LINE_LOOP);
-		else if (i == 1 && is_active) glBegin(GL_TRIANGLES);
-		else break;
-
-		tvec[0] = shift[0] + ((-0.7f * drawsize) * scale[0]);
-		tvec[1] = shift[1] + ((drawsize * (asp[1] + 0.1f)) * scale[1]);
-		glVertex3fv(tvec); /* left */
-
-		tvec[0] = shift[0] + ((0.7f * drawsize) * scale[0]);
-		glVertex3fv(tvec); /* right */
-
-		tvec[0] = shift[0];
-		tvec[1] = shift[1] + ((1.1f * drawsize * (asp[1] + 0.7f)) * scale[1]);
-		glVertex3fv(tvec); /* top */
-
-		glEnd();
-	}
-
-	if ((dflag & DRAW_SCENESET) == 0) {
-		if (cam->flag & (CAM_SHOWLIMITS | CAM_SHOWMIST)) {
-			float nobmat[4][4];
-
-			/* draw in normalized object matrix space */
-			copy_m4_m4(nobmat, ob->obmat);
-			normalize_m4(nobmat);
-
-			glPushMatrix();
-			glLoadMatrixf(rv3d->viewmat);
-			glMultMatrixf(nobmat);
-
-			if (cam->flag & CAM_SHOWLIMITS) {
-				const unsigned char col[3] = {128, 128, 60}, col_hi[3] = {255, 255, 120};
-
-				draw_limit_line(cam->clipsta, cam->clipend, dflag, (is_active ? col_hi : col));
-				/* qdn: was yafray only, now also enabled for Blender to be used with defocus composite node */
-				draw_focus_cross(BKE_camera_object_dof_distance(ob), cam->drawsize);
-			}
-
-			if (cam->flag & CAM_SHOWMIST) {
-				World *world = scene->world;
-				const unsigned char col[3] = {128, 128, 128}, col_hi[3] = {255, 255, 255};
-
-				if (world) {
-					draw_limit_line(world->miststa, world->miststa + world->mistdist,
-					                dflag, (is_active ? col_hi : col));
-				}
-			}
-			glPopMatrix();
-		}
-	}
-
-	/* stereo cameras drawing */
-	if (is_stereo3d) {
-		drawcamera_stereo3d(scene, v3d, rv3d, ob, cam, vec, drawsize, scale);
-	}
-}
-
-/* flag similar to draw_object() */
-static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D *UNUSED(rv3d),
-                        Object *UNUSED(ob), int UNUSED(flag))
-{
-	float vec[3];
-
-	glEnable(GL_BLEND);
-	glLineWidth(1);
-
-	for (int j = 0; j < 3; j++) {
-		vec[2] = 0.25f * j - 0.125f;
-
-		glBegin(GL_LINE_LOOP);
-		for (int i = 0; i < 16; i++) {
-			vec[0] = cosf((float)M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f);
-			vec[1] = sinf((float)M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f);
-			glVertex3fv(vec);
-		}
-		glEnd();
-	}
-
-	for (int j = 0; j < 4; j++) {
-		vec[0] = (((j + 1) % 2) * (j - 1)) * 0.5f;
-		vec[1] = ((j % 2) * (j - 2)) * 0.5f;
-		glBegin(GL_LINE_STRIP);
-		for (int i = 0; i < 3; i++) {
-			if (i == 1) {
-				vec[0] *= 0.5f;
-				vec[1] *= 0.5f;
-			}
-
-			vec[2] = 0.25f * i - 0.125f;
-			glVertex3fv(vec);
-		}
-		glEnd();
-	}
-
-	glDisable(GL_BLEND);
-}
-
-static void lattice_draw_verts(Lattice *lt, DispList *dl, BPoint *actbp, short sel)
-{
-	BPoint *bp = lt->def;
-	const float *co = dl ? dl->verts : NULL;
-
-	const int color = sel ? TH_VERTEX_SELECT : TH_VERTEX;
-	UI_ThemeColor(color);
-
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-	glBegin(GL_POINTS);
-
-	for (int w = 0; w < lt->pntsw; w++) {
-		int wxt = (w == 0 || w == lt->pntsw - 1);
-		for (int v = 0; v < lt->pntsv; v++) {
-			int vxt = (v == 0 || v == lt->pntsv - 1);
-			for (int u = 0; u < lt->pntsu; u++, bp++, co += 3) {
-				int uxt = (u == 0 || u == lt->pntsu - 1);
-				if (!(lt->flag & LT_OUTSIDE) || uxt || vxt || wxt) {
-					if (bp->hide == 0) {
-						/* check for active BPoint and ensure selected */
-						if ((bp == actbp) && (bp->f1 & SELECT)) {
-							UI_ThemeColor(TH_ACTIVE_VERT);
-							glVertex3fv(dl ? co : bp->vec);
-							UI_ThemeColor(color);
-						}
-						else if ((bp->f1 & SELECT) == sel) {
-							glVertex3fv(dl ? co : bp->vec);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	glEnd();
-}
-
-static void drawlattice__point(Lattice *lt, DispList *dl, int u, int v, int w, int actdef_wcol)
-{
-	int index = ((w * lt->pntsv + v) * lt->pntsu) + u;
-
-	if (actdef_wcol) {
-		float col[3];
-		MDeformWeight *mdw = defvert_find_index(lt->dvert + index, actdef_wcol - 1);
-
-		weight_to_rgb(col, mdw ? mdw->weight : 0.0f);
-		glColor3fv(col);
-
-	}
-
-	if (dl) {
-		glVertex3fv(&dl->verts[index * 3]);
-	}
-	else {
-		glVertex3fv(lt->def[index].vec);
-	}
-}
-
-#ifdef SEQUENCER_DAG_WORKAROUND
-static void ensure_curve_cache(Scene *scene, Object *object)
-{
-	bool need_recalc = object->curve_cache == NULL;
-	/* Render thread might have freed the curve cache if the
-	 * object is not visible. If the object is also used for
-	 * particles duplication, then render thread might have
-	 * also created curve_cache with only bevel and path
-	 * filled in.
-	 *
-	 * So check for curve_cache != NULL is not fully correct
-	 * here, we also need to check whether display list is
-	 * empty or not.
-	 *
-	 * The trick below tries to optimize calls to displist
-	 * creation for cases curve is empty. Meaning, if the curve
-	 * is empty (without splines) bevel list would also be empty.
-	 * And the thing is, render thread always leaves bevel list
-	 * in a proper state. So if bevel list is here and display
-	 * list is not we need to make display list.
-	 */
-	if (need_recalc == false) {
-		need_recalc = object->curve_cache->disp.first == NULL &&
-		              object->curve_cache->bev.first != NULL;
-	}
-	if (need_recalc) {
-		switch (object->type) {
-			case OB_CURVE:
-			case OB_SURF:
-			case OB_FONT:
-				BKE_displist_make_curveTypes(scene, object, false);
-				break;
-			case OB_MBALL:
-				BKE_displist_make_mball(G.main->eval_ctx, scene, object);
-				break;
-			case OB_LATTICE:
-				BKE_lattice_modifiers_calc(scene, object);
-				break;
-		}
-	}
-}
-#endif
-
-/* lattice color is hardcoded, now also shows weightgroup values in edit mode */
-static void drawlattice(View3D *v3d, Object *ob)
-{
-	Lattice *lt = ob->data;
-	DispList *dl;
-	int u, v, w;
-	int actdef_wcol = 0;
-	const bool is_edit = (lt->editlatt != NULL);
-
-	dl = BKE_displist_find(&ob->curve_cache->disp, DL_VERTS);
-
-	if (is_edit) {
-		lt = lt->editlatt->latt;
-
-		UI_ThemeColor(TH_WIRE_EDIT);
-
-		if (ob->defbase.first && lt->dvert) {
-			actdef_wcol = ob->actdef;
-		}
-	}
-
-	glLineWidth(1);
-	glBegin(GL_LINES);
-	for (w = 0; w < lt->pntsw; w++) {
-		int wxt = (w == 0 || w == lt->pntsw - 1);
-		for (v = 0; v < lt->pntsv; v++) {
-			int vxt = (v == 0 || v == lt->pntsv - 1);
-			for (u = 0; u < lt->pntsu; u++) {
-				int uxt = (u == 0 || u == lt->pntsu - 1);
-
-				if (w && ((uxt || vxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u, v, w - 1, actdef_wcol);
-					drawlattice__point(lt, dl, u, v, w, actdef_wcol);
-				}
-				if (v && ((uxt || wxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u, v - 1, w, actdef_wcol);
-					drawlattice__point(lt, dl, u, v, w, actdef_wcol);
-				}
-				if (u && ((vxt || wxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u - 1, v, w, actdef_wcol);
-					drawlattice__point(lt, dl, u, v, w, actdef_wcol);
-				}
-			}
-		}
-	}
-	glEnd();
-
-	if (is_edit) {
-		BPoint *actbp = BKE_lattice_active_point_get(lt);
-
-		if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-		lattice_draw_verts(lt, dl, actbp, 0);
-		lattice_draw_verts(lt, dl, actbp, 1);
-
-		if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-	}
-}
-
-/* ***************** ******************** */
-
-/* draw callback */
-
-typedef struct drawDMVertSel_userData {
-	MVert *mvert;
-	int active;
-	unsigned char *col[3];  /* (base, sel, act) */
-	char sel_prev;
-} drawDMVertSel_userData;
+/* ***************** BACKBUF SEL (BBS) ********* */
 
-static void drawSelectedVertices__mapFunc(void *userData, int index, const float co[3],
-                                          const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
+#ifdef USE_MESH_DM_SELECT
+static void bbs_obmode_mesh_verts__mapFunc(void *userData, int index, const float co[3],
+                                           const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
 {
-	drawDMVertSel_userData *data = userData;
+	drawMVertOffset_userData *data = userData;
 	MVert *mv = &data->mvert[index];
 
 	if (!(mv->flag & ME_HIDE)) {
-		const char sel = (index == data->active) ? 2 : (mv->flag & SELECT);
-		if (sel != data->sel_prev) {
-			glColor3ubv(data->col[sel]);
-			data->sel_prev = sel;
-		}
-
-		glVertex3fv(co);
+		int selcol;
+		GPU_select_index_get(data->offset + index, &selcol);
+		immAttrib1u(data->col, selcol);
+		immVertex3fv(data->pos, co);
 	}
 }
 
-static void drawSelectedVertices(DerivedMesh *dm, Mesh *me)
-{
-	drawDMVertSel_userData data;
-
-	/* TODO define selected color */
-	unsigned char base_col[3] = {0x0, 0x0, 0x0};
-	unsigned char sel_col[3] = {0xd8, 0xb8, 0x0};
-	unsigned char act_col[3] = {0xff, 0xff, 0xff};
-
-	data.mvert = me->mvert;
-	data.active = BKE_mesh_mselect_active_get(me, ME_VSEL);
-	data.sel_prev = 0xff;
-
-	data.col[0] = base_col;
-	data.col[1] = sel_col;
-	data.col[2] = act_col;
-
-	glBegin(GL_POINTS);
-	dm->foreachMappedVert(dm, drawSelectedVertices__mapFunc, &data, DM_FOREACH_NOP);
-	glEnd();
-}
-
-/* ************** DRAW MESH ****************** */
-
-/* First section is all the "simple" draw routines,
- * ones that just pass some sort of primitive to GL,
- * with perhaps various options to control lighting,
- * color, etc.
- *
- * These routines should not have user interface related
- * logic!!!
- */
-
-static void calcDrawDMNormalScale(Object *ob, drawDMNormal_userData *data)
-{
-	float obmat[3][3];
-
-	copy_m3_m4(obmat, ob->obmat);
-
-	data->uniform_scale = is_uniform_scaled_m3(obmat);
-
-	if (!data->uniform_scale) {
-		/* inverted matrix */
-		invert_m3_m3(data->imat, obmat);
-
-		/* transposed inverted matrix */
-		transpose_m3_m3(data->tmat, data->imat);
-	}
-}
-
-static void draw_dm_face_normals__mapFunc(void *userData, int index, const float cent[3], const float no[3])
+static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *dm, int offset)
 {
-	drawDMNormal_userData *data = userData;
-	BMFace *efa = BM_face_at_index(data->bm, index);
-	float n[3];
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		if (!data->uniform_scale) {
-			mul_v3_m3v3(n, data->tmat, no);
-			normalize_v3(n);
-			mul_m3_v3(data->imat, n);
-		}
-		else {
-			copy_v3_v3(n, no);
-		}
+	drawMVertOffset_userData data;
+	Mesh *me = ob->data;
+	MVert *mvert = me->mvert;
+	data.mvert = mvert;
+	data.offset = offset;
 
-		glVertex3fv(cent);
-		glVertex3f(cent[0] + n[0] * data->normalsize,
-		           cent[1] + n[1] * data->normalsize,
-		           cent[2] + n[2] * data->normalsize);
-	}
-}
+	const int imm_len = dm->getNumVerts(dm);
 
-static void draw_dm_face_normals(BMEditMesh *em, Scene *scene, Object *ob, DerivedMesh *dm)
-{
-	drawDMNormal_userData data;
+	if (imm_len == 0) return;
 
-	data.bm = em->bm;
-	data.normalsize = scene->toolsettings->normalsize;
+	Gwn_VertFormat *format = immVertexFormat();
+	data.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	data.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U32, 1, GWN_FETCH_INT);
 
-	calcDrawDMNormalScale(ob, &data);
+	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
-	glBegin(GL_LINES);
-	dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, &data, DM_FOREACH_USE_NORMAL);
-	glEnd();
-}
+	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
-static void draw_dm_face_centers__mapFunc(void *userData, int index, const float cent[3], const float UNUSED(no[3]))
-{
-	drawBMSelect_userData *data = userData;
-	BMFace *efa = BM_face_at_index(data->bm, index);
+	immBeginAtMost(GWN_PRIM_POINTS, imm_len);
+	dm->foreachMappedVert(dm, bbs_obmode_mesh_verts__mapFunc, &data, DM_FOREACH_NOP);
+	immEnd();
 
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) &&
-	    (BM_elem_flag_test(efa, BM_ELEM_SELECT) == data->select))
-	{
-		glVertex3fv(cent);
-	}
+	immUnbindProgram();
 }
-static void draw_dm_face_centers(BMEditMesh *em, DerivedMesh *dm, bool select)
+#else
+static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *UNUSED(dm), int offset)
 {
-	drawBMSelect_userData data = {em->bm, select};
-
-	glBegin(GL_POINTS);
-	dm->foreachMappedFaceCenter(dm, draw_dm_face_centers__mapFunc, &data, DM_FOREACH_NOP);
-	glEnd();
+	Mesh *me = ob->data;
+	Gwn_Batch *batch = DRW_mesh_batch_cache_get_verts_with_select_id(me, offset);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+	GWN_batch_draw(batch);
 }
+#endif
 
-static void draw_dm_vert_normals__mapFunc(void *userData, int index, const float co[3], const float no_f[3], const short no_s[3])
+#ifdef USE_MESH_DM_SELECT
+static void bbs_mesh_verts__mapFunc(void *userData, int index, const float co[3],
+                                    const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
 {
-	drawDMNormal_userData *data = userData;
+	drawBMOffset_userData *data = userData;
 	BMVert *eve = BM_vert_at_index(data->bm, index);
 
 	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-		float no[3], n[3];
-
-		if (no_f) {
-			copy_v3_v3(no, no_f);
-		}
-		else {
-			normal_short_to_float_v3(no, no_s);
-		}
-
-		if (!data->uniform_scale) {
-			mul_v3_m3v3(n, data->tmat, no);
-			normalize_v3(n);
-			mul_m3_v3(data->imat, n);
-		}
-		else {
-			copy_v3_v3(n, no);
-		}
-
-		glVertex3fv(co);
-		glVertex3f(co[0] + n[0] * data->normalsize,
-		           co[1] + n[1] * data->normalsize,
-		           co[2] + n[2] * data->normalsize);
-	}
-}
-
-static void draw_dm_vert_normals(BMEditMesh *em, Scene *scene, Object *ob, DerivedMesh *dm)
-{
-	drawDMNormal_userData data;
-
-	data.bm = em->bm;
-	data.normalsize = scene->toolsettings->normalsize;
-
-	calcDrawDMNormalScale(ob, &data);
-
-	glBegin(GL_LINES);
-	dm->foreachMappedVert(dm, draw_dm_vert_normals__mapFunc, &data, DM_FOREACH_USE_NORMAL);
-	glEnd();
-}
-
-/* Draw verts with color set based on selection */
-static void draw_dm_verts__mapFunc(void *userData, int index, const float co[3],
-                                   const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
-{
-	drawDMVerts_userData *data = userData;
-	BMVert *eve = BM_vert_at_index(data->bm, index);
-
-	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->sel) {
-		/* skin nodes: draw a red circle around the root node(s) */
-		if (data->cd_vskin_offset != -1) {
-			const MVertSkin *vs = BM_ELEM_CD_GET_VOID_P(eve, data->cd_vskin_offset);
-			if (vs->flag & MVERT_SKIN_ROOT) {
-				float radius = (vs->radius[0] + vs->radius[1]) * 0.5f;
-				glEnd();
-
-				glColor4ubv(data->th_skin_root);
-				drawcircball(GL_LINES, co, radius, data->imat);
-
-				glColor4ubv(data->sel ? data->th_vertex_select : data->th_vertex);
-				glBegin(GL_POINTS);
-			}
-		}
-
-		/* draw active in a different color - no need to stop/start point drawing for this :D */
-		if (eve == data->eve_act) {
-			glColor4ubv(data->th_editmesh_active);
-			glVertex3fv(co);
-
-			/* back to regular vertex color */
-			glColor4ubv(data->sel ? data->th_vertex_select : data->th_vertex);
-		}
-		else {
-			glVertex3fv(co);
-		}
+		int selcol;
+		GPU_select_index_get(data->offset + index, &selcol);
+		immAttrib1u(data->col, selcol);
+		immVertex3fv(data->pos, co);
 	}
 }
-
-static void draw_dm_verts(BMEditMesh *em, DerivedMesh *dm, const char sel, BMVert *eve_act,
-                          RegionView3D *rv3d)
+static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
-	drawDMVerts_userData data;
-	data.sel = sel;
-	data.eve_act = eve_act;
+	drawBMOffset_userData data;
 	data.bm = em->bm;
+	data.offset = offset;
+	Gwn_VertFormat *format = immVertexFormat();
+	data.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	data.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U32, 1, GWN_FETCH_INT);
 
-	/* Cache theme values */
-	UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, data.th_editmesh_active);
-	UI_GetThemeColor4ubv(TH_VERTEX_SELECT, data.th_vertex_select);
-	UI_GetThemeColor4ubv(TH_VERTEX, data.th_vertex);
-	UI_GetThemeColor4ubv(TH_SKIN_ROOT, data.th_skin_root);
-
-	/* For skin root drawing */
-	data.cd_vskin_offset = CustomData_get_offset(&em->bm->vdata, CD_MVERT_SKIN);
-	/* view-aligned matrix */
-	mul_m4_m4m4(data.imat, rv3d->viewmat, em->ob->obmat);
-	invert_m4(data.imat);
+	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
 	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-	glBegin(GL_POINTS);
-	dm->foreachMappedVert(dm, draw_dm_verts__mapFunc, &data, DM_FOREACH_NOP);
-	glEnd();
-}
-
-/* Draw edges with color set based on selection */
-static DMDrawOption draw_dm_edges_sel__setDrawOptions(void *userData, int index)
-{
-	BMEdge *eed;
-	drawDMEdgesSel_userData *data = userData;
-	unsigned char *col;
 
-	eed = BM_edge_at_index(data->bm, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		if (eed == data->eed_act) {
-			glColor4ubv(data->actCol);
-		}
-		else {
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-				col = data->selCol;
-			}
-			else {
-				col = data->baseCol;
-			}
-			/* no alpha, this is used so a transparent color can disable drawing unselected edges in editmode */
-			if (col[3] == 0)
-				return DM_DRAW_OPTION_SKIP;
-
-			glColor4ubv(col);
-		}
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static void draw_dm_edges_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol,
-                              unsigned char *selCol, unsigned char *actCol, BMEdge *eed_act)
-{
-	drawDMEdgesSel_userData data;
-
-	data.baseCol = baseCol;
-	data.selCol = selCol;
-	data.actCol = actCol;
-	data.bm = em->bm;
-	data.eed_act = eed_act;
-	dm->drawMappedEdges(dm, draw_dm_edges_sel__setDrawOptions, &data);
-}
-
-/* Draw edges */
-static DMDrawOption draw_dm_edges__setDrawOptions(void *userData, int index)
-{
-	if (BM_elem_flag_test(BM_edge_at_index(userData, index), BM_ELEM_HIDDEN))
-		return DM_DRAW_OPTION_SKIP;
-	else
-		return DM_DRAW_OPTION_NORMAL;
-}
-
-static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm)
-{
-	dm->drawMappedEdges(dm, draw_dm_edges__setDrawOptions, em->bm);
-}
-
-/* Draw edges with color interpolated based on selection */
-static DMDrawOption draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)
-{
-	drawDMEdgesSelInterp_userData *data = userData;
-	if (BM_elem_flag_test(BM_edge_at_index(data->bm, index), BM_ELEM_HIDDEN))
-		return DM_DRAW_OPTION_SKIP;
-	else
-		return DM_DRAW_OPTION_NORMAL;
-}
-static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)
-{
-	drawDMEdgesSelInterp_userData *data = userData;
-	BMEdge *eed = BM_edge_at_index(data->bm, index);
-	unsigned char **cols = userData;
-	unsigned int col0_id = (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT)) ? 2 : 1;
-	unsigned int col1_id = (BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)) ? 2 : 1;
-	unsigned char *col0 = cols[col0_id];
-	unsigned char *col1 = cols[col1_id];
-	unsigned char *col_pt;
-
-	if (col0_id == col1_id) {
-		col_pt = col0;
-	}
-	else if (t == 0.0f) {
-		col_pt = col0;
-	}
-	else if (t == 1.0f) {
-		col_pt = col1;
-	}
-	else {
-		unsigned char  col_blend[4];
-		interp_v4_v4v4_uchar(col_blend, col0, col1, t);
-		glColor4ubv(col_blend);
-		data->lastCol = NULL;
-		return;
-	}
-
-	if (data->lastCol != col_pt) {
-		data->lastCol = col_pt;
-		glColor4ubv(col_pt);
-	}
-}
-
-static void draw_dm_edges_sel_interp(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol)
-{
-	drawDMEdgesSelInterp_userData data;
-	data.bm = em->bm;
-	data.baseCol = baseCol;
-	data.selCol = selCol;
-	data.lastCol = NULL;
+	immBeginAtMost(GWN_PRIM_POINTS, em->bm->totvert);
+	dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, &data, DM_FOREACH_NOP);
+	immEnd();
 
-	dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_sel_interp__setDrawInterpOptions, &data);
+	immUnbindProgram();
 }
-
-static void bm_color_from_weight(float col[3], BMVert *vert, drawDMEdgesWeightInterp_userData *data)
+#else
+static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *UNUSED(dm), int offset)
 {
-	MDeformVert *dvert = BM_ELEM_CD_GET_VOID_P(vert, data->cd_dvert_offset);
-	float weight = defvert_find_weight(dvert, data->vgroup_index);
-
-	if ((weight == 0.0f) &&
-	    ((data->weight_user == OB_DRAW_GROUPUSER_ACTIVE) ||
-	     ((data->weight_user == OB_DRAW_GROUPUSER_ALL) && defvert_is_weight_zero(dvert, data->defgroup_tot))))
-	{
-		copy_v3_v3(col, data->alert_color);
-	}
-	else {
-		weight_to_rgb(col, weight);
-	}
-}
+	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
-static void draw_dm_edges_nop_interp__setDrawInterpOptions(void *UNUSED(userData), int UNUSED(index), float UNUSED(t))
-{
-	/* pass */
+	Mesh *me = em->ob->data;
+	Gwn_Batch *batch = DRW_mesh_batch_cache_get_verts_with_select_id(me, offset);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+	GWN_batch_draw(batch);
 }
+#endif
 
-static void draw_dm_edges_weight_interp__setDrawInterpOptions(void *userData, int index, float t)
+#ifdef USE_MESH_DM_SELECT
+static void bbs_mesh_wire__mapFunc(void *userData, int index, const float v0co[3], const float v1co[3])
 {
-	drawDMEdgesWeightInterp_userData *data = userData;
+	drawBMOffset_userData *data = userData;
 	BMEdge *eed = BM_edge_at_index(data->bm, index);
-	float col[3];
 
-	if (t == 0.0f) {
-		bm_color_from_weight(col, eed->v1, data);
-	}
-	else if (t == 1.0f) {
-		bm_color_from_weight(col, eed->v2, data);
-	}
-	else {
-		float col_v1[3];
-		float col_v2[3];
-
-		bm_color_from_weight(col_v1, eed->v1, data);
-		bm_color_from_weight(col_v2, eed->v2, data);
-		interp_v3_v3v3(col, col_v1, col_v2, t);
+	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+		int selcol;
+		GPU_select_index_get(data->offset + index, &selcol);
+		immAttrib1u(data->col, selcol);
+		immVertex3fv(data->pos, v0co);
+		immVertex3fv(data->pos, v1co);
 	}
-
-	glColor3fv(col);
 }
 
-static void draw_dm_edges_weight_interp(BMEditMesh *em, DerivedMesh *dm, const char weight_user)
+static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
-	drawDMEdgesWeightInterp_userData data;
-	Object *ob = em->ob;
-
+	drawBMOffset_userData data;
 	data.bm = em->bm;
-	data.cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
-	data.defgroup_tot = BLI_listbase_count(&ob->defbase);
-	data.vgroup_index = ob->actdef - 1;
-	data.weight_user = weight_user;
-	UI_GetThemeColor3fv(TH_VERTEX_UNREFERENCED, data.alert_color);
-
-	if ((data.vgroup_index != -1) && (data.cd_dvert_offset != -1)) {
-		glEnable(GL_BLEND);
-		dm->drawMappedEdgesInterp(
-		        dm,
-		        draw_dm_edges_sel_interp__setDrawOptions,
-		        draw_dm_edges_weight_interp__setDrawInterpOptions,
-		        &data);
-		glDisable(GL_BLEND);
-	}
-	else {
-		float col[3];
-
-		if (data.weight_user == OB_DRAW_GROUPUSER_NONE) {
-			weight_to_rgb(col, 0.0f);
-		}
-		else {
-			copy_v3_v3(col, data.alert_color);
-		}
-		glColor3fv(col);
-
-		dm->drawMappedEdgesInterp(
-		        dm,
-		        draw_dm_edges_sel_interp__setDrawOptions,
-		        draw_dm_edges_nop_interp__setDrawInterpOptions,
-		        &data);
-	}
-
-}
-
-static bool draw_dm_edges_weight_check(Mesh *me, View3D *v3d)
-{
-	if (me->drawflag & ME_DRAWEIGHT) {
-		if ((v3d->drawtype == OB_WIRE) ||
-		    (v3d->flag2 & V3D_SOLID_MATCAP) ||
-		    ((v3d->flag2 & V3D_OCCLUDE_WIRE) && (v3d->drawtype > OB_WIRE)))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/* Draw only seam edges */
-static DMDrawOption draw_dm_edges_seams__setDrawOptions(void *userData, int index)
-{
-	BMEdge *eed = BM_edge_at_index(userData, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SEAM))
-		return DM_DRAW_OPTION_NORMAL;
-	else
-		return DM_DRAW_OPTION_SKIP;
-}
-
-static void draw_dm_edges_seams(BMEditMesh *em, DerivedMesh *dm)
-{
-	dm->drawMappedEdges(dm, draw_dm_edges_seams__setDrawOptions, em->bm);
-}
-
-/* Draw only sharp edges */
-static DMDrawOption draw_dm_edges_sharp__setDrawOptions(void *userData, int index)
-{
-	BMEdge *eed = BM_edge_at_index(userData, index);
+	data.offset = offset;
 
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && !BM_elem_flag_test(eed, BM_ELEM_SMOOTH))
-		return DM_DRAW_OPTION_NORMAL;
-	else
-		return DM_DRAW_OPTION_SKIP;
-}
+	Gwn_VertFormat *format = immVertexFormat();
 
-static void draw_dm_edges_sharp(BMEditMesh *em, DerivedMesh *dm)
-{
-	dm->drawMappedEdges(dm, draw_dm_edges_sharp__setDrawOptions, em->bm);
-}
+	const int imm_len = dm->getNumEdges(dm) * 2;
 
-#ifdef WITH_FREESTYLE
+	if (imm_len == 0) return;
 
-static bool draw_dm_test_freestyle_edge_mark(BMesh *bm, BMEdge *eed)
-{
-	FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, eed->head.data, CD_FREESTYLE_EDGE);
-	if (!fed)
-		return false;
-	return (fed->flag & FREESTYLE_EDGE_MARK) != 0;
-}
-
-/* Draw only Freestyle feature edges */
-static DMDrawOption draw_dm_edges_freestyle__setDrawOptions(void *userData, int index)
-{
-	BMEdge *eed = BM_edge_at_index(userData, index);
+	data.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	data.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U32, 1, GWN_FETCH_INT);
 
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && draw_dm_test_freestyle_edge_mark(userData, eed))
-		return DM_DRAW_OPTION_NORMAL;
-	else
-		return DM_DRAW_OPTION_SKIP;
-}
-
-static void draw_dm_edges_freestyle(BMEditMesh *em, DerivedMesh *dm)
-{
-	dm->drawMappedEdges(dm, draw_dm_edges_freestyle__setDrawOptions, em->bm);
-}
-
-static bool draw_dm_test_freestyle_face_mark(BMesh *bm, BMFace *efa)
-{
-	FreestyleFace *ffa = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_FREESTYLE_FACE);
-	if (!ffa)
-		return false;
-	return (ffa->flag & FREESTYLE_FACE_MARK) != 0;
-}
+	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
-#endif
-
-/* Draw loop normals. */
-static void draw_dm_loop_normals__mapFunc(void *userData, int vertex_index, int face_index,
-                                          const float co[3], const float no[3])
-{
-	if (no) {
-		const drawDMNormal_userData *data = userData;
-		const BMVert *eve = BM_vert_at_index(data->bm, vertex_index);
-		const BMFace *efa = BM_face_at_index(data->bm, face_index);
-		float vec[3];
-
-		if (!(BM_elem_flag_test(eve, BM_ELEM_HIDDEN) || BM_elem_flag_test(efa, BM_ELEM_HIDDEN))) {
-			if (!data->uniform_scale) {
-				mul_v3_m3v3(vec, (float(*)[3])data->tmat, no);
-				normalize_v3(vec);
-				mul_m3_v3((float(*)[3])data->imat, vec);
-			}
-			else {
-				copy_v3_v3(vec, no);
-			}
-			mul_v3_fl(vec, data->normalsize);
-			add_v3_v3(vec, co);
-			glVertex3fv(co);
-			glVertex3fv(vec);
-		}
-	}
-}
-
-static void draw_dm_loop_normals(BMEditMesh *em, Scene *scene, Object *ob, DerivedMesh *dm)
-{
-	drawDMNormal_userData data;
-
-	data.bm = em->bm;
-	data.normalsize = scene->toolsettings->normalsize;
+	glLineWidth(1.0f);
 
-	calcDrawDMNormalScale(ob, &data);
+	immBeginAtMost(GWN_PRIM_LINES, imm_len);
+	dm->foreachMappedEdge(dm, bbs_mesh_wire__mapFunc, &data);
+	immEnd();
 
-	glBegin(GL_LINES);
-	dm->foreachMappedLoop(dm, draw_dm_loop_normals__mapFunc, &data, DM_FOREACH_USE_NORMAL);
-	glEnd();
+	immUnbindProgram();
 }
-
-/* Draw faces with color set based on selection
- * return 2 for the active face so it renders with stipple enabled */
-static DMDrawOption draw_dm_faces_sel__setDrawOptions(void *userData, int index)
-{
-	drawDMFacesSel_userData *data = userData;
-	BMFace *efa = BM_face_at_index(data->bm, index);
-	unsigned char *col;
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		if (efa == data->efa_act) {
-			glColor4ubv(data->cols[2]);
-			return DM_DRAW_OPTION_STIPPLE;
-		}
-		else {
-#ifdef WITH_FREESTYLE
-			col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : draw_dm_test_freestyle_face_mark(data->bm, efa) ? 3 : 0];
 #else
-			col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : 0];
-#endif
-			if (col[3] == 0)
-				return DM_DRAW_OPTION_SKIP;
-			glColor4ubv(col);
-			return DM_DRAW_OPTION_NORMAL;
-		}
-	}
-	return DM_DRAW_OPTION_SKIP;
-}
-
-static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int next_index)
+static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *UNUSED(dm), int offset)
 {
+	glLineWidth(1.0f);
 
-	drawDMFacesSel_userData *data = userData;
-	int i;
-	BMFace *efa;
-	BMFace *next_efa;
-
-	unsigned char *col, *next_col;
-
-	i = data->orig_index_mp_to_orig ? data->orig_index_mp_to_orig[index] : index;
-	efa = (i != ORIGINDEX_NONE) ? BM_face_at_index(data->bm, i) : NULL;
-	i = data->orig_index_mp_to_orig ? data->orig_index_mp_to_orig[next_index] : next_index;
-	next_efa = (i != ORIGINDEX_NONE) ? BM_face_at_index(data->bm, i) : NULL;
-
-	if (ELEM(NULL, efa, next_efa))
-		return 0;
-
-	if (efa == next_efa)
-		return 1;
-
-	if (efa == data->efa_act || next_efa == data->efa_act)
-		return 0;
-
-#ifdef WITH_FREESTYLE
-	col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : draw_dm_test_freestyle_face_mark(data->bm, efa) ? 3 : 0];
-	next_col = data->cols[BM_elem_flag_test(next_efa, BM_ELEM_SELECT) ? 1 : draw_dm_test_freestyle_face_mark(data->bm, efa) ? 3 : 0];
-#else
-	col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : 0];
-	next_col = data->cols[BM_elem_flag_test(next_efa, BM_ELEM_SELECT) ? 1 : 0];
-#endif
-
-	if (col[3] == 0 || next_col[3] == 0)
-		return 0;
-
-	return col == next_col;
+	Mesh *me = em->ob->data;
+	Gwn_Batch *batch = DRW_mesh_batch_cache_get_edges_with_select_id(me, offset);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+	GWN_batch_draw(batch);
 }
-
-/* also draws the active face */
-#ifdef WITH_FREESTYLE
-static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol,
-                              unsigned char *selCol, unsigned char *actCol, unsigned char *markCol, BMFace *efa_act)
-#else
-static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol,
-                              unsigned char *selCol, unsigned char *actCol, BMFace *efa_act)
-#endif
-{
-	drawDMFacesSel_userData data;
-	data.dm = dm;
-	data.cols[0] = baseCol;
-	data.bm = em->bm;
-	data.cols[1] = selCol;
-	data.cols[2] = actCol;
-#ifdef WITH_FREESTYLE
-	data.cols[3] = markCol;
 #endif
-	data.efa_act = efa_act;
-	/* double lookup */
-	data.orig_index_mp_to_orig  = DM_get_poly_data_layer(dm, CD_ORIGINDEX);
 
-	dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, NULL, draw_dm_faces_sel__compareDrawOptions, &data, DM_DRAW_SKIP_HIDDEN);
-}
-
-static DMDrawOption draw_dm_creases__setDrawOptions(void *userData, int index)
-{
-	drawDMLayer_userData *data = userData;
-	BMesh *bm = data->bm;
-	BMEdge *eed = BM_edge_at_index(bm, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		const float crease = BM_ELEM_CD_GET_FLOAT(eed, data->cd_layer_offset);
-		if (crease != 0.0f) {
-			UI_ThemeColorBlend(TH_WIRE_EDIT, TH_EDGE_CREASE, crease);
-			return DM_DRAW_OPTION_NORMAL;
-		}
-	}
-	return DM_DRAW_OPTION_SKIP;
-}
-static void draw_dm_creases(BMEditMesh *em, DerivedMesh *dm)
+#ifdef USE_MESH_DM_SELECT
+static void bbs_mesh_face(BMEditMesh *em, DerivedMesh *dm, const bool use_select)
 {
-	drawDMLayer_userData data;
+	UNUSED_VARS(dm);
 
+	drawBMOffset_userData data;
 	data.bm = em->bm;
-	data.cd_layer_offset = CustomData_get_offset(&em->bm->edata, CD_CREASE);
-
-	if (data.cd_layer_offset != -1) {
-		glLineWidth(3.0);
-		dm->drawMappedEdges(dm, draw_dm_creases__setDrawOptions, &data);
-	}
-}
-
-static DMDrawOption draw_dm_bweights__setDrawOptions(void *userData, int index)
-{
-	drawDMLayer_userData *data = userData;
-	BMesh *bm = data->bm;
-	BMEdge *eed = BM_edge_at_index(bm, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		const float bweight = BM_ELEM_CD_GET_FLOAT(eed, data->cd_layer_offset);
-		if (bweight != 0.0f) {
-			UI_ThemeColorBlend(TH_WIRE_EDIT, TH_EDGE_BEVEL, bweight);
-			return DM_DRAW_OPTION_NORMAL;
-		}
-	}
-	return DM_DRAW_OPTION_SKIP;
-}
-static void draw_dm_bweights__mapFunc(void *userData, int index, const float co[3],
-                                      const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
-{
-	drawDMLayer_userData *data = userData;
-	BMesh *bm = data->bm;
-	BMVert *eve = BM_vert_at_index(bm, index);
-
-	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-		const float bweight = BM_ELEM_CD_GET_FLOAT(eve, data->cd_layer_offset);
-		if (bweight != 0.0f) {
-			UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_BEVEL, bweight);
-			glVertex3fv(co);
-		}
-	}
-}
-static void draw_dm_bweights(BMEditMesh *em, Scene *scene, DerivedMesh *dm)
-{
-	ToolSettings *ts = scene->toolsettings;
-
-	if (ts->selectmode & SCE_SELECT_VERTEX) {
-		drawDMLayer_userData data;
-
-		data.bm = em->bm;
-		data.cd_layer_offset = CustomData_get_offset(&em->bm->vdata, CD_BWEIGHT);
-
-		if (data.cd_layer_offset != -1) {
-			glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) + 2);
-			glBegin(GL_POINTS);
-			dm->foreachMappedVert(dm, draw_dm_bweights__mapFunc, &data, DM_FOREACH_NOP);
-			glEnd();
-		}
-	}
-	else {
-		drawDMLayer_userData data;
-
-		data.bm = em->bm;
-		data.cd_layer_offset = CustomData_get_offset(&em->bm->edata, CD_BWEIGHT);
-
-		if (data.cd_layer_offset != -1) {
-			glLineWidth(3.0);
-			dm->drawMappedEdges(dm, draw_dm_bweights__setDrawOptions, &data);
-		}
-	}
-}
-
-/* Second section of routines: Combine first sets to form fancy
- * drawing routines (for example rendering twice to get overlays).
- *
- * Also includes routines that are basic drawing but are too
- * specialized to be split out (like drawing creases or measurements).
- */
-
-/* EditMesh drawing routines */
-
-static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit,
-                                BMEditMesh *em, DerivedMesh *cageDM, BMVert *eve_act,
-                                RegionView3D *rv3d)
-{
-	ToolSettings *ts = scene->toolsettings;
-
-	if (v3d->zbuf) glDepthMask(0);  /* disable write in zbuffer, zbuf select */
-
-	for (int sel = 0; sel < 2; sel++) {
-		unsigned char col[4], fcol[4];
-
-		UI_GetThemeColor3ubv(sel ? TH_VERTEX_SELECT : TH_VERTEX, col);
-		UI_GetThemeColor3ubv(sel ? TH_FACE_DOT : TH_WIRE_EDIT, fcol);
-
-		for (int pass = 0; pass < 2; pass++) {
-			float size = UI_GetThemeValuef(TH_VERTEX_SIZE);
-			float fsize = UI_GetThemeValuef(TH_FACEDOT_SIZE);
-
-			if (pass == 0) {
-				if (v3d->zbuf && !(v3d->flag & V3D_ZBUF_SELECT)) {
-					glDisable(GL_DEPTH_TEST);
-					glEnable(GL_BLEND);
-				}
-				else {
-					continue;
-				}
-
-				size = (size > 2.1f ? size / 2.0f : size);
-				fsize = (fsize > 2.1f ? fsize / 2.0f : fsize);
-				col[3] = fcol[3] = 100;
-			}
-			else {
-				col[3] = fcol[3] = 255;
-			}
-
-			if (ts->selectmode & SCE_SELECT_VERTEX) {
-				glPointSize(size);
-				glColor4ubv(col);
-				draw_dm_verts(em, cageDM, sel, eve_act, rv3d);
-			}
-
-			if (check_ob_drawface_dot(scene, v3d, obedit->dt)) {
-				glPointSize(fsize);
-				glColor4ubv(fcol);
-				draw_dm_face_centers(em, cageDM, sel);
-			}
-
-			if (pass == 0) {
-				glDisable(GL_BLEND);
-				glEnable(GL_DEPTH_TEST);
-			}
-		}
-	}
-
-	if (v3d->zbuf) glDepthMask(1);
-}
-
-static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d,
-                                Mesh *me, DerivedMesh *cageDM, short sel_only,
-                                BMEdge *eed_act)
-{
-	ToolSettings *ts = scene->toolsettings;
-	unsigned char wireCol[4], selCol[4], actCol[4];
-
-	/* since this function does transparent... */
-	UI_GetThemeColor4ubv(TH_EDGE_SELECT, selCol);
-	UI_GetThemeColor4ubv(TH_WIRE_EDIT, wireCol);
-	UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, actCol);
-
-	/* when sel only is used, don't render wire, only selected, this is used for
-	 * textured draw mode when the 'edges' option is disabled */
-	if (sel_only)
-		wireCol[3] = 0;
-
-	for (int pass = 0; pass < 2; pass++) {
-		/* show wires in transparent when no zbuf clipping for select */
-		if (pass == 0) {
-			if (v3d->zbuf && (v3d->flag & V3D_ZBUF_SELECT) == 0) {
-				glEnable(GL_BLEND);
-				glDisable(GL_DEPTH_TEST);
-				selCol[3] = 85;
-				if (!sel_only) wireCol[3] = 85;
-			}
-			else {
-				continue;
-			}
-		}
-		else {
-			selCol[3] = 255;
-			if (!sel_only) wireCol[3] = 255;
-		}
-
-		if ((me->drawflag & ME_DRAWEDGES) || (ts->selectmode & SCE_SELECT_EDGE)) {
-			if (cageDM->drawMappedEdgesInterp &&
-			    ((ts->selectmode & SCE_SELECT_VERTEX) || (me->drawflag & ME_DRAWEIGHT)))
-			{
-				if (draw_dm_edges_weight_check(me, v3d)) {
-					// Interpolate vertex weights
-					draw_dm_edges_weight_interp(em, cageDM, ts->weightuser);
-				}
-				else if (ts->selectmode == SCE_SELECT_FACE) {
-					draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
-				}
-				else {
-					// Interpolate vertex selection
-					draw_dm_edges_sel_interp(em, cageDM, wireCol, selCol);
-				}
-			}
-			else {
-				draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
-			}
-		}
-		else {
-			if (!sel_only) {
-				glColor4ubv(wireCol);
-				draw_dm_edges(em, cageDM);
-			}
-		}
-
-		if (pass == 0) {
-			glDisable(GL_BLEND);
-			glEnable(GL_DEPTH_TEST);
-		}
-	}
-}
-
-static void draw_em_measure_stats(ARegion *ar, View3D *v3d, Object *ob, BMEditMesh *em, UnitSettings *unit)
-{
-	/* Do not use ascii when using non-default unit system, some unit chars are utf8 (micro, square, etc.).
-	 * See bug #36090.
-	 */
-	const short txt_flag = V3D_CACHE_TEXT_LOCALCLIP | (unit->system ? 0 : V3D_CACHE_TEXT_ASCII);
-	Mesh *me = ob->data;
-	float v1[3], v2[3], v3[3], vmid[3], fvec[3];
-	char numstr[32]; /* Stores the measurement display text here */
-	size_t numstr_len;
-	const char *conv_float; /* Use a float conversion matching the grid size */
-	unsigned char col[4] = {0, 0, 0, 255}; /* color of the text to draw */
-	float area; /* area of the face */
-	float grid = unit->system ? unit->scale_length : v3d->grid;
-	const bool do_split = (unit->flag & USER_UNIT_OPT_SPLIT) != 0;
-	const bool do_global = (v3d->flag & V3D_GLOBAL_STATS) != 0;
-	const bool do_moving = (G.moving & G_TRANSFORM_EDIT) != 0;
-	/* when 2 edge-info options are enabled, space apart */
-	const bool do_edge_textpair = (me->drawflag & ME_DRAWEXTRA_EDGELEN) && (me->drawflag & ME_DRAWEXTRA_EDGEANG);
-	const float edge_texpair_sep = 0.4f;
-	float clip_planes[4][4];
-	/* allow for displaying shape keys and deform mods */
-	DerivedMesh *dm = EDBM_mesh_deform_dm_get(em);
-	BMIter iter;
-
-	/* make the precision of the display value proportionate to the gridsize */
-
-	if (grid <= 0.01f) conv_float = "%.6g";
-	else if (grid <= 0.1f) conv_float = "%.5g";
-	else if (grid <= 1.0f) conv_float = "%.4g";
-	else if (grid <= 10.0f) conv_float = "%.3g";
-	else conv_float = "%.2g";
-
-	if (me->drawflag & (ME_DRAWEXTRA_EDGELEN | ME_DRAWEXTRA_EDGEANG)) {
-		BoundBox bb;
-		bglMats mats = {{0}};
-		const rcti rect = {0, ar->winx, 0, ar->winy};
-
-		view3d_get_transformation(ar, ar->regiondata, em->ob, &mats);
-		ED_view3d_clipping_calc(&bb, clip_planes, &mats, &rect);
-	}
-
-	if (me->drawflag & ME_DRAWEXTRA_EDGELEN) {
-		BMEdge *eed;
-
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
-
-		if (dm) {
-			BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-		}
-
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			/* draw selected edges, or edges next to selected verts while dragging */
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT) ||
-			    (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
-			                   BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))))
-			{
-				float v1_clip[3], v2_clip[3];
-
-				if (dm) {
-					dm->getVertCo(dm, BM_elem_index_get(eed->v1), v1);
-					dm->getVertCo(dm, BM_elem_index_get(eed->v2), v2);
-				}
-				else {
-					copy_v3_v3(v1, eed->v1->co);
-					copy_v3_v3(v2, eed->v2->co);
-				}
-
-				if (clip_segment_v3_plane_n(v1, v2, clip_planes, 4, v1_clip, v2_clip)) {
-
-					if (do_edge_textpair) {
-						interp_v3_v3v3(vmid, v1, v2, edge_texpair_sep);
-					}
-					else {
-						mid_v3_v3v3(vmid, v1_clip, v2_clip);
-					}
-
-					if (do_global) {
-						mul_mat3_m4_v3(ob->obmat, v1);
-						mul_mat3_m4_v3(ob->obmat, v2);
-					}
-
-					if (unit->system) {
-						numstr_len = bUnit_AsString(numstr, sizeof(numstr), len_v3v3(v1, v2) * unit->scale_length, 3,
-						                            unit->system, B_UNIT_LENGTH, do_split, false);
-					}
-					else {
-						numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), conv_float, len_v3v3(v1, v2));
-					}
-
-					view3d_cached_text_draw_add(vmid, numstr, numstr_len, 0, txt_flag, col);
-				}
-			}
-		}
-	}
-
-	if (me->drawflag & ME_DRAWEXTRA_EDGEANG) {
-		const bool is_rad = (unit->system_rotation == USER_UNIT_ROT_RADIANS);
-		BMEdge *eed;
-
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGEANG, col);
-
-		if (dm) {
-			BM_mesh_elem_index_ensure(em->bm, BM_VERT | BM_FACE);
-		}
-
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			BMLoop *l_a, *l_b;
-			if (BM_edge_loop_pair(eed, &l_a, &l_b)) {
-				/* draw selected edges, or edges next to selected verts while dragging */
-				if (BM_elem_flag_test(eed, BM_ELEM_SELECT) ||
-				    (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
-				                   BM_elem_flag_test(eed->v2, BM_ELEM_SELECT) ||
-				                   /* special case, this is useful to show when verts connected to
-				                    * this edge via a face are being transformed */
-				                   BM_elem_flag_test(l_a->next->next->v, BM_ELEM_SELECT) ||
-				                   BM_elem_flag_test(l_a->prev->v, BM_ELEM_SELECT)       ||
-				                   BM_elem_flag_test(l_b->next->next->v, BM_ELEM_SELECT) ||
-				                   BM_elem_flag_test(l_b->prev->v, BM_ELEM_SELECT)
-				                   )))
-				{
-					float v1_clip[3], v2_clip[3];
-
-					if (dm) {
-						dm->getVertCo(dm, BM_elem_index_get(eed->v1), v1);
-						dm->getVertCo(dm, BM_elem_index_get(eed->v2), v2);
-					}
-					else {
-						copy_v3_v3(v1, eed->v1->co);
-						copy_v3_v3(v2, eed->v2->co);
-					}
-
-					if (clip_segment_v3_plane_n(v1, v2, clip_planes, 4, v1_clip, v2_clip)) {
-						float no_a[3], no_b[3];
-						float angle;
-
-						if (do_edge_textpair) {
-							interp_v3_v3v3(vmid, v2_clip, v1_clip, edge_texpair_sep);
-						}
-						else {
-							mid_v3_v3v3(vmid, v1_clip, v2_clip);
-						}
-
-						if (dm) {
-							dm->getPolyNo(dm, BM_elem_index_get(l_a->f), no_a);
-							dm->getPolyNo(dm, BM_elem_index_get(l_b->f), no_b);
-						}
-						else {
-							copy_v3_v3(no_a, l_a->f->no);
-							copy_v3_v3(no_b, l_b->f->no);
-						}
-
-						if (do_global) {
-							mul_mat3_m4_v3(ob->imat, no_a);
-							mul_mat3_m4_v3(ob->imat, no_b);
-							normalize_v3(no_a);
-							normalize_v3(no_b);
-						}
-
-						angle = angle_normalized_v3v3(no_a, no_b);
-
-						numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%.3f", is_rad ? angle : RAD2DEGF(angle));
-
-						view3d_cached_text_draw_add(vmid, numstr, numstr_len, 0, txt_flag, col);
-					}
-				}
-			}
-		}
-	}
-
-	if (me->drawflag & ME_DRAWEXTRA_FACEAREA) {
-		/* would be nice to use BM_face_calc_area, but that is for 2d faces
-		 * so instead add up tessellation triangle areas */
-		BMFace *f = NULL;
-
-#define DRAW_EM_MEASURE_STATS_FACEAREA()                                                 \
-	if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {                                          \
-		mul_v3_fl(vmid, 1.0f / (float)n);                                                \
-		if (unit->system) {                                                              \
-			numstr_len = bUnit_AsString(                                                 \
-			        numstr, sizeof(numstr),                                              \
-			        (double)(area * unit->scale_length * unit->scale_length),            \
-			        3, unit->system, B_UNIT_AREA, do_split, false);                      \
-		}                                                                                \
-		else {                                                                           \
-			numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), conv_float, area);    \
-		}                                                                                \
-		view3d_cached_text_draw_add(vmid, numstr, numstr_len, 0, txt_flag, col);         \
-	} (void)0
-
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
-
-		if (dm) {
-			BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-		}
-
-		area = 0.0;
-		zero_v3(vmid);
-		int n = 0;
-		for (int i = 0; i < em->tottri; i++) {
-			BMLoop **l = em->looptris[i];
-			if (f && l[0]->f != f) {
-				DRAW_EM_MEASURE_STATS_FACEAREA();
-				zero_v3(vmid);
-				area = 0.0;
-				n = 0;
-			}
-
-			f = l[0]->f;
-
-			if (dm) {
-				dm->getVertCo(dm, BM_elem_index_get(l[0]->v), v1);
-				dm->getVertCo(dm, BM_elem_index_get(l[1]->v), v2);
-				dm->getVertCo(dm, BM_elem_index_get(l[2]->v), v3);
-			}
-			else {
-				copy_v3_v3(v1, l[0]->v->co);
-				copy_v3_v3(v2, l[1]->v->co);
-				copy_v3_v3(v3, l[2]->v->co);
-			}
-
-			add_v3_v3(vmid, v1);
-			add_v3_v3(vmid, v2);
-			add_v3_v3(vmid, v3);
-			n += 3;
-			if (do_global) {
-				mul_mat3_m4_v3(ob->obmat, v1);
-				mul_mat3_m4_v3(ob->obmat, v2);
-				mul_mat3_m4_v3(ob->obmat, v3);
-			}
-			area += area_tri_v3(v1, v2, v3);
-		}
-
-		if (f) {
-			DRAW_EM_MEASURE_STATS_FACEAREA();
-		}
-#undef DRAW_EM_MEASURE_STATS_FACEAREA
-	}
-
-	if (me->drawflag & ME_DRAWEXTRA_FACEANG) {
-		BMFace *efa;
-		const bool is_rad = (unit->system_rotation == USER_UNIT_ROT_RADIANS);
-
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-
-		if (dm) {
-			BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-		}
-
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			const bool is_face_sel = BM_elem_flag_test_bool(efa, BM_ELEM_SELECT);
-
-			if (is_face_sel || do_moving) {
-				BMIter liter;
-				BMLoop *loop;
-				bool is_first = true;
-
-				BM_ITER_ELEM (loop, &liter, efa, BM_LOOPS_OF_FACE) {
-					if (is_face_sel ||
-					    (do_moving &&
-					     (BM_elem_flag_test(loop->v, BM_ELEM_SELECT) ||
-					      BM_elem_flag_test(loop->prev->v, BM_ELEM_SELECT) ||
-					      BM_elem_flag_test(loop->next->v, BM_ELEM_SELECT))))
-					{
-						float v2_local[3];
-
-						/* lazy init center calc */
-						if (is_first) {
-							if (dm) {
-								BMLoop *l_iter, *l_first;
-								float tvec[3];
-								zero_v3(vmid);
-								l_iter = l_first = BM_FACE_FIRST_LOOP(efa);
-								do {
-									dm->getVertCo(dm, BM_elem_index_get(l_iter->v), tvec);
-									add_v3_v3(vmid, tvec);
-								} while ((l_iter = l_iter->next) != l_first);
-								mul_v3_fl(vmid, 1.0f / (float)efa->len);
-							}
-							else {
-								BM_face_calc_center_bounds(efa, vmid);
-							}
-							is_first = false;
-						}
-
-						if (dm) {
-							dm->getVertCo(dm, BM_elem_index_get(loop->prev->v), v1);
-							dm->getVertCo(dm, BM_elem_index_get(loop->v),       v2);
-							dm->getVertCo(dm, BM_elem_index_get(loop->next->v), v3);
-						}
-						else {
-							copy_v3_v3(v1, loop->prev->v->co);
-							copy_v3_v3(v2, loop->v->co);
-							copy_v3_v3(v3, loop->next->v->co);
-						}
-
-						copy_v3_v3(v2_local, v2);
-
-						if (do_global) {
-							mul_mat3_m4_v3(ob->obmat, v1);
-							mul_mat3_m4_v3(ob->obmat, v2);
-							mul_mat3_m4_v3(ob->obmat, v3);
-						}
-
-						float angle = angle_v3v3v3(v1, v2, v3);
-
-						numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%.3f", is_rad ? angle : RAD2DEGF(angle));
-						interp_v3_v3v3(fvec, vmid, v2_local, 0.8f);
-						view3d_cached_text_draw_add(fvec, numstr, numstr_len, 0, txt_flag, col);
-					}
-				}
-			}
-		}
-	}
-}
-
-static void draw_em_indices(BMEditMesh *em)
-{
-	const short txt_flag = V3D_CACHE_TEXT_ASCII | V3D_CACHE_TEXT_LOCALCLIP;
-	BMEdge *e;
-	BMFace *f;
-	BMVert *v;
-	char numstr[32];
-	size_t numstr_len;
-	float pos[3];
-	unsigned char col[4];
-
-	BMIter iter;
-	BMesh *bm = em->bm;
-
-	/* For now, reuse appropriate theme colors from stats text colors */
-	int i = 0;
-	if (em->selectmode & SCE_SELECT_VERTEX) {
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
-			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
-				numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%d", i);
-				view3d_cached_text_draw_add(v->co, numstr, numstr_len, 0, txt_flag, col);
-			}
-			i++;
-		}
-	}
 
-	if (em->selectmode & SCE_SELECT_EDGE) {
-		i = 0;
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
-		BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-			if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
-				numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%d", i);
-				mid_v3_v3v3(pos, e->v1->co, e->v2->co);
-				view3d_cached_text_draw_add(pos, numstr, numstr_len, 0, txt_flag, col);
-			}
-			i++;
-		}
-	}
+	const int tri_len = em->tottri;
+	const int imm_len = tri_len * 3;
+	const char hflag_skip = use_select ? BM_ELEM_HIDDEN : (BM_ELEM_HIDDEN | BM_ELEM_SELECT);
 
-	if (em->selectmode & SCE_SELECT_FACE) {
-		i = 0;
-		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
-		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
-				BM_face_calc_center_mean(f, pos);
-				numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%d", i);
-				view3d_cached_text_draw_add(pos, numstr, numstr_len, 0, txt_flag, col);
-			}
-			i++;
-		}
-	}
-}
-
-static DMDrawOption draw_em_fancy__setFaceOpts(void *userData, int index)
-{
-	BMEditMesh *em = userData;
-
-	if (UNLIKELY(index >= em->bm->totface))
-		return DM_DRAW_OPTION_NORMAL;
-
-	BMFace *efa = BM_face_at_index(em->bm, index);
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
+	if (imm_len == 0) return;
 
-static DMDrawOption draw_em_fancy__setGLSLFaceOpts(void *userData, int index)
-{
-	BMEditMesh *em = userData;
+	Gwn_VertFormat *format = immVertexFormat();
+	data.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	data.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U32, 1, GWN_FETCH_INT);
 
-	if (UNLIKELY(index >= em->bm->totface))
-		return DM_DRAW_OPTION_NORMAL;
+	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
-	BMFace *efa = BM_face_at_index(em->bm, index);
+	immBeginAtMost(GWN_PRIM_TRIS, imm_len);
 
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		return DM_DRAW_OPTION_NORMAL;
+	if (use_select == false) {
+		int selcol;
+		GPU_select_index_get(0, &selcol);
+		immAttrib1u(data.col, selcol);
 	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
-                          Object *ob, BMEditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, const char dt)
-
-{
-	RegionView3D *rv3d = ar->regiondata;
-	Mesh *me = ob->data;
-	const bool use_occlude_wire = (dt > OB_WIRE) && (v3d->flag2 & V3D_OCCLUDE_WIRE);
-	bool use_depth_offset = false;
-
-	glLineWidth(1);
-
-	BM_mesh_elem_table_ensure(em->bm, BM_VERT | BM_EDGE | BM_FACE);
-
-	if (check_object_draw_editweight(me, finalDM)) {
-		if (dt > OB_WIRE) {
-			draw_mesh_paint_weight_faces(finalDM, true, draw_em_fancy__setFaceOpts, me->edit_btmesh);
-
-			ED_view3d_polygon_offset(rv3d, 1.0);
-			glDepthMask(0);
-			use_depth_offset = true;
-		}
-		else {
-			glEnable(GL_DEPTH_TEST);
-			draw_mesh_paint_weight_faces(finalDM, false, draw_em_fancy__setFaceOpts, me->edit_btmesh);
-			draw_mesh_paint_weight_edges(rv3d, finalDM, true, true, draw_dm_edges__setDrawOptions, me->edit_btmesh->bm);
-			glDisable(GL_DEPTH_TEST);
-		}
-	}
-	else if (dt > OB_WIRE) {
-		if (use_occlude_wire) {
-			/* use the cageDM since it always overlaps the editmesh faces */
-			glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-			cageDM->drawMappedFaces(cageDM, draw_em_fancy__setFaceOpts,
-			                        GPU_object_material_bind, NULL, me->edit_btmesh, DM_DRAW_SKIP_HIDDEN | DM_DRAW_NEED_NORMALS);
-			GPU_object_material_unbind();
-			glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-		}
-		else if (check_object_draw_texture(scene, v3d, dt)) {
-			if (draw_glsl_material(scene, ob, v3d, dt)) {
-				glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-
-				finalDM->drawMappedFacesGLSL(finalDM, GPU_object_material_bind,
-				                             draw_em_fancy__setGLSLFaceOpts, em);
-				GPU_object_material_unbind();
-
-				glFrontFace(GL_CCW);
-			}
-			else {
-				draw_mesh_textured(scene, v3d, rv3d, ob, finalDM, 0);
-			}
-		}
-		else {
-			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-			finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, GPU_object_material_bind, NULL, me->edit_btmesh, DM_DRAW_SKIP_HIDDEN | DM_DRAW_NEED_NORMALS);
-
-			glFrontFace(GL_CCW);
-
-			GPU_object_material_unbind();
-		}
-
-		/* Setup for drawing wire over, disable zbuffer
-		 * write to show selected edge wires better */
-		UI_ThemeColor(TH_WIRE_EDIT);
-
-		ED_view3d_polygon_offset(rv3d, 1.0);
-		glDepthMask(0);
-		use_depth_offset = true;
-	}
-	else {
-		if (cageDM != finalDM) {
-			UI_ThemeColorBlend(TH_WIRE_EDIT, TH_BACK, 0.7);
-			finalDM->drawEdges(finalDM, 1, 0);
-		}
-	}
-
-	if ((dt > OB_WIRE) && (v3d->flag2 & V3D_RENDER_SHADOW)) {
-		/* pass */
-	}
-	else {
-		/* annoying but active faces is stored differently */
-		BMFace *efa_act = BM_mesh_active_face_get(em->bm, false, true);
-		BMEdge *eed_act = NULL;
-		BMVert *eve_act = NULL;
-
-		if (em->bm->selected.last) {
-			BMEditSelection *ese = em->bm->selected.last;
-			/* face is handled above */
-#if 0
-			if (ese->type == BM_FACE) {
-				efa_act = (BMFace *)ese->data;
-			}
-			else
-#endif
-			if (ese->htype == BM_EDGE) {
-				eed_act = (BMEdge *)ese->ele;
-			}
-			else if (ese->htype == BM_VERT) {
-				eve_act = (BMVert *)ese->ele;
-			}
-		}
-
-		if ((me->drawflag & ME_DRAWFACES) && (use_occlude_wire == false)) {  /* transp faces */
-			unsigned char col1[4], col2[4], col3[4];
-#ifdef WITH_FREESTYLE
-			unsigned char col4[4];
-#endif
-
-			UI_GetThemeColor4ubv(TH_FACE, col1);
-			UI_GetThemeColor4ubv(TH_FACE_SELECT, col2);
-			UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
-#ifdef WITH_FREESTYLE
-			UI_GetThemeColor4ubv(TH_FREESTYLE_FACE_MARK, col4);
-#endif
-
-			glEnable(GL_BLEND);
-			glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
-
-			/* don't draw unselected faces, only selected, this is MUCH nicer when texturing */
-			if (check_object_draw_texture(scene, v3d, dt))
-				col1[3] = 0;
-
-#ifdef WITH_FREESTYLE
-			if (!(me->drawflag & ME_DRAW_FREESTYLE_FACE) || !CustomData_has_layer(&em->bm->pdata, CD_FREESTYLE_FACE))
-				col4[3] = 0;
-
-			draw_dm_faces_sel(em, cageDM, col1, col2, col3, col4, efa_act);
-#else
-			draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
-#endif
-
-			glDisable(GL_BLEND);
-			glDepthMask(1);  /* restore write in zbuffer */
-		}
-		else if (efa_act) {
-			/* even if draw faces is off it would be nice to draw the stipple face
-			 * Make all other faces zero alpha except for the active */
-			unsigned char col1[4], col2[4], col3[4];
-#ifdef WITH_FREESTYLE
-			unsigned char col4[4];
-			col4[3] = 0; /* don't draw */
-#endif
-			col1[3] = col2[3] = 0; /* don't draw */
-
-			UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 
-			glEnable(GL_BLEND);
-			glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
-
-#ifdef WITH_FREESTYLE
-			draw_dm_faces_sel(em, cageDM, col1, col2, col3, col4, efa_act);
-#else
-			draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
-#endif
-
-			glDisable(GL_BLEND);
-			glDepthMask(1);  /* restore write in zbuffer */
-		}
-
-		/* here starts all fancy draw-extra over */
-		if ((me->drawflag & ME_DRAWEDGES) == 0 && check_object_draw_texture(scene, v3d, dt)) {
-			/* we are drawing textures and 'ME_DRAWEDGES' is disabled, don't draw any edges */
-
-			/* only draw selected edges otherwise there is no way of telling if a face is selected */
-			draw_em_fancy_edges(em, scene, v3d, me, cageDM, 1, eed_act);
-
-		}
-		else {
-			if (me->drawflag & ME_DRAWSEAMS) {
-				UI_ThemeColor(TH_EDGE_SEAM);
-				glLineWidth(2);
-
-				draw_dm_edges_seams(em, cageDM);
-
-				glColor3ub(0, 0, 0);
-			}
-
-			if (me->drawflag & ME_DRAWSHARP) {
-				UI_ThemeColor(TH_EDGE_SHARP);
-				glLineWidth(2);
-
-				draw_dm_edges_sharp(em, cageDM);
-
-				glColor3ub(0, 0, 0);
-			}
-
-#ifdef WITH_FREESTYLE
-			if (me->drawflag & ME_DRAW_FREESTYLE_EDGE && CustomData_has_layer(&em->bm->edata, CD_FREESTYLE_EDGE)) {
-				UI_ThemeColor(TH_FREESTYLE_EDGE_MARK);
-				glLineWidth(2);
-
-				draw_dm_edges_freestyle(em, cageDM);
-
-				glColor3ub(0, 0, 0);
-			}
-#endif
-
-			if (me->drawflag & ME_DRAWCREASES) {
-				draw_dm_creases(em, cageDM);
-			}
-			if (me->drawflag & ME_DRAWBWEIGHTS) {
-				draw_dm_bweights(em, scene, cageDM);
-			}
-
-			glLineWidth(1);
-			draw_em_fancy_edges(em, scene, v3d, me, cageDM, 0, eed_act);
-		}
-
-		{
-			draw_em_fancy_verts(scene, v3d, ob, em, cageDM, eve_act, rv3d);
-
-			if (me->drawflag & ME_DRAWNORMALS) {
-				UI_ThemeColor(TH_NORMAL);
-				draw_dm_face_normals(em, scene, ob, cageDM);
-			}
-			if (me->drawflag & ME_DRAW_VNORMALS) {
-				UI_ThemeColor(TH_VNORMAL);
-				draw_dm_vert_normals(em, scene, ob, cageDM);
-			}
-			if (me->drawflag & ME_DRAW_LNORMALS) {
-				UI_ThemeColor(TH_LNORMAL);
-				draw_dm_loop_normals(em, scene, ob, cageDM);
-			}
-
-			if ((me->drawflag & (ME_DRAWEXTRA_EDGELEN |
-			                     ME_DRAWEXTRA_FACEAREA |
-			                     ME_DRAWEXTRA_FACEANG |
-			                     ME_DRAWEXTRA_EDGEANG)) &&
-			    !(v3d->flag2 & V3D_RENDER_OVERRIDE))
-			{
-				draw_em_measure_stats(ar, v3d, ob, em, &scene->unit);
-			}
-
-			if ((G.debug & G_DEBUG) && (me->drawflag & ME_DRAWEXTRA_INDICES) &&
-			    !(v3d->flag2 & V3D_RENDER_OVERRIDE))
-			{
-				draw_em_indices(em);
+	int index = 0;
+	while (index < tri_len) {
+		const BMFace *f = em->looptris[index][0]->f;
+		const int ntris = f->len - 2;
+		if (!BM_elem_flag_test(f, hflag_skip)) {
+			if (use_select) {
+				int selcol;
+				GPU_select_index_get(BM_elem_index_get(f) + 1, &selcol);
+				immAttrib1u(data.col, selcol);
+			}
+			for (int t = 0; t < ntris; t++) {
+				immVertex3fv(data.pos, em->looptris[index][0]->v->co);
+				immVertex3fv(data.pos, em->looptris[index][1]->v->co);
+				immVertex3fv(data.pos, em->looptris[index][2]->v->co);
+				index++;
 			}
 		}
-	}
-
-	if (use_depth_offset) {
-		glDepthMask(1);
-		ED_view3d_polygon_offset(rv3d, 0.0);
-		GPU_object_material_unbind();
-	}
-#if 0  /* currently not needed */
-	else if (use_occlude_wire) {
-		ED_view3d_polygon_offset(rv3d, 0.0);
-	}
-#endif
-}
-
-/* Mesh drawing routines */
-
-static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
-{
-	if ((v3d->transp == false) &&  /* not when we draw the transparent pass */
-	    (ob->mode & OB_MODE_ALL_PAINT) == false) /* not when painting (its distracting) - campbell */
-	{
-		glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
-		glDepthMask(0);
-
-		/* if transparent, we cannot draw the edges for solid select... edges
-		 * have no material info. GPU_object_material_visible will skip the
-		 * transparent faces */
-		if (ob->dtx & OB_DRAWTRANSP) {
-			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-			dm->drawFacesSolid(dm, NULL, 0, GPU_object_material_visible);
-			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-		}
 		else {
-			dm->drawEdges(dm, 0, 1);
+			index += ntris;
 		}
-
-		glDepthMask(1);
 	}
-}
+	immEnd();
 
-static bool object_is_halo(Scene *scene, Object *ob)
-{
-	const Material *ma = give_current_material(ob, 1);
-	return (ma && (ma->material_type == MA_TYPE_HALO) && !BKE_scene_use_new_shading_nodes(scene));
+	immUnbindProgram();
 }
-
-static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
-                            const char dt, const unsigned char ob_wire_col[4], const short dflag)
-{
-#ifdef WITH_GAMEENGINE
-	Object *ob = (rv3d->rflag & RV3D_IS_GAME_ENGINE) ? BKE_object_lod_meshob_get(base->object, scene) : base->object;
 #else
-	Object *ob = base->object;
-#endif
-	Mesh *me = ob->data;
-	eWireDrawMode draw_wire = OBDRAW_WIRE_OFF;
-	bool /* no_verts,*/ no_edges, no_faces;
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	const bool is_obact = (ob == OBACT);
-	int draw_flags = (is_obact && BKE_paint_select_face_test(ob)) ? DRAW_FACE_SELECT : 0;
-
-	if (!dm)
-		return;
-
-	DM_update_materials(dm, ob);
-
-	/* Check to draw dynamic paint colors (or weights from WeightVG modifiers).
-	 * Note: Last "preview-active" modifier in stack will win! */
-	if (DM_get_loop_data_layer(dm, CD_PREVIEW_MLOOPCOL) && modifiers_isPreview(ob))
-		draw_flags |= DRAW_MODIFIERS_PREVIEW;
-
-	/* Unwanted combination */
-	if (draw_flags & DRAW_FACE_SELECT) {
-		draw_wire = OBDRAW_WIRE_OFF;
-	}
-	else if (ob->dtx & OB_DRAWWIRE) {
-		draw_wire = OBDRAW_WIRE_ON_DEPTH; /* draw wire after solid using zoffset and depth buffer adjusment */
-	}
-
-	/* check polys instead of tessfaces because of dyntopo where tessfaces don't exist */
-	if (dm->type == DM_TYPE_CCGDM) {
-		no_edges = !subsurf_has_edges(dm);
-		no_faces = !subsurf_has_faces(dm);
-	}
-	else {
-		no_edges = (dm->getNumEdges(dm) == 0);
-		no_faces = (dm->getNumPolys(dm) == 0);
-	}
-
-	/* vertexpaint, faceselect wants this, but it doesnt work for shaded? */
-	glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-
-	if (dt == OB_BOUNDBOX) {
-		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE) == 0)
-			draw_bounding_volume(ob, ob->boundtype);
-	}
-	else if ((no_faces && no_edges) ||
-	         ((!is_obact || (ob->mode == OB_MODE_OBJECT)) && object_is_halo(scene, ob)))
-	{
-		glPointSize(1.5);
-		dm->drawVerts(dm);
-	}
-	else if ((dt == OB_WIRE) || no_faces) {
-		draw_wire = OBDRAW_WIRE_ON; /* draw wire only, no depth buffer stuff */
-	}
-	else if (((is_obact && ob->mode & OB_MODE_TEXTURE_PAINT)) ||
-	         check_object_draw_texture(scene, v3d, dt))
-	{
-		bool draw_loose = true;
-
-		if ((v3d->flag & V3D_SELECT_OUTLINE) &&
-		    ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
-		    (base->flag & SELECT) &&
-		    !(G.f & G_PICKSEL || (draw_flags & DRAW_FACE_SELECT)) &&
-		    (draw_wire == OBDRAW_WIRE_OFF))
-		{
-			draw_mesh_object_outline(v3d, ob, dm);
-		}
-
-		if (draw_glsl_material(scene, ob, v3d, dt) && !(draw_flags & DRAW_MODIFIERS_PREVIEW)) {
-			Paint *p;
-
-			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-
-			if ((v3d->flag2 & V3D_SHOW_SOLID_MATCAP) && ob->sculpt && (p = BKE_paint_get_active(scene))) {
-				GPUVertexAttribs gattribs;
-				float planes[4][4];
-				float (*fpl)[4] = NULL;
-				const bool fast = (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
-
-				if (ob->sculpt->partial_redraw) {
-					if (ar->do_draw & RGN_DRAW_PARTIAL) {
-						ED_sculpt_redraw_planes_get(planes, ar, rv3d, ob);
-						fpl = planes;
-						ob->sculpt->partial_redraw = 0;
-					}
-				}
-
-				GPU_object_material_bind(1, &gattribs);
-				dm->drawFacesSolid(dm, fpl, fast, NULL);
-				draw_loose = false;
-			}
-			else
-				dm->drawFacesGLSL(dm, GPU_object_material_bind);
-
-#if 0 /* XXX */
-			if (BKE_bproperty_object_get(ob, "Text"))
-				draw_mesh_text(ob, 1);
-#endif
-			GPU_object_material_unbind();
-
-			glFrontFace(GL_CCW);
-
-			if (draw_flags & DRAW_FACE_SELECT)
-				draw_mesh_face_select(rv3d, me, dm, false);
-		}
-		else {
-			draw_mesh_textured(scene, v3d, rv3d, ob, dm, draw_flags);
-		}
-
-		if (draw_loose && !(draw_flags & DRAW_FACE_SELECT)) {
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					glColor3ubv(ob_wire_col);
-				}
-				glLineWidth(1.0f);
-				dm->drawLooseEdges(dm);
-			}
-		}
-	}
-	else if (dt == OB_SOLID) {
-		if (draw_flags & DRAW_MODIFIERS_PREVIEW) {
-			/* for object selection draws no shade */
-			if (dflag & (DRAW_PICKING | DRAW_CONSTCOLOR)) {
-				dm->drawFacesSolid(dm, NULL, 0, GPU_object_material_bind);
-				GPU_object_material_unbind();
-			}
-			else {
-				const float specular[3] = {0.47f, 0.47f, 0.47f};
-
-				/* draw outline */
-				if ((v3d->flag & V3D_SELECT_OUTLINE) &&
-				    ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
-				    (base->flag & SELECT) &&
-				    (draw_wire == OBDRAW_WIRE_OFF) &&
-				    (ob->sculpt == NULL))
-				{
-					draw_mesh_object_outline(v3d, ob, dm);
-				}
-
-				/* materials arent compatible with vertex colors */
-				GPU_end_object_materials();
-
-				/* set default specular */
-				GPU_basic_shader_colors(NULL, specular, 35, 1.0f);
-				GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-
-				dm->drawMappedFaces(dm, NULL, NULL, NULL, NULL, DM_DRAW_USE_COLORS | DM_DRAW_NEED_NORMALS);
-
-				GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-			}
-		}
-		else {
-			Paint *p;
-
-			if ((v3d->flag & V3D_SELECT_OUTLINE) &&
-			    ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
-			    (base->flag & SELECT) &&
-			    (draw_wire == OBDRAW_WIRE_OFF) &&
-			    (ob->sculpt == NULL))
-			{
-				draw_mesh_object_outline(v3d, ob, dm);
-			}
-
-			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-
-			if (ob->sculpt && (p = BKE_paint_get_active(scene))) {
-				float planes[4][4];
-				float (*fpl)[4] = NULL;
-				const bool fast = (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
-
-				if (ob->sculpt->partial_redraw) {
-					if (ar->do_draw & RGN_DRAW_PARTIAL) {
-						ED_sculpt_redraw_planes_get(planes, ar, rv3d, ob);
-						fpl = planes;
-						ob->sculpt->partial_redraw = 0;
-					}
-				}
-
-				dm->drawFacesSolid(dm, fpl, fast, GPU_object_material_bind);
-			}
-			else
-				dm->drawFacesSolid(dm, NULL, 0, GPU_object_material_bind);
-
-			glFrontFace(GL_CCW);
-
-			GPU_object_material_unbind();
-
-			if (!ob->sculpt && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					glColor3ubv(ob_wire_col);
-				}
-				glLineWidth(1.0f);
-				dm->drawLooseEdges(dm);
-			}
-		}
-	}
-	else if (dt == OB_PAINT) {
-		draw_mesh_paint(v3d, rv3d, ob, dm, draw_flags);
-
-		/* since we already draw wire as wp guide, don't draw over the top */
-		draw_wire = OBDRAW_WIRE_OFF;
-	}
-
-	if ((draw_wire != OBDRAW_WIRE_OFF) &&  /* draw extra wire */
-	    /* when overriding with render only, don't bother */
-	    (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID) == 0))
-	{
-		/* When using wireframe object draw in particle edit mode
-		 * the mesh gets in the way of seeing the particles, fade the wire color
-		 * with the background. */
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			if (is_obact && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
-				ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.15f);
-			}
-			else {
-				glColor3ubv(ob_wire_col);
-			}
-		}
-
-		/* If drawing wire and drawtype is not OB_WIRE then we are
-		 * overlaying the wires.
-		 *
-		 * UPDATE bug #10290 - With this wire-only objects can draw
-		 * behind other objects depending on their order in the scene. 2x if 0's below. undo'ing zr's commit: r4059
-		 *
-		 * if draw wire is 1 then just drawing wire, no need for depth buffer stuff,
-		 * otherwise this wire is to overlay solid mode faces so do some depth buffer tricks.
-		 */
-		if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
-			ED_view3d_polygon_offset(rv3d, 1.0);
-			glDepthMask(0);  /* disable write in zbuffer, selected edge wires show better */
-		}
-
-		glLineWidth(1.0f);
-		dm->drawEdges(dm, ((dt == OB_WIRE) || no_faces), (ob->dtx & OB_DRAW_ALL_EDGES) != 0);
-
-		if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
-			glDepthMask(1);
-			ED_view3d_polygon_offset(rv3d, 0.0);
-		}
-	}
-
-	if (is_obact && BKE_paint_select_vert_test(ob)) {
-		const bool use_depth = (v3d->flag & V3D_ZBUF_SELECT) != 0;
-		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-
-		if (!use_depth) glDisable(GL_DEPTH_TEST);
-		else            ED_view3d_polygon_offset(rv3d, 1.0);
-		drawSelectedVertices(dm, ob->data);
-		if (!use_depth) glEnable(GL_DEPTH_TEST);
-		else            ED_view3d_polygon_offset(rv3d, 0.0);
-	}
-	dm->release(dm);
-}
-
-/* returns true if nothing was drawn, for detecting to draw an object center */
-static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
-                             const char dt, const unsigned char ob_wire_col[4], const short dflag)
+static void bbs_mesh_face(BMEditMesh *em, DerivedMesh *UNUSED(dm), const bool use_select)
 {
-	Object *ob = base->object;
-	Object *obedit = scene->obedit;
-	Mesh *me = ob->data;
-	BMEditMesh *em = me->edit_btmesh;
-	bool do_alpha_after = false, drawlinked = false, retval = false;
-
-	/* If we are drawing shadows and any of the materials don't cast a shadow,
-	 * then don't draw the object */
-	if (v3d->flag2 & V3D_RENDER_SHADOW) {
-		for (int i = 1; i <= ob->totcol; ++i) {
-			Material *ma = give_current_material(ob, i);
-			if (ma && !(ma->mode2 & MA_CASTSHADOW)) {
-				return true;
-			}
-		}
-	}
+	Mesh *me = em->ob->data;
+	Gwn_Batch *batch;
 
-	if (obedit && ob != obedit && ob->data == obedit->data) {
-		if (BKE_key_from_object(ob) || BKE_key_from_object(obedit)) {}
-		else if (ob->modifiers.first || obedit->modifiers.first) {}
-		else drawlinked = true;
-	}
-
-	/* backface culling */
-	if (v3d->flag2 & V3D_BACKFACE_CULLING) {
-		glEnable(GL_CULL_FACE);
-		glCullFace(GL_BACK);
-	}
-
-	if (ob == obedit || drawlinked) {
-		DerivedMesh *finalDM, *cageDM;
-
-		if (obedit != ob) {
-			finalDM = cageDM = editbmesh_get_derived_base(
-			        ob, em, scene->customdata_mask);
-		}
-		else {
-			cageDM = editbmesh_get_derived_cage_and_final(
-			        scene, ob, em, scene->customdata_mask,
-			        &finalDM);
-		}
-
-		const bool use_material = ((me->drawflag & ME_DRAWEIGHT) == 0);
-
-		DM_update_materials(finalDM, ob);
-		if (cageDM != finalDM) {
-			DM_update_materials(cageDM, ob);
-		}
-
-		if (use_material) {
-			if (dt > OB_WIRE) {
-				const bool glsl = draw_glsl_material(scene, ob, v3d, dt);
-
-				GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
-			}
-		}
-
-		draw_em_fancy(scene, ar, v3d, ob, em, cageDM, finalDM, dt);
-
-		if (use_material) {
-			GPU_end_object_materials();
-		}
-
-		if (obedit != ob)
-			finalDM->release(finalDM);
+	if (use_select) {
+		batch = DRW_mesh_batch_cache_get_triangles_with_select_id(me, true, 1);
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+		GWN_batch_draw(batch);
 	}
 	else {
-		/* ob->bb was set by derived mesh system, do NULL check just to be sure */
-		if (me->totpoly <= 4 || (!ob->bb || ED_view3d_boundbox_clip(rv3d, ob->bb))) {
-			if (dt > OB_WIRE) {
-				const bool glsl = draw_glsl_material(scene, ob, v3d, dt);
-
-				if (dt == OB_SOLID || glsl) {
-					const bool check_alpha = check_alpha_pass(base);
-					GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl,
-					                           (check_alpha) ? &do_alpha_after : NULL);
-				}
-			}
-
-			draw_mesh_fancy(scene, ar, v3d, rv3d, base, dt, ob_wire_col, dflag);
-
-			GPU_end_object_materials();
-
-			if (me->totvert == 0) retval = true;
-		}
+		int selcol;
+		GPU_select_index_get(0, &selcol);
+		batch = DRW_mesh_batch_cache_get_triangles_with_select_mask(me, true);
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_UNIFORM_COLOR_U32);
+		GWN_batch_uniform_1ui(batch, "color", selcol);
+		GWN_batch_draw(batch);
 	}
-
-	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
-		/* GPU_begin_object_materials checked if this is needed */
-		if (do_alpha_after) {
-			if (ob->dtx & OB_DRAWXRAY) {
-				ED_view3d_after_add(&v3d->afterdraw_xraytransp, base, dflag);
-			}
-			else {
-				ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
-			}
-		}
-		else if (ob->dtx & OB_DRAWXRAY && ob->dtx & OB_DRAWTRANSP) {
-			/* special case xray+transp when alpha is 1.0, without this the object vanishes */
-			if (v3d->xray == 0 && v3d->transp == 0) {
-				ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag);
-			}
-		}
-	}
-
-	if (v3d->flag2 & V3D_BACKFACE_CULLING)
-		glDisable(GL_CULL_FACE);
-
-	return retval;
 }
-
-/* ************** DRAW DISPLIST ****************** */
-
-
-/**
- * \param dl_type_mask Only draw types matching this mask.
- * \return true when nothing was drawn
- */
-static bool drawDispListwire_ex(ListBase *dlbase, unsigned int dl_type_mask)
-{
-	if (dlbase == NULL) return true;
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-
-	for (DispList *dl = dlbase->first; dl; dl = dl->next) {
-		if (dl->parts == 0 || dl->nr == 0) {
-			continue;
-		}
-
-		if ((dl_type_mask & (1 << dl->type)) == 0) {
-			continue;
-		}
-
-		const float *data = dl->verts;
-		int parts;
-
-		switch (dl->type) {
-			case DL_SEGM:
-
-				glVertexPointer(3, GL_FLOAT, 0, data);
-
-				for (parts = 0; parts < dl->parts; parts++)
-					glDrawArrays(GL_LINE_STRIP, parts * dl->nr, dl->nr);
-
-				break;
-			case DL_POLY:
-
-				glVertexPointer(3, GL_FLOAT, 0, data);
-
-				for (parts = 0; parts < dl->parts; parts++)
-					glDrawArrays(GL_LINE_LOOP, parts * dl->nr, dl->nr);
-
-				break;
-			case DL_SURF:
-
-				glVertexPointer(3, GL_FLOAT, 0, data);
-
-				for (parts = 0; parts < dl->parts; parts++) {
-					if (dl->flag & DL_CYCL_U)
-						glDrawArrays(GL_LINE_LOOP, parts * dl->nr, dl->nr);
-					else
-						glDrawArrays(GL_LINE_STRIP, parts * dl->nr, dl->nr);
-				}
-
-				for (int nr = 0; nr < dl->nr; nr++) {
-					int ofs = 3 * dl->nr;
-
-					data = (dl->verts) + 3 * nr;
-					parts = dl->parts;
-
-					if (dl->flag & DL_CYCL_V) glBegin(GL_LINE_LOOP);
-					else glBegin(GL_LINE_STRIP);
-
-					while (parts--) {
-						glVertex3fv(data);
-						data += ofs;
-					}
-					glEnd();
-
-#if 0
-				/* (ton) this code crashes for me when resolv is 86 or higher... no clue */
-				glVertexPointer(3, GL_FLOAT, sizeof(float) * 3 * dl->nr, data + 3 * nr);
-				if (dl->flag & DL_CYCL_V)
-					glDrawArrays(GL_LINE_LOOP, 0, dl->parts);
-				else
-					glDrawArrays(GL_LINE_STRIP, 0, dl->parts);
 #endif
-				}
-				break;
-
-			case DL_INDEX3:
-				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-				glDrawElements(GL_TRIANGLES, 3 * dl->parts, GL_UNSIGNED_INT, dl->index);
-				break;
-
-			case DL_INDEX4:
-				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-				glDrawElements(GL_QUADS, 4 * dl->parts, GL_UNSIGNED_INT, dl->index);
-				break;
-		}
-	}
-
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-
-	return false;
-}
-
-static bool drawDispListwire(ListBase *dlbase, const short ob_type)
-{
-	unsigned int dl_mask = 0xffffffff;
-
-	/* skip fill-faces for curves & fonts */
-	if (ELEM(ob_type, OB_FONT, OB_CURVE)) {
-		dl_mask &= ~((1 << DL_INDEX3) | (1 << DL_INDEX4));
-	}
-
-	return drawDispListwire_ex(dlbase, dl_mask);
-}
-
-static bool index3_nors_incr = true;
-
-static void drawDispListsolid(ListBase *lb, Object *ob, const short dflag,
-                              const unsigned char ob_wire_col[4], const bool use_glsl)
-{
-	GPUVertexAttribs gattribs;
-
-	if (lb == NULL) return;
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-
-	/* track current material, -1 for none (needed for lines) */
-	short col = -1;
-
-	DispList *dl = lb->first;
-	while (dl) {
-		const float *data = dl->verts;
-		const float *ndata = dl->nors;
-
-		switch (dl->type) {
-			case DL_SEGM:
-				if (ob->type == OB_SURF) {
-					if (col != -1) {
-						GPU_object_material_unbind();
-						col = -1;
-					}
-
-					if ((dflag & DRAW_CONSTCOLOR) == 0)
-						glColor3ubv(ob_wire_col);
-
-					// glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-					// glDrawArrays(GL_LINE_STRIP, 0, dl->nr);
-					glBegin(GL_LINE_STRIP);
-					for (int nr = dl->nr; nr; nr--, data += 3)
-						glVertex3fv(data);
-					glEnd();
-				}
-				break;
-			case DL_POLY:
-				if (ob->type == OB_SURF) {
-					if (col != -1) {
-						GPU_object_material_unbind();
-						col = -1;
-					}
-
-					/* for some reason glDrawArrays crashes here in half of the platforms (not osx) */
-					//glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-					//glDrawArrays(GL_LINE_LOOP, 0, dl->nr);
-
-					glBegin(GL_LINE_LOOP);
-					for (int nr = dl->nr; nr; nr--, data += 3)
-						glVertex3fv(data);
-					glEnd();
-				}
-				break;
-			case DL_SURF:
-
-				if (dl->index) {
-					if (col != dl->col) {
-						GPU_object_material_bind(dl->col + 1, use_glsl ? &gattribs : NULL);
-						col = dl->col;
-					}
-					/* FLAT/SMOOTH shading for surfaces */
-					glShadeModel((dl->rt & CU_SMOOTH) ? GL_SMOOTH : GL_FLAT);
-
-					glEnableClientState(GL_NORMAL_ARRAY);
-					glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-					glNormalPointer(GL_FLOAT, 0, dl->nors);
-					glDrawElements(GL_QUADS, 4 * dl->totindex, GL_UNSIGNED_INT, dl->index);
-					glDisableClientState(GL_NORMAL_ARRAY);
-					glShadeModel(GL_SMOOTH);
-				}
-				break;
-
-			case DL_INDEX3:
-				if (col != dl->col) {
-					GPU_object_material_bind(dl->col + 1, use_glsl ? &gattribs : NULL);
-					col = dl->col;
-				}
-
-				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-
-				/* for polys only one normal needed */
-				if (index3_nors_incr) {
-					glEnableClientState(GL_NORMAL_ARRAY);
-					glNormalPointer(GL_FLOAT, 0, dl->nors);
-				}
-				else
-					glNormal3fv(ndata);
-
-				glDrawElements(GL_TRIANGLES, 3 * dl->parts, GL_UNSIGNED_INT, dl->index);
-
-				if (index3_nors_incr)
-					glDisableClientState(GL_NORMAL_ARRAY);
-
-				break;
-
-			case DL_INDEX4:
-				if (col != dl->col) {
-					GPU_object_material_bind(dl->col + 1, use_glsl ? &gattribs : NULL);
-					col = dl->col;
-				}
-
-				glEnableClientState(GL_NORMAL_ARRAY);
-				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-				glNormalPointer(GL_FLOAT, 0, dl->nors);
-				glDrawElements(GL_QUADS, 4 * dl->parts, GL_UNSIGNED_INT, dl->index);
-				glDisableClientState(GL_NORMAL_ARRAY);
-
-				break;
-		}
-		dl = dl->next;
-	}
-
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glFrontFace(GL_CCW);
 
-	if (col != -1) {
-		GPU_object_material_unbind();
-	}
-}
-
-static void drawCurveDMWired(Object *ob)
-{
-	DerivedMesh *dm = ob->derivedFinal;
-	dm->drawEdges(dm, 1, 0);
-}
-
-/* return true when nothing was drawn */
-static bool drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt)
-{
-	Object *ob = base->object;
-	DerivedMesh *dm = ob->derivedFinal;
-
-	if (!dm) {
-		return true;
-	}
-
-	DM_update_materials(dm, ob);
-
-	glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
-
-	if (dt > OB_WIRE && dm->getNumPolys(dm)) {
-		bool glsl = draw_glsl_material(scene, ob, v3d, dt);
-		GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
-
-		if (!glsl)
-			dm->drawFacesSolid(dm, NULL, 0, GPU_object_material_bind);
-		else
-			dm->drawFacesGLSL(dm, GPU_object_material_bind);
-
-		GPU_end_object_materials();
-	}
-	else {
-		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID) == 0)
-			drawCurveDMWired(ob);
-	}
-
-	return false;
-}
-
-/**
- * Only called by #drawDispList
- * \return true when nothing was drawn
- */
-static bool drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
-                                    const char dt, const short dflag, const unsigned char ob_wire_col[4])
-{
-	Object *ob = base->object;
-	ListBase *lb = NULL;
-	DispList *dl;
-	Curve *cu;
-	const bool render_only = (v3d->flag2 & V3D_RENDER_OVERRIDE) != 0;
-	const bool solid = (dt > OB_WIRE);
-
-	switch (ob->type) {
-		case OB_FONT:
-		case OB_CURVE:
-			cu = ob->data;
-
-			lb = &ob->curve_cache->disp;
-
-			if (solid) {
-				const bool has_faces = BKE_displist_has_faces(lb);
-				dl = lb->first;
-				if (dl == NULL) {
-					return true;
-				}
-
-				if (dl->nors == NULL) BKE_displist_normals_add(lb);
-				index3_nors_incr = false;
-
-				if (!render_only) {
-					/* when we have faces, only draw loose-wire */
-					if (has_faces) {
-						drawDispListwire_ex(lb, (1 << DL_SEGM));
-					}
-					else {
-						drawDispListwire(lb, ob->type);
-					}
-				}
-
-				if (has_faces == false) {
-					/* pass */
-				}
-				else {
-					if (draw_glsl_material(scene, ob, v3d, dt)) {
-						GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-						drawDispListsolid(lb, ob, dflag, ob_wire_col, true);
-						GPU_end_object_materials();
-					}
-					else {
-						GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-						drawDispListsolid(lb, ob, dflag, ob_wire_col, false);
-						GPU_end_object_materials();
-					}
-					if (cu->editnurb && cu->bevobj == NULL && cu->taperobj == NULL && cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
-						cpack(0);
-						drawDispListwire(lb, ob->type);
-					}
-				}
-				index3_nors_incr = true;
-			}
-			else {
-				if (!render_only || BKE_displist_has_faces(lb)) {
-					return drawDispListwire(lb, ob->type);
-				}
-			}
-			break;
-		case OB_SURF:
-
-			lb = &ob->curve_cache->disp;
-
-			if (solid) {
-				dl = lb->first;
-				if (dl == NULL) {
-					return true;
-				}
-
-				if (dl->nors == NULL) BKE_displist_normals_add(lb);
-
-				if (draw_glsl_material(scene, ob, v3d, dt)) {
-					GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-					drawDispListsolid(lb, ob, dflag, ob_wire_col, true);
-					GPU_end_object_materials();
-				}
-				else {
-					GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-					drawDispListsolid(lb, ob, dflag, ob_wire_col, false);
-					GPU_end_object_materials();
-				}
-			}
-			else {
-				return drawDispListwire(lb, ob->type);
-			}
-			break;
-		case OB_MBALL:
-
-			if (BKE_mball_is_basis(ob)) {
-				lb = &ob->curve_cache->disp;
-				if (BLI_listbase_is_empty(lb)) {
-					return true;
-				}
-
-				if (solid) {
-
-					if (draw_glsl_material(scene, ob, v3d, dt)) {
-						GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-						drawDispListsolid(lb, ob, dflag, ob_wire_col, true);
-						GPU_end_object_materials();
-					}
-					else {
-						GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-						drawDispListsolid(lb, ob, dflag, ob_wire_col, false);
-						GPU_end_object_materials();
-					}
-				}
-				else {
-					return drawDispListwire(lb, ob->type);
-				}
-			}
-			break;
-	}
-
-	return false;
-}
-static bool drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
-                         const char dt, const short dflag, const unsigned char ob_wire_col[4])
+#ifdef USE_MESH_DM_SELECT
+static void bbs_mesh_solid__drawCenter(void *userData, int index, const float cent[3], const float UNUSED(no[3]))
 {
-	bool retval;
-
-	/* backface culling */
-	if (v3d->flag2 & V3D_BACKFACE_CULLING) {
-		/* not all displists use same in/out normal direction convention */
-		glEnable(GL_CULL_FACE);
-		glCullFace(GL_BACK);
-	}
-
-#ifdef SEQUENCER_DAG_WORKAROUND
-	ensure_curve_cache(scene, base->object);
-#endif
-
-	if (drawCurveDerivedMesh(scene, v3d, rv3d, base, dt) == false) {
-		retval = false;
-	}
-	else {
-		Object *ob = base->object;
-		GLenum mode;
-
-		if (ob->type == OB_MBALL) {
-			mode = (ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW;
-		}
-		else {
-			mode = (ob->transflag & OB_NEG_SCALE) ? GL_CCW : GL_CW;
-		}
-
-		glFrontFace(mode);
-
-		retval = drawDispList_nobackface(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-
-		if (mode != GL_CCW) {
-			glFrontFace(GL_CCW);
-		}
-	}
+	drawBMOffset_userData *data = (drawBMOffset_userData *)userData;
+	BMFace *efa = BM_face_at_index(userData, index);
 
-	if (v3d->flag2 & V3D_BACKFACE_CULLING) {
-		glDisable(GL_CULL_FACE);
+	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
+		int selcol;
+		GPU_select_index_get(index + 1, &selcol);
+		immAttrib1u(data->col, selcol);
+		immVertex3fv(data->pos, cent);
 	}
-
-	return retval;
 }
 
-/* *********** drawing for particles ************* */
-static void draw_particle_arrays(int draw_as, int totpoint, int ob_dt, int select)
-{
-	/* draw created data arrays */
-	switch (draw_as) {
-		case PART_DRAW_AXIS:
-		case PART_DRAW_CROSS:
-			glDrawArrays(GL_LINES, 0, 6 * totpoint);
-			break;
-		case PART_DRAW_LINE:
-			glDrawArrays(GL_LINES, 0, 2 * totpoint);
-			break;
-		case PART_DRAW_BB:
-			if (ob_dt <= OB_WIRE || select)
-				glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-			else
-				glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-
-			glDrawArrays(GL_QUADS, 0, 4 * totpoint);
-			break;
-		default:
-			glDrawArrays(GL_POINTS, 0, totpoint);
-			break;
-	}
-}
-static void draw_particle(ParticleKey *state, int draw_as, short draw, float pixsize,
-                          float imat[4][4], const float draw_line[2], ParticleBillboardData *bb, ParticleDrawData *pdd)
+static void bbs_mesh_face_dot(BMEditMesh *em, DerivedMesh *dm)
 {
-	float vec[3], vec2[3];
-	float *vd = NULL;
-	float *cd = NULL;
-	float ma_col[3] = {0.0f, 0.0f, 0.0f};
-
-	/* null only for PART_DRAW_CIRC */
-	if (pdd) {
-		vd = pdd->vd;
-		cd = pdd->cd;
-
-		if (pdd->ma_col) {
-			copy_v3_v3(ma_col, pdd->ma_col);
-		}
-	}
-
-	switch (draw_as) {
-		case PART_DRAW_DOT:
-		{
-			if (vd) {
-				copy_v3_v3(vd, state->co); pdd->vd += 3;
-			}
-			if (cd) {
-				copy_v3_v3(cd, pdd->ma_col);
-				pdd->cd += 3;
-			}
-			break;
-		}
-		case PART_DRAW_CROSS:
-		case PART_DRAW_AXIS:
-		{
-			vec[0] = 2.0f * pixsize;
-			vec[1] = vec[2] = 0.0;
-			mul_qt_v3(state->rot, vec);
-			if (draw_as == PART_DRAW_AXIS) {
-				if (cd) {
-					cd[1] = cd[2] = cd[4] = cd[5] = 0.0;
-					cd[0] = cd[3] = 1.0;
-					cd[6] = cd[8] = cd[9] = cd[11] = 0.0;
-					cd[7] = cd[10] = 1.0;
-					cd[13] = cd[12] = cd[15] = cd[16] = 0.0;
-					cd[14] = cd[17] = 1.0;
-					pdd->cd += 18;
-				}
-
-				copy_v3_v3(vec2, state->co);
-			}
-			else {
-				if (cd) {
-					cd[0] = cd[3] = cd[6] = cd[9] = cd[12] = cd[15] = ma_col[0];
-					cd[1] = cd[4] = cd[7] = cd[10] = cd[13] = cd[16] = ma_col[1];
-					cd[2] = cd[5] = cd[8] = cd[11] = cd[14] = cd[17] = ma_col[2];
-					pdd->cd += 18;
-				}
-				sub_v3_v3v3(vec2, state->co, vec);
-			}
-
-			add_v3_v3(vec, state->co);
-			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
-			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
-
-			vec[1] = 2.0f * pixsize;
-			vec[0] = vec[2] = 0.0;
-			mul_qt_v3(state->rot, vec);
-			if (draw_as == PART_DRAW_AXIS) {
-				copy_v3_v3(vec2, state->co);
-			}
-			else {
-				sub_v3_v3v3(vec2, state->co, vec);
-			}
-
-			add_v3_v3(vec, state->co);
-			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
-			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
-
-			vec[2] = 2.0f * pixsize;
-			vec[0] = vec[1] = 0.0f;
-			mul_qt_v3(state->rot, vec);
-			if (draw_as == PART_DRAW_AXIS) {
-				copy_v3_v3(vec2, state->co);
-			}
-			else {
-				sub_v3_v3v3(vec2, state->co, vec);
-			}
-
-			add_v3_v3(vec, state->co);
-
-			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
-			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
-			break;
-		}
-		case PART_DRAW_LINE:
-		{
-			copy_v3_v3(vec, state->vel);
-			normalize_v3(vec);
-			if (draw & PART_DRAW_VEL_LENGTH)
-				mul_v3_fl(vec, len_v3(state->vel));
-			madd_v3_v3v3fl(pdd->vd, state->co, vec, -draw_line[0]); pdd->vd += 3;
-			madd_v3_v3v3fl(pdd->vd, state->co, vec,  draw_line[1]); pdd->vd += 3;
-			if (cd) {
-				cd[0] = cd[3] = ma_col[0];
-				cd[1] = cd[4] = ma_col[1];
-				cd[2] = cd[5] = ma_col[2];
-				pdd->cd += 6;
-			}
-			break;
-		}
-		case PART_DRAW_CIRC:
-		{
-			drawcircball(GL_LINE_LOOP, state->co, pixsize, imat);
-			break;
-		}
-		case PART_DRAW_BB:
-		{
-			float xvec[3], yvec[3], zvec[3], bb_center[3];
-			if (cd) {
-				cd[0] = cd[3] = cd[6] = cd[9] = ma_col[0];
-				cd[1] = cd[4] = cd[7] = cd[10] = ma_col[1];
-				cd[2] = cd[5] = cd[8] = cd[11] = ma_col[2];
-				pdd->cd += 12;
-			}
-
-			copy_v3_v3(bb->vec, state->co);
-			copy_v3_v3(bb->vel, state->vel);
-
-			psys_make_billboard(bb, xvec, yvec, zvec, bb_center);
-
-			add_v3_v3v3(pdd->vd, bb_center, xvec);
-			add_v3_v3(pdd->vd, yvec); pdd->vd += 3;
+	drawBMOffset_userData data; /* don't use offset */
+	data.bm = em->bm;
+	Gwn_VertFormat *format = immVertexFormat();
+	data.pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	data.col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U32, 1, GWN_FETCH_INT);
 
-			sub_v3_v3v3(pdd->vd, bb_center, xvec);
-			add_v3_v3(pdd->vd, yvec); pdd->vd += 3;
+	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
-			sub_v3_v3v3(pdd->vd, bb_center, xvec);
-			sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd += 3;
+	glPointSize(UI_GetThemeValuef(TH_FACEDOT_SIZE));
 
-			add_v3_v3v3(pdd->vd, bb_center, xvec);
-			sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd += 3;
+	immBeginAtMost(GWN_PRIM_POINTS, em->bm->totface);
+	dm->foreachMappedFaceCenter(dm, bbs_mesh_solid__drawCenter, &data, DM_FOREACH_NOP);
+	immEnd();
 
-			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
-			break;
-		}
-	}
+	immUnbindProgram();
 }
-static void draw_particle_data(ParticleSystem *psys, RegionView3D *rv3d,
-                               ParticleKey *state, int draw_as,
-                               float imat[4][4], ParticleBillboardData *bb, ParticleDrawData *pdd,
-                               const float ct, const float pa_size, const float r_tilt, const float pixsize_scale)
-{
-	ParticleSettings *part = psys->part;
-	float pixsize;
-
-	if (psys->parent)
-		mul_m4_v3(psys->parent->obmat, state->co);
-
-	/* create actual particle data */
-	if (draw_as == PART_DRAW_BB) {
-		bb->offset[0] = part->bb_offset[0];
-		bb->offset[1] = part->bb_offset[1];
-		bb->size[0] = part->bb_size[0] * pa_size;
-		if (part->bb_align == PART_BB_VEL) {
-			float pa_vel = len_v3(state->vel);
-			float head = part->bb_vel_head * pa_vel;
-			float tail = part->bb_vel_tail * pa_vel;
-			bb->size[1] = part->bb_size[1] * pa_size + head + tail;
-			/* use offset to adjust the particle center. this is relative to size, so need to divide! */
-			if (bb->size[1] > 0.0f)
-				bb->offset[1] += (head - tail) / bb->size[1];
-		}
-		else {
-			bb->size[1] = part->bb_size[1] * pa_size;
-		}
-		bb->tilt = part->bb_tilt * (1.0f - part->bb_rand_tilt * r_tilt);
-		bb->time = ct;
-	}
-
-	pixsize = ED_view3d_pixel_size(rv3d, state->co) * pixsize_scale;
-
-	draw_particle(state, draw_as, part->draw, pixsize, imat, part->draw_line, bb, pdd);
-}
-/* unified drawing of all new particle systems draw types except dupli ob & group
- * mostly tries to use vertex arrays for speed
- *
- * 1. check that everything is ok & updated
- * 2. start initializing things
- * 3. initialize according to draw type
- * 4. allocate drawing data arrays
- * 5. start filling the arrays
- * 6. draw the arrays
- * 7. clean up
- */
-static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                                     Base *base, ParticleSystem *psys,
-                                     const char ob_dt, const short dflag)
-{
-	Object *ob = base->object;
-	ParticleEditSettings *pset = PE_settings(scene);
-	ParticleSettings *part = psys->part;
-	ParticleData *pars = psys->particles;
-	ParticleData *pa;
-	ParticleKey state, *states = NULL;
-	ParticleBillboardData bb;
-	ParticleSimulationData sim = {NULL};
-	ParticleDrawData *pdd = psys->pdd;
-	Material *ma;
-	float vel[3], imat[4][4];
-	float timestep, pixsize_scale = 1.0f, pa_size, r_tilt, r_length;
-	float pa_time, pa_birthtime, pa_dietime, pa_health, intensity;
-	float cfra;
-	float ma_col[3] = {0.0f, 0.0f, 0.0f};
-	int a, totpart, totpoint = 0, totve = 0, drawn, draw_as, totchild = 0;
-	bool select = (ob->flag & SELECT) != 0, create_cdata = false, need_v = false;
-	GLint polygonmode[2];
-	char numstr[32];
-	unsigned char tcol[4] = {0, 0, 0, 255};
-
-/* 1. */
-	if (part == NULL || !psys_check_enabled(ob, psys, G.is_rendering))
-		return;
-
-	if (pars == NULL) return;
-
-	/* don't draw normal paths in edit mode */
-	if (psys_in_edit_mode(scene, psys) && (pset->flag & PE_DRAW_PART) == 0)
-		return;
-
-	if (part->draw_as == PART_DRAW_REND)
-		draw_as = part->ren_as;
-	else
-		draw_as = part->draw_as;
-
-	if (draw_as == PART_DRAW_NOT)
-		return;
-
-	/* prepare curvemapping tables */
-	if ((psys->part->child_flag & PART_CHILD_USE_CLUMP_CURVE) && psys->part->clumpcurve)
-		curvemapping_changed_all(psys->part->clumpcurve);
-	if ((psys->part->child_flag & PART_CHILD_USE_ROUGH_CURVE) && psys->part->roughcurve)
-		curvemapping_changed_all(psys->part->roughcurve);
-	if ((psys->part->child_flag & PART_CHILD_USE_TWIST_CURVE) && psys->part->twistcurve)
-		curvemapping_changed_all(psys->part->twistcurve);
-
-/* 2. */
-	sim.scene = scene;
-	sim.ob = ob;
-	sim.psys = psys;
-	sim.psmd = psys_get_modifier(ob, psys);
-
-	if (part->phystype == PART_PHYS_KEYED) {
-		if (psys->flag & PSYS_KEYED) {
-			psys_count_keyed_targets(&sim);
-			if (psys->totkeyed == 0)
-				return;
-		}
-	}
-
-	if (select) {
-		select = false;
-		if (psys_get_current(ob) == psys)
-			select = true;
-	}
-
-	psys->flag |= PSYS_DRAWING;
-
-	if (part->type == PART_HAIR && !psys->childcache)
-		totchild = 0;
-	else
-		totchild = psys->totchild * part->disp / 100;
-
-	ma = give_current_material(ob, part->omat);
-
-	if (v3d->zbuf) glDepthMask(1);
-
-	if ((ma) && (part->draw_col == PART_DRAW_COL_MAT)) {
-		rgb_float_to_uchar(tcol, &(ma->r));
-		copy_v3_v3(ma_col, &ma->r);
-	}
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		glColor3ubv(tcol);
-	}
-
-	timestep = psys_get_timestep(&sim);
-
-	if ((base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP)) {
-		float mat[4][4];
-		mul_m4_m4m4(mat, ob->obmat, psys->imat);
-		glMultMatrixf(mat);
-	}
-
-	/* needed for text display */
-	invert_m4_m4(ob->imat, ob->obmat);
-
-	totpart = psys->totpart;
-
-	cfra = BKE_scene_frame_get(scene);
-
-	if (draw_as == PART_DRAW_PATH && psys->pathcache == NULL && psys->childcache == NULL)
-		draw_as = PART_DRAW_DOT;
-
-/* 3. */
-	glLineWidth(1.0f);
-
-	switch (draw_as) {
-		case PART_DRAW_DOT:
-			if (part->draw_size)
-				glPointSize(part->draw_size);
-			else
-				glPointSize(2.0);  /* default dot size */
-			break;
-		case PART_DRAW_CIRC:
-			/* calculate view aligned matrix: */
-			copy_m4_m4(imat, rv3d->viewinv);
-			normalize_v3(imat[0]);
-			normalize_v3(imat[1]);
-			ATTR_FALLTHROUGH;
-		case PART_DRAW_CROSS:
-		case PART_DRAW_AXIS:
-			/* lets calculate the scale: */
-
-			if (part->draw_size == 0.0)
-				pixsize_scale = 2.0f;
-			else
-				pixsize_scale = part->draw_size;
-
-			if (draw_as == PART_DRAW_AXIS)
-				create_cdata = 1;
-			break;
-		case PART_DRAW_OB:
-			if (part->dup_ob == NULL)
-				draw_as = PART_DRAW_DOT;
-			else
-				draw_as = 0;
-			break;
-		case PART_DRAW_GR:
-			if (part->dup_group == NULL)
-				draw_as = PART_DRAW_DOT;
-			else
-				draw_as = 0;
-			break;
-		case PART_DRAW_BB:
-			if (v3d->camera == NULL && part->bb_ob == NULL) {
-				printf("Billboards need an active camera or a target object!\n");
-
-				draw_as = part->draw_as = PART_DRAW_DOT;
-
-				if (part->draw_size)
-					glPointSize(part->draw_size);
-				else
-					glPointSize(2.0);  /* default dot size */
-			}
-			else if (part->bb_ob)
-				bb.ob = part->bb_ob;
-			else
-				bb.ob = v3d->camera;
-
-			bb.align = part->bb_align;
-			bb.anim = part->bb_anim;
-			bb.lock = part->draw & PART_DRAW_BB_LOCK;
-			break;
-		case PART_DRAW_PATH:
-			break;
-		case PART_DRAW_LINE:
-			need_v = 1;
-			break;
-	}
-	if (part->draw & PART_DRAW_SIZE && part->draw_as != PART_DRAW_CIRC) {
-		copy_m4_m4(imat, rv3d->viewinv);
-		normalize_v3(imat[0]);
-		normalize_v3(imat[1]);
-	}
-
-	if (ELEM(draw_as, PART_DRAW_DOT, PART_DRAW_CROSS, PART_DRAW_LINE) &&
-	    (part->draw_col > PART_DRAW_COL_MAT))
-	{
-		create_cdata = 1;
-	}
-
-	if (!create_cdata && pdd && pdd->cdata) {
-		MEM_freeN(pdd->cdata);
-		pdd->cdata = pdd->cd = NULL;
-	}
-
-/* 4. */
-	if (draw_as && ELEM(draw_as, PART_DRAW_PATH, PART_DRAW_CIRC) == 0) {
-		int partsize = 3 * sizeof(float);
-		int create_ndata = 0;
-
-		if (!pdd)
-			pdd = psys->pdd = MEM_callocN(sizeof(ParticleDrawData), "ParticleDrawData");
-
-		if (part->draw_as == PART_DRAW_REND && part->trail_count > 1) {
-			partsize *= part->trail_count;
-			psys_make_temp_pointcache(ob, psys);
-		}
-
-		switch (draw_as) {
-			case PART_DRAW_AXIS:
-			case PART_DRAW_CROSS:
-				partsize *= 6;
-				if (draw_as != PART_DRAW_CROSS)
-					create_cdata = 1;
-				break;
-			case PART_DRAW_LINE:
-				partsize *= 2;
-				break;
-			case PART_DRAW_BB:
-				partsize *= 4;
-				create_ndata = 1;
-				break;
-		}
-
-		if (pdd->totpart != totpart + totchild || pdd->partsize != partsize)
-			psys_free_pdd(psys);
-
-		if (!pdd->vdata)
-			pdd->vdata = MEM_calloc_arrayN(totpart + totchild, partsize, "particle_vdata");
-		if (create_cdata && !pdd->cdata)
-			pdd->cdata = MEM_calloc_arrayN(totpart + totchild, partsize, "particle_cdata");
-		if (create_ndata && !pdd->ndata)
-			pdd->ndata = MEM_calloc_arrayN(totpart + totchild, partsize, "particle_ndata");
-
-		if (part->draw & PART_DRAW_VEL && draw_as != PART_DRAW_LINE) {
-			if (!pdd->vedata)
-				pdd->vedata = MEM_calloc_arrayN(totpart + totchild, 2 * 3 * sizeof(float), "particle_vedata");
-
-			need_v = 1;
-		}
-		else if (pdd->vedata) {
-			/* velocity data not needed, so free it */
-			MEM_freeN(pdd->vedata);
-			pdd->vedata = NULL;
-		}
-
-		pdd->vd = pdd->vdata;
-		pdd->ved = pdd->vedata;
-		pdd->cd = pdd->cdata;
-		pdd->nd = pdd->ndata;
-		pdd->totpart = totpart + totchild;
-		pdd->partsize = partsize;
-	}
-	else if (psys->pdd) {
-		psys_free_pdd(psys);
-		MEM_freeN(psys->pdd);
-		pdd = psys->pdd = NULL;
-	}
-
-	if (pdd) {
-		pdd->ma_col = ma_col;
-	}
-
-	psys->lattice_deform_data = psys_create_lattice_deform_data(&sim);
-
-	/* circles don't use drawdata, so have to add a special case here */
-	if ((pdd || draw_as == PART_DRAW_CIRC) && draw_as != PART_DRAW_PATH) {
-		/* 5. */
-		if (pdd && (pdd->flag & PARTICLE_DRAW_DATA_UPDATED) &&
-		    (pdd->vedata || part->draw & (PART_DRAW_SIZE | PART_DRAW_NUM | PART_DRAW_HEALTH)) == 0)
-		{
-			totpoint = pdd->totpoint; /* draw data is up to date */
-		}
-		else {
-			for (a = 0, pa = pars; a < totpart + totchild; a++, pa++) {
-				/* setup per particle individual stuff */
-				if (a < totpart) {
-					if (totchild && (part->draw & PART_DRAW_PARENT) == 0) continue;
-					if (pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST) continue;
-
-					pa_time = (cfra - pa->time) / pa->lifetime;
-					pa_birthtime = pa->time;
-					pa_dietime = pa->dietime;
-					pa_size = pa->size;
-					if (part->phystype == PART_PHYS_BOIDS)
-						pa_health = pa->boid->data.health;
-					else
-						pa_health = -1.0;
-
-					r_tilt = 2.0f * (psys_frand(psys, a + 21) - 0.5f);
-					r_length = psys_frand(psys, a + 22);
-
-					if (part->draw_col > PART_DRAW_COL_MAT) {
-						switch (part->draw_col) {
-							case PART_DRAW_COL_VEL:
-								intensity = len_v3(pa->state.vel) / part->color_vec_max;
-								break;
-							case PART_DRAW_COL_ACC:
-								intensity = len_v3v3(pa->state.vel, pa->prev_state.vel) / ((pa->state.time - pa->prev_state.time) * part->color_vec_max);
-								break;
-							default:
-								intensity = 1.0f; /* should never happen */
-								BLI_assert(0);
-								break;
-						}
-						CLAMP(intensity, 0.0f, 1.0f);
-						weight_to_rgb(ma_col, intensity);
-					}
-				}
-				else {
-					ChildParticle *cpa = &psys->child[a - totpart];
-
-					pa_time = psys_get_child_time(psys, cpa, cfra, &pa_birthtime, &pa_dietime);
-					pa_size = psys_get_child_size(psys, cpa, cfra, NULL);
-
-					pa_health = -1.0;
-
-					r_tilt = 2.0f * (psys_frand(psys, a + 21) - 0.5f);
-					r_length = psys_frand(psys, a + 22);
-				}
-
-				drawn = 0;
-				if (part->draw_as == PART_DRAW_REND && part->trail_count > 1) {
-					float length = part->path_end * (1.0f - part->randlength * r_length);
-					int trail_count = part->trail_count * (1.0f - part->randlength * r_length);
-					float ct = ((part->draw & PART_ABS_PATH_TIME) ? cfra : pa_time) - length;
-					float dt = length / (trail_count ? (float)trail_count : 1.0f);
-					int i = 0;
-
-					ct += dt;
-					for (i = 0; i < trail_count; i++, ct += dt) {
-
-						if (part->draw & PART_ABS_PATH_TIME) {
-							if (ct < pa_birthtime || ct > pa_dietime)
-								continue;
-						}
-						else if (ct < 0.0f || ct > 1.0f)
-							continue;
-
-						state.time = (part->draw & PART_ABS_PATH_TIME) ? -ct : -(pa_birthtime + ct * (pa_dietime - pa_birthtime));
-						psys_get_particle_on_path(&sim, a, &state, need_v);
-
-						draw_particle_data(psys, rv3d,
-						                   &state, draw_as, imat, &bb, psys->pdd,
-						                   ct, pa_size, r_tilt, pixsize_scale);
-
-						totpoint++;
-						drawn = 1;
-					}
-				}
-				else {
-					state.time = cfra;
-					if (psys_get_particle_state(&sim, a, &state, 0)) {
-
-						draw_particle_data(psys, rv3d,
-						                   &state, draw_as, imat, &bb, psys->pdd,
-						                   pa_time, pa_size, r_tilt, pixsize_scale);
-
-						totpoint++;
-						drawn = 1;
-					}
-				}
-
-				if (drawn) {
-					/* additional things to draw for each particle
-					 * (velocity, size and number) */
-					if ((part->draw & PART_DRAW_VEL) && pdd && pdd->vedata) {
-						copy_v3_v3(pdd->ved, state.co);
-						pdd->ved += 3;
-						mul_v3_v3fl(vel, state.vel, timestep);
-						add_v3_v3v3(pdd->ved, state.co, vel);
-						pdd->ved += 3;
-
-						totve++;
-					}
-
-					if (part->draw & PART_DRAW_SIZE) {
-						setlinestyle(3);
-						drawcircball(GL_LINE_LOOP, state.co, pa_size, imat);
-						setlinestyle(0);
-					}
-
-
-					if ((part->draw & PART_DRAW_NUM || part->draw & PART_DRAW_HEALTH) &&
-					    (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
-					{
-						size_t numstr_len;
-						float vec_txt[3];
-						char *val_pos = numstr;
-						numstr[0] = '\0';
-
-						if (part->draw & PART_DRAW_NUM) {
-							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype == PART_PHYS_BOIDS)) {
-								numstr_len = BLI_snprintf_rlen(val_pos, sizeof(numstr), "%d:%.2f", a, pa_health);
-							}
-							else {
-								numstr_len = BLI_snprintf_rlen(val_pos, sizeof(numstr), "%d", a);
-							}
-						}
-						else {
-							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype == PART_PHYS_BOIDS)) {
-								numstr_len = BLI_snprintf_rlen(val_pos, sizeof(numstr), "%.2f", pa_health);
-							}
-						}
-
-						if (numstr[0]) {
-							/* in path drawing state.co is the end point
-							 * use worldspace because object matrix is already applied */
-							mul_v3_m4v3(vec_txt, ob->imat, state.co);
-							view3d_cached_text_draw_add(vec_txt, numstr, numstr_len,
-							                            10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
-						}
-					}
-				}
-			}
-		}
-	}
-/* 6. */
-
-	glGetIntegerv(GL_POLYGON_MODE, polygonmode);
-	glEnableClientState(GL_VERTEX_ARRAY);
-
-	if (draw_as == PART_DRAW_PATH) {
-		ParticleCacheKey **cache, *path;
-		float *cdata2 = NULL;
-
-		/* setup gl flags */
-		if (1) { //ob_dt > OB_WIRE) {
-			glEnableClientState(GL_NORMAL_ARRAY);
-
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				if (part->draw_col == PART_DRAW_COL_MAT)
-					glEnableClientState(GL_COLOR_ARRAY);
-			}
-
-			// XXX test
-			GPU_basic_shader_colors(NULL, NULL, 0.0f, 1.0f);
-			GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-		}
-
-		if (totchild && (part->draw & PART_DRAW_PARENT) == 0)
-			totpart = 0;
-		else if (psys->pathcache == NULL)
-			totpart = 0;
-
-		/* draw actual/parent particles */
-		cache = psys->pathcache;
-		for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
-			path = cache[a];
-			if (path->segments > 0) {
-				glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-
-				if (1) { //ob_dt > OB_WIRE) {
-					glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
-					if ((dflag & DRAW_CONSTCOLOR) == 0) {
-						if (part->draw_col == PART_DRAW_COL_MAT) {
-							glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
-						}
-					}
-				}
-
-				glDrawArrays(GL_LINE_STRIP, 0, path->segments + 1);
-			}
-		}
-
-		if (part->type ==  PART_HAIR) {
-			if (part->draw & PART_DRAW_GUIDE_HAIRS) {
-				DerivedMesh *hair_dm = psys->hair_out_dm;
-
-				glDisableClientState(GL_NORMAL_ARRAY);
-				glDisableClientState(GL_COLOR_ARRAY);
-
-				for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
-					if (pa->totkey > 1) {
-						HairKey *hkey = pa->hair;
-
-						glVertexPointer(3, GL_FLOAT, sizeof(HairKey), hkey->world_co);
-
-#if 0 /* XXX use proper theme color here */
-						UI_ThemeColor(TH_NORMAL);
 #else
-						glColor3f(0.58f, 0.67f, 1.0f);
-#endif
-
-						glDrawArrays(GL_LINE_STRIP, 0, pa->totkey);
-					}
-				}
-
-				if (hair_dm) {
-					MVert *mvert = hair_dm->getVertArray(hair_dm);
-					int i;
-
-					glColor3f(0.9f, 0.4f, 0.4f);
-
-					glBegin(GL_LINES);
-					for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
-						for (i = 1; i < pa->totkey; ++i) {
-							float v1[3], v2[3];
-
-							copy_v3_v3(v1, mvert[pa->hair_index + i - 1].co);
-							copy_v3_v3(v2, mvert[pa->hair_index + i].co);
-
-							mul_m4_v3(ob->obmat, v1);
-							mul_m4_v3(ob->obmat, v2);
-
-							glVertex3fv(v1);
-							glVertex3fv(v2);
-						}
-					}
-					glEnd();
-				}
-
-				glEnableClientState(GL_NORMAL_ARRAY);
-				if ((dflag & DRAW_CONSTCOLOR) == 0)
-					if (part->draw_col == PART_DRAW_COL_MAT)
-						glEnableClientState(GL_COLOR_ARRAY);
-			}
-
-			if (part->draw & PART_DRAW_HAIR_GRID) {
-				ClothModifierData *clmd = psys->clmd;
-				if (clmd) {
-					float *gmin = clmd->hair_grid_min;
-					float *gmax = clmd->hair_grid_max;
-					int *res = clmd->hair_grid_res;
-					int i;
-
-					glDisableClientState(GL_NORMAL_ARRAY);
-					glDisableClientState(GL_COLOR_ARRAY);
-
-					if (select)
-						UI_ThemeColor(TH_ACTIVE);
-					else
-						UI_ThemeColor(TH_WIRE);
-					glBegin(GL_LINES);
-					glVertex3f(gmin[0], gmin[1], gmin[2]); glVertex3f(gmax[0], gmin[1], gmin[2]);
-					glVertex3f(gmax[0], gmin[1], gmin[2]); glVertex3f(gmax[0], gmax[1], gmin[2]);
-					glVertex3f(gmax[0], gmax[1], gmin[2]); glVertex3f(gmin[0], gmax[1], gmin[2]);
-					glVertex3f(gmin[0], gmax[1], gmin[2]); glVertex3f(gmin[0], gmin[1], gmin[2]);
-
-					glVertex3f(gmin[0], gmin[1], gmax[2]); glVertex3f(gmax[0], gmin[1], gmax[2]);
-					glVertex3f(gmax[0], gmin[1], gmax[2]); glVertex3f(gmax[0], gmax[1], gmax[2]);
-					glVertex3f(gmax[0], gmax[1], gmax[2]); glVertex3f(gmin[0], gmax[1], gmax[2]);
-					glVertex3f(gmin[0], gmax[1], gmax[2]); glVertex3f(gmin[0], gmin[1], gmax[2]);
-
-					glVertex3f(gmin[0], gmin[1], gmin[2]); glVertex3f(gmin[0], gmin[1], gmax[2]);
-					glVertex3f(gmax[0], gmin[1], gmin[2]); glVertex3f(gmax[0], gmin[1], gmax[2]);
-					glVertex3f(gmin[0], gmax[1], gmin[2]); glVertex3f(gmin[0], gmax[1], gmax[2]);
-					glVertex3f(gmax[0], gmax[1], gmin[2]); glVertex3f(gmax[0], gmax[1], gmax[2]);
-					glEnd();
-
-					if (select)
-						UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -100);
-					else
-						UI_ThemeColorShadeAlpha(TH_WIRE, 0, -100);
-					glEnable(GL_BLEND);
-					glBegin(GL_LINES);
-					for (i = 1; i < res[0] - 1; ++i) {
-						float f = interpf(gmax[0], gmin[0], (float)i / (float)(res[0] - 1));
-						glVertex3f(f, gmin[1], gmin[2]); glVertex3f(f, gmax[1], gmin[2]);
-						glVertex3f(f, gmax[1], gmin[2]); glVertex3f(f, gmax[1], gmax[2]);
-						glVertex3f(f, gmax[1], gmax[2]); glVertex3f(f, gmin[1], gmax[2]);
-						glVertex3f(f, gmin[1], gmax[2]); glVertex3f(f, gmin[1], gmin[2]);
-					}
-					for (i = 1; i < res[1] - 1; ++i) {
-						float f = interpf(gmax[1], gmin[1], (float)i / (float)(res[1] - 1));
-						glVertex3f(gmin[0], f, gmin[2]); glVertex3f(gmax[0], f, gmin[2]);
-						glVertex3f(gmax[0], f, gmin[2]); glVertex3f(gmax[0], f, gmax[2]);
-						glVertex3f(gmax[0], f, gmax[2]); glVertex3f(gmin[0], f, gmax[2]);
-						glVertex3f(gmin[0], f, gmax[2]); glVertex3f(gmin[0], f, gmin[2]);
-					}
-					for (i = 1; i < res[2] - 1; ++i) {
-						float f = interpf(gmax[2], gmin[2], (float)i / (float)(res[2] - 1));
-						glVertex3f(gmin[0], gmin[1], f); glVertex3f(gmax[0], gmin[1], f);
-						glVertex3f(gmax[0], gmin[1], f); glVertex3f(gmax[0], gmax[1], f);
-						glVertex3f(gmax[0], gmax[1], f); glVertex3f(gmin[0], gmax[1], f);
-						glVertex3f(gmin[0], gmax[1], f); glVertex3f(gmin[0], gmin[1], f);
-					}
-					glEnd();
-					glDisable(GL_BLEND);
-
-					glEnableClientState(GL_NORMAL_ARRAY);
-					if ((dflag & DRAW_CONSTCOLOR) == 0)
-						if (part->draw_col == PART_DRAW_COL_MAT)
-							glEnableClientState(GL_COLOR_ARRAY);
-				}
-			}
-		}
-
-		/* draw child particles */
-		cache = psys->childcache;
-		for (a = 0; a < totchild; a++) {
-			path = cache[a];
-			glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-
-			if (1) { //ob_dt > OB_WIRE) {
-				glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					if (part->draw_col == PART_DRAW_COL_MAT) {
-						glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
-					}
-				}
-			}
-
-			glDrawArrays(GL_LINE_STRIP, 0, path->segments + 1);
-		}
-
-		/* restore & clean up */
-		if (1) { //ob_dt > OB_WIRE) {
-			if (part->draw_col == PART_DRAW_COL_MAT)
-				glDisableClientState(GL_COLOR_ARRAY);
-			GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-		}
-
-		if (cdata2) {
-			MEM_freeN(cdata2);
-			cdata2 = NULL;
-		}
-
-		if ((part->draw & PART_DRAW_NUM) && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-			cache = psys->pathcache;
-
-			for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
-				float vec_txt[3];
-				size_t numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%i", a);
-				/* use worldspace because object matrix is already applied */
-				mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
-				view3d_cached_text_draw_add(vec_txt, numstr, numstr_len,
-				                            10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
-			}
-		}
-	}
-	else if (pdd && ELEM(draw_as, 0, PART_DRAW_CIRC) == 0) {
-		glDisableClientState(GL_COLOR_ARRAY);
-
-		/* enable point data array */
-		if (pdd->vdata) {
-			glEnableClientState(GL_VERTEX_ARRAY);
-			glVertexPointer(3, GL_FLOAT, 0, pdd->vdata);
-		}
-		else
-			glDisableClientState(GL_VERTEX_ARRAY);
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			if (select) {
-				UI_ThemeColor(TH_ACTIVE);
-
-				if (part->draw_size)
-					glPointSize(part->draw_size + 2);
-				else
-					glPointSize(4.0);
-
-				glLineWidth(3.0);
-
-				draw_particle_arrays(draw_as, totpoint, ob_dt, 1);
-			}
-
-			/* restore from select */
-			glColor3fv(ma_col);
-		}
-
-		glPointSize(part->draw_size ? part->draw_size : 2.0);
-		glLineWidth(1.0);
-
-		/* enable other data arrays */
-
-		/* billboards are drawn this way */
-		if (pdd->ndata && ob_dt > OB_WIRE) {
-			glEnableClientState(GL_NORMAL_ARRAY);
-			glNormalPointer(GL_FLOAT, 0, pdd->ndata);
-			GPU_basic_shader_colors(NULL, NULL, 0.0f, 1.0f);
-			GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
-		}
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			if (pdd->cdata) {
-				glEnableClientState(GL_COLOR_ARRAY);
-				glColorPointer(3, GL_FLOAT, 0, pdd->cdata);
-			}
-		}
-
-		draw_particle_arrays(draw_as, totpoint, ob_dt, 0);
-
-		pdd->flag |= PARTICLE_DRAW_DATA_UPDATED;
-		pdd->totpoint = totpoint;
-	}
-
-	if (pdd && pdd->vedata) {
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			glDisableClientState(GL_COLOR_ARRAY);
-			cpack(0xC0C0C0);
-		}
-
-		glVertexPointer(3, GL_FLOAT, 0, pdd->vedata);
-
-		glDrawArrays(GL_LINES, 0, 2 * totve);
-	}
-
-	glPolygonMode(GL_FRONT, polygonmode[0]);
-	glPolygonMode(GL_BACK, polygonmode[1]);
-
-/* 7. */
-
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	glDisableClientState(GL_COLOR_ARRAY);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_NORMAL_ARRAY);
-
-	if (states)
-		MEM_freeN(states);
-
-	psys->flag &= ~PSYS_DRAWING;
-
-	/* draw data can't be saved for billboards as they must update to target changes */
-	if (draw_as == PART_DRAW_BB) {
-		psys_free_pdd(psys);
-		pdd->flag &= ~PARTICLE_DRAW_DATA_UPDATED;
-	}
-
-	if (psys->lattice_deform_data) {
-		end_latt_deform(psys->lattice_deform_data);
-		psys->lattice_deform_data = NULL;
-	}
-
-	if (pdd) {
-		/* drop references to stack memory */
-		pdd->ma_col = NULL;
-	}
-
-	if ((base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP)) {
-		glLoadMatrixf(rv3d->viewmat);
-	}
-}
-
-static void draw_update_ptcache_edit(Scene *scene, Object *ob, PTCacheEdit *edit)
-{
-	if (edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED)
-		PE_update_object(scene, ob, 0);
-
-	/* create path and child path cache if it doesn't exist already */
-	if (edit->pathcache == NULL)
-		psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
-}
-
-static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
-{
-	ParticleCacheKey **cache, *path, *pkey;
-	PTCacheEditPoint *point;
-	PTCacheEditKey *key;
-	ParticleEditSettings *pset = PE_settings(scene);
-	int i, k, totpoint = edit->totpoint, timed = (pset->flag & PE_FADE_TIME) ? pset->fade_frames : 0;
-	int totkeys = 1;
-	float sel_col[3];
-	float nosel_col[3];
-	float *pathcol = NULL, *pcol;
-
-	if (edit->pathcache == NULL)
-		return;
-
-	PE_hide_keys_time(scene, edit, CFRA);
-
-	/* opengl setup */
-	if ((v3d->flag & V3D_ZBUF_SELECT) == 0)
-		glDisable(GL_DEPTH_TEST);
-
-	/* get selection theme colors */
-	UI_GetThemeColor3fv(TH_VERTEX_SELECT, sel_col);
-	UI_GetThemeColor3fv(TH_VERTEX, nosel_col);
-
-	/* draw paths */
-	totkeys = (*edit->pathcache)->segments + 1;
-
-	glEnable(GL_BLEND);
-	pathcol = MEM_calloc_arrayN(totkeys, 4 * sizeof(float), "particle path color data");
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_COLOR_ARRAY);
-
-	if (pset->brushtype == PE_BRUSH_WEIGHT)
-		glLineWidth(2.0f);
-
-	cache = edit->pathcache;
-	for (i = 0, point = edit->points; i < totpoint; i++, point++) {
-		path = cache[i];
-		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-
-		if (point->flag & PEP_HIDE) {
-			for (k = 0, pcol = pathcol; k < totkeys; k++, pcol += 4) {
-				copy_v3_v3(pcol, path->col);
-				pcol[3] = 0.25f;
-			}
-
-			glColorPointer(4, GL_FLOAT, 4 * sizeof(float), pathcol);
-		}
-		else if (timed) {
-			for (k = 0, pcol = pathcol, pkey = path; k < totkeys; k++, pkey++, pcol += 4) {
-				copy_v3_v3(pcol, pkey->col);
-				pcol[3] = 1.0f - fabsf((float)(CFRA) -pkey->time) / (float)pset->fade_frames;
-			}
-
-			glColorPointer(4, GL_FLOAT, 4 * sizeof(float), pathcol);
-		}
-		else
-			glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
-
-		glDrawArrays(GL_LINE_STRIP, 0, path->segments + 1);
-	}
-
-	if (pathcol) { MEM_freeN(pathcol); pathcol = pcol = NULL; }
-
-
-	/* draw edit vertices */
-	if (pset->selectmode != SCE_SELECT_PATH) {
-		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-
-		if (pset->selectmode == SCE_SELECT_POINT) {
-			float *pd = NULL, *pdata = NULL;
-			float *cd = NULL, *cdata = NULL;
-			int totkeys_visible = 0;
-
-			for (i = 0, point = edit->points; i < totpoint; i++, point++)
-				if (!(point->flag & PEP_HIDE))
-					totkeys_visible += point->totkey;
-
-			if (totkeys_visible) {
-				if (edit->points && !(edit->points->keys->flag & PEK_USE_WCO))
-					pd = pdata = MEM_calloc_arrayN(totkeys_visible, 3 * sizeof(float), "particle edit point data");
-				cd = cdata = MEM_calloc_arrayN(totkeys_visible, (timed ? 4 : 3) * sizeof(float), "particle edit color data");
-			}
-
-			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
-				if (point->flag & PEP_HIDE)
-					continue;
-
-				for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
-					if (pd) {
-						copy_v3_v3(pd, key->co);
-						pd += 3;
-					}
-
-					if (key->flag & PEK_SELECT) {
-						copy_v3_v3(cd, sel_col);
-					}
-					else {
-						copy_v3_v3(cd, nosel_col);
-					}
-
-					if (timed)
-						*(cd + 3) = 1.0f - fabsf((float)CFRA - *key->time) / (float)pset->fade_frames;
-
-					cd += (timed ? 4 : 3);
-				}
-			}
-			cd = cdata;
-			pd = pdata;
-			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
-				if (point->flag & PEP_HIDE || point->totkey == 0)
-					continue;
-
-				if (point->keys->flag & PEK_USE_WCO)
-					glVertexPointer(3, GL_FLOAT, sizeof(PTCacheEditKey), point->keys->world_co);
-				else
-					glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), pd);
-
-				glColorPointer((timed ? 4 : 3), GL_FLOAT, (timed ? 4 : 3) * sizeof(float), cd);
-
-				glDrawArrays(GL_POINTS, 0, point->totkey);
-
-				pd += pd ? 3 * point->totkey : 0;
-				cd += (timed ? 4 : 3) * point->totkey;
-			}
-			if (pdata) { MEM_freeN(pdata); pd = pdata = NULL; }
-			if (cdata) { MEM_freeN(cdata); cd = cdata = NULL; }
-		}
-		else if (pset->selectmode == SCE_SELECT_END) {
-			glBegin(GL_POINTS);
-			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
-				if ((point->flag & PEP_HIDE) == 0 && point->totkey) {
-					key = point->keys + point->totkey - 1;
-					glColor3fv((key->flag & PEK_SELECT) ? sel_col : nosel_col);
-					/* has to be like this.. otherwise selection won't work, have try glArrayElement later..*/
-					glVertex3fv((key->flag & PEK_USE_WCO) ? key->world_co : key->co);
-				}
-			}
-			glEnd();
-		}
-	}
-
-	glDisable(GL_BLEND);
-	glDisableClientState(GL_COLOR_ARRAY);
-	glDisableClientState(GL_NORMAL_ARRAY);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-}
-
-static void ob_draw_RE_motion(float com[3], float rotscale[3][3], float itw, float ith, float drw_size)
-{
-	float tr[3][3];
-	float root[3], tip[3];
-	/* take a copy for not spoiling original */
-	copy_m3_m3(tr, rotscale);
-	float tw = itw * drw_size;
-	float th = ith * drw_size;
-
-	glBegin(GL_LINES);
-
-	glColor4ub(0x7F, 0x00, 0x00, 155);
-	root[1] = root[2] = 0.0f;
-	root[0] = -drw_size;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	tip[1] = tip[2] = 0.0f;
-	tip[0] = drw_size;
-	mul_m3_v3(tr, tip);
-	add_v3_v3(tip, com);
-	glVertex3fv(tip);
-
-	root[1] = 0.0f; root[2] = tw;
-	root[0] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[1] = 0.0f; root[2] = -tw;
-	root[0] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[1] = tw; root[2] = 0.0f;
-	root[0] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[1] = -tw; root[2] = 0.0f;
-	root[0] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	glColor4ub(0x00, 0x7F, 0x00, 155);
-
-	root[0] = root[2] = 0.0f;
-	root[1] = -drw_size;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	tip[0] = tip[2] = 0.0f;
-	tip[1] = drw_size;
-	mul_m3_v3(tr, tip);
-	add_v3_v3(tip, com);
-	glVertex3fv(tip);
-
-	root[0] = 0.0f; root[2] = tw;
-	root[1] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = 0.0f; root[2] = -tw;
-	root[1] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = tw; root[2] = 0.0f;
-	root[1] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = -tw; root[2] = 0.0f;
-	root[1] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	glColor4ub(0x00, 0x00, 0x7F, 155);
-	root[0] = root[1] = 0.0f;
-	root[2] = -drw_size;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	tip[0] = tip[1] = 0.0f;
-	tip[2] = drw_size;
-	mul_m3_v3(tr, tip);
-	add_v3_v3(tip, com);
-	glVertex3fv(tip);
-
-	root[0] = 0.0f; root[1] = tw;
-	root[2] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = 0.0f; root[1] = -tw;
-	root[2] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = tw; root[1] = 0.0f;
-	root[2] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	root[0] = -tw; root[1] = 0.0f;
-	root[2] = th;
-	mul_m3_v3(tr, root);
-	add_v3_v3(root, com);
-	glVertex3fv(root);
-	glVertex3fv(tip);
-
-	glEnd();
-}
-
-/* place to add drawers */
-
-static void drawhandlesN(Nurb *nu, const char sel, const bool hide_handles)
-{
-	if (nu->hide || hide_handles) return;
-
-	if (nu->type == CU_BEZIER) {
-
-		const float *fp;
-
-#define TH_HANDLE_COL_TOT ((TH_HANDLE_SEL_FREE - TH_HANDLE_FREE) + 1)
-		/* use MIN2 when indexing to ensure newer files don't read outside the array */
-		unsigned char handle_cols[TH_HANDLE_COL_TOT][3];
-		const int basecol = sel ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE;
-
-		for (int a = 0; a < TH_HANDLE_COL_TOT; a++) {
-			UI_GetThemeColor3ubv(basecol + a, handle_cols[a]);
-		}
-
-		glLineWidth(1.0f);
-
-		glBegin(GL_LINES);
-
-		BezTriple *bezt = nu->bezt;
-		int a = nu->pntsu;
-		while (a--) {
-			if (bezt->hide == 0) {
-				if ((bezt->f2 & SELECT) == sel) {
-					fp = bezt->vec[0];
-
-					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT - 1)]);
-					glVertex3fv(fp);
-					glVertex3fv(fp + 3);
-
-					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT - 1)]);
-					glVertex3fv(fp + 3);
-					glVertex3fv(fp + 6);
-				}
-				else if ((bezt->f1 & SELECT) == sel) {
-					fp = bezt->vec[0];
-
-					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT - 1)]);
-					glVertex3fv(fp);
-					glVertex3fv(fp + 3);
-				}
-				else if ((bezt->f3 & SELECT) == sel) {
-					fp = bezt->vec[1];
-
-					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT - 1)]);
-					glVertex3fv(fp);
-					glVertex3fv(fp + 3);
-				}
-			}
-			bezt++;
-		}
-
-		glEnd();
-
-#undef TH_HANDLE_COL_TOT
-
-	}
-}
-
-static void drawhandlesN_active(Nurb *nu)
-{
-	if (nu->hide) return;
-
-	UI_ThemeColor(TH_ACTIVE_SPLINE);
-	glLineWidth(2);
-
-	glBegin(GL_LINES);
-
-	if (nu->type == CU_BEZIER) {
-		BezTriple *bezt = nu->bezt;
-		int a = nu->pntsu;
-		while (a--) {
-			if (bezt->hide == 0) {
-				const float *fp = bezt->vec[0];
-
-				glVertex3fv(fp);
-				glVertex3fv(fp + 3);
-
-				glVertex3fv(fp + 3);
-				glVertex3fv(fp + 6);
-			}
-			bezt++;
-		}
-	}
-	glEnd();
-
-	glColor3ub(0, 0, 0);
-}
-
-static void drawvertsN(Nurb *nu, const char sel, const bool hide_handles, const void *vert)
-{
-	if (nu->hide) return;
-
-	const int color = sel ? TH_VERTEX_SELECT : TH_VERTEX;
-
-	UI_ThemeColor(color);
-
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-
-	glBegin(GL_POINTS);
-
-	if (nu->type == CU_BEZIER) {
-
-		BezTriple *bezt = nu->bezt;
-		int a = nu->pntsu;
-		while (a--) {
-			if (bezt->hide == 0) {
-				if (sel == 1 && bezt == vert) {
-					UI_ThemeColor(TH_ACTIVE_VERT);
-
-					if (bezt->f2 & SELECT) glVertex3fv(bezt->vec[1]);
-					if (!hide_handles) {
-						if (bezt->f1 & SELECT) glVertex3fv(bezt->vec[0]);
-						if (bezt->f3 & SELECT) glVertex3fv(bezt->vec[2]);
-					}
-
-					UI_ThemeColor(color);
-				}
-				else if (hide_handles) {
-					if ((bezt->f2 & SELECT) == sel) glVertex3fv(bezt->vec[1]);
-				}
-				else {
-					if ((bezt->f1 & SELECT) == sel) glVertex3fv(bezt->vec[0]);
-					if ((bezt->f2 & SELECT) == sel) glVertex3fv(bezt->vec[1]);
-					if ((bezt->f3 & SELECT) == sel) glVertex3fv(bezt->vec[2]);
-				}
-			}
-			bezt++;
-		}
-	}
-	else {
-		BPoint *bp = nu->bp;
-		int a = nu->pntsu * nu->pntsv;
-		while (a--) {
-			if (bp->hide == 0) {
-				if (bp == vert) {
-					UI_ThemeColor(TH_ACTIVE_VERT);
-					glVertex3fv(bp->vec);
-					UI_ThemeColor(color);
-				}
-				else {
-					if ((bp->f1 & SELECT) == sel) glVertex3fv(bp->vec);
-				}
-			}
-			bp++;
-		}
-	}
-
-	glEnd();
-}
-
-static void editnurb_draw_active_poly(Nurb *nu)
-{
-	UI_ThemeColor(TH_ACTIVE_SPLINE);
-	glLineWidth(2);
-
-	BPoint *bp = nu->bp;
-	for (int b = 0; b < nu->pntsv; b++) {
-		if (nu->flagu & 1) glBegin(GL_LINE_LOOP);
-		else glBegin(GL_LINE_STRIP);
-
-		for (int a = 0; a < nu->pntsu; a++, bp++) {
-			glVertex3fv(bp->vec);
-		}
-
-		glEnd();
-	}
-
-	glColor3ub(0, 0, 0);
-}
-
-static void editnurb_draw_active_nurbs(Nurb *nu)
-{
-	UI_ThemeColor(TH_ACTIVE_SPLINE);
-	glLineWidth(2);
-
-	glBegin(GL_LINES);
-	BPoint *bp = nu->bp;
-	for (int b = 0; b < nu->pntsv; b++) {
-		BPoint *bp1 = bp;
-		bp++;
-
-		for (int a = nu->pntsu - 1; a > 0; a--, bp++) {
-			if (bp->hide == 0 && bp1->hide == 0) {
-				glVertex3fv(bp->vec);
-				glVertex3fv(bp1->vec);
-			}
-			bp1 = bp;
-		}
-	}
-
-	if (nu->pntsv > 1) {    /* surface */
-
-		int ofs = nu->pntsu;
-		for (int b = 0; b < nu->pntsu; b++) {
-			BPoint *bp1 = nu->bp + b;
-			bp = bp1 + ofs;
-			for (int a = nu->pntsv - 1; a > 0; a--, bp += ofs) {
-				if (bp->hide == 0 && bp1->hide == 0) {
-					glVertex3fv(bp->vec);
-					glVertex3fv(bp1->vec);
-				}
-				bp1 = bp;
-			}
-		}
-	}
-
-	glEnd();
-
-	glColor3ub(0, 0, 0);
-}
-
-static void draw_editnurb_splines(Object *ob, Nurb *nurb, const bool sel)
-{
-	BPoint *bp, *bp1;
-	int a, b;
-	Curve *cu = ob->data;
-
-	int index = 0;
-	Nurb *nu = nurb;
-	while (nu) {
-		if (nu->hide == 0) {
-			switch (nu->type) {
-				case CU_POLY:
-					if (!sel && index == cu->actnu) {
-						/* we should draw active spline highlight below everything */
-						editnurb_draw_active_poly(nu);
-					}
-
-					glLineWidth(1);
-
-					UI_ThemeColor(TH_NURB_ULINE);
-					bp = nu->bp;
-					for (b = 0; b < nu->pntsv; b++) {
-						if (nu->flagu & 1) glBegin(GL_LINE_LOOP);
-						else glBegin(GL_LINE_STRIP);
-
-						for (a = 0; a < nu->pntsu; a++, bp++) {
-							glVertex3fv(bp->vec);
-						}
-
-						glEnd();
-					}
-					break;
-				case CU_NURBS:
-					if (!sel && index == cu->actnu) {
-						/* we should draw active spline highlight below everything */
-						editnurb_draw_active_nurbs(nu);
-					}
-
-					glLineWidth(1);
-
-					glBegin(GL_LINES);
-
-					bp = nu->bp;
-					for (b = 0; b < nu->pntsv; b++) {
-						bp1 = bp;
-						bp++;
-						for (a = nu->pntsu - 1; a > 0; a--, bp++) {
-							if (bp->hide == 0 && bp1->hide == 0) {
-								if (sel) {
-									if ((bp->f1 & SELECT) && (bp1->f1 & SELECT)) {
-										UI_ThemeColor(TH_NURB_SEL_ULINE);
-
-										glVertex3fv(bp->vec);
-										glVertex3fv(bp1->vec);
-									}
-								}
-								else {
-									if ((bp->f1 & SELECT) && (bp1->f1 & SELECT)) {
-										/* pass */
-									}
-									else {
-										UI_ThemeColor(TH_NURB_ULINE);
-
-										glVertex3fv(bp->vec);
-										glVertex3fv(bp1->vec);
-									}
-								}
-							}
-							bp1 = bp;
-						}
-					}
-
-					if (nu->pntsv > 1) {    /* surface */
-						int ofs = nu->pntsu;
-						for (b = 0; b < nu->pntsu; b++) {
-							bp1 = nu->bp + b;
-							bp = bp1 + ofs;
-							for (a = nu->pntsv - 1; a > 0; a--, bp += ofs) {
-								if (bp->hide == 0 && bp1->hide == 0) {
-									if (sel) {
-										if ((bp->f1 & SELECT) && (bp1->f1 & SELECT)) {
-											UI_ThemeColor(TH_NURB_SEL_VLINE);
-
-											glVertex3fv(bp->vec);
-											glVertex3fv(bp1->vec);
-										}
-									}
-									else {
-										if ((bp->f1 & SELECT) && (bp1->f1 & SELECT)) {
-											/* pass */
-										}
-										else {
-											UI_ThemeColor(TH_NURB_VLINE);
-
-											glVertex3fv(bp->vec);
-											glVertex3fv(bp1->vec);
-										}
-									}
-								}
-								bp1 = bp;
-							}
-						}
-					}
-
-					glEnd();
-					break;
-			}
-		}
-
-		index++;
-		nu = nu->next;
-	}
-}
-
-static void draw_editnurb(
-        Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb,
-        const char dt, const short dflag, const unsigned char ob_wire_col[4])
-{
-	ToolSettings *ts = scene->toolsettings;
-	Object *ob = base->object;
-	Curve *cu = ob->data;
-	Nurb *nu;
-	const void *vert = BKE_curve_vert_active_get(cu);
-	const bool hide_handles = (cu->drawflag & CU_HIDE_HANDLES) != 0;
-	unsigned char wire_col[3];
-
-	/* DispList */
-	UI_GetThemeColor3ubv(TH_WIRE_EDIT, wire_col);
-	glColor3ubv(wire_col);
-
-	drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-
-	/* for shadows only show solid faces */
-	if (v3d->flag2 & V3D_RENDER_SHADOW)
-		return;
-
-	if (v3d->zbuf) glDepthFunc(GL_ALWAYS);
-
-	/* first non-selected and active handles */
-	int index = 0;
-	for (nu = nurb; nu; nu = nu->next) {
-		if (nu->type == CU_BEZIER) {
-			if (index == cu->actnu && !hide_handles)
-				drawhandlesN_active(nu);
-			drawhandlesN(nu, 0, hide_handles);
-		}
-		index++;
-	}
-	draw_editnurb_splines(ob, nurb, false);
-	draw_editnurb_splines(ob, nurb, true);
-	/* selected handles */
-	for (nu = nurb; nu; nu = nu->next) {
-		if (nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES) == 0)
-			drawhandlesN(nu, 1, hide_handles);
-		drawvertsN(nu, 0, hide_handles, NULL);
-	}
-
-	if (v3d->zbuf) glDepthFunc(GL_LEQUAL);
-
-	glColor3ubv(wire_col);
-
-	/* direction vectors for 3d curve paths
-	 * when at its lowest, don't render normals */
-	if ((cu->flag & CU_3D) && (ts->normalsize > 0.0015f) && (cu->drawflag & CU_HIDE_NORMALS) == 0) {
-		BevList *bl;
-		glLineWidth(1.0f);
-		for (bl = ob->curve_cache->bev.first, nu = nurb; nu && bl; bl = bl->next, nu = nu->next) {
-			BevPoint *bevp = bl->bevpoints;
-			int nr = bl->nr;
-			int skip = nu->resolu / 16;
-
-			while (nr-- > 0) { /* accounts for empty bevel lists */
-				const float fac = bevp->radius * ts->normalsize;
-				float vec_a[3]; /* Offset perpendicular to the curve */
-				float vec_b[3]; /* Delta along the curve */
-
-				vec_a[0] = fac;
-				vec_a[1] = 0.0f;
-				vec_a[2] = 0.0f;
-
-				mul_qt_v3(bevp->quat, vec_a);
-				madd_v3_v3fl(vec_a, bevp->dir, -fac);
-
-				reflect_v3_v3v3(vec_b, vec_a, bevp->dir);
-				negate_v3(vec_b);
-
-				add_v3_v3(vec_a, bevp->vec);
-				add_v3_v3(vec_b, bevp->vec);
-
-				glBegin(GL_LINE_STRIP);
-				glVertex3fv(vec_a);
-				glVertex3fv(bevp->vec);
-				glVertex3fv(vec_b);
-				glEnd();
-
-				bevp += skip + 1;
-				nr -= skip;
-			}
-		}
-	}
-
-	if (v3d->zbuf) glDepthFunc(GL_ALWAYS);
-
-	for (nu = nurb; nu; nu = nu->next) {
-		drawvertsN(nu, 1, hide_handles, vert);
-	}
-
-	if (v3d->zbuf) glDepthFunc(GL_LEQUAL);
-}
-
-static void draw_editfont_textcurs(RegionView3D *rv3d, float textcurs[4][2])
-{
-	cpack(0);
-	ED_view3d_polygon_offset(rv3d, -1.0);
-	set_inverted_drawing(1);
-	glBegin(GL_QUADS);
-	glVertex2fv(textcurs[0]);
-	glVertex2fv(textcurs[1]);
-	glVertex2fv(textcurs[2]);
-	glVertex2fv(textcurs[3]);
-	glEnd();
-	set_inverted_drawing(0);
-	ED_view3d_polygon_offset(rv3d, 0.0);
-}
-
-static void draw_editfont(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
-                          const char dt, const short dflag, const unsigned char ob_wire_col[4])
-{
-	Object *ob = base->object;
-	Curve *cu = ob->data;
-	EditFont *ef = cu->editfont;
-	float vec1[3], vec2[3];
-
-	draw_editfont_textcurs(rv3d, ef->textcurs);
-
-	if (cu->flag & CU_FAST) {
-		cpack(0xFFFFFF);
-		set_inverted_drawing(1);
-		drawDispList(scene, v3d, rv3d, base, OB_WIRE, dflag, ob_wire_col);
-		set_inverted_drawing(0);
-	}
-	else {
-		drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-	}
-
-	if (cu->linewidth != 0.0f) {
-		UI_ThemeColor(TH_WIRE_EDIT);
-		copy_v3_v3(vec1, ob->orig);
-		copy_v3_v3(vec2, ob->orig);
-		vec1[0] += cu->linewidth;
-		vec2[0] += cu->linewidth;
-		vec1[1] += cu->linedist * cu->fsize;
-		vec2[1] -= cu->lines * cu->linedist * cu->fsize;
-		setlinestyle(3);
-		glBegin(GL_LINES);
-		glVertex2fv(vec1);
-		glVertex2fv(vec2);
-		glEnd();
-		setlinestyle(0);
-	}
-
-	setlinestyle(3);
-	for (int i = 0; i < cu->totbox; i++) {
-		if (cu->tb[i].w != 0.0f) {
-			UI_ThemeColor(i == (cu->actbox - 1) ? TH_ACTIVE : TH_WIRE);
-			vec1[0] = cu->xof + cu->tb[i].x;
-			vec1[1] = cu->yof + cu->tb[i].y + cu->fsize;
-			vec1[2] = 0.001;
-			glBegin(GL_LINE_STRIP);
-			glVertex3fv(vec1);
-			vec1[0] += cu->tb[i].w;
-			glVertex3fv(vec1);
-			vec1[1] -= cu->tb[i].h;
-			glVertex3fv(vec1);
-			vec1[0] -= cu->tb[i].w;
-			glVertex3fv(vec1);
-			vec1[1] += cu->tb[i].h;
-			glVertex3fv(vec1);
-			glEnd();
-		}
-	}
-	setlinestyle(0);
-
-
-	if (ef->selboxes && ef->selboxes_len) {
-		float selboxw;
-
-		cpack(0xffffff);
-		set_inverted_drawing(1);
-		for (int i = 0; i < ef->selboxes_len; i++) {
-			EditFontSelBox *sb = &ef->selboxes[i];
-			float tvec[3];
-
-			if (i + 1 != ef->selboxes_len) {
-				if (ef->selboxes[i + 1].y == sb->y)
-					selboxw = ef->selboxes[i + 1].x - sb->x;
-				else
-					selboxw = sb->w;
-			}
-			else {
-				selboxw = sb->w;
-			}
-
-			/* fill in xy below */
-			tvec[2] = 0.001;
-
-			glBegin(GL_QUADS);
-
-			if (sb->rot == 0.0f) {
-				copy_v2_fl2(tvec, sb->x, sb->y);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, sb->x + selboxw, sb->y);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, sb->x + selboxw, sb->y + sb->h);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, sb->x, sb->y + sb->h);
-				glVertex3fv(tvec);
-			}
-			else {
-				float mat[2][2];
-
-				angle_to_mat2(mat, sb->rot);
-
-				copy_v2_fl2(tvec, sb->x, sb->y);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, selboxw, 0.0f);
-				mul_m2v2(mat, tvec);
-				add_v2_v2(tvec, &sb->x);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, selboxw, sb->h);
-				mul_m2v2(mat, tvec);
-				add_v2_v2(tvec, &sb->x);
-				glVertex3fv(tvec);
-
-				copy_v2_fl2(tvec, 0.0f, sb->h);
-				mul_m2v2(mat, tvec);
-				add_v2_v2(tvec, &sb->x);
-				glVertex3fv(tvec);
-			}
-
-			glEnd();
-		}
-		set_inverted_drawing(0);
-	}
-}
-
-/* draw a sphere for use as an empty drawtype */
-static void draw_empty_sphere(float size)
-{
-	static GLuint displist = 0;
-
-	if (displist == 0) {
-		GLUquadricObj *qobj;
-
-		displist = glGenLists(1);
-		glNewList(displist, GL_COMPILE);
-
-		glPushMatrix();
-
-		qobj = gluNewQuadric();
-		gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-		gluDisk(qobj, 0.0,  1, 16, 1);
-
-		glRotatef(90, 0, 1, 0);
-		gluDisk(qobj, 0.0,  1, 16, 1);
-
-		glRotatef(90, 1, 0, 0);
-		gluDisk(qobj, 0.0,  1, 16, 1);
-
-		gluDeleteQuadric(qobj);
-
-		glPopMatrix();
-		glEndList();
-	}
-
-	glScalef(size, size, size);
-	glCallList(displist);
-	glScalef(1.0f / size, 1.0f / size, 1.0f / size);
-}
-
-/* draw a cone for use as an empty drawtype */
-static void draw_empty_cone(float size)
-{
-	const float radius = size;
-
-	GLUquadricObj *qobj = gluNewQuadric();
-	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-
-	glPushMatrix();
-
-	glScalef(radius, size * 2.0f, radius);
-	glRotatef(-90.0, 1.0, 0.0, 0.0);
-	gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
-
-	glPopMatrix();
-
-	gluDeleteQuadric(qobj);
-}
-
-static void drawspiral(const float cent[3], float rad, float tmat[4][4], int start)
-{
-	float vec[3], vx[3], vy[3];
-	const float tot_inv = 1.0f / (float)CIRCLE_RESOL;
-	int a;
-	bool inverse = false;
-	float x, y, fac;
-
-	if (start < 0) {
-		inverse = true;
-		start = -start;
-	}
-
-	mul_v3_v3fl(vx, tmat[0], rad);
-	mul_v3_v3fl(vy, tmat[1], rad);
-
-	glBegin(GL_LINE_STRIP);
-
-	if (inverse == 0) {
-		copy_v3_v3(vec, cent);
-		glVertex3fv(vec);
-
-		for (a = 0; a < CIRCLE_RESOL; a++) {
-			if (a + start >= CIRCLE_RESOL)
-				start = -a + 1;
-
-			fac = (float)a * tot_inv;
-			x = sinval[a + start] * fac;
-			y = cosval[a + start] * fac;
-
-			vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
-			vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
-			vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
-
-			glVertex3fv(vec);
-		}
-	}
-	else {
-		fac = (float)(CIRCLE_RESOL - 1) * tot_inv;
-		x = sinval[start] * fac;
-		y = cosval[start] * fac;
-
-		vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
-		vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
-		vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
-
-		glVertex3fv(vec);
-
-		for (a = 0; a < CIRCLE_RESOL; a++) {
-			if (a + start >= CIRCLE_RESOL)
-				start = -a + 1;
-
-			fac = (float)(-a + (CIRCLE_RESOL - 1)) * tot_inv;
-			x = sinval[a + start] * fac;
-			y = cosval[a + start] * fac;
-
-			vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
-			vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
-			vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
-			glVertex3fv(vec);
-		}
-	}
-
-	glEnd();
-}
-
-/* draws a circle on x-z plane given the scaling of the circle, assuming that
- * all required matrices have been set (used for drawing empties) */
-static void drawcircle_size(float size)
-{
-	glBegin(GL_LINE_LOOP);
-
-	/* coordinates are: cos(degrees * 11.25) = x, sin(degrees * 11.25) = y, 0.0f = z */
-	for (short degrees = 0; degrees < CIRCLE_RESOL; degrees++) {
-		float x = cosval[degrees];
-		float y = sinval[degrees];
-
-		glVertex3f(x * size, 0.0f, y * size);
-	}
-
-	glEnd();
-
-}
-
-/* needs fixing if non-identity matrix used */
-static void drawtube(const float vec[3], float radius, float height, float tmat[4][4])
-{
-	float cur[3];
-	drawcircball(GL_LINE_LOOP, vec, radius, tmat);
-
-	copy_v3_v3(cur, vec);
-	cur[2] += height;
-
-	drawcircball(GL_LINE_LOOP, cur, radius, tmat);
-
-	glBegin(GL_LINES);
-	glVertex3f(vec[0] + radius, vec[1], vec[2]);
-	glVertex3f(cur[0] + radius, cur[1], cur[2]);
-	glVertex3f(vec[0] - radius, vec[1], vec[2]);
-	glVertex3f(cur[0] - radius, cur[1], cur[2]);
-	glVertex3f(vec[0], vec[1] + radius, vec[2]);
-	glVertex3f(cur[0], cur[1] + radius, cur[2]);
-	glVertex3f(vec[0], vec[1] - radius, vec[2]);
-	glVertex3f(cur[0], cur[1] - radius, cur[2]);
-	glEnd();
-}
-
-/* needs fixing if non-identity matrix used */
-static void drawcone(const float vec[3], float radius, float height, float tmat[4][4])
-{
-	float cur[3];
-
-	copy_v3_v3(cur, vec);
-	cur[2] += height;
-
-	drawcircball(GL_LINE_LOOP, cur, radius, tmat);
-
-	glBegin(GL_LINES);
-	glVertex3f(vec[0], vec[1], vec[2]);
-	glVertex3f(cur[0] + radius, cur[1], cur[2]);
-	glVertex3f(vec[0], vec[1], vec[2]);
-	glVertex3f(cur[0] - radius, cur[1], cur[2]);
-	glVertex3f(vec[0], vec[1], vec[2]);
-	glVertex3f(cur[0], cur[1] + radius, cur[2]);
-	glVertex3f(vec[0], vec[1], vec[2]);
-	glVertex3f(cur[0], cur[1] - radius, cur[2]);
-	glEnd();
-}
-
-/* return true if nothing was drawn */
-static bool drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
-                      const char dt, const short dflag, const unsigned char ob_wire_col[4])
-{
-	Object *ob = base->object;
-	MetaElem *ml;
-	float imat[4][4];
-	int code = 1;
-
-	MetaBall *mb = ob->data;
-
-	if (mb->editelems) {
-		if ((G.f & G_PICKSEL) == 0) {
-			unsigned char wire_col[4];
-			UI_GetThemeColor4ubv(TH_WIRE_EDIT, wire_col);
-			glColor3ubv(wire_col);
-
-			drawDispList(scene, v3d, rv3d, base, dt, dflag, wire_col);
-		}
-		ml = mb->editelems->first;
-	}
-	else {
-		if ((base->flag & OB_FROMDUPLI) == 0) {
-			drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-		}
-		ml = mb->elems.first;
-	}
-
-	if (ml == NULL) {
-		return true;
-	}
-
-	if (v3d->flag2 & V3D_RENDER_OVERRIDE) {
-		return false;
-	}
-
-	invert_m4_m4(imat, rv3d->viewmatob);
-	normalize_v3(imat[0]);
-	normalize_v3(imat[1]);
-
-	if (mb->editelems == NULL) {
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			glColor3ubv(ob_wire_col);
-		}
-	}
-
-	glLineWidth(1.0f);
-
-	while (ml) {
-		/* draw radius */
-		if (mb->editelems) {
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				if ((ml->flag & SELECT) && (ml->flag & MB_SCALE_RAD)) cpack(0xA0A0F0);
-				else cpack(0x3030A0);
-			}
-
-			if (G.f & G_PICKSEL) {
-				ml->selcol1 = code;
-				GPU_select_load_id(code++);
-			}
-		}
-		drawcircball(GL_LINE_LOOP, &(ml->x), ml->rad, imat);
-
-		/* draw stiffness */
-		if (mb->editelems) {
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				if ((ml->flag & SELECT) && !(ml->flag & MB_SCALE_RAD)) cpack(0xA0F0A0);
-				else cpack(0x30A030);
-			}
-
-			if (G.f & G_PICKSEL) {
-				ml->selcol2 = code;
-				GPU_select_load_id(code++);
-			}
-			drawcircball(GL_LINE_LOOP, &(ml->x), ml->rad * atanf(ml->s) / (float)M_PI_2, imat);
-		}
-
-		ml = ml->next;
-	}
-	return false;
-}
-
-static void draw_forcefield(Object *ob, RegionView3D *rv3d,
-                            const short dflag, const unsigned char ob_wire_col[4])
-{
-	PartDeflect *pd = ob->pd;
-	float imat[4][4], tmat[4][4];
-	float vec[3] = {0.0, 0.0, 0.0};
-	/* scale size of circle etc with the empty drawsize */
-	const float size = (ob->type == OB_EMPTY) ? ob->empty_drawsize : 1.0f;
-
-	/* calculus here, is reused in PFIELD_FORCE */
-	invert_m4_m4(imat, rv3d->viewmatob);
-#if 0
-	normalize_v3(imat[0]);  /* we don't do this because field doesnt scale either... apart from wind! */
-	normalize_v3(imat[1]);
-#endif
-
-	if (pd->forcefield == PFIELD_WIND) {
-		float force_val = pd->f_strength;
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.5f);
-		}
-
-		unit_m4(tmat);
-		force_val *= 0.1f;
-		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2] = 0.5f * force_val;
-		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2] = 1.0f * force_val;
-		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2] = 1.5f * force_val;
-		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2] = 0.0f; /* reset vec for max dist circle */
-
-	}
-	else if (pd->forcefield == PFIELD_FORCE) {
-		float ffall_val = pd->f_power;
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.5f);
-		drawcircball(GL_LINE_LOOP, vec, size, imat);
-		if ((dflag & DRAW_CONSTCOLOR) == 0) ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.9f - 0.4f / powf(1.5f, ffall_val));
-		drawcircball(GL_LINE_LOOP, vec, size * 1.5f, imat);
-		if ((dflag & DRAW_CONSTCOLOR) == 0) ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.9f - 0.4f / powf(2.0f, ffall_val));
-		drawcircball(GL_LINE_LOOP, vec, size * 2.0f, imat);
-	}
-	else if (pd->forcefield == PFIELD_VORTEX) {
-		float force_val = pd->f_strength;
-
-		unit_m4(tmat);
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.7f);
-		}
-
-		if (force_val < 0) {
-			drawspiral(vec, size, tmat, 1);
-			drawspiral(vec, size, tmat, 16);
-		}
-		else {
-			drawspiral(vec, size, tmat, -1);
-			drawspiral(vec, size, tmat, -16);
-		}
-	}
-	else if (pd->forcefield == PFIELD_GUIDE && ob->type == OB_CURVE) {
-		Curve *cu = ob->data;
-		if ((cu->flag & CU_PATH) && ob->curve_cache->path && ob->curve_cache->path->data) {
-			float guidevec1[4], guidevec2[3];
-			float mindist = pd->f_strength;
-
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.5f);
-			}
-
-			/* path end */
-			setlinestyle(3);
-			where_on_path(ob, 1.0f, guidevec1, guidevec2, NULL, NULL, NULL);
-			drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
-
-			/* path beginning */
-			setlinestyle(0);
-			where_on_path(ob, 0.0f, guidevec1, guidevec2, NULL, NULL, NULL);
-			drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
-
-			copy_v3_v3(vec, guidevec1); /* max center */
-		}
-	}
-
-	setlinestyle(3);
-
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-		ob_wire_color_blend_theme_id(ob_wire_col, TH_BACK, 0.5f);
-	}
-
-	if (pd->falloff == PFIELD_FALL_SPHERE) {
-		/* as last, guide curve alters it */
-		if (pd->flag & PFIELD_USEMAX)
-			drawcircball(GL_LINE_LOOP, vec, pd->maxdist, imat);
-
-		if (pd->flag & PFIELD_USEMIN)
-			drawcircball(GL_LINE_LOOP, vec, pd->mindist, imat);
-	}
-	else if (pd->falloff == PFIELD_FALL_TUBE) {
-		float radius, distance;
-
-		unit_m4(tmat);
-
-		vec[0] = vec[1] = 0.0f;
-		radius = (pd->flag & PFIELD_USEMAXR) ? pd->maxrad : 1.0f;
-		distance = (pd->flag & PFIELD_USEMAX) ? pd->maxdist : 0.0f;
-		vec[2] = distance;
-		distance = (pd->flag & PFIELD_POSZ) ? -distance : -2.0f * distance;
-
-		if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR))
-			drawtube(vec, radius, distance, tmat);
-
-		radius = (pd->flag & PFIELD_USEMINR) ? pd->minrad : 1.0f;
-		distance = (pd->flag & PFIELD_USEMIN) ? pd->mindist : 0.0f;
-		vec[2] = distance;
-		distance = (pd->flag & PFIELD_POSZ) ? -distance : -2.0f * distance;
-
-		if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR))
-			drawtube(vec, radius, distance, tmat);
-	}
-	else if (pd->falloff == PFIELD_FALL_CONE) {
-		float radius, distance;
-
-		unit_m4(tmat);
-
-		radius = DEG2RADF((pd->flag & PFIELD_USEMAXR) ? pd->maxrad : 1.0f);
-		distance = (pd->flag & PFIELD_USEMAX) ? pd->maxdist : 0.0f;
-
-		if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR)) {
-			drawcone(vec, distance * sinf(radius), distance * cosf(radius), tmat);
-			if ((pd->flag & PFIELD_POSZ) == 0)
-				drawcone(vec, distance * sinf(radius), -distance * cosf(radius), tmat);
-		}
-
-		radius = DEG2RADF((pd->flag & PFIELD_USEMINR) ? pd->minrad : 1.0f);
-		distance = (pd->flag & PFIELD_USEMIN) ? pd->mindist : 0.0f;
-
-		if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR)) {
-			drawcone(vec, distance * sinf(radius), distance * cosf(radius), tmat);
-			if ((pd->flag & PFIELD_POSZ) == 0)
-				drawcone(vec, distance * sinf(radius), -distance * cosf(radius), tmat);
-		}
-	}
-	setlinestyle(0);
-}
-
-static void draw_box(const float vec[8][3], bool solid)
-{
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, 0, vec);
-
-	if (solid) {
-		const GLubyte indices[24] = {0, 1, 2, 3, 7, 6, 5, 4, 4, 5, 1, 0, 3, 2, 6, 7, 3, 7, 4, 0, 1, 5, 6, 2};
-		glDrawRangeElements(GL_QUADS, 0, 7, 24, GL_UNSIGNED_BYTE, indices);
-	}
-	else {
-		const GLubyte indices[24] = {0, 1, 1, 2, 2, 3, 3, 0, 0, 4, 4, 5, 5, 6, 6, 7, 7, 4, 1, 5, 2, 6, 3, 7};
-		glDrawRangeElements(GL_LINES, 0, 7, 24, GL_UNSIGNED_BYTE, indices);
-	}
-
-	glDisableClientState(GL_VERTEX_ARRAY);
-}
-
-static void draw_bb_quadric(BoundBox *bb, char type, bool around_origin)
+static void bbs_mesh_face_dot(BMEditMesh *em, DerivedMesh *UNUSED(dm))
 {
-	float size[3], cent[3];
-	GLUquadricObj *qobj = gluNewQuadric();
-
-	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-
-	BKE_boundbox_calc_size_aabb(bb, size);
-
-	if (around_origin) {
-		zero_v3(cent);
-	}
-	else {
-		BKE_boundbox_calc_center_aabb(bb, cent);
-	}
-
-	glPushMatrix();
-	if (type == OB_BOUND_SPHERE) {
-		float scale = MAX3(size[0], size[1], size[2]);
-		glTranslate3fv(cent);
-		glScalef(scale, scale, scale);
-		gluSphere(qobj, 1.0, 8, 5);
-	}
-	else if (type == OB_BOUND_CYLINDER) {
-		float radius = size[0] > size[1] ? size[0] : size[1];
-		glTranslatef(cent[0], cent[1], cent[2] - size[2]);
-		glScalef(radius, radius, 2.0f * size[2]);
-		gluCylinder(qobj, 1.0, 1.0, 1.0, 8, 1);
-	}
-	else if (type == OB_BOUND_CONE) {
-		float radius = size[0] > size[1] ? size[0] : size[1];
-		glTranslatef(cent[0], cent[1], cent[2] - size[2]);
-		glScalef(radius, radius, 2.0f * size[2]);
-		gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
-	}
-	else if (type == OB_BOUND_CAPSULE) {
-		float radius = size[0] > size[1] ? size[0] : size[1];
-		float length = size[2] > radius ? 2.0f * (size[2] - radius) : 0.0f;
-		glTranslatef(cent[0], cent[1], cent[2] - length * 0.5f);
-		gluCylinder(qobj, radius, radius, length, 8, 1);
-		gluSphere(qobj, radius, 8, 4);
-		glTranslatef(0.0, 0.0, length);
-		gluSphere(qobj, radius, 8, 4);
-	}
-	glPopMatrix();
-
-	gluDeleteQuadric(qobj);
+	Mesh *me = em->ob->data;
+	Gwn_Batch *batch = DRW_mesh_batch_cache_get_facedots_with_select_id(me, 1);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+	GWN_batch_draw(batch);
 }
-
-static void draw_bounding_volume(Object *ob, char type)
-{
-	BoundBox  bb_local;
-	BoundBox *bb = NULL;
-
-	if (ob->type == OB_MESH) {
-		bb = BKE_mesh_boundbox_get(ob);
-	}
-	else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
-		bb = BKE_curve_boundbox_get(ob);
-	}
-	else if (ob->type == OB_MBALL) {
-		if (BKE_mball_is_basis(ob)) {
-			bb = ob->bb;
-		}
-	}
-	else if (ob->type == OB_ARMATURE) {
-		bb = BKE_armature_boundbox_get(ob);
-	}
-	else if (ob->type == OB_LATTICE) {
-		bb = BKE_lattice_boundbox_get(ob);
-	}
-	else {
-		const float min[3] = {-1.0f, -1.0f, -1.0f}, max[3] = {1.0f, 1.0f, 1.0f};
-		bb = &bb_local;
-		BKE_boundbox_init_from_minmax(bb, min, max);
-	}
-
-	if (bb == NULL)
-		return;
-
-	if (ob->gameflag & OB_BOUNDS) { /* bounds need to be drawn around origin for game engine */
-
-		if (type == OB_BOUND_BOX) {
-			float vec[8][3], size[3];
-
-			BKE_boundbox_calc_size_aabb(bb, size);
-
-			vec[0][0] = vec[1][0] = vec[2][0] = vec[3][0] = -size[0];
-			vec[4][0] = vec[5][0] = vec[6][0] = vec[7][0] = +size[0];
-			vec[0][1] = vec[1][1] = vec[4][1] = vec[5][1] = -size[1];
-			vec[2][1] = vec[3][1] = vec[6][1] = vec[7][1] = +size[1];
-			vec[0][2] = vec[3][2] = vec[4][2] = vec[7][2] = -size[2];
-			vec[1][2] = vec[2][2] = vec[5][2] = vec[6][2] = +size[2];
-
-			draw_box(vec, false);
-		}
-		else {
-			draw_bb_quadric(bb, type, true);
-		}
-	}
-	else {
-		if (type == OB_BOUND_BOX)
-			draw_box(bb->vec, false);
-		else
-			draw_bb_quadric(bb, type, false);
-	}
-}
-
-static void drawtexspace(Object *ob)
-{
-	float vec[8][3], loc[3], size[3];
-
-	if (ob->type == OB_MESH) {
-		BKE_mesh_texspace_get(ob->data, loc, NULL, size);
-	}
-	else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
-		BKE_curve_texspace_get(ob->data, loc, NULL, size);
-	}
-	else if (ob->type == OB_MBALL) {
-		MetaBall *mb = ob->data;
-		copy_v3_v3(size, mb->size);
-		copy_v3_v3(loc, mb->loc);
-	}
-	else {
-		return;
-	}
-
-	vec[0][0] = vec[1][0] = vec[2][0] = vec[3][0] = loc[0] - size[0];
-	vec[4][0] = vec[5][0] = vec[6][0] = vec[7][0] = loc[0] + size[0];
-
-	vec[0][1] = vec[1][1] = vec[4][1] = vec[5][1] = loc[1] - size[1];
-	vec[2][1] = vec[3][1] = vec[6][1] = vec[7][1] = loc[1] + size[1];
-
-	vec[0][2] = vec[3][2] = vec[4][2] = vec[7][2] = loc[2] - size[2];
-	vec[1][2] = vec[2][2] = vec[5][2] = vec[6][2] = loc[2] + size[2];
-
-	setlinestyle(2);
-
-	draw_box(vec, false);
-
-	setlinestyle(0);
-}
-
-/* draws wire outline */
-static void draw_object_selected_outline(
-        Scene *scene, View3D *v3d, ARegion *ar, Base *base,
-        const unsigned char ob_wire_col[4])
-{
-	RegionView3D *rv3d = ar->regiondata;
-	Object *ob = base->object;
-
-	glDepthMask(0);
-
-	if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
-		bool has_faces = false;
-
-#ifdef SEQUENCER_DAG_WORKAROUND
-		ensure_curve_cache(scene, ob);
-#endif
-
-		DerivedMesh *dm = ob->derivedFinal;
-		if (dm) {
-			DM_update_materials(dm, ob);
-		}
-
-		if (dm) {
-			has_faces = (dm->getNumPolys(dm) != 0);
-		}
-		else {
-			has_faces = BKE_displist_has_faces(&ob->curve_cache->disp);
-		}
-
-		if (has_faces && ED_view3d_boundbox_clip(rv3d, ob->bb)) {
-			glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
-			if (dm) {
-				draw_mesh_object_outline(v3d, ob, dm);
-			}
-			else {
-				/* only draw 'solid' parts of the display list as wire. */
-				drawDispListwire_ex(&ob->curve_cache->disp, (DL_INDEX3 | DL_INDEX4 | DL_SURF));
-			}
-		}
-	}
-	else if (ob->type == OB_MBALL) {
-		if (BKE_mball_is_basis(ob)) {
-			if ((base->flag & OB_FROMDUPLI) == 0) {
-				glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
-				drawDispListwire(&ob->curve_cache->disp, ob->type);
-			}
-		}
-	}
-	else if (ob->type == OB_ARMATURE) {
-		if (!(ob->mode & OB_MODE_POSE && base == scene->basact)) {
-			glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
-			draw_armature(scene, v3d, ar, base, OB_WIRE, 0, ob_wire_col, true);
-		}
-	}
-
-	glDepthMask(1);
-}
-
-static void draw_wire_extra(Scene *scene, RegionView3D *rv3d, Object *ob, const unsigned char ob_wire_col[4])
-{
-	if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL)) {
-
-		if (scene->obedit == ob) {
-			UI_ThemeColor(TH_WIRE_EDIT);
-		}
-		else {
-			glColor3ubv(ob_wire_col);
-		}
-
-		ED_view3d_polygon_offset(rv3d, 1.0);
-		glDepthMask(0);  /* disable write in zbuffer, selected edge wires show better */
-		glLineWidth(1);
-
-		if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
-			if (ED_view3d_boundbox_clip(rv3d, ob->bb)) {
-
-				if (ob->derivedFinal) {
-					drawCurveDMWired(ob);
-				}
-				else {
-					drawDispListwire(&ob->curve_cache->disp, ob->type);
-				}
-			}
-		}
-		else if (ob->type == OB_MBALL) {
-			if (BKE_mball_is_basis(ob)) {
-				drawDispListwire(&ob->curve_cache->disp, ob->type);
-			}
-		}
-
-		glDepthMask(1);
-		ED_view3d_polygon_offset(rv3d, 0.0);
-	}
-}
-
-/* should be called in view space */
-static void draw_hooks(Object *ob)
-{
-	for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
-		if (md->type == eModifierType_Hook) {
-			HookModifierData *hmd = (HookModifierData *) md;
-			float vec[3];
-
-			mul_v3_m4v3(vec, ob->obmat, hmd->cent);
-
-			if (hmd->object) {
-				setlinestyle(3);
-				glBegin(GL_LINES);
-				glVertex3fv(hmd->object->obmat[3]);
-				glVertex3fv(vec);
-				glEnd();
-				setlinestyle(0);
-			}
-
-			glPointSize(3.0);
-			glBegin(GL_POINTS);
-			glVertex3fv(vec);
-			glEnd();
-		}
-	}
-}
-
-static void draw_rigid_body_pivot(bRigidBodyJointConstraint *data,
-                                  const short dflag, const unsigned char ob_wire_col[4])
-{
-	const char *axis_str[3] = {"px", "py", "pz"};
-	float mat[4][4];
-
-	eul_to_mat4(mat, &data->axX);
-	glLineWidth(4.0f);
-	setlinestyle(2);
-	for (int axis = 0; axis < 3; axis++) {
-		float dir[3] = {0, 0, 0};
-		float v[3];
-
-		copy_v3_v3(v, &data->pivX);
-
-		dir[axis] = 1.0f;
-		glBegin(GL_LINES);
-		mul_m4_v3(mat, dir);
-		add_v3_v3(v, dir);
-		glVertex3fv(&data->pivX);
-		glVertex3fv(v);
-		glEnd();
-
-		/* when const color is set wirecolor is NULL - we could get the current color but
-		 * with selection and group instancing its not needed to draw the text */
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			view3d_cached_text_draw_add(v, axis_str[axis], 2, 0, V3D_CACHE_TEXT_ASCII, ob_wire_col);
-		}
-	}
-
-	setlinestyle(0);
-}
-
-static void draw_object_wire_color(Scene *scene, Base *base, unsigned char r_ob_wire_col[4])
-{
-	Object *ob = base->object;
-	int colindex = 0;
-	const bool is_edit = (ob->mode & OB_MODE_EDIT) != 0;
-	/* confusing logic here, there are 2 methods of setting the color
-	 * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
-	 *
-	 * note: no theme yet for 'colindex' */
-	int theme_id = is_edit ? TH_WIRE_EDIT : TH_WIRE;
-	int theme_shade = 0;
-
-	if ((scene->obedit == NULL) &&
-	    (G.moving & G_TRANSFORM_OBJ) &&
-	    (base->flag & (SELECT + BA_WAS_SEL)))
-	{
-		theme_id = TH_TRANSFORM;
-	}
-	else {
-		/* Sets the 'colindex' */
-		if (ID_IS_LINKED(ob)) {
-			colindex = (base->flag & (SELECT + BA_WAS_SEL)) ? 2 : 1;
-		}
-		/* Sets the 'theme_id' or fallback to wire */
-		else {
-			if (ob->flag & OB_FROMGROUP) {
-				if (base->flag & (SELECT + BA_WAS_SEL)) {
-					/* uses darker active color for non-active + selected */
-					theme_id = TH_GROUP_ACTIVE;
-
-					if (scene->basact != base) {
-						theme_shade = -32;
-					}
-				}
-				else {
-					theme_id = TH_GROUP;
-				}
-			}
-			else {
-				if (base->flag & (SELECT + BA_WAS_SEL)) {
-					theme_id = scene->basact == base ? TH_ACTIVE : TH_SELECT;
-				}
-				else {
-					if (ob->type == OB_LAMP) theme_id = TH_LAMP;
-					else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
-					else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
-					else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
-					/* fallback to TH_WIRE */
-				}
-			}
-		}
-	}
-
-	/* finally set the color */
-	if (colindex == 0) {
-		if (theme_shade == 0) UI_GetThemeColor3ubv(theme_id, r_ob_wire_col);
-		else                  UI_GetThemeColorShade3ubv(theme_id, theme_shade, r_ob_wire_col);
-	}
-	else {
-		cpack_cpy_3ub(r_ob_wire_col, colortab[colindex]);
-	}
-
-	/* no reason to use this but some functions take col[4] */
-	r_ob_wire_col[3] = 255;
-}
-
-static void draw_object_matcap_check(View3D *v3d, Object *ob)
-{
-	/* fixed rule, active object draws as matcap */
-	BLI_assert((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) == 0);
-	(void)ob;
-
-	if (v3d->defmaterial == NULL) {
-		extern Material defmaterial;
-
-		v3d->defmaterial = MEM_mallocN(sizeof(Material), "matcap material");
-		*(v3d->defmaterial) = defmaterial;
-		BLI_listbase_clear(&v3d->defmaterial->gpumaterial);
-		v3d->defmaterial->preview = NULL;
-	}
-	/* first time users */
-	if (v3d->matcap_icon < ICON_MATCAP_01 ||
-	    v3d->matcap_icon > ICON_MATCAP_24)
-	{
-		v3d->matcap_icon = ICON_MATCAP_01;
-	}
-
-	if (v3d->defmaterial->preview == NULL)
-		v3d->defmaterial->preview = UI_icon_to_preview(v3d->matcap_icon);
-
-	/* signal to all material checks, gets cleared below */
-	v3d->flag2 |= V3D_SHOW_SOLID_MATCAP;
-}
-
-static void draw_rigidbody_shape(Object *ob)
-{
-	BoundBox *bb = NULL;
-	float size[3], vec[8][3];
-
-	if (ob->type == OB_MESH) {
-		bb = BKE_mesh_boundbox_get(ob);
-	}
-
-	if (bb == NULL)
-		return;
-
-	switch (ob->rigidbody_object->shape) {
-		case RB_SHAPE_BOX:
-			BKE_boundbox_calc_size_aabb(bb, size);
-
-			vec[0][0] = vec[1][0] = vec[2][0] = vec[3][0] = -size[0];
-			vec[4][0] = vec[5][0] = vec[6][0] = vec[7][0] = +size[0];
-			vec[0][1] = vec[1][1] = vec[4][1] = vec[5][1] = -size[1];
-			vec[2][1] = vec[3][1] = vec[6][1] = vec[7][1] = +size[1];
-			vec[0][2] = vec[3][2] = vec[4][2] = vec[7][2] = -size[2];
-			vec[1][2] = vec[2][2] = vec[5][2] = vec[6][2] = +size[2];
-
-			draw_box(vec, false);
-			break;
-		case RB_SHAPE_SPHERE:
-			draw_bb_quadric(bb, OB_BOUND_SPHERE, true);
-			break;
-		case RB_SHAPE_CONE:
-			draw_bb_quadric(bb, OB_BOUND_CONE, true);
-			break;
-		case RB_SHAPE_CYLINDER:
-			draw_bb_quadric(bb, OB_BOUND_CYLINDER, true);
-			break;
-		case RB_SHAPE_CAPSULE:
-			draw_bb_quadric(bb, OB_BOUND_CAPSULE, true);
-			break;
-	}
-}
-
-/**
- * main object drawing function, draws in selection
- * \param dflag (draw flag) can be DRAW_PICKING and/or DRAW_CONSTCOLOR, DRAW_SCENESET
- */
-void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short dflag)
-{
-	ModifierData *md = NULL;
-	Object *ob = base->object;
-	Curve *cu;
-	RegionView3D *rv3d = ar->regiondata;
-	unsigned int col = 0;
-	unsigned char _ob_wire_col[4];            /* dont initialize this */
-	const unsigned char *ob_wire_col = NULL;  /* dont initialize this, use NULL crashes as a way to find invalid use */
-	bool zbufoff = false, is_paint = false, empty_object = false;
-	const bool is_obact = (ob == OBACT);
-	const bool render_override = (v3d->flag2 & V3D_RENDER_OVERRIDE) != 0;
-	const bool is_picking = (G.f & G_PICKSEL) != 0;
-	const bool has_particles = (ob->particlesystem.first != NULL);
-	bool skip_object = false;  /* Draw particles but not their emitter object. */
-	SmokeModifierData *smd = NULL;
-
-	if (ob != scene->obedit) {
-		if (ob->restrictflag & OB_RESTRICT_VIEW)
-			return;
-
-		if (render_override) {
-			if (ob->restrictflag & OB_RESTRICT_RENDER)
-				return;
-
-			if (!has_particles && (ob->transflag & (OB_DUPLI & ~OB_DUPLIFRAMES)))
-				return;
-		}
-	}
-
-	if (has_particles) {
-		/* XXX particles are not safe for simultaneous threaded render */
-		if (G.is_rendering) {
-			return;
-		}
-
-		if (ob->mode == OB_MODE_OBJECT) {
-			ParticleSystem *psys;
-
-			skip_object = render_override;
-			for (psys = ob->particlesystem.first; psys; psys = psys->next) {
-				/* Once we have found a psys which renders its emitter object, we are done. */
-				if (psys->part->draw & PART_DRAW_EMITTER) {
-					skip_object = false;
-					break;
-				}
-			}
-		}
-	}
-
-	if (((base->flag & OB_FROMDUPLI) == 0) &&
-	    (md = modifiers_findByType(ob, eModifierType_Smoke)) &&
-	    (modifier_isEnabled(scene, md, eModifierMode_Realtime)))
-	{
-		smd = (SmokeModifierData *)md;
-
-		if (smd->domain) {
-			if (!v3d->transp && (dflag & DRAW_PICKING) == 0) {
-				if (!v3d->xray && !(ob->dtx & OB_DRAWXRAY)) {
-					/* object has already been drawn so skip drawing it */
-					ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
-					return;
-				}
-				else if (v3d->xray) {
-					/* object has already been drawn so skip drawing it */
-					ED_view3d_after_add(&v3d->afterdraw_xraytransp, base, dflag);
-					return;
-				}
-			}
-		}
-	}
-
-
-	/* xray delay? */
-	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
-		/* don't do xray in particle mode, need the z-buffer */
-		if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
-			/* xray and transp are set when it is drawing the 2nd/3rd pass */
-			if (!v3d->xray && !v3d->transp && (ob->dtx & OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) {
-				ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag);
-				return;
-			}
-
-			/* allow transp option for empty images */
-			if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
-				if (!v3d->xray && !v3d->transp && !(ob->dtx & OB_DRAWXRAY) && (ob->dtx & OB_DRAWTRANSP)) {
-					ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
-					return;
-				}
-			}
-		}
-	}
-
-
-	/* -------------------------------------------------------------------- */
-	/* no return after this point, otherwise leaks */
-
-	/* only once set now, will be removed too, should become a global standard */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	/* reset here to avoid having to call all over */
-	glLineWidth(1.0f);
-
-	view3d_cached_text_draw_begin();
-
-	/* draw motion paths (in view space) */
-	if (ob->mpath && !render_override) {
-		bAnimVizSettings *avs = &ob->avs;
-
-		/* setup drawing environment for paths */
-		draw_motion_paths_init(v3d, ar);
-
-		/* draw motion path for object */
-		draw_motion_path_instance(scene, ob, NULL, avs, ob->mpath);
-
-		/* cleanup after drawing */
-		draw_motion_paths_cleanup(v3d);
-	}
-
-	/* multiply view with object matrix.
-	 * local viewmat and persmat, to calculate projections */
-	ED_view3d_init_mats_rv3d_gl(ob, rv3d);
-
-	/* which wire color */
-	if ((dflag & DRAW_CONSTCOLOR) == 0) {
-
-		ED_view3d_project_base(ar, base);
-
-		draw_object_wire_color(scene, base, _ob_wire_col);
-		ob_wire_col = _ob_wire_col;
-
-		glColor3ubv(ob_wire_col);
-	}
-
-	/* maximum drawtype */
-	char dt = v3d->drawtype;
-	if (dt == OB_RENDER) dt = v3d->prev_drawtype;
-	dt = MIN2(dt, ob->dt);
-	if (v3d->zbuf == 0 && dt > OB_WIRE) dt = OB_WIRE;
-	short dtx = 0;
-
-
-	/* faceselect exception: also draw solid when (dt == wire), except in editmode */
-	if (is_obact) {
-		if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) {
-			if (ob->type == OB_MESH) {
-				if (dt < OB_SOLID) {
-					zbufoff = true;
-					dt = OB_SOLID;
-				}
-
-				if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
-					dt = OB_PAINT;
-				}
-
-				is_paint = true;
-				glEnable(GL_DEPTH_TEST);
-			}
-		}
-	}
-
-	/* matcap check - only when not painting color */
-	if ((v3d->flag2 & V3D_SOLID_MATCAP) &&
-	    (dt == OB_SOLID) &&
-	    (is_paint == false && is_picking == false) &&
-	    ((v3d->flag2 & V3D_RENDER_SHADOW) == 0))
-	{
-		draw_object_matcap_check(v3d, ob);
-	}
-
-	/* draw-extra supported for boundbox drawmode too */
-	if (dt >= OB_BOUNDBOX) {
-		dtx = ob->dtx;
-		if (ob->mode & OB_MODE_EDIT) {
-			/* the only 2 extra drawtypes alowed in editmode */
-			dtx = dtx & (OB_DRAWWIRE | OB_TEXSPACE);
-		}
-	}
-
-	if (!skip_object) {
-		/* draw outline for selected objects, mesh does itself */
-		if ((v3d->flag & V3D_SELECT_OUTLINE) && !render_override && ob->type != OB_MESH) {
-			if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (dflag & DRAW_SCENESET) == 0) {
-				if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(dflag & (DRAW_PICKING | DRAW_CONSTCOLOR))) {
-					draw_object_selected_outline(scene, v3d, ar, base, ob_wire_col);
-				}
-			}
-		}
-
-		switch (ob->type) {
-			case OB_MESH:
-				empty_object = draw_mesh_object(scene, ar, v3d, rv3d, base, dt, ob_wire_col, dflag);
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					/* mesh draws wire itself */
-					dtx &= ~OB_DRAWWIRE;
-				}
-
-				break;
-			case OB_FONT:
-				cu = ob->data;
-				if (cu->editfont) {
-					draw_editfont(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-				}
-				else if (dt == OB_BOUNDBOX) {
-					if ((render_override && v3d->drawtype >= OB_WIRE) == 0) {
-#ifdef SEQUENCER_DAG_WORKAROUND
-						ensure_curve_cache(scene, base->object);
-#endif
-						draw_bounding_volume(ob, ob->boundtype);
-					}
-				}
-				else if (ED_view3d_boundbox_clip(rv3d, ob->bb)) {
-					empty_object = drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-				}
-
-				break;
-			case OB_CURVE:
-			case OB_SURF:
-				cu = ob->data;
-
-				if (cu->editnurb) {
-					ListBase *nurbs = BKE_curve_editNurbs_get(cu);
-					draw_editnurb(scene, v3d, rv3d, base, nurbs->first, dt, dflag, ob_wire_col);
-				}
-				else if (dt == OB_BOUNDBOX) {
-					if ((render_override && (v3d->drawtype >= OB_WIRE)) == 0) {
-#ifdef SEQUENCER_DAG_WORKAROUND
-						ensure_curve_cache(scene, base->object);
 #endif
-						draw_bounding_volume(ob, ob->boundtype);
-					}
-				}
-				else if (ED_view3d_boundbox_clip(rv3d, ob->bb)) {
-					empty_object = drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-				}
-				break;
-			case OB_MBALL:
-			{
-				MetaBall *mb = ob->data;
-
-				if (mb->editelems)
-					drawmball(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-				else if (dt == OB_BOUNDBOX) {
-					if ((render_override && (v3d->drawtype >= OB_WIRE)) == 0) {
-#ifdef SEQUENCER_DAG_WORKAROUND
-						ensure_curve_cache(scene, base->object);
-#endif
-						draw_bounding_volume(ob, ob->boundtype);
-					}
-				}
-				else
-					empty_object = drawmball(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-				break;
-			}
-			case OB_EMPTY:
-				if (!render_override) {
-					if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
-						draw_empty_image(ob, dflag, ob_wire_col, v3d->multiview_eye);
-					}
-					else {
-						drawaxes(rv3d->viewmatob, ob->empty_drawsize, ob->empty_drawtype);
-					}
-				}
-				break;
-			case OB_LAMP:
-				if (!render_override) {
-					drawlamp(v3d, rv3d, base, dt, dflag, ob_wire_col, is_obact);
-				}
-				break;
-			case OB_CAMERA:
-				if (!render_override ||
-				    (rv3d->persp == RV3D_CAMOB && v3d->camera == ob)) /* special exception for active camera */
-				{
-					drawcamera(scene, v3d, rv3d, base, dflag, ob_wire_col);
-				}
-				break;
-			case OB_SPEAKER:
-				if (!render_override)
-					drawspeaker(scene, v3d, rv3d, ob, dflag);
-				break;
-			case OB_LATTICE:
-				if (!render_override) {
-					/* Do not allow boundbox in edit nor pose mode! */
-					if ((dt == OB_BOUNDBOX) && (ob->mode & OB_MODE_EDIT))
-						dt = OB_WIRE;
-					if (dt == OB_BOUNDBOX) {
-						draw_bounding_volume(ob, ob->boundtype);
-					}
-					else {
-#ifdef SEQUENCER_DAG_WORKAROUND
-						ensure_curve_cache(scene, ob);
-#endif
-						drawlattice(v3d, ob);
-					}
-				}
-				break;
-			case OB_ARMATURE:
-				if (!render_override) {
-					/* Do not allow boundbox in edit nor pose mode! */
-					if ((dt == OB_BOUNDBOX) && (ob->mode & (OB_MODE_EDIT | OB_MODE_POSE)))
-						dt = OB_WIRE;
-					if (dt == OB_BOUNDBOX) {
-						draw_bounding_volume(ob, ob->boundtype);
-					}
-					else {
-						glLineWidth(1.0f);
-						empty_object = draw_armature(scene, v3d, ar, base, dt, dflag, ob_wire_col, false);
-					}
-				}
-				break;
-			default:
-				if (!render_override) {
-					drawaxes(rv3d->viewmatob, 1.0, OB_ARROWS);
-				}
-				break;
-		}
-
-		if (!render_override) {
-			if (ob->soft /*&& dflag & OB_SBMOTION*/) {
-				float mrt[3][3], msc[3][3], mtr[3][3];
-				SoftBody *sb = NULL;
-				float tipw = 0.5f, tiph = 0.5f, drawsize = 4.0f;
-				if ((sb = ob->soft)) {
-					if (sb->solverflags & SBSO_ESTIMATEIPO) {
-
-						glLoadMatrixf(rv3d->viewmat);
-						copy_m3_m3(msc, sb->lscale);
-						copy_m3_m3(mrt, sb->lrot);
-						mul_m3_m3m3(mtr, mrt, msc);
-						ob_draw_RE_motion(sb->lcom, mtr, tipw, tiph, drawsize);
-						glMultMatrixf(ob->obmat);
-					}
-				}
-			}
-
-			if (ob->pd && ob->pd->forcefield) {
-				draw_forcefield(ob, rv3d, dflag, ob_wire_col);
-			}
-		}
-	}
-
-	/* code for new particle system */
-	if ((ob->particlesystem.first) &&
-	    (ob != scene->obedit))
-	{
-		ParticleSystem *psys;
-
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			/* for visibility, also while wpaint */
-			if (col || (ob->flag & SELECT)) {
-				cpack(0xFFFFFF);
-			}
-		}
-		//glDepthMask(GL_FALSE);
-
-		glLoadMatrixf(rv3d->viewmat);
-
-		view3d_cached_text_draw_begin();
-
-		for (psys = ob->particlesystem.first; psys; psys = psys->next) {
-			/* run this so that possible child particles get cached */
-			if (ob->mode & OB_MODE_PARTICLE_EDIT && is_obact) {
-				PTCacheEdit *edit = PE_create_current(scene, ob);
-				if (edit && edit->psys == psys)
-					draw_update_ptcache_edit(scene, ob, edit);
-			}
-
-			draw_new_particle_system(scene, v3d, rv3d, base, psys, dt, dflag);
-		}
-		invert_m4_m4(ob->imat, ob->obmat);
-		view3d_cached_text_draw_end(v3d, ar, 0);
-
-		glMultMatrixf(ob->obmat);
-
-		//glDepthMask(GL_TRUE);
-		if (col) cpack(col);
-	}
-
-	/* draw edit particles last so that they can draw over child particles */
-	if ((dflag & DRAW_PICKING) == 0 &&
-	    (!scene->obedit))
-	{
-
-		if (ob->mode & OB_MODE_PARTICLE_EDIT && is_obact) {
-			PTCacheEdit *edit = PE_create_current(scene, ob);
-			if (edit) {
-				glLoadMatrixf(rv3d->viewmat);
-				draw_update_ptcache_edit(scene, ob, edit);
-				draw_ptcache_edit(scene, v3d, edit);
-				glMultMatrixf(ob->obmat);
-			}
-		}
-	}
-
-	/* draw code for smoke, only draw domains */
-	if (smd && smd->domain) {
-		SmokeDomainSettings *sds = smd->domain;
-		float viewnormal[3];
-
-		glLoadMatrixf(rv3d->viewmat);
-		glMultMatrixf(ob->obmat);
-
-		if (!render_override) {
-			BoundBox bb;
-			float p0[3], p1[3];
-
-			/* draw max domain bounds */
-			if ((sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN)) {
-				VECSUBFAC(p0, sds->p0, sds->cell_size, sds->adapt_res);
-				VECADDFAC(p1, sds->p1, sds->cell_size, sds->adapt_res);
-				BKE_boundbox_init_from_minmax(&bb, p0, p1);
-				draw_box(bb.vec, false);
-			}
-
-			/* draw a single voxel to hint the user about the resolution of the fluid */
-			copy_v3_v3(p0, sds->p0);
-
-			if (sds->flags & MOD_SMOKE_HIGHRES) {
-				madd_v3_v3v3fl(p1, p0, sds->cell_size, 1.0f / (sds->amplify + 1));
-			}
-			else {
-				add_v3_v3v3(p1, p0, sds->cell_size);
-			}
-
-			BKE_boundbox_init_from_minmax(&bb, p0, p1);
-			draw_box(bb.vec, false);
-		}
-
-		/* don't show smoke before simulation starts, this could be made an option in the future */
-		if (sds->fluid && CFRA >= sds->point_cache[0]->startframe) {
-			float p0[3], p1[3];
-
-			/* get view vector */
-			invert_m4_m4(ob->imat, ob->obmat);
-			mul_v3_mat3_m4v3(viewnormal, ob->imat, rv3d->viewinv[2]);
-			normalize_v3(viewnormal);
-
-			/* set dynamic boundaries to draw the volume
-			 * also scale cube to global space to equalize volume slicing on all axes
-			 *  (it's scaled back before drawing) */
-			p0[0] = (sds->p0[0] + sds->cell_size[0] * sds->res_min[0] + sds->obj_shift_f[0]) * fabsf(ob->size[0]);
-			p0[1] = (sds->p0[1] + sds->cell_size[1] * sds->res_min[1] + sds->obj_shift_f[1]) * fabsf(ob->size[1]);
-			p0[2] = (sds->p0[2] + sds->cell_size[2] * sds->res_min[2] + sds->obj_shift_f[2]) * fabsf(ob->size[2]);
-			p1[0] = (sds->p0[0] + sds->cell_size[0] * sds->res_max[0] + sds->obj_shift_f[0]) * fabsf(ob->size[0]);
-			p1[1] = (sds->p0[1] + sds->cell_size[1] * sds->res_max[1] + sds->obj_shift_f[1]) * fabsf(ob->size[1]);
-			p1[2] = (sds->p0[2] + sds->cell_size[2] * sds->res_max[2] + sds->obj_shift_f[2]) * fabsf(ob->size[2]);
-
-			if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {
-				sds->tex = NULL;
-				GPU_create_smoke(smd, 0);
-				draw_smoke_volume(sds, ob, p0, p1, viewnormal);
-				GPU_free_smoke(smd);
-			}
-			else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {
-				sds->tex = NULL;
-				GPU_create_smoke(smd, 1);
-				draw_smoke_volume(sds, ob, p0, p1, viewnormal);
-				GPU_free_smoke(smd);
-			}
-
-			/* smoke debug render */
-			if (!render_override && sds->draw_velocity) {
-				draw_smoke_velocity(sds, viewnormal);
-			}
-		}
-	}
-
-	if (!render_override) {
-		bConstraint *con;
-
-		for (con = ob->constraints.first; con; con = con->next) {
-			if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
-				bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint *)con->data;
-				if (data->flag & CONSTRAINT_DRAW_PIVOT)
-					draw_rigid_body_pivot(data, dflag, ob_wire_col);
-			}
-		}
-
-		if ((ob->gameflag & OB_BOUNDS) && (ob->mode == OB_MODE_OBJECT)) {
-			if (ob->boundtype != ob->collision_boundtype || (dtx & OB_DRAWBOUNDOX) == 0) {
-				setlinestyle(2);
-				draw_bounding_volume(ob, ob->collision_boundtype);
-				setlinestyle(0);
-			}
-		}
-		if (ob->rigidbody_object) {
-			draw_rigidbody_shape(ob);
-		}
-
-		/* draw extra: after normal draw because of makeDispList */
-		if (dtx && (G.f & G_RENDER_OGL) == 0) {
-
-			if (dtx & OB_AXIS) {
-				drawaxes(rv3d->viewmatob, 1.0f, OB_ARROWS);
-			}
-			if (dtx & OB_DRAWBOUNDOX) {
-				draw_bounding_volume(ob, ob->boundtype);
-			}
-			if (dtx & OB_TEXSPACE) {
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					/* prevent random colors being used */
-					glColor3ubv(ob_wire_col);
-				}
-				drawtexspace(ob);
-			}
-			if (dtx & OB_DRAWNAME) {
-				/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
-				/* but, we also don't draw names for sets or duplicators */
-				if (dflag == 0) {
-					const float zero[3] = {0, 0, 0};
-					view3d_cached_text_draw_add(zero, ob->id.name + 2, strlen(ob->id.name + 2), 10, 0, ob_wire_col);
-				}
-			}
-			if ((dtx & OB_DRAWWIRE) && dt >= OB_SOLID) {
-				if ((dflag & DRAW_CONSTCOLOR) == 0) {
-					draw_wire_extra(scene, rv3d, ob, ob_wire_col);
-				}
-			}
-		}
-	}
-
-	if ((dt <= OB_SOLID) && !render_override) {
-		if (((ob->gameflag & OB_DYNAMIC) &&
-		     ((ob->gameflag & OB_BOUNDS) == 0)) ||
-
-		    ((ob->gameflag & OB_BOUNDS) &&
-		     (ob->collision_boundtype == OB_BOUND_SPHERE)))
-		{
-			float imat[4][4], vec[3] = {0.0f, 0.0f, 0.0f};
-
-			invert_m4_m4(imat, rv3d->viewmatob);
-
-			if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				/* prevent random colors being used */
-				glColor3ubv(ob_wire_col);
-			}
-
-			setlinestyle(2);
-			drawcircball(GL_LINE_LOOP, vec, ob->inertia, imat);
-			setlinestyle(0);
-		}
-	}
-
-	/* return warning, this is cached text draw */
-	invert_m4_m4(ob->imat, ob->obmat);
-	view3d_cached_text_draw_end(v3d, ar, 1);
-	/* return warning, clear temp flag */
-	v3d->flag2 &= ~V3D_SHOW_SOLID_MATCAP;
-
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (zbufoff) {
-		glDisable(GL_DEPTH_TEST);
-	}
-
-	if ((base->flag & OB_FROMDUPLI) || render_override) {
-		ED_view3d_clear_mats_rv3d(rv3d);
-		return;
-	}
-
-	/* object centers, need to be drawn in viewmat space for speed, but OK for picking select */
-	if (!is_obact || !(ob->mode & OB_MODE_ALL_PAINT)) {
-		int do_draw_center = -1; /* defines below are zero or positive... */
-
-		if (render_override) {
-			/* don't draw */
-		}
-		else if (is_obact)
-			do_draw_center = ACTIVE;
-		else if (base->flag & SELECT)
-			do_draw_center = SELECT;
-		else if (empty_object || (v3d->flag & V3D_DRAW_CENTERS))
-			do_draw_center = DESELECT;
-
-		if (do_draw_center != -1) {
-			if (dflag & DRAW_PICKING) {
-				/* draw a single point for opengl selection */
-				if ((base->sx != IS_CLIPPED) &&
-				    (U.obcenter_dia != 0.0))
-				{
-					glPointSize(U.obcenter_dia);
-					glBegin(GL_POINTS);
-					glVertex3fv(ob->obmat[3]);
-					glEnd();
-				}
-			}
-			else if ((dflag & DRAW_CONSTCOLOR) == 0) {
-				/* we don't draw centers for duplicators and sets */
-				if ((base->sx != IS_CLIPPED) &&
-				    (U.obcenter_dia != 0.0) &&
-				    !(G.f & G_RENDER_OGL))
-				{
-					/* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
-					drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ID_IS_LINKED(ob) || ob->id.us > 1);
-				}
-			}
-		}
-	}
-
-	/* not for sets, duplicators or picking */
-	if (dflag == 0 && (v3d->flag & V3D_HIDE_HELPLINES) == 0 && !render_override) {
-		ListBase *list;
-		RigidBodyCon *rbc = ob->rigidbody_constraint;
-
-		/* draw hook center and offset line */
-		if (ob != scene->obedit)
-			draw_hooks(ob);
-
-		/* help lines and so */
-		if (ob != scene->obedit && ob->parent && (ob->parent->lay & v3d->lay)) {
-			setlinestyle(3);
-			glBegin(GL_LINES);
-			glVertex3fv(ob->obmat[3]);
-			glVertex3fv(ob->orig);
-			glEnd();
-			setlinestyle(0);
-		}
-
-		/* Drawing the constraint lines */
-		if (ob->constraints.first) {
-			bConstraint *curcon;
-			bConstraintOb *cob;
-			unsigned char col1[4], col2[4];
-
-			list = &ob->constraints;
-
-			UI_GetThemeColor3ubv(TH_GRID, col1);
-			UI_make_axis_color(col1, col2, 'Z');
-			glColor3ubv(col2);
-
-			cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
-
-			for (curcon = list->first; curcon; curcon = curcon->next) {
-				if (ELEM(curcon->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_OBJECTSOLVER)) {
-					/* special case for object solver and follow track constraints because they don't fill
-					 * constraint targets properly (design limitation -- scene is needed for their target
-					 * but it can't be accessed from get_targets callback) */
-
-					Object *camob = NULL;
-
-					if (curcon->type == CONSTRAINT_TYPE_FOLLOWTRACK) {
-						bFollowTrackConstraint *data = (bFollowTrackConstraint *)curcon->data;
-
-						camob = data->camera ? data->camera : scene->camera;
-					}
-					else if (curcon->type == CONSTRAINT_TYPE_OBJECTSOLVER) {
-						bObjectSolverConstraint *data = (bObjectSolverConstraint *)curcon->data;
-
-						camob = data->camera ? data->camera : scene->camera;
-					}
-
-					if (camob) {
-						setlinestyle(3);
-						glBegin(GL_LINES);
-						glVertex3fv(camob->obmat[3]);
-						glVertex3fv(ob->obmat[3]);
-						glEnd();
-						setlinestyle(0);
-					}
-				}
-				else {
-					const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(curcon);
-
-					if ((cti && cti->get_constraint_targets) && (curcon->flag & CONSTRAINT_EXPAND)) {
-						ListBase targets = {NULL, NULL};
-						bConstraintTarget *ct;
-
-						cti->get_constraint_targets(curcon, &targets);
-
-						for (ct = targets.first; ct; ct = ct->next) {
-							/* calculate target's matrix */
-							if (cti->get_target_matrix)
-								cti->get_target_matrix(curcon, cob, ct, BKE_scene_frame_get(scene));
-							else
-								unit_m4(ct->matrix);
-
-							setlinestyle(3);
-							glBegin(GL_LINES);
-							glVertex3fv(ct->matrix[3]);
-							glVertex3fv(ob->obmat[3]);
-							glEnd();
-							setlinestyle(0);
-						}
-
-						if (cti->flush_constraint_targets)
-							cti->flush_constraint_targets(curcon, &targets, 1);
-					}
-				}
-			}
-
-			BKE_constraints_clear_evalob(cob);
-		}
-		/* draw rigid body constraint lines */
-		if (rbc) {
-			UI_ThemeColor(TH_WIRE);
-			setlinestyle(3);
-			glBegin(GL_LINES);
-			if (rbc->ob1) {
-				glVertex3fv(ob->obmat[3]);
-				glVertex3fv(rbc->ob1->obmat[3]);
-			}
-			if (rbc->ob2) {
-				glVertex3fv(ob->obmat[3]);
-				glVertex3fv(rbc->ob2->obmat[3]);
-			}
-			glEnd();
-			setlinestyle(0);
-		}
-	}
-
-	ED_view3d_clear_mats_rv3d(rv3d);
-}
-
-
-/**
- * Drawing for selection picking,
- * caller must have called 'GPU_select_load_id(base->selcode)' first.
- */
-void draw_object_select(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short dflag)
-{
-	BLI_assert(dflag & DRAW_PICKING && dflag & DRAW_CONSTCOLOR);
-	draw_object(scene, ar, v3d, base, dflag);
-
-	/* we draw duplicators for selection too */
-	if ((base->object->transflag & OB_DUPLI)) {
-		ListBase *lb;
-		DupliObject *dob;
-		Base tbase;
-
-		tbase.flag = OB_FROMDUPLI;
-		lb = object_duplilist(G.main->eval_ctx, scene, base->object);
-
-		for (dob = lb->first; dob; dob = dob->next) {
-			float omat[4][4];
-			char dt;
-			short dtx;
-
-			tbase.object = dob->ob;
-			copy_m4_m4(omat, dob->ob->obmat);
-			copy_m4_m4(dob->ob->obmat, dob->mat);
-
-			/* extra service: draw the duplicator in drawtype of parent */
-			/* MIN2 for the drawtype to allow bounding box objects in groups for lods */
-			dt = tbase.object->dt;   tbase.object->dt = MIN2(tbase.object->dt, base->object->dt);
-			dtx = tbase.object->dtx; tbase.object->dtx = base->object->dtx;
-
-			draw_object(scene, ar, v3d, &tbase, dflag);
-
-			tbase.object->dt = dt;
-			tbase.object->dtx = dtx;
-
-			copy_m4_m4(dob->ob->obmat, omat);
-		}
-		free_object_duplilist(lb);
-	}
-}
-
-/* ***************** BACKBUF SEL (BBS) ********* */
-
-static void bbs_obmode_mesh_verts__mapFunc(void *userData, int index, const float co[3],
-                                           const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
-{
-	drawMVertOffset_userData *data = userData;
-	MVert *mv = &data->mvert[index];
-
-	if (!(mv->flag & ME_HIDE)) {
-		GPU_select_index_set(data->offset + index);
-		glVertex3fv(co);
-	}
-}
-
-static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *dm, int offset)
-{
-	drawMVertOffset_userData data;
-	Mesh *me = ob->data;
-	MVert *mvert = me->mvert;
-	data.mvert = mvert;
-	data.offset = offset;
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-	glBegin(GL_POINTS);
-	dm->foreachMappedVert(dm, bbs_obmode_mesh_verts__mapFunc, &data, DM_FOREACH_NOP);
-	glEnd();
-}
-
-static void bbs_mesh_verts__mapFunc(void *userData, int index, const float co[3],
-                                    const float UNUSED(no_f[3]), const short UNUSED(no_s[3]))
-{
-	drawBMOffset_userData *data = userData;
-	BMVert *eve = BM_vert_at_index(data->bm, index);
-
-	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(data->offset + index);
-		glVertex3fv(co);
-	}
-}
-static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
-{
-	drawBMOffset_userData data = {em->bm, offset};
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
-	glBegin(GL_POINTS);
-	dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, &data, DM_FOREACH_NOP);
-	glEnd();
-}
-
-static DMDrawOption bbs_mesh_wire__setDrawOptions(void *userData, int index)
-{
-	drawBMOffset_userData *data = userData;
-	BMEdge *eed = BM_edge_at_index(data->bm, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(data->offset + index);
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
-{
-	drawBMOffset_userData data = {em->bm, offset};
-	glLineWidth(1);
-	dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, &data);
-}
-
-/**
- * dont set #GPU_framebuffer_index_set. just use to mask other
- */
-static DMDrawOption bbs_mesh_mask__setSolidDrawOptions(void *userData, int index)
-{
-	BMFace *efa = BM_face_at_index(userData, index);
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int index)
-{
-	BMFace *efa = BM_face_at_index(userData, index);
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(index + 1);
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static void bbs_mesh_solid__drawCenter(void *userData, int index, const float cent[3], const float UNUSED(no[3]))
-{
-	BMFace *efa = BM_face_at_index(userData, index);
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(index + 1);
-
-		glVertex3fv(cent);
-	}
-}
 
 /* two options, facecolors or black */
 static void bbs_mesh_solid_EM(BMEditMesh *em, Scene *scene, View3D *v3d,
                               Object *ob, DerivedMesh *dm, bool use_faceselect)
 {
-	cpack(0);
-
 	if (use_faceselect) {
-		dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, NULL, NULL, em->bm, DM_DRAW_SKIP_HIDDEN | DM_DRAW_SELECT_USE_EDITMODE);
+		bbs_mesh_face(em, dm, true);
 
 		if (check_ob_drawface_dot(scene, v3d, ob->dt)) {
-			glPointSize(UI_GetThemeValuef(TH_FACEDOT_SIZE));
-
-			glBegin(GL_POINTS);
-			dm->foreachMappedFaceCenter(dm, bbs_mesh_solid__drawCenter, em->bm, DM_FOREACH_NOP);
-			glEnd();
+			bbs_mesh_face_dot(em, dm);
 		}
-
 	}
 	else {
-		dm->drawMappedFaces(dm, bbs_mesh_mask__setSolidDrawOptions, NULL, NULL, em->bm, DM_DRAW_SKIP_SELECT | DM_DRAW_SKIP_HIDDEN | DM_DRAW_SELECT_USE_EDITMODE);
-	}
-}
-
-static DMDrawOption bbs_mesh_solid__setDrawOpts(void *UNUSED(userData), int index)
-{
-	GPU_select_index_set(index + 1);
-	return DM_DRAW_OPTION_NORMAL;
-}
-
-static DMDrawOption bbs_mesh_solid_hide__setDrawOpts(void *userData, int index)
-{
-	Mesh *me = userData;
-
-	if (!(me->mpoly[index].flag & ME_HIDE)) {
-		GPU_select_index_set(index + 1);
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
+		bbs_mesh_face(em, dm, false);
 	}
 }
 
+#ifdef USE_MESH_DM_SELECT
 /* must have called GPU_framebuffer_index_set beforehand */
 static DMDrawOption bbs_mesh_solid_hide2__setDrawOpts(void *userData, int index)
 {
@@ -8372,11 +550,10 @@ static DMDrawOption bbs_mesh_solid_hide2__setDrawOpts(void *userData, int index)
 	}
 }
 
-static void bbs_mesh_solid_verts(Scene *scene, Object *ob)
+static void bbs_mesh_solid_verts(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
 	Mesh *me = ob->data;
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	glColor3ub(0, 0, 0);
+	DerivedMesh *dm = mesh_get_derived_final(depsgraph, scene, ob, scene->customdata_mask);
 
 	DM_update_materials(dm, ob);
 
@@ -8392,29 +569,56 @@ static void bbs_mesh_solid_verts(Scene *scene, Object *ob)
 	bm_vertoffs = me->totvert + 1;
 	dm->release(dm);
 }
-
-static void bbs_mesh_solid_faces(Scene *scene, Object *ob)
+#else
+static void bbs_mesh_solid_verts(Depsgraph *UNUSED(depsgraph), Scene *UNUSED(scene), Object *ob)
 {
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
 	Mesh *me = ob->data;
 
-	glColor3ub(0, 0, 0);
+	/* Only draw faces to mask out verts, we don't want their selection ID's. */
+	const int G_f_orig = G.f;
+	G.f &= ~G_BACKBUFSEL;
 
-	DM_update_materials(dm, ob);
+	{
+		int selcol;
+		Gwn_Batch *batch;
+		GPU_select_index_get(0, &selcol);
+		batch = DRW_mesh_batch_cache_get_triangles_with_select_mask(me, true);
+		GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_UNIFORM_COLOR_U32);
+		GWN_batch_uniform_1ui(batch, "color", selcol);
+		GWN_batch_draw(batch);
+	}
 
-	if ((me->editflag & ME_EDIT_PAINT_FACE_SEL))
-		dm->drawMappedFaces(dm, bbs_mesh_solid_hide__setDrawOpts, NULL, NULL, me, DM_DRAW_SKIP_HIDDEN);
-	else
-		dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, NULL, NULL, me, 0);
+	G.f |= (G_f_orig & G_BACKBUFSEL);
 
-	dm->release(dm);
+	bbs_obmode_mesh_verts(ob, NULL, 1);
+	bm_vertoffs = me->totvert + 1;
 }
+#endif
 
-void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
+static void bbs_mesh_solid_faces(Scene *UNUSED(scene), Object *ob)
+{
+	Mesh *me = ob->data;
+	Gwn_Batch *batch;
+	if ((me->editflag & ME_EDIT_PAINT_FACE_SEL)) {
+		batch = DRW_mesh_batch_cache_get_triangles_with_select_id(me, true, 1);
+	}
+	else {
+		batch = DRW_mesh_batch_cache_get_triangles_with_select_id(me, false, 1);
+	}
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
+	GWN_batch_draw(batch);
+}
+
+void draw_object_backbufsel(
+        Depsgraph *depsgraph, Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob,
+        short select_mode)
 {
 	ToolSettings *ts = scene->toolsettings;
+	if (select_mode == -1) {
+		select_mode = ts->selectmode;
+	}
 
-	glMultMatrixf(ob->obmat);
+	gpuMultMatrix(ob->obmat);
 
 	glClearDepth(1.0); glClear(GL_DEPTH_BUFFER_BIT);
 	glEnable(GL_DEPTH_TEST);
@@ -8425,14 +629,14 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 				Mesh *me = ob->data;
 				BMEditMesh *em = me->edit_btmesh;
 
-				DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
+				DerivedMesh *dm = editbmesh_get_derived_cage(depsgraph, scene, ob, em, CD_MASK_BAREMESH);
 
 				BM_mesh_elem_table_ensure(em->bm, BM_VERT | BM_EDGE | BM_FACE);
 
 				DM_update_materials(dm, ob);
 
-				bbs_mesh_solid_EM(em, scene, v3d, ob, dm, (ts->selectmode & SCE_SELECT_FACE) != 0);
-				if (ts->selectmode & SCE_SELECT_FACE)
+				bbs_mesh_solid_EM(em, scene, v3d, ob, dm, (select_mode & SCE_SELECT_FACE) != 0);
+				if (select_mode & SCE_SELECT_FACE)
 					bm_solidoffs = 1 + em->bm->totface;
 				else {
 					bm_solidoffs = 1;
@@ -8441,7 +645,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 				ED_view3d_polygon_offset(rv3d, 1.0);
 
 				/* we draw edges if edge select mode */
-				if (ts->selectmode & SCE_SELECT_EDGE) {
+				if (select_mode & SCE_SELECT_EDGE) {
 					bbs_mesh_wire(em, dm, bm_solidoffs);
 					bm_wireoffs = bm_solidoffs + em->bm->totedge;
 				}
@@ -8451,7 +655,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 				}
 
 				/* we draw verts if vert select mode. */
-				if (ts->selectmode & SCE_SELECT_VERTEX) {
+				if (select_mode & SCE_SELECT_VERTEX) {
 					bbs_mesh_verts(em, dm, bm_wireoffs);
 					bm_vertoffs = bm_wireoffs + em->bm->totvert;
 				}
@@ -8469,7 +673,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 				    /* currently vertex select supports weight paint and vertex paint*/
 				    ((ob->mode & OB_MODE_WEIGHT_PAINT) || (ob->mode & OB_MODE_VERTEX_PAINT)))
 				{
-					bbs_mesh_solid_verts(scene, ob);
+					bbs_mesh_solid_verts(depsgraph, scene, ob);
 				}
 				else {
 					bbs_mesh_solid_faces(scene, ob);
@@ -8481,77 +685,134 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 			break;
 	}
 
-	glLoadMatrixf(rv3d->viewmat);
+	gpuLoadMatrix(rv3d->viewmat);
 }
 
 
-/* ************* draw object instances for bones, for example ****************** */
-/*               assumes all matrices/etc set OK */
-
-/* helper function for drawing object instances - meshes */
-static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                                      Object *ob, const short dt, int outline)
+void ED_draw_object_facemap(
+        Depsgraph *depsgraph, Scene *scene, Object *ob, const float col[4], const int facemap)
 {
-	Mesh *me = ob->data;
-	DerivedMesh *dm = NULL, *edm = NULL;
+	DerivedMesh *dm = NULL;
 
-	if (ob->mode & OB_MODE_EDIT) {
-		edm = editbmesh_get_derived_base(ob, me->edit_btmesh, CD_MASK_BAREMESH);
-		DM_update_materials(edm, ob);
-	}
-	else {
-		dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
-		DM_update_materials(dm, ob);
+	/* happens on undo */
+	if (ob->type != OB_MESH || !ob->data)
+		return;
+
+	/* Temporary, happens on undo, would resolve but will eventually move away from DM. */
+	if (ob->derivedFinal == NULL) {
+		return;
 	}
 
-	if (dt <= OB_WIRE) {
-		if (dm)
-			dm->drawEdges(dm, 1, 0);
-		else if (edm)
-			edm->drawEdges(edm, 1, 0);
+	dm = mesh_get_derived_final(depsgraph, scene, ob, CD_MASK_BAREMESH);
+	if (!dm || !CustomData_has_layer(&dm->polyData, CD_FACEMAP))
+		return;
+
+
+	glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
+
+#if 0
+	DM_update_materials(dm, ob);
+
+	/* add polygon offset so we draw above the original surface */
+	glPolygonOffset(1.0, 1.0);
+
+	GPU_facemap_setup(dm);
+
+	glColor4fv(col);
+
+	gpuPushAttrib(GL_ENABLE_BIT);
+	glEnable(GL_BLEND);
+	glDisable(GL_LIGHTING);
+
+	/* always draw using backface culling */
+	glEnable(GL_CULL_FACE);
+	glCullFace(GL_BACK);
+
+	if (dm->drawObject->facemapindices) {
+		glDrawElements(GL_TRIANGLES, dm->drawObject->facemap_count[facemap] * 3, GL_UNSIGNED_INT,
+		               (int *)NULL + dm->drawObject->facemap_start[facemap] * 3);
 	}
-	else {
-		if (outline)
-			draw_mesh_object_outline(v3d, ob, dm ? dm : edm);
+	gpuPopAttrib();
 
-		if (dm) {
-			bool glsl = draw_glsl_material(scene, ob, v3d, dt);
-			GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
-		}
+	GPU_buffers_unbind();
+
+	glPolygonOffset(0.0, 0.0);
 
-		glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
+#else
+
+	/* Just to create the data to pass to immediate mode, grr! */
+	Mesh *me = ob->data;
+	const int *facemap_data = CustomData_get_layer(&me->pdata, CD_FACEMAP);
+	if (facemap_data) {
+		Gwn_VertFormat *format = immVertexFormat();
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
 
-		if (dm) {
-			dm->drawFacesSolid(dm, NULL, 0, GPU_object_material_bind);
-			GPU_end_object_materials();
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformColor4fv(col);
+
+		/* XXX, alpha isn't working yet, not sure why. */
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_BLEND);
+
+		MVert *mvert;
+
+		MPoly *mpoly;
+		int    mpoly_len;
+
+		MLoop *mloop;
+		int    mloop_len;
+
+		if (dm && CustomData_has_layer(&dm->polyData, CD_FACEMAP)) {
+			mvert = dm->getVertArray(dm);
+			mpoly = dm->getPolyArray(dm);
+			mloop = dm->getLoopArray(dm);
+
+			mpoly_len = dm->getNumPolys(dm);
+			mloop_len = dm->getNumLoops(dm);
+
+			facemap_data = CustomData_get_layer(&dm->polyData, CD_FACEMAP);
 		}
-		else if (edm)
-			edm->drawMappedFaces(edm, NULL, GPU_object_material_bind, NULL, NULL, DM_DRAW_NEED_NORMALS);
+		else {
+			mvert = me->mvert;
+			mpoly = me->mpoly;
+			mloop = me->mloop;
 
-		GPU_object_material_unbind();
-	}
+			mpoly_len = me->totpoly;
+			mloop_len = me->totloop;
 
-	if (edm) edm->release(edm);
-	if (dm) dm->release(dm);
-}
+			facemap_data = CustomData_get_layer(&me->pdata, CD_FACEMAP);
+		}
 
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const char dt, int outline)
-{
-	if (ob == NULL)
-		return;
+		/* use gawain immediate mode fore now */
+		const int looptris_len = poly_to_tri_count(mpoly_len, mloop_len);
+		immBeginAtMost(GWN_PRIM_TRIS, looptris_len * 3);
 
-	switch (ob->type) {
-		case OB_MESH:
-			draw_object_mesh_instance(scene, v3d, rv3d, ob, dt, outline);
-			break;
-		case OB_EMPTY:
-			if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
-				/* CONSTCOLOR == no wire outline */
-				draw_empty_image(ob, DRAW_CONSTCOLOR, NULL, v3d->multiview_eye);
-			}
-			else {
-				drawaxes(rv3d->viewmatob, ob->empty_drawsize, ob->empty_drawtype);
+		MPoly *mp;
+		int i;
+		for (mp = mpoly, i = 0; i < mpoly_len; i++, mp++) {
+			if (facemap_data[i] == facemap) {
+				/* Weak, fan-fill, use until we have derived-mesh replaced. */
+				const MLoop *ml_start = &mloop[mp->loopstart];
+				const MLoop *ml_a = ml_start + 1;
+				const MLoop *ml_b = ml_start + 2;
+				for (int j = 2; j < mp->totloop; j++) {
+					immVertex3fv(pos, mvert[ml_start->v].co);
+					immVertex3fv(pos, mvert[ml_a->v].co);
+					immVertex3fv(pos, mvert[ml_b->v].co);
+
+					ml_a++;
+					ml_b++;
+				}
 			}
-			break;
+		}
+		immEnd();
+
+		immUnbindProgram();
+
+		glDisable(GL_BLEND);
 	}
+#endif
+
+	dm->release(dm);
 }
+
diff --git a/source/blender/editors/space_view3d/drawsimdebug.c b/source/blender/editors/space_view3d/drawsimdebug.c
deleted file mode 100644
index 9165147736a..00000000000
--- a/source/blender/editors/space_view3d/drawsimdebug.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2014 by the Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Lukas Toenne
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_view3d/drawsimdebug.c
- *  \ingroup spview3d
- */
-
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_object_types.h"
-
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-
-#include "BKE_effect.h"
-
-#include "view3d_intern.h"
-
-#include "BIF_gl.h"
-
-
-static void draw_sim_debug_elements(SimDebugData *debug_data, float imat[4][4])
-{
-	GHashIterator iter;
-
-	/**** dots ****/
-
-	glPointSize(3.0f);
-	glBegin(GL_POINTS);
-	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-		if (elem->type != SIM_DEBUG_ELEM_DOT)
-			continue;
-
-		glColor3f(elem->color[0], elem->color[1], elem->color[2]);
-		glVertex3f(elem->v1[0], elem->v1[1], elem->v1[2]);
-	}
-	glEnd();
-
-	/**** circles ****/
-
-	{
-		float circle[16][2] = {
-		    {0.000000, 1.000000}, {0.382683, 0.923880}, {0.707107, 0.707107}, {0.923880, 0.382683},
-		    {1.000000, -0.000000}, {0.923880, -0.382683}, {0.707107, -0.707107}, {0.382683, -0.923880},
-		    {-0.000000, -1.000000}, {-0.382683, -0.923880}, {-0.707107, -0.707107}, {-0.923879, -0.382684},
-		    {-1.000000, 0.000000}, {-0.923879, 0.382684}, {-0.707107, 0.707107}, {-0.382683, 0.923880} };
-		for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-			SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-			float radius = elem->v2[0];
-			float co[3];
-			int i;
-
-			if (elem->type != SIM_DEBUG_ELEM_CIRCLE)
-				continue;
-
-			glColor3f(elem->color[0], elem->color[1], elem->color[2]);
-			glBegin(GL_LINE_LOOP);
-			for (i = 0; i < 16; ++i) {
-				co[0] = radius * circle[i][0];
-				co[1] = radius * circle[i][1];
-				co[2] = 0.0f;
-				mul_mat3_m4_v3(imat, co);
-				add_v3_v3(co, elem->v1);
-
-				glVertex3f(co[0], co[1], co[2]);
-			}
-			glEnd();
-		}
-	}
-
-	/**** lines ****/
-
-	glBegin(GL_LINES);
-	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-		if (elem->type != SIM_DEBUG_ELEM_LINE)
-			continue;
-
-		glColor3f(elem->color[0], elem->color[1], elem->color[2]);
-		glVertex3f(elem->v1[0], elem->v1[1], elem->v1[2]);
-		glVertex3f(elem->v2[0], elem->v2[1], elem->v2[2]);
-	}
-	glEnd();
-
-	/**** vectors ****/
-
-	glPointSize(2.0f);
-	glBegin(GL_POINTS);
-	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-		if (elem->type != SIM_DEBUG_ELEM_VECTOR)
-			continue;
-
-		glColor3f(elem->color[0], elem->color[1], elem->color[2]);
-		glVertex3f(elem->v1[0], elem->v1[1], elem->v1[2]);
-	}
-	glEnd();
-
-	glBegin(GL_LINES);
-	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-		float t[3];
-		if (elem->type != SIM_DEBUG_ELEM_VECTOR)
-			continue;
-
-		glColor3f(elem->color[0], elem->color[1], elem->color[2]);
-		glVertex3f(elem->v1[0], elem->v1[1], elem->v1[2]);
-		add_v3_v3v3(t, elem->v1, elem->v2);
-		glVertex3f(t[0], t[1], t[2]);
-	}
-	glEnd();
-
-	/**** strings ****/
-
-	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
-		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
-		if (elem->type != SIM_DEBUG_ELEM_STRING)
-			continue;
-
-		unsigned char col[4];
-		rgb_float_to_uchar(col, elem->color);
-		col[3] = 255;
-		view3d_cached_text_draw_add(elem->v1, elem->str, strlen(elem->str),
-		                            0, V3D_CACHE_TEXT_GLOBALSPACE, col);
-	}
-}
-
-void draw_sim_debug_data(Scene *UNUSED(scene), View3D *v3d, ARegion *ar)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	/*Object *ob = base->object;*/
-	float imat[4][4];
-
-	if (!_sim_debug_data)
-		return;
-
-	invert_m4_m4(imat, rv3d->viewmatob);
-
-//	glDepthMask(GL_FALSE);
-//	glEnable(GL_BLEND);
-
-	glPushMatrix();
-	glLoadMatrixf(rv3d->viewmat);
-
-	view3d_cached_text_draw_begin();
-	draw_sim_debug_elements(_sim_debug_data, imat);
-	view3d_cached_text_draw_end(v3d, ar, false);
-
-	glPopMatrix();
-
-//	glDepthMask(GL_TRUE);
-//	glDisable(GL_BLEND);
-}
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index cf118404183..3b648e3b13a 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -48,7 +48,6 @@
 
 #include "BIF_gl.h"
 
-#include "GPU_debug.h"
 #include "GPU_shader.h"
 #include "GPU_texture.h"
 
@@ -129,7 +128,7 @@ static GPUTexture *create_transfer_function(int type, const ColorBand *coba)
 			break;
 	}
 
-	GPUTexture *tex = GPU_texture_create_1D(TFUNC_WIDTH, data, NULL);
+	GPUTexture *tex = GPU_texture_create_1D(TFUNC_WIDTH, GPU_RGBA8, data, NULL);
 
 	MEM_freeN(data);
 
@@ -160,7 +159,7 @@ static GPUTexture *create_field_texture(SmokeDomainSettings *sds)
 		default: return NULL;
 	}
 
-	return GPU_texture_create_3D(sds->res[0], sds->res[1], sds->res[2], 1, field);
+	return GPU_texture_create_3D(sds->res[0], sds->res[1], sds->res[2], GPU_R8, field, NULL);
 }
 
 typedef struct VolumeSlicer {
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 833d54efd75..d4fa98cfc88 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -43,31 +43,40 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_curve.h"
 #include "BKE_icons.h"
+#include "BKE_lattice.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mball.h"
+#include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
+#include "BKE_workspace.h"
 
 #include "ED_space_api.h"
 #include "ED_screen.h"
+#include "ED_transform.h"
 
-#include "GPU_compositing.h"
 #include "GPU_framebuffer.h"
 #include "GPU_material.h"
+#include "GPU_viewport.h"
+#include "GPU_matrix.h"
 
-#include "BIF_gl.h"
+#include "DRW_engine.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
 #include "RNA_access.h"
 
+#include "UI_interface.h"
 #include "UI_resources.h"
 
 #ifdef WITH_PYTHON
@@ -106,17 +115,17 @@ ARegion *view3d_has_buttons_region(ScrArea *sa)
 
 ARegion *view3d_has_tools_region(ScrArea *sa)
 {
-	ARegion *ar, *artool = NULL, *arprops = NULL, *arhead;
+	ARegion *ar, *artool = NULL, *arhead;
 
 	for (ar = sa->regionbase.first; ar; ar = ar->next) {
 		if (ar->regiontype == RGN_TYPE_TOOLS)
 			artool = ar;
-		if (ar->regiontype == RGN_TYPE_TOOL_PROPS)
-			arprops = ar;
 	}
 
 	/* tool region hide/unhide also hides props */
-	if (arprops && artool) return artool;
+	if (artool) {
+		return artool;
+	}
 
 	if (artool == NULL) {
 		/* add subdiv level; after header */
@@ -135,15 +144,6 @@ ARegion *view3d_has_tools_region(ScrArea *sa)
 		artool->flag = RGN_FLAG_HIDDEN;
 	}
 
-	if (arprops == NULL) {
-		/* add extra subdivided region for tool properties */
-		arprops = MEM_callocN(sizeof(ARegion), "tool props for view3d");
-
-		BLI_insertlinkafter(&sa->regionbase, artool, arprops);
-		arprops->regiontype = RGN_TYPE_TOOL_PROPS;
-		arprops->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
-	}
-
 	return artool;
 }
 
@@ -250,7 +250,7 @@ void ED_view3d_init_mats_rv3d_gl(struct Object *ob, struct RegionView3D *rv3d)
 	/* we have to multiply instead of loading viewmatob to make
 	 * it work with duplis using displists, otherwise it will
 	 * override the dupli-matrix */
-	glMultMatrixf(ob->obmat);
+	gpuMultMatrix(ob->obmat);
 }
 
 #ifdef DEBUG
@@ -283,8 +283,6 @@ void ED_view3d_stop_render_preview(wmWindowManager *wm, ARegion *ar)
 		BPy_END_ALLOW_THREADS;
 #endif
 
-		if (rv3d->render_engine->re)
-			RE_Database_Free(rv3d->render_engine->re);
 		RE_engine_free(rv3d->render_engine);
 		rv3d->render_engine = NULL;
 	}
@@ -306,9 +304,8 @@ void ED_view3d_shade_update(Main *bmain, View3D *v3d, ScrArea *sa)
 
 /* ******************** default callbacks for view3d space ***************** */
 
-static SpaceLink *view3d_new(const bContext *C)
+static SpaceLink *view3d_new(const ScrArea *UNUSED(sa), const Scene *scene)
 {
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar;
 	View3D *v3d;
 	RegionView3D *rv3d;
@@ -325,19 +322,24 @@ static SpaceLink *view3d_new(const bContext *C)
 	v3d->gridlines = 16;
 	v3d->gridsubdiv = 10;
 	v3d->drawtype = OB_SOLID;
+	v3d->shading.flag = V3D_SHADING_SPECULAR_HIGHLIGHT;
+	v3d->shading.light = V3D_LIGHTING_STUDIO;
+	v3d->shading.shadow_intensity = 0.5f;
+	v3d->shading.xray_alpha = 0.5f;
+	copy_v3_fl(v3d->shading.single_color, 0.8f);
+
+	v3d->overlay.flag = V3D_OVERLAY_LOOK_DEV;
 
 	v3d->gridflag = V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_FLOOR;
 
 	v3d->flag = V3D_SELECT_OUTLINE;
 	v3d->flag2 = V3D_SHOW_RECONSTRUCTION | V3D_SHOW_GPENCIL;
 
-	v3d->lens = 35.0f;
+	v3d->lens = 50.0f;
 	v3d->near = 0.01f;
 	v3d->far = 1000.0f;
 
-	v3d->twflag |= U.tw_flag & V3D_USE_MANIPULATOR;
-	v3d->twtype = V3D_MANIP_TRANSLATE;
-	v3d->around = V3D_AROUND_CENTER_MEAN;
+	v3d->twflag |= U.manipulator_flag & V3D_MANIPULATOR_DRAW;
 
 	v3d->bundle_size = 0.2f;
 	v3d->bundle_drawtype = OB_PLAINAXES;
@@ -353,7 +355,7 @@ static SpaceLink *view3d_new(const bContext *C)
 
 	BLI_addtail(&v3d->regionbase, ar);
 	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
+	ar->alignment = RGN_ALIGN_TOP;
 
 	/* tool shelf */
 	ar = MEM_callocN(sizeof(ARegion), "toolshelf for view3d");
@@ -363,14 +365,6 @@ static SpaceLink *view3d_new(const bContext *C)
 	ar->alignment = RGN_ALIGN_LEFT;
 	ar->flag = RGN_FLAG_HIDDEN;
 
-	/* tool properties */
-	ar = MEM_callocN(sizeof(ARegion), "tool properties for view3d");
-
-	BLI_addtail(&v3d->regionbase, ar);
-	ar->regiontype = RGN_TYPE_TOOL_PROPS;
-	ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
-	ar->flag = RGN_FLAG_HIDDEN;
-
 	/* buttons/list view */
 	ar = MEM_callocN(sizeof(ARegion), "buttons for view3d");
 
@@ -399,30 +393,11 @@ static SpaceLink *view3d_new(const bContext *C)
 static void view3d_free(SpaceLink *sl)
 {
 	View3D *vd = (View3D *) sl;
-	BGpic *bgpic;
-
-	for (bgpic = vd->bgpicbase.first; bgpic; bgpic = bgpic->next) {
-		if (bgpic->source == V3D_BGPIC_IMAGE) {
-			id_us_min((ID *)bgpic->ima);
-		}
-		else if (bgpic->source == V3D_BGPIC_MOVIE) {
-			id_us_min((ID *)bgpic->clip);
-		}
-	}
-	BLI_freelistN(&vd->bgpicbase);
 
 	if (vd->localvd) MEM_freeN(vd->localvd);
 
 	if (vd->properties_storage) MEM_freeN(vd->properties_storage);
 
-	/* matcap material, its preview rect gets freed via icons */
-	if (vd->defmaterial) {
-		if (vd->defmaterial->gpumaterial.first)
-			GPU_material_free(&vd->defmaterial->gpumaterial);
-		BKE_previewimg_free(&vd->defmaterial->preview);
-		MEM_freeN(vd->defmaterial);
-	}
-
 	if (vd->fx_settings.ssao)
 		MEM_freeN(vd->fx_settings.ssao);
 	if (vd->fx_settings.dof)
@@ -440,7 +415,6 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
 {
 	View3D *v3do = (View3D *)sl;
 	View3D *v3dn = MEM_dupallocN(sl);
-	BGpic *bgpic;
 
 	/* clear or remove stuff from old */
 
@@ -455,18 +429,6 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
 
 	/* copy or clear inside new stuff */
 
-	v3dn->defmaterial = NULL;
-
-	BLI_duplicatelist(&v3dn->bgpicbase, &v3do->bgpicbase);
-	for (bgpic = v3dn->bgpicbase.first; bgpic; bgpic = bgpic->next) {
-		if (bgpic->source == V3D_BGPIC_IMAGE) {
-			id_us_plus((ID *)bgpic->ima);
-		}
-		else if (bgpic->source == V3D_BGPIC_MOVIE) {
-			id_us_plus((ID *)bgpic->clip);
-		}
-	}
-
 	v3dn->properties_storage = NULL;
 	if (v3dn->fx_settings.dof)
 		v3dn->fx_settings.dof = MEM_dupallocN(v3do->fx_settings.dof);
@@ -482,6 +444,13 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar)
 	ListBase *lb;
 	wmKeyMap *keymap;
 
+	if (ar->manipulator_map == NULL) {
+		ar->manipulator_map = WM_manipulatormap_new_from_type(
+		        &(const struct wmManipulatorMapType_Params) {SPACE_VIEW3D, RGN_TYPE_WINDOW});
+	}
+
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+
 	/* object ops. */
 
 	/* important to be before Pose keymap since they can both be enabled at once */
@@ -572,11 +541,6 @@ static void view3d_main_region_exit(wmWindowManager *wm, ARegion *ar)
 		GPU_offscreen_free(rv3d->gpuoffscreen);
 		rv3d->gpuoffscreen = NULL;
 	}
-
-	if (rv3d->compositor) {
-		GPU_fx_compositor_destroy(rv3d->compositor);
-		rv3d->compositor = NULL;
-	}
 }
 
 static int view3d_ob_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
@@ -589,7 +553,7 @@ static int view3d_ob_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent
 	return 0;
 }
 
-static int view3d_group_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
+static int view3d_collection_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
 {
 	if (drag->type == WM_DRAG_ID) {
 		ID *id = drag->poin;
@@ -664,7 +628,7 @@ static void view3d_ob_drop_copy(wmDrag *drag, wmDropBox *drop)
 	RNA_string_set(drop->ptr, "name", id->name + 2);
 }
 
-static void view3d_group_drop_copy(wmDrag *drag, wmDropBox *drop)
+static void view3d_collection_drop_copy(wmDrag *drag, wmDropBox *drop)
 {
 	ID *id = drag->poin;
 
@@ -704,9 +668,32 @@ static void view3d_dropboxes(void)
 	WM_dropbox_add(lb, "MESH_OT_drop_named_image", view3d_ima_mesh_drop_poll, view3d_id_path_drop_copy);
 	WM_dropbox_add(lb, "OBJECT_OT_drop_named_image", view3d_ima_empty_drop_poll, view3d_id_path_drop_copy);
 	WM_dropbox_add(lb, "VIEW3D_OT_background_image_add", view3d_ima_bg_drop_poll, view3d_id_path_drop_copy);
-	WM_dropbox_add(lb, "OBJECT_OT_group_instance_add", view3d_group_drop_poll, view3d_group_drop_copy);
+	WM_dropbox_add(lb, "OBJECT_OT_collection_instance_add", view3d_collection_drop_poll, view3d_collection_drop_copy);
 }
 
+static void view3d_widgets(void)
+{
+	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(
+	        &(const struct wmManipulatorMapType_Params){SPACE_VIEW3D, RGN_TYPE_WINDOW});
+
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_spot);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_area);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_target);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_force_field);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera_view);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_empty_image);
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_armature_spline);
+
+	WM_manipulatorgrouptype_append(TRANSFORM_WGT_manipulator);
+	WM_manipulatorgrouptype_append(VIEW3D_WGT_xform_cage);
+
+	WM_manipulatorgrouptype_append(VIEW3D_WGT_ruler);
+	WM_manipulatortype_append(VIEW3D_WT_ruler_item);
+
+	WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_navigate);
+	WM_manipulatortype_append(VIEW3D_WT_navigate_rotate);
+}
 
 
 /* type callback, not region itself */
@@ -731,9 +718,6 @@ static void view3d_main_region_free(ARegion *ar)
 		if (rv3d->gpuoffscreen) {
 			GPU_offscreen_free(rv3d->gpuoffscreen);
 		}
-		if (rv3d->compositor) {
-			GPU_fx_compositor_destroy(rv3d->compositor);
-		}
 
 		MEM_freeN(rv3d);
 		ar->regiondata = NULL;
@@ -757,33 +741,21 @@ static void *view3d_main_region_duplicate(void *poin)
 		new->render_engine = NULL;
 		new->sms = NULL;
 		new->smooth_timer = NULL;
-		new->compositor = NULL;
 
 		return new;
 	}
 	return NULL;
 }
 
-static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, Scene *scene)
+static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	wmWindow *win = wmn->wm->winactive;
-	ScrArea *sa;
 	unsigned int lay_used = 0;
-	Base *base;
 
 	if (!win) return;
 
-	base = scene->base.first;
-	while (base) {
-		lay_used |= base->lay & ((1 << 20) - 1); /* ignore localview */
-
-		if (lay_used == (1 << 20) - 1)
-			break;
-
-		base = base->next;
-	}
-
-	for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+	const bScreen *screen = WM_window_get_active_screen(win);
+	for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 		if (sa->spacetype == SPACE_VIEW3D) {
 			if (BLI_findindex(&sa->regionbase, ar) != -1) {
 				View3D *v3d = sa->spacedata.first;
@@ -794,13 +766,21 @@ static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, Scene *scene
 	}
 }
 
-static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *wmn)
+static void view3d_main_region_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
+        wmNotifier *wmn, const Scene *scene)
 {
-	Scene *scene = sc->scene;
 	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
+	wmManipulatorMap *mmap = ar->manipulator_map;
 
 	/* context changes */
 	switch (wmn->category) {
+		case NC_WM:
+			if (ELEM(wmn->data, ND_UNDO)) {
+				WM_manipulatormap_tag_refresh(mmap);
+			}
+			break;
 		case NC_ANIMATION:
 			switch (wmn->data) {
 				case ND_KEYFRAME_PROP:
@@ -820,21 +800,32 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 			break;
 		case NC_SCENE:
 			switch (wmn->data) {
+				case ND_SCENEBROWSE:
 				case ND_LAYER_CONTENT:
 					if (wmn->reference)
 						view3d_recalc_used_layers(ar, wmn, wmn->reference);
 					ED_region_tag_redraw(ar);
+					WM_manipulatormap_tag_refresh(mmap);
+					break;
+				case ND_LAYER:
+					if (wmn->reference) {
+						BKE_screen_view3d_sync(v3d, wmn->reference);
+					}
+					ED_region_tag_redraw(ar);
+					WM_manipulatormap_tag_refresh(mmap);
 					break;
-				case ND_FRAME:
-				case ND_TRANSFORM:
 				case ND_OB_ACTIVE:
 				case ND_OB_SELECT:
+					DEG_id_tag_update((ID *)&scene->id, DEG_TAG_SELECT_UPDATE);
+					ATTR_FALLTHROUGH;
+				case ND_FRAME:
+				case ND_TRANSFORM:
 				case ND_OB_VISIBLE:
-				case ND_LAYER:
 				case ND_RENDER_OPTIONS:
 				case ND_MARKERS:
 				case ND_MODE:
 					ED_region_tag_redraw(ar);
+					WM_manipulatormap_tag_refresh(mmap);
 					break;
 				case ND_WORLD:
 					/* handled by space_view3d_listener() for v3d access */
@@ -842,7 +833,6 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 				case ND_DRAW_RENDER_VIEWPORT:
 				{
 					if (v3d->camera && (scene == wmn->reference)) {
-						RegionView3D *rv3d = ar->regiondata;
 						if (rv3d->persp == RV3D_CAMOB) {
 							ED_region_tag_redraw(ar);
 						}
@@ -867,6 +857,7 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 				case ND_POINTCACHE:
 				case ND_LOD:
 					ED_region_tag_redraw(ar);
+					WM_manipulatormap_tag_refresh(mmap);
 					break;
 			}
 			switch (wmn->action) {
@@ -877,9 +868,25 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 			break;
 		case NC_GEOM:
 			switch (wmn->data) {
+				case ND_SELECT:
+				{
+					WM_manipulatormap_tag_refresh(mmap);
+
+					ID *ob_data = wmn->reference;
+					if (ob_data == NULL) {
+						BLI_assert(wmn->window); // Use `WM_event_add_notifier` instead of `WM_main_add_notifier`
+						ViewLayer *view_layer = WM_window_get_active_view_layer(wmn->window);
+						ob_data = OBEDIT_FROM_VIEW_LAYER(view_layer)->data;
+					}
+					if (ob_data) {
+						BLI_assert(OB_DATA_SUPPORT_ID(GS(ob_data->name)));
+						/* TODO(sergey): Notifiers shouldn't really be doing DEG tags. */
+						DEG_id_tag_update(ob_data, DEG_TAG_SELECT_UPDATE);
+					}
+					ATTR_FALLTHROUGH;
+				}
 				case ND_DATA:
 				case ND_VERTEX_GROUP:
-				case ND_SELECT:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -894,7 +901,6 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 				case ND_DRAW_RENDER_VIEWPORT:
 				{
 					if (v3d->camera && (v3d->camera->data == wmn->reference)) {
-						RegionView3D *rv3d = ar->regiondata;
 						if (rv3d->persp == RV3D_CAMOB) {
 							ED_region_tag_redraw(ar);
 						}
@@ -923,21 +929,13 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 			switch (wmn->data) {
 				case ND_SHADING:
 				case ND_NODES:
-				{
-#ifdef WITH_LEGACY_DEPSGRAPH
-					Object *ob = OBACT;
-					if ((v3d->drawtype == OB_MATERIAL) ||
-					    (ob && (ob->mode == OB_MODE_TEXTURE_PAINT)) ||
-					    (v3d->drawtype == OB_TEXTURE &&
-					     (scene->gm.matmode == GAME_MAT_GLSL ||
-					      BKE_scene_use_new_shading_nodes(scene))) ||
-					    !DEG_depsgraph_use_legacy())
-#endif
-					{
-						ED_region_tag_redraw(ar);
-					}
+					/* TODO(sergey) This is a bit too much updates, but needed to
+					 * have proper material drivers update in the viewport.
+					 *
+					 * How to solve?
+					 */
+					ED_region_tag_redraw(ar);
 					break;
-				}
 				case ND_SHADING_DRAW:
 				case ND_SHADING_LINKS:
 					ED_region_tag_redraw(ar);
@@ -949,20 +947,23 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 				case ND_WORLD_DRAW:
 					/* handled by space_view3d_listener() for v3d access */
 					break;
+				case ND_WORLD:
+					/* Needed for updating world materials */
+					ED_region_tag_redraw(ar);
+					break;
 			}
 			break;
 		case NC_LAMP:
 			switch (wmn->data) {
 				case ND_LIGHTING:
-					if ((v3d->drawtype == OB_MATERIAL) ||
-					    (v3d->drawtype == OB_TEXTURE && (scene->gm.matmode == GAME_MAT_GLSL)) ||
-					    !DEG_depsgraph_use_legacy())
-					{
-						ED_region_tag_redraw(ar);
-					}
+					/* TODO(sergey): This is a bit too much, but needed to
+					 * handle updates from new depsgraph.
+					 */
+					ED_region_tag_redraw(ar);
 					break;
 				case ND_LIGHTING_DRAW:
 					ED_region_tag_redraw(ar);
+					WM_manipulatormap_tag_refresh(mmap);
 					break;
 			}
 			break;
@@ -982,10 +983,10 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 		case NC_SPACE:
 			if (wmn->data == ND_SPACE_VIEW3D) {
 				if (wmn->subtype == NS_VIEW3D_GPU) {
-					RegionView3D *rv3d = ar->regiondata;
 					rv3d->rflag |= RV3D_GPULIGHT_UPDATE;
 				}
 				ED_region_tag_redraw(ar);
+				WM_manipulatormap_tag_refresh(mmap);
 			}
 			break;
 		case NC_ID:
@@ -998,15 +999,13 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 				case ND_SKETCH:
 					ED_region_tag_redraw(ar);
 					break;
-				case ND_SCREENBROWSE:
-				case ND_SCREENDELETE:
-				case ND_SCREENSET:
-					/* screen was changed, need to update used layers due to NC_SCENE|ND_LAYER_CONTENT */
-					/* updates used layers only for View3D in active screen */
-					if (wmn->reference) {
-						bScreen *sc_ref = wmn->reference;
-						view3d_recalc_used_layers(ar, wmn, sc_ref->scene);
-					}
+				case ND_LAYOUTBROWSE:
+				case ND_LAYOUTDELETE:
+				case ND_LAYOUTSET:
+					WM_manipulatormap_tag_refresh(mmap);
+					ED_region_tag_redraw(ar);
+					break;
+				case ND_LAYER:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -1020,12 +1019,118 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 	}
 }
 
+static void view3d_main_region_message_subscribe(
+        const struct bContext *C,
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *sa, struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	/* Developer note: there are many properties that impact 3D view drawing,
+	 * so instead of subscribing to individual properties, just subscribe to types
+	 * accepting some redundant redraws.
+	 *
+	 * For other space types we might try avoid this, keep the 3D view as an exceptional case! */
+	wmMsgParams_RNA msg_key_params = {{{0}}};
+
+	/* Only subscribe to types. */
+	StructRNA *type_array[] = {
+		&RNA_Window,
+
+		/* These object have properties that impact drawing. */
+		&RNA_AreaLamp,
+		&RNA_Camera,
+		&RNA_Lamp,
+		&RNA_Speaker,
+		&RNA_SunLamp,
+
+		/* General types the 3D view depends on. */
+		&RNA_Object,
+		&RNA_UnitSettings,  /* grid-floor */
+
+		&RNA_View3DOverlay,
+		&RNA_View3DShading,
+		&RNA_World,
+	};
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(type_array); i++) {
+		msg_key_params.ptr.type = type_array[i];
+		WM_msg_subscribe_rna_params(
+		        mbus,
+		        &msg_key_params,
+		        &msg_sub_value_region_tag_redraw,
+		        __func__);
+	}
+
+	/* Subscribe to a handful of other properties. */
+	RegionView3D *rv3d = ar->regiondata;
+
+	WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, engine, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, resolution_x, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, resolution_y, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, pixel_aspect_x, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, pixel_aspect_y, &msg_sub_value_region_tag_redraw);
+	if (rv3d->persp == RV3D_CAMOB) {
+		WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, use_border, &msg_sub_value_region_tag_redraw);
+	}
+
+	WM_msg_subscribe_rna_anon_type(mbus, SceneEEVEE, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_type(mbus, SceneDisplay, &msg_sub_value_region_tag_redraw);
+	WM_msg_subscribe_rna_anon_type(mbus, ObjectDisplay, &msg_sub_value_region_tag_redraw);
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *obact = OBACT(view_layer);
+	if (obact != NULL) {
+		switch (obact->mode) {
+			case OB_MODE_PARTICLE_EDIT:
+				WM_msg_subscribe_rna_anon_type(mbus, ParticleEdit, &msg_sub_value_region_tag_redraw);
+				break;
+			default:
+				break;
+		}
+	}
+
+	{
+		wmMsgSubscribeValue msg_sub_value_region_tag_refresh = {
+			.owner = ar,
+			.user_data = sa,
+			.notify = WM_toolsystem_do_msg_notify_tag_refresh,
+		};
+		WM_msg_subscribe_rna_anon_prop(
+		        mbus, Object, mode,
+		        &msg_sub_value_region_tag_refresh);
+	}
+}
+
+static void view3d_tools_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *UNUSED(sa), struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+	WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_region_tag_redraw);
+}
+
 /* concept is to retrieve cursor type context-less */
-static void view3d_main_region_cursor(wmWindow *win, ScrArea *UNUSED(sa), ARegion *UNUSED(ar))
+static void view3d_main_region_cursor(wmWindow *win, ScrArea *sa, ARegion *ar)
 {
-	Scene *scene = win->screen->scene;
+	if (WM_cursor_set_from_tool(win, sa, ar)) {
+		return;
+	}
 
-	if (scene->obedit) {
+	ViewLayer *view_layer = WM_window_get_active_view_layer(win);
+	Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
+	if (obedit) {
 		WM_cursor_set(win, CURSOR_EDIT);
 	}
 	else {
@@ -1048,7 +1153,9 @@ static void view3d_header_region_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
-static void view3d_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void view3d_header_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1078,6 +1185,36 @@ static void view3d_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(s
 	}
 }
 
+static void view3d_header_region_message_subscribe(
+        const struct bContext *UNUSED(C),
+        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
+        struct bScreen *UNUSED(screen), struct ScrArea *UNUSED(sa), struct ARegion *ar,
+        struct wmMsgBus *mbus)
+{
+	wmMsgParams_RNA msg_key_params = {{{0}}};
+
+	/* Only subscribe to types. */
+	StructRNA *type_array[] = {
+		&RNA_View3DShading,
+	};
+
+	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+		.owner = ar,
+		.user_data = ar,
+		.notify = ED_region_do_msg_notify_tag_redraw,
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(type_array); i++) {
+		msg_key_params.ptr.type = type_array[i];
+		WM_msg_subscribe_rna_params(
+		        mbus,
+		        &msg_key_params,
+		        &msg_sub_value_region_tag_redraw,
+		        __func__);
+	}
+}
+
+
 /* add handlers, stuff you only do once or on area/region changes */
 static void view3d_buttons_region_init(wmWindowManager *wm, ARegion *ar)
 {
@@ -1094,7 +1231,9 @@ static void view3d_buttons_region_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void view3d_buttons_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void view3d_buttons_region_listener(
+        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
+        wmNotifier *wmn, const Scene *UNUSED(scene))
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1184,6 +1323,27 @@ static void view3d_buttons_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(
 	}
 }
 
+static int view3d_tools_region_snap_size(const ARegion *ar, int size, int axis)
+{
+	if (axis == 0) {
+		/* Note, this depends on the icon size: see #ICON_DEFAULT_HEIGHT_TOOLBAR. */
+		const float snap_units[] = {3 + 0.25f, 5 + 0.25};
+		const float aspect = BLI_rctf_size_x(&ar->v2d.cur) / (BLI_rcti_size_x(&ar->v2d.mask) + 1);
+		int best_diff = INT_MAX;
+		int best_size = size;
+		for (uint i = 0; i < ARRAY_SIZE(snap_units); i += 1) {
+			const int test_size = (snap_units[i] * U.widget_unit) / (UI_DPI_FAC * aspect);
+			const int test_diff = ABS(test_size - size);
+			if (test_diff < best_diff) {
+				best_size = test_size;
+				best_diff = test_diff;
+			}
+		}
+		return best_size;
+	}
+	return size;
+}
+
 /* add handlers, stuff you only do once or on area/region changes */
 static void view3d_tools_region_init(wmWindowManager *wm, ARegion *ar)
 {
@@ -1197,30 +1357,13 @@ static void view3d_tools_region_init(wmWindowManager *wm, ARegion *ar)
 
 static void view3d_tools_region_draw(const bContext *C, ARegion *ar)
 {
-	ED_region_panels(C, ar, CTX_data_mode_string(C), -1, true);
-}
-
-static void view3d_props_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_WM:
-			if (wmn->data == ND_HISTORY)
-				ED_region_tag_redraw(ar);
-			break;
-		case NC_SCENE:
-			if (wmn->data == ND_MODE)
-				ED_region_tag_redraw(ar);
-			break;
-		case NC_SPACE:
-			if (wmn->data == ND_SPACE_VIEW3D)
-				ED_region_tag_redraw(ar);
-			break;
-	}
+	ED_region_panels(C, ar, (const char * []){CTX_data_mode_string(C), NULL}, -1, true);
 }
 
 /* area (not region) level listener */
-static void space_view3d_listener(bScreen *UNUSED(sc), ScrArea *sa, struct wmNotifier *wmn)
+static void space_view3d_listener(
+        bScreen *UNUSED(sc), ScrArea *sa, struct wmNotifier *wmn, Scene *UNUSED(scene),
+        WorkSpace *UNUSED(workspace))
 {
 	View3D *v3d = sa->spacedata.first;
 
@@ -1255,8 +1398,6 @@ static void space_view3d_listener(bScreen *UNUSED(sc), ScrArea *sa, struct wmNot
 }
 
 const char *view3d_context_dir[] = {
-	"selected_objects", "selected_bases", "selected_editable_objects",
-	"selected_editable_bases", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
 	"active_base", "active_object", NULL
 };
 
@@ -1267,109 +1408,27 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
 	if (CTX_data_dir(member)) {
 		CTX_data_dir_set(result, view3d_context_dir);
 	}
-	else if (CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) {
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		Base *base;
-		const bool selected_objects = CTX_data_equals(member, "selected_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if ((base->flag & SELECT) && (base->lay & lay)) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) {
-					if (selected_objects)
-						CTX_data_id_list_add(result, &base->object->id);
-					else
-						CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-				}
-			}
-		}
-		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
-		return 1;
-	}
-	else if (CTX_data_equals(member, "selected_editable_objects") || CTX_data_equals(member, "selected_editable_bases")) {
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		Base *base;
-		const bool selected_editable_objects = CTX_data_equals(member, "selected_editable_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if ((base->flag & SELECT) && (base->lay & lay)) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) {
-					if (0 == BKE_object_is_libdata(base->object)) {
-						if (selected_editable_objects)
-							CTX_data_id_list_add(result, &base->object->id);
-						else
-							CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-					}
-				}
-			}
-		}
-		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
-		return 1;
-	}
-	else if (CTX_data_equals(member, "visible_objects") || CTX_data_equals(member, "visible_bases")) {
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		Base *base;
-		const bool visible_objects = CTX_data_equals(member, "visible_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & lay) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0) {
-					if (visible_objects)
-						CTX_data_id_list_add(result, &base->object->id);
-					else
-						CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-				}
-			}
-		}
-		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
-		return 1;
-	}
-	else if (CTX_data_equals(member, "selectable_objects") || CTX_data_equals(member, "selectable_bases")) {
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		Base *base;
-		const bool selectable_objects = CTX_data_equals(member, "selectable_objects");
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & lay) {
-				if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0 && (base->object->restrictflag & OB_RESTRICT_SELECT) == 0) {
-					if (selectable_objects)
-						CTX_data_id_list_add(result, &base->object->id);
-					else
-						CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
-				}
-			}
-		}
-		CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
-		return 1;
-	}
 	else if (CTX_data_equals(member, "active_base")) {
-		View3D *v3d = CTX_wm_view3d(C);
 		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		if (scene->basact && (scene->basact->lay & lay)) {
-			Object *ob = scene->basact->object;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		if (view_layer->basact) {
+			Object *ob = view_layer->basact->object;
 			/* if hidden but in edit mode, we still display, can happen with animation */
-			if ((ob->restrictflag & OB_RESTRICT_VIEW) == 0 || (ob->mode & OB_MODE_EDIT))
-				CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, scene->basact);
+			if ((view_layer->basact->flag & BASE_VISIBLED) != 0 || (ob->mode & OB_MODE_EDIT)) {
+				CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, view_layer->basact);
+			}
 		}
 
 		return 1;
 	}
 	else if (CTX_data_equals(member, "active_object")) {
-		View3D *v3d = CTX_wm_view3d(C);
-		Scene *scene = CTX_data_scene(C);
-		const unsigned int lay = v3d ? v3d->lay : scene->lay;
-		if (scene->basact && (scene->basact->lay & lay)) {
-			Object *ob = scene->basact->object;
-			if ((ob->restrictflag & OB_RESTRICT_VIEW) == 0 || (ob->mode & OB_MODE_EDIT))
-				CTX_data_id_pointer_set(result, &scene->basact->object->id);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		if (view_layer->basact) {
+			Object *ob = view_layer->basact->object;
+			/* if hidden but in edit mode, we still display, can happen with animation */
+			if ((view_layer->basact->flag & BASE_VISIBLED) != 0 || (ob->mode & OB_MODE_EDIT) != 0) {
+				CTX_data_id_pointer_set(result, &ob->id);
+			}
 		}
 
 		return 1;
@@ -1410,8 +1469,6 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i
 
 		/* Values in local-view aren't used, see: T52663 */
 		if (is_local == false) {
-			/* Skip 'v3d->defmaterial', it's not library data.  */
-
 			if ((ID *)v3d->ob_centre == old_id) {
 				v3d->ob_centre = (Object *)new_id;
 				/* Otherwise, bonename may remain valid... We could be smart and check this, too? */
@@ -1419,21 +1476,6 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i
 					v3d->ob_centre_bone[0] = '\0';
 				}
 			}
-
-			if (ELEM(GS(old_id->name), ID_IM, ID_MC)) {
-				for (BGpic *bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
-					if ((ID *)bgpic->ima == old_id) {
-						bgpic->ima = (Image *)new_id;
-						id_us_min(old_id);
-						id_us_plus(new_id);
-					}
-					if ((ID *)bgpic->clip == old_id) {
-						bgpic->clip = (MovieClip *)new_id;
-						id_us_min(old_id);
-						id_us_plus(new_id);
-					}
-				}
-			}
 		}
 
 		if (is_local) {
@@ -1459,6 +1501,7 @@ void ED_spacetype_view3d(void)
 	st->operatortypes = view3d_operatortypes;
 	st->keymap = view3d_keymap;
 	st->dropboxes = view3d_dropboxes;
+	st->manipulators = view3d_widgets;
 	st->context = view3d_context;
 	st->id_remap = view3d_id_remap;
 
@@ -1472,6 +1515,7 @@ void ED_spacetype_view3d(void)
 	art->free = view3d_main_region_free;
 	art->duplicate = view3d_main_region_duplicate;
 	art->listener = view3d_main_region_listener;
+	art->message_subscribe = view3d_main_region_message_subscribe;
 	art->cursor = view3d_main_region_cursor;
 	art->lock = 1;   /* can become flag, see BKE_spacedata_draw_locks */
 	BLI_addhead(&st->regiontypes, art);
@@ -1495,6 +1539,8 @@ void ED_spacetype_view3d(void)
 	art->prefsizey = 50; /* XXX */
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
 	art->listener = view3d_buttons_region_listener;
+	art->message_subscribe = view3d_tools_region_message_subscribe;
+	art->snap_size = view3d_tools_region_snap_size;
 	art->init = view3d_tools_region_init;
 	art->draw = view3d_tools_region_draw;
 	BLI_addhead(&st->regiontypes, art);
@@ -1504,20 +1550,6 @@ void ED_spacetype_view3d(void)
 	view3d_toolshelf_register(art);
 #endif
 
-	/* regions: tool properties */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype view3d tool properties region");
-	art->regionid = RGN_TYPE_TOOL_PROPS;
-	art->prefsizex = 0;
-	art->prefsizey = 120;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
-	art->listener = view3d_props_region_listener;
-	art->init = view3d_tools_region_init;
-	art->draw = view3d_tools_region_draw;
-	BLI_addhead(&st->regiontypes, art);
-
-	view3d_tool_props_register(art);
-
-
 	/* regions: header */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype view3d header region");
 	art->regionid = RGN_TYPE_HEADER;
@@ -1526,8 +1558,8 @@ void ED_spacetype_view3d(void)
 	art->listener = view3d_header_region_listener;
 	art->init = view3d_header_region_init;
 	art->draw = view3d_header_region_draw;
+	art->message_subscribe = view3d_header_region_message_subscribe;
 	BLI_addhead(&st->regiontypes, art);
 
 	BKE_spacetype_register(st);
 }
-
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index fbbc5bd7bb9..69e8aa07d3f 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -55,13 +55,14 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
 #include "BKE_screen.h"
 #include "BKE_editmesh.h"
 #include "BKE_deform.h"
 #include "BKE_object.h"
 #include "BKE_object_deform.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -776,18 +777,18 @@ static void do_view3d_vgroup_buttons(bContext *C, void *UNUSED(arg), int event)
 		return;
 	}
 	else {
-		Scene *scene = CTX_data_scene(C);
-		Object *ob = scene->basact->object;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Object *ob = view_layer->basact->object;
 		ED_vgroup_vert_active_mirror(ob, event - B_VGRP_PNL_EDIT_SINGLE);
-		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 	}
 }
 
 static int view3d_panel_vgroup_poll(const bContext *C, PanelType *UNUSED(pt))
 {
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = OBACT;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
 	if (ob && (BKE_object_is_in_editmode_vgroup(ob) ||
 	           BKE_object_is_in_wpaint_select_vert(ob)))
 	{
@@ -805,7 +806,8 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa)
 {
 	uiBlock *block = uiLayoutAbsoluteBlock(pa->layout);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = scene->basact->object;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = view_layer->basact->object;
 
 	MDeformVert *dv;
 
@@ -1095,9 +1097,9 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob)
 
 static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event)
 {
-	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Object *ob = OBACT;
+	Object *ob = OBACT(view_layer);
 
 	switch (event) {
 
@@ -1108,7 +1110,7 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event
 		case B_OBJECTPANELMEDIAN:
 			if (ob) {
 				v3d_editvertex_buts(NULL, v3d, ob, 1.0);
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			}
 			break;
 	}
@@ -1119,16 +1121,17 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event
 
 static int view3d_panel_transform_poll(const bContext *C, PanelType *UNUSED(pt))
 {
-	Scene *scene = CTX_data_scene(C);
-	return (scene->basact != NULL);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	return (view_layer->basact != NULL);
 }
 
 static void view3d_panel_transform(const bContext *C, Panel *pa)
 {
 	uiBlock *block;
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
-	Object *ob = scene->basact->object;
+	Object *ob = view_layer->basact->object;
 	uiLayout *col;
 
 	block = uiLayoutGetBlock(pa->layout);
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c
index e27b3fe13f9..d0475684262 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -54,8 +54,9 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_object.h"
+#include "BKE_context.h"
 
-#include "BKE_depsgraph.h" /* for object updating */
+#include "DEG_depsgraph.h"
 
 #include "ED_screen.h"
 
@@ -137,7 +138,7 @@ Object *ED_view3d_cameracontrol_object_get(View3DCameraControl *vctrl)
  * the view for first-person style navigation.
  */
 struct View3DCameraControl *ED_view3d_cameracontrol_acquire(
-        Scene *scene, View3D *v3d, RegionView3D *rv3d,
+        Depsgraph *depsgraph, Scene *scene, View3D *v3d, RegionView3D *rv3d,
         const bool use_parent_root)
 {
 	View3DCameraControl *vctrl;
@@ -177,7 +178,7 @@ struct View3DCameraControl *ED_view3d_cameracontrol_acquire(
 		/* store the original camera loc and rot */
 		vctrl->obtfm = BKE_object_tfm_backup(ob_back);
 
-		BKE_object_where_is_calc(scene, v3d->camera);
+		BKE_object_where_is_calc(depsgraph, scene, v3d->camera);
 		negate_v3_v3(rv3d->ofs, v3d->camera->obmat[3]);
 
 		rv3d->dist = 0.0;
@@ -242,7 +243,7 @@ void ED_view3d_cameracontrol_update(
 
 		ob_update = v3d->camera->parent;
 		while (ob_update) {
-			DAG_id_tag_update(&ob_update->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob_update->id, OB_RECALC_OB);
 			ob_update = ob_update->parent;
 		}
 
@@ -264,7 +265,7 @@ void ED_view3d_cameracontrol_update(
 
 		BKE_object_apply_mat4(v3d->camera, view_mat, true, true);
 
-		DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
+		DEG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
 
 		copy_v3_v3(v3d->camera->size, size_back);
 
@@ -299,7 +300,7 @@ void ED_view3d_cameracontrol_release(
 			/* store the original camera loc and rot */
 			BKE_object_tfm_restore(ob_back, vctrl->obtfm);
 
-			DAG_id_tag_update(&ob_back->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob_back->id, OB_RECALC_OB);
 		}
 		else {
 			/* Non Camera we need to reset the view back to the original location bacause the user canceled*/
@@ -311,7 +312,7 @@ void ED_view3d_cameracontrol_release(
 		rv3d->dist = vctrl->dist_backup;
 	}
 	else if (vctrl->persp_backup == RV3D_CAMOB) { /* camera */
-		DAG_id_tag_update((ID *)view3d_cameracontrol_object(vctrl), OB_RECALC_OB);
+		DEG_id_tag_update((ID *)view3d_cameracontrol_object(vctrl), OB_RECALC_OB);
 
 		/* always, is set to zero otherwise */
 		copy_v3_v3(rv3d->ofs, vctrl->ofs_backup);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d8247caa5c2..5cd36cce31c 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -28,958 +28,285 @@
  *  \ingroup spview3d
  */
 
-#include <string.h>
-#include <stdio.h>
 #include <math.h>
 
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_customdata_types.h"
-#include "DNA_object_types.h"
-#include "DNA_group_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_key_types.h"
-#include "DNA_lamp_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_world_types.h"
-#include "DNA_brush_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_math.h"
-#include "BLI_jitter_2d.h"
-#include "BLI_utildefines.h"
-#include "BLI_endian_switch.h"
+#include "BLI_rect.h"
+#include "BLI_string.h"
 #include "BLI_threads.h"
+#include "BLI_jitter_2d.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
 
-#include "BKE_anim.h"
 #include "BKE_camera.h"
 #include "BKE_context.h"
-#include "BKE_customdata.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_image.h"
+#include "BKE_global.h"
 #include "BKE_key.h"
-#include "BKE_main.h"
+#include "BKE_scene.h"
 #include "BKE_object.h"
-#include "BKE_global.h"
 #include "BKE_paint.h"
-#include "BKE_scene.h"
-#include "BKE_screen.h"
 #include "BKE_unit.h"
-#include "BKE_movieclip.h"
 
-#include "RE_engine.h"
-
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
-#include "IMB_colormanagement.h"
+#include "BLF_api.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "BLT_translation.h"
 
-#include "WM_api.h"
+#include "DNA_armature_types.h"
+#include "DNA_brush_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
 
-#include "BLF_api.h"
-#include "BLT_translation.h"
+#include "DRW_engine.h"
 
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_gpencil.h"
 #include "ED_screen.h"
-#include "ED_space_api.h"
-#include "ED_screen_types.h"
 #include "ED_transform.h"
 
-#include "UI_interface.h"
-#include "UI_interface_icons.h"
-#include "UI_resources.h"
+#include "DEG_depsgraph_query.h"
 
+#include "GPU_batch.h"
 #include "GPU_draw.h"
-#include "GPU_framebuffer.h"
+#include "GPU_matrix.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
 #include "GPU_material.h"
-#include "GPU_compositing.h"
-#include "GPU_extensions.h"
-#include "GPU_select.h"
-
-#include "view3d_intern.h"  /* own include */
-
-/* prototypes */
-static bool view3d_stereo3d_active(wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d);
-static void view3d_stereo3d_setup(Scene *scene, View3D *v3d, ARegion *ar, const rcti *rect);
-static void view3d_stereo3d_setup_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
-                                            float winmat[4][4], const char *viewname);
-
-/* handy utility for drawing shapes in the viewport for arbitrary code.
- * could add lines and points too */
-// #define DEBUG_DRAW
-#ifdef DEBUG_DRAW
-static void bl_debug_draw(void);
-/* add these locally when using these functions for testing */
-extern void bl_debug_draw_quad_clear(void);
-extern void bl_debug_draw_quad_add(const float v0[3], const float v1[3], const float v2[3], const float v3[3]);
-extern void bl_debug_draw_edge_add(const float v0[3], const float v1[3]);
-extern void bl_debug_color_set(const unsigned int col);
-#endif
-
-void circf(float x, float y, float rad)
-{
-	GLUquadricObj *qobj = gluNewQuadric();
-
-	gluQuadricDrawStyle(qobj, GLU_FILL);
-
-	glPushMatrix();
-
-	glTranslatef(x, y, 0.0);
-
-	gluDisk(qobj, 0.0,  rad, 32, 1);
-
-	glPopMatrix();
-
-	gluDeleteQuadric(qobj);
-}
-
-void circ(float x, float y, float rad)
-{
-	GLUquadricObj *qobj = gluNewQuadric();
-
-	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
-
-	glPushMatrix();
-
-	glTranslatef(x, y, 0.0);
-
-	gluDisk(qobj, 0.0,  rad, 32, 1);
+#include "GPU_viewport.h"
 
-	glPopMatrix();
-
-	gluDeleteQuadric(qobj);
-}
-
-
-/* ********* custom clipping *********** */
-
-static void view3d_draw_clipping(RegionView3D *rv3d)
-{
-	BoundBox *bb = rv3d->clipbb;
-
-	if (bb) {
-		const unsigned int clipping_index[6][4] = {
-			{0, 1, 2, 3},
-			{0, 4, 5, 1},
-			{4, 7, 6, 5},
-			{7, 3, 2, 6},
-			{1, 5, 6, 2},
-			{7, 4, 0, 3}
-		};
-
-		/* fill in zero alpha for rendering & re-projection [#31530] */
-		unsigned char col[4];
-		UI_GetThemeColor4ubv(TH_V3D_CLIPPING_BORDER, col);
-		glColor4ubv(col);
-
-		glEnable(GL_BLEND);
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glVertexPointer(3, GL_FLOAT, 0, bb->vec);
-		glDrawElements(GL_QUADS, sizeof(clipping_index) / sizeof(unsigned int), GL_UNSIGNED_INT, clipping_index);
-		glDisableClientState(GL_VERTEX_ARRAY);
-		glDisable(GL_BLEND);
-	}
-}
-
-void ED_view3d_clipping_set(RegionView3D *rv3d)
-{
-	double plane[4];
-	const unsigned int tot = (rv3d->viewlock & RV3D_BOXCLIP) ? 4 : 6;
-	unsigned int a;
-
-	for (a = 0; a < tot; a++) {
-		copy_v4db_v4fl(plane, rv3d->clip[a]);
-		glClipPlane(GL_CLIP_PLANE0 + a, plane);
-		glEnable(GL_CLIP_PLANE0 + a);
-	}
-}
-
-/* use these to temp disable/enable clipping when 'rv3d->rflag & RV3D_CLIPPING' is set */
-void ED_view3d_clipping_disable(void)
-{
-	unsigned int a;
-
-	for (a = 0; a < 6; a++) {
-		glDisable(GL_CLIP_PLANE0 + a);
-	}
-}
-void ED_view3d_clipping_enable(void)
-{
-	unsigned int a;
-
-	for (a = 0; a < 6; a++) {
-		glEnable(GL_CLIP_PLANE0 + a);
-	}
-}
-
-static bool view3d_clipping_test(const float co[3], const float clip[6][4])
-{
-	if (plane_point_side_v3(clip[0], co) > 0.0f)
-		if (plane_point_side_v3(clip[1], co) > 0.0f)
-			if (plane_point_side_v3(clip[2], co) > 0.0f)
-				if (plane_point_side_v3(clip[3], co) > 0.0f)
-					return false;
-
-	return true;
-}
-
-/* for 'local' ED_view3d_clipping_local must run first
- * then all comparisons can be done in localspace */
-bool ED_view3d_clipping_test(const RegionView3D *rv3d, const float co[3], const bool is_local)
-{
-	return view3d_clipping_test(co, is_local ? rv3d->clip_local : rv3d->clip);
-}
-
-/* ********* end custom clipping *********** */
-
-
-static void drawgrid_draw(ARegion *ar, double wx, double wy, double x, double y, double dx)
-{
-	double verts[2][2];
-
-	x += (wx);
-	y += (wy);
+#include "MEM_guardedalloc.h"
 
-	/* set fixed 'Y' */
-	verts[0][1] = 0.0f;
-	verts[1][1] = (double)ar->winy;
+#include "UI_interface.h"
+#include "UI_resources.h"
 
-	/* iter over 'X' */
-	verts[0][0] = verts[1][0] = x - dx * floor(x / dx);
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_DOUBLE, 0, verts);
+#include "RE_engine.h"
 
-	while (verts[0][0] < ar->winx) {
-		glDrawArrays(GL_LINES, 0, 2);
-		verts[0][0] = verts[1][0] = verts[0][0] + dx;
-	}
+#include "WM_api.h"
+#include "WM_types.h"
 
-	/* set fixed 'X' */
-	verts[0][0] = 0.0f;
-	verts[1][0] = (double)ar->winx;
+#include "RNA_access.h"
 
-	/* iter over 'Y' */
-	verts[0][1] = verts[1][1] = y - dx * floor(y / dx);
-	while (verts[0][1] < ar->winy) {
-		glDrawArrays(GL_LINES, 0, 2);
-		verts[0][1] = verts[1][1] = verts[0][1] + dx;
-	}
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
-	glDisableClientState(GL_VERTEX_ARRAY);
-}
+#include "view3d_intern.h"  /* own include */
 
-#define GRID_MIN_PX_D   6.0
-#define GRID_MIN_PX_F 6.0f
+/* ******************** general functions ***************** */
 
-static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, const char **grid_unit)
+/**
+ * \note keep this synced with #ED_view3d_mats_rv3d_backup/#ED_view3d_mats_rv3d_restore
+ */
+void ED_view3d_update_viewmat(
+        Depsgraph *depsgraph, Scene *scene, View3D *v3d, ARegion *ar,
+        float viewmat[4][4], float winmat[4][4], const rcti *rect)
 {
-	/* extern short bgpicmode; */
 	RegionView3D *rv3d = ar->regiondata;
-	double wx, wy, x, y, fw, fx, fy, dx;
-	double vec4[4];
-	unsigned char col[3], col2[3];
 
-	fx = rv3d->persmat[3][0];
-	fy = rv3d->persmat[3][1];
-	fw = rv3d->persmat[3][3];
-
-	wx = (ar->winx / 2.0); /* because of rounding errors, grid at wrong location */
-	wy = (ar->winy / 2.0);
-
-	x = (wx) * fx / fw;
-	y = (wy) * fy / fw;
-
-	vec4[0] = vec4[1] = v3d->grid;
-
-	vec4[2] = 0.0;
-	vec4[3] = 1.0;
-	mul_m4_v4d(rv3d->persmat, vec4);
-	fx = vec4[0];
-	fy = vec4[1];
-	fw = vec4[3];
-
-	dx = fabs(x - (wx) * fx / fw);
-	if (dx == 0) dx = fabs(y - (wy) * fy / fw);
-
-	glLineWidth(1.0f);
-
-	glDepthMask(GL_FALSE);     /* disable write in zbuffer */
-
-	/* check zoom out */
-	UI_ThemeColor(TH_GRID);
-
-	if (unit->system) {
-		/* Use GRID_MIN_PX * 2 for units because very very small grid
-		 * items are less useful when dealing with units */
-		const void *usys;
-		int len, i;
-		double dx_scalar;
-		float blend_fac;
-
-		bUnit_GetSystem(unit->system, B_UNIT_LENGTH, &usys, &len);
-
-		if (usys) {
-			i = len;
-			while (i--) {
-				double scalar = bUnit_GetScaler(usys, i);
-
-				dx_scalar = dx * scalar / (double)unit->scale_length;
-				if (dx_scalar < (GRID_MIN_PX_D * 2.0))
-					continue;
-
-				/* Store the smallest drawn grid size units name so users know how big each grid cell is */
-				if (*grid_unit == NULL) {
-					*grid_unit = bUnit_GetNameDisplay(usys, i);
-					rv3d->gridview = (float)((scalar * (double)v3d->grid) / (double)unit->scale_length);
-				}
-				blend_fac = 1.0f - ((GRID_MIN_PX_F * 2.0f) / (float)dx_scalar);
-
-				/* tweak to have the fade a bit nicer */
-				blend_fac = (blend_fac * blend_fac) * 2.0f;
-				CLAMP(blend_fac, 0.3f, 1.0f);
-
-
-				UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, blend_fac);
+	/* setup window matrices */
+	if (winmat)
+		copy_m4_m4(rv3d->winmat, winmat);
+	else
+		view3d_winmatrix_set(depsgraph, ar, v3d, rect);
 
-				drawgrid_draw(ar, wx, wy, x, y, dx_scalar);
-			}
-		}
+	/* setup view matrix */
+	if (viewmat) {
+		copy_m4_m4(rv3d->viewmat, viewmat);
 	}
 	else {
-		const double sublines    = v3d->gridsubdiv;
-		const float  sublines_fl = v3d->gridsubdiv;
-
-		if (dx < GRID_MIN_PX_D) {
-			rv3d->gridview *= sublines_fl;
-			dx *= sublines;
-
-			if (dx < GRID_MIN_PX_D) {
-				rv3d->gridview *= sublines_fl;
-				dx *= sublines;
-
-				if (dx < GRID_MIN_PX_D) {
-					rv3d->gridview *= sublines_fl;
-					dx *= sublines;
-					if (dx < GRID_MIN_PX_D) {
-						/* pass */
-					}
-					else {
-						UI_ThemeColor(TH_GRID);
-						drawgrid_draw(ar, wx, wy, x, y, dx);
-					}
-				}
-				else {  /* start blending out */
-					UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, dx / (GRID_MIN_PX_D * 6.0));
-					drawgrid_draw(ar, wx, wy, x, y, dx);
-
-					UI_ThemeColor(TH_GRID);
-					drawgrid_draw(ar, wx, wy, x, y, sublines * dx);
-				}
-			}
-			else {  /* start blending out (GRID_MIN_PX < dx < (GRID_MIN_PX * 10)) */
-				UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, dx / (GRID_MIN_PX_D * 6.0));
-				drawgrid_draw(ar, wx, wy, x, y, dx);
-
-				UI_ThemeColor(TH_GRID);
-				drawgrid_draw(ar, wx, wy, x, y, sublines * dx);
-			}
-		}
-		else {
-			if (dx > (GRID_MIN_PX_D * 10.0)) {  /* start blending in */
-				rv3d->gridview /= sublines_fl;
-				dx /= sublines;
-				if (dx > (GRID_MIN_PX_D * 10.0)) {  /* start blending in */
-					rv3d->gridview /= sublines_fl;
-					dx /= sublines;
-					if (dx > (GRID_MIN_PX_D * 10.0)) {
-						UI_ThemeColor(TH_GRID);
-						drawgrid_draw(ar, wx, wy, x, y, dx);
-					}
-					else {
-						UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, dx / (GRID_MIN_PX_D * 6.0));
-						drawgrid_draw(ar, wx, wy, x, y, dx);
-						UI_ThemeColor(TH_GRID);
-						drawgrid_draw(ar, wx, wy, x, y, dx * sublines);
-					}
-				}
-				else {
-					UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, dx / (GRID_MIN_PX_D * 6.0));
-					drawgrid_draw(ar, wx, wy, x, y, dx);
-					UI_ThemeColor(TH_GRID);
-					drawgrid_draw(ar, wx, wy, x, y, dx * sublines);
-				}
-			}
-			else {
-				UI_ThemeColorBlend(TH_HIGH_GRAD, TH_GRID, dx / (GRID_MIN_PX_D * 6.0));
-				drawgrid_draw(ar, wx, wy, x, y, dx);
-				UI_ThemeColor(TH_GRID);
-				drawgrid_draw(ar, wx, wy, x, y, dx * sublines);
-			}
+		float rect_scale[2];
+		if (rect) {
+			rect_scale[0] = (float)BLI_rcti_size_x(rect) / (float)ar->winx;
+			rect_scale[1] = (float)BLI_rcti_size_y(rect) / (float)ar->winy;
 		}
+		/* note: calls BKE_object_where_is_calc for camera... */
+		view3d_viewmatrix_set(depsgraph, scene, v3d, rv3d, rect ? rect_scale : NULL);
 	}
+	/* update utility matrices */
+	mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
+	invert_m4_m4(rv3d->persinv, rv3d->persmat);
+	invert_m4_m4(rv3d->viewinv, rv3d->viewmat);
 
+	/* calculate GLSL view dependent values */
 
-	x += (wx);
-	y += (wy);
-	UI_GetThemeColor3ubv(TH_GRID, col);
-
-	setlinestyle(0);
-
-	/* center cross */
-	/* horizontal line */
-	if (ELEM(rv3d->view, RV3D_VIEW_RIGHT, RV3D_VIEW_LEFT))
-		UI_make_axis_color(col, col2, 'Y');
-	else UI_make_axis_color(col, col2, 'X');
-	glColor3ubv(col2);
-
-	fdrawline(0.0,  y,  (float)ar->winx,  y);
+	/* store window coordinates scaling/offset */
+	if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
+		rctf cameraborder;
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &cameraborder, false);
+		rv3d->viewcamtexcofac[0] = (float)ar->winx / BLI_rctf_size_x(&cameraborder);
+		rv3d->viewcamtexcofac[1] = (float)ar->winy / BLI_rctf_size_y(&cameraborder);
 
-	/* vertical line */
-	if (ELEM(rv3d->view, RV3D_VIEW_TOP, RV3D_VIEW_BOTTOM))
-		UI_make_axis_color(col, col2, 'Y');
-	else UI_make_axis_color(col, col2, 'Z');
-	glColor3ubv(col2);
+		rv3d->viewcamtexcofac[2] = -rv3d->viewcamtexcofac[0] * cameraborder.xmin / (float)ar->winx;
+		rv3d->viewcamtexcofac[3] = -rv3d->viewcamtexcofac[1] * cameraborder.ymin / (float)ar->winy;
+	}
+	else {
+		rv3d->viewcamtexcofac[0] = rv3d->viewcamtexcofac[1] = 1.0f;
+		rv3d->viewcamtexcofac[2] = rv3d->viewcamtexcofac[3] = 0.0f;
+	}
 
-	fdrawline(x, 0.0, x, (float)ar->winy);
+	/* calculate pixelsize factor once, is used for lamps and obcenters */
+	{
+		/* note:  '1.0f / len_v3(v1)'  replaced  'len_v3(rv3d->viewmat[0])'
+		 * because of float point precision problems at large values [#23908] */
+		float v1[3], v2[3];
+		float len_px, len_sc;
 
-	glDepthMask(GL_TRUE);  /* enable write in zbuffer */
-}
-#undef GRID_MIN_PX
+		v1[0] = rv3d->persmat[0][0];
+		v1[1] = rv3d->persmat[1][0];
+		v1[2] = rv3d->persmat[2][0];
 
-/** could move this elsewhere, but tied into #ED_view3d_grid_scale */
-float ED_scene_grid_scale(Scene *scene, const char **grid_unit)
-{
-	/* apply units */
-	if (scene->unit.system) {
-		const void *usys;
-		int len;
+		v2[0] = rv3d->persmat[0][1];
+		v2[1] = rv3d->persmat[1][1];
+		v2[2] = rv3d->persmat[2][1];
 
-		bUnit_GetSystem(scene->unit.system, B_UNIT_LENGTH, &usys, &len);
+		len_px = 2.0f / sqrtf(min_ff(len_squared_v3(v1), len_squared_v3(v2)));
+		len_sc = (float)MAX2(ar->winx, ar->winy);
 
-		if (usys) {
-			int i = bUnit_GetBaseUnit(usys);
-			if (grid_unit)
-				*grid_unit = bUnit_GetNameDisplay(usys, i);
-			return (float)bUnit_GetScaler(usys, i) / scene->unit.scale_length;
-		}
+		rv3d->pixsize = len_px / len_sc;
 	}
-
-	return 1.0f;
 }
 
-float ED_view3d_grid_scale(Scene *scene, View3D *v3d, const char **grid_unit)
-{
-	return v3d->grid * ED_scene_grid_scale(scene, grid_unit);
-}
-
-static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit, bool write_depth)
+static void view3d_main_region_setup_view(
+        Depsgraph *depsgraph, Scene *scene,
+        View3D *v3d, ARegion *ar, float viewmat[4][4], float winmat[4][4], const rcti *rect)
 {
-	float grid, grid_scale;
-	unsigned char col_grid[3];
-	const int gridlines = v3d->gridlines / 2;
-
-	if (v3d->gridlines < 3) return;
-
-	/* use 'grid_scale' instead of 'v3d->grid' from now on */
-	grid_scale = ED_view3d_grid_scale(scene, v3d, grid_unit);
-	grid = gridlines * grid_scale;
-
-	if (!write_depth)
-		glDepthMask(GL_FALSE);
-
-	UI_GetThemeColor3ubv(TH_GRID, col_grid);
-
-	glLineWidth(1);
-
-	/* draw the Y axis and/or grid lines */
-	if (v3d->gridflag & V3D_SHOW_FLOOR) {
-		const int sublines = v3d->gridsubdiv;
-		float vert[4][3] = {{0.0f}};
-		unsigned char col_bg[3];
-		unsigned char col_grid_emphasise[3], col_grid_light[3];
-		int a;
-		int prev_emphasise = -1;
-
-		UI_GetThemeColor3ubv(TH_BACK, col_bg);
-
-		/* emphasise division lines lighter instead of darker, if background is darker than grid */
-		UI_GetColorPtrShade3ubv(col_grid, col_grid_light, 10);
-		UI_GetColorPtrShade3ubv(col_grid, col_grid_emphasise,
-		                        (((col_grid[0] + col_grid[1] + col_grid[2]) + 30) >
-		                         (col_bg[0] + col_bg[1] + col_bg[2])) ? 20 : -10);
-
-		/* set fixed axis */
-		vert[0][0] = vert[2][1] = grid;
-		vert[1][0] = vert[3][1] = -grid;
-
-		glEnableClientState(GL_VERTEX_ARRAY);
-		glVertexPointer(3, GL_FLOAT, 0, vert);
-
-		for (a = -gridlines; a <= gridlines; a++) {
-			const float line = a * grid_scale;
-			const int is_emphasise = (a % sublines) == 0;
-
-			if (is_emphasise != prev_emphasise) {
-				glColor3ubv(is_emphasise ? col_grid_emphasise : col_grid_light);
-				prev_emphasise = is_emphasise;
-			}
-
-			/* set variable axis */
-			vert[0][1] = vert[1][1] = vert[2][0] = vert[3][0] = line;
-
-			glDrawArrays(GL_LINES, 0, 4);
-		}
-
-		glDisableClientState(GL_VERTEX_ARRAY);
-	}
+	RegionView3D *rv3d = ar->regiondata;
 
-	/* draw the Z axis line */
-	/* check for the 'show Z axis' preference */
-	if (v3d->gridflag & (V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_Z)) {
-		glBegin(GL_LINES);
-		int axis;
-		for (axis = 0; axis < 3; axis++) {
-			if (v3d->gridflag & (V3D_SHOW_X << axis)) {
-				float vert[3];
-				unsigned char tcol[3];
-
-				UI_make_axis_color(col_grid, tcol, 'X' + axis);
-				glColor3ubv(tcol);
-
-				zero_v3(vert);
-				vert[axis] = grid;
-				glVertex3fv(vert);
-				vert[axis] = -grid;
-				glVertex3fv(vert);
-			}
-		}
-		glEnd();
-	}
+	ED_view3d_update_viewmat(depsgraph, scene, v3d, ar, viewmat, winmat, rect);
 
-	glDepthMask(GL_TRUE);
+	/* set for opengl */
+	gpuLoadProjectionMatrix(rv3d->winmat);
+	gpuLoadMatrix(rv3d->viewmat);
 }
 
-
-static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d)
+static bool view3d_stereo3d_active(wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d)
 {
-	int co[2];
-
-	/* we don't want the clipping for cursor */
-	if (ED_view3d_project_int_global(ar, ED_view3d_cursor3d_get(scene, v3d), co, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-		const float f5 = 0.25f * U.widget_unit;
-		const float f10 = 0.5f * U.widget_unit;
-		const float f20 = U.widget_unit;
-
-		glLineWidth(1);
-		setlinestyle(0);
-		cpack(0xFF);
-		circ((float)co[0], (float)co[1], f10);
-		setlinestyle(4);
-		cpack(0xFFFFFF);
-		circ((float)co[0], (float)co[1], f10);
-		setlinestyle(0);
-
-		UI_ThemeColor(TH_VIEW_OVERLAY);
-		sdrawline(co[0] - f20, co[1], co[0] - f5, co[1]);
-		sdrawline(co[0] + f5, co[1], co[0] + f20, co[1]);
-		sdrawline(co[0], co[1] - f20, co[0], co[1] - f5);
-		sdrawline(co[0], co[1] + f5, co[0], co[1] + f20);
+	if ((scene->r.scemode & R_MULTIVIEW) == 0) {
+		return false;
 	}
-}
-
-/* Draw a live substitute of the view icon, which is always shown
- * colors copied from transform_manipulator.c, we should keep these matching. */
-static void draw_view_axis(RegionView3D *rv3d, rcti *rect)
-{
-	const float k = U.rvisize * U.pixelsize;   /* axis size */
-	const float toll = 0.5;      /* used to see when view is quasi-orthogonal */
-	float startx = k + 1.0f; /* axis center in screen coordinates, x=y */
-	float starty = k + 1.0f;
-	float ydisp = 0.0;          /* vertical displacement to allow obj info text */
-	int bright = - 20 * (10 - U.rvibright); /* axis alpha offset (rvibright has range 0-10) */
-	float vec[3];
-	float dx, dy;
-
-	int axis_order[3] = {0, 1, 2};
-	int axis_i;
-
-	startx += rect->xmin;
-	starty += rect->ymin;
-
-	axis_sort_v3(rv3d->viewinv[2], axis_order);
-
-	/* thickness of lines is proportional to k */
-	glLineWidth(2);
-
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	for (axis_i = 0; axis_i < 3; axis_i++) {
-		int i = axis_order[axis_i];
-		const char axis_text[2] = {'x' + i, '\0'};
 
-		zero_v3(vec);
-		vec[i] = 1.0f;
-		mul_qt_v3(rv3d->viewquat, vec);
-		dx = vec[0] * k;
-		dy = vec[1] * k;
-
-		UI_ThemeColorShadeAlpha(TH_AXIS_X + i, 0, bright);
-		glBegin(GL_LINES);
-		glVertex2f(startx, starty + ydisp);
-		glVertex2f(startx + dx, starty + dy + ydisp);
-		glEnd();
-
-		if (fabsf(dx) > toll || fabsf(dy) > toll) {
-			BLF_draw_default_ascii(startx + dx + 2, starty + dy + ydisp + 2, 0.0f, axis_text, 1);
-
-			/* BLF_draw_default disables blending */
-			glEnable(GL_BLEND);
-		}
+	if ((v3d->camera == NULL) || (v3d->camera->type != OB_CAMERA) || rv3d->persp != RV3D_CAMOB) {
+		return false;
 	}
 
-	glDisable(GL_BLEND);
-}
-
-#ifdef WITH_INPUT_NDOF
-/* draw center and axis of rotation for ongoing 3D mouse navigation */
-static void draw_rotation_guide(RegionView3D *rv3d)
-{
-	float o[3];    /* center of rotation */
-	float end[3];  /* endpoints for drawing */
-
-	float color[4] = {0.0f, 0.4235f, 1.0f, 1.0f};  /* bright blue so it matches device LEDs */
-
-	negate_v3_v3(o, rv3d->ofs);
-
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glPointSize(5);
-	glEnable(GL_POINT_SMOOTH);
-	glDepthMask(0);  /* don't overwrite zbuf */
-
-	if (rv3d->rot_angle != 0.0f) {
-		/* -- draw rotation axis -- */
-		float scaled_axis[3];
-		const float scale = rv3d->dist;
-		mul_v3_v3fl(scaled_axis, rv3d->rot_axis, scale);
-
-
-		glBegin(GL_LINE_STRIP);
-		color[3] = 0.0f;  /* more transparent toward the ends */
-		glColor4fv(color);
-		add_v3_v3v3(end, o, scaled_axis);
-		glVertex3fv(end);
-
-#if 0
-		color[3] = 0.2f + fabsf(rv3d->rot_angle);  /* modulate opacity with angle */
-		/* ^^ neat idea, but angle is frame-rate dependent, so it's usually close to 0.2 */
-#endif
-
-		color[3] = 0.5f;  /* more opaque toward the center */
-		glColor4fv(color);
-		glVertex3fv(o);
-
-		color[3] = 0.0f;
-		glColor4fv(color);
-		sub_v3_v3v3(end, o, scaled_axis);
-		glVertex3fv(end);
-		glEnd();
-
-		/* -- draw ring around rotation center -- */
-		{
-#define     ROT_AXIS_DETAIL 13
-
-			const float s = 0.05f * scale;
-			const float step = 2.0f * (float)(M_PI / ROT_AXIS_DETAIL);
-			float angle;
-			int i;
-
-			float q[4];  /* rotate ring so it's perpendicular to axis */
-			const int upright = fabsf(rv3d->rot_axis[2]) >= 0.95f;
-			if (!upright) {
-				const float up[3] = {0.0f, 0.0f, 1.0f};
-				float vis_angle, vis_axis[3];
-
-				cross_v3_v3v3(vis_axis, up, rv3d->rot_axis);
-				vis_angle = acosf(dot_v3v3(up, rv3d->rot_axis));
-				axis_angle_to_quat(q, vis_axis, vis_angle);
+	switch (v3d->stereo3d_camera) {
+		case STEREO_MONO_ID:
+			return false;
+			break;
+		case STEREO_3D_ID:
+			/* win will be NULL when calling this from the selection or draw loop. */
+			if ((win == NULL) || (WM_stereo3d_enabled(win, true) == false)) {
+				return false;
 			}
-
-			color[3] = 0.25f;  /* somewhat faint */
-			glColor4fv(color);
-			glBegin(GL_LINE_LOOP);
-			for (i = 0, angle = 0.0f; i < ROT_AXIS_DETAIL; ++i, angle += step) {
-				float p[3] = {s * cosf(angle), s * sinf(angle), 0.0f};
-
-				if (!upright) {
-					mul_qt_v3(q, p);
-				}
-
-				add_v3_v3(p, o);
-				glVertex3fv(p);
+			if (((scene->r.views_format & SCE_VIEWS_FORMAT_MULTIVIEW) != 0) &&
+			    !BKE_scene_multiview_is_stereo3d(&scene->r))
+			{
+				return false;
 			}
-			glEnd();
-
-#undef      ROT_AXIS_DETAIL
-		}
-
-		color[3] = 1.0f;  /* solid dot */
-	}
-	else
-		color[3] = 0.5f;  /* see-through dot */
-
-	/* -- draw rotation center -- */
-	glColor4fv(color);
-	glBegin(GL_POINTS);
-	glVertex3fv(o);
-	glEnd();
-
-#if 0
-	/* find screen coordinates for rotation center, then draw pretty icon */
-	mul_m4_v3(rv3d->persinv, rot_center);
-	UI_icon_draw(rot_center[0], rot_center[1], ICON_NDOF_TURN);
-	/* ^^ just playing around, does not work */
-#endif
-
-	glDisable(GL_BLEND);
-	glDisable(GL_POINT_SMOOTH);
-	glDepthMask(1);
-}
-#endif /* WITH_INPUT_NDOF */
-
-static void draw_view_icon(RegionView3D *rv3d, rcti *rect)
-{
-	BIFIconID icon;
-
-	if (ELEM(rv3d->view, RV3D_VIEW_TOP, RV3D_VIEW_BOTTOM))
-		icon = ICON_AXIS_TOP;
-	else if (ELEM(rv3d->view, RV3D_VIEW_FRONT, RV3D_VIEW_BACK))
-		icon = ICON_AXIS_FRONT;
-	else if (ELEM(rv3d->view, RV3D_VIEW_RIGHT, RV3D_VIEW_LEFT))
-		icon = ICON_AXIS_SIDE;
-	else return;
-
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA);
-
-	UI_icon_draw(5.0 + rect->xmin, 5.0 + rect->ymin, icon);
-
-	glDisable(GL_BLEND);
-}
-
-static const char *view3d_get_name(View3D *v3d, RegionView3D *rv3d)
-{
-	const char *name = NULL;
-
-	switch (rv3d->view) {
-		case RV3D_VIEW_FRONT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Front Ortho");
-			else name = IFACE_("Front Persp");
-			break;
-		case RV3D_VIEW_BACK:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Back Ortho");
-			else name = IFACE_("Back Persp");
-			break;
-		case RV3D_VIEW_TOP:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Top Ortho");
-			else name = IFACE_("Top Persp");
-			break;
-		case RV3D_VIEW_BOTTOM:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Bottom Ortho");
-			else name = IFACE_("Bottom Persp");
-			break;
-		case RV3D_VIEW_RIGHT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Right Ortho");
-			else name = IFACE_("Right Persp");
 			break;
-		case RV3D_VIEW_LEFT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Left Ortho");
-			else name = IFACE_("Left Persp");
-			break;
-
+		/* We always need the stereo calculation for left and right cameras. */
+		case STEREO_LEFT_ID:
+		case STEREO_RIGHT_ID:
 		default:
-			if (rv3d->persp == RV3D_CAMOB) {
-				if ((v3d->camera) && (v3d->camera->type == OB_CAMERA)) {
-					Camera *cam;
-					cam = v3d->camera->data;
-					if (cam->type == CAM_PERSP) {
-						name = IFACE_("Camera Persp");
-					}
-					else if (cam->type == CAM_ORTHO) {
-						name = IFACE_("Camera Ortho");
-					}
-					else {
-						BLI_assert(cam->type == CAM_PANO);
-						name = IFACE_("Camera Pano");
-					}
-				}
-				else {
-					name = IFACE_("Object as Camera");
-				}
-			}
-			else {
-				name = (rv3d->persp == RV3D_ORTHO) ? IFACE_("User Ortho") : IFACE_("User Persp");
-			}
 			break;
 	}
-
-	return name;
+	return true;
 }
 
-static void draw_viewport_name(ARegion *ar, View3D *v3d, rcti *rect)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	const char *name = view3d_get_name(v3d, rv3d);
-	/* increase size for unicode languages (Chinese in utf-8...) */
-#ifdef WITH_INTERNATIONAL
-	char tmpstr[96];
-#else
-	char tmpstr[32];
-#endif
-
-	if (v3d->localvd) {
-		BLI_snprintf(tmpstr, sizeof(tmpstr), IFACE_("%s (Local)"), name);
-		name = tmpstr;
-	}
 
-	UI_ThemeColor(TH_TEXT_HI);
-#ifdef WITH_INTERNATIONAL
-	BLF_draw_default(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
-#else
-	BLF_draw_default_ascii(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
-#endif
-}
-
-/* draw info beside axes in bottom left-corner:
- * framenum, object name, bone name (if available), marker name (if available)
+/* setup the view and win matrices for the multiview cameras
+ *
+ * unlike view3d_stereo3d_setup_offscreen, when view3d_stereo3d_setup is called
+ * we have no winmatrix (i.e., projection matrix) defined at that time.
+ * Since the camera and the camera shift are needed for the winmat calculation
+ * we do a small hack to replace it temporarily so we don't need to change the
+ * view3d)main_region_setup_view() code to account for that.
  */
-
-static void draw_selected_name(Scene *scene, Object *ob, const rcti *rect)
+static void view3d_stereo3d_setup(
+        Depsgraph *depsgraph, Scene *scene, View3D *v3d, ARegion *ar, const rcti *rect)
 {
-	const int cfra = CFRA;
-	const char *msg_pin = " (Pinned)";
-	const char *msg_sep = " : ";
+	bool is_left;
+	const char *names[2] = { STEREO_LEFT_NAME, STEREO_RIGHT_NAME };
+	const char *viewname;
 
-	char info[300];
-	const char *markern;
-	char *s = info;
-	short offset = 1.5f * UI_UNIT_X + rect->xmin;
+	/* show only left or right camera */
+	if (v3d->stereo3d_camera != STEREO_3D_ID)
+		v3d->multiview_eye = v3d->stereo3d_camera;
 
-	s += sprintf(s, "(%d)", cfra);
+	is_left = v3d->multiview_eye == STEREO_LEFT_ID;
+	viewname = names[is_left ? STEREO_LEFT_ID : STEREO_RIGHT_ID];
 
-	/*
-	 * info can contain:
-	 * - a frame (7 + 2)
-	 * - 3 object names (MAX_NAME)
-	 * - 2 BREAD_CRUMB_SEPARATORs (6)
-	 * - a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1) - translated, so give some room!
-	 * - a marker name (MAX_NAME + 3)
-	 */
+	/* update the viewport matrices with the new camera */
+	if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
+		Camera *data;
+		float viewmat[4][4];
+		float shiftx;
 
-	/* get name of marker on current frame (if available) */
-	markern = BKE_scene_find_marker_name(scene, cfra);
+		data = (Camera *)v3d->camera->data;
+		shiftx = data->shiftx;
 
-	/* check if there is an object */
-	if (ob) {
-		*s++ = ' ';
-		s += BLI_strcpy_rlen(s, ob->id.name + 2);
+		BLI_thread_lock(LOCK_VIEW3D);
+		data->shiftx = BKE_camera_multiview_shift_x(&scene->r, v3d->camera, viewname);
 
-		/* name(s) to display depends on type of object */
-		if (ob->type == OB_ARMATURE) {
-			bArmature *arm = ob->data;
+		BKE_camera_multiview_view_matrix(&scene->r, v3d->camera, is_left, viewmat);
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, NULL, rect);
 
-			/* show name of active bone too (if possible) */
-			if (arm->edbo) {
-				if (arm->act_edbone) {
-					s += BLI_strcpy_rlen(s, msg_sep);
-					s += BLI_strcpy_rlen(s, arm->act_edbone->name);
-				}
-			}
-			else if (ob->mode & OB_MODE_POSE) {
-				if (arm->act_bone) {
+		data->shiftx = shiftx;
+		BLI_thread_unlock(LOCK_VIEW3D);
+	}
+	else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
+		float viewmat[4][4];
+		Object *view_ob = v3d->camera;
+		Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname);
 
-					if (arm->act_bone->layer & arm->layer) {
-						s += BLI_strcpy_rlen(s, msg_sep);
-						s += BLI_strcpy_rlen(s, arm->act_bone->name);
-					}
-				}
-			}
-		}
-		else if (ELEM(ob->type, OB_MESH, OB_LATTICE, OB_CURVE)) {
-			Key *key = NULL;
-			KeyBlock *kb = NULL;
+		BLI_thread_lock(LOCK_VIEW3D);
+		v3d->camera = camera;
 
-			/* try to display active bone and active shapekey too (if they exist) */
+		BKE_camera_multiview_view_matrix(&scene->r, camera, false, viewmat);
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, NULL, rect);
 
-			if (ob->type == OB_MESH && ob->mode & OB_MODE_WEIGHT_PAINT) {
-				Object *armobj = BKE_object_pose_armature_get(ob);
-				if (armobj  && armobj->mode & OB_MODE_POSE) {
-					bArmature *arm = armobj->data;
-					if (arm->act_bone) {
-						if (arm->act_bone->layer & arm->layer) {
-							s += BLI_strcpy_rlen(s, msg_sep);
-							s += BLI_strcpy_rlen(s, arm->act_bone->name);
-						}
-					}
-				}
-			}
+		v3d->camera = view_ob;
+		BLI_thread_unlock(LOCK_VIEW3D);
+	}
+}
 
-			key = BKE_key_from_object(ob);
-			if (key) {
-				kb = BLI_findlink(&key->block, ob->shapenr - 1);
-				if (kb) {
-					s += BLI_strcpy_rlen(s, msg_sep);
-					s += BLI_strcpy_rlen(s, kb->name);
-					if (ob->shapeflag & OB_SHAPE_LOCK) {
-						s += BLI_strcpy_rlen(s, IFACE_(msg_pin));
-					}
-				}
-			}
-		}
+/**
+ * Set the correct matrices
+ */
+void ED_view3d_draw_setup_view(
+        wmWindow *win, Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d,
+        float viewmat[4][4], float winmat[4][4], const rcti *rect)
+{
+	RegionView3D *rv3d = ar->regiondata;
 
-		/* color depends on whether there is a keyframe */
-		if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)cfra, ANIMFILTER_KEYS_LOCAL))
-			UI_ThemeColor(TH_TIME_KEYFRAME);
-		else if (ED_gpencil_has_keyframe_v3d(scene, ob, cfra))
-			UI_ThemeColor(TH_TIME_GP_KEYFRAME);
-		else
-			UI_ThemeColor(TH_TEXT_HI);
+	/* Setup the view matrix. */
+	if (view3d_stereo3d_active(win, scene, v3d, rv3d)) {
+		view3d_stereo3d_setup(depsgraph, scene, v3d, ar, rect);
 	}
 	else {
-		/* no object */
-		if (ED_gpencil_has_keyframe_v3d(scene, NULL, cfra))
-			UI_ThemeColor(TH_TIME_GP_KEYFRAME);
-		else
-			UI_ThemeColor(TH_TEXT_HI);
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, winmat, rect);
 	}
-
-	if (markern) {
-		s += sprintf(s, " <%s>", markern);
-	}
-
-	if (U.uiflag & USER_SHOW_ROTVIEWICON)
-		offset = U.widget_unit + (U.rvisize * 2) + rect->xmin;
-
-	BLF_draw_default(offset, 0.5f * U.widget_unit, 0.0f, info, sizeof(info));
 }
 
+/* ******************** view border ***************** */
+
 static void view3d_camera_border(
-        const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
+        const Scene *scene, struct Depsgraph *depsgraph,
+        const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
         rctf *r_viewborder, const bool no_shift, const bool no_zoom)
 {
 	CameraParams params;
 	rctf rect_view, rect_camera;
+	Object *camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
 
 	/* get viewport viewplane */
 	BKE_camera_params_init(&params);
-	BKE_camera_params_from_view3d(&params, v3d, rv3d);
+	BKE_camera_params_from_view3d(&params, depsgraph, v3d, rv3d);
 	if (no_zoom)
 		params.zoom = 1.0f;
 	BKE_camera_params_compute_viewplane(&params, ar->winx, ar->winy, 1.0f, 1.0f);
@@ -990,7 +317,7 @@ static void view3d_camera_border(
 	/* fallback for non camera objects */
 	params.clipsta = v3d->near;
 	params.clipend = v3d->far;
-	BKE_camera_params_from_object(&params, v3d->camera);
+	BKE_camera_params_from_object(&params, camera_eval);
 	if (no_shift) {
 		params.shiftx = 0.0f;
 		params.shifty = 0.0f;
@@ -1006,24 +333,26 @@ static void view3d_camera_border(
 }
 
 void ED_view3d_calc_camera_border_size(
-        const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
+        const Scene *scene, Depsgraph *depsgraph,
+        const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
         float r_size[2])
 {
 	rctf viewborder;
 
-	view3d_camera_border(scene, ar, v3d, rv3d, &viewborder, true, true);
+	view3d_camera_border(scene, depsgraph, ar, v3d, rv3d, &viewborder, true, true);
 	r_size[0] = BLI_rctf_size_x(&viewborder);
 	r_size[1] = BLI_rctf_size_y(&viewborder);
 }
 
 void ED_view3d_calc_camera_border(
-        const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
+        const Scene *scene, Depsgraph *depsgraph,
+        const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
         rctf *r_viewborder, const bool no_shift)
 {
-	view3d_camera_border(scene, ar, v3d, rv3d, r_viewborder, no_shift, false);
+	view3d_camera_border(scene, depsgraph, ar, v3d, rv3d, r_viewborder, no_shift, false);
 }
 
-static void drawviewborder_grid3(float x1, float x2, float y1, float y2, float fac)
+static void drawviewborder_grid3(uint shdr_pos, float x1, float x2, float y1, float y2, float fac)
 {
 	float x3, y3, x4, y4;
 
@@ -1032,29 +361,33 @@ static void drawviewborder_grid3(float x1, float x2, float y1, float y2, float f
 	x4 = x1 + (1.0f - fac) * (x2 - x1);
 	y4 = y1 + (1.0f - fac) * (y2 - y1);
 
-	glBegin(GL_LINES);
-	glVertex2f(x1, y3);
-	glVertex2f(x2, y3);
+	immBegin(GWN_PRIM_LINES, 8);
+
+	immVertex2f(shdr_pos, x1, y3);
+	immVertex2f(shdr_pos, x2, y3);
+
+	immVertex2f(shdr_pos, x1, y4);
+	immVertex2f(shdr_pos, x2, y4);
 
-	glVertex2f(x1, y4);
-	glVertex2f(x2, y4);
+	immVertex2f(shdr_pos, x3, y1);
+	immVertex2f(shdr_pos, x3, y2);
 
-	glVertex2f(x3, y1);
-	glVertex2f(x3, y2);
+	immVertex2f(shdr_pos, x4, y1);
+	immVertex2f(shdr_pos, x4, y2);
 
-	glVertex2f(x4, y1);
-	glVertex2f(x4, y2);
-	glEnd();
+	immEnd();
 }
 
 /* harmonious triangle */
-static void drawviewborder_triangle(float x1, float x2, float y1, float y2, const char golden, const char dir)
+static void drawviewborder_triangle(
+        uint shdr_pos, float x1, float x2, float y1, float y2, const char golden, const char dir)
 {
 	float ofs;
 	float w = x2 - x1;
 	float h = y2 - y1;
 
-	glBegin(GL_LINES);
+	immBegin(GWN_PRIM_LINES, 6);
+
 	if (w > h) {
 		if (golden) {
 			ofs = w * (1.0f - (1.0f / 1.61803399f));
@@ -1064,14 +397,14 @@ static void drawviewborder_triangle(float x1, float x2, float y1, float y2, cons
 		}
 		if (dir == 'B') SWAP(float, y1, y2);
 
-		glVertex2f(x1, y1);
-		glVertex2f(x2, y2);
+		immVertex2f(shdr_pos, x1, y1);
+		immVertex2f(shdr_pos, x2, y2);
 
-		glVertex2f(x2, y1);
-		glVertex2f(x1 + (w - ofs), y2);
+		immVertex2f(shdr_pos, x2, y1);
+		immVertex2f(shdr_pos, x1 + (w - ofs), y2);
 
-		glVertex2f(x1, y2);
-		glVertex2f(x1 + ofs, y1);
+		immVertex2f(shdr_pos, x1, y2);
+		immVertex2f(shdr_pos, x1 + ofs, y1);
 	}
 	else {
 		if (golden) {
@@ -1082,19 +415,20 @@ static void drawviewborder_triangle(float x1, float x2, float y1, float y2, cons
 		}
 		if (dir == 'B') SWAP(float, x1, x2);
 
-		glVertex2f(x1, y1);
-		glVertex2f(x2, y2);
+		immVertex2f(shdr_pos, x1, y1);
+		immVertex2f(shdr_pos, x2, y2);
 
-		glVertex2f(x2, y1);
-		glVertex2f(x1, y1 + ofs);
+		immVertex2f(shdr_pos, x2, y1);
+		immVertex2f(shdr_pos, x1, y1 + ofs);
 
-		glVertex2f(x1, y2);
-		glVertex2f(x2, y1 + (h - ofs));
+		immVertex2f(shdr_pos, x1, y2);
+		immVertex2f(shdr_pos, x2, y1 + (h - ofs));
 	}
-	glEnd();
+
+	immEnd();
 }
 
-static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
+static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View3D *v3d)
 {
 	float x1, x2, y1, y2;
 	float x1i, x2i, y1i, y2i;
@@ -1108,7 +442,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 	if (v3d->camera->type == OB_CAMERA)
 		ca = v3d->camera->data;
 
-	ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, false);
+	ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &viewborder, false);
 	/* the offsets */
 	x1 = viewborder.xmin;
 	y1 = viewborder.ymin;
@@ -1129,56 +463,74 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 	x2i = (int)(x2 + (1.0f - 0.0001f));
 	y2i = (int)(y2 + (1.0f - 0.0001f));
 
-	/* passepartout, specified in camera edit buttons */
-	if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT) && ca->passepartalpha > 0.000001f) {
-		const float winx = (ar->winx + 1);
-		const float winy = (ar->winy + 1);
+	uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-		if (ca->passepartalpha == 1.0f) {
-			glColor3f(0, 0, 0);
-		}
-		else {
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glEnable(GL_BLEND);
-			glColor4f(0, 0, 0, ca->passepartalpha);
-		}
+	/* First, solid lines. */
+	{
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		if (x1i > 0.0f)
-			glRectf(0.0, winy, x1i, 0.0);
-		if (x2i < winx)
-			glRectf(x2i, winy, winx, 0.0);
-		if (y2i < winy)
-			glRectf(x1i, winy, x2i, y2i);
-		if (y2i > 0.0f)
-			glRectf(x1i, y1i, x2i, 0.0);
+		/* passepartout, specified in camera edit buttons */
+		if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT) && ca->passepartalpha > 0.000001f) {
+			const float winx = (ar->winx + 1);
+			const float winy = (ar->winy + 1);
 
-		glDisable(GL_BLEND);
-	}
+			float alpha = 1.0f;
+
+			if (ca->passepartalpha != 1.0f) {
+				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+				glEnable(GL_BLEND);
+				alpha = ca->passepartalpha;
+			}
+
+			immUniformColor4f(0.0f, 0.0f, 0.0f, alpha);
 
-	setlinestyle(0);
+			if (x1i > 0.0f)
+				immRectf(shdr_pos, 0.0f, winy, x1i, 0.0f);
+			if (x2i < winx)
+				immRectf(shdr_pos, x2i, winy, winx, 0.0f);
+			if (y2i < winy)
+				immRectf(shdr_pos, x1i, winy, x2i, y2i);
+			if (y2i > 0.0f)
+				immRectf(shdr_pos, x1i, y1i, x2i, 0.0f);
 
-	UI_ThemeColor(TH_BACK);
+			glDisable(GL_BLEND);
+		}
 
-	fdrawbox(x1i, y1i, x2i, y2i);
+		immUniformThemeColor(TH_BACK);
+		imm_draw_box_wire_2d(shdr_pos, x1i, y1i, x2i, y2i);
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
-	if (view3d_camera_border_hack_test == true) {
-		glColor3ubv(view3d_camera_border_hack_col);
-		fdrawbox(x1i + 1, y1i + 1, x2i - 1, y2i - 1);
-		view3d_camera_border_hack_test = false;
-	}
+		if (view3d_camera_border_hack_test == true) {
+			immUniformColor3ubv(view3d_camera_border_hack_col);
+			imm_draw_box_wire_2d(shdr_pos, x1i + 1, y1i + 1, x2i - 1, y2i - 1);
+			view3d_camera_border_hack_test = false;
+		}
 #endif
 
-	setlinestyle(3);
-
-	/* outer line not to confuse with object selecton */
-	if (v3d->flag2 & V3D_LOCK_CAMERA) {
-		UI_ThemeColor(TH_REDALERT);
-		fdrawbox(x1i - 1, y1i - 1, x2i + 1, y2i + 1);
+		immUnbindProgram();
 	}
 
-	UI_ThemeColor(TH_VIEW_OVERLAY);
-	fdrawbox(x1i, y1i, x2i, y2i);
+	/* And now, the dashed lines! */
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	{
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+		immUniform1i("num_colors", 0);  /* "simple" mode */
+		immUniform1f("dash_width", 6.0f);
+		immUniform1f("dash_factor", 0.5f);
+
+		/* outer line not to confuse with object selection */
+		if (v3d->flag2 & V3D_LOCK_CAMERA) {
+			immUniformThemeColor(TH_REDALERT);
+			imm_draw_box_wire_2d(shdr_pos, x1i - 1, y1i - 1, x2i + 1, y2i + 1);
+		}
+
+		immUniformThemeColor(TH_VIEW_OVERLAY);
+		imm_draw_box_wire_2d(shdr_pos, x1i, y1i, x2i, y2i);
+	}
 
 	/* border */
 	if (scene->r.mode & R_BORDER) {
@@ -1189,82 +541,76 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 		x4 = floorf(x1 + (scene->r.border.xmax * (x2 - x1))) + (U.pixelsize - 1);
 		y4 = floorf(y1 + (scene->r.border.ymax * (y2 - y1))) + (U.pixelsize - 1);
 
-		cpack(0x4040FF);
-		sdrawbox(x3,  y3,  x4,  y4);
+		immUniformColor3f(1.0f, 0.25f, 0.25f);
+		imm_draw_box_wire_2d(shdr_pos, x3, y3, x4, y4);
 	}
 
 	/* safety border */
 	if (ca) {
+		immUniformThemeColorBlend(TH_VIEW_OVERLAY, TH_BACK, 0.25f);
+
 		if (ca->dtx & CAM_DTX_CENTER) {
 			float x3, y3;
 
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-
 			x3 = x1 + 0.5f * (x2 - x1);
 			y3 = y1 + 0.5f * (y2 - y1);
 
-			glBegin(GL_LINES);
-			glVertex2f(x1, y3);
-			glVertex2f(x2, y3);
+			immBegin(GWN_PRIM_LINES, 4);
 
-			glVertex2f(x3, y1);
-			glVertex2f(x3, y2);
-			glEnd();
+			immVertex2f(shdr_pos, x1, y3);
+			immVertex2f(shdr_pos, x2, y3);
+
+			immVertex2f(shdr_pos, x3, y1);
+			immVertex2f(shdr_pos, x3, y2);
+
+			immEnd();
 		}
 
 		if (ca->dtx & CAM_DTX_CENTER_DIAG) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
+			immBegin(GWN_PRIM_LINES, 4);
 
-			glBegin(GL_LINES);
-			glVertex2f(x1, y1);
-			glVertex2f(x2, y2);
+			immVertex2f(shdr_pos, x1, y1);
+			immVertex2f(shdr_pos, x2, y2);
 
-			glVertex2f(x1, y2);
-			glVertex2f(x2, y1);
-			glEnd();
+			immVertex2f(shdr_pos, x1, y2);
+			immVertex2f(shdr_pos, x2, y1);
+
+			immEnd();
 		}
 
 		if (ca->dtx & CAM_DTX_THIRDS) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_grid3(x1, x2, y1, y2, 1.0f / 3.0f);
+			drawviewborder_grid3(shdr_pos, x1, x2, y1, y2, 1.0f / 3.0f);
 		}
 
 		if (ca->dtx & CAM_DTX_GOLDEN) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_grid3(x1, x2, y1, y2, 1.0f - (1.0f / 1.61803399f));
+			drawviewborder_grid3(shdr_pos, x1, x2, y1, y2, 1.0f - (1.0f / 1.61803399f));
 		}
 
 		if (ca->dtx & CAM_DTX_GOLDEN_TRI_A) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_triangle(x1, x2, y1, y2, 0, 'A');
+			drawviewborder_triangle(shdr_pos, x1, x2, y1, y2, 0, 'A');
 		}
 
 		if (ca->dtx & CAM_DTX_GOLDEN_TRI_B) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_triangle(x1, x2, y1, y2, 0, 'B');
+			drawviewborder_triangle(shdr_pos, x1, x2, y1, y2, 0, 'B');
 		}
 
 		if (ca->dtx & CAM_DTX_HARMONY_TRI_A) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_triangle(x1, x2, y1, y2, 1, 'A');
+			drawviewborder_triangle(shdr_pos, x1, x2, y1, y2, 1, 'A');
 		}
 
 		if (ca->dtx & CAM_DTX_HARMONY_TRI_B) {
-			UI_ThemeColorBlendShade(TH_VIEW_OVERLAY, TH_BACK, 0.25, 0);
-			drawviewborder_triangle(x1, x2, y1, y2, 1, 'B');
+			drawviewborder_triangle(shdr_pos, x1, x2, y1, y2, 1, 'B');
 		}
 
 		if (ca->flag & CAM_SHOW_SAFE_MARGINS) {
 			UI_draw_safe_areas(
-			        x1, x2, y1, y2,
-			        scene->safe_areas.title,
-			        scene->safe_areas.action);
+			        shdr_pos, x1, x2, y1, y2,
+			        scene->safe_areas.title, scene->safe_areas.action);
 
 			if (ca->flag & CAM_SHOW_SAFE_CENTER) {
 				UI_draw_safe_areas(
-				        x1, x2, y1, y2,
-				        scene->safe_areas.title_center,
-				        scene->safe_areas.action_center);
+				        shdr_pos, x1, x2, y1, y2,
+				        scene->safe_areas.title_center, scene->safe_areas.action_center);
 			}
 		}
 
@@ -1300,1891 +646,683 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 			}
 
 			/* draw */
-			UI_ThemeColorShade(TH_VIEW_OVERLAY, 100);
-			UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 2.0f);
+			immUniformThemeColorShade(TH_VIEW_OVERLAY, 100);
+
+			/* TODO Was using UI_draw_roundbox_4fv(false, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 2.0f, color).
+			 * We'll probably need a new imm_draw_line_roundbox_dashed dor that - though in practice the
+			 * 2.0f round corner effect was nearly not visible anyway... */
+			imm_draw_box_wire_2d(shdr_pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 		}
 	}
 
-	setlinestyle(0);
+	immUnbindProgram();
+	/* end dashed lines */
 
 	/* camera name - draw in highlighted text color */
 	if (ca && (ca->flag & CAM_SHOWNAME)) {
-		UI_ThemeColor(TH_TEXT_HI);
+		UI_FontThemeColor(BLF_default(), TH_TEXT_HI);
 		BLF_draw_default(
 		        x1i, y1i - (0.7f * U.widget_unit), 0.0f,
 		        v3d->camera->id.name + 2, sizeof(v3d->camera->id.name) - 2);
 	}
 }
 
-/* *********************** backdraw for selection *************** */
-
-static void backdrawview3d(Scene *scene, wmWindow *win, ARegion *ar, View3D *v3d, Object *obact, Object *obedit)
+static void drawrenderborder(ARegion *ar, View3D *v3d)
 {
-	RegionView3D *rv3d = ar->regiondata;
-	int multisample_enabled;
+	/* use the same program for everything */
+	uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	BLI_assert(ar->regiontype == RGN_TYPE_WINDOW);
+	glLineWidth(1.0f);
 
-	if (obact && (obact->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) ||
-	             BKE_paint_select_face_test(obact)))
-	{
-		/* do nothing */
-	}
-	/* texture paint mode sampling */
-	else if (obact && (obact->mode & OB_MODE_TEXTURE_PAINT) &&
-	         (v3d->drawtype > OB_WIRE))
-	{
-		/* do nothing */
-	}
-	else if ((obact && (obact->mode & OB_MODE_PARTICLE_EDIT)) &&
-	         V3D_IS_ZBUF(v3d))
-	{
-		/* do nothing */
-	}
-	else if (obedit &&
-	         V3D_IS_ZBUF(v3d))
-	{
-		/* do nothing */
-	}
-	else {
-		v3d->flag &= ~V3D_INVALID_BACKBUF;
-		return;
-	}
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-	if (!(v3d->flag & V3D_INVALID_BACKBUF))
-		return;
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
 
-#if 0
-	if (test) {
-		if (qtest()) {
-			addafterqueue(ar->win, BACKBUFDRAW, 1);
-			return;
-		}
-	}
-#endif
-
-	if (v3d->drawtype > OB_WIRE) v3d->zbuf = true;
-
-	/* dithering and AA break color coding, so disable */
-	glDisable(GL_DITHER);
+	immUniform1i("num_colors", 0);  /* "simple" mode */
+	immUniform4f("color", 1.0f, 0.25f, 0.25f, 1.0f);
+	immUniform1f("dash_width", 6.0f);
+	immUniform1f("dash_factor", 0.5f);
 
-	multisample_enabled = glIsEnabled(GL_MULTISAMPLE);
-	if (multisample_enabled)
-		glDisable(GL_MULTISAMPLE);
+	imm_draw_box_wire_2d(shdr_pos,
+	                  v3d->render_border.xmin * ar->winx, v3d->render_border.ymin * ar->winy,
+	                  v3d->render_border.xmax * ar->winx, v3d->render_border.ymax * ar->winy);
 
-	if (win->multisamples != USER_MULTISAMPLE_NONE) {
-		/* for multisample we use an offscreen FBO. multisample drawing can fail
-		 * with color coded selection drawing, and reading back depths from such
-		 * a buffer can also cause a few seconds freeze on OS X / NVidia. */
-		int w = BLI_rcti_size_x(&ar->winrct);
-		int h = BLI_rcti_size_y(&ar->winrct);
-		char error[256];
+	immUnbindProgram();
+}
 
-		if (rv3d->gpuoffscreen) {
-			if (GPU_offscreen_width(rv3d->gpuoffscreen)  != w ||
-			    GPU_offscreen_height(rv3d->gpuoffscreen) != h)
-			{
-				GPU_offscreen_free(rv3d->gpuoffscreen);
-				rv3d->gpuoffscreen = NULL;
-			}
-		}
+void ED_view3d_draw_depth(
+        Depsgraph *depsgraph,
+        ARegion *ar, View3D *v3d, bool alphaoverride)
+{
+	struct bThemeState theme_state;
+	Scene *scene = DEG_get_evaluated_scene(depsgraph);
+	RegionView3D *rv3d = ar->regiondata;
 
-		if (!rv3d->gpuoffscreen) {
-			rv3d->gpuoffscreen = GPU_offscreen_create(w, h, 0, error);
+	short zbuf = v3d->zbuf;
+	short flag = v3d->flag;
+	float glalphaclip = U.glalphaclip;
+	int obcenter_dia = U.obcenter_dia;
+	/* temp set drawtype to solid */
+	/* Setting these temporarily is not nice */
+	v3d->flag &= ~V3D_SELECT_OUTLINE;
+	U.glalphaclip = alphaoverride ? 0.5f : glalphaclip; /* not that nice but means we wont zoom into billboards */
+	U.obcenter_dia = 0;
 
-			if (!rv3d->gpuoffscreen)
-				fprintf(stderr, "Failed to create offscreen selection buffer for multisample: %s\n", error);
-		}
-	}
+	/* Tools may request depth outside of regular drawing code. */
+	UI_Theme_Store(&theme_state);
+	UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
 
-	if (rv3d->gpuoffscreen)
-		GPU_offscreen_bind(rv3d->gpuoffscreen, true);
-	else
-		glScissor(ar->winrct.xmin, ar->winrct.ymin, BLI_rcti_size_x(&ar->winrct), BLI_rcti_size_y(&ar->winrct));
+	ED_view3d_draw_setup_view(NULL, depsgraph, scene, ar, v3d, NULL, NULL, NULL);
 
-	glClearColor(0.0, 0.0, 0.0, 0.0);
-	if (v3d->zbuf) {
-		glEnable(GL_DEPTH_TEST);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	}
-	else {
-		glClear(GL_COLOR_BUFFER_BIT);
-		glDisable(GL_DEPTH_TEST);
-	}
+	glClear(GL_DEPTH_BUFFER_BIT);
 
-	if (rv3d->rflag & RV3D_CLIPPING)
+	if (rv3d->rflag & RV3D_CLIPPING) {
 		ED_view3d_clipping_set(rv3d);
-
-	G.f |= G_BACKBUFSEL;
-
-	if (obact && (obact->lay & v3d->lay)) {
-		draw_object_backbufsel(scene, v3d, rv3d, obact);
 	}
+	/* get surface depth without bias */
+	rv3d->rflag |= RV3D_ZOFFSET_DISABLED;
 
-	if (rv3d->gpuoffscreen)
-		GPU_offscreen_unbind(rv3d->gpuoffscreen, true);
-	else
-		ar->swap = 0; /* mark invalid backbuf for wm draw */
-
-	v3d->flag &= ~V3D_INVALID_BACKBUF;
+	v3d->zbuf = true;
+	glEnable(GL_DEPTH_TEST);
 
-	G.f &= ~G_BACKBUFSEL;
-	v3d->zbuf = false;
-	glDisable(GL_DEPTH_TEST);
-	glEnable(GL_DITHER);
-	if (multisample_enabled)
-		glEnable(GL_MULTISAMPLE);
+	DRW_draw_depth_loop(depsgraph, ar, v3d);
 
-	if (rv3d->rflag & RV3D_CLIPPING)
+	if (rv3d->rflag & RV3D_CLIPPING) {
 		ED_view3d_clipping_disable();
-}
-
-void view3d_opengl_read_pixels(ARegion *ar, int x, int y, int w, int h, int format, int type, void *data)
-{
-	RegionView3D *rv3d = ar->regiondata;
-
-	if (rv3d->gpuoffscreen) {
-		GPU_offscreen_bind(rv3d->gpuoffscreen, true);
-		glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
-		glReadPixels(x, y, w, h, format, type, data);
-		GPU_offscreen_unbind(rv3d->gpuoffscreen, true);
 	}
-	else {
-		glReadPixels(ar->winrct.xmin + x, ar->winrct.ymin + y, w, h, format, type, data);
-	}
-}
+	rv3d->rflag &= ~RV3D_ZOFFSET_DISABLED;
 
-/* XXX depth reading exception, for code not using gpu offscreen */
-static void view3d_opengl_read_Z_pixels(ARegion *ar, int x, int y, int w, int h, int format, int type, void *data)
-{
+	v3d->zbuf = zbuf;
+	if (!v3d->zbuf) glDisable(GL_DEPTH_TEST);
 
-	glReadPixels(ar->winrct.xmin + x, ar->winrct.ymin + y, w, h, format, type, data);
-}
+	U.glalphaclip = glalphaclip;
+	v3d->flag = flag;
+	U.obcenter_dia = obcenter_dia;
 
-void ED_view3d_backbuf_validate(ViewContext *vc)
-{
-	if (vc->v3d->flag & V3D_INVALID_BACKBUF) {
-		backdrawview3d(vc->scene, vc->win, vc->ar, vc->v3d, vc->obact, vc->obedit);
-	}
+	UI_Theme_Restore(&theme_state);
 }
 
-/**
- * allow for small values [0.5 - 2.5],
- * and large values, FLT_MAX by clamping by the area size
- */
-int ED_view3d_backbuf_sample_size_clamp(ARegion *ar, const float dist)
-{
-	return (int)min_ff(ceilf(dist), (float)max_ii(ar->winx, ar->winx));
-}
+/* ******************** other elements ***************** */
 
-/* samples a single pixel (copied from vpaint) */
-unsigned int ED_view3d_backbuf_sample(ViewContext *vc, int x, int y)
+/** could move this elsewhere, but tied into #ED_view3d_grid_scale */
+float ED_scene_grid_scale(Scene *scene, const char **grid_unit)
 {
-	unsigned int col;
-
-	if (x >= vc->ar->winx || y >= vc->ar->winy) {
-		return 0;
-	}
-
-	ED_view3d_backbuf_validate(vc);
+	/* apply units */
+	if (scene->unit.system) {
+		const void *usys;
+		int len;
 
-	view3d_opengl_read_pixels(vc->ar, x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &col);
-	glReadBuffer(GL_BACK);
+		bUnit_GetSystem(scene->unit.system, B_UNIT_LENGTH, &usys, &len);
 
-	if (ENDIAN_ORDER == B_ENDIAN) {
-		BLI_endian_switch_uint32(&col);
+		if (usys) {
+			int i = bUnit_GetBaseUnit(usys);
+			if (grid_unit)
+				*grid_unit = bUnit_GetNameDisplay(usys, i);
+			return (float)bUnit_GetScaler(usys, i) / scene->unit.scale_length;
+		}
 	}
 
-	return GPU_select_to_index(col);
+	return 1.0f;
 }
 
-/* reads full rect, converts indices */
-ImBuf *ED_view3d_backbuf_read(ViewContext *vc, int xmin, int ymin, int xmax, int ymax)
+float ED_view3d_grid_scale(Scene *scene, View3D *v3d, const char **grid_unit)
 {
-	struct ImBuf *ibuf_clip;
-	/* clip */
-	const rcti clip = {
-	    max_ii(xmin, 0), min_ii(xmax, vc->ar->winx - 1),
-	    max_ii(ymin, 0), min_ii(ymax, vc->ar->winy - 1)};
-	const int size_clip[2] = {
-	    BLI_rcti_size_x(&clip) + 1,
-	    BLI_rcti_size_y(&clip) + 1};
-
-	if (UNLIKELY((clip.xmin > clip.xmax) ||
-	             (clip.ymin > clip.ymax)))
-	{
-		return NULL;
-	}
+	return v3d->grid * ED_scene_grid_scale(scene, grid_unit);
+}
 
-	ibuf_clip = IMB_allocImBuf(size_clip[0], size_clip[1], 32, IB_rect);
+static void draw_view_axis(RegionView3D *rv3d, const rcti *rect)
+{
+	const float k = U.rvisize * U.pixelsize;  /* axis size */
+	const int bright = - 20 * (10 - U.rvibright);  /* axis alpha offset (rvibright has range 0-10) */
 
-	ED_view3d_backbuf_validate(vc);
+	const float startx = rect->xmin + k + 1.0f;  /* axis center in screen coordinates, x=y */
+	const float starty = rect->ymin + k + 1.0f;
 
-	view3d_opengl_read_pixels(vc->ar, clip.xmin, clip.ymin, size_clip[0], size_clip[1], GL_RGBA, GL_UNSIGNED_BYTE, ibuf_clip->rect);
+	float axis_pos[3][2];
+	unsigned char axis_col[3][4];
 
-	glReadBuffer(GL_BACK);
+	int axis_order[3] = {0, 1, 2};
+	axis_sort_v3(rv3d->viewinv[2], axis_order);
 
-	if (ENDIAN_ORDER == B_ENDIAN) {
-		IMB_convert_rgba_to_abgr(ibuf_clip);
-	}
+	for (int axis_i = 0; axis_i < 3; axis_i++) {
+		int i = axis_order[axis_i];
 
-	GPU_select_to_index_array(ibuf_clip->rect, size_clip[0] * size_clip[1]);
+		/* get position of each axis tip on screen */
+		float vec[3] = { 0.0f };
+		vec[i] = 1.0f;
+		mul_qt_v3(rv3d->viewquat, vec);
+		axis_pos[i][0] = startx + vec[0] * k;
+		axis_pos[i][1] = starty + vec[1] * k;
 
-	if ((clip.xmin == xmin) &&
-	    (clip.xmax == xmax) &&
-	    (clip.ymin == ymin) &&
-	    (clip.ymax == ymax))
-	{
-		return ibuf_clip;
+		/* get color of each axis */
+		UI_GetThemeColorShade3ubv(TH_AXIS_X + i, bright, axis_col[i]); /* rgb */
+		axis_col[i][3] = 255 * hypotf(vec[0], vec[1]); /* alpha */
 	}
-	else {
-		/* put clipped result into a non-clipped buffer */
-		struct ImBuf *ibuf_full;
-		const int size[2] = {
-		    (xmax - xmin + 1),
-		    (ymax - ymin + 1)};
-
-		ibuf_full = IMB_allocImBuf(size[0], size[1], 32, IB_rect);
-
-		IMB_rectcpy(
-		        ibuf_full, ibuf_clip,
-		        clip.xmin - xmin, clip.ymin - ymin,
-		        0, 0,
-		        size_clip[0], size_clip[1]);
-		IMB_freeImBuf(ibuf_clip);
-		return ibuf_full;
-	}
-}
 
-/**
- * Smart function to sample a rectangle spiral ling outside, nice for backbuf selection
- */
-uint ED_view3d_backbuf_sample_rect(
-        ViewContext *vc, const int mval[2], int size,
-        unsigned int min, unsigned int max, float *r_dist)
-{
-	struct ImBuf *buf;
-	const unsigned int *bufmin, *bufmax, *tbuf;
-	int minx, miny;
-	int a, b, rc, nr, amount, dirvec[4][2];
-	unsigned int index = 0;
-
-	amount = (size - 1) / 2;
-
-	minx = mval[0] - (amount + 1);
-	miny = mval[1] - (amount + 1);
-	buf = ED_view3d_backbuf_read(vc, minx, miny, minx + size - 1, miny + size - 1);
-	if (!buf) return 0;
-
-	rc = 0;
-
-	dirvec[0][0] = 1; dirvec[0][1] = 0;
-	dirvec[1][0] = 0; dirvec[1][1] = -size;
-	dirvec[2][0] = -1; dirvec[2][1] = 0;
-	dirvec[3][0] = 0; dirvec[3][1] = size;
-
-	bufmin = buf->rect;
-	tbuf = buf->rect;
-	bufmax = buf->rect + size * size;
-	tbuf += amount * size + amount;
-
-	for (nr = 1; nr <= size; nr++) {
-
-		for (a = 0; a < 2; a++) {
-			for (b = 0; b < nr; b++) {
-				if (*tbuf && *tbuf >= min && *tbuf < max) {
-					/* we got a hit */
-
-					/* get x,y pixel coords from the offset
-					 * (manhatten distance in keeping with other screen-based selection) */
-					*r_dist = (float)(
-					        abs(((int)(tbuf - buf->rect) % size) - (size / 2)) +
-					        abs(((int)(tbuf - buf->rect) / size) - (size / 2)));
-
-					/* indices start at 1 here */
-					index = (*tbuf - min) + 1;
-					goto exit;
-				}
-
-				tbuf += (dirvec[rc][0] + dirvec[rc][1]);
+	/* draw axis lines */
+	glLineWidth(2.0f);
+	glEnable(GL_LINE_SMOOTH);
+	glEnable(GL_BLEND);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-				if (tbuf < bufmin || tbuf >= bufmax) {
-					goto exit;
-				}
-			}
-			rc++;
-			rc &= 3;
-		}
-	}
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
 
-exit:
-	IMB_freeImBuf(buf);
-	return index;
-}
+	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+	immBegin(GWN_PRIM_LINES, 6);
 
+	for (int axis_i = 0; axis_i < 3; axis_i++) {
+		int i = axis_order[axis_i];
 
-/* ************************************************************* */
+		immAttrib4ubv(col, axis_col[i]);
+		immVertex2f(pos, startx, starty);
+		immAttrib4ubv(col, axis_col[i]);
+		immVertex2fv(pos, axis_pos[i]);
+	}
 
-static void view3d_stereo_bgpic_setup(Scene *scene, View3D *v3d, Image *ima, ImageUser *iuser)
-{
-	if (BKE_image_is_stereo(ima)) {
-		iuser->flag |= IMA_SHOW_STEREO;
+	immEnd();
+	immUnbindProgram();
+	glDisable(GL_LINE_SMOOTH);
 
-		if ((scene->r.scemode & R_MULTIVIEW) == 0) {
-			iuser->multiview_eye = STEREO_LEFT_ID;
-		}
-		else if (v3d->stereo3d_camera != STEREO_3D_ID) {
-			/* show only left or right camera */
-			iuser->multiview_eye = v3d->stereo3d_camera;
-		}
+	/* draw axis names */
+	for (int axis_i = 0; axis_i < 3; axis_i++) {
+		int i = axis_order[axis_i];
 
-		BKE_image_multiview_index(ima, iuser);
-	}
-	else {
-		iuser->flag &= ~IMA_SHOW_STEREO;
+		const char axis_text[2] = {'x' + i, '\0'};
+		BLF_color4ubv(BLF_default(), axis_col[i]);
+		BLF_draw_default_ascii(axis_pos[i][0] + 2, axis_pos[i][1] + 2, 0.0f, axis_text, 1);
 	}
 }
 
-static void view3d_draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d,
-                              const bool do_foreground, const bool do_camera_frame)
+#ifdef WITH_INPUT_NDOF
+/* draw center and axis of rotation for ongoing 3D mouse navigation */
+static void UNUSED_FUNCTION(draw_rotation_guide)(RegionView3D *rv3d)
 {
-	RegionView3D *rv3d = ar->regiondata;
-	BGpic *bgpic;
-	int fg_flag = do_foreground ? V3D_BGPIC_FOREGROUND : 0;
-
-	for (bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
-		bgpic->iuser.scene = scene;  /* Needed for render results. */
-
-		if ((bgpic->flag & V3D_BGPIC_FOREGROUND) != fg_flag)
-			continue;
-
-		if ((bgpic->view == 0) || /* zero for any */
-		    (bgpic->view & (1 << rv3d->view)) || /* check agaist flags */
-		    (rv3d->persp == RV3D_CAMOB && bgpic->view == (1 << RV3D_VIEW_CAMERA)))
-		{
-			float image_aspect[2];
-			float fac, asp, zoomx, zoomy;
-			float x1, y1, x2, y2, centx, centy;
-
-			ImBuf *ibuf = NULL, *freeibuf, *releaseibuf;
-			void *lock;
-			rctf clip_rect;
-
-			Image *ima = NULL;
-			MovieClip *clip = NULL;
-
-			/* disable individual images */
-			if ((bgpic->flag & V3D_BGPIC_DISABLED))
-				continue;
-
-			freeibuf = NULL;
-			releaseibuf = NULL;
-			if (bgpic->source == V3D_BGPIC_IMAGE) {
-				ima = bgpic->ima;
-				if (ima == NULL)
-					continue;
-				BKE_image_user_frame_calc(&bgpic->iuser, CFRA, 0);
-				if (ima->source == IMA_SRC_SEQUENCE && !(bgpic->iuser.flag & IMA_USER_FRAME_IN_RANGE)) {
-					ibuf = NULL; /* frame is out of range, dont show */
-				}
-				else {
-					view3d_stereo_bgpic_setup(scene, v3d, ima, &bgpic->iuser);
-					ibuf = BKE_image_acquire_ibuf(ima, &bgpic->iuser, &lock);
-					releaseibuf = ibuf;
-				}
-
-				image_aspect[0] = ima->aspx;
-				image_aspect[1] = ima->aspy;
-			}
-			else if (bgpic->source == V3D_BGPIC_MOVIE) {
-				/* TODO: skip drawing when out of frame range (as image sequences do above) */
-
-				if (bgpic->flag & V3D_BGPIC_CAMERACLIP) {
-					if (scene->camera)
-						clip = BKE_object_movieclip_get(scene, scene->camera, true);
-				}
-				else {
-					clip = bgpic->clip;
-				}
-
-				if (clip == NULL)
-					continue;
-
-				BKE_movieclip_user_set_frame(&bgpic->cuser, CFRA);
-				ibuf = BKE_movieclip_get_ibuf(clip, &bgpic->cuser);
-
-				image_aspect[0] = clip->aspx;
-				image_aspect[1] = clip->aspy;
-
-				/* working with ibuf from image and clip has got different workflow now.
-				 * ibuf acquired from clip is referenced by cache system and should
-				 * be dereferenced after usage. */
-				freeibuf = ibuf;
-			}
-			else {
-				/* perhaps when loading future files... */
-				BLI_assert(0);
-				copy_v2_fl(image_aspect, 1.0f);
-			}
+	float o[3];    /* center of rotation */
+	float end[3];  /* endpoints for drawing */
 
-			if (ibuf == NULL)
-				continue;
+	GLubyte color[4] = {0, 108, 255, 255};  /* bright blue so it matches device LEDs */
 
-			if ((ibuf->rect == NULL && ibuf->rect_float == NULL) || ibuf->channels != 4) { /* invalid image format */
-				if (freeibuf)
-					IMB_freeImBuf(freeibuf);
-				if (releaseibuf)
-					BKE_image_release_ibuf(ima, releaseibuf, lock);
+	negate_v3_v3(o, rv3d->ofs);
 
-				continue;
-			}
+	glEnable(GL_BLEND);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	glDepthMask(GL_FALSE);  /* don't overwrite zbuf */
 
-			if (ibuf->rect == NULL)
-				IMB_rect_from_float(ibuf);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	unsigned int col = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
 
-			if (rv3d->persp == RV3D_CAMOB) {
+	immBindBuiltinProgram(GPU_SHADER_3D_SMOOTH_COLOR);
 
-				if (do_camera_frame) {
-					rctf vb;
-					ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &vb, false);
-					x1 = vb.xmin;
-					y1 = vb.ymin;
-					x2 = vb.xmax;
-					y2 = vb.ymax;
-				}
-				else {
-					x1 = ar->winrct.xmin;
-					y1 = ar->winrct.ymin;
-					x2 = ar->winrct.xmax;
-					y2 = ar->winrct.ymax;
-				}
+	if (rv3d->rot_angle != 0.0f) {
+		/* -- draw rotation axis -- */
+		float scaled_axis[3];
+		const float scale = rv3d->dist;
+		mul_v3_v3fl(scaled_axis, rv3d->rot_axis, scale);
 
-				/* apply offset last - camera offset is different to offset in blender units */
-				/* so this has some sane way of working - this matches camera's shift _exactly_ */
-				{
-					const float max_dim = max_ff(x2 - x1, y2 - y1);
-					const float xof_scale = bgpic->xof * max_dim;
-					const float yof_scale = bgpic->yof * max_dim;
-
-					x1 += xof_scale;
-					y1 += yof_scale;
-					x2 += xof_scale;
-					y2 += yof_scale;
-				}
 
-				centx = (x1 + x2) / 2.0f;
-				centy = (y1 + y2) / 2.0f;
+		immBegin(GWN_PRIM_LINE_STRIP, 3);
+		color[3] = 0; /* more transparent toward the ends */
+		immAttrib4ubv(col, color);
+		add_v3_v3v3(end, o, scaled_axis);
+		immVertex3fv(pos, end);
 
-				/* aspect correction */
-				if (bgpic->flag & V3D_BGPIC_CAMERA_ASPECT) {
-					/* apply aspect from clip */
-					const float w_src = ibuf->x * image_aspect[0];
-					const float h_src = ibuf->y * image_aspect[1];
+#if 0
+		color[3] = 0.2f + fabsf(rv3d->rot_angle);  /* modulate opacity with angle */
+		/* ^^ neat idea, but angle is frame-rate dependent, so it's usually close to 0.2 */
+#endif
 
-					/* destination aspect is already applied from the camera frame */
-					const float w_dst = x1 - x2;
-					const float h_dst = y1 - y2;
+		color[3] = 127; /* more opaque toward the center */
+		immAttrib4ubv(col, color);
+		immVertex3fv(pos, o);
 
-					const float asp_src = w_src / h_src;
-					const float asp_dst = w_dst / h_dst;
+		color[3] = 0;
+		immAttrib4ubv(col, color);
+		sub_v3_v3v3(end, o, scaled_axis);
+		immVertex3fv(pos, end);
+		immEnd();
 
-					if (fabsf(asp_src - asp_dst) >= FLT_EPSILON) {
-						if ((asp_src > asp_dst) == ((bgpic->flag & V3D_BGPIC_CAMERA_CROP) != 0)) {
-							/* fit X */
-							const float div = asp_src / asp_dst;
-							x1 = ((x1 - centx) * div) + centx;
-							x2 = ((x2 - centx) * div) + centx;
-						}
-						else {
-							/* fit Y */
-							const float div = asp_dst / asp_src;
-							y1 = ((y1 - centy) * div) + centy;
-							y2 = ((y2 - centy) * div) + centy;
-						}
-					}
-				}
-			}
-			else {
-				float tvec[3];
-				float sco[2];
-				const float mval_f[2] = {1.0f, 0.0f};
-				const float co_zero[3] = {0};
-				float zfac;
-
-				/* calc window coord */
-				zfac = ED_view3d_calc_zfac(rv3d, co_zero, NULL);
-				ED_view3d_win_to_delta(ar, mval_f, tvec, zfac);
-				fac = max_ff(fabsf(tvec[0]), max_ff(fabsf(tvec[1]), fabsf(tvec[2]))); /* largest abs axis */
-				fac = 1.0f / fac;
-
-				asp = (float)ibuf->y / (float)ibuf->x;
-
-				zero_v3(tvec);
-				ED_view3d_project_float_v2_m4(ar, tvec, sco, rv3d->persmat);
-
-				x1 =  sco[0] + fac * (bgpic->xof - bgpic->size);
-				y1 =  sco[1] + asp * fac * (bgpic->yof - bgpic->size);
-				x2 =  sco[0] + fac * (bgpic->xof + bgpic->size);
-				y2 =  sco[1] + asp * fac * (bgpic->yof + bgpic->size);
-
-				centx = (x1 + x2) / 2.0f;
-				centy = (y1 + y2) / 2.0f;
-			}
+		/* -- draw ring around rotation center -- */
+		{
+#define     ROT_AXIS_DETAIL 13
 
-			/* complete clip? */
-			BLI_rctf_init(&clip_rect, x1, x2, y1, y2);
-			if (bgpic->rotation) {
-				BLI_rctf_rotate_expand(&clip_rect, &clip_rect, bgpic->rotation);
-			}
+			const float s = 0.05f * scale;
+			const float step = 2.0f * (float)(M_PI / ROT_AXIS_DETAIL);
 
-			if (clip_rect.xmax < 0 || clip_rect.ymax < 0 || clip_rect.xmin > ar->winx || clip_rect.ymin > ar->winy) {
-				if (freeibuf)
-					IMB_freeImBuf(freeibuf);
-				if (releaseibuf)
-					BKE_image_release_ibuf(ima, releaseibuf, lock);
+			float q[4];  /* rotate ring so it's perpendicular to axis */
+			const int upright = fabsf(rv3d->rot_axis[2]) >= 0.95f;
+			if (!upright) {
+				const float up[3] = {0.0f, 0.0f, 1.0f};
+				float vis_angle, vis_axis[3];
 
-				continue;
+				cross_v3_v3v3(vis_axis, up, rv3d->rot_axis);
+				vis_angle = acosf(dot_v3v3(up, rv3d->rot_axis));
+				axis_angle_to_quat(q, vis_axis, vis_angle);
 			}
 
-			zoomx = (x2 - x1) / ibuf->x;
-			zoomy = (y2 - y1) / ibuf->y;
-
-			/* for some reason; zoomlevels down refuses to use GL_ALPHA_SCALE */
-			if (zoomx < 1.0f || zoomy < 1.0f) {
-				float tzoom = min_ff(zoomx, zoomy);
-				int mip = 0;
+			immBegin(GWN_PRIM_LINE_LOOP, ROT_AXIS_DETAIL);
+			color[3] = 63; /* somewhat faint */
+			immAttrib4ubv(col, color);
+			float angle = 0.0f;
+			for (int i = 0; i < ROT_AXIS_DETAIL; ++i, angle += step) {
+				float p[3] = {s * cosf(angle), s * sinf(angle), 0.0f};
 
-				if ((ibuf->userflags & IB_MIPMAP_INVALID) != 0) {
-					IMB_remakemipmap(ibuf, 0);
-					ibuf->userflags &= ~IB_MIPMAP_INVALID;
-				}
-				else if (ibuf->mipmap[0] == NULL)
-					IMB_makemipmap(ibuf, 0);
-
-				while (tzoom < 1.0f && mip < 8 && ibuf->mipmap[mip]) {
-					tzoom *= 2.0f;
-					zoomx *= 2.0f;
-					zoomy *= 2.0f;
-					mip++;
+				if (!upright) {
+					mul_qt_v3(q, p);
 				}
-				if (mip > 0)
-					ibuf = ibuf->mipmap[mip - 1];
-			}
 
-			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-			glDepthMask(0);
-
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA);
-
-			glMatrixMode(GL_PROJECTION);
-			glPushMatrix();
-			glMatrixMode(GL_MODELVIEW);
-			glPushMatrix();
-			ED_region_pixelspace(ar);
-
-			glTranslatef(centx, centy, 0.0);
-			glRotatef(RAD2DEGF(-bgpic->rotation), 0.0f, 0.0f, 1.0f);
-
-			if (bgpic->flag & V3D_BGPIC_FLIP_X) {
-				zoomx *= -1.0f;
-				x1 = x2;
-			}
-			if (bgpic->flag & V3D_BGPIC_FLIP_Y) {
-				zoomy *= -1.0f;
-				y1 = y2;
+				add_v3_v3(p, o);
+				immVertex3fv(pos, p);
 			}
-			glPixelZoom(zoomx, zoomy);
-			glColor4f(1.0f, 1.0f, 1.0f, 1.0f - bgpic->blend);
-
-			/* could not use glaDrawPixelsAuto because it could fallback to
-			 * glaDrawPixelsSafe in some cases, which will end up in missing
-			 * alpha transparency for the background image (sergey)
-			 */
-			glaDrawPixelsTex(x1 - centx, y1 - centy, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, ibuf->rect);
+			immEnd();
 
-			glPixelZoom(1.0, 1.0);
-			glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
-
-			glMatrixMode(GL_PROJECTION);
-			glPopMatrix();
-			glMatrixMode(GL_MODELVIEW);
-			glPopMatrix();
-
-			glDisable(GL_BLEND);
-
-			glDepthMask(1);
-			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-			if (freeibuf)
-				IMB_freeImBuf(freeibuf);
-			if (releaseibuf)
-				BKE_image_release_ibuf(ima, releaseibuf, lock);
+#undef      ROT_AXIS_DETAIL
 		}
+
+		color[3] = 255;  /* solid dot */
 	}
-}
+	else
+		color[3] = 127;  /* see-through dot */
 
-static void view3d_draw_bgpic_test(Scene *scene, ARegion *ar, View3D *v3d,
-                                   const bool do_foreground, const bool do_camera_frame)
-{
-	RegionView3D *rv3d = ar->regiondata;
+	immUnbindProgram();
 
-	if ((v3d->flag & V3D_DISPBGPICS) == 0)
-		return;
+	/* -- draw rotation center -- */
+	immBindBuiltinProgram(GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR);
+	glPointSize(5.0f);
+	immBegin(GWN_PRIM_POINTS, 1);
+	immAttrib4ubv(col, color);
+	immVertex3fv(pos, o);
+	immEnd();
+	immUnbindProgram();
 
-	/* disabled - mango request, since footage /w only render is quite useful
-	 * and this option is easy to disable all background images at once */
 #if 0
-	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
-		return;
+	/* find screen coordinates for rotation center, then draw pretty icon */
+	mul_m4_v3(rv3d->persinv, rot_center);
+	UI_icon_draw(rot_center[0], rot_center[1], ICON_NDOF_TURN);
+	/* ^^ just playing around, does not work */
 #endif
 
-	if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
-		if (rv3d->persp == RV3D_CAMOB) {
-			view3d_draw_bgpic(scene, ar, v3d, do_foreground, do_camera_frame);
-		}
-	}
-	else {
-		view3d_draw_bgpic(scene, ar, v3d, do_foreground, do_camera_frame);
-	}
-}
-
-/* ****************** View3d afterdraw *************** */
-
-typedef struct View3DAfter {
-	struct View3DAfter *next, *prev;
-	struct Base *base;
-	short dflag;
-} View3DAfter;
-
-/* temp storage of Objects that need to be drawn as last */
-void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag)
-{
-	View3DAfter *v3da = MEM_callocN(sizeof(View3DAfter), "View 3d after");
-	BLI_assert((base->flag & OB_FROMDUPLI) == 0);
-	BLI_addtail(lb, v3da);
-	v3da->base = base;
-	v3da->dflag = dflag;
-}
-
-/* disables write in zbuffer and draws it over */
-static void view3d_draw_transp(Scene *scene, ARegion *ar, View3D *v3d)
-{
-	View3DAfter *v3da;
-
-	glDepthMask(GL_FALSE);
-	v3d->transp = true;
-
-	while ((v3da = BLI_pophead(&v3d->afterdraw_transp))) {
-		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
-		MEM_freeN(v3da);
-	}
-	v3d->transp = false;
-
+	glDisable(GL_BLEND);
 	glDepthMask(GL_TRUE);
-
-}
-
-/* clears zbuffer and draws it over */
-static void view3d_draw_xray(Scene *scene, ARegion *ar, View3D *v3d, bool *clear)
-{
-	View3DAfter *v3da;
-
-	if (*clear && v3d->zbuf) {
-		glClear(GL_DEPTH_BUFFER_BIT);
-		*clear = false;
-	}
-
-	v3d->xray = true;
-	while ((v3da = BLI_pophead(&v3d->afterdraw_xray))) {
-		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
-		MEM_freeN(v3da);
-	}
-	v3d->xray = false;
 }
+#endif /* WITH_INPUT_NDOF */
 
+/* ******************** info ***************** */
 
-/* clears zbuffer and draws it over */
-static void view3d_draw_xraytransp(Scene *scene, ARegion *ar, View3D *v3d, const bool clear)
-{
-	View3DAfter *v3da;
-
-	if (clear && v3d->zbuf)
-		glClear(GL_DEPTH_BUFFER_BIT);
-
-	v3d->xray = true;
-	v3d->transp = true;
-
-	glDepthMask(GL_FALSE);
-
-	while ((v3da = BLI_pophead(&v3d->afterdraw_xraytransp))) {
-		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
-		MEM_freeN(v3da);
-	}
-
-	v3d->transp = false;
-	v3d->xray = false;
-
-	glDepthMask(GL_TRUE);
-}
-
-/* clears zbuffer and draws it over,
- * note that in the select version we don't care about transparent flag as with regular drawing */
-static void view3d_draw_xray_select(Scene *scene, ARegion *ar, View3D *v3d, bool *clear)
+/**
+* Render and camera border
+*/
+static void view3d_draw_border(const bContext *C, ARegion *ar)
 {
-	/* Not ideal, but we need to read from the previous depths before clearing
-	 * otherwise we could have a function to load the depths after drawing.
-	 *
-	 * Clearing the depth buffer isn't all that common between drawing objects so accept this for now.
-	 */
-	if (U.gpu_select_pick_deph) {
-		GPU_select_load_id(-1);
-	}
+	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	RegionView3D *rv3d = ar->regiondata;
+	View3D *v3d = CTX_wm_view3d(C);
 
-	View3DAfter *v3da;
-	if (*clear && v3d->zbuf) {
-		glClear(GL_DEPTH_BUFFER_BIT);
-		*clear = false;
+	if (rv3d->persp == RV3D_CAMOB) {
+		drawviewborder(scene, depsgraph, ar, v3d);
 	}
-
-	v3d->xray = true;
-	while ((v3da = BLI_pophead(&v3d->afterdraw_xray))) {
-		if (GPU_select_load_id(v3da->base->selcol)) {
-			draw_object_select(scene, ar, v3d, v3da->base, v3da->dflag);
-		}
-		MEM_freeN(v3da);
+	else if (v3d->flag2 & V3D_RENDER_BORDER) {
+		drawrenderborder(ar, v3d);
 	}
-	v3d->xray = false;
 }
 
-/* *********************** */
-
-/*
- * In most cases call draw_dupli_objects,
- * draw_dupli_objects_color was added because when drawing set dupli's
- * we need to force the color
- */
-
-#if 0
-int dupli_ob_sort(void *arg1, void *arg2)
-{
-	void *p1 = ((DupliObject *)arg1)->ob;
-	void *p2 = ((DupliObject *)arg2)->ob;
-	int val = 0;
-	if (p1 < p2) val = -1;
-	else if (p1 > p2) val = 1;
-	return val;
-}
-#endif
-
-
-static DupliObject *dupli_step(DupliObject *dob)
+/**
+* Grease Pencil
+*/
+static void view3d_draw_grease_pencil(const bContext *UNUSED(C))
 {
-	while (dob && dob->no_draw)
-		dob = dob->next;
-	return dob;
+	/* TODO viewport */
 }
 
-static void draw_dupli_objects_color(
-        Scene *scene, ARegion *ar, View3D *v3d, Base *base,
-        const short dflag, const int color)
+/**
+* Viewport Name
+*/
+static const char *view3d_get_name(View3D *v3d, RegionView3D *rv3d)
 {
-	RegionView3D *rv3d = ar->regiondata;
-	ListBase *lb;
-	LodLevel *savedlod;
-	DupliObject *dob_prev = NULL, *dob, *dob_next = NULL;
-	Base tbase = {NULL};
-	BoundBox bb, *bb_tmp; /* use a copy because draw_object, calls clear_mesh_caches */
-	GLuint displist = 0;
-	unsigned char color_rgb[3];
-	const short dflag_dupli = dflag | DRAW_CONSTCOLOR;
-	short transflag;
-	bool use_displist = false;  /* -1 is initialize */
-	char dt;
-	short dtx;
-	DupliApplyData *apply_data;
-
-	if (base->object->restrictflag & OB_RESTRICT_VIEW) return;
-	if ((base->object->restrictflag & OB_RESTRICT_RENDER) && (v3d->flag2 & V3D_RENDER_OVERRIDE)) return;
-
-	if (dflag & DRAW_CONSTCOLOR) {
-		BLI_assert(color == TH_UNDEFINED);
-	}
-	else {
-		UI_GetThemeColorBlend3ubv(color, TH_BACK, 0.5f, color_rgb);
-	}
-
-	tbase.flag = OB_FROMDUPLI | base->flag;
-	lb = object_duplilist(G.main->eval_ctx, scene, base->object);
-	// BLI_listbase_sort(lb, dupli_ob_sort); /* might be nice to have if we have a dupli list with mixed objects. */
-
-	apply_data = duplilist_apply(base->object, scene, lb);
-
-	dob = dupli_step(lb->first);
-	if (dob) dob_next = dupli_step(dob->next);
-
-	for (; dob; dob_prev = dob, dob = dob_next, dob_next = dob_next ? dupli_step(dob_next->next) : NULL) {
-		bool testbb = false;
-
-		tbase.object = dob->ob;
-
-		/* Make sure lod is updated from dupli's position */
-		savedlod = dob->ob->currentlod;
-
-#ifdef WITH_GAMEENGINE
-		if (rv3d->rflag & RV3D_IS_GAME_ENGINE) {
-			BKE_object_lod_update(dob->ob, rv3d->viewinv[3]);
-		}
-#endif
-
-		/* extra service: draw the duplicator in drawtype of parent, minimum taken
-		 * to allow e.g. boundbox box objects in groups for LOD */
-		dt = tbase.object->dt;
-		tbase.object->dt = MIN2(tbase.object->dt, base->object->dt);
-
-		/* inherit draw extra, but not if a boundbox under the assumption that this
-		 * is intended to speed up drawing, and drawing extra (especially wire) can
-		 * slow it down too much */
-		dtx = tbase.object->dtx;
-		if (tbase.object->dt != OB_BOUNDBOX)
-			tbase.object->dtx = base->object->dtx;
-
-		/* negative scale flag has to propagate */
-		transflag = tbase.object->transflag;
-
-		if (is_negative_m4(dob->mat))
-			tbase.object->transflag |= OB_NEG_SCALE;
-		else
-			tbase.object->transflag &= ~OB_NEG_SCALE;
-
-		/* should move outside the loop but possible color is set in draw_object still */
-		if ((dflag & DRAW_CONSTCOLOR) == 0) {
-			glColor3ubv(color_rgb);
-		}
-
-		/* generate displist, test for new object */
-		if (dob_prev && dob_prev->ob != dob->ob) {
-			if (use_displist == true)
-				glDeleteLists(displist, 1);
-
-			use_displist = false;
-		}
+	const char *name = NULL;
 
-		if ((bb_tmp = BKE_object_boundbox_get(dob->ob))) {
-			bb = *bb_tmp; /* must make a copy  */
-			testbb = true;
-		}
+	switch (rv3d->view) {
+		case RV3D_VIEW_FRONT:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Front Ortho");
+			else name = IFACE_("Front Persp");
+			break;
+		case RV3D_VIEW_BACK:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Back Ortho");
+			else name = IFACE_("Back Persp");
+			break;
+		case RV3D_VIEW_TOP:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Top Ortho");
+			else name = IFACE_("Top Persp");
+			break;
+		case RV3D_VIEW_BOTTOM:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Bottom Ortho");
+			else name = IFACE_("Bottom Persp");
+			break;
+		case RV3D_VIEW_RIGHT:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Right Ortho");
+			else name = IFACE_("Right Persp");
+			break;
+		case RV3D_VIEW_LEFT:
+			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Left Ortho");
+			else name = IFACE_("Left Persp");
+			break;
 
-		if (!testbb || ED_view3d_boundbox_clip_ex(rv3d, &bb, dob->mat)) {
-			/* generate displist */
-			if (use_displist == false) {
-
-				/* note, since this was added, its checked (dob->type == OB_DUPLIGROUP)
-				 * however this is very slow, it was probably needed for the NLA
-				 * offset feature (used in group-duplicate.blend but no longer works in 2.5)
-				 * so for now it should be ok to - campbell */
-
-				if ( /* if this is the last no need  to make a displist */
-				     (dob_next == NULL || dob_next->ob != dob->ob) ||
-				     /* lamp drawing messes with matrices, could be handled smarter... but this works */
-				     (dob->ob->type == OB_LAMP) ||
-				     (dob->type == OB_DUPLIGROUP && dob->animated) ||
-				     !bb_tmp ||
-				     draw_glsl_material(scene, dob->ob, v3d, dt) ||
-				     check_object_draw_texture(scene, v3d, dt) ||
-				     (v3d->flag2 & V3D_SOLID_MATCAP) != 0)
-				{
-					// printf("draw_dupli_objects_color: skipping displist for %s\n", dob->ob->id.name + 2);
-					use_displist = false;
+		default:
+			if (rv3d->persp == RV3D_CAMOB) {
+				if ((v3d->camera) && (v3d->camera->type == OB_CAMERA)) {
+					Camera *cam;
+					cam = v3d->camera->data;
+					if (cam->type == CAM_PERSP) {
+						name = IFACE_("Camera Persp");
+					}
+					else if (cam->type == CAM_ORTHO) {
+						name = IFACE_("Camera Ortho");
+					}
+					else {
+						BLI_assert(cam->type == CAM_PANO);
+						name = IFACE_("Camera Pano");
+					}
 				}
 				else {
-					// printf("draw_dupli_objects_color: using displist for %s\n", dob->ob->id.name + 2);
-
-					/* disable boundbox check for list creation */
-					BKE_object_boundbox_flag(dob->ob, BOUNDBOX_DISABLED, 1);
-					/* need this for next part of code */
-					unit_m4(dob->ob->obmat);    /* obmat gets restored */
-
-					displist = glGenLists(1);
-					glNewList(displist, GL_COMPILE);
-					draw_object(scene, ar, v3d, &tbase, dflag_dupli);
-					glEndList();
-
-					use_displist = true;
-					BKE_object_boundbox_flag(dob->ob, BOUNDBOX_DISABLED, 0);
+					name = IFACE_("Object as Camera");
 				}
 			}
-
-			if (use_displist) {
-				glPushMatrix();
-				glMultMatrixf(dob->mat);
-				glCallList(displist);
-				glPopMatrix();
-			}
 			else {
-				copy_m4_m4(dob->ob->obmat, dob->mat);
-				GPU_begin_dupli_object(dob);
-				draw_object(scene, ar, v3d, &tbase, dflag_dupli);
-				GPU_end_dupli_object();
+				name = (rv3d->persp == RV3D_ORTHO) ? IFACE_("User Ortho") : IFACE_("User Persp");
 			}
-		}
-
-		tbase.object->dt = dt;
-		tbase.object->dtx = dtx;
-		tbase.object->transflag = transflag;
-		tbase.object->currentlod = savedlod;
-	}
-
-	if (apply_data) {
-		duplilist_restore(lb, apply_data);
-		duplilist_free_apply_data(apply_data);
 	}
 
-	free_object_duplilist(lb);
-
-	if (use_displist)
-		glDeleteLists(displist, 1);
-}
-
-static void draw_dupli_objects(Scene *scene, ARegion *ar, View3D *v3d, Base *base)
-{
-	/* define the color here so draw_dupli_objects_color can be called
-	 * from the set loop */
-
-	int color = (base->flag & SELECT) ? TH_SELECT : TH_WIRE;
-	/* debug */
-	if (base->object->dup_group && base->object->dup_group->id.us < 1)
-		color = TH_REDALERT;
-
-	draw_dupli_objects_color(scene, ar, v3d, base, 0, color);
+	return name;
 }
 
-/* XXX warning, not using gpu offscreen here */
-void view3d_update_depths_rect(ARegion *ar, ViewDepths *d, rcti *rect)
+static void draw_viewport_name(ARegion *ar, View3D *v3d, const rcti *rect)
 {
-	int x, y, w, h;
-	rcti r;
-	/* clamp rect by region */
-
-	r.xmin = 0;
-	r.xmax = ar->winx - 1;
-	r.ymin = 0;
-	r.ymax = ar->winy - 1;
-
-	/* Constrain rect to depth bounds */
-	BLI_rcti_isect(&r, rect, rect);
-
-	/* assign values to compare with the ViewDepths */
-	x = rect->xmin;
-	y = rect->ymin;
-
-	w = BLI_rcti_size_x(rect);
-	h = BLI_rcti_size_y(rect);
-
-	if (w <= 0 || h <= 0) {
-		if (d->depths)
-			MEM_freeN(d->depths);
-		d->depths = NULL;
-
-		d->damaged = false;
-	}
-	else if (d->w != w ||
-	         d->h != h ||
-	         d->x != x ||
-	         d->y != y ||
-	         d->depths == NULL
-	         )
-	{
-		d->x = x;
-		d->y = y;
-		d->w = w;
-		d->h = h;
-
-		if (d->depths)
-			MEM_freeN(d->depths);
-
-		d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths Subset");
+	RegionView3D *rv3d = ar->regiondata;
+	const char *name = view3d_get_name(v3d, rv3d);
+	/* increase size for unicode languages (Chinese in utf-8...) */
+#ifdef WITH_INTERNATIONAL
+	char tmpstr[96];
+#else
+	char tmpstr[32];
+#endif
 
-		d->damaged = true;
+	if (v3d->localvd) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), IFACE_("%s (Local)"), name);
+		name = tmpstr;
 	}
 
-	if (d->damaged) {
-		/* XXX using special function here, it doesn't use the gpu offscreen system */
-		view3d_opengl_read_Z_pixels(ar, d->x, d->y, d->w, d->h, GL_DEPTH_COMPONENT, GL_FLOAT, d->depths);
-		glGetDoublev(GL_DEPTH_RANGE, d->depth_range);
-		d->damaged = false;
-	}
+	UI_FontThemeColor(BLF_default(), TH_TEXT_HI);
+#ifdef WITH_INTERNATIONAL
+	BLF_draw_default(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
+#else
+	BLF_draw_default_ascii(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
+#endif
 }
 
-/* note, with nouveau drivers the glReadPixels() is very slow. [#24339] */
-void ED_view3d_depth_update(ARegion *ar)
-{
-	RegionView3D *rv3d = ar->regiondata;
-
-	/* Create storage for, and, if necessary, copy depth buffer */
-	if (!rv3d->depths) rv3d->depths = MEM_callocN(sizeof(ViewDepths), "ViewDepths");
-	if (rv3d->depths) {
-		ViewDepths *d = rv3d->depths;
-		if (d->w != ar->winx ||
-		    d->h != ar->winy ||
-		    !d->depths)
-		{
-			d->w = ar->winx;
-			d->h = ar->winy;
-			if (d->depths)
-				MEM_freeN(d->depths);
-			d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths");
-			d->damaged = true;
-		}
-
-		if (d->damaged) {
-			view3d_opengl_read_pixels(ar, 0, 0, d->w, d->h, GL_DEPTH_COMPONENT, GL_FLOAT, d->depths);
-			glGetDoublev(GL_DEPTH_RANGE, d->depth_range);
-
-			d->damaged = false;
-		}
-	}
-}
+/**
+ * draw info beside axes in bottom left-corner:
+ * framenum, object name, bone name (if available), marker name (if available)
+ */
 
-/* utility function to find the closest Z value, use for autodepth */
-float view3d_depth_near(ViewDepths *d)
+static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
 {
-	/* convert to float for comparisons */
-	const float near = (float)d->depth_range[0];
-	const float far_real = (float)d->depth_range[1];
-	float far = far_real;
-
-	const float *depths = d->depths;
-	float depth = FLT_MAX;
-	int i = (int)d->w * (int)d->h; /* cast to avoid short overflow */
-
-	/* far is both the starting 'far' value
-	 * and the closest value found. */
-	while (i--) {
-		depth = *depths++;
-		if ((depth < far) && (depth > near)) {
-			far = depth;
-		}
-	}
+	const int cfra = CFRA;
+	const char *msg_pin = " (Pinned)";
+	const char *msg_sep = " : ";
 
-	return far == far_real ? FLT_MAX : far;
-}
+	const int font_id = BLF_default();
 
-void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d)
-{
-	short zbuf = v3d->zbuf;
-	RegionView3D *rv3d = ar->regiondata;
+	char info[300];
+	char *s = info;
+	short offset = 1.5f * UI_UNIT_X + rect->xmin;
 
-	/* Setup view matrix. */
-	ED_view3d_draw_setup_view(NULL, scene, ar, v3d, rv3d->viewmat, rv3d->winmat, NULL);
+	s += sprintf(s, "(%d)", cfra);
 
-	glClear(GL_DEPTH_BUFFER_BIT);
+	/*
+	 * info can contain:
+	 * - a frame (7 + 2)
+	 * - 3 object names (MAX_NAME)
+	 * - 2 BREAD_CRUMB_SEPARATORs (6)
+	 * - a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1) - translated, so give some room!
+	 * - a marker name (MAX_NAME + 3)
+	 */
 
-	v3d->zbuf = true;
-	glEnable(GL_DEPTH_TEST);
+	/* get name of marker on current frame (if available) */
+	const char *markern = BKE_scene_find_marker_name(scene, cfra);
 
-	if (v3d->flag2 & V3D_SHOW_GPENCIL) {
-		ED_gpencil_draw_view3d(NULL, scene, v3d, ar, true);
-	}
+	/* check if there is an object */
+	if (ob) {
+		*s++ = ' ';
+		s += BLI_strcpy_rlen(s, ob->id.name + 2);
 
-	v3d->zbuf = zbuf;
-}
+		/* name(s) to display depends on type of object */
+		if (ob->type == OB_ARMATURE) {
+			bArmature *arm = ob->data;
 
-static void view3d_draw_depth_loop(Scene *scene, ARegion *ar, View3D *v3d)
-{
-	Base *base;
-
-	/* no need for color when drawing depth buffer */
-	const short dflag_depth = DRAW_CONSTCOLOR;
-
-	/* draw set first */
-	if (scene->set) {
-		Scene *sce_iter;
-		for (SETLOOPER(scene->set, sce_iter, base)) {
-			if (v3d->lay & base->lay) {
-				draw_object(scene, ar, v3d, base, 0);
-				if (base->object->transflag & OB_DUPLI) {
-					draw_dupli_objects_color(scene, ar, v3d, base, dflag_depth, TH_UNDEFINED);
+			/* show name of active bone too (if possible) */
+			if (arm->edbo) {
+				if (arm->act_edbone) {
+					s += BLI_strcpy_rlen(s, msg_sep);
+					s += BLI_strcpy_rlen(s, arm->act_edbone->name);
 				}
 			}
-		}
-	}
-
-	for (base = scene->base.first; base; base = base->next) {
-		if (v3d->lay & base->lay) {
-			/* dupli drawing */
-			if (base->object->transflag & OB_DUPLI) {
-				draw_dupli_objects_color(scene, ar, v3d, base, dflag_depth, TH_UNDEFINED);
-			}
-			draw_object(scene, ar, v3d, base, dflag_depth);
-		}
-	}
-
-	/* this isn't that nice, draw xray objects as if they are normal */
-	if (v3d->afterdraw_transp.first ||
-	    v3d->afterdraw_xray.first ||
-	    v3d->afterdraw_xraytransp.first)
-	{
-		View3DAfter *v3da;
-		int mask_orig;
-
-		v3d->xray = true;
-
-		/* transp materials can change the depth mask, see #21388 */
-		glGetIntegerv(GL_DEPTH_WRITEMASK, &mask_orig);
-
+			else if (ob->mode & OB_MODE_POSE) {
+				if (arm->act_bone) {
 
-		if (v3d->afterdraw_xray.first || v3d->afterdraw_xraytransp.first) {
-			glDepthFunc(GL_ALWAYS); /* always write into the depth bufer, overwriting front z values */
-			for (v3da = v3d->afterdraw_xray.first; v3da; v3da = v3da->next) {
-				draw_object(scene, ar, v3d, v3da->base, dflag_depth);
+					if (arm->act_bone->layer & arm->layer) {
+						s += BLI_strcpy_rlen(s, msg_sep);
+						s += BLI_strcpy_rlen(s, arm->act_bone->name);
+					}
+				}
 			}
-			glDepthFunc(GL_LEQUAL); /* Now write the depth buffer normally */
-		}
-
-		/* draw 3 passes, transp/xray/xraytransp */
-		v3d->xray = false;
-		v3d->transp = true;
-		while ((v3da = BLI_pophead(&v3d->afterdraw_transp))) {
-			draw_object(scene, ar, v3d, v3da->base, dflag_depth);
-			MEM_freeN(v3da);
-		}
-
-		v3d->xray = true;
-		v3d->transp = false;
-		while ((v3da = BLI_pophead(&v3d->afterdraw_xray))) {
-			draw_object(scene, ar, v3d, v3da->base, dflag_depth);
-			MEM_freeN(v3da);
-		}
-
-		v3d->xray = true;
-		v3d->transp = true;
-		while ((v3da = BLI_pophead(&v3d->afterdraw_xraytransp))) {
-			draw_object(scene, ar, v3d, v3da->base, dflag_depth);
-			MEM_freeN(v3da);
-		}
-
-
-		v3d->xray = false;
-		v3d->transp = false;
-
-		glDepthMask(mask_orig);
-	}
-}
-
-void ED_view3d_draw_depth(Scene *scene, ARegion *ar, View3D *v3d, bool alphaoverride)
-{
-	struct bThemeState theme_state;
-	RegionView3D *rv3d = ar->regiondata;
-	short zbuf = v3d->zbuf;
-	short flag = v3d->flag;
-	float glalphaclip = U.glalphaclip;
-	int obcenter_dia = U.obcenter_dia;
-	/* temp set drawtype to solid */
-
-	/* Setting these temporarily is not nice */
-	v3d->flag &= ~V3D_SELECT_OUTLINE;
-	U.glalphaclip = alphaoverride ? 0.5f : glalphaclip; /* not that nice but means we wont zoom into billboards */
-	U.obcenter_dia = 0;
-
-	/* Tools may request depth outside of regular drawing code. */
-	UI_Theme_Store(&theme_state);
-	UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
-
-	/* Setup view matrix. */
-	ED_view3d_draw_setup_view(NULL, scene, ar, v3d, rv3d->viewmat, rv3d->winmat, NULL);
-
-	glClear(GL_DEPTH_BUFFER_BIT);
-
-	if (rv3d->rflag & RV3D_CLIPPING) {
-		ED_view3d_clipping_set(rv3d);
-	}
-	/* get surface depth without bias */
-	rv3d->rflag |= RV3D_ZOFFSET_DISABLED;
-
-	v3d->zbuf = true;
-	glEnable(GL_DEPTH_TEST);
-
-	view3d_draw_depth_loop(scene, ar, v3d);
-
-	if (rv3d->rflag & RV3D_CLIPPING) {
-		ED_view3d_clipping_disable();
-	}
-	rv3d->rflag &= ~RV3D_ZOFFSET_DISABLED;
-
-	v3d->zbuf = zbuf;
-	if (!v3d->zbuf) glDisable(GL_DEPTH_TEST);
-
-	U.glalphaclip = glalphaclip;
-	v3d->flag = flag;
-	U.obcenter_dia = obcenter_dia;
-
-	UI_Theme_Restore(&theme_state);
-}
-
-void ED_view3d_draw_select_loop(
-        ViewContext *vc, Scene *scene, View3D *v3d, ARegion *ar,
-        bool use_obedit_skip, bool use_nearest)
-{
-	short code = 1;
-	const short dflag = DRAW_PICKING | DRAW_CONSTCOLOR;
-
-	if (vc->obedit && vc->obedit->type == OB_MBALL) {
-		draw_object(scene, ar, v3d, BASACT, dflag);
-	}
-	else if ((vc->obedit && vc->obedit->type == OB_ARMATURE)) {
-		/* if not drawing sketch, draw bones */
-		if (!BDR_drawSketchNames(vc)) {
-			draw_object(scene, ar, v3d, BASACT, dflag);
 		}
-	}
-	else {
-		Base *base;
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (base->lay & v3d->lay) {
-
-				if ((base->object->restrictflag & OB_RESTRICT_SELECT) ||
-				    (use_obedit_skip && (scene->obedit->data == base->object->data)))
-				{
-					base->selcol = 0;
-				}
-				else {
-					base->selcol = code;
+		else if (ELEM(ob->type, OB_MESH, OB_LATTICE, OB_CURVE)) {
+			/* try to display active bone and active shapekey too (if they exist) */
 
-					if (use_nearest && (base->object->dtx & OB_DRAWXRAY)) {
-						ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag);
-					}
-					else {
-						if (GPU_select_load_id(code)) {
-							draw_object_select(scene, ar, v3d, base, dflag);
+			if (ob->type == OB_MESH && ob->mode & OB_MODE_WEIGHT_PAINT) {
+				Object *armobj = BKE_object_pose_armature_get(ob);
+				if (armobj  && armobj->mode & OB_MODE_POSE) {
+					bArmature *arm = armobj->data;
+					if (arm->act_bone) {
+						if (arm->act_bone->layer & arm->layer) {
+							s += BLI_strcpy_rlen(s, msg_sep);
+							s += BLI_strcpy_rlen(s, arm->act_bone->name);
 						}
 					}
-					code++;
 				}
 			}
-		}
 
-		if (use_nearest) {
-			bool xrayclear = true;
-			if (v3d->afterdraw_xray.first) {
-				view3d_draw_xray_select(scene, ar, v3d, &xrayclear);
+			Key *key = BKE_key_from_object(ob);
+			if (key) {
+				KeyBlock *kb = BLI_findlink(&key->block, ob->shapenr - 1);
+				if (kb) {
+					s += BLI_strcpy_rlen(s, msg_sep);
+					s += BLI_strcpy_rlen(s, kb->name);
+					if (ob->shapeflag & OB_SHAPE_LOCK) {
+						s += BLI_strcpy_rlen(s, IFACE_(msg_pin));
+					}
+				}
 			}
 		}
-	}
-}
-
-typedef struct View3DShadow {
-	struct View3DShadow *next, *prev;
-	GPULamp *lamp;
-} View3DShadow;
-
-static void gpu_render_lamp_update(Scene *scene, View3D *v3d,
-                                   Object *ob, Object *par,
-                                   float obmat[4][4], unsigned int lay,
-                                   ListBase *shadows, SceneRenderLayer *srl)
-{
-	GPULamp *lamp;
-	Lamp *la = (Lamp *)ob->data;
-	View3DShadow *shadow;
-	unsigned int layers;
-
-	lamp = GPU_lamp_from_blender(scene, ob, par);
-
-	if (lamp) {
-		GPU_lamp_update(lamp, lay, (ob->restrictflag & OB_RESTRICT_RENDER), obmat);
-		GPU_lamp_update_colors(lamp, la->r, la->g, la->b, la->energy);
-
-		layers = lay & v3d->lay;
-		if (srl)
-			layers &= srl->lay;
-
-		if (layers &&
-		    GPU_lamp_has_shadow_buffer(lamp) &&
-		    /* keep last, may do string lookup */
-		    GPU_lamp_visible(lamp, srl, NULL))
-		{
-			shadow = MEM_callocN(sizeof(View3DShadow), "View3DShadow");
-			shadow->lamp = lamp;
-			BLI_addtail(shadows, shadow);
-		}
-	}
-}
 
-static void gpu_update_lamps_shadows_world(Scene *scene, View3D *v3d)
-{
-	ListBase shadows;
-	View3DShadow *shadow;
-	Scene *sce_iter;
-	Base *base;
-	Object *ob;
-	World *world = scene->world;
-	SceneRenderLayer *srl = v3d->scenelock ? BLI_findlink(&scene->r.layers, scene->r.actlay) : NULL;
-
-	BLI_listbase_clear(&shadows);
-
-	/* update lamp transform and gather shadow lamps */
-	for (SETLOOPER(scene, sce_iter, base)) {
-		ob = base->object;
-
-		if (ob->type == OB_LAMP)
-			gpu_render_lamp_update(scene, v3d, ob, NULL, ob->obmat, ob->lay, &shadows, srl);
-
-		if (ob->transflag & OB_DUPLI) {
-			DupliObject *dob;
-			ListBase *lb = object_duplilist(G.main->eval_ctx, scene, ob);
-
-			for (dob = lb->first; dob; dob = dob->next)
-				if (dob->ob->type == OB_LAMP)
-					gpu_render_lamp_update(scene, v3d, dob->ob, ob, dob->mat, ob->lay, &shadows, srl);
-
-			free_object_duplilist(lb);
-		}
+		/* color depends on whether there is a keyframe */
+		if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)cfra, ANIMFILTER_KEYS_LOCAL))
+			UI_FontThemeColor(font_id, TH_TIME_KEYFRAME);
+		else if (ED_gpencil_has_keyframe_v3d(scene, ob, cfra))
+			UI_FontThemeColor(font_id, TH_TIME_GP_KEYFRAME);
+		else
+			UI_FontThemeColor(font_id, TH_TEXT_HI);
 	}
-
-	/* render shadows after updating all lamps, nested object_duplilist
-	 * don't work correct since it's replacing object matrices */
-	for (shadow = shadows.first; shadow; shadow = shadow->next) {
-		/* this needs to be done better .. */
-		float viewmat[4][4], winmat[4][4];
-		int drawtype, lay, winsize, flag2 = v3d->flag2;
-		ARegion ar = {NULL};
-		RegionView3D rv3d = {{{0}}};
-
-		drawtype = v3d->drawtype;
-		lay = v3d->lay;
-
-		v3d->drawtype = OB_SOLID;
-		v3d->lay &= GPU_lamp_shadow_layer(shadow->lamp);
-		v3d->flag2 &= ~(V3D_SOLID_TEX | V3D_SHOW_SOLID_MATCAP);
-		v3d->flag2 |= V3D_RENDER_OVERRIDE | V3D_RENDER_SHADOW;
-
-		GPU_lamp_shadow_buffer_bind(shadow->lamp, viewmat, &winsize, winmat);
-
-		ar.regiondata = &rv3d;
-		ar.regiontype = RGN_TYPE_WINDOW;
-		rv3d.persp = RV3D_CAMOB;
-		copy_m4_m4(rv3d.winmat, winmat);
-		copy_m4_m4(rv3d.viewmat, viewmat);
-		invert_m4_m4(rv3d.viewinv, rv3d.viewmat);
-		mul_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat);
-		invert_m4_m4(rv3d.persinv, rv3d.viewinv);
-
-		/* no need to call ED_view3d_draw_offscreen_init since shadow buffers were already updated */
-		ED_view3d_draw_offscreen(
-		            scene, v3d, &ar, winsize, winsize, viewmat, winmat,
-		            false, false, true,
-		            NULL, NULL, NULL, NULL);
-		GPU_lamp_shadow_buffer_unbind(shadow->lamp);
-
-		v3d->drawtype = drawtype;
-		v3d->lay = lay;
-		v3d->flag2 = flag2;
+	else {
+		/* no object */
+		if (ED_gpencil_has_keyframe_v3d(scene, NULL, cfra))
+			UI_FontThemeColor(font_id, TH_TIME_GP_KEYFRAME);
+		else
+			UI_FontThemeColor(font_id, TH_TEXT_HI);
 	}
 
-	BLI_freelistN(&shadows);
-
-	/* update world values */
-	if (world) {
-		GPU_mist_update_enable(world->mode & WO_MIST);
-		GPU_mist_update_values(world->mistype, world->miststa, world->mistdist, world->misi, &world->horr);
-		GPU_horizon_update_color(&world->horr);
-		GPU_ambient_update_color(&world->ambr);
-		GPU_zenith_update_color(&world->zenr);
+	if (markern) {
+		s += sprintf(s, " <%s>", markern);
 	}
-}
-
-/* *********************** customdata **************** */
-
-CustomDataMask ED_view3d_datamask(const Scene *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)))
-	{
-		mask |= CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
-
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			if (drawtype == OB_MATERIAL)
-				mask |= CD_MASK_ORCO;
-		}
-		else {
-			if ((scene->gm.matmode == GAME_MAT_GLSL && drawtype == OB_TEXTURE) ||
-			    (drawtype == OB_MATERIAL))
-			{
-				mask |= CD_MASK_ORCO;
-			}
-		}
-	}
+	if (U.uiflag & USER_SHOW_ROTVIEWICON)
+		offset = U.widget_unit + (U.rvisize * 2) + rect->xmin;
 
-	return mask;
+	BLF_draw_default(offset, rect->ymin + 0.5f * U.widget_unit, 0.0f, info, sizeof(info));
 }
 
-/* goes over all modes and view3d settings */
-CustomDataMask ED_view3d_screen_datamask(const bScreen *screen)
-{
-	const Scene *scene = screen->scene;
-	CustomDataMask mask = CD_MASK_BAREMESH;
-	const ScrArea *sa;
-
-	/* check if we need tfaces & mcols due to view mode */
-	for (sa = screen->areabase.first; sa; sa = sa->next) {
-		if (sa->spacetype == SPACE_VIEW3D) {
-			mask |= ED_view3d_datamask(scene, sa->spacedata.first);
-		}
-	}
-
-	return mask;
-}
+/* ******************** view loop ***************** */
 
 /**
- * \note keep this synced with #ED_view3d_mats_rv3d_backup/#ED_view3d_mats_rv3d_restore
- */
-void ED_view3d_update_viewmat(
-        Scene *scene, View3D *v3d, ARegion *ar, float viewmat[4][4], float winmat[4][4], const rcti *rect)
+* Information drawn on top of the solid plates and composed data
+*/
+void view3d_draw_region_info(const bContext *C, ARegion *ar, const int offset)
 {
 	RegionView3D *rv3d = ar->regiondata;
+	View3D *v3d = CTX_wm_view3d(C);
+	Scene *scene = CTX_data_scene(C);
+	wmWindowManager *wm = CTX_wm_manager(C);
 
-	/* setup window matrices */
-	if (winmat)
-		copy_m4_m4(rv3d->winmat, winmat);
-	else
-		view3d_winmatrix_set(ar, v3d, rect);
-
-	/* setup view matrix */
-	if (viewmat) {
-		copy_m4_m4(rv3d->viewmat, viewmat);
-	}
-	else {
-		float rect_scale[2];
-		if (rect) {
-			rect_scale[0] = (float)BLI_rcti_size_x(rect) / (float)ar->winx;
-			rect_scale[1] = (float)BLI_rcti_size_y(rect) / (float)ar->winy;
-		}
-		view3d_viewmatrix_set(scene, v3d, rv3d, rect ? rect_scale : NULL);  /* note: calls BKE_object_where_is_calc for camera... */
-	}
-
-	/* update utility matrices */
-	mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
-	invert_m4_m4(rv3d->persinv, rv3d->persmat);
-	invert_m4_m4(rv3d->viewinv, rv3d->viewmat);
-
-	/* calculate GLSL view dependent values */
-
-	/* store window coordinates scaling/offset */
-	if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
-		rctf cameraborder;
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &cameraborder, false);
-		rv3d->viewcamtexcofac[0] = (float)ar->winx / BLI_rctf_size_x(&cameraborder);
-		rv3d->viewcamtexcofac[1] = (float)ar->winy / BLI_rctf_size_y(&cameraborder);
-
-		rv3d->viewcamtexcofac[2] = -rv3d->viewcamtexcofac[0] * cameraborder.xmin / (float)ar->winx;
-		rv3d->viewcamtexcofac[3] = -rv3d->viewcamtexcofac[1] * cameraborder.ymin / (float)ar->winy;
-	}
-	else {
-		rv3d->viewcamtexcofac[0] = rv3d->viewcamtexcofac[1] = 1.0f;
-		rv3d->viewcamtexcofac[2] = rv3d->viewcamtexcofac[3] = 0.0f;
-	}
-
-	/**
-	 * Calculate pixel-size factor once, is used for lamps and object centers.
-	 * Used by #ED_view3d_pixel_size and typically not accessed directly.
-	 *
-	 * \note #BKE_camera_params_compute_viewplane' also calculates a pixel-size value,
-	 * passed to #RE_SetPixelSize, in ortho mode this is compatible with this value,
-	 * but in perspective mode its offset by the near-clip.
-	 *
-	 * 'RegionView3D.pixsize' is used for viewport drawing, not rendering.
-	 */
-	{
-		/* note:  '1.0f / len_v3(v1)'  replaced  'len_v3(rv3d->viewmat[0])'
-		 * because of float point precision problems at large values [#23908] */
-		float v1[3], v2[3];
-		float len_px, len_sc;
-
-		v1[0] = rv3d->persmat[0][0];
-		v1[1] = rv3d->persmat[1][0];
-		v1[2] = rv3d->persmat[2][0];
-
-		v2[0] = rv3d->persmat[0][1];
-		v2[1] = rv3d->persmat[1][1];
-		v2[2] = rv3d->persmat[2][1];
-
-		len_px = 2.0f / sqrtf(min_ff(len_squared_v3(v1), len_squared_v3(v2)));
-		len_sc = (float)MAX2(ar->winx, ar->winy);
-
-		rv3d->pixsize = len_px / len_sc;
-	}
-}
+	/* correct projection matrix */
+	ED_region_pixelspace(ar);
 
-/**
- * Shared by #ED_view3d_draw_offscreen and #view3d_main_region_draw_objects
- *
- * \note \a C and \a grid_unit will be NULL when \a draw_offscreen is set.
- * \note Drawing lamps and opengl render uses this, so dont do grease pencil or view widgets here.
- */
-static void view3d_draw_objects(
-        const bContext *C,
-        Scene *scene, View3D *v3d, ARegion *ar,
-        const char **grid_unit,
-        const bool do_bgpic, const bool draw_offscreen, GPUFX *fx)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	Base *base;
-	const bool do_camera_frame = !draw_offscreen;
-	const bool draw_grids = !draw_offscreen && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0;
-	const bool draw_floor = (rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO);
-	/* only draw grids after in solid modes, else it hovers over mesh wires */
-	const bool draw_grids_after = draw_grids && draw_floor && (v3d->drawtype > OB_WIRE) && fx;
-	bool do_composite_xray = false;
-	bool xrayclear = true;
-
-	if (!draw_offscreen) {
-		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
-	}
+	/* local coordinate visible rect inside region, to accomodate overlapping ui */
+	rcti rect;
+	ED_region_visible_rect(ar, &rect);
 
-	if (rv3d->rflag & RV3D_CLIPPING)
-		view3d_draw_clipping(rv3d);
+	/* Leave room for previously drawn info. */
+	rect.ymax -= offset;
 
-	/* set zbuffer after we draw clipping region */
-	if (v3d->drawtype > OB_WIRE) {
-		v3d->zbuf = true;
-	}
-	else {
-		v3d->zbuf = false;
-	}
+	view3d_draw_border(C, ar);
+	view3d_draw_grease_pencil(C);
 
-	/* special case (depth for wire color) */
-	if (v3d->drawtype <= OB_WIRE) {
-		if (scene->obedit && scene->obedit->type == OB_MESH) {
-			Mesh *me = scene->obedit->data;
-			if (me->drawflag & ME_DRAWEIGHT) {
-				v3d->zbuf = true;
-			}
-		}
-	}
+	BLF_batch_draw_begin();
 
-	if (v3d->zbuf) {
-		glEnable(GL_DEPTH_TEST);
+	if (U.uiflag & USER_SHOW_ROTVIEWICON) {
+		draw_view_axis(rv3d, &rect);
 	}
 
-	/* ortho grid goes first, does not write to depth buffer and doesn't need depth test so it will override
-	 * objects if done last */
-	if (draw_grids) {
-		/* needs to be done always, gridview is adjusted in drawgrid() now, but only for ortho views. */
-		rv3d->gridview = ED_view3d_grid_scale(scene, v3d, grid_unit);
-
-		if (!draw_floor) {
-			ED_region_pixelspace(ar);
-			*grid_unit = NULL;  /* drawgrid need this to detect/affect smallest valid unit... */
-			drawgrid(&scene->unit, ar, v3d, grid_unit);
-			/* XXX make function? replaces persp(1) */
-			glMatrixMode(GL_PROJECTION);
-			glLoadMatrixf(rv3d->winmat);
-			glMatrixMode(GL_MODELVIEW);
-			glLoadMatrixf(rv3d->viewmat);
-		}
-		else if (!draw_grids_after) {
-			drawfloor(scene, v3d, grid_unit, true);
+	if ((v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) == 0) {
+		if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_no_scrub(wm)) {
+			ED_scene_draw_fps(scene, &rect);
 		}
-	}
-
-	/* important to do before clipping */
-	if (do_bgpic) {
-		view3d_draw_bgpic_test(scene, ar, v3d, false, do_camera_frame);
-	}
-
-	if (rv3d->rflag & RV3D_CLIPPING) {
-		ED_view3d_clipping_set(rv3d);
-	}
-
-	/* draw set first */
-	if (scene->set) {
-		const short dflag = DRAW_CONSTCOLOR | DRAW_SCENESET;
-		Scene *sce_iter;
-		for (SETLOOPER(scene->set, sce_iter, base)) {
-			if (v3d->lay & base->lay) {
-				UI_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-				draw_object(scene, ar, v3d, base, dflag);
-
-				if (base->object->transflag & OB_DUPLI) {
-					draw_dupli_objects_color(scene, ar, v3d, base, dflag, TH_UNDEFINED);
-				}
-			}
+		else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
+			draw_viewport_name(ar, v3d, &rect);
 		}
 
-		/* Transp and X-ray afterdraw stuff for sets is done later */
-	}
-
-
-	if (draw_offscreen) {
-		for (base = scene->base.first; base; base = base->next) {
-			if (v3d->lay & base->lay) {
-				/* dupli drawing */
-				if (base->object->transflag & OB_DUPLI)
-					draw_dupli_objects(scene, ar, v3d, base);
-
-				draw_object(scene, ar, v3d, base, 0);
-			}
+		if (U.uiflag & USER_DRAWVIEWINFO) {
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+			Object *ob = OBACT(view_layer);
+			draw_selected_name(scene, ob, &rect);
 		}
-	}
-	else {
-		unsigned int lay_used = 0;
 
-		/* then draw not selected and the duplis, but skip editmode object */
-		for (base = scene->base.first; base; base = base->next) {
-			lay_used |= base->lay;
-
-			if (v3d->lay & base->lay) {
+#if 0 /* TODO */
+		if (grid_unit) { /* draw below the viewport name */
+			char numstr[32] = "";
 
-				/* dupli drawing */
-				if (base->object->transflag & OB_DUPLI) {
-					draw_dupli_objects(scene, ar, v3d, base);
-				}
-				if ((base->flag & SELECT) == 0) {
-					if (base->object != scene->obedit)
-						draw_object(scene, ar, v3d, base, 0);
-				}
+			UI_FontThemeColor(BLF_default(), TH_TEXT_HI);
+			if (v3d->grid != 1.0f) {
+				BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid);
 			}
-		}
-
-		/* mask out localview */
-		v3d->lay_used = lay_used & ((1 << 20) - 1);
 
-		/* draw selected and editmode */
-		for (base = scene->base.first; base; base = base->next) {
-			if (v3d->lay & base->lay) {
-				if (base->object == scene->obedit || (base->flag & SELECT)) {
-					draw_object(scene, ar, v3d, base, 0);
-				}
-			}
+			BLF_draw_default_ascii(
+			        rect.xmin + U.widget_unit,
+			        rect.ymax - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f,
+			        numstr[0] ? numstr : grid_unit, sizeof(numstr));
 		}
+#endif
 	}
 
-	/* perspective floor goes last to use scene depth and avoid writing to depth buffer */
-	if (draw_grids_after) {
-		drawfloor(scene, v3d, grid_unit, false);
-	}
-
-	/* must be before xray draw which clears the depth buffer */
-	if (v3d->flag2 & V3D_SHOW_GPENCIL) {
-		wmWindowManager *wm = (C != NULL) ? CTX_wm_manager(C) : NULL;
-
-		/* must be before xray draw which clears the depth buffer */
-		if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
-		ED_gpencil_draw_view3d(wm, scene, v3d, ar, true);
-		if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-	}
-
-	/* transp and X-ray afterdraw stuff */
-	if (v3d->afterdraw_transp.first)     view3d_draw_transp(scene, ar, v3d);
-
-	/* always do that here to cleanup depth buffers if none needed */
-	if (fx) {
-		do_composite_xray = v3d->zbuf && (v3d->afterdraw_xray.first || v3d->afterdraw_xraytransp.first);
-		GPU_fx_compositor_setup_XRay_pass(fx, do_composite_xray);
-	}
-
-	if (v3d->afterdraw_xray.first)       view3d_draw_xray(scene, ar, v3d, &xrayclear);
-	if (v3d->afterdraw_xraytransp.first) view3d_draw_xraytransp(scene, ar, v3d, xrayclear);
-
-	if (fx && do_composite_xray) {
-		GPU_fx_compositor_XRay_resolve(fx);
-	}
-
-	if (!draw_offscreen) {
-		ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
-	}
-
-	if (rv3d->rflag & RV3D_CLIPPING)
-		ED_view3d_clipping_disable();
-
-	/* important to do after clipping */
-	if (do_bgpic) {
-		view3d_draw_bgpic_test(scene, ar, v3d, true, do_camera_frame);
-	}
+	BLF_batch_draw_end();
+}
 
-	if (!draw_offscreen) {
-		BIF_draw_manipulator(C);
-	}
+static void view3d_draw_view(const bContext *C, ARegion *ar)
+{
+	ED_view3d_draw_setup_view(CTX_wm_window(C), CTX_data_depsgraph(C), CTX_data_scene(C), ar, CTX_wm_view3d(C), NULL, NULL, NULL);
 
-	/* cleanup */
-	if (v3d->zbuf) {
-		v3d->zbuf = false;
-		glDisable(GL_DEPTH_TEST);
-	}
+	/* Only 100% compliant on new spec goes bellow */
+	DRW_draw_view(C);
+}
 
-	if ((v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
-		GPU_free_images_old();
+RenderEngineType *ED_view3d_engine_type(Scene *scene, int drawtype)
+{
+	/*
+	 * Tempory viewport draw modes until we have a proper system.
+	 * all modes are done in the draw manager, except
+	 * cycles material as it is an external render engine.
+	 */
+	if (strcmp(scene->r.engine, RE_engine_id_CYCLES) == 0 && drawtype == OB_MATERIAL) {
+		return RE_engines_find(RE_engine_id_BLENDER_EEVEE);
 	}
+	return RE_engines_find(scene->r.engine);
 }
 
-static void view3d_main_region_setup_view(
-        Scene *scene, View3D *v3d, ARegion *ar, float viewmat[4][4], float winmat[4][4], const rcti *rect)
+void view3d_main_region_draw(const bContext *C, ARegion *ar)
 {
-	RegionView3D *rv3d = ar->regiondata;
+	View3D *v3d = CTX_wm_view3d(C);
 
-	ED_view3d_update_viewmat(scene, v3d, ar, viewmat, winmat, rect);
+	view3d_draw_view(C, ar);
 
-	/* set for opengl */
-	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(rv3d->winmat);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadMatrixf(rv3d->viewmat);
-}
+	GPU_free_images_old();
+	GPU_pass_cache_garbage_collect();
 
-/**
- * Store values from #RegionView3D, set when drawing.
- * This is needed when we draw with to a viewport using a different matrix (offscreen drawing for example).
- *
- * Values set by #ED_view3d_update_viewmat should be handled here.
- */
-struct RV3DMatrixStore {
-	float winmat[4][4];
-	float viewmat[4][4];
-	float viewinv[4][4];
-	float persmat[4][4];
-	float persinv[4][4];
-	float viewcamtexcofac[4];
-	float pixsize;
-};
-
-struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d)
-{
-	struct RV3DMatrixStore *rv3dmat = MEM_mallocN(sizeof(*rv3dmat), __func__);
-	copy_m4_m4(rv3dmat->winmat, rv3d->winmat);
-	copy_m4_m4(rv3dmat->viewmat, rv3d->viewmat);
-	copy_m4_m4(rv3dmat->persmat, rv3d->persmat);
-	copy_m4_m4(rv3dmat->persinv, rv3d->persinv);
-	copy_m4_m4(rv3dmat->viewinv, rv3d->viewinv);
-	copy_v4_v4(rv3dmat->viewcamtexcofac, rv3d->viewcamtexcofac);
-	rv3dmat->pixsize = rv3d->pixsize;
-	return (void *)rv3dmat;
-}
+	/* XXX This is in order to draw UI batches with the DRW
+	 * olg context since we now use it for drawing the entire area */
+	gpu_batch_presets_reset();
 
-void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat)
-{
-	copy_m4_m4(rv3d->winmat, rv3dmat->winmat);
-	copy_m4_m4(rv3d->viewmat, rv3dmat->viewmat);
-	copy_m4_m4(rv3d->persmat, rv3dmat->persmat);
-	copy_m4_m4(rv3d->persinv, rv3dmat->persinv);
-	copy_m4_m4(rv3d->viewinv, rv3dmat->viewinv);
-	copy_v4_v4(rv3d->viewcamtexcofac, rv3dmat->viewcamtexcofac);
-	rv3d->pixsize = rv3dmat->pixsize;
-}
+	/* No depth test for drawing action zones afterwards. */
+	glDisable(GL_DEPTH_TEST);
 
-void ED_view3d_draw_offscreen_init(Scene *scene, View3D *v3d)
-{
-	/* shadow buffers, before we setup matrices */
-	if (draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
-		gpu_update_lamps_shadows_world(scene, v3d);
+	v3d->flag |= V3D_INVALID_BACKBUF;
 }
 
-/*
- * Function to clear the view
- */
-static void view3d_main_region_clear(Scene *scene, View3D *v3d, ARegion *ar)
-{
-	if (scene->world && (v3d->flag3 & V3D_SHOW_WORLD)) {
-		RegionView3D *rv3d = ar->regiondata;
-		GPUMaterial *gpumat = GPU_material_world(scene, scene->world);
-
-		/* calculate full shader for background */
-		GPU_material_bind(gpumat, 1, 1, 1.0, false, rv3d->viewmat, rv3d->viewinv, rv3d->viewcamtexcofac, (v3d->scenelock != 0));
-
-		bool material_not_bound = !GPU_material_bound(gpumat);
-
-		if (material_not_bound) {
-			glMatrixMode(GL_PROJECTION);
-			glPushMatrix();
-			glLoadIdentity();
-			glMatrixMode(GL_MODELVIEW);
-			glPushMatrix();
-			glLoadIdentity();
-			glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
-		}
+/* -------------------------------------------------------------------- */
 
-		/* Draw world */
-		glEnable(GL_DEPTH_TEST);
-		glDepthFunc(GL_ALWAYS);
-		glBegin(GL_TRIANGLE_STRIP);
-		glVertex3f(-1.0, -1.0, 1.0);
-		glVertex3f(1.0, -1.0, 1.0);
-		glVertex3f(-1.0, 1.0, 1.0);
-		glVertex3f(1.0, 1.0, 1.0);
-		glEnd();
-
-		if (material_not_bound) {
-			glMatrixMode(GL_PROJECTION);
-			glPopMatrix();
-			glMatrixMode(GL_MODELVIEW);
-			glPopMatrix();
-		}
+/** \name Offscreen Drawing
+ * \{ */
 
-		GPU_material_unbind(gpumat);
+static void view3d_stereo3d_setup_offscreen(
+        Depsgraph *depsgraph, Scene *scene, View3D *v3d, ARegion *ar,
+        float winmat[4][4], const char *viewname)
+{
+	/* update the viewport matrices with the new camera */
+	if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
+		float viewmat[4][4];
+		const bool is_left = STREQ(viewname, STEREO_LEFT_NAME);
 
-		glDepthFunc(GL_LEQUAL);
-		glDisable(GL_DEPTH_TEST);
+		BKE_camera_multiview_view_matrix(&scene->r, v3d->camera, is_left, viewmat);
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, winmat, NULL);
 	}
-	else {
-		if (UI_GetThemeValue(TH_SHOW_BACK_GRAD)) {
-			glMatrixMode(GL_PROJECTION);
-			glPushMatrix();
-			glLoadIdentity();
-			glMatrixMode(GL_MODELVIEW);
-			glPushMatrix();
-			glLoadIdentity();
-
-			glEnable(GL_DEPTH_TEST);
-			glDepthFunc(GL_ALWAYS);
-			glBegin(GL_QUADS);
-			UI_ThemeColor(TH_LOW_GRAD);
-			glVertex3f(-1.0, -1.0, 1.0);
-			glVertex3f(1.0, -1.0, 1.0);
-			UI_ThemeColor(TH_HIGH_GRAD);
-			glVertex3f(1.0, 1.0, 1.0);
-			glVertex3f(-1.0, 1.0, 1.0);
-			glEnd();
-			glDepthFunc(GL_LEQUAL);
-			glDisable(GL_DEPTH_TEST);
-
-			glMatrixMode(GL_PROJECTION);
-			glPopMatrix();
-
-			glMatrixMode(GL_MODELVIEW);
-			glPopMatrix();
-		}
-		else {
-			UI_ThemeClearColorAlpha(TH_HIGH_GRAD, 1.0f);
-			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		}
+	else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
+		float viewmat[4][4];
+		Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname);
+
+		BKE_camera_multiview_view_matrix(&scene->r, camera, false, viewmat);
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, winmat, NULL);
 	}
 }
 
-/* ED_view3d_draw_offscreen_init should be called before this to initialize
- * stuff like shadow buffers
- */
 void ED_view3d_draw_offscreen(
-        Scene *scene, View3D *v3d, ARegion *ar, int winx, int winy,
+        Depsgraph *depsgraph, Scene *scene,
+        int drawtype,
+        View3D *v3d, ARegion *ar, int winx, int winy,
         float viewmat[4][4], float winmat[4][4],
-        bool do_bgpic, bool do_sky, bool is_persp, const char *viewname,
-        GPUFX *fx, GPUFXSettings *fx_settings,
-        GPUOffScreen *ofs)
+        bool do_sky, bool UNUSED(is_persp), const char *viewname,
+        GPUFXSettings *UNUSED(fx_settings),
+        GPUOffScreen *ofs, GPUViewport *viewport)
 {
-	struct bThemeState theme_state;
-	int bwinx, bwiny;
-	rcti brect;
-	bool do_compositing = false;
 	RegionView3D *rv3d = ar->regiondata;
-
-	glPushMatrix();
+	RenderEngineType *engine_type = ED_view3d_engine_type(scene, drawtype);
 
 	/* set temporary new size */
-	bwinx = ar->winx;
-	bwiny = ar->winy;
-	brect = ar->winrct;
+	int bwinx = ar->winx;
+	int bwiny = ar->winy;
+	rcti brect = ar->winrct;
 
 	ar->winx = winx;
 	ar->winy = winy;
@@ -3193,6 +1331,7 @@ void ED_view3d_draw_offscreen(
 	ar->winrct.xmax = winx;
 	ar->winrct.ymax = winy;
 
+	struct bThemeState theme_state;
 	UI_Theme_Store(&theme_state);
 	UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
 
@@ -3205,66 +1344,28 @@ void ED_view3d_draw_offscreen(
 		GPU_free_images_anim();
 	}
 
-	/* setup view matrices before fx or unbinding the offscreen buffers will cause issues */
+	gpuPushProjectionMatrix();
+	gpuLoadIdentity();
+	gpuPushMatrix();
+	gpuLoadIdentity();
+
 	if ((viewname != NULL && viewname[0] != '\0') && (viewmat == NULL) && rv3d->persp == RV3D_CAMOB && v3d->camera)
-		view3d_stereo3d_setup_offscreen(scene, v3d, ar, winmat, viewname);
+		view3d_stereo3d_setup_offscreen(depsgraph, scene, v3d, ar, winmat, viewname);
 	else
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, winmat, NULL);
-
-	/* framebuffer fx needed, we need to draw offscreen first */
-	if (v3d->fx_settings.fx_flag && fx) {
-		GPUSSAOSettings *ssao = NULL;
-
-		if (v3d->drawtype < OB_SOLID) {
-			ssao = v3d->fx_settings.ssao;
-			v3d->fx_settings.ssao = NULL;
-		}
-
-		do_compositing = GPU_fx_compositor_initialize_passes(fx, &ar->winrct, NULL, fx_settings);
-
-		if (ssao)
-			v3d->fx_settings.ssao = ssao;
-	}
-
-	/* clear opengl buffers */
-	if (do_sky) {
-		view3d_main_region_clear(scene, v3d, ar);
-	}
-	else {
-		glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	}
+		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, winmat, NULL);
 
 	/* main drawing call */
-	view3d_draw_objects(NULL, scene, v3d, ar, NULL, do_bgpic, true, do_compositing ? fx : NULL);
-
-	/* post process */
-	if (do_compositing) {
-		if (!winmat)
-			is_persp = rv3d->is_persp;
-		GPU_fx_do_composite_pass(fx, winmat, is_persp, scene, ofs);
-	}
-
-	if ((v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
-		/* draw grease-pencil stuff */
-		ED_region_pixelspace(ar);
-
-
-		if (v3d->flag2 & V3D_SHOW_GPENCIL) {
-			/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-			ED_gpencil_draw_view3d(NULL, scene, v3d, ar, false);
-		}
-
-		/* freeing the images again here could be done after the operator runs, leaving for now */
-		GPU_free_images_anim();
-	}
+	DRW_draw_render_loop_offscreen(
+	        depsgraph, engine_type, ar, v3d,
+	        do_sky, ofs, viewport);
 
 	/* restore size */
 	ar->winx = bwinx;
 	ar->winy = bwiny;
 	ar->winrct = brect;
 
-	glPopMatrix();
+	gpuPopProjectionMatrix();
+	gpuPopMatrix();
 
 	UI_Theme_Restore(&theme_state);
 
@@ -3272,39 +1373,22 @@ void ED_view3d_draw_offscreen(
 }
 
 /**
- * Set the correct matrices
- */
-void ED_view3d_draw_setup_view(
-        wmWindow *win, Scene *scene, ARegion *ar, View3D *v3d, float viewmat[4][4], float winmat[4][4], const rcti *rect)
-{
-	RegionView3D *rv3d = ar->regiondata;
-
-	/* Setup the view matrix. */
-	if (view3d_stereo3d_active(win, scene, v3d, rv3d)) {
-		view3d_stereo3d_setup(scene, v3d, ar, rect);
-	}
-	else {
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, winmat, rect);
-	}
-}
-
-/**
  * Utility func for ED_view3d_draw_offscreen
  *
  * \param ofs: Optional off-screen buffer, can be NULL.
  * (avoids re-creating when doing multiple GL renders).
  */
 ImBuf *ED_view3d_draw_offscreen_imbuf(
-        Scene *scene, View3D *v3d, ARegion *ar, int sizex, int sizey,
+        Depsgraph *depsgraph, Scene *scene,
+        int drawtype,
+        View3D *v3d, ARegion *ar, int sizex, int sizey,
         unsigned int flag, unsigned int draw_flags,
         int alpha_mode, int samples, const char *viewname,
         /* output vars */
-        GPUFX *fx, GPUOffScreen *ofs, char err_out[256])
+        GPUOffScreen *ofs, char err_out[256])
 {
 	RegionView3D *rv3d = ar->regiondata;
-	ImBuf *ibuf;
 	const bool draw_sky = (alpha_mode == R_ADDSKY);
-	const bool draw_background = (draw_flags & V3D_OFSDRAW_USE_BACKGROUND);
 	const bool use_full_sample = (draw_flags & V3D_OFSDRAW_USE_FULL_SAMPLE);
 
 	/* view state */
@@ -3318,33 +1402,36 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 	}
 
 	const bool own_ofs = (ofs == NULL);
+	DRW_opengl_context_enable();
 
 	if (own_ofs) {
 		/* bind */
-		ofs = GPU_offscreen_create(sizex, sizey, use_full_sample ? 0 : samples, err_out);
+		ofs = GPU_offscreen_create(sizex, sizey, use_full_sample ? 0 : samples, true, false, err_out);
 		if (ofs == NULL) {
+			DRW_opengl_context_disable();
 			return NULL;
 		}
 	}
 
-	ED_view3d_draw_offscreen_init(scene, v3d);
-
 	GPU_offscreen_bind(ofs, true);
 
 	/* read in pixels & stamp */
-	ibuf = IMB_allocImBuf(sizex, sizey, 32, flag);
+	ImBuf *ibuf = IMB_allocImBuf(sizex, sizey, 32, flag);
 
 	/* render 3d view */
 	if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
 		CameraParams params;
 		Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname);
+		const Object *camera_eval = DEG_get_evaluated_object(
+		                                depsgraph,
+		                                camera);
 
 		BKE_camera_params_init(&params);
 		/* fallback for non camera objects */
 		params.clipsta = v3d->near;
 		params.clipend = v3d->far;
-		BKE_camera_params_from_object(&params, camera);
-		BKE_camera_multiview_params(&scene->r, &params, camera, viewname);
+		BKE_camera_params_from_object(&params, camera_eval);
+		BKE_camera_multiview_params(&scene->r, &params, camera_eval, viewname);
 		BKE_camera_params_compute_viewplane(&params, sizex, sizey, scene->r.xasp, scene->r.yasp);
 		BKE_camera_params_compute_matrix(&params);
 
@@ -3357,7 +1444,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 		rctf viewplane;
 		float clipsta, clipend;
 
-		is_ortho = ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL);
+		is_ortho = ED_view3d_viewplane_get(depsgraph, v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL);
 		if (is_ortho) {
 			orthographic_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, -clipend, clipend);
 		}
@@ -3369,9 +1456,10 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 	if ((samples && use_full_sample) == 0) {
 		/* Single-pass render, common case */
 		ED_view3d_draw_offscreen(
-		        scene, v3d, ar, sizex, sizey, NULL, winmat,
-		        draw_background, draw_sky, !is_ortho, viewname,
-		        fx, &fx_settings, ofs);
+		        depsgraph, scene, drawtype,
+		        v3d, ar, sizex, sizey, NULL, winmat,
+		        draw_sky, !is_ortho, viewname,
+		        &fx_settings, ofs, NULL);
 
 		if (ibuf->rect_float) {
 			GPU_offscreen_read_pixels(ofs, GL_FLOAT, ibuf->rect_float);
@@ -3385,28 +1473,22 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 		 * Use because OpenGL may use a lower quality MSAA, and only over-sample edges. */
 		static float jit_ofs[32][2];
 		float winmat_jitter[4][4];
-		/* use imbuf as temp storage, before writing into it from accumulation buffer */
-		unsigned char *rect_temp = ibuf->rect ? (void *)ibuf->rect : (void *)ibuf->rect_float;
-		unsigned int *accum_buffer = MEM_mallocN(sizex * sizey * sizeof(int[4]), "accum1");
-		unsigned int i;
-		int j;
+		float *rect_temp = (ibuf->rect_float) ? ibuf->rect_float : MEM_mallocN(sizex * sizey * sizeof(float[4]), "rect_temp");
+		float *accum_buffer = MEM_mallocN(sizex * sizey * sizeof(float[4]), "accum_buffer");
+		GPUViewport *viewport = GPU_viewport_create_from_offscreen(ofs);
 
 		BLI_jitter_init(jit_ofs, samples);
 
 		/* first sample buffer, also initializes 'rv3d->persmat' */
 		ED_view3d_draw_offscreen(
-		        scene, v3d, ar, sizex, sizey, NULL, winmat,
-		        draw_background, draw_sky, !is_ortho, viewname,
-		        fx, &fx_settings, ofs);
-		GPU_offscreen_read_pixels(ofs, GL_UNSIGNED_BYTE, rect_temp);
-
-		i = sizex * sizey * 4;
-		while (i--) {
-			accum_buffer[i] = rect_temp[i];
-		}
+		        depsgraph, scene, drawtype,
+		        v3d, ar, sizex, sizey, NULL, winmat,
+		        draw_sky, !is_ortho, viewname,
+		        &fx_settings, ofs, viewport);
+		GPU_offscreen_read_pixels(ofs, GL_FLOAT, accum_buffer);
 
 		/* skip the first sample */
-		for (j = 1; j < samples; j++) {
+		for (int j = 1; j < samples; j++) {
 			copy_m4_m4(winmat_jitter, winmat);
 			window_translate_m4(
 			        winmat_jitter, rv3d->persmat,
@@ -3414,29 +1496,40 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 			        (jit_ofs[j][1] * 2.0f) / sizey);
 
 			ED_view3d_draw_offscreen(
-			        scene, v3d, ar, sizex, sizey, NULL, winmat_jitter,
-			        draw_background, draw_sky, !is_ortho, viewname,
-			        fx, &fx_settings, ofs);
-			GPU_offscreen_read_pixels(ofs, GL_UNSIGNED_BYTE, rect_temp);
+			        depsgraph, scene, drawtype,
+			        v3d, ar, sizex, sizey, NULL, winmat_jitter,
+			        draw_sky, !is_ortho, viewname,
+			        &fx_settings, ofs, viewport);
+			GPU_offscreen_read_pixels(ofs, GL_FLOAT, rect_temp);
 
-			i = sizex * sizey * 4;
+			unsigned int i = sizex * sizey * 4;
 			while (i--) {
 				accum_buffer[i] += rect_temp[i];
 			}
 		}
 
+		{
+			/* don't free data owned by 'ofs' */
+			GPU_viewport_clear_from_offscreen(viewport);
+			GPU_viewport_free(viewport);
+		}
+
+		if (ibuf->rect_float == NULL) {
+			MEM_freeN(rect_temp);
+		}
+
 		if (ibuf->rect_float) {
 			float *rect_float = ibuf->rect_float;
-			i = sizex * sizey * 4;
+			unsigned int i = sizex * sizey * 4;
 			while (i--) {
-				rect_float[i] = (float)(accum_buffer[i] / samples) * (1.0f / 255.0f);
+				rect_float[i] = accum_buffer[i] / samples;
 			}
 		}
 		else {
 			unsigned char *rect_ub = (unsigned char *)ibuf->rect;
-			i = sizex * sizey * 4;
+			unsigned int i = sizex * sizey * 4;
 			while (i--) {
-				rect_ub[i] = accum_buffer[i] / samples;
+				rect_ub[i] = (unsigned char)(255.0f * accum_buffer[i] / samples);
 			}
 		}
 
@@ -3450,6 +1543,8 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 		GPU_offscreen_free(ofs);
 	}
 
+	DRW_opengl_context_disable();
+
 	if (ibuf->rect_float && ibuf->rect)
 		IMB_rect_from_float(ibuf);
 
@@ -3465,10 +1560,12 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
  * \note used by the sequencer
  */
 ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
-        Scene *scene, Object *camera, int width, int height,
-        unsigned int flag, unsigned int draw_flags, int drawtype,
+        Depsgraph *depsgraph, Scene *scene,
+        int drawtype,
+        Object *camera, int width, int height,
+        unsigned int flag, unsigned int draw_flags,
         int alpha_mode, int samples, const char *viewname,
-        GPUFX *fx, GPUOffScreen *ofs, char err_out[256])
+        GPUOffScreen *ofs, char err_out[256])
 {
 	View3D v3d = {NULL};
 	ARegion ar = {NULL};
@@ -3490,9 +1587,9 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
 	if (draw_flags & V3D_OFSDRAW_USE_SOLID_TEX) {
 		v3d.flag2 |= V3D_SOLID_TEX;
 	}
-	if (draw_flags & V3D_OFSDRAW_USE_BACKGROUND) {
-		v3d.flag3 |= V3D_SHOW_WORLD;
-	}
+
+	v3d.flag3 |= V3D_SHOW_WORLD;
+
 	if (draw_flags & V3D_OFSDRAW_USE_CAMERA_DOF) {
 		if (camera->type == OB_CAMERA) {
 			v3d.fx_settings.dof = &((Camera *)camera->data)->gpu_dof;
@@ -3508,11 +1605,13 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
 
 	{
 		CameraParams params;
-		Object *view_camera = BKE_camera_multiview_render(scene, v3d.camera, viewname);
+		const Object *view_camera_eval = DEG_get_evaluated_object(
+		                                     depsgraph,
+		                                     BKE_camera_multiview_render(scene, v3d.camera, viewname));
 
 		BKE_camera_params_init(&params);
-		BKE_camera_params_from_object(&params, view_camera);
-		BKE_camera_multiview_params(&scene->r, &params, view_camera, viewname);
+		BKE_camera_params_from_object(&params, view_camera_eval);
+		BKE_camera_multiview_params(&scene->r, &params, view_camera_eval, viewname);
 		BKE_camera_params_compute_viewplane(&params, width, height, scene->r.xasp, scene->r.yasp);
 		BKE_camera_params_compute_matrix(&params);
 
@@ -3526,670 +1625,9 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
 	invert_m4_m4(rv3d.persinv, rv3d.viewinv);
 
 	return ED_view3d_draw_offscreen_imbuf(
-	        scene, &v3d, &ar, width, height, flag, draw_flags,
-	        alpha_mode, samples, viewname, fx, ofs, err_out);
+	        depsgraph, scene, drawtype,
+	        &v3d, &ar, width, height, flag,
+	        draw_flags, alpha_mode, samples, viewname, ofs, err_out);
 }
 
-
-/**
- * \note The info that this uses is updated in #ED_refresh_viewport_fps,
- * which currently gets called during #SCREEN_OT_animation_step.
- */
-void ED_scene_draw_fps(Scene *scene, const rcti *rect)
-{
-	ScreenFrameRateInfo *fpsi = scene->fps_info;
-	float fps;
-	char printable[16];
-	int i, tot;
-
-	if (!fpsi || !fpsi->lredrawtime || !fpsi->redrawtime)
-		return;
-
-	printable[0] = '\0';
-
-#if 0
-	/* this is too simple, better do an average */
-	fps = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime))
-#else
-	fpsi->redrawtimes_fps[fpsi->redrawtime_index] = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime));
-
-	for (i = 0, tot = 0, fps = 0.0f; i < REDRAW_FRAME_AVERAGE; i++) {
-		if (fpsi->redrawtimes_fps[i]) {
-			fps += fpsi->redrawtimes_fps[i];
-			tot++;
-		}
-	}
-	if (tot) {
-		fpsi->redrawtime_index = (fpsi->redrawtime_index + 1) % REDRAW_FRAME_AVERAGE;
-
-		//fpsi->redrawtime_index++;
-		//if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE)
-		//	fpsi->redrawtime = 0;
-
-		fps = fps / tot;
-	}
-#endif
-
-	/* is this more than half a frame behind? */
-	if (fps + 0.5f < (float)(FPS)) {
-		UI_ThemeColor(TH_REDALERT);
-		BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %.2f"), fps);
-	}
-	else {
-		UI_ThemeColor(TH_TEXT_HI);
-		BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %i"), (int)(fps + 0.5f));
-	}
-
-#ifdef WITH_INTERNATIONAL
-	BLF_draw_default(rect->xmin + U.widget_unit,  rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
-#else
-	BLF_draw_default_ascii(rect->xmin + U.widget_unit,  rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
-#endif
-}
-
-static bool view3d_main_region_do_render_draw(const Scene *scene)
-{
-	RenderEngineType *type = RE_engines_find(scene->r.engine);
-
-	return (type && type->view_update && type->view_draw);
-}
-
-bool ED_view3d_calc_render_border(
-        const Scene *scene, const View3D *v3d, const ARegion *ar,
-        rcti *rect)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	rctf viewborder;
-	bool use_border;
-
-	/* test if there is a 3d view rendering */
-	if (v3d->drawtype != OB_RENDER || !view3d_main_region_do_render_draw(scene))
-		return false;
-
-	/* test if there is a border render */
-	if (rv3d->persp == RV3D_CAMOB)
-		use_border = (scene->r.mode & R_BORDER) != 0;
-	else
-		use_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0;
-
-	if (!use_border)
-		return false;
-
-	/* compute border */
-	if (rv3d->persp == RV3D_CAMOB) {
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, false);
-
-		rect->xmin = viewborder.xmin + scene->r.border.xmin * BLI_rctf_size_x(&viewborder);
-		rect->ymin = viewborder.ymin + scene->r.border.ymin * BLI_rctf_size_y(&viewborder);
-		rect->xmax = viewborder.xmin + scene->r.border.xmax * BLI_rctf_size_x(&viewborder);
-		rect->ymax = viewborder.ymin + scene->r.border.ymax * BLI_rctf_size_y(&viewborder);
-	}
-	else {
-		rect->xmin = v3d->render_border.xmin * ar->winx;
-		rect->xmax = v3d->render_border.xmax * ar->winx;
-		rect->ymin = v3d->render_border.ymin * ar->winy;
-		rect->ymax = v3d->render_border.ymax * ar->winy;
-	}
-
-	BLI_rcti_translate(rect, ar->winrct.xmin, ar->winrct.ymin);
-	BLI_rcti_isect(&ar->winrct, rect, rect);
-
-	return true;
-}
-
-static bool view3d_main_region_draw_engine(const bContext *C, Scene *scene,
-                                         ARegion *ar, View3D *v3d,
-                                         bool clip_border, const rcti *border_rect)
-{
-	RegionView3D *rv3d = ar->regiondata;
-	RenderEngineType *type;
-	GLint scissor[4];
-
-	/* create render engine */
-	if (!rv3d->render_engine) {
-		RenderEngine *engine;
-
-		type = RE_engines_find(scene->r.engine);
-
-		if (!(type->view_update && type->view_draw))
-			return false;
-
-		engine = RE_engine_create_ex(type, true);
-
-		engine->tile_x = scene->r.tilex;
-		engine->tile_y = scene->r.tiley;
-
-		type->view_update(engine, C);
-
-		rv3d->render_engine = engine;
-	}
-
-	/* setup view matrices */
-	view3d_main_region_setup_view(scene, v3d, ar, NULL, NULL, NULL);
-
-	/* background draw */
-	ED_region_pixelspace(ar);
-
-	if (clip_border) {
-		/* for border draw, we only need to clear a subset of the 3d view */
-		if (border_rect->xmax > border_rect->xmin && border_rect->ymax > border_rect->ymin) {
-			glGetIntegerv(GL_SCISSOR_BOX, scissor);
-			glScissor(border_rect->xmin, border_rect->ymin,
-			          BLI_rcti_size_x(border_rect), BLI_rcti_size_y(border_rect));
-		}
-		else {
-			return false;
-		}
-	}
-
-	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	if (v3d->flag & V3D_DISPBGPICS)
-		view3d_draw_bgpic_test(scene, ar, v3d, false, true);
-	else
-		fdrawcheckerboard(0, 0, ar->winx, ar->winy);
-
-	/* render result draw */
-	type = rv3d->render_engine->type;
-	type->view_draw(rv3d->render_engine, C);
-
-	if (v3d->flag & V3D_DISPBGPICS)
-		view3d_draw_bgpic_test(scene, ar, v3d, true, true);
-
-	if (clip_border) {
-		/* restore scissor as it was before */
-		glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
-	}
-
-	return true;
-}
-
-static void view3d_main_region_draw_engine_info(View3D *v3d, RegionView3D *rv3d, ARegion *ar, bool render_border)
-{
-	float fill_color[4] = {0.0f, 0.0f, 0.0f, 0.25f};
-
-	if (!rv3d->render_engine || !rv3d->render_engine->text[0])
-		return;
-
-	if (render_border) {
-		/* draw darkened background color. no alpha because border render does
-		 * partial redraw and will not redraw the region behind this info bar */
-		float alpha = 1.0f - fill_color[3];
-		Camera *camera = ED_view3d_camera_data_get(v3d, rv3d);
-
-		if (camera) {
-			if (camera->flag & CAM_SHOWPASSEPARTOUT) {
-				alpha *= (1.0f - camera->passepartalpha);
-			}
-		}
-
-		UI_GetThemeColor3fv(TH_HIGH_GRAD, fill_color);
-		mul_v3_fl(fill_color, alpha);
-		fill_color[3] = 1.0f;
-	}
-
-	ED_region_info_draw(ar, rv3d->render_engine->text, fill_color, true);
-}
-
-static bool view3d_stereo3d_active(wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d)
-{
-	if ((scene->r.scemode & R_MULTIVIEW) == 0) {
-		return false;
-	}
-
-	if ((v3d->camera == NULL) || (v3d->camera->type != OB_CAMERA) || rv3d->persp != RV3D_CAMOB) {
-		return false;
-	}
-
-	switch (v3d->stereo3d_camera) {
-		case STEREO_MONO_ID:
-			return false;
-			break;
-		case STEREO_3D_ID:
-			/* win will be NULL when calling this from the selection or draw loop. */
-			if ((win == NULL) || (WM_stereo3d_enabled(win, true) == false)) {
-				return false;
-			}
-			if (((scene->r.views_format & SCE_VIEWS_FORMAT_MULTIVIEW) != 0) &&
-			    !BKE_scene_multiview_is_stereo3d(&scene->r))
-			{
-				return false;
-			}
-			break;
-		/* We always need the stereo calculation for left and right cameras. */
-		case STEREO_LEFT_ID:
-		case STEREO_RIGHT_ID:
-		default:
-			break;
-	}
-	return true;
-}
-
-/* setup the view and win matrices for the multiview cameras
- *
- * unlike view3d_stereo3d_setup_offscreen, when view3d_stereo3d_setup is called
- * we have no winmatrix (i.e., projection matrix) defined at that time.
- * Since the camera and the camera shift are needed for the winmat calculation
- * we do a small hack to replace it temporarily so we don't need to change the
- * view3d)main_region_setup_view() code to account for that.
- */
-static void view3d_stereo3d_setup(Scene *scene, View3D *v3d, ARegion *ar, const rcti *rect)
-{
-	bool is_left;
-	const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
-	const char *viewname;
-
-	/* show only left or right camera */
-	if (v3d->stereo3d_camera != STEREO_3D_ID)
-		v3d->multiview_eye = v3d->stereo3d_camera;
-
-	is_left = v3d->multiview_eye == STEREO_LEFT_ID;
-	viewname = names[is_left ? STEREO_LEFT_ID : STEREO_RIGHT_ID];
-
-	/* update the viewport matrices with the new camera */
-	if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
-		Camera *data;
-		float viewmat[4][4];
-		float shiftx;
-
-		data = (Camera *)v3d->camera->data;
-		shiftx = data->shiftx;
-
-		BLI_thread_lock(LOCK_VIEW3D);
-		data->shiftx = BKE_camera_multiview_shift_x(&scene->r, v3d->camera, viewname);
-
-		BKE_camera_multiview_view_matrix(&scene->r, v3d->camera, is_left, viewmat);
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, NULL, rect);
-
-		data->shiftx = shiftx;
-		BLI_thread_unlock(LOCK_VIEW3D);
-	}
-	else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
-		float viewmat[4][4];
-		Object *view_ob = v3d->camera;
-		Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname);
-
-		BLI_thread_lock(LOCK_VIEW3D);
-		v3d->camera = camera;
-
-		BKE_camera_multiview_view_matrix(&scene->r, camera, false, viewmat);
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, NULL, rect);
-
-		v3d->camera = view_ob;
-		BLI_thread_unlock(LOCK_VIEW3D);
-	}
-}
-
-static void view3d_stereo3d_setup_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
-                                            float winmat[4][4], const char *viewname)
-{
-	/* update the viewport matrices with the new camera */
-	if (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
-		float viewmat[4][4];
-		const bool is_left = STREQ(viewname, STEREO_LEFT_NAME);
-
-		BKE_camera_multiview_view_matrix(&scene->r, v3d->camera, is_left, viewmat);
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, winmat, NULL);
-	}
-	else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
-		float viewmat[4][4];
-		Object *camera = BKE_camera_multiview_render(scene, v3d->camera, viewname);
-
-		BKE_camera_multiview_view_matrix(&scene->r, camera, false, viewmat);
-		view3d_main_region_setup_view(scene, v3d, ar, viewmat, winmat, NULL);
-	}
-}
-
-#ifdef WITH_GAMEENGINE
-static void update_lods(Scene *scene, float camera_pos[3])
-{
-	Scene *sce_iter;
-	Base *base;
-	Object *ob;
-
-	for (SETLOOPER(scene, sce_iter, base)) {
-		ob = base->object;
-		BKE_object_lod_update(ob, camera_pos);
-	}
-}
-#endif
-
-static void view3d_main_region_draw_objects(const bContext *C, Scene *scene, View3D *v3d,
-                                          ARegion *ar, const char **grid_unit)
-{
-	wmWindow *win = CTX_wm_window(C);
-	RegionView3D *rv3d = ar->regiondata;
-	unsigned int lay_used = v3d->lay_used;
-
-	/* post processing */
-	bool do_compositing = false;
-
-	/* shadow buffers, before we setup matrices */
-	if (draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
-		gpu_update_lamps_shadows_world(scene, v3d);
-
-	/* reset default OpenGL lights if needed (i.e. after preferences have been altered) */
-	if (rv3d->rflag & RV3D_GPULIGHT_UPDATE) {
-		rv3d->rflag &= ~RV3D_GPULIGHT_UPDATE;
-		GPU_default_lights();
-	}
-
-	/* Setup the view matrix. */
-	ED_view3d_draw_setup_view(CTX_wm_window(C), scene, ar, v3d, NULL, NULL, NULL);
-
-	rv3d->rflag &= ~RV3D_IS_GAME_ENGINE;
-#ifdef WITH_GAMEENGINE
-	if (STREQ(scene->r.engine, RE_engine_id_BLENDER_GAME)) {
-		rv3d->rflag |= RV3D_IS_GAME_ENGINE;
-
-		/* Make sure LoDs are up to date */
-		update_lods(scene, rv3d->viewinv[3]);
-	}
-#endif
-
-	/* framebuffer fx needed, we need to draw offscreen first */
-	if (v3d->fx_settings.fx_flag && v3d->drawtype >= OB_SOLID) {
-		GPUFXSettings fx_settings;
-		BKE_screen_gpu_fx_validate(&v3d->fx_settings);
-		fx_settings = v3d->fx_settings;
-		if (!rv3d->compositor)
-			rv3d->compositor = GPU_fx_compositor_create();
-
-		if (rv3d->persp == RV3D_CAMOB && v3d->camera)
-			BKE_camera_to_gpu_dof(v3d->camera, &fx_settings);
-		else {
-			fx_settings.dof = NULL;
-		}
-
-		do_compositing = GPU_fx_compositor_initialize_passes(rv3d->compositor, &ar->winrct, &ar->drawrct, &fx_settings);
-	}
-
-	/* clear the background */
-	view3d_main_region_clear(scene, v3d, ar);
-
-	/* enables anti-aliasing for 3D view drawing */
-	if (win->multisamples != USER_MULTISAMPLE_NONE) {
-		glEnable(GL_MULTISAMPLE);
-	}
-
-	/* main drawing call */
-	view3d_draw_objects(C, scene, v3d, ar, grid_unit, true, false, do_compositing ? rv3d->compositor : NULL);
-
-	/* post process */
-	if (do_compositing) {
-		GPU_fx_do_composite_pass(rv3d->compositor, rv3d->winmat, rv3d->is_persp, scene, NULL);
-	}
-
-	/* Disable back anti-aliasing */
-	if (win->multisamples != USER_MULTISAMPLE_NONE) {
-		glDisable(GL_MULTISAMPLE);
-	}
-
-	if (v3d->lay_used != lay_used) { /* happens when loading old files or loading with UI load */
-		/* find header and force tag redraw */
-		ScrArea *sa = CTX_wm_area(C);
-		ARegion *ar_header = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
-		ED_region_tag_redraw(ar_header); /* can be NULL */
-	}
-
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-		BDR_drawSketch(C);
-	}
-
-#ifdef WITH_INPUT_NDOF
-	if ((U.ndof_flag & NDOF_SHOW_GUIDE) && ((rv3d->viewlock & RV3D_LOCKED) == 0) && (rv3d->persp != RV3D_CAMOB))
-		/* TODO: draw something else (but not this) during fly mode */
-		draw_rotation_guide(rv3d);
-#endif
-}
-
-static bool is_cursor_visible(Scene *scene)
-{
-	if (U.app_flag & USER_APP_VIEW3D_HIDE_CURSOR) {
-		return false;
-	}
-
-	Object *ob = OBACT;
-
-	/* don't draw cursor in paint modes, but with a few exceptions */
-	if (ob && ob->mode & OB_MODE_ALL_PAINT) {
-		/* exception: object is in weight paint and has deforming armature in pose mode */
-		if (ob->mode & OB_MODE_WEIGHT_PAINT) {
-			if (BKE_object_pose_armature_get(ob) != NULL) {
-				return true;
-			}
-		}
-		/* exception: object in texture paint mode, clone brush, use_clone_layer disabled */
-		else if (ob->mode & OB_MODE_TEXTURE_PAINT) {
-			const Paint *p = BKE_paint_get_active(scene);
-
-			if (p && p->brush && p->brush->imagepaint_tool == PAINT_TOOL_CLONE) {
-				if ((scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_CLONE) == 0) {
-					return true;
-				}
-			}
-		}
-
-		/* no exception met? then don't draw cursor! */
-		return false;
-	}
-
-	return true;
-}
-
-static void view3d_main_region_draw_info(const bContext *C, Scene *scene,
-                                       ARegion *ar, View3D *v3d,
-                                       const char *grid_unit, bool render_border)
-{
-	wmWindowManager *wm = CTX_wm_manager(C);
-	RegionView3D *rv3d = ar->regiondata;
-	rcti rect;
-
-	/* local coordinate visible rect inside region, to accomodate overlapping ui */
-	ED_region_visible_rect(ar, &rect);
-
-	if (rv3d->persp == RV3D_CAMOB) {
-		drawviewborder(scene, ar, v3d);
-	}
-	else if (v3d->flag2 & V3D_RENDER_BORDER) {
-		glLineWidth(1.0f);
-		setlinestyle(3);
-		cpack(0x4040FF);
-
-		sdrawbox(v3d->render_border.xmin * ar->winx, v3d->render_border.ymin * ar->winy,
-		         v3d->render_border.xmax * ar->winx, v3d->render_border.ymax * ar->winy);
-
-		setlinestyle(0);
-	}
-
-	if (v3d->flag2 & V3D_SHOW_GPENCIL) {
-		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-		ED_gpencil_draw_view3d(wm, scene, v3d, ar, false);
-	}
-
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-		Object *ob;
-
-		/* 3d cursor */
-		if (is_cursor_visible(scene)) {
-			drawcursor(scene, ar, v3d);
-		}
-
-		if (U.uiflag & USER_SHOW_ROTVIEWICON)
-			draw_view_axis(rv3d, &rect);
-		else
-			draw_view_icon(rv3d, &rect);
-
-		ob = OBACT;
-		if (U.uiflag & USER_DRAWVIEWINFO)
-			draw_selected_name(scene, ob, &rect);
-	}
-
-	if (rv3d->render_engine) {
-		view3d_main_region_draw_engine_info(v3d, rv3d, ar, render_border);
-		return;
-	}
-
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-		if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_no_scrub(wm)) {
-			ED_scene_draw_fps(scene, &rect);
-		}
-		else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
-			draw_viewport_name(ar, v3d, &rect);
-		}
-
-		if (grid_unit) { /* draw below the viewport name */
-			char numstr[32] = "";
-
-			UI_ThemeColor(TH_TEXT_HI);
-			if (v3d->grid != 1.0f) {
-				BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid);
-			}
-
-			BLF_draw_default_ascii(rect.xmin + U.widget_unit,
-			                       rect.ymax - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f,
-			                       numstr[0] ? numstr : grid_unit, sizeof(numstr));
-		}
-	}
-}
-
-void view3d_main_region_draw(const bContext *C, ARegion *ar)
-{
-	Scene *scene = CTX_data_scene(C);
-	View3D *v3d = CTX_wm_view3d(C);
-	const char *grid_unit = NULL;
-	rcti border_rect;
-	bool render_border, clip_border;
-
-	/* if we only redraw render border area, skip opengl draw and also
-	 * don't do scissor because it's already set */
-	render_border = ED_view3d_calc_render_border(scene, v3d, ar, &border_rect);
-	clip_border = (render_border && !BLI_rcti_compare(&ar->drawrct, &border_rect));
-
-	/* draw viewport using opengl */
-	if (v3d->drawtype != OB_RENDER || !view3d_main_region_do_render_draw(scene) || clip_border) {
-		view3d_main_region_draw_objects(C, scene, v3d, ar, &grid_unit);
-
-#ifdef DEBUG_DRAW
-		bl_debug_draw();
-#endif
-		if (G.debug & G_DEBUG_SIMDATA)
-			draw_sim_debug_data(scene, v3d, ar);
-
-		ED_region_pixelspace(ar);
-	}
-
-	/* draw viewport using external renderer */
-	if (v3d->drawtype == OB_RENDER)
-		view3d_main_region_draw_engine(C, scene, ar, v3d, clip_border, &border_rect);
-
-	view3d_main_region_draw_info(C, scene, ar, v3d, grid_unit, render_border);
-
-	v3d->flag |= V3D_INVALID_BACKBUF;
-
-	BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_transp));
-	BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_xray));
-	BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_xraytransp));
-}
-
-#ifdef DEBUG_DRAW
-/* debug drawing */
-#define _DEBUG_DRAW_QUAD_TOT 1024
-#define _DEBUG_DRAW_EDGE_TOT 1024
-static float _bl_debug_draw_quads[_DEBUG_DRAW_QUAD_TOT][4][3];
-static int   _bl_debug_draw_quads_tot = 0;
-static float _bl_debug_draw_edges[_DEBUG_DRAW_QUAD_TOT][2][3];
-static int   _bl_debug_draw_edges_tot = 0;
-static unsigned int _bl_debug_draw_quads_color[_DEBUG_DRAW_QUAD_TOT];
-static unsigned int _bl_debug_draw_edges_color[_DEBUG_DRAW_EDGE_TOT];
-static unsigned int _bl_debug_draw_color;
-
-void bl_debug_draw_quad_clear(void)
-{
-	_bl_debug_draw_quads_tot = 0;
-	_bl_debug_draw_edges_tot = 0;
-	_bl_debug_draw_color = 0x00FF0000;
-}
-void bl_debug_color_set(const unsigned int color)
-{
-	_bl_debug_draw_color = color;
-}
-void bl_debug_draw_quad_add(const float v0[3], const float v1[3], const float v2[3], const float v3[3])
-{
-	if (_bl_debug_draw_quads_tot >= _DEBUG_DRAW_QUAD_TOT) {
-		printf("%s: max quad count hit %d!", __func__, _bl_debug_draw_quads_tot);
-	}
-	else {
-		float *pt = &_bl_debug_draw_quads[_bl_debug_draw_quads_tot][0][0];
-		copy_v3_v3(pt, v0); pt += 3;
-		copy_v3_v3(pt, v1); pt += 3;
-		copy_v3_v3(pt, v2); pt += 3;
-		copy_v3_v3(pt, v3); pt += 3;
-		_bl_debug_draw_quads_color[_bl_debug_draw_quads_tot] = _bl_debug_draw_color;
-		_bl_debug_draw_quads_tot++;
-	}
-}
-void bl_debug_draw_edge_add(const float v0[3], const float v1[3])
-{
-	if (_bl_debug_draw_quads_tot >= _DEBUG_DRAW_EDGE_TOT) {
-		printf("%s: max edge count hit %d!", __func__, _bl_debug_draw_edges_tot);
-	}
-	else {
-		float *pt = &_bl_debug_draw_edges[_bl_debug_draw_edges_tot][0][0];
-		copy_v3_v3(pt, v0); pt += 3;
-		copy_v3_v3(pt, v1); pt += 3;
-		_bl_debug_draw_edges_color[_bl_debug_draw_edges_tot] = _bl_debug_draw_color;
-		_bl_debug_draw_edges_tot++;
-	}
-}
-static void bl_debug_draw(void)
-{
-	unsigned int color;
-	if (_bl_debug_draw_quads_tot) {
-		int i;
-		color = _bl_debug_draw_quads_color[0];
-		cpack(color);
-		for (i = 0; i < _bl_debug_draw_quads_tot; i ++) {
-			if (_bl_debug_draw_quads_color[i] != color) {
-				color = _bl_debug_draw_quads_color[i];
-				cpack(color);
-			}
-			glBegin(GL_LINE_LOOP);
-			glVertex3fv(_bl_debug_draw_quads[i][0]);
-			glVertex3fv(_bl_debug_draw_quads[i][1]);
-			glVertex3fv(_bl_debug_draw_quads[i][2]);
-			glVertex3fv(_bl_debug_draw_quads[i][3]);
-			glEnd();
-		}
-	}
-	if (_bl_debug_draw_edges_tot) {
-		int i;
-		color = _bl_debug_draw_edges_color[0];
-		cpack(color);
-		glBegin(GL_LINES);
-		for (i = 0; i < _bl_debug_draw_edges_tot; i ++) {
-			if (_bl_debug_draw_edges_color[i] != color) {
-				color = _bl_debug_draw_edges_color[i];
-				cpack(color);
-			}
-			glVertex3fv(_bl_debug_draw_edges[i][0]);
-			glVertex3fv(_bl_debug_draw_edges[i][1]);
-		}
-		glEnd();
-		color = _bl_debug_draw_edges_color[0];
-		cpack(color);
-		glPointSize(4.0);
-		glBegin(GL_POINTS);
-		for (i = 0; i < _bl_debug_draw_edges_tot; i ++) {
-			if (_bl_debug_draw_edges_color[i] != color) {
-				color = _bl_debug_draw_edges_color[i];
-				cpack(color);
-			}
-			glVertex3fv(_bl_debug_draw_edges[i][0]);
-			glVertex3fv(_bl_debug_draw_edges[i][1]);
-		}
-		glEnd();
-	}
-}
-#endif
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
new file mode 100644
index 00000000000..3a89c910ea8
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -0,0 +1,1077 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_draw_legacy.c
+ *  \ingroup spview3d
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_object_types.h"
+#include "DNA_group_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_key_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_world_types.h"
+#include "DNA_brush_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_jitter_2d.h"
+#include "BLI_utildefines.h"
+#include "BLI_endian_switch.h"
+#include "BLI_threads.h"
+
+#include "BKE_anim.h"
+#include "BKE_camera.h"
+#include "BKE_context.h"
+#include "BKE_customdata.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_image.h"
+#include "BKE_key.h"
+#include "BKE_layer.h"
+#include "BKE_main.h"
+#include "BKE_object.h"
+#include "BKE_global.h"
+#include "BKE_paint.h"
+#include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_unit.h"
+#include "BKE_movieclip.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
+#include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
+#include "IMB_colormanagement.h"
+
+#include "BIF_glutil.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BLF_api.h"
+#include "BLT_translation.h"
+
+#include "ED_armature.h"
+#include "ED_keyframing.h"
+#include "ED_gpencil.h"
+#include "ED_screen.h"
+#include "ED_space_api.h"
+#include "ED_screen_types.h"
+#include "ED_transform.h"
+
+#include "UI_interface.h"
+#include "UI_interface_icons.h"
+#include "UI_resources.h"
+
+#include "GPU_draw.h"
+#include "GPU_framebuffer.h"
+#include "GPU_material.h"
+#include "GPU_extensions.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_select.h"
+#include "GPU_matrix.h"
+
+#include "RE_engine.h"
+
+#include "DRW_engine.h"
+
+#include "view3d_intern.h"  /* own include */
+
+/* ********* custom clipping *********** */
+
+void ED_view3d_clipping_set(RegionView3D *rv3d)
+{
+	double plane[4];
+	const unsigned int tot = (rv3d->viewlock & RV3D_BOXCLIP) ? 4 : 6;
+
+	for (unsigned a = 0; a < tot; a++) {
+		copy_v4db_v4fl(plane, rv3d->clip[a]);
+		glClipPlane(GL_CLIP_PLANE0 + a, plane);
+		glEnable(GL_CLIP_PLANE0 + a);
+	}
+}
+
+/* use these to temp disable/enable clipping when 'rv3d->rflag & RV3D_CLIPPING' is set */
+void ED_view3d_clipping_disable(void)
+{
+	for (unsigned a = 0; a < 6; a++) {
+		glDisable(GL_CLIP_PLANE0 + a);
+	}
+}
+void ED_view3d_clipping_enable(void)
+{
+	for (unsigned a = 0; a < 6; a++) {
+		glEnable(GL_CLIP_PLANE0 + a);
+	}
+}
+
+static bool view3d_clipping_test(const float co[3], const float clip[6][4])
+{
+	if (plane_point_side_v3(clip[0], co) > 0.0f)
+		if (plane_point_side_v3(clip[1], co) > 0.0f)
+			if (plane_point_side_v3(clip[2], co) > 0.0f)
+				if (plane_point_side_v3(clip[3], co) > 0.0f)
+					return false;
+
+	return true;
+}
+
+/* for 'local' ED_view3d_clipping_local must run first
+ * then all comparisons can be done in localspace */
+bool ED_view3d_clipping_test(const RegionView3D *rv3d, const float co[3], const bool is_local)
+{
+	return view3d_clipping_test(co, is_local ? rv3d->clip_local : rv3d->clip);
+}
+
+/* *********************** backdraw for selection *************** */
+
+static void backdrawview3d(
+        struct Depsgraph *depsgraph, Scene *scene,
+        ARegion *ar, View3D *v3d,
+        Object *obact, Object *obedit,
+        short select_mode)
+{
+	RegionView3D *rv3d = ar->regiondata;
+	Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id);
+	Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact);
+
+	BLI_assert(ar->regiontype == RGN_TYPE_WINDOW);
+
+	if (obact_eval && (obact_eval->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) ||
+	             BKE_paint_select_face_test(obact_eval)))
+	{
+		/* do nothing */
+	}
+	/* texture paint mode sampling */
+	else if (obact_eval && (obact_eval->mode & OB_MODE_TEXTURE_PAINT) &&
+	         (v3d->drawtype > OB_WIRE))
+	{
+		/* do nothing */
+	}
+	else if ((obact_eval && (obact_eval->mode & OB_MODE_PARTICLE_EDIT)) &&
+	         V3D_IS_ZBUF(v3d))
+	{
+		/* do nothing */
+	}
+	else if ((obedit && (obedit->mode & OB_MODE_EDIT)) &&
+	         V3D_IS_ZBUF(v3d))
+	{
+		/* do nothing */
+	}
+	else {
+		v3d->flag &= ~V3D_INVALID_BACKBUF;
+		return;
+	}
+
+	if (!(v3d->flag & V3D_INVALID_BACKBUF))
+		return;
+
+#if 0
+	if (test) {
+		if (qtest()) {
+			addafterqueue(ar->win, BACKBUFDRAW, 1);
+			return;
+		}
+	}
+#endif
+
+	if (v3d->drawtype > OB_WIRE) v3d->zbuf = true;
+
+	/* dithering and AA break color coding, so disable */
+	glDisable(GL_DITHER);
+
+	if (false) {
+		/* for multisample we use an offscreen FBO. multisample drawing can fail
+		 * with color coded selection drawing, and reading back depths from such
+		 * a buffer can also cause a few seconds freeze on OS X / NVidia.
+		 *
+		 * NOTE: code is no longer used now, but offscreen drawing is likely
+		 * what we will always want to do for the new viewport. */
+		int w = BLI_rcti_size_x(&ar->winrct);
+		int h = BLI_rcti_size_y(&ar->winrct);
+		char error[256];
+
+		if (rv3d->gpuoffscreen) {
+			if (GPU_offscreen_width(rv3d->gpuoffscreen)  != w ||
+			    GPU_offscreen_height(rv3d->gpuoffscreen) != h)
+			{
+				GPU_offscreen_free(rv3d->gpuoffscreen);
+				rv3d->gpuoffscreen = NULL;
+			}
+		}
+
+		if (!rv3d->gpuoffscreen) {
+			rv3d->gpuoffscreen = GPU_offscreen_create(w, h, 0, true, false, error);
+
+			if (!rv3d->gpuoffscreen)
+				fprintf(stderr, "Failed to create offscreen selection buffer for multisample: %s\n", error);
+		}
+	}
+
+	if (rv3d->gpuoffscreen)
+		GPU_offscreen_bind(rv3d->gpuoffscreen, true);
+	else
+		glScissor(ar->winrct.xmin, ar->winrct.ymin, BLI_rcti_size_x(&ar->winrct), BLI_rcti_size_y(&ar->winrct));
+
+	glClearColor(0.0, 0.0, 0.0, 0.0);
+	if (v3d->zbuf) {
+		glEnable(GL_DEPTH_TEST);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	}
+	else {
+		glClear(GL_COLOR_BUFFER_BIT);
+		glDisable(GL_DEPTH_TEST);
+	}
+
+	if (rv3d->rflag & RV3D_CLIPPING)
+		ED_view3d_clipping_set(rv3d);
+
+	G.f |= G_BACKBUFSEL;
+
+	if (obact_eval && ((obact_eval->base_flag & BASE_VISIBLED) != 0)) {
+		draw_object_backbufsel(depsgraph, scene_eval, v3d, rv3d, obact_eval, select_mode);
+	}
+
+	if (rv3d->gpuoffscreen)
+		GPU_offscreen_unbind(rv3d->gpuoffscreen, true);
+
+	v3d->flag &= ~V3D_INVALID_BACKBUF;
+
+	G.f &= ~G_BACKBUFSEL;
+	v3d->zbuf = false;
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_DITHER);
+
+	if (rv3d->rflag & RV3D_CLIPPING)
+		ED_view3d_clipping_disable();
+}
+
+void view3d_opengl_read_pixels(ARegion *ar, int x, int y, int w, int h, int format, int type, void *data)
+{
+	RegionView3D *rv3d = ar->regiondata;
+
+	if (rv3d->gpuoffscreen) {
+		GPU_offscreen_bind(rv3d->gpuoffscreen, true);
+		glReadBuffer(GL_COLOR_ATTACHMENT0);
+		glReadPixels(x, y, w, h, format, type, data);
+		GPU_offscreen_unbind(rv3d->gpuoffscreen, true);
+	}
+	else {
+		glReadPixels(ar->winrct.xmin + x, ar->winrct.ymin + y, w, h, format, type, data);
+	}
+}
+
+/* XXX depth reading exception, for code not using gpu offscreen */
+static void view3d_opengl_read_Z_pixels(ARegion *ar, int x, int y, int w, int h, int format, int type, void *data)
+{
+	glReadPixels(ar->winrct.xmin + x, ar->winrct.ymin + y, w, h, format, type, data);
+}
+
+void ED_view3d_backbuf_validate_with_select_mode(ViewContext *vc, short select_mode)
+{
+	if (vc->v3d->flag & V3D_INVALID_BACKBUF) {
+		backdrawview3d(vc->depsgraph, vc->scene, vc->ar, vc->v3d, vc->obact, vc->obedit, select_mode);
+	}
+}
+
+void ED_view3d_backbuf_validate(ViewContext *vc)
+{
+	ED_view3d_backbuf_validate_with_select_mode(vc, -1);
+}
+
+/**
+ * allow for small values [0.5 - 2.5],
+ * and large values, FLT_MAX by clamping by the area size
+ */
+int ED_view3d_backbuf_sample_size_clamp(ARegion *ar, const float dist)
+{
+	return (int)min_ff(ceilf(dist), (float)max_ii(ar->winx, ar->winx));
+}
+
+/* samples a single pixel (copied from vpaint) */
+unsigned int ED_view3d_backbuf_sample(
+        ViewContext *vc, int x, int y)
+{
+	if (x >= vc->ar->winx || y >= vc->ar->winy) {
+		return 0;
+	}
+
+	ED_view3d_backbuf_validate(vc);
+
+	unsigned int col;
+	view3d_opengl_read_pixels(vc->ar, x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &col);
+	glReadBuffer(GL_BACK);
+
+	if (ENDIAN_ORDER == B_ENDIAN) {
+		BLI_endian_switch_uint32(&col);
+	}
+
+	return GPU_select_to_index(col);
+}
+
+/* reads full rect, converts indices */
+ImBuf *ED_view3d_backbuf_read(
+        ViewContext *vc, int xmin, int ymin, int xmax, int ymax)
+{
+	/* clip */
+	const rcti clip = {
+	    max_ii(xmin, 0), min_ii(xmax, vc->ar->winx - 1),
+	    max_ii(ymin, 0), min_ii(ymax, vc->ar->winy - 1)};
+	const int size_clip[2] = {
+	    BLI_rcti_size_x(&clip) + 1,
+	    BLI_rcti_size_y(&clip) + 1};
+
+	if (UNLIKELY((clip.xmin > clip.xmax) ||
+	             (clip.ymin > clip.ymax)))
+	{
+		return NULL;
+	}
+
+	ImBuf *ibuf_clip = IMB_allocImBuf(size_clip[0], size_clip[1], 32, IB_rect);
+
+	ED_view3d_backbuf_validate(vc);
+
+	view3d_opengl_read_pixels(vc->ar, clip.xmin, clip.ymin, size_clip[0], size_clip[1], GL_RGBA, GL_UNSIGNED_BYTE, ibuf_clip->rect);
+
+	glReadBuffer(GL_BACK);
+
+	if (ENDIAN_ORDER == B_ENDIAN) {
+		IMB_convert_rgba_to_abgr(ibuf_clip);
+	}
+
+	GPU_select_to_index_array(ibuf_clip->rect, size_clip[0] * size_clip[1]);
+
+	if ((clip.xmin == xmin) &&
+	    (clip.xmax == xmax) &&
+	    (clip.ymin == ymin) &&
+	    (clip.ymax == ymax))
+	{
+		return ibuf_clip;
+	}
+	else {
+		/* put clipped result into a non-clipped buffer */
+		const int size[2] = {
+		    (xmax - xmin + 1),
+		    (ymax - ymin + 1)};
+
+		ImBuf *ibuf_full = IMB_allocImBuf(size[0], size[1], 32, IB_rect);
+
+		IMB_rectcpy(
+		        ibuf_full, ibuf_clip,
+		        clip.xmin - xmin, clip.ymin - ymin,
+		        0, 0,
+		        size_clip[0], size_clip[1]);
+		IMB_freeImBuf(ibuf_clip);
+		return ibuf_full;
+	}
+}
+
+/* smart function to sample a rect spiralling outside, nice for backbuf selection */
+unsigned int ED_view3d_backbuf_sample_rect(
+        ViewContext *vc, const int mval[2], int size,
+        unsigned int min, unsigned int max, float *r_dist)
+{
+	int dirvec[4][2];
+
+	const int amount = (size - 1) / 2;
+
+	const int minx = mval[0] - (amount + 1);
+	const int miny = mval[1] - (amount + 1);
+	ImBuf *buf = ED_view3d_backbuf_read(vc, minx, miny, minx + size - 1, miny + size - 1);
+	if (!buf) return 0;
+
+	unsigned index = 0;
+	int rc = 0;
+
+	dirvec[0][0] = 1; dirvec[0][1] = 0;
+	dirvec[1][0] = 0; dirvec[1][1] = -size;
+	dirvec[2][0] = -1; dirvec[2][1] = 0;
+	dirvec[3][0] = 0; dirvec[3][1] = size;
+
+	const unsigned *bufmin = buf->rect;
+	const unsigned *tbuf = buf->rect;
+	const unsigned *bufmax = buf->rect + size * size;
+	tbuf += amount * size + amount;
+
+	for (int nr = 1; nr <= size; nr++) {
+		for (int a = 0; a < 2; a++) {
+			for (int b = 0; b < nr; b++) {
+				if (*tbuf && *tbuf >= min && *tbuf < max) {
+					/* we got a hit */
+
+					/* get x,y pixel coords from the offset
+					 * (manhatten distance in keeping with other screen-based selection) */
+					*r_dist = (float)(
+					        abs(((int)(tbuf - buf->rect) % size) - (size / 2)) +
+					        abs(((int)(tbuf - buf->rect) / size) - (size / 2)));
+
+					/* indices start at 1 here */
+					index = (*tbuf - min) + 1;
+					goto exit;
+				}
+
+				tbuf += (dirvec[rc][0] + dirvec[rc][1]);
+
+				if (tbuf < bufmin || tbuf >= bufmax) {
+					goto exit;
+				}
+			}
+			rc++;
+			rc &= 3;
+		}
+	}
+
+exit:
+	IMB_freeImBuf(buf);
+	return index;
+}
+
+
+/* ************************************************************* */
+
+static void view3d_stereo_bgpic_setup(Scene *scene, View3D *v3d, Image *ima, ImageUser *iuser)
+{
+	if (BKE_image_is_stereo(ima)) {
+		iuser->flag |= IMA_SHOW_STEREO;
+
+		if ((scene->r.scemode & R_MULTIVIEW) == 0) {
+			iuser->multiview_eye = STEREO_LEFT_ID;
+		}
+		else if (v3d->stereo3d_camera != STEREO_3D_ID) {
+			/* show only left or right camera */
+			iuser->multiview_eye = v3d->stereo3d_camera;
+		}
+
+		BKE_image_multiview_index(ima, iuser);
+	}
+	else {
+		iuser->flag &= ~IMA_SHOW_STEREO;
+	}
+}
+
+static void view3d_draw_bgpic(Scene *scene, Depsgraph *depsgraph,
+                              ARegion *ar, View3D *v3d,
+                              const bool do_foreground, const bool do_camera_frame)
+{
+	RegionView3D *rv3d = ar->regiondata;
+	int fg_flag = do_foreground ? CAM_BGIMG_FLAG_FOREGROUND : 0;
+	if (v3d->camera == NULL || v3d->camera->type != OB_CAMERA) {
+		return;
+	}
+	Camera *cam = v3d->camera->data;
+
+	for (CameraBGImage *bgpic = cam->bg_images.first; bgpic; bgpic = bgpic->next) {
+		bgpic->iuser.scene = scene;  /* Needed for render results. */
+
+		if ((bgpic->flag & CAM_BGIMG_FLAG_FOREGROUND) != fg_flag)
+			continue;
+
+		{
+			float image_aspect[2];
+			float x1, y1, x2, y2, centx, centy;
+
+			void *lock;
+
+			Image *ima = NULL;
+
+			/* disable individual images */
+			if ((bgpic->flag & CAM_BGIMG_FLAG_DISABLED))
+				continue;
+
+			ImBuf *ibuf = NULL;
+			ImBuf *freeibuf = NULL;
+			ImBuf *releaseibuf = NULL;
+			if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) {
+				ima = bgpic->ima;
+				if (ima == NULL)
+					continue;
+				BKE_image_user_frame_calc(&bgpic->iuser, CFRA, 0);
+				if (ima->source == IMA_SRC_SEQUENCE && !(bgpic->iuser.flag & IMA_USER_FRAME_IN_RANGE)) {
+					ibuf = NULL; /* frame is out of range, dont show */
+				}
+				else {
+					view3d_stereo_bgpic_setup(scene, v3d, ima, &bgpic->iuser);
+					ibuf = BKE_image_acquire_ibuf(ima, &bgpic->iuser, &lock);
+					releaseibuf = ibuf;
+				}
+
+				image_aspect[0] = ima->aspx;
+				image_aspect[1] = ima->aspy;
+			}
+			else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) {
+				/* TODO: skip drawing when out of frame range (as image sequences do above) */
+				MovieClip *clip = NULL;
+
+				if (bgpic->flag & CAM_BGIMG_FLAG_CAMERACLIP) {
+					if (scene->camera)
+						clip = BKE_object_movieclip_get(scene, scene->camera, true);
+				}
+				else {
+					clip = bgpic->clip;
+				}
+
+				if (clip == NULL)
+					continue;
+
+				BKE_movieclip_user_set_frame(&bgpic->cuser, CFRA);
+				ibuf = BKE_movieclip_get_ibuf(clip, &bgpic->cuser);
+
+				image_aspect[0] = clip->aspx;
+				image_aspect[1] = clip->aspy;
+
+				/* working with ibuf from image and clip has got different workflow now.
+				 * ibuf acquired from clip is referenced by cache system and should
+				 * be dereferenced after usage. */
+				freeibuf = ibuf;
+			}
+			else {
+				/* perhaps when loading future files... */
+				BLI_assert(0);
+				copy_v2_fl(image_aspect, 1.0f);
+			}
+
+			if (ibuf == NULL)
+				continue;
+
+			if ((ibuf->rect == NULL && ibuf->rect_float == NULL) || ibuf->channels != 4) { /* invalid image format */
+				if (freeibuf)
+					IMB_freeImBuf(freeibuf);
+				if (releaseibuf)
+					BKE_image_release_ibuf(ima, releaseibuf, lock);
+
+				continue;
+			}
+
+			if (ibuf->rect == NULL)
+				IMB_rect_from_float(ibuf);
+
+			BLI_assert(rv3d->persp == RV3D_CAMOB);
+			{
+				if (do_camera_frame) {
+					rctf vb;
+					ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &vb, false);
+					x1 = vb.xmin;
+					y1 = vb.ymin;
+					x2 = vb.xmax;
+					y2 = vb.ymax;
+				}
+				else {
+					x1 = ar->winrct.xmin;
+					y1 = ar->winrct.ymin;
+					x2 = ar->winrct.xmax;
+					y2 = ar->winrct.ymax;
+				}
+
+				/* apply offset last - camera offset is different to offset in blender units */
+				/* so this has some sane way of working - this matches camera's shift _exactly_ */
+				{
+					const float max_dim = max_ff(x2 - x1, y2 - y1);
+					const float xof_scale = bgpic->offset[0] * max_dim;
+					const float yof_scale = bgpic->offset[1] * max_dim;
+
+					x1 += xof_scale;
+					y1 += yof_scale;
+					x2 += xof_scale;
+					y2 += yof_scale;
+				}
+
+				centx = (x1 + x2) * 0.5f;
+				centy = (y1 + y2) * 0.5f;
+
+				/* aspect correction */
+				if (bgpic->flag & CAM_BGIMG_FLAG_CAMERA_ASPECT) {
+					/* apply aspect from clip */
+					const float w_src = ibuf->x * image_aspect[0];
+					const float h_src = ibuf->y * image_aspect[1];
+
+					/* destination aspect is already applied from the camera frame */
+					const float w_dst = x1 - x2;
+					const float h_dst = y1 - y2;
+
+					const float asp_src = w_src / h_src;
+					const float asp_dst = w_dst / h_dst;
+
+					if (fabsf(asp_src - asp_dst) >= FLT_EPSILON) {
+						if ((asp_src > asp_dst) == ((bgpic->flag & CAM_BGIMG_FLAG_CAMERA_CROP) != 0)) {
+							/* fit X */
+							const float div = asp_src / asp_dst;
+							x1 = ((x1 - centx) * div) + centx;
+							x2 = ((x2 - centx) * div) + centx;
+						}
+						else {
+							/* fit Y */
+							const float div = asp_dst / asp_src;
+							y1 = ((y1 - centy) * div) + centy;
+							y2 = ((y2 - centy) * div) + centy;
+						}
+					}
+				}
+			}
+
+			/* complete clip? */
+			rctf clip_rect;
+			BLI_rctf_init(&clip_rect, x1, x2, y1, y2);
+			if (bgpic->rotation) {
+				BLI_rctf_rotate_expand(&clip_rect, &clip_rect, bgpic->rotation);
+			}
+
+			if (clip_rect.xmax < 0 || clip_rect.ymax < 0 || clip_rect.xmin > ar->winx || clip_rect.ymin > ar->winy) {
+				if (freeibuf)
+					IMB_freeImBuf(freeibuf);
+				if (releaseibuf)
+					BKE_image_release_ibuf(ima, releaseibuf, lock);
+
+				continue;
+			}
+
+			float zoomx = (x2 - x1) / ibuf->x;
+			float zoomy = (y2 - y1) / ibuf->y;
+
+			/* for some reason; zoomlevels down refuses to use GL_ALPHA_SCALE */
+			if (zoomx < 1.0f || zoomy < 1.0f) {
+				float tzoom = min_ff(zoomx, zoomy);
+				int mip = 0;
+
+				if ((ibuf->userflags & IB_MIPMAP_INVALID) != 0) {
+					IMB_remakemipmap(ibuf, 0);
+					ibuf->userflags &= ~IB_MIPMAP_INVALID;
+				}
+				else if (ibuf->mipmap[0] == NULL)
+					IMB_makemipmap(ibuf, 0);
+
+				while (tzoom < 1.0f && mip < 8 && ibuf->mipmap[mip]) {
+					tzoom *= 2.0f;
+					zoomx *= 2.0f;
+					zoomy *= 2.0f;
+					mip++;
+				}
+				if (mip > 0)
+					ibuf = ibuf->mipmap[mip - 1];
+			}
+
+			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
+			glDepthMask(GL_FALSE);
+
+			glEnable(GL_BLEND);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+			gpuPushProjectionMatrix();
+			gpuPushMatrix();
+			ED_region_pixelspace(ar);
+
+			gpuTranslate2f(centx, centy);
+			gpuScaleUniform(bgpic->scale);
+			gpuRotate2D(RAD2DEGF(-bgpic->rotation));
+
+			if (bgpic->flag & CAM_BGIMG_FLAG_FLIP_X) {
+				zoomx *= -1.0f;
+				x1 = x2;
+			}
+			if (bgpic->flag & CAM_BGIMG_FLAG_FLIP_Y) {
+				zoomy *= -1.0f;
+				y1 = y2;
+			}
+
+			float col[4] = {1.0f, 1.0f, 1.0f, bgpic->alpha};
+			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
+			immDrawPixelsTex(&state, x1 - centx, y1 - centy, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, ibuf->rect,
+			                 zoomx, zoomy, col);
+
+			gpuPopProjectionMatrix();
+			gpuPopMatrix();
+
+			glDisable(GL_BLEND);
+
+			glDepthMask(GL_TRUE);
+			if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
+
+			if (freeibuf)
+				IMB_freeImBuf(freeibuf);
+			if (releaseibuf)
+				BKE_image_release_ibuf(ima, releaseibuf, lock);
+		}
+	}
+}
+
+void ED_view3d_draw_bgpic_test(
+        Scene *scene, Depsgraph *depsgraph,
+        ARegion *ar, View3D *v3d,
+        const bool do_foreground, const bool do_camera_frame)
+{
+	RegionView3D *rv3d = ar->regiondata;
+
+	if ((rv3d->persp == RV3D_CAMOB) && v3d->camera && (v3d->camera->type == OB_CAMERA)) {
+		Camera *cam = v3d->camera->data;
+		if ((cam->flag & CAM_SHOW_BG_IMAGE) == 0) {
+			return;
+		}
+	}
+	else {
+		return;
+	}
+
+	/* disabled - mango request, since footage /w only render is quite useful
+	 * and this option is easy to disable all background images at once */
+#if 0
+	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
+		return;
+#endif
+
+	if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
+		if (rv3d->persp == RV3D_CAMOB) {
+			view3d_draw_bgpic(scene, depsgraph, ar, v3d, do_foreground, do_camera_frame);
+		}
+	}
+	else {
+		view3d_draw_bgpic(scene, depsgraph, ar, v3d, do_foreground, do_camera_frame);
+	}
+}
+
+/* *********************** */
+
+/* XXX warning, not using gpu offscreen here */
+void view3d_update_depths_rect(ARegion *ar, ViewDepths *d, rcti *rect)
+{
+	/* clamp rect by region */
+	rcti r = {
+		.xmin = 0,
+		.xmax = ar->winx - 1,
+		.ymin = 0,
+		.ymax = ar->winy - 1
+	};
+
+	/* Constrain rect to depth bounds */
+	BLI_rcti_isect(&r, rect, rect);
+
+	/* assign values to compare with the ViewDepths */
+	int x = rect->xmin;
+	int y = rect->ymin;
+
+	int w = BLI_rcti_size_x(rect);
+	int h = BLI_rcti_size_y(rect);
+
+	if (w <= 0 || h <= 0) {
+		if (d->depths)
+			MEM_freeN(d->depths);
+		d->depths = NULL;
+
+		d->damaged = false;
+	}
+	else if (d->w != w ||
+	         d->h != h ||
+	         d->x != x ||
+	         d->y != y ||
+	         d->depths == NULL
+	         )
+	{
+		d->x = x;
+		d->y = y;
+		d->w = w;
+		d->h = h;
+
+		if (d->depths)
+			MEM_freeN(d->depths);
+
+		d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths Subset");
+
+		d->damaged = true;
+	}
+
+	if (d->damaged) {
+		/* XXX using special function here, it doesn't use the gpu offscreen system */
+		view3d_opengl_read_Z_pixels(ar, d->x, d->y, d->w, d->h, GL_DEPTH_COMPONENT, GL_FLOAT, d->depths);
+		glGetDoublev(GL_DEPTH_RANGE, d->depth_range);
+		d->damaged = false;
+	}
+}
+
+/* note, with nouveau drivers the glReadPixels() is very slow. [#24339] */
+void ED_view3d_depth_update(ARegion *ar)
+{
+	RegionView3D *rv3d = ar->regiondata;
+
+	/* Create storage for, and, if necessary, copy depth buffer */
+	if (!rv3d->depths) rv3d->depths = MEM_callocN(sizeof(ViewDepths), "ViewDepths");
+	if (rv3d->depths) {
+		ViewDepths *d = rv3d->depths;
+		if (d->w != ar->winx ||
+		    d->h != ar->winy ||
+		    !d->depths)
+		{
+			d->w = ar->winx;
+			d->h = ar->winy;
+			if (d->depths)
+				MEM_freeN(d->depths);
+			d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths");
+			d->damaged = true;
+		}
+
+		if (d->damaged) {
+			view3d_opengl_read_pixels(ar, 0, 0, d->w, d->h, GL_DEPTH_COMPONENT, GL_FLOAT, d->depths);
+			glGetDoublev(GL_DEPTH_RANGE, d->depth_range);
+
+			d->damaged = false;
+		}
+	}
+}
+
+/* utility function to find the closest Z value, use for autodepth */
+float view3d_depth_near(ViewDepths *d)
+{
+	/* convert to float for comparisons */
+	const float near = (float)d->depth_range[0];
+	const float far_real = (float)d->depth_range[1];
+	float far = far_real;
+
+	const float *depths = d->depths;
+	float depth = FLT_MAX;
+	int i = (int)d->w * (int)d->h; /* cast to avoid short overflow */
+
+	/* far is both the starting 'far' value
+	 * and the closest value found. */
+	while (i--) {
+		depth = *depths++;
+		if ((depth < far) && (depth > near)) {
+			far = depth;
+		}
+	}
+
+	return far == far_real ? FLT_MAX : far;
+}
+
+void ED_view3d_draw_depth_gpencil(
+        Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d)
+{
+	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
+	bool zbuf = v3d->zbuf;
+
+	/* Setup view matrix. */
+	ED_view3d_draw_setup_view(NULL, depsgraph, scene, ar, v3d, NULL, NULL, NULL);
+
+	glClear(GL_DEPTH_BUFFER_BIT);
+
+	v3d->zbuf = true;
+	glEnable(GL_DEPTH_TEST);
+
+	if (v3d->flag2 & V3D_SHOW_GPENCIL) {
+		ED_gpencil_draw_view3d(NULL, scene, view_layer, depsgraph, v3d, ar, true);
+	}
+
+	v3d->zbuf = zbuf;
+	if (!zbuf) glDisable(GL_DEPTH_TEST);
+}
+
+/* *********************** customdata **************** */
+
+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)))
+	{
+		mask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
+
+		if (drawtype == OB_MATERIAL)
+			mask |= CD_MASK_ORCO;
+	}
+
+	return mask;
+}
+
+/* goes over all modes and view3d settings */
+CustomDataMask ED_view3d_screen_datamask(const Scene *scene, const bScreen *screen)
+{
+	CustomDataMask mask = CD_MASK_BAREMESH;
+
+	/* check if we need tfaces & mcols due to view mode */
+	for (const ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+		if (sa->spacetype == SPACE_VIEW3D) {
+			mask |= ED_view3d_datamask(scene, sa->spacedata.first);
+		}
+	}
+
+	return mask;
+}
+
+/**
+ * Store values from #RegionView3D, set when drawing.
+ * This is needed when we draw with to a viewport using a different matrix (offscreen drawing for example).
+ *
+ * Values set by #ED_view3d_update_viewmat should be handled here.
+ */
+struct RV3DMatrixStore {
+	float winmat[4][4];
+	float viewmat[4][4];
+	float viewinv[4][4];
+	float persmat[4][4];
+	float persinv[4][4];
+	float viewcamtexcofac[4];
+	float pixsize;
+};
+
+struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d)
+{
+	struct RV3DMatrixStore *rv3dmat = MEM_mallocN(sizeof(*rv3dmat), __func__);
+	copy_m4_m4(rv3dmat->winmat, rv3d->winmat);
+	copy_m4_m4(rv3dmat->viewmat, rv3d->viewmat);
+	copy_m4_m4(rv3dmat->persmat, rv3d->persmat);
+	copy_m4_m4(rv3dmat->persinv, rv3d->persinv);
+	copy_m4_m4(rv3dmat->viewinv, rv3d->viewinv);
+	copy_v4_v4(rv3dmat->viewcamtexcofac, rv3d->viewcamtexcofac);
+	rv3dmat->pixsize = rv3d->pixsize;
+	return (void *)rv3dmat;
+}
+
+void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat_pt)
+{
+	struct RV3DMatrixStore *rv3dmat = rv3dmat_pt;
+	copy_m4_m4(rv3d->winmat, rv3dmat->winmat);
+	copy_m4_m4(rv3d->viewmat, rv3dmat->viewmat);
+	copy_m4_m4(rv3d->persmat, rv3dmat->persmat);
+	copy_m4_m4(rv3d->persinv, rv3dmat->persinv);
+	copy_m4_m4(rv3d->viewinv, rv3dmat->viewinv);
+	copy_v4_v4(rv3d->viewcamtexcofac, rv3dmat->viewcamtexcofac);
+	rv3d->pixsize = rv3dmat->pixsize;
+}
+
+/**
+ * \note The info that this uses is updated in #ED_refresh_viewport_fps,
+ * which currently gets called during #SCREEN_OT_animation_step.
+ */
+void ED_scene_draw_fps(Scene *scene, const rcti *rect)
+{
+	ScreenFrameRateInfo *fpsi = scene->fps_info;
+	char printable[16];
+
+	if (!fpsi || !fpsi->lredrawtime || !fpsi->redrawtime)
+		return;
+
+	printable[0] = '\0';
+
+#if 0
+	/* this is too simple, better do an average */
+	fps = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime))
+#else
+	fpsi->redrawtimes_fps[fpsi->redrawtime_index] = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime));
+
+	float fps = 0.0f;
+	int tot = 0;
+	for (int i = 0; i < REDRAW_FRAME_AVERAGE; i++) {
+		if (fpsi->redrawtimes_fps[i]) {
+			fps += fpsi->redrawtimes_fps[i];
+			tot++;
+		}
+	}
+	if (tot) {
+		fpsi->redrawtime_index = (fpsi->redrawtime_index + 1) % REDRAW_FRAME_AVERAGE;
+
+		//fpsi->redrawtime_index++;
+		//if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE)
+		//	fpsi->redrawtime = 0;
+
+		fps = fps / tot;
+	}
+#endif
+
+	const int font_id = BLF_default();
+
+	/* is this more than half a frame behind? */
+	if (fps + 0.5f < (float)(FPS)) {
+		UI_FontThemeColor(font_id, TH_REDALERT);
+		BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %.2f"), fps);
+	}
+	else {
+		UI_FontThemeColor(font_id, TH_TEXT_HI);
+		BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %i"), (int)(fps + 0.5f));
+	}
+
+#ifdef WITH_INTERNATIONAL
+	BLF_draw_default(rect->xmin + U.widget_unit,  rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
+#else
+	BLF_draw_default_ascii(rect->xmin + U.widget_unit,  rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
+#endif
+}
+
+static bool view3d_main_region_do_render_draw(const Scene *scene)
+{
+	RenderEngineType *type = RE_engines_find(scene->r.engine);
+	return (type && type->view_update && type->view_draw);
+}
+
+bool ED_view3d_calc_render_border(const Scene *scene, Depsgraph *depsgraph, View3D *v3d, ARegion *ar, rcti *rect)
+{
+	RegionView3D *rv3d = ar->regiondata;
+	bool use_border;
+
+	/* test if there is a 3d view rendering */
+	if (v3d->drawtype != OB_RENDER || !view3d_main_region_do_render_draw(scene))
+		return false;
+
+	/* test if there is a border render */
+	if (rv3d->persp == RV3D_CAMOB)
+		use_border = (scene->r.mode & R_BORDER) != 0;
+	else
+		use_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0;
+
+	if (!use_border)
+		return false;
+
+	/* compute border */
+	if (rv3d->persp == RV3D_CAMOB) {
+		rctf viewborder;
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &viewborder, false);
+
+		rect->xmin = viewborder.xmin + scene->r.border.xmin * BLI_rctf_size_x(&viewborder);
+		rect->ymin = viewborder.ymin + scene->r.border.ymin * BLI_rctf_size_y(&viewborder);
+		rect->xmax = viewborder.xmin + scene->r.border.xmax * BLI_rctf_size_x(&viewborder);
+		rect->ymax = viewborder.ymin + scene->r.border.ymax * BLI_rctf_size_y(&viewborder);
+	}
+	else {
+		rect->xmin = v3d->render_border.xmin * ar->winx;
+		rect->xmax = v3d->render_border.xmax * ar->winx;
+		rect->ymin = v3d->render_border.ymin * ar->winy;
+		rect->ymax = v3d->render_border.ymax * ar->winy;
+	}
+
+	BLI_rcti_translate(rect, ar->winrct.xmin, ar->winrct.ymin);
+	BLI_rcti_isect(&ar->winrct, rect, rect);
+
+	return true;
+}
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index b175ee09f5c..e2ff809db36 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -36,6 +36,7 @@
 #include <float.h>
 
 #include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -48,8 +49,10 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_armature.h"
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_font.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
@@ -59,12 +62,12 @@
 #include "BKE_screen.h"
 #include "BKE_action.h"
 
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -76,6 +79,7 @@
 #include "ED_mesh.h"
 #include "ED_gpencil.h"
 #include "ED_view3d.h"
+#include "ED_transform_snap_object_context.h"
 
 #include "UI_resources.h"
 
@@ -132,6 +136,7 @@ typedef struct ViewOpsData {
 	ARegion *ar;
 	View3D *v3d;
 	RegionView3D *rv3d;
+	Depsgraph *depsgraph;
 
 	/** Needed for continuous zoom. */
 	wmTimer *timer;
@@ -216,6 +221,7 @@ static void viewops_data_alloc(bContext *C, wmOperator *op)
 
 	/* store data */
 	op->customdata = vod;
+	vod->depsgraph = CTX_data_depsgraph(C);
 	vod->scene = CTX_data_scene(C);
 	vod->sa = CTX_wm_area(C);
 	vod->ar = CTX_wm_region(C);
@@ -243,8 +249,11 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
 	static float lastofs[3] = {0, 0, 0};
 	bool is_set = false;
 
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob_act = OBACT;
+	ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
+	Object *ob_act_eval = OBACT(view_layer_eval);
+	Object *ob_act = DEG_get_original_object(ob_act_eval);
 
 	if (ob_act && (ob_act->mode & OB_MODE_ALL_PAINT) &&
 	    /* with weight-paint + pose-mode, fall through to using calculateTransformCenter */
@@ -256,16 +265,16 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
 		 */
 		if (ob_act->mode & (OB_MODE_SCULPT | OB_MODE_TEXTURE_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
 			float stroke[3];
-			BKE_paint_stroke_get_average(scene, ob_act, stroke);
+			BKE_paint_stroke_get_average(scene, ob_act_eval, stroke);
 			copy_v3_v3(lastofs, stroke);
 		}
 		else {
-			copy_v3_v3(lastofs, ob_act->obmat[3]);
+			copy_v3_v3(lastofs, ob_act_eval->obmat[3]);
 		}
 		is_set = true;
 	}
 	else if (ob_act && (ob_act->mode & OB_MODE_EDIT) && (ob_act->type == OB_FONT)) {
-		Curve *cu = ob_act->data;
+		Curve *cu = ob_act_eval->data;
 		EditFont *ef = cu->editfont;
 		int i;
 
@@ -275,33 +284,32 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
 		}
 		mul_v2_fl(lastofs, 1.0f / 4.0f);
 
-		mul_m4_v3(ob_act->obmat, lastofs);
+		mul_m4_v3(ob_act_eval->obmat, lastofs);
 
 		is_set = true;
 	}
 	else if (ob_act == NULL || ob_act->mode == OB_MODE_OBJECT) {
 		/* object mode use boundbox centers */
-		View3D *v3d = CTX_wm_view3d(C);
-		Base *base;
+		Base *base_eval;
 		unsigned int tot = 0;
 		float select_center[3];
 
 		zero_v3(select_center);
-		for (base = FIRSTBASE; base; base = base->next) {
-			if (TESTBASE(v3d, base)) {
+		for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) {
+			if (TESTBASE(base_eval)) {
 				/* use the boundbox if we can */
-				Object *ob = base->object;
+				Object *ob_eval = base_eval->object;
 
-				if (ob->bb && !(ob->bb->flag & BOUNDBOX_DIRTY)) {
+				if (ob_eval->bb && !(ob_eval->bb->flag & BOUNDBOX_DIRTY)) {
 					float cent[3];
 
-					BKE_boundbox_calc_center_aabb(ob->bb, cent);
+					BKE_boundbox_calc_center_aabb(ob_eval->bb, cent);
 
-					mul_m4_v3(ob->obmat, cent);
+					mul_m4_v3(ob_eval->obmat, cent);
 					add_v3_v3(select_center, cent);
 				}
 				else {
-					add_v3_v3(select_center, ob->obmat[3]);
+					add_v3_v3(select_center, ob_eval->obmat[3]);
 				}
 				tot++;
 			}
@@ -364,6 +372,7 @@ static void viewops_data_create(
         bContext *C, wmOperator *op, const wmEvent *event,
         enum eViewOpsFlag viewops_flag)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	ViewOpsData *vod = op->customdata;
 	RegionView3D *rv3d = vod->rv3d;
 
@@ -381,7 +390,7 @@ static void viewops_data_create(
 		negate_v3_v3(fallback_depth_pt, rv3d->ofs);
 
 		vod->use_dyn_ofs = ED_view3d_autodist(
-		        vod->scene, vod->ar, vod->v3d,
+		        depsgraph, vod->ar, vod->v3d,
 		        event->mval, vod->dyn_ofs, true, fallback_depth_pt);
 	}
 	else {
@@ -389,7 +398,7 @@ static void viewops_data_create(
 	}
 
 	if (viewops_flag & VIEWOPS_FLAG_PERSP_ENSURE) {
-		if (ED_view3d_persp_ensure(vod->v3d, vod->ar)) {
+		if (ED_view3d_persp_ensure(depsgraph, vod->v3d, vod->ar)) {
 			/* If we're switching from camera view to the perspective one,
 			 * need to tag viewport update, so camera vuew and borders
 			 * are properly updated.
@@ -400,7 +409,7 @@ static void viewops_data_create(
 
 	/* set the view from the camera, if view locking is enabled.
 	 * we may want to make this optional but for now its needed always */
-	ED_view3d_camera_lock_init(vod->v3d, vod->rv3d);
+	ED_view3d_camera_lock_init(depsgraph, vod->v3d, vod->rv3d);
 
 	vod->init.dist = rv3d->dist;
 	vod->init.camzoom = rv3d->camzoom;
@@ -504,8 +513,9 @@ static void viewops_data_create(
 static void viewops_data_free(bContext *C, wmOperator *op)
 {
 	ARegion *ar;
+#if 0
 	Paint *p = BKE_paint_get_active_from_context(C);
-
+#endif
 	if (op->customdata) {
 		ViewOpsData *vod = op->customdata;
 		ar = vod->ar;
@@ -521,7 +531,9 @@ static void viewops_data_free(bContext *C, wmOperator *op)
 		ar = CTX_wm_region(C);
 	}
 
+#if 0
 	if (p && (p->flags & PAINT_FAST_NAVIGATE))
+#endif
 		ED_region_tag_redraw(ar);
 }
 
@@ -800,7 +812,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2])
 	vod->prev.event_xy[0] = event_xy[0];
 	vod->prev.event_xy[1] = event_xy[1];
 
-	ED_view3d_camera_lock_sync(vod->v3d, rv3d);
+	ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, rv3d);
 
 	ED_region_tag_redraw(vod->ar);
 }
@@ -1108,7 +1120,7 @@ static void view3d_ndof_orbit(
 
 	BLI_assert((rv3d->viewlock & RV3D_LOCKED) == 0);
 
-	ED_view3d_persp_ensure(v3d, ar);
+	ED_view3d_persp_ensure(vod->depsgraph, v3d, ar);
 
 	rv3d->view = RV3D_VIEW_USER;
 
@@ -1297,6 +1309,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		return OPERATOR_CANCELLED;
 	}
 	else {
+		const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		ViewOpsData *vod;
 		View3D *v3d;
 		RegionView3D *rv3d;
@@ -1317,7 +1330,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		/* off by default, until changed later this function */
 		rv3d->rot_angle = 0.0f;
 
-		ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+		ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
 		if (ndof->progress != P_FINISHING) {
 			const bool has_rotation = NDOF_HAS_ROTATE;
@@ -1334,7 +1347,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 			}
 		}
 
-		ED_view3d_camera_lock_sync(v3d, rv3d);
+		ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
 		ED_region_tag_redraw(vod->ar);
 
@@ -1365,6 +1378,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 		return OPERATOR_CANCELLED;
 	}
 	else {
+		const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		ViewOpsData *vod;
 		View3D *v3d;
 		RegionView3D *rv3d;
@@ -1386,7 +1400,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 		/* off by default, until changed later this function */
 		rv3d->rot_angle = 0.0f;
 
-		ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+		ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
 		if (ndof->progress == P_FINISHING) {
 			/* pass */
@@ -1435,7 +1449,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 			ED_view3d_distance_set(rv3d, dist_backup);
 		}
 
-		ED_view3d_camera_lock_sync(v3d, rv3d);
+		ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
 		ED_region_tag_redraw(vod->ar);
 
@@ -1469,6 +1483,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
 		return OPERATOR_CANCELLED;
 	}
 	else {
+		const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		View3D *v3d = CTX_wm_view3d(C);
 		RegionView3D *rv3d = CTX_wm_region_view3d(C);
 		const wmNDOFMotionData *ndof = event->customdata;
@@ -1482,7 +1497,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
 		if (!(has_translate || has_zoom))
 			return OPERATOR_CANCELLED;
 
-		ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+		ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
 		if (ndof->progress != P_FINISHING) {
 			ScrArea *sa = CTX_wm_area(C);
@@ -1493,7 +1508,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
 			}
 		}
 
-		ED_view3d_camera_lock_sync(v3d, rv3d);
+		ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
 		ED_region_tag_redraw(CTX_wm_region(C));
 
@@ -1626,7 +1641,7 @@ static void viewmove_apply(ViewOpsData *vod, int x, int y)
 	vod->prev.event_xy[0] = x;
 	vod->prev.event_xy[1] = y;
 
-	ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+	ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
 	ED_region_tag_redraw(vod->ar);
 }
@@ -1790,7 +1805,7 @@ void viewzoom_modal_keymap(wmKeyConfig *keyconf)
  * \param zoom_xy: Optionally zoom to window location (coords compatible w/ #wmEvent.x, y). Use when not NULL.
  */
 static void view_zoom_to_window_xy_camera(
-        Scene *scene, View3D *v3d,
+        Scene *scene, Depsgraph *depsgraph, View3D *v3d,
         ARegion *ar, float dfac, const int zoom_xy[2])
 {
 	RegionView3D *rv3d = ar->regiondata;
@@ -1808,13 +1823,13 @@ static void view_zoom_to_window_xy_camera(
 		float pt_dst[2];
 		float delta_px[2];
 
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &camera_frame_old, false);
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &camera_frame_old, false);
 		BLI_rctf_translate(&camera_frame_old, ar->winrct.xmin, ar->winrct.ymin);
 
 		rv3d->camzoom = camzoom_new;
 		CLAMP(rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX);
 
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &camera_frame_new, false);
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &camera_frame_new, false);
 		BLI_rctf_translate(&camera_frame_new, ar->winrct.xmin, ar->winrct.ymin);
 
 		BLI_rctf_transform_pt_v(&camera_frame_new, &camera_frame_old, pt_dst, pt_src);
@@ -1987,7 +2002,7 @@ static void viewzoom_apply_camera(
 		/* calculate inverted, then invert again (needed because of camera zoom scaling) */
 		zfac = 1.0f / zfac;
 		view_zoom_to_window_xy_camera(
-		        vod->scene, vod->v3d,
+		        vod->scene, vod->depsgraph, vod->v3d,
 		        vod->ar, zfac, zoom_to_pos ? vod->prev.event_xy : NULL);
 	}
 
@@ -2025,7 +2040,7 @@ static void viewzoom_apply_3d(
 		view3d_boxview_sync(vod->sa, vod->ar);
 	}
 
-	ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+	ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
 	ED_region_tag_redraw(vod->ar);
 }
@@ -2107,6 +2122,7 @@ static int viewzoom_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 static int viewzoom_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d;
 	RegionView3D *rv3d;
@@ -2149,7 +2165,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
 		const float step = 1.2f;
 		/* this min and max is also in viewmove() */
 		if (use_cam_zoom) {
-			view_zoom_to_window_xy_camera(scene, v3d, ar, step, zoom_xy);
+			view_zoom_to_window_xy_camera(scene, depsgraph, v3d, ar, step, zoom_xy);
 		}
 		else {
 			if (rv3d->dist < dist_range[1]) {
@@ -2160,7 +2176,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
 	else {
 		const float step = 1.0f / 1.2f;
 		if (use_cam_zoom) {
-			view_zoom_to_window_xy_camera(scene, v3d, ar, step, zoom_xy);
+			view_zoom_to_window_xy_camera(scene, depsgraph, v3d, ar, step, zoom_xy);
 		}
 		else {
 			if (rv3d->dist > dist_range[0]) {
@@ -2175,7 +2191,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
 
 	ED_view3d_depth_tag_update(rv3d);
 
-	ED_view3d_camera_lock_sync(v3d, rv3d);
+	ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 	ED_view3d_camera_lock_autokey(v3d, rv3d, C, false, true);
 
 	ED_region_tag_redraw(ar);
@@ -2369,7 +2385,7 @@ static void viewdolly_apply(ViewOpsData *vod, const int xy[2], const short zoom_
 		view3d_boxview_sync(vod->sa, vod->ar);
 	}
 
-	ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+	ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
 	ED_region_tag_redraw(vod->ar);
 }
@@ -2470,7 +2486,7 @@ static int viewdolly_exec(bContext *C, wmOperator *op)
 
 	ED_view3d_depth_tag_update(rv3d);
 
-	ED_view3d_camera_lock_sync(v3d, rv3d);
+	ED_view3d_camera_lock_sync(CTX_data_depsgraph(C), v3d, rv3d);
 
 	ED_region_tag_redraw(ar);
 
@@ -2504,7 +2520,8 @@ static int viewdolly_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	if (vod->rv3d->persp != RV3D_PERSP) {
 		if (vod->rv3d->persp == RV3D_CAMOB) {
 			/* ignore rv3d->lpersp because dolly only makes sense in perspective mode */
-			ED_view3d_persp_switch_from_camera(vod->v3d, vod->rv3d, RV3D_PERSP);
+			const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+			ED_view3d_persp_switch_from_camera(depsgraph, vod->v3d, vod->rv3d, RV3D_PERSP);
 		}
 		else {
 			vod->rv3d->persp = RV3D_PERSP;
@@ -2638,7 +2655,7 @@ static void view3d_from_minmax(
 		}
 
 		if (ok_dist) {
-			new_dist = ED_view3d_radius_to_dist(v3d, ar, persp, true, (size / 2) * VIEW3D_MARGIN);
+			new_dist = ED_view3d_radius_to_dist(v3d, ar, CTX_data_depsgraph(C), persp, true, (size / 2) * VIEW3D_MARGIN);
 			if (rv3d->is_persp) {
 				/* don't zoom closer than the near clipping plane */
 				new_dist = max_ff(new_dist, v3d->near * 1.5f);
@@ -2693,8 +2710,9 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	Scene *scene = CTX_data_scene(C);
-	Base *base;
-	float *curs;
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
+	Base *base_eval;
 	const bool use_all_regions = RNA_boolean_get(op->ptr, "use_all_regions");
 	const bool skip_camera = (ED_view3d_camera_lock_check(v3d, ar->regiondata) ||
 	                          /* any one of the regions may be locked */
@@ -2707,24 +2725,26 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
 
 	if (center) {
 		/* in 2.4x this also move the cursor to (0, 0, 0) (with shift+c). */
-		curs = ED_view3d_cursor3d_get(scene, v3d);
+		View3DCursor *cursor = ED_view3d_cursor3d_get(scene, v3d);
 		zero_v3(min);
 		zero_v3(max);
-		zero_v3(curs);
+		zero_v3(cursor->location);
+		unit_qt(cursor->rotation);
 	}
 	else {
 		INIT_MINMAX(min, max);
 	}
 
-	for (base = scene->base.first; base; base = base->next) {
-		if (BASE_VISIBLE(v3d, base)) {
+	for (base_eval = view_layer_eval->object_bases.first; base_eval; base_eval = base_eval->next) {
+		if (BASE_VISIBLE(base_eval)) {
 			changed = true;
 
-			if (skip_camera && base->object == v3d->camera) {
+			Object *ob = DEG_get_original_object(base_eval->object);
+			if (skip_camera && ob == v3d->camera) {
 				continue;
 			}
 
-			BKE_object_minmax(base->object, min, max, false);
+			BKE_object_minmax(base_eval->object, min, max, false);
 		}
 	}
 	if (!changed) {
@@ -2746,6 +2766,10 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
 		view3d_from_minmax(C, v3d, ar, min, max, true, smooth_viewtx);
 	}
 
+	if (center) {
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+	}
+
 	return OPERATOR_FINISHED;
 }
 
@@ -2780,13 +2804,16 @@ void VIEW3D_OT_view_all(wmOperatorType *ot)
 /* like a localview without local!, was centerview() in 2.4x */
 static int viewselected_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
 	bGPdata *gpd = CTX_data_gpencil_data(C);
 	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
-	Object *ob = OBACT;
+	const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map &&
+	                          WM_manipulatormap_is_any_selected(ar->manipulator_map));
+	Object *ob_eval = OBACT(view_layer_eval);
 	Object *obedit = CTX_data_edit_object(C);
 	float min[3], max[3];
 	bool ok = false, ok_dist = true;
@@ -2797,28 +2824,27 @@ static int viewselected_exec(bContext *C, wmOperator *op)
 	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
 	INIT_MINMAX(min, max);
-
-	if (is_gp_edit) {
-		ob = NULL;
+	if (is_gp_edit || is_face_map) {
+		ob_eval = NULL;
 	}
 
-	if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) {
+	if (ob_eval && (ob_eval->mode & OB_MODE_WEIGHT_PAINT)) {
 		/* hard-coded exception, we look for the one selected armature */
 		/* this is weak code this way, we should make a generic active/selection callback interface once... */
-		Base *base;
-		for (base = scene->base.first; base; base = base->next) {
-			if (TESTBASELIB(v3d, base)) {
-				if (base->object->type == OB_ARMATURE)
-					if (base->object->mode & OB_MODE_POSE)
+		Base *base_eval;
+		for (base_eval = view_layer_eval->object_bases.first; base_eval; base_eval = base_eval->next) {
+			if (TESTBASELIB(base_eval)) {
+				if (base_eval->object->type == OB_ARMATURE)
+					if (base_eval->object->mode & OB_MODE_POSE)
 						break;
 			}
 		}
-		if (base)
-			ob = base->object;
+		if (base_eval)
+			ob_eval = base_eval->object;
 	}
 
-
 	if (is_gp_edit) {
+		/* TODO(sergey): Check on this after gpencil merge. */
 		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
 		{
 			/* we're only interested in selected points here... */
@@ -2830,38 +2856,48 @@ static int viewselected_exec(bContext *C, wmOperator *op)
 		}
 		CTX_DATA_END;
 	}
+	else if (is_face_map) {
+		ok = WM_manipulatormap_minmax(ar->manipulator_map, true, true, min, max);
+	}
 	else if (obedit) {
-		ok = ED_view3d_minmax_verts(obedit, min, max);    /* only selected */
+		/* only selected */
+		FOREACH_OBJECT_IN_MODE_BEGIN (view_layer_eval, obedit->mode, ob_eval_iter) {
+			ok |= ED_view3d_minmax_verts(ob_eval_iter, min, max);
+		}
+		FOREACH_OBJECT_IN_MODE_END;
 	}
-	else if (ob && (ob->mode & OB_MODE_POSE)) {
-		ok = BKE_pose_minmax(ob, min, max, true, true);
+	else if (ob_eval && (ob_eval->mode & OB_MODE_POSE)) {
+		FOREACH_OBJECT_IN_MODE_BEGIN (view_layer_eval, ob_eval->mode, ob_eval_iter) {
+			ok |= BKE_pose_minmax(ob_eval_iter, min, max, true, true);
+		}
+		FOREACH_OBJECT_IN_MODE_END;
 	}
-	else if (BKE_paint_select_face_test(ob)) {
-		ok = paintface_minmax(ob, min, max);
+	else if (BKE_paint_select_face_test(ob_eval)) {
+		ok = paintface_minmax(ob_eval, min, max);
 	}
-	else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
-		ok = PE_minmax(scene, min, max);
+	else if (ob_eval && (ob_eval->mode & OB_MODE_PARTICLE_EDIT)) {
+		ok = PE_minmax(scene, view_layer_eval, min, max);
 	}
-	else if (ob &&
-	         (ob->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
+	else if (ob_eval &&
+	         (ob_eval->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
 	{
-		BKE_paint_stroke_get_average(scene, ob, min);
+		BKE_paint_stroke_get_average(scene, ob_eval, min);
 		copy_v3_v3(max, min);
 		ok = true;
 		ok_dist = 0; /* don't zoom */
 	}
 	else {
-		Base *base;
-		for (base = FIRSTBASE; base; base = base->next) {
-			if (TESTBASE(v3d, base)) {
+		Base *base_eval;
+		for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) {
+			if (TESTBASE(base_eval)) {
 
-				if (skip_camera && base->object == v3d->camera) {
+				if (skip_camera && base_eval->object == v3d->camera) {
 					continue;
 				}
 
 				/* account for duplis */
-				if (BKE_object_minmax_dupli(bmain, scene, base->object, min, max, false) == 0)
-					BKE_object_minmax(base->object, min, max, false);  /* use if duplis not found */
+				if (BKE_object_minmax_dupli(depsgraph, scene, base_eval->object, min, max, false) == 0)
+					BKE_object_minmax(base_eval->object, min, max, false);  /* use if duplis not found */
 
 				ok = 1;
 			}
@@ -2950,14 +2986,14 @@ static int view_lock_to_active_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *obact = CTX_data_active_object(C);
 
 	if (v3d) {
-
 		ED_view3d_lock_clear(v3d);
 
 		v3d->ob_centre = obact; /* can be NULL */
 
 		if (obact && obact->type == OB_ARMATURE) {
 			if (obact->mode & OB_MODE_POSE) {
-				bPoseChannel *pcham_act = BKE_pose_channel_active(obact);
+				Object *obact_eval = DEG_get_evaluated_object(CTX_data_depsgraph(C), obact);
+				bPoseChannel *pcham_act = BKE_pose_channel_active(obact_eval);
 				if (pcham_act) {
 					BLI_strncpy(v3d->ob_centre_bone, pcham_act->name, sizeof(v3d->ob_centre_bone));
 				}
@@ -3015,7 +3051,7 @@ static int viewcenter_cursor_exec(bContext *C, wmOperator *op)
 
 		/* non camera center */
 		float new_ofs[3];
-		negate_v3_v3(new_ofs, ED_view3d_cursor3d_get(scene, v3d));
+		negate_v3_v3(new_ofs, ED_view3d_cursor3d_get(scene, v3d)->location);
 		ED_view3d_smooth_view(
 		        C, v3d, ar, smooth_viewtx,
 		        &(const V3D_SmoothParams) {.ofs = new_ofs});
@@ -3051,10 +3087,10 @@ static int viewcenter_pick_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 {
 	View3D *v3d = CTX_wm_view3d(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar = CTX_wm_region(C);
 
 	if (rv3d) {
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		float new_ofs[3];
 		const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
@@ -3062,7 +3098,7 @@ static int viewcenter_pick_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 
 		view3d_operator_needs_opengl(C);
 
-		if (ED_view3d_autodist(scene, ar, v3d, event->mval, new_ofs, false, NULL)) {
+		if (ED_view3d_autodist(depsgraph, ar, v3d, event->mval, new_ofs, false, NULL)) {
 			/* pass */
 		}
 		else {
@@ -3102,6 +3138,7 @@ void VIEW3D_OT_view_center_pick(wmOperatorType *ot)
 
 static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was view3d_home() in 2.4x */
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	float xfac, yfac;
 	float size[2];
@@ -3116,7 +3153,7 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was
 
 	rv3d->camdx = rv3d->camdy = 0.0f;
 
-	ED_view3d_calc_camera_border_size(scene, ar, v3d, rv3d, size);
+	ED_view3d_calc_camera_border_size(scene, depsgraph, ar, v3d, rv3d, size);
 
 	/* 4px is just a little room from the edge of the area */
 	xfac = (float)ar->winx / (float)(size[0] + 4);
@@ -3185,6 +3222,7 @@ void VIEW3D_OT_view_center_lock(wmOperatorType *ot)
 
 static int render_border_exec(bContext *C, wmOperator *op)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	ARegion *ar = CTX_wm_region(C);
 	RegionView3D *rv3d = ED_view3d_context_rv3d(C);
@@ -3205,7 +3243,7 @@ static int render_border_exec(bContext *C, wmOperator *op)
 	/* calculate range */
 
 	if (rv3d->persp == RV3D_CAMOB) {
-		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &vb, false);
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &vb, false);
 	}
 	else {
 		vb.xmin = 0;
@@ -3250,6 +3288,9 @@ static int render_border_exec(bContext *C, wmOperator *op)
 			v3d->flag2 |= V3D_RENDER_BORDER;
 	}
 
+	if (rv3d->persp == RV3D_CAMOB) {
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+	}
 	return OPERATOR_FINISHED;
 }
 
@@ -3313,6 +3354,9 @@ static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op))
 	border->xmax = 1.0f;
 	border->ymax = 1.0f;
 
+	if (rv3d->persp == RV3D_CAMOB) {
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+	}
 	return OPERATOR_FINISHED;
 }
 
@@ -3342,7 +3386,6 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	Scene *scene = CTX_data_scene(C);
 	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
 	/* Zooms in on a border drawn by the user */
@@ -3355,9 +3398,8 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 	float new_ofs[3];
 
 	/* ZBuffer depth vars */
-	bglMats mats;
 	float depth_close = FLT_MAX;
-	double cent[2],  p[3];
+	float cent[2],  p[3];
 
 	/* note; otherwise opengl won't work */
 	view3d_operator_needs_opengl(C);
@@ -3371,8 +3413,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 	ED_view3d_dist_range_get(v3d, dist_range);
 
 	/* Get Z Depths, needed for perspective, nice for ortho */
-	bgl_get_mats(&mats);
-	ED_view3d_draw_depth(scene, ar, v3d, true);
+	ED_view3d_draw_depth(CTX_data_depsgraph(C), ar, v3d, true);
 
 	{
 		/* avoid allocating the whole depth buffer */
@@ -3387,11 +3428,11 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 		MEM_SAFE_FREE(depth_temp.depths);
 	}
 
-	cent[0] = (((double)rect.xmin) + ((double)rect.xmax)) / 2;
-	cent[1] = (((double)rect.ymin) + ((double)rect.ymax)) / 2;
+	cent[0] = (((float)rect.xmin) + ((float)rect.xmax)) / 2;
+	cent[1] = (((float)rect.ymin) + ((float)rect.ymax)) / 2;
 
 	if (rv3d->is_persp) {
-		double p_corner[3];
+		float p_corner[3];
 
 		/* no depths to use, we cant do anything! */
 		if (depth_close == FLT_MAX) {
@@ -3399,23 +3440,14 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 			return OPERATOR_CANCELLED;
 		}
 		/* convert border to 3d coordinates */
-		if ((!gluUnProject(cent[0], cent[1], depth_close,
-		                   mats.modelview, mats.projection, (GLint *)mats.viewport,
-		                   &p[0], &p[1], &p[2])) ||
-		    (!gluUnProject((double)rect.xmin, (double)rect.ymin, depth_close,
-		                   mats.modelview, mats.projection, (GLint *)mats.viewport,
-		                   &p_corner[0], &p_corner[1], &p_corner[2])))
+		if ((!ED_view3d_unproject(ar, cent[0], cent[1], depth_close, p)) ||
+		    (!ED_view3d_unproject(ar, rect.xmin, rect.ymin, depth_close, p_corner)))
 		{
 			return OPERATOR_CANCELLED;
 		}
 
-		dvec[0] = p[0] - p_corner[0];
-		dvec[1] = p[1] - p_corner[1];
-		dvec[2] = p[2] - p_corner[2];
-
-		new_ofs[0] = -p[0];
-		new_ofs[1] = -p[1];
-		new_ofs[2] = -p[2];
+		sub_v3_v3v3(dvec, p, p_corner);
+		negate_v3_v3(new_ofs, p);
 
 		new_dist = len_v3(dvec);
 
@@ -3430,13 +3462,8 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 		new_dist = rv3d->dist;
 
 		/* convert the drawn rectangle into 3d space */
-		if (depth_close != FLT_MAX && gluUnProject(cent[0], cent[1], depth_close,
-		                                           mats.modelview, mats.projection, (GLint *)mats.viewport,
-		                                           &p[0], &p[1], &p[2]))
-		{
-			new_ofs[0] = -p[0];
-			new_ofs[1] = -p[1];
-			new_ofs[2] = -p[2];
+		if (depth_close != FLT_MAX && ED_view3d_unproject(ar, cent[0], cent[1], depth_close, p)) {
+			negate_v3_v3(new_ofs, p);
 		}
 		else {
 			float mval_f[2];
@@ -3526,13 +3553,13 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot)
  * Sets the view to 1:1 camera/render-pixel.
  * \{ */
 
-static void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar, View3D *v3d)
+static void view3d_set_1_to_1_viewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View3D *v3d)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	float size[2];
 	int im_width = (scene->r.size * scene->r.xsch) / 100;
 
-	ED_view3d_calc_camera_border_size(scene, ar, v3d, rv3d, size);
+	ED_view3d_calc_camera_border_size(scene, depsgraph, ar, v3d, rv3d, size);
 
 	rv3d->camzoom = BKE_screen_view3d_zoom_from_fac((float)im_width / size[0]);
 	CLAMP(rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX);
@@ -3540,6 +3567,7 @@ static void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar, View3D *v3d)
 
 static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 
 	View3D *v3d;
@@ -3548,7 +3576,7 @@ static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op))
 	/* no NULL check is needed, poll checks */
 	ED_view3d_context_user_region(C, &v3d, &ar);
 
-	view3d_set_1_to_1_viewborder(scene, ar, v3d);
+	view3d_set_1_to_1_viewborder(scene, depsgraph, ar, v3d);
 
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 
@@ -3655,7 +3683,8 @@ static void axis_set_view(
 		dist = rv3d->dist;
 
 		/* so we animate _from_ the camera location */
-		ED_view3d_from_object(v3d->camera, rv3d->ofs, NULL, &rv3d->dist, NULL);
+		Object *camera_eval = DEG_get_evaluated_object(CTX_data_depsgraph(C), v3d->camera);
+		ED_view3d_from_object(camera_eval, rv3d->ofs, NULL, &rv3d->dist, NULL);
 
 		ED_view3d_smooth_view(
 		        C, v3d, ar, smooth_viewtx,
@@ -3685,7 +3714,6 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
 	View3D *v3d;
 	ARegion *ar;
 	RegionView3D *rv3d;
-	Scene *scene = CTX_data_scene(C);
 	static int perspo = RV3D_PERSP;
 	int viewnum, nextperspo;
 	bool align_active;
@@ -3719,8 +3747,11 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
 		if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
 			/* lastview -  */
 
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+			Scene *scene = CTX_data_scene(C);
+
 			if (rv3d->persp != RV3D_CAMOB) {
-				Object *ob = OBACT;
+				Object *ob = OBACT(view_layer);
 
 				if (!rv3d->smooth_timer) {
 					/* store settings of current view before allowing overwriting with camera view
@@ -3755,7 +3786,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
 					v3d->camera = ob;
 
 				if (v3d->camera == NULL)
-					v3d->camera = BKE_scene_camera_find(scene);
+					v3d->camera = BKE_view_layer_camera_find(view_layer);
 
 				/* couldnt find any useful camera, bail out */
 				if (v3d->camera == NULL)
@@ -3863,7 +3894,8 @@ static int vieworbit_exec(bContext *C, wmOperator *op)
 			float quat_new[4];
 
 			if (view_opposite == RV3D_VIEW_USER) {
-				ED_view3d_persp_ensure(v3d, ar);
+				const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+				ED_view3d_persp_ensure(depsgraph, v3d, ar);
 			}
 
 			if (ELEM(orbitdir, V3D_VIEW_STEPLEFT, V3D_VIEW_STEPRIGHT)) {
@@ -3988,7 +4020,7 @@ static void viewroll_apply(ViewOpsData *vod, int x, int UNUSED(y))
 		view3d_boxview_sync(vod->sa, vod->ar);
 	}
 
-	ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+	ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
 	ED_region_tag_redraw(vod->ar);
 }
@@ -4321,11 +4353,11 @@ void VIEW3D_OT_navigate(wmOperatorType *ot)
 /** \name Background Image Add Operator
  * \{ */
 
-static BGpic *background_image_add(bContext *C)
+static CameraBGImage *background_image_add(bContext *C)
 {
-	View3D *v3d = CTX_wm_view3d(C);
+	Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
 
-	return ED_view3d_background_image_new(v3d);
+	return BKE_camera_background_image_new(cam);
 }
 
 static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op))
@@ -4337,9 +4369,9 @@ static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op))
 
 static int background_image_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
-	View3D *v3d = CTX_wm_view3d(C);
+	Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
 	Image *ima;
-	BGpic *bgpic;
+	CameraBGImage *bgpic;
 
 	ima = (Image *)WM_operator_drop_load_path(C, op, ID_IM);
 	/* may be NULL, continue anyway */
@@ -4347,9 +4379,9 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, const wmEven
 	bgpic = background_image_add(C);
 	bgpic->ima = ima;
 
-	v3d->flag |= V3D_DISPBGPICS;
+	cam->flag |= CAM_SHOW_BG_IMAGE;
 
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+	WM_event_add_notifier(C, NC_CAMERA | ND_DRAW_RENDER_VIEWPORT, cam);
 
 	return OPERATOR_FINISHED;
 }
@@ -4366,7 +4398,7 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = background_image_add_invoke;
 	ot->exec   = background_image_add_exec;
-	ot->poll   = ED_operator_view3d_active;
+	ot->poll   = ED_operator_camera;
 
 	/* flags */
 	ot->flag   = OPTYPE_UNDO;
@@ -4386,21 +4418,21 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 
 static int background_image_remove_exec(bContext *C, wmOperator *op)
 {
-	View3D *v3d = CTX_wm_view3d(C);
+	Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
 	const int index = RNA_int_get(op->ptr, "index");
-	BGpic *bgpic_rem = BLI_findlink(&v3d->bgpicbase, index);
+	CameraBGImage *bgpic_rem = BLI_findlink(&cam->bg_images, index);
 
 	if (bgpic_rem) {
-		if (bgpic_rem->source == V3D_BGPIC_IMAGE) {
+		if (bgpic_rem->source == CAM_BGIMG_SOURCE_IMAGE) {
 			id_us_min((ID *)bgpic_rem->ima);
 		}
-		else if (bgpic_rem->source == V3D_BGPIC_MOVIE) {
+		else if (bgpic_rem->source == CAM_BGIMG_SOURCE_MOVIE) {
 			id_us_min((ID *)bgpic_rem->clip);
 		}
 
-		ED_view3d_background_image_remove(v3d, bgpic_rem);
+		BKE_camera_background_image_remove(cam, bgpic_rem);
 
-		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+		WM_event_add_notifier(C, NC_CAMERA | ND_DRAW_RENDER_VIEWPORT, cam);
 		return OPERATOR_FINISHED;
 	}
 	else {
@@ -4417,7 +4449,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec   = background_image_remove_exec;
-	ot->poll   = ED_operator_view3d_active;
+	ot->poll   = ED_operator_camera;
 
 	/* flags */
 	ot->flag   = 0;
@@ -4457,9 +4489,8 @@ void ED_view3d_clipping_local(RegionView3D *rv3d, float mat[4][4])
 
 static int view3d_clipping_exec(bContext *C, wmOperator *op)
 {
+	ARegion *ar = CTX_wm_region(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	ViewContext vc;
-	bglMats mats;
 	rcti rect;
 
 	WM_operator_properties_border_to_rcti(op, &rect);
@@ -4467,12 +4498,8 @@ static int view3d_clipping_exec(bContext *C, wmOperator *op)
 	rv3d->rflag |= RV3D_CLIPPING;
 	rv3d->clipbb = MEM_callocN(sizeof(BoundBox), "clipbb");
 
-	/* note; otherwise opengl won't work */
-	view3d_operator_needs_opengl(C);
-
-	ED_view3d_viewcontext_init(C, &vc);
-	view3d_get_transformation(vc.ar, vc.rv3d, NULL, &mats); /* NULL because we don't want it in object space */
-	ED_view3d_clipping_calc(rv3d->clipbb, rv3d->clip, &mats, &rect);
+	/* NULL object because we don't want it in object space */
+	ED_view3d_clipping_calc(rv3d->clipbb, rv3d->clip, ar, NULL, &rect);
 
 	return OPERATOR_FINISHED;
 }
@@ -4527,7 +4554,6 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
 /* note: cannot use event->mval here (called by object_add() */
 void ED_view3d_cursor3d_position(bContext *C, float fp[3], const int mval[2])
 {
-	Scene *scene = CTX_data_scene(C);
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	RegionView3D *rv3d = ar->regiondata;
@@ -4549,9 +4575,12 @@ void ED_view3d_cursor3d_position(bContext *C, float fp[3], const int mval[2])
 	}
 
 	if (U.uiflag & USER_DEPTH_CURSOR) {  /* maybe this should be accessed some other way */
+		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
 		view3d_operator_needs_opengl(C);
-		if (ED_view3d_autodist(scene, ar, v3d, mval, fp, true, NULL))
+		if (ED_view3d_autodist(depsgraph, ar, v3d, mval, fp, true, NULL)) {
 			depth_used = true;
+		}
 	}
 
 	if (depth_used == false) {
@@ -4565,25 +4594,74 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
 
-	float *fp_curr = ED_view3d_cursor3d_get(scene, v3d);
-	float  fp_prev[3];
+	View3DCursor *cursor_curr = ED_view3d_cursor3d_get(scene, v3d);
+	View3DCursor  cursor_prev = *cursor_curr;
 
-	copy_v3_v3(fp_prev, fp_curr);
+	ED_view3d_cursor3d_position(C, cursor_curr->location, mval);
+	copy_qt_qt(cursor_curr->rotation, rv3d->viewquat);
+	cursor_curr->rotation[0] *= -1.0f;
 
-	ED_view3d_cursor3d_position(C, fp_curr, mval);
+	{
+		const float mval_fl[2] = {UNPACK2(mval)};
+		float ray_no[3];
+
+		struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
+		        scene, CTX_data_depsgraph(C), 0, ar, v3d);
+
+		float obmat[4][4];
+		Object *ob_dummy = NULL;
+		float dist_px = 0;
+		if (ED_transform_snap_object_project_view3d_ex(
+		        snap_context,
+		        SCE_SNAP_MODE_FACE,
+		        &(const struct SnapObjectParams){
+		            .snap_select = SNAP_ALL,
+		            .use_object_edit_cage = false,
+		        },
+		        mval_fl, &dist_px,
+		        cursor_curr->location, ray_no, NULL,
+		        &ob_dummy, obmat))
+		{
+			float tquat[4];
+			/* Math normal (Z). */
+			{
+				float z_src[3] = {0, 0, 1};
+				mul_qt_v3(cursor_curr->rotation, z_src);
+				rotation_between_vecs_to_quat(tquat, z_src, ray_no);
+				mul_qt_qtqt(cursor_curr->rotation, tquat, cursor_curr->rotation);
+			}
+
+			/* Match object matrix (X). */
+			{
+				const float ortho_axis_dot[3] = {
+					dot_v3v3(ray_no, obmat[0]),
+					dot_v3v3(ray_no, obmat[1]),
+					dot_v3v3(ray_no, obmat[2]),
+				};
+				const int ortho_axis = axis_dominant_v3_ortho_single(ortho_axis_dot);
+				float x_src[3] = {1, 0, 0};
+				float x_dst[3];
+				mul_qt_v3(cursor_curr->rotation, x_src);
+				project_plane_v3_v3v3(x_dst, obmat[ortho_axis], ray_no);
+				normalize_v3(x_dst);
+				rotation_between_vecs_to_quat(tquat, x_src, x_dst);
+				mul_qt_qtqt(cursor_curr->rotation, tquat, cursor_curr->rotation);
+			}
+		}
+		ED_transform_snap_object_context_destroy(snap_context);
+	}
 
 	/* offset the cursor lock to avoid jumping to new offset */
 	if (v3d->ob_centre_cursor) {
-		ARegion *ar = CTX_wm_region(C);
-		RegionView3D *rv3d = ar->regiondata;
-
 		if (U.uiflag & USER_LOCK_CURSOR_ADJUST) {
 
 			float co_curr[2], co_prev[2];
 
-			if ((ED_view3d_project_float_global(ar, fp_prev, co_prev, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
-			    (ED_view3d_project_float_global(ar, fp_curr, co_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
+			if ((ED_view3d_project_float_global(ar, cursor_prev.location, co_prev, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
+			    (ED_view3d_project_float_global(ar, cursor_curr->location, co_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
 			{
 				rv3d->ofs_lock[0] += (co_curr[0] - co_prev[0]) / (ar->winx * 0.5f);
 				rv3d->ofs_lock[1] += (co_curr[1] - co_prev[1]) / (ar->winy * 0.5f);
@@ -4599,6 +4677,14 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 	else
 		WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
+
+	{
+		struct wmMsgBus *mbus = CTX_wm_message_bus(C);
+		WM_msg_publish_rna_prop(
+		        mbus, &scene->id, scene, Scene, cursor_location);
+	}
+
+	DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 }
 
 static int view3d_cursor3d_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
@@ -4628,96 +4714,6 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Transform Manipulator Operator
- * \{ */
-
-static int manipulator_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	View3D *v3d = CTX_wm_view3d(C);
-
-	if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
-	if (!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
-
-	/* note; otherwise opengl won't work */
-	view3d_operator_needs_opengl(C);
-
-	if (BIF_do_manipulator(C, event, op) == 0)
-		return OPERATOR_PASS_THROUGH;
-
-	return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_manipulator(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "3D Manipulator";
-	ot->description = "Manipulate selected item by axis";
-	ot->idname = "VIEW3D_OT_manipulator";
-
-	/* api callbacks */
-	ot->invoke = manipulator_invoke;
-
-	ot->poll = ED_operator_view3d_active;
-
-	/* properties to pass to transform */
-	Transform_Properties(ot, P_CONSTRAINT);
-
-	prop = RNA_def_boolean(ot->srna, "use_planar_constraint", false, "Planar Constraint", "Limit the transformation to the "
-	                       "two axes that have not been clicked (translate/scale only)");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Enable Transform Manipulator Operator
- * \{ */
-
-static int enable_manipulator_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	View3D *v3d = CTX_wm_view3d(C);
-
-	v3d->twtype = 0;
-
-	if (RNA_boolean_get(op->ptr, "translate"))
-		v3d->twtype |= V3D_MANIP_TRANSLATE;
-	if (RNA_boolean_get(op->ptr, "rotate"))
-		v3d->twtype |= V3D_MANIP_ROTATE;
-	if (RNA_boolean_get(op->ptr, "scale"))
-		v3d->twtype |= V3D_MANIP_SCALE;
-
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
-
-	return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_enable_manipulator(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Enable 3D Manipulator";
-	ot->description = "Enable the transform manipulator for use";
-	ot->idname = "VIEW3D_OT_enable_manipulator";
-
-	/* api callbacks */
-	ot->invoke = enable_manipulator_invoke;
-	ot->poll = ED_operator_view3d_active;
-
-	/* properties */
-	prop = RNA_def_boolean(ot->srna, "translate", 0, "Translate", "Enable the translate manipulator");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_boolean(ot->srna, "rotate", 0, "Rotate", "Enable the rotate manipulator");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_boolean(ot->srna, "scale", 0, "Scale", "Enable the scale manipulator");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
 /** \name Toggle Render Shading Operator
  * \{ */
 
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 65d66df4824..d8cc9ab9828 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -56,6 +56,10 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
+#include "GPU_immediate.h"
+
+#include "DEG_depsgraph.h"
+
 #include "view3d_intern.h"  /* own include */
 
 /* NOTE: these defines are saved in keymap files, do not change values but just add new ones */
@@ -191,6 +195,7 @@ typedef struct FlyInfo {
 	RegionView3D *rv3d;
 	View3D *v3d;
 	ARegion *ar;
+	struct Depsgraph *depsgraph;
 	Scene *scene;
 
 	wmTimer *timer; /* needed for redraws */
@@ -240,7 +245,7 @@ static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar),
 	float x1, x2, y1, y2;
 
 	if (fly->scene->camera) {
-		ED_view3d_calc_camera_border(fly->scene, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
+		ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
 		xoff = viewborder.xmin;
 		yoff = viewborder.ymin;
 	}
@@ -257,36 +262,45 @@ static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar),
 	x2 = xoff + 0.55f * fly->width;
 	y2 = yoff + 0.55f * fly->height;
 
-	UI_ThemeColor(TH_VIEW_OVERLAY);
-	glBegin(GL_LINES);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformThemeColor(TH_VIEW_OVERLAY);
+
+	immBegin(GWN_PRIM_LINES, 16);
+
 	/* bottom left */
-	glVertex2f(x1, y1);
-	glVertex2f(x1, y1 + 5);
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x1, y1 + 5);
 
-	glVertex2f(x1, y1);
-	glVertex2f(x1 + 5, y1);
+	immVertex2f(pos, x1, y1);
+	immVertex2f(pos, x1 + 5, y1);
 
 	/* top right */
-	glVertex2f(x2, y2);
-	glVertex2f(x2, y2 - 5);
+	immVertex2f(pos, x2, y2);
+	immVertex2f(pos, x2, y2 - 5);
 
-	glVertex2f(x2, y2);
-	glVertex2f(x2 - 5, y2);
+	immVertex2f(pos, x2, y2);
+	immVertex2f(pos, x2 - 5, y2);
 
 	/* top left */
-	glVertex2f(x1, y2);
-	glVertex2f(x1, y2 - 5);
+	immVertex2f(pos, x1, y2);
+	immVertex2f(pos, x1, y2 - 5);
 
-	glVertex2f(x1, y2);
-	glVertex2f(x1 + 5, y2);
+	immVertex2f(pos, x1, y2);
+	immVertex2f(pos, x1 + 5, y2);
 
 	/* bottom right */
-	glVertex2f(x2, y1);
-	glVertex2f(x2, y1 + 5);
+	immVertex2f(pos, x2, y1);
+	immVertex2f(pos, x2, y1 + 5);
 
-	glVertex2f(x2, y1);
-	glVertex2f(x2 - 5, y1);
-	glEnd();
+	immVertex2f(pos, x2, y1);
+	immVertex2f(pos, x2 - 5, y1);
+
+	immEnd();
+	immUnbindProgram();
 }
 
 static void fly_update_header(bContext *C, wmOperator *op, FlyInfo *fly)
@@ -332,6 +346,7 @@ enum {
 static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent *event)
 {
 	wmWindow *win = CTX_wm_window(C);
+
 	rctf viewborder;
 
 	float upvec[3]; /* tmp */
@@ -340,6 +355,7 @@ static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent
 	fly->rv3d = CTX_wm_region_view3d(C);
 	fly->v3d = CTX_wm_view3d(C);
 	fly->ar = CTX_wm_region(C);
+	fly->depsgraph = CTX_data_depsgraph(C);
 	fly->scene = CTX_data_scene(C);
 
 #ifdef NDOF_FLY_DEBUG
@@ -406,12 +422,12 @@ static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent
 	}
 
 	fly->v3d_camera_control = ED_view3d_cameracontrol_acquire(
-	        fly->scene, fly->v3d, fly->rv3d,
+	        CTX_data_depsgraph(C), fly->scene, fly->v3d, fly->rv3d,
 	        (U.uiflag & USER_CAM_LOCK_NO_PARENT) == 0);
 
 	/* calculate center */
 	if (fly->scene->camera) {
-		ED_view3d_calc_camera_border(fly->scene, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
+		ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
 
 		fly->width = BLI_rctf_size_x(&viewborder);
 		fly->height = BLI_rctf_size_y(&viewborder);
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 124bd33f227..5f07bb0fc3d 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -41,11 +41,12 @@
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -71,7 +72,6 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event);
 /* XXX quickly ported across */
 static void handle_view3d_lock(bContext *C)
 {
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	ScrArea *sa = CTX_wm_area(C);
 	View3D *v3d = CTX_wm_view3d(C);
@@ -83,10 +83,6 @@ static void handle_view3d_lock(bContext *C)
 			scene->layact = v3d->layact;
 			scene->camera = v3d->camera;
 
-			/* not through notifier, listener don't have context
-			 * and non-open screens or spaces need to be updated too */
-			BKE_screen_view3d_main_sync(&bmain->screen, scene);
-
 			/* notifiers for scene update */
 			WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 		}
@@ -97,16 +93,16 @@ static void handle_view3d_lock(bContext *C)
  * layer code is on three levels actually:
  * - here for operator
  * - uiTemplateLayers in interface/ code for buttons
- * - ED_view3d_scene_layer_set for RNA
+ * - ED_view3d_view_layer_set for RNA
  */
-static void view3d_layers_editmode_ensure(Scene *scene, View3D *v3d)
+static void view3d_layers_editmode_ensure(View3D *v3d, Object *obedit)
 {
 	/* sanity check - when in editmode disallow switching the editmode layer off since its confusing
 	 * an alternative would be to always draw the editmode object. */
-	if (scene->obedit && (scene->obedit->lay & v3d->lay) == 0) {
+	if (obedit && (obedit->lay & v3d->lay) == 0) {
 		int bit;
 		for (bit = 0; bit < 32; bit++) {
-			if (scene->obedit->lay & (1u << bit)) {
+			if (obedit->lay & (1u << bit)) {
 				v3d->lay |= (1u << bit);
 				break;
 			}
@@ -116,9 +112,9 @@ static void view3d_layers_editmode_ensure(Scene *scene, View3D *v3d)
 
 static int view3d_layers_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	ScrArea *sa = CTX_wm_area(C);
 	View3D *v3d = sa->spacedata.first;
+	Object *obedit = CTX_data_edit_object(C);
 	int nr = RNA_int_get(op->ptr, "nr");
 	const bool toggle = RNA_boolean_get(op->ptr, "toggle");
 
@@ -134,7 +130,7 @@ static int view3d_layers_exec(bContext *C, wmOperator *op)
 			/* return to active layer only */
 			v3d->lay = v3d->lay_prev;
 
-			view3d_layers_editmode_ensure(scene, v3d);
+			view3d_layers_editmode_ensure(v3d, obedit);
 		}
 		else {
 			v3d->lay_prev = v3d->lay;
@@ -155,7 +151,7 @@ static int view3d_layers_exec(bContext *C, wmOperator *op)
 			v3d->lay = (1 << nr);
 		}
 
-		view3d_layers_editmode_ensure(scene, v3d);
+		view3d_layers_editmode_ensure(v3d, obedit);
 
 		/* set active layer, ensure to always have one */
 		if (v3d->lay & (1 << nr))
@@ -172,7 +168,7 @@ static int view3d_layers_exec(bContext *C, wmOperator *op)
 
 	if (v3d->scenelock) handle_view3d_lock(C);
 
-	DAG_on_visible_update(CTX_data_main(C), false);
+	DEG_on_visible_update(CTX_data_main(C), false);
 
 	ED_area_tag_redraw(sa);
 
@@ -225,6 +221,45 @@ void VIEW3D_OT_layers(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "toggle", 1, "Toggle", "Toggle the layer");
 }
 
+/* -------------------------------------------------------------------- */
+/** \name Toggle Bone selection Overlay Operator
+ * \{ */
+
+static int toggle_show_xray(bContext *C, wmOperator *UNUSED(op))
+{
+	View3D *v3d = CTX_wm_view3d(C);
+	v3d->shading.flag ^= V3D_SHADING_XRAY;
+	ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C));
+	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+	return OPERATOR_FINISHED;
+}
+
+static int toggle_show_xray_poll(bContext *C)
+{
+	bool result = (ED_operator_view3d_active(C) && !ED_operator_posemode(C) && !ED_operator_editmesh(C));
+	if (result) {
+		// Additional test for SOLID or TEXTURE mode
+		View3D *v3d = CTX_wm_view3d(C);
+		result = (v3d->drawtype & (OB_SOLID | OB_TEXTURE)) > 0;
+	}
+	return result;
+}
+
+void VIEW3D_OT_toggle_xray_draw_option(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Toggle Show X-Ray";
+	ot->description = "Toggle show X-Ray";
+	ot->idname = "VIEW3D_OT_toggle_xray_draw_option";
+
+	/* api callbacks */
+	ot->exec = toggle_show_xray;
+	ot->poll = toggle_show_xray_poll;
+}
+
+/** \} */
+
+
 static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event)
 {
 	wmWindow *win = CTX_wm_window(C);
@@ -278,21 +313,64 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
 	}
 }
 
+static void uiTemplatePaintModeSelection(uiLayout *layout, struct bContext *C)
+{
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
+
+	/* Manipulators aren't used in paint modes */
+	if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) {
+		/* masks aren't used for sculpt and particle painting */
+		PointerRNA meshptr;
+
+		RNA_pointer_create(ob->data, &RNA_Mesh, ob->data, &meshptr);
+		if (ob->mode & (OB_MODE_TEXTURE_PAINT)) {
+			uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+		}
+		else {
+			uiLayout *row = uiLayoutRow(layout, true);
+			uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+			uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+		}
+	}
+}
+
+void uiTemplateHeader3D_mode(uiLayout *layout, struct bContext *C)
+{
+	/* Extracted from: uiTemplateHeader3D */
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
+	Object *obedit = CTX_data_edit_object(C);
+	bGPdata *gpd = CTX_data_gpencil_data(C);
+
+	bool is_paint = (
+	        ob && !(gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
+	        ELEM(ob->mode,
+	             OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT));
+
+	uiTemplateEditModeSelection(layout, C);
+	if ((obedit == NULL) && is_paint) {
+		uiTemplatePaintModeSelection(layout, C);
+	}
+}
+
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 {
 	bScreen *screen = CTX_wm_screen(C);
 	ScrArea *sa = CTX_wm_area(C);
 	View3D *v3d = sa->spacedata.first;
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ToolSettings *ts = CTX_data_tool_settings(C);
 	PointerRNA v3dptr, toolsptr, sceneptr;
-	Object *ob = OBACT;
+	Object *ob = OBACT(view_layer);
 	Object *obedit = CTX_data_edit_object(C);
 	bGPdata *gpd = CTX_data_gpencil_data(C);
 	uiBlock *block;
-	uiLayout *row;
-	bool is_paint = false;
-	int modeselect;
+	bool is_paint = (
+	        ob && !(gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
+	        ELEM(ob->mode,
+	             OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT));
 
 	RNA_pointer_create(&screen->id, &RNA_SpaceView3D, v3d, &v3dptr);
 	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &toolsptr);
@@ -304,81 +382,39 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	/* other buttons: */
 	UI_block_emboss_set(block, UI_EMBOSS);
 
-	/* mode */
-	if ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE)) {
-		modeselect = OB_MODE_GPENCIL;
-	}
-	else if (ob) {
-		modeselect = ob->mode;
-		is_paint = ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT);
-	}
-	else {
-		modeselect = OB_MODE_OBJECT;
-	}
-
-	row = uiLayoutRow(layout, false);
-	{
-		const EnumPropertyItem *item = rna_enum_object_mode_items;
-		const char *name = "";
-		int icon = ICON_OBJECT_DATAMODE;
-
-		while (item->identifier) {
-			if (item->value == modeselect && item->identifier[0]) {
-				name = IFACE_(item->name);
-				icon = item->icon;
-				break;
-			}
-			item++;
-		}
-
-		uiItemMenuEnumO(row, C, "OBJECT_OT_mode_set", "mode", name, icon);
-	}
-
-	/* Draw type */
-	uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-
-	row = uiLayoutRow(layout, true);
+	/* moved to topbar */
+#if 0
+	uiLayout *row = uiLayoutRow(layout, true);
 	uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 	if (!ob || ELEM(ob->mode, OB_MODE_OBJECT, OB_MODE_POSE, OB_MODE_WEIGHT_PAINT)) {
 		uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 	}
+#endif
 
 	if (obedit == NULL && is_paint) {
-		/* Manipulators aren't used in paint modes */
-		if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) {
-			/* masks aren't used for sculpt and particle painting */
-			PointerRNA meshptr;
-
-			RNA_pointer_create(ob->data, &RNA_Mesh, ob->data, &meshptr);
-			if (ob->mode & (OB_MODE_TEXTURE_PAINT)) {
-				uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-			}
-			else {
-				row = uiLayoutRow(layout, true);
-				uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-				uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-			}
-		}
+		/* Currently Python calls this directly. */
+#if 0
+		uiTemplatePaintModeSelection(layout, C);
+#endif
+
 	}
 	else {
+		/* Moved to popover and topbar. */
+#if 0
 		/* Transform widget / manipulators */
 		row = uiLayoutRow(layout, true);
 		uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-		if (v3d->twflag & V3D_USE_MANIPULATOR) {
-			uiItemR(row, &v3dptr, "transform_manipulators", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-		}
-		uiItemR(row, &v3dptr, "transform_orientation", 0, "", ICON_NONE);
+		uiItemR(row, &sceneptr, "transform_orientation", 0, "", ICON_NONE);
+#endif
 	}
 
 	if (obedit == NULL && v3d->localvd == NULL) {
-		unsigned int ob_lay = ob ? ob->lay : 0;
-
-		/* Layers */
-		uiTemplateLayers(layout, v3d->scenelock ? &sceneptr : &v3dptr, "layers", &v3dptr, "layers_used", ob_lay);
-
 		/* Scene lock */
 		uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 	}
 
+	/* Currently Python calls this directly. */
+#if 0
 	uiTemplateEditModeSelection(layout, C);
+#endif
 }
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index dc268479736..6c9749e5eeb 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -37,7 +37,10 @@
 
 struct ARegion;
 struct ARegionType;
+struct Base;
 struct BoundBox;
+struct Gwn_Batch;
+struct Depsgraph;
 struct DerivedMesh;
 struct Object;
 struct SmokeDomainSettings;
@@ -46,9 +49,12 @@ struct bContext;
 struct bMotionPath;
 struct bPoseChannel;
 struct Mesh;
+struct ViewLayer;
 struct wmOperatorType;
-struct wmWindowManager;
 struct wmKeyConfig;
+struct wmManipulatorGroupType;
+struct wmManipulatorType;
+struct wmWindowManager;
 
 /* drawing flags: */
 enum {
@@ -57,14 +63,9 @@ enum {
 	DRAW_SCENESET    = (1 << 2)
 };
 
-/* draw_mesh_fancy/draw_mesh_textured draw_flags */
-enum {
-	DRAW_MODIFIERS_PREVIEW  = (1 << 0),
-	DRAW_FACE_SELECT        = (1 << 1)
-};
-
 /* view3d_header.c */
 void VIEW3D_OT_layers(struct wmOperatorType *ot);
+void VIEW3D_OT_toggle_xray_draw_option(struct wmOperatorType *ot);
 
 /* view3d_ops.c */
 void view3d_operatortypes(void);
@@ -99,8 +100,6 @@ void VIEW3D_OT_view_orbit(struct wmOperatorType *ot);
 void VIEW3D_OT_view_roll(struct wmOperatorType *ot);
 void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
 void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
-void VIEW3D_OT_manipulator(struct wmOperatorType *ot);
-void VIEW3D_OT_enable_manipulator(struct wmOperatorType *ot);
 void VIEW3D_OT_render_border(struct wmOperatorType *ot);
 void VIEW3D_OT_clear_render_border(struct wmOperatorType *ot);
 void VIEW3D_OT_zoom_border(struct wmOperatorType *ot);
@@ -133,87 +132,33 @@ void VIEW3D_OT_walk(struct wmOperatorType *ot);
 /* view3d_ruler.c */
 void VIEW3D_OT_ruler(struct wmOperatorType *ot);
 
-/* drawanim.c */
-void draw_motion_paths_init(View3D *v3d, struct ARegion *ar);
-void draw_motion_path_instance(Scene *scene,
-                               struct Object *ob, struct bPoseChannel *pchan,
-                               struct bAnimVizSettings *avs, struct bMotionPath *mpath);
-void draw_motion_paths_cleanup(View3D *v3d);
-
-
-
 /* drawobject.c */
-void draw_object(
-        Scene *scene, struct ARegion *ar, View3D *v3d,
-        Base *base, const short dflag);
-void draw_object_select(
-        Scene *scene, ARegion *ar, View3D *v3d,
-        Base *base, const short dflag);
-
-bool draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const char dt);
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline);
-void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob);
-void drawaxes(const float viewmat_local[4][4], float size, char drawtype);
-
-void view3d_cached_text_draw_begin(void);
-void view3d_cached_text_draw_add(const float co[3],
-                                 const char *str, const size_t str_len,
-                                 short xoffs, short flag, const unsigned char col[4]);
-void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write);
-
-bool check_object_draw_texture(struct Scene *scene, struct View3D *v3d, const char drawtype);
-
-enum {
-	V3D_CACHE_TEXT_ZBUF         = (1 << 0),
-	V3D_CACHE_TEXT_WORLDSPACE   = (1 << 1),
-	V3D_CACHE_TEXT_ASCII        = (1 << 2),
-	V3D_CACHE_TEXT_GLOBALSPACE  = (1 << 3),
-	V3D_CACHE_TEXT_LOCALCLIP    = (1 << 4)
-};
+void draw_object_backbufsel(
+        struct Depsgraph *depsgraph, Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob,
+        short select_mode);
 
 int view3d_effective_drawtype(const struct View3D *v3d);
 
-/* drawarmature.c */
-bool draw_armature(
-        Scene *scene, View3D *v3d, ARegion *ar, Base *base,
-        const short dt, const short dflag, const unsigned char ob_wire_col[4],
-        const bool is_outline);
-
-/* drawmesh.c */
-void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                        struct Object *ob, struct DerivedMesh *dm, const int draw_flags);
-void draw_mesh_face_select(
-        struct RegionView3D *rv3d, struct Mesh *me, struct DerivedMesh *dm,
-        bool draw_select_edges);
-void draw_mesh_paint_weight_faces(struct DerivedMesh *dm, const bool do_light,
-                                  void *facemask_cb, void *user_data);
-void draw_mesh_paint_vcolor_faces(struct DerivedMesh *dm, const bool use_light,
-                                  void *facemask_cb, void *user_data,
-                                  const struct Mesh *me);
-void draw_mesh_paint_weight_edges(RegionView3D *rv3d, struct DerivedMesh *dm,
-                                  const bool use_depth, const bool use_alpha,
-                                  void *edgemask_cb, void *user_data);
-void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
-                     struct Object *ob, struct DerivedMesh *dm, const int draw_flags);
-
-/* drawsimdebug.c */
-void draw_sim_debug_data(Scene *scene, View3D *v3d, ARegion *ar);
-
 /* view3d_draw.c */
 void view3d_main_region_draw(const struct bContext *C, struct ARegion *ar);
+void view3d_draw_region_info(const struct bContext *C, struct ARegion *ar, const int offset);
 
 void ED_view3d_draw_depth(
-        Scene *scene,
+        struct Depsgraph *depsgraph,
         struct ARegion *ar, View3D *v3d, bool alphaoverride);
-void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d);
+
+/* view3d_draw_legacy.c */
+void ED_view3d_draw_depth_gpencil(struct Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d);
+
 void ED_view3d_draw_select_loop(
-        ViewContext *vc, Scene *scene, View3D *v3d, ARegion *ar,
+        struct Depsgraph *depsgraph, ViewContext *vc, Scene *scene, struct ViewLayer *view_layer, View3D *v3d, ARegion *ar,
         bool use_obedit_skip, bool use_nearest);
 
-void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag);\
+void ED_view3d_draw_depth_loop(
+        struct Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d);
+
+void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag);
 
-void circf(float x, float y, float rad);
-void circ(float x, float y, float rad);
 void view3d_update_depths_rect(struct ARegion *ar, struct ViewDepths *d, struct rcti *rect);
 float view3d_depth_near(struct ViewDepths *d);
 
@@ -228,9 +173,6 @@ void VIEW3D_OT_smoothview(struct wmOperatorType *ot);
 void VIEW3D_OT_camera_to_view(struct wmOperatorType *ot);
 void VIEW3D_OT_camera_to_view_selected(struct wmOperatorType *ot);
 void VIEW3D_OT_object_as_camera(struct wmOperatorType *ot);
-void VIEW3D_OT_localview(struct wmOperatorType *ot);
-void VIEW3D_OT_game_start(struct wmOperatorType *ot);
-
 
 bool ED_view3d_boundbox_clip_ex(const RegionView3D *rv3d, const struct BoundBox *bb, float obmat[4][4]);
 bool ED_view3d_boundbox_clip(RegionView3D *rv3d, const struct BoundBox *bb);
@@ -243,6 +185,7 @@ typedef struct V3D_SmoothParams {
 } V3D_SmoothParams;
 
 void ED_view3d_smooth_view_ex(
+        const struct Depsgraph *depsgraph,
         struct wmWindowManager *wm, struct wmWindow *win, struct ScrArea *sa,
         struct View3D *v3d, struct ARegion *ar, const int smooth_viewtx,
         const V3D_SmoothParams *sview);
@@ -257,9 +200,10 @@ void ED_view3d_smooth_view_force_finish(
         struct View3D *v3d, struct ARegion *ar);
 
 void view3d_winmatrix_set(
+        struct Depsgraph *depsgraph,
         ARegion *ar, const View3D *v3d, const rcti *rect);
 void view3d_viewmatrix_set(
-        Scene *scene,
+        struct Depsgraph *depsgraph, Scene *scene,
         const View3D *v3d, RegionView3D *rv3d, const float rect_scale[2]);
 
 void fly_modal_keymap(struct wmKeyConfig *keyconf);
@@ -275,7 +219,7 @@ void view3d_buttons_register(struct ARegionType *art);
 
 /* view3d_camera_control.c */
 struct View3DCameraControl *ED_view3d_cameracontrol_acquire(
-        Scene *scene, View3D *v3d, RegionView3D *rv3d,
+        struct Depsgraph *depsgraph, Scene *scene, View3D *v3d, RegionView3D *rv3d,
         const bool use_parent_root);
 void ED_view3d_cameracontrol_update(
         struct View3DCameraControl *vctrl,
@@ -284,13 +228,12 @@ void ED_view3d_cameracontrol_update(
 void ED_view3d_cameracontrol_release(
         struct View3DCameraControl *vctrl,
         const bool restore);
-Object *ED_view3d_cameracontrol_object_get(
+struct Object *ED_view3d_cameracontrol_object_get(
         struct View3DCameraControl *vctrl);
 
 /* view3d_toolbar.c */
 void VIEW3D_OT_toolshelf(struct wmOperatorType *ot);
 void view3d_toolshelf_register(struct ARegionType *art);
-void view3d_tool_props_register(struct ARegionType *art);
 
 /* view3d_snap.c */
 bool ED_view3d_minmax_verts(struct Object *obedit, float min[3], float max[3]);
@@ -309,6 +252,23 @@ ARegion *view3d_has_tools_region(ScrArea *sa);
 
 extern const char *view3d_context_dir[]; /* doc access */
 
+/* view3d_widgets.c */
+void VIEW3D_WGT_lamp_spot(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_lamp_area(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_lamp_target(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_camera(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_camera_view(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_force_field(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_empty_image(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_armature_spline(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WGT_navigate(struct wmManipulatorGroupType *wgt);
+
+void VIEW3D_WGT_ruler(struct wmManipulatorGroupType *wgt);
+void VIEW3D_WT_ruler_item(struct wmManipulatorType *wt);
+void VIEW3D_OT_ruler_add(struct wmOperatorType *ot);
+
+void VIEW3D_WT_navigate_rotate(struct wmManipulatorType *wt);
+
 /* draw_volume.c */
 void draw_smoke_volume(struct SmokeDomainSettings *sds, struct Object *ob,
                        const float min[3], const float max[3],
@@ -328,4 +288,3 @@ extern bool view3d_camera_border_hack_test;
 #endif
 
 #endif /* __VIEW3D_INTERN_H__ */
-
diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c
index ef7b01f7a21..145f57174fd 100644
--- a/source/blender/editors/space_view3d/view3d_iterators.c
+++ b/source/blender/editors/space_view3d/view3d_iterators.c
@@ -35,11 +35,16 @@
 #include "BLI_utildefines.h"
 #include "BLI_rect.h"
 
+#include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_displist.h"
 #include "BKE_editmesh.h"
+#include "BKE_context.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "bmesh.h"
 
@@ -109,7 +114,9 @@ void meshobject_foreachScreenVert(
         void *userData, eV3DProjTest clip_flag)
 {
 	foreachScreenObjectVert_userData data;
-	DerivedMesh *dm = mesh_get_derived_deform(vc->scene, vc->obact, CD_MASK_BAREMESH);
+	DerivedMesh *dm;
+
+	dm = mesh_get_derived_deform(vc->depsgraph, vc->scene, vc->obact, CD_MASK_BAREMESH);
 
 	ED_view3d_check_mats_rv3d(vc->rv3d);
 
@@ -150,7 +157,9 @@ void mesh_foreachScreenVert(
         void *userData, eV3DProjTest clip_flag)
 {
 	foreachScreenVert_userData data;
-	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+	DerivedMesh *dm;
+
+	dm = editbmesh_get_derived_cage(vc->depsgraph, vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
 	ED_view3d_check_mats_rv3d(vc->rv3d);
 
@@ -204,7 +213,9 @@ void mesh_foreachScreenEdge(
         void *userData, eV3DProjTest clip_flag)
 {
 	foreachScreenEdge_userData data;
-	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+	DerivedMesh *dm;
+
+	dm = editbmesh_get_derived_cage(vc->depsgraph, vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
 	ED_view3d_check_mats_rv3d(vc->rv3d);
 
@@ -250,7 +261,9 @@ void mesh_foreachScreenFace(
         void *userData, const eV3DProjTest clip_flag)
 {
 	foreachScreenFace_userData data;
-	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+	DerivedMesh *dm;
+
+	dm = editbmesh_get_derived_cage(vc->depsgraph, vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
 	ED_view3d_check_mats_rv3d(vc->rv3d);
 
@@ -438,19 +451,21 @@ void pose_foreachScreenBone(
         void (*func)(void *userData, struct bPoseChannel *pchan, const float screen_co_a[2], const float screen_co_b[2]),
         void *userData, const eV3DProjTest clip_flag)
 {
-	bArmature *arm = vc->obact->data;
+	const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph, vc->obact);
+	const bArmature *arm_eval = ob_eval->data;
 	bPose *pose = vc->obact->pose;
 	bPoseChannel *pchan;
 
 	ED_view3d_check_mats_rv3d(vc->rv3d);
 
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-		if (PBONE_VISIBLE(arm, pchan->bone)) {
+		if (PBONE_VISIBLE(arm_eval, pchan->bone)) {
+			bPoseChannel *pchan_eval = BKE_pose_channel_find_name(ob_eval->pose, pchan->name);
 			float screen_co_a[2], screen_co_b[2];
 			int points_proj_tot = 0;
 
 			/* project head location to screenspace */
-			if (ED_view3d_project_float_object(vc->ar, pchan->pose_head, screen_co_a, clip_flag) == V3D_PROJ_RET_OK) {
+			if (ED_view3d_project_float_object(vc->ar, pchan_eval->pose_head, screen_co_a, clip_flag) == V3D_PROJ_RET_OK) {
 				points_proj_tot++;
 			}
 			else {
@@ -459,7 +474,7 @@ void pose_foreachScreenBone(
 			}
 
 			/* project tail location to screenspace */
-			if (ED_view3d_project_float_object(vc->ar, pchan->pose_tail, screen_co_b, clip_flag) == V3D_PROJ_RET_OK) {
+			if (ED_view3d_project_float_object(vc->ar, pchan_eval->pose_tail, screen_co_b, clip_flag) == V3D_PROJ_RET_OK) {
 				points_proj_tot++;
 			}
 			else {
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_armature.c b/source/blender/editors/space_view3d/view3d_manipulator_armature.c
new file mode 100644
index 00000000000..5d3d88ff2a2
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_armature.c
@@ -0,0 +1,220 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_armature.c
+ *  \ingroup spview3d
+ */
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_armature.h"
+#include "BKE_action.h"
+#include "BKE_context.h"
+#include "BKE_object.h"
+
+#include "DNA_object_types.h"
+#include "DNA_armature_types.h"
+
+#include "ED_armature.h"
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h"  /* own include */
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Armature Spline Manipulator
+ *
+ * \{ */
+
+/*
+ * TODO(campbell): Current conversion is a approximation (usable not correct),
+ * we'll need to take the next/previous bones into account to get the tangent directions.
+ * First last matrices from 'b_bone_spline_setup' are close but also not quite accurate
+ * since they're not at either end-points on the curve.
+ *
+ * Likely we'll need a function especially to get the first/last orientations.
+ */
+
+#define BBONE_SCALE_Y 3.0f
+
+struct BoneSplineHandle {
+	wmManipulator *manipulator;
+	bPoseChannel *pchan;
+	/* We could remove, keep since at the moment for checking the conversion. */
+	float co[3];
+	int index;
+};
+
+struct BoneSplineWidgetGroup {
+	struct BoneSplineHandle handles[2];
+};
+
+static void manipulator_bbone_offset_get(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	struct BoneSplineHandle *bh = mpr_prop->custom_func.user_data;
+	bPoseChannel *pchan = bh->pchan;
+
+	float *value = value_p;
+	BLI_assert(mpr_prop->type->array_length == 3);
+
+	if (bh->index == 0) {
+		bh->co[1] = pchan->bone->ease1 / BBONE_SCALE_Y;
+		bh->co[0] = pchan->curveInX;
+		bh->co[2] = pchan->curveInY;
+	}
+	else {
+		bh->co[1] = -pchan->bone->ease2 / BBONE_SCALE_Y;
+		bh->co[0] = pchan->curveOutX;
+		bh->co[2] = pchan->curveOutY;
+	}
+	copy_v3_v3(value, bh->co);
+}
+
+static void manipulator_bbone_offset_set(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	struct BoneSplineHandle *bh = mpr_prop->custom_func.user_data;
+	bPoseChannel *pchan = bh->pchan;
+
+	const float *value = value_p;
+
+	BLI_assert(mpr_prop->type->array_length == 3);
+	copy_v3_v3(bh->co, value);
+
+	if (bh->index == 0) {
+		pchan->bone->ease1 = max_ff(0.0f, bh->co[1] * BBONE_SCALE_Y);
+		pchan->curveInX = bh->co[0];
+		pchan->curveInY = bh->co[2];
+	}
+	else {
+		pchan->bone->ease2 = max_ff(0.0f, -bh->co[1] * BBONE_SCALE_Y);
+		pchan->curveOutX = bh->co[0];
+		pchan->curveOutY = bh->co[2];
+	}
+
+}
+
+static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	if (ob != NULL) {
+		const bArmature *arm = ob->data;
+		if (arm->drawtype == ARM_B_BONE) {
+			if (arm->act_bone && arm->act_bone->segments > 1) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+
+static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	bPoseChannel *pchan = BKE_pose_channel_active(ob);
+
+	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true);
+
+	struct BoneSplineWidgetGroup *bspline_group = MEM_callocN(sizeof(struct BoneSplineWidgetGroup), __func__);
+	mgroup->customdata = bspline_group;
+
+	/* Handles */
+	for (int i = 0; i < ARRAY_SIZE(bspline_group->handles); i++) {
+		wmManipulator *mpr;
+		mpr = bspline_group->handles[i].manipulator = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
+		RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
+		RNA_enum_set(mpr->ptr, "draw_options",
+		             ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL | ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW);
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_VALUE, true);
+
+		UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+		UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+
+		mpr->scale_basis = 0.06f;
+
+		if (i == 0) {
+			copy_v3_v3(mpr->matrix_basis[3], pchan->loc);
+		}
+	}
+}
+
+static void WIDGETGROUP_armature_spline_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+
+	if (!mgroup->customdata)
+		return;
+
+	struct BoneSplineWidgetGroup *bspline_group = mgroup->customdata;
+	bPoseChannel *pchan = BKE_pose_channel_active(ob);
+
+	/* Handles */
+	for (int i = 0; i < ARRAY_SIZE(bspline_group->handles); i++) {
+		wmManipulator *mpr = bspline_group->handles[i].manipulator;
+		bspline_group->handles[i].pchan = pchan;
+		bspline_group->handles[i].index = i;
+
+		float mat[4][4];
+		mul_m4_m4m4(mat, ob->obmat, (i == 0) ? pchan->disp_mat : pchan->disp_tail_mat);
+		copy_m4_m4(mpr->matrix_space, mat);
+
+		/* need to set property here for undo. TODO would prefer to do this in _init */
+		WM_manipulator_target_property_def_func(
+		        mpr, "offset",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_bbone_offset_get,
+		            .value_set_fn = manipulator_bbone_offset_set,
+		            .range_get_fn = NULL,
+		            .user_data = &bspline_group->handles[i],
+		        });
+	}
+}
+
+void VIEW3D_WGT_armature_spline(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Armature Spline Widgets";
+	wgt->idname = "VIEW3D_WGT_armature_spline";
+
+	wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	             WM_MANIPULATORGROUPTYPE_3D);
+
+	wgt->poll = WIDGETGROUP_armature_spline_poll;
+	wgt->setup = WIDGETGROUP_armature_spline_setup;
+	wgt->refresh = WIDGETGROUP_armature_spline_refresh;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
new file mode 100644
index 00000000000..b680818dc14
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
@@ -0,0 +1,460 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_camera.c
+ *  \ingroup spview3d
+ */
+
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_camera.h"
+#include "BKE_context.h"
+
+#include "DNA_object_types.h"
+#include "DNA_camera_types.h"
+
+#include "ED_armature.h"
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_message.h"
+
+#include "view3d_intern.h"  /* own include */
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Camera Manipulators
+ * \{ */
+
+struct CameraWidgetGroup {
+	wmManipulator *dop_dist;
+	wmManipulator *focal_len;
+	wmManipulator *ortho_scale;
+};
+
+static bool WIDGETGROUP_camera_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+	if (ob && ob->type == OB_CAMERA) {
+		Camera *camera = ob->data;
+		/* TODO: support overrides. */
+		if (camera->id.lib == NULL) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static void WIDGETGROUP_camera_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	Object *ob = CTX_data_active_object(C);
+	float dir[3];
+
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
+
+	struct CameraWidgetGroup *camgroup = MEM_callocN(sizeof(struct CameraWidgetGroup), __func__);
+	mgroup->customdata = camgroup;
+
+	negate_v3_v3(dir, ob->obmat[2]);
+
+	/* dof distance */
+	{
+		wmManipulator *mpr;
+		mpr = camgroup->dop_dist = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+		RNA_enum_set(mpr->ptr, "draw_style",  ED_MANIPULATOR_ARROW_STYLE_CROSS);
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true);
+
+		UI_GetThemeColor3fv(TH_MANIPULATOR_A, mpr->color);
+		UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+	}
+
+	/* focal length
+	 * - logic/calculations are similar to BKE_camera_view_frame_ex, better keep in sync */
+	{
+		wmManipulator *mpr;
+		mpr = camgroup->focal_len = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+		mpr->flag |= WM_MANIPULATOR_DRAW_NO_SCALE;
+		RNA_enum_set(mpr->ptr, "draw_style",  ED_MANIPULATOR_ARROW_STYLE_CONE);
+		RNA_enum_set(mpr->ptr, "draw_options",  ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED);
+
+		UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+		UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+
+		mpr = camgroup->ortho_scale = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+		mpr->flag |= WM_MANIPULATOR_DRAW_NO_SCALE;
+		RNA_enum_set(mpr->ptr, "draw_style",  ED_MANIPULATOR_ARROW_STYLE_CONE);
+		RNA_enum_set(mpr->ptr, "draw_options",  ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED);
+
+		UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+		UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+	}
+}
+
+static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	if (!mgroup->customdata)
+		return;
+
+	struct CameraWidgetGroup *camgroup = mgroup->customdata;
+	Object *ob = CTX_data_active_object(C);
+	Camera *ca = ob->data;
+	PointerRNA camera_ptr;
+	float dir[3];
+
+	const float ob_scale_inv[3] = {
+		1.0f / len_v3(ob->obmat[0]),
+		1.0f / len_v3(ob->obmat[1]),
+		1.0f / len_v3(ob->obmat[2]),
+	};
+	const float ob_scale_uniform_inv = (ob_scale_inv[0] + ob_scale_inv[1] + ob_scale_inv[2]) / 3.0f;
+
+	RNA_pointer_create(&ca->id, &RNA_Camera, ca, &camera_ptr);
+
+	negate_v3_v3(dir, ob->obmat[2]);
+
+	if (ca->flag & CAM_SHOWLIMITS) {
+		WM_manipulator_set_matrix_location(camgroup->dop_dist, ob->obmat[3]);
+		WM_manipulator_set_matrix_rotation_from_yz_axis(camgroup->dop_dist, ob->obmat[1], dir);
+		WM_manipulator_set_scale(camgroup->dop_dist, ca->drawsize);
+		WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, false);
+
+		/* need to set property here for undo. TODO would prefer to do this in _init */
+		WM_manipulator_target_property_def_rna(camgroup->dop_dist, "offset", &camera_ptr, "dof_distance", -1);
+	}
+	else {
+		WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	/* TODO - make focal length/ortho ob_scale_inv widget optional */
+	const Scene *scene = CTX_data_scene(C);
+	const float aspx = (float)scene->r.xsch * scene->r.xasp;
+	const float aspy = (float)scene->r.ysch * scene->r.yasp;
+	const bool is_ortho = (ca->type == CAM_ORTHO);
+	const int sensor_fit = BKE_camera_sensor_fit(ca->sensor_fit, aspx, aspy);
+	wmManipulator *widget = is_ortho ? camgroup->ortho_scale : camgroup->focal_len;
+	float scale_matrix;
+	if (true) {
+		float offset[3];
+		float aspect[2];
+
+		WM_manipulator_set_flag(widget, WM_MANIPULATOR_HIDDEN, false);
+		WM_manipulator_set_flag(is_ortho ? camgroup->focal_len : camgroup->ortho_scale, WM_MANIPULATOR_HIDDEN, true);
+
+
+		/* account for lens shifting */
+		offset[0] = ((ob->size[0] > 0.0f) ? -2.0f : 2.0f) * ca->shiftx;
+		offset[1] = 2.0f * ca->shifty;
+		offset[2] = 0.0f;
+
+		/* get aspect */
+		aspect[0] = (sensor_fit == CAMERA_SENSOR_FIT_HOR) ? 1.0f : aspx / aspy;
+		aspect[1] = (sensor_fit == CAMERA_SENSOR_FIT_HOR) ? aspy / aspx : 1.0f;
+
+		unit_m4(widget->matrix_basis);
+		WM_manipulator_set_matrix_location(widget, ob->obmat[3]);
+		WM_manipulator_set_matrix_rotation_from_yz_axis(widget, ob->obmat[1], dir);
+
+		if (is_ortho) {
+			scale_matrix = ca->ortho_scale * 0.5f;
+		}
+		else {
+			scale_matrix = ca->drawsize / ob_scale_uniform_inv;
+		}
+		mul_v3_fl(widget->matrix_basis[0], scale_matrix);
+		mul_v3_fl(widget->matrix_basis[1], scale_matrix);
+
+		RNA_float_set_array(widget->ptr, "aspect", aspect);
+
+		WM_manipulator_set_matrix_offset_location(widget, offset);
+	}
+
+	/* define & update properties */
+	{
+		const char *propname = is_ortho ? "ortho_scale" : "lens";
+		PropertyRNA *prop = RNA_struct_find_property(&camera_ptr, propname);
+		const wmManipulatorPropertyType *mpr_prop_type = WM_manipulatortype_target_property_find(widget->type, "offset");
+
+		WM_manipulator_target_property_clear_rna_ptr(widget, mpr_prop_type);
+
+		float min, max, range;
+		float step, precision;
+
+		/* get property range */
+		RNA_property_float_ui_range(&camera_ptr, prop, &min, &max, &step, &precision);
+		range = max - min;
+
+		ED_manipulator_arrow3d_set_range_fac(
+		        widget, is_ortho ?
+		        (ca->drawsize * range) :
+		        (scale_matrix * range /
+		         /* Half sensor, intentionally use sensor from camera and not calculated above. */
+		         (0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_HOR) ? ca->sensor_x : ca->sensor_x))));
+
+		WM_manipulator_target_property_def_rna_ptr(widget, mpr_prop_type, &camera_ptr, prop, -1);
+	}
+
+}
+
+static void WIDGETGROUP_camera_message_subscribe(
+        const bContext *C, wmManipulatorGroup *mgroup, struct wmMsgBus *mbus)
+{
+	ARegion *ar = CTX_wm_region(C);
+	Object *ob = CTX_data_active_object(C);
+	Camera *ca = ob->data;
+
+	wmMsgSubscribeValue msg_sub_value_mpr_tag_refresh = {
+		.owner = ar,
+		.user_data = mgroup->parent_mmap,
+		.notify = WM_manipulator_do_msg_notify_tag_refresh,
+	};
+
+	{
+		extern PropertyRNA rna_Camera_dof_distance;
+		extern PropertyRNA rna_Camera_draw_size;
+		extern PropertyRNA rna_Camera_ortho_scale;
+		extern PropertyRNA rna_Camera_sensor_fit;
+		extern PropertyRNA rna_Camera_sensor_width;
+		extern PropertyRNA rna_Camera_shift_x;
+		extern PropertyRNA rna_Camera_shift_y;
+		extern PropertyRNA rna_Camera_type;
+		extern PropertyRNA rna_Camera_lens;
+		const PropertyRNA *props[] = {
+			&rna_Camera_dof_distance,
+			&rna_Camera_draw_size,
+			&rna_Camera_ortho_scale,
+			&rna_Camera_sensor_fit,
+			&rna_Camera_sensor_width,
+			&rna_Camera_shift_x,
+			&rna_Camera_shift_y,
+			&rna_Camera_type,
+			&rna_Camera_lens,
+		};
+
+		PointerRNA idptr;
+		RNA_id_pointer_create(&ca->id, &idptr);
+
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_mpr_tag_refresh, __func__);
+		}
+	}
+
+	/* Subscribe to render settings */
+	{
+		WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, resolution_x, &msg_sub_value_mpr_tag_refresh);
+		WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, resolution_y, &msg_sub_value_mpr_tag_refresh);
+		WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, pixel_aspect_x, &msg_sub_value_mpr_tag_refresh);
+		WM_msg_subscribe_rna_anon_prop(mbus, RenderSettings, pixel_aspect_y, &msg_sub_value_mpr_tag_refresh);
+	}
+}
+
+void VIEW3D_WGT_camera(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Camera Widgets";
+	wgt->idname = "VIEW3D_WGT_camera";
+
+	wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	             WM_MANIPULATORGROUPTYPE_3D |
+	             WM_MANIPULATORGROUPTYPE_DEPTH_3D);
+
+	wgt->poll = WIDGETGROUP_camera_poll;
+	wgt->setup = WIDGETGROUP_camera_setup;
+	wgt->refresh = WIDGETGROUP_camera_refresh;
+	wgt->message_subscribe = WIDGETGROUP_camera_message_subscribe;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+
+/** \name CameraView Manipulators
+ * \{ */
+
+struct CameraViewWidgetGroup {
+	wmManipulator *border;
+
+	struct {
+		rctf *edit_border;
+		rctf view_border;
+	} state;
+};
+
+/* scale callbacks */
+static void manipulator_render_border_prop_matrix_get(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	struct CameraViewWidgetGroup *viewgroup = mpr_prop->custom_func.user_data;
+	const rctf *border = viewgroup->state.edit_border;
+
+	unit_m4(matrix);
+	matrix[0][0] = BLI_rctf_size_x(border);
+	matrix[1][1] = BLI_rctf_size_y(border);
+	matrix[3][0] = BLI_rctf_cent_x(border);
+	matrix[3][1] = BLI_rctf_cent_y(border);
+}
+
+static void manipulator_render_border_prop_matrix_set(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	const float (*matrix)[4] = value_p;
+	struct CameraViewWidgetGroup *viewgroup = mpr_prop->custom_func.user_data;
+	rctf *border = viewgroup->state.edit_border;
+	BLI_assert(mpr_prop->type->array_length == 16);
+
+	BLI_rctf_resize(border, len_v3(matrix[0]), len_v3(matrix[1]));
+	BLI_rctf_recenter(border, matrix[3][0], matrix[3][1]);
+	BLI_rctf_isect(&(rctf){.xmin = 0, .ymin = 0, .xmax = 1, .ymax = 1}, border, border);
+}
+
+static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Scene *scene = CTX_data_scene(C);
+
+	/* This is just so the border isn't always in the way,
+	 * stealing mouse clicks from regular usage.
+	 * We could change the rules for when to show. */
+	{
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		if (scene->camera != OBACT(view_layer)) {
+			return false;
+		}
+	}
+
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+	View3D *v3d = CTX_wm_view3d(C);
+	if (rv3d->persp == RV3D_CAMOB) {
+		if (scene->r.mode & R_BORDER) {
+			/* TODO: support overrides. */
+			if (scene->id.lib == NULL) {
+				return true;
+			}
+		}
+	}
+	else if (v3d->flag2 & V3D_RENDER_BORDER) {
+		return true;
+	}
+	return false;
+}
+
+static void WIDGETGROUP_camera_view_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct CameraViewWidgetGroup *viewgroup = MEM_mallocN(sizeof(struct CameraViewWidgetGroup), __func__);
+
+	viewgroup->border = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
+
+	RNA_enum_set(viewgroup->border->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE);
+	/* Box style is more subtle in this case. */
+	RNA_enum_set(viewgroup->border->ptr, "draw_style", ED_MANIPULATOR_CAGE2D_STYLE_BOX);
+
+
+	mgroup->customdata = viewgroup;
+}
+
+static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct CameraViewWidgetGroup *viewgroup = mgroup->customdata;
+
+	ARegion *ar = CTX_wm_region(C);
+	struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	RegionView3D *rv3d = ar->regiondata;
+	if (rv3d->persp == RV3D_CAMOB) {
+		Scene *scene = CTX_data_scene(C);
+		View3D *v3d = CTX_wm_view3d(C);
+		ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &viewgroup->state.view_border, false);
+	}
+	else {
+		viewgroup->state.view_border = (rctf){.xmin = 0, .ymin = 0, .xmax = ar->winx, .ymax = ar->winy};
+	}
+
+	wmManipulator *mpr = viewgroup->border;
+	unit_m4(mpr->matrix_space);
+	mul_v3_fl(mpr->matrix_space[0], BLI_rctf_size_x(&viewgroup->state.view_border));
+	mul_v3_fl(mpr->matrix_space[1], BLI_rctf_size_y(&viewgroup->state.view_border));
+	mpr->matrix_space[3][0] = viewgroup->state.view_border.xmin;
+	mpr->matrix_space[3][1] = viewgroup->state.view_border.ymin;
+}
+
+static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct CameraViewWidgetGroup *viewgroup = mgroup->customdata;
+
+	View3D *v3d = CTX_wm_view3d(C);
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+	Scene *scene = CTX_data_scene(C);
+
+	{
+		wmManipulator *mpr = viewgroup->border;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		RNA_enum_set(viewgroup->border->ptr, "transform",
+		             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE);
+
+		if (rv3d->persp == RV3D_CAMOB) {
+			viewgroup->state.edit_border = &scene->r.border;
+		}
+		else {
+			viewgroup->state.edit_border = &v3d->render_border;
+		}
+
+		WM_manipulator_target_property_def_func(
+		        mpr, "matrix",
+		        &(const struct wmManipulatorPropertyFnParams) {
+		            .value_get_fn = manipulator_render_border_prop_matrix_get,
+		            .value_set_fn = manipulator_render_border_prop_matrix_set,
+		            .range_get_fn = NULL,
+		            .user_data = viewgroup,
+		        });
+	}
+
+}
+
+void VIEW3D_WGT_camera_view(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Camera View Widgets";
+	wgt->idname = "VIEW3D_WGT_camera_view";
+
+	wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	             WM_MANIPULATORGROUPTYPE_SCALE);
+
+	wgt->poll = WIDGETGROUP_camera_view_poll;
+	wgt->setup = WIDGETGROUP_camera_view_setup;
+	wgt->draw_prepare = WIDGETGROUP_camera_view_draw_prepare;
+	wgt->refresh = WIDGETGROUP_camera_view_refresh;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_empty.c b/source/blender/editors/space_view3d/view3d_manipulator_empty.c
new file mode 100644
index 00000000000..1d56c5ee7f4
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_empty.c
@@ -0,0 +1,196 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_empty.c
+ *  \ingroup spview3d
+ */
+
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_object.h"
+#include "BKE_image.h"
+
+#include "DNA_object_types.h"
+#include "DNA_lamp_types.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Empty Image Manipulators
+ * \{ */
+
+struct EmptyImageWidgetGroup {
+	wmManipulator *manipulator;
+	struct {
+		Object *ob;
+		float dims[2];
+	} state;
+};
+
+/* translate callbacks */
+static void manipulator_empty_image_prop_matrix_get(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
+	const Object *ob = imgroup->state.ob;
+
+	unit_m4(matrix);
+	matrix[0][0] = ob->empty_drawsize;
+	matrix[1][1] = ob->empty_drawsize;
+
+	float dims[2] = {0.0f, 0.0f};
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+	dims[0] *= ob->empty_drawsize;
+	dims[1] *= ob->empty_drawsize;
+
+	matrix[3][0] = (ob->ima_ofs[0] * dims[0]) + (0.5f * dims[0]);
+	matrix[3][1] = (ob->ima_ofs[1] * dims[1]) + (0.5f * dims[1]);
+}
+
+static void manipulator_empty_image_prop_matrix_set(
+        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	const float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
+	Object *ob = imgroup->state.ob;
+
+	ob->empty_drawsize = matrix[0][0];
+
+	float dims[2];
+	RNA_float_get_array(mpr->ptr, "dimensions", dims);
+	dims[0] *= ob->empty_drawsize;
+	dims[1] *= ob->empty_drawsize;
+
+	ob->ima_ofs[0] = (matrix[3][0] - (0.5f * dims[0])) / dims[0];
+	ob->ima_ofs[1] = (matrix[3][1] - (0.5f * dims[1])) / dims[1];
+}
+
+static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+
+	if (ob && ob->type == OB_EMPTY) {
+		return (ob->empty_drawtype == OB_EMPTY_IMAGE);
+	}
+	return false;
+}
+
+static void WIDGETGROUP_empty_image_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct EmptyImageWidgetGroup *imgroup = MEM_mallocN(sizeof(struct EmptyImageWidgetGroup), __func__);
+	imgroup->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
+	wmManipulator *mpr = imgroup->manipulator;
+	RNA_enum_set(mpr->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE);
+
+	mgroup->customdata = imgroup;
+
+	WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+}
+
+static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct EmptyImageWidgetGroup *imgroup = mgroup->customdata;
+	Object *ob = CTX_data_active_object(C);
+	wmManipulator *mpr = imgroup->manipulator;
+
+	copy_m4_m4(mpr->matrix_basis, ob->obmat);
+
+	RNA_enum_set(mpr->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM);
+
+	imgroup->state.ob = ob;
+
+	/* Use dimensions for aspect. */
+	if (ob->data != NULL) {
+		const Image *image = ob->data;
+		ImageUser iuser = *ob->iuser;
+		float size[2];
+		BKE_image_get_size_fl(ob->data, &iuser, size);
+
+		/* Get the image aspect even if the buffer is invalid */
+		if (image->aspx > image->aspy) {
+			size[1] *= image->aspy / image->aspx;
+		}
+		else if (image->aspx < image->aspy) {
+			size[0] *= image->aspx / image->aspy;
+		}
+
+		const float dims_max = max_ff(size[0], size[1]);
+		imgroup->state.dims[0] = size[0] / dims_max;
+		imgroup->state.dims[1] = size[1] / dims_max;
+	}
+	else {
+		copy_v2_fl(imgroup->state.dims, 1.0f);
+	}
+	RNA_float_set_array(mpr->ptr, "dimensions", imgroup->state.dims);
+
+	WM_manipulator_target_property_def_func(
+	        mpr, "matrix",
+	        &(const struct wmManipulatorPropertyFnParams) {
+	            .value_get_fn = manipulator_empty_image_prop_matrix_get,
+	            .value_set_fn = manipulator_empty_image_prop_matrix_set,
+	            .range_get_fn = NULL,
+	            .user_data = imgroup,
+	        });
+}
+
+void VIEW3D_WGT_empty_image(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Area Lamp Widgets";
+	wgt->idname = "VIEW3D_WGT_empty_image";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_3D |
+	              WM_MANIPULATORGROUPTYPE_DEPTH_3D);
+
+	wgt->poll = WIDGETGROUP_empty_image_poll;
+	wgt->setup = WIDGETGROUP_empty_image_setup;
+	wgt->refresh = WIDGETGROUP_empty_image_refresh;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c b/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
new file mode 100644
index 00000000000..e76be448be4
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
@@ -0,0 +1,118 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_forcefield.c
+ *  \ingroup spview3d
+ */
+
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_object.h"
+
+#include "DNA_object_types.h"
+#include "DNA_object_force_types.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Force Field Manipulators
+ * \{ */
+
+static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+
+	return (ob && ob->pd && ob->pd->forcefield);
+}
+
+static void WIDGETGROUP_forcefield_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	/* only wind effector for now */
+	wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+	mgroup->customdata = wwrapper;
+
+	wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_arrow_3d", mgroup, NULL);
+	wmManipulator *mpr = wwrapper->manipulator;
+	RNA_enum_set(mpr->ptr, "draw_options",  ED_MANIPULATOR_ARROW_STYLE_CONSTRAINED);
+	ED_manipulator_arrow3d_set_ui_range(mpr, -200.0f, 200.0f);
+	ED_manipulator_arrow3d_set_range_fac(mpr, 6.0f);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+}
+
+static void WIDGETGROUP_forcefield_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = mgroup->customdata;
+	wmManipulator *mpr = wwrapper->manipulator;
+	Object *ob = CTX_data_active_object(C);
+	PartDeflect *pd = ob->pd;
+
+	if (pd->forcefield == PFIELD_WIND) {
+		const float size = (ob->type == OB_EMPTY) ? ob->empty_drawsize : 1.0f;
+		const float ofs[3] = {0.0f, -size, 0.0f};
+		PointerRNA field_ptr;
+
+		RNA_pointer_create(&ob->id, &RNA_FieldSettings, pd, &field_ptr);
+		WM_manipulator_set_matrix_location(mpr, ob->obmat[3]);
+		WM_manipulator_set_matrix_rotation_from_z_axis(mpr, ob->obmat[2]);
+		WM_manipulator_set_matrix_offset_location(mpr, ofs);
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+		WM_manipulator_target_property_def_rna(mpr, "offset", &field_ptr, "strength", -1);
+	}
+	else {
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+	}
+}
+
+void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Force Field Widgets";
+	wgt->idname = "VIEW3D_WGT_force_field";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_3D |
+	              WM_MANIPULATORGROUPTYPE_SCALE |
+	              WM_MANIPULATORGROUPTYPE_DEPTH_3D);
+
+	wgt->poll = WIDGETGROUP_forcefield_poll;
+	wgt->setup = WIDGETGROUP_forcefield_setup;
+	wgt->refresh = WIDGETGROUP_forcefield_refresh;
+}
+
+/** \} */
+
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_lamp.c b/source/blender/editors/space_view3d/view3d_manipulator_lamp.c
new file mode 100644
index 00000000000..88c36fc2c0b
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_lamp.c
@@ -0,0 +1,291 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_lamp.c
+ *  \ingroup spview3d
+ */
+
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_object.h"
+
+#include "DNA_object_types.h"
+#include "DNA_lamp_types.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Spot Lamp Manipulators
+ * \{ */
+
+static bool WIDGETGROUP_lamp_spot_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+
+	if (ob && ob->type == OB_LAMP) {
+		Lamp *la = ob->data;
+		return (la->type == LA_SPOT);
+	}
+	return false;
+}
+
+static void WIDGETGROUP_lamp_spot_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+
+	wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_arrow_3d", mgroup, NULL);
+	wmManipulator *mpr = wwrapper->manipulator;
+	RNA_enum_set(mpr->ptr, "draw_options",  ED_MANIPULATOR_ARROW_STYLE_INVERTED);
+
+	mgroup->customdata = wwrapper;
+
+	ED_manipulator_arrow3d_set_range_fac(mpr, 4.0f);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, mpr->color);
+}
+
+static void WIDGETGROUP_lamp_spot_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = mgroup->customdata;
+	wmManipulator *mpr = wwrapper->manipulator;
+	Object *ob = CTX_data_active_object(C);
+	Lamp *la = ob->data;
+	float dir[3];
+
+	negate_v3_v3(dir, ob->obmat[2]);
+
+	WM_manipulator_set_matrix_rotation_from_z_axis(mpr, dir);
+	WM_manipulator_set_matrix_location(mpr, ob->obmat[3]);
+
+	/* need to set property here for undo. TODO would prefer to do this in _init */
+	PointerRNA lamp_ptr;
+	const char *propname = "spot_size";
+	RNA_pointer_create(&la->id, &RNA_Lamp, la, &lamp_ptr);
+	WM_manipulator_target_property_def_rna(mpr, "offset", &lamp_ptr, propname, -1);
+}
+
+void VIEW3D_WGT_lamp_spot(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Spot Lamp Widgets";
+	wgt->idname = "VIEW3D_WGT_lamp_spot";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_3D |
+	              WM_MANIPULATORGROUPTYPE_DEPTH_3D);
+
+	wgt->poll = WIDGETGROUP_lamp_spot_poll;
+	wgt->setup = WIDGETGROUP_lamp_spot_setup;
+	wgt->refresh = WIDGETGROUP_lamp_spot_refresh;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Area Lamp Manipulators
+ * \{ */
+
+/* scale callbacks */
+static void manipulator_area_lamp_prop_matrix_get(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        void *value_p)
+{
+	BLI_assert(mpr_prop->type->array_length == 16);
+	float (*matrix)[4] = value_p;
+	const Lamp *la = mpr_prop->custom_func.user_data;
+
+	matrix[0][0] = la->area_size;
+	matrix[1][1] = ELEM(la->area_shape, LA_AREA_RECT, LA_AREA_ELLIPSE) ? la->area_sizey : la->area_size;
+}
+
+static void manipulator_area_lamp_prop_matrix_set(
+        const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
+        const void *value_p)
+{
+	const float (*matrix)[4] = value_p;
+	BLI_assert(mpr_prop->type->array_length == 16);
+	Lamp *la = mpr_prop->custom_func.user_data;
+
+	if (ELEM(la->area_shape, LA_AREA_RECT, LA_AREA_ELLIPSE)) {
+		la->area_size = len_v3(matrix[0]);
+		la->area_sizey = len_v3(matrix[1]);
+	}
+	else {
+		la->area_size = len_v3(matrix[0]);
+	}
+}
+
+static bool WIDGETGROUP_lamp_area_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+
+	if (ob && ob->type == OB_LAMP) {
+		Lamp *la = ob->data;
+		return (la->type == LA_AREA);
+	}
+	return false;
+}
+
+static void WIDGETGROUP_lamp_area_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+	wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
+	wmManipulator *mpr = wwrapper->manipulator;
+	RNA_enum_set(mpr->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE);
+
+	mgroup->customdata = wwrapper;
+
+	WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true);
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+}
+
+static void WIDGETGROUP_lamp_area_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = mgroup->customdata;
+	Object *ob = CTX_data_active_object(C);
+	Lamp *la = ob->data;
+	wmManipulator *mpr = wwrapper->manipulator;
+
+	copy_m4_m4(mpr->matrix_basis, ob->obmat);
+
+	int flag = ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE;
+	if (ELEM(la->area_shape, LA_AREA_SQUARE, LA_AREA_DISK)) {
+		flag |= ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM;
+	}
+	RNA_enum_set(mpr->ptr, "transform", flag);
+
+	/* need to set property here for undo. TODO would prefer to do this in _init */
+	WM_manipulator_target_property_def_func(
+	        mpr, "matrix",
+	        &(const struct wmManipulatorPropertyFnParams) {
+	            .value_get_fn = manipulator_area_lamp_prop_matrix_get,
+	            .value_set_fn = manipulator_area_lamp_prop_matrix_set,
+	            .range_get_fn = NULL,
+	            .user_data = la,
+	        });
+}
+
+void VIEW3D_WGT_lamp_area(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Area Lamp Widgets";
+	wgt->idname = "VIEW3D_WGT_lamp_area";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_3D |
+	              WM_MANIPULATORGROUPTYPE_DEPTH_3D);
+
+	wgt->poll = WIDGETGROUP_lamp_area_poll;
+	wgt->setup = WIDGETGROUP_lamp_area_setup;
+	wgt->refresh = WIDGETGROUP_lamp_area_refresh;
+}
+
+/** \} */
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Lamp Target Manipulator
+ * \{ */
+
+static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	Object *ob = CTX_data_active_object(C);
+
+	if (ob != NULL) {
+		if (ob->type == OB_LAMP) {
+			Lamp *la = ob->data;
+			return (ELEM(la->type, LA_SUN, LA_SPOT, LA_HEMI, LA_AREA));
+		}
+#if 0
+		else if (ob->type == OB_CAMERA) {
+			return true;
+		}
+#endif
+	}
+	return false;
+}
+
+static void WIDGETGROUP_lamp_target_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+	wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_grab_3d", mgroup, NULL);
+	wmManipulator *mpr = wwrapper->manipulator;
+
+	mgroup->customdata = wwrapper;
+
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
+
+	mpr->scale_basis = 0.06f;
+
+	wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_transform_axis_target", true);
+
+	RNA_enum_set(mpr->ptr, "draw_options",
+	             ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL | ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW);
+
+	WM_manipulator_operator_set(mpr, 0, ot, NULL);
+}
+
+static void WIDGETGROUP_lamp_target_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	wmManipulatorWrapper *wwrapper = mgroup->customdata;
+	Object *ob = CTX_data_active_object(C);
+	wmManipulator *mpr = wwrapper->manipulator;
+
+	copy_m4_m4(mpr->matrix_basis, ob->obmat);
+	unit_m4(mpr->matrix_offset);
+	mpr->matrix_offset[3][2] = -2.4f / mpr->scale_basis;
+	WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_OFFSET_SCALE, true);
+}
+
+void VIEW3D_WGT_lamp_target(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Target Lamp Widgets";
+	wgt->idname = "VIEW3D_WGT_lamp_target";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_3D);
+
+	wgt->poll = WIDGETGROUP_lamp_target_poll;
+	wgt->setup = WIDGETGROUP_lamp_target_setup;
+	wgt->draw_prepare = WIDGETGROUP_lamp_target_draw_prepare;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
new file mode 100644
index 00000000000..d86c6595bfa
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
@@ -0,0 +1,368 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_navigate.c
+ *  \ingroup spview3d
+ */
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_object.h"
+
+#include "DNA_object_types.h"
+
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h"  /* own include */
+
+/* -------------------------------------------------------------------- */
+/** \name View3D Navigation Manipulator Group
+ * \{ */
+
+/* Offset from screen edge. */
+#define MANIPULATOR_OFFSET_FAC 2.5
+/* Size of main icon. */
+#define MANIPULATOR_SIZE 64
+/* Factor for size of smaller button. */
+#define MANIPULATOR_MINI_FAC 0.5
+/* How much mini buttons offset from the primary. */
+#define MANIPULATOR_MINI_OFFSET_FAC 0.6666f
+
+
+enum {
+	MPR_MOVE = 0,
+	MPR_ROTATE = 1,
+	MPR_ZOOM = 2,
+
+	/* just buttons */
+	/* overlaps MPR_ORTHO (switch between) */
+	MPR_PERSP = 3,
+	MPR_ORTHO = 4,
+	MPR_CAMERA = 5,
+
+	MPR_TOTAL = 6,
+};
+
+/* Vector icons compatible with 'GPU_batch_from_poly_2d_encoded' */
+static const uchar shape_camera[] = {
+	0xa3, 0x19, 0x78, 0x55, 0x4d, 0x19, 0x4f, 0x0a, 0x7f, 0x00, 0xb0, 0x0a, 0xa9, 0x19,
+	0xa9, 0x19, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f, 0x0a, 0x4f, 0x25, 0x25, 0x4f, 0x0a,
+	0x4d, 0x19, 0x47, 0x19, 0x65, 0x55, 0x41, 0x55, 0x41, 0x9e, 0x43, 0xa8, 0x38, 0xb3,
+	0x34, 0xc3, 0x38, 0xd2, 0x43, 0xdd, 0x53, 0xe1, 0x62, 0xdd, 0x6d, 0xd2, 0x72, 0xc3,
+	0x78, 0xc3, 0x7c, 0xd2, 0x87, 0xdd, 0x96, 0xe1, 0xa6, 0xdd, 0xb1, 0xd2, 0xb5, 0xc3,
+	0xb1, 0xb3, 0xa6, 0xa8, 0xa9, 0x9e, 0xa9, 0x8c, 0xbb, 0x8c, 0xbb, 0x86, 0xc7, 0x86,
+	0xe0, 0x9e, 0xe0, 0x55, 0xc7, 0x6d, 0xbb, 0x6d, 0xbb, 0x67, 0xa9, 0x67, 0xa9, 0x55,
+	0x8a, 0x55, 0xa9, 0x19, 0xb0, 0x0a, 0xda, 0x25, 0xf5, 0x4f, 0xff, 0x80, 0xf5, 0xb0,
+	0xda, 0xda, 0xb0, 0xf5, 0x80, 0xff, 0x4f, 0xf5, 0x4f, 0xf5, 0x7c, 0xb3, 0x78, 0xc3,
+	0x72, 0xc3, 0x6d, 0xb3, 0x62, 0xa8, 0x53, 0xa4, 0x43, 0xa8, 0x41, 0x9e, 0xa9, 0x9e,
+	0xa6, 0xa8, 0x96, 0xa4, 0x87, 0xa8, 0x87, 0xa8,
+};
+static const uchar shape_ortho[] = {
+	0x85, 0x15, 0x85, 0x7c, 0xde, 0xb3, 0xde, 0xb8, 0xd9, 0xba, 0x80, 0x85, 0x27, 0xba,
+	0x22, 0xb8, 0x22, 0xb3, 0x7b, 0x7c, 0x7b, 0x15, 0x80, 0x12, 0x80, 0x12, 0x1d, 0xba,
+	0x80, 0xf2, 0x80, 0xff, 0x4f, 0xf5, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f, 0x0a, 0x4f,
+	0x25, 0x25, 0x4f, 0x0a, 0x7f, 0x00, 0x80, 0x0d, 0x1d, 0x45, 0x1d, 0x45, 0xb0, 0x0a,
+	0xda, 0x25, 0xf5, 0x4f, 0xff, 0x80, 0xf5, 0xb0, 0xda, 0xda, 0xb0, 0xf5, 0x80, 0xff,
+	0x80, 0xf2, 0xe3, 0xba, 0xe3, 0x45, 0x80, 0x0d, 0x7f, 0x00, 0x7f, 0x00,
+};
+static const uchar shape_pan[] = {
+	0xbf, 0x4c, 0xbf, 0x66, 0x99, 0x66, 0x99, 0x40, 0xb2, 0x40, 0x7f, 0x0d, 0x7f, 0x00,
+	0xb0, 0x0a, 0xda, 0x25, 0xf5, 0x4f, 0xff, 0x80, 0xf5, 0xb0, 0xda, 0xda, 0xb0, 0xf5,
+	0x80, 0xff, 0x80, 0xf2, 0xb3, 0xbf, 0x99, 0xbf, 0x99, 0x99, 0xbf, 0x99, 0xbf, 0xb2,
+	0xf2, 0x7f, 0xf2, 0x7f, 0x40, 0xb3, 0x40, 0x99, 0x66, 0x99, 0x66, 0xbf, 0x4d, 0xbf,
+	0x80, 0xf2, 0x80, 0xff, 0x4f, 0xf5, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f, 0x0a, 0x4f,
+	0x25, 0x25, 0x4f, 0x0a, 0x7f, 0x00, 0x7f, 0x0d, 0x4c, 0x40, 0x66, 0x40, 0x66, 0x66,
+	0x40, 0x66, 0x40, 0x4d, 0x0d, 0x80, 0x0d, 0x80,
+};
+static const uchar shape_persp[] = {
+	0xda, 0xda, 0xb0, 0xf5, 0x80, 0xff, 0x4f, 0xf5, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f,
+	0x0a, 0x4f, 0x25, 0x25, 0x4f, 0x0a, 0x7f, 0x00, 0x80, 0x07, 0x30, 0x50, 0x18, 0xbd,
+	0x80, 0xdb, 0xe8, 0xbd, 0xf5, 0xb0, 0xf5, 0xb0, 0x83, 0x0f, 0x87, 0x7b, 0xe2, 0xb7,
+	0xe3, 0xba, 0xe0, 0xbb, 0x80, 0x87, 0x20, 0xbb, 0x1d, 0xba, 0x1d, 0xb7, 0x78, 0x7b,
+	0x7d, 0x0f, 0x80, 0x0c, 0x80, 0x0c, 0xd0, 0x50, 0x80, 0x07, 0x7f, 0x00, 0xb0, 0x0a,
+	0xda, 0x25, 0xf5, 0x4f, 0xff, 0x80, 0xf5, 0xb0, 0xe8, 0xbd, 0xe8, 0xbd,
+};
+static const uchar shape_zoom[] = {
+	0xad, 0x7f, 0xf1, 0x7f, 0xff, 0x80, 0xf5, 0xb0, 0xda, 0xda, 0xb0, 0xf5, 0x80, 0xff,
+	0x4f, 0xf5, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f, 0x0d, 0x7f, 0x52, 0x7f, 0x69, 0xb7,
+	0x48, 0xb7, 0x80, 0xd8, 0xb8, 0xb7, 0x96, 0xb7, 0x96, 0xb7, 0x7f, 0x2f, 0x0d, 0x7f,
+	0x00, 0x7f, 0x0a, 0x4f, 0x25, 0x25, 0x4f, 0x0a, 0x7f, 0x00, 0xb0, 0x0a, 0xda, 0x25,
+	0xf5, 0x4f, 0xff, 0x80, 0xf1, 0x7f, 0xf1, 0x7f,
+};
+
+
+struct NavigateManipulatorInfo {
+	const char *opname;
+	const char *manipulator;
+	const unsigned char *shape;
+	uint shape_size;
+};
+
+#define SHAPE_VARS(shape_id) shape = shape_id, .shape_size = ARRAY_SIZE(shape_id)
+
+struct NavigateManipulatorInfo g_navigate_params[MPR_TOTAL] = {
+	{
+		.opname = "VIEW3D_OT_move",
+		.manipulator = "MANIPULATOR_WT_button_2d",
+		.SHAPE_VARS(shape_pan),
+	}, {
+		.opname = "VIEW3D_OT_rotate",
+		.manipulator = "VIEW3D_WT_navigate_rotate",
+		.shape = NULL,
+		.shape_size = 0,
+	}, {
+		.opname = "VIEW3D_OT_zoom",
+		.manipulator = "MANIPULATOR_WT_button_2d",
+		.SHAPE_VARS(shape_zoom),
+	}, {
+		.opname = "VIEW3D_OT_view_persportho",
+		.manipulator = "MANIPULATOR_WT_button_2d",
+		.SHAPE_VARS(shape_persp),
+	}, {
+		.opname = "VIEW3D_OT_view_persportho",
+		.manipulator = "MANIPULATOR_WT_button_2d",
+		.SHAPE_VARS(shape_ortho),
+	}, {
+		.opname = "VIEW3D_OT_viewnumpad",
+		.manipulator = "MANIPULATOR_WT_button_2d",
+		.SHAPE_VARS(shape_camera),
+	},
+};
+
+#undef SHAPE_VARS
+
+struct NavigateWidgetGroup {
+	wmManipulator *mpr_array[MPR_TOTAL];
+	/* Store the view state to check for changes. */
+	struct {
+		rcti rect_visible;
+		struct {
+			char is_persp;
+			char is_camera;
+			char viewlock;
+		} rv3d;
+	} state;
+	int region_size[2];
+};
+
+static bool WIDGETGROUP_navigate_poll(const bContext *UNUSED(C), wmManipulatorGroupType *UNUSED(wgt))
+{
+	if (U.manipulator_flag & USER_MANIPULATOR_DRAW_NAVIGATE) {
+		return true;
+	}
+	return false;
+
+}
+
+static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct NavigateWidgetGroup *navgroup = MEM_callocN(sizeof(struct NavigateWidgetGroup), __func__);
+
+	navgroup->region_size[0] = -1;
+	navgroup->region_size[1] = -1;
+
+	wmOperatorType *ot_viewnumpad = WM_operatortype_find("VIEW3D_OT_viewnumpad", true);
+
+	for (int i = 0; i < MPR_TOTAL; i++) {
+		const struct NavigateManipulatorInfo *info = &g_navigate_params[i];
+		navgroup->mpr_array[i] = WM_manipulator_new(info->manipulator, mgroup, NULL);
+		wmManipulator *mpr = navgroup->mpr_array[i];
+		mpr->flag |= WM_MANIPULATOR_GRAB_CURSOR | WM_MANIPULATOR_DRAW_MODAL;
+		mpr->color[3] = 0.2f;
+		mpr->color_hi[3] = 0.4f;
+
+		/* may be overwritten later */
+		mpr->scale_basis = (MANIPULATOR_SIZE * MANIPULATOR_MINI_FAC) / 2;
+		if (info->shape != NULL) {
+			PropertyRNA *prop = RNA_struct_find_property(mpr->ptr, "shape");
+			RNA_property_string_set_bytes(
+			        mpr->ptr, prop,
+			        (const char *)info->shape, info->shape_size);
+			RNA_enum_set(mpr->ptr, "draw_options", ED_MANIPULATOR_BUTTON_SHOW_OUTLINE);
+		}
+
+		wmOperatorType *ot = WM_operatortype_find(info->opname, true);
+		WM_manipulator_operator_set(mpr, 0, ot, NULL);
+	}
+
+	{
+		wmManipulator *mpr = navgroup->mpr_array[MPR_CAMERA];
+		PointerRNA *ptr = WM_manipulator_operator_set(mpr, 0, ot_viewnumpad, NULL);
+		RNA_enum_set(ptr, "type", RV3D_VIEW_CAMERA);
+	}
+
+	/* Click only buttons (not modal). */
+	{
+		int mpr_ids[] = {MPR_PERSP, MPR_ORTHO, MPR_CAMERA};
+		for (int i = 0; i < ARRAY_SIZE(mpr_ids); i++) {
+			wmManipulator *mpr = navgroup->mpr_array[mpr_ids[i]];
+			RNA_boolean_set(mpr->ptr, "show_drag", false);
+		}
+	}
+
+	/* Modal operators, don't use initial mouse location since we're clicking on a button. */
+	{
+		int mpr_ids[] = {MPR_MOVE, MPR_ROTATE, MPR_ZOOM};
+		for (int i = 0; i < ARRAY_SIZE(mpr_ids); i++) {
+			wmManipulator *mpr = navgroup->mpr_array[mpr_ids[i]];
+			wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, 0);
+			RNA_boolean_set(&mpop->ptr, "use_mouse_init", false);
+		}
+	}
+
+	{
+		wmManipulator *mpr = navgroup->mpr_array[MPR_ROTATE];
+		mpr->scale_basis = MANIPULATOR_SIZE / 2;
+		char mapping[6] = {
+			RV3D_VIEW_LEFT,
+			RV3D_VIEW_RIGHT,
+			RV3D_VIEW_FRONT,
+			RV3D_VIEW_BACK,
+			RV3D_VIEW_BOTTOM,
+			RV3D_VIEW_TOP,
+		};
+
+		for (int part_index = 0; part_index < 6; part_index += 1) {
+			PointerRNA *ptr = WM_manipulator_operator_set(mpr, part_index + 1, ot_viewnumpad, NULL);
+			RNA_enum_set(ptr, "type", mapping[part_index]);
+		}
+
+		/* When dragging an axis, use this instead. */
+		mpr->drag_part = 0;
+	}
+
+	mgroup->customdata = navgroup;
+}
+
+static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct NavigateWidgetGroup *navgroup = mgroup->customdata;
+	ARegion *ar = CTX_wm_region(C);
+	const RegionView3D *rv3d = ar->regiondata;
+
+	for (int i = 0; i < 3; i++) {
+		copy_v3_v3(navgroup->mpr_array[MPR_ROTATE]->matrix_offset[i], rv3d->viewmat[i]);
+	}
+
+	rcti rect_visible;
+	ED_region_visible_rect(ar, &rect_visible);
+
+	if ((navgroup->state.rect_visible.xmax == rect_visible.xmax) &&
+	    (navgroup->state.rect_visible.ymax == rect_visible.ymax) &&
+	    (navgroup->state.rv3d.is_persp == rv3d->is_persp) &&
+	    (navgroup->state.rv3d.is_camera == (rv3d->persp == RV3D_CAMOB)) &&
+	    (navgroup->state.rv3d.viewlock == rv3d->viewlock))
+	{
+		return;
+	}
+
+	navgroup->state.rect_visible = rect_visible;
+	navgroup->state.rv3d.is_persp = rv3d->is_persp;
+	navgroup->state.rv3d.is_camera = (rv3d->persp == RV3D_CAMOB);
+	navgroup->state.rv3d.viewlock = rv3d->viewlock;
+
+	const float icon_size = MANIPULATOR_SIZE;
+	const float icon_offset = (icon_size / 2.0) * MANIPULATOR_OFFSET_FAC * UI_DPI_FAC;
+	const float icon_offset_mini = icon_size * MANIPULATOR_MINI_OFFSET_FAC * UI_DPI_FAC;
+	const float co[2] = {rect_visible.xmax - icon_offset, rect_visible.ymax - icon_offset};
+
+	wmManipulator *mpr;
+
+	for (uint i = 0; i < ARRAY_SIZE(navgroup->mpr_array); i++) {
+		mpr = navgroup->mpr_array[i];
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+	}
+
+	if (((rv3d->viewlock & RV3D_LOCKED) == 0) && (navgroup->state.rv3d.is_camera == false)) {
+		mpr = navgroup->mpr_array[MPR_ROTATE];
+		mpr->matrix_basis[3][0] = co[0];
+		mpr->matrix_basis[3][1] = co[1];
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		mpr = navgroup->mpr_array[MPR_MOVE];
+		mpr->matrix_basis[3][0] = co[0] + icon_offset_mini;
+		mpr->matrix_basis[3][1] = co[1] - icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		mpr = navgroup->mpr_array[MPR_ZOOM];
+		mpr->matrix_basis[3][0] = co[0] - icon_offset_mini;
+		mpr->matrix_basis[3][1] = co[1] - icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		mpr = navgroup->mpr_array[rv3d->is_persp ? MPR_ORTHO : MPR_PERSP];
+		mpr->matrix_basis[3][0] = co[0] + icon_offset_mini;
+		mpr->matrix_basis[3][1] = co[1] + icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		mpr = navgroup->mpr_array[MPR_CAMERA];
+		mpr->matrix_basis[3][0] = co[0] - icon_offset_mini;
+		mpr->matrix_basis[3][1] = co[1] + icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+	}
+	else {
+		/* RV3D_LOCKED or Camera: only show supported buttons. */
+		mpr = navgroup->mpr_array[MPR_MOVE];
+		mpr->matrix_basis[3][0] = co[0] + icon_offset_mini;
+		mpr->matrix_basis[3][1] = co[1] + icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		mpr = navgroup->mpr_array[MPR_ZOOM];
+		mpr->matrix_basis[3][0] = co[0];
+		mpr->matrix_basis[3][1] = co[1] + icon_offset_mini;
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+
+		if (navgroup->state.rv3d.is_camera) {
+			mpr = navgroup->mpr_array[MPR_CAMERA];
+			mpr->matrix_basis[3][0] = co[0] - icon_offset_mini;
+			mpr->matrix_basis[3][1] = co[1] + icon_offset_mini;
+			WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+		}
+	}
+}
+
+void VIEW3D_WGT_navigate(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "View3D Navigate";
+	wgt->idname = "VIEW3D_WGT_navigate";
+
+	wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
+	              WM_MANIPULATORGROUPTYPE_SCALE |
+	              WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL);
+
+	wgt->poll = WIDGETGROUP_navigate_poll;
+	wgt->setup = WIDGETGROUP_navigate_setup;
+	wgt->draw_prepare = WIDGETGROUP_navigate_draw_prepare;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c b/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
new file mode 100644
index 00000000000..b232be35462
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
@@ -0,0 +1,309 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file view3d_manipulator_navigate_type.c
+ *  \ingroup wm
+ *
+ * \name Custom Orientation/Navigation Manipulator for the 3D View
+ *
+ * \brief Simple manipulator to axis and translate.
+ *
+ * - scale_basis: used for the size.
+ * - matrix_basis: used for the location.
+ * - matrix_offset: used to store the orientation.
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+#include "BLI_sort_utils.h"
+
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+
+#include "view3d_intern.h"
+
+#define DIAL_RESOLUTION 32
+
+#define HANDLE_SIZE 0.33
+
+static void axis_geom_draw(
+        const wmManipulator *mpr, const float color[4], const bool UNUSED(select))
+{
+	glLineWidth(mpr->line_width);
+
+	Gwn_VertFormat *format = immVertexFormat();
+	const uint pos_id = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
+	/* flip z for reverse */
+	const float cone_coords[5][3] = {
+		{-1, -1, 4},
+		{-1, +1, 4},
+		{+1, +1, 4},
+		{+1, -1, 4},
+		{0,   0, 2},
+	};
+
+	struct {
+		float depth;
+		char index;
+		char axis;
+		char is_pos;
+	} axis_order[6] = {
+		{-mpr->matrix_offset[0][2], 0, 0, false},
+		{+mpr->matrix_offset[0][2], 1, 0, true},
+		{-mpr->matrix_offset[1][2], 2, 1, false},
+		{+mpr->matrix_offset[1][2], 3, 1, true},
+		{-mpr->matrix_offset[2][2], 4, 2, false},
+		{+mpr->matrix_offset[2][2], 5, 2, true},
+	};
+	qsort(&axis_order, ARRAY_SIZE(axis_order), sizeof(axis_order[0]), BLI_sortutil_cmp_float);
+
+	const float scale_axis = 0.25f;
+	static const float axis_highlight[4] = {1, 1, 1, 1};
+	static const float axis_nop[4] = {1, 1, 1, 0};
+	static const float axis_black[4] = {0, 0, 0, 1};
+	static float axis_color[3][4];
+	gpuPushMatrix();
+	gpuMultMatrix(mpr->matrix_offset);
+
+	bool draw_center_done = false;
+
+	for (int axis_index = 0; axis_index < ARRAY_SIZE(axis_order); axis_index++) {
+		const int index = axis_order[axis_index].index;
+		const int axis = axis_order[axis_index].axis;
+		const bool is_pos = axis_order[axis_index].is_pos;
+
+		/* Draw slightly before, so axis aligned arrows draw ontop. */
+		if ((draw_center_done == false) && (axis_order[axis_index].depth > -0.01f)) {
+
+			/* Circle defining active area (revert back to 2D space). */
+			{
+				gpuPopMatrix();
+				immUniformColor4fv(color);
+				imm_draw_circle_fill_3d(pos_id, 0, 0, 1.0f, DIAL_RESOLUTION);
+				gpuPushMatrix();
+				gpuMultMatrix(mpr->matrix_offset);
+			}
+
+			/* Center cube. */
+			{
+				float center[3], size[3];
+
+				zero_v3(center);
+				copy_v3_fl(size, HANDLE_SIZE);
+
+				glEnable(GL_DEPTH_TEST);
+				glDepthMask(GL_TRUE);
+				glDepthFunc(GL_LEQUAL);
+				glBlendFunc(GL_ONE, GL_ZERO);
+				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+				glEnable(GL_LINE_SMOOTH);
+				glEnable(GL_BLEND);
+				glLineWidth(1.0f);
+				/* Just draw depth values. */
+				immUniformColor4fv(axis_nop);
+				imm_draw_cube_fill_3d(pos_id, center, size);
+				immUniformColor4fv(axis_black);
+				madd_v3_v3fl(
+				        center,
+				        (float[3]){
+				            mpr->matrix_offset[0][2],
+				            mpr->matrix_offset[1][2],
+				            mpr->matrix_offset[2][2],
+				        },
+				        0.08f);
+				imm_draw_cube_wire_3d(pos_id, center, size);
+				glDisable(GL_BLEND);
+				glDisable(GL_LINE_SMOOTH);
+				glDisable(GL_DEPTH_TEST);
+			}
+
+			draw_center_done = true;
+		}
+		UI_GetThemeColor3fv(TH_AXIS_X + axis, axis_color[axis]);
+		axis_color[axis][3] = 1.0f;
+
+		const int index_z = axis;
+		const int index_y = (axis + 1) % 3;
+		const int index_x = (axis + 2) % 3;
+
+#define ROTATED_VERT(v_orig) \
+		{ \
+			float v[3]; \
+			copy_v3_v3(v, v_orig); \
+			if (is_pos == 0) { \
+				v[2] *= -1.0f; \
+			} \
+			immVertex3f(pos_id, v[index_x] * scale_axis, v[index_y] * scale_axis, v[index_z] * scale_axis); \
+		} ((void)0)
+
+		bool ok = true;
+
+		/* skip view align axis */
+		if (len_squared_v2(mpr->matrix_offset[axis]) < 1e-6f && (mpr->matrix_offset[axis][2] > 0.0f) == is_pos) {
+			ok = false;
+		}
+		if (ok) {
+			immUniformColor4fv(index + 1 == mpr->highlight_part ? axis_highlight : axis_color[axis]);
+			immBegin(GWN_PRIM_TRI_FAN, 6);
+			ROTATED_VERT(cone_coords[4]);
+			for (int j = 0; j <= 4; j++) {
+				ROTATED_VERT(cone_coords[j % 4]);
+			}
+			immEnd();
+		}
+
+#undef ROTATED_VERT
+	}
+
+	gpuPopMatrix();
+	immUnbindProgram();
+}
+
+static void axis3d_draw_intern(
+        const bContext *UNUSED(C), wmManipulator *mpr,
+        const bool select, const bool highlight)
+{
+	const float *color = highlight ? mpr->color_hi : mpr->color;
+	float matrix_final[4][4];
+	float matrix_unit[4][4];
+
+	unit_m4(matrix_unit);
+
+	WM_manipulator_calc_matrix_final_params(
+	        mpr,
+	        &((struct WM_ManipulatorMatrixParams) {
+	            .matrix_offset = matrix_unit,
+	        }), matrix_final);
+
+	gpuPushMatrix();
+	gpuMultMatrix(matrix_final);
+
+	glEnable(GL_BLEND);
+	axis_geom_draw(mpr, color, select);
+	glDisable(GL_BLEND);
+	gpuPopMatrix();
+}
+
+static void manipulator_axis_draw(const bContext *C, wmManipulator *mpr)
+{
+	const bool is_modal = mpr->state & WM_MANIPULATOR_STATE_MODAL;
+	const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0;
+
+	(void)is_modal;
+
+	glEnable(GL_BLEND);
+	axis3d_draw_intern(C, mpr, false, is_highlight);
+	glDisable(GL_BLEND);
+}
+
+static int manipulator_axis_test_select(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	float point_local[2] = {UNPACK2(event->mval)};
+	sub_v2_v2(point_local, mpr->matrix_basis[3]);
+	mul_v2_fl(point_local, 1.0f / (mpr->scale_basis * UI_DPI_FAC));
+
+	const float len_sq = len_squared_v2(point_local);
+	if (len_sq > 1.0) {
+		return -1;
+	}
+
+	int part_best = -1;
+	int part_index = 1;
+	/* Use 'SQUARE(HANDLE_SIZE)' if we want to be able to _not_ focus on one of the axis. */
+	float i_best_len_sq = FLT_MAX;
+	for (int i = 0; i < 3; i++) {
+		for (int is_pos = 0; is_pos < 2; is_pos++) {
+			float co[2] = {
+				mpr->matrix_offset[i][0] * (is_pos ? 1 : -1),
+				mpr->matrix_offset[i][1] * (is_pos ? 1 : -1),
+			};
+
+			bool ok = true;
+
+			/* Check if we're viewing on an axis, there is no point to clicking on the current axis so show the reverse. */
+			if (len_squared_v2(co) < 1e-6f && (mpr->matrix_offset[i][2] > 0.0f) == is_pos) {
+				ok = false;
+			}
+
+			if (ok) {
+				const float len_axis_sq = len_squared_v2v2(co, point_local);
+				if (len_axis_sq < i_best_len_sq) {
+					part_best = part_index;
+					i_best_len_sq = len_axis_sq;
+				}
+			}
+			part_index += 1;
+		}
+	}
+
+	if (part_best != -1) {
+		return part_best;
+	}
+
+	/* The 'mpr->scale_final' is already applied when projecting. */
+	if (len_sq < 1.0f) {
+		return 0;
+	}
+
+	return -1;
+}
+
+static int manipulator_axis_cursor_get(wmManipulator *mpr)
+{
+	if (mpr->highlight_part > 0) {
+		return CURSOR_EDIT;
+	}
+	return BC_NSEW_SCROLLCURSOR;
+}
+
+void VIEW3D_WT_navigate_rotate(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "VIEW3D_WT_navigate_rotate";
+
+	/* api callbacks */
+	wt->draw = manipulator_axis_draw;
+	wt->test_select = manipulator_axis_test_select;
+	wt->cursor_get = manipulator_axis_cursor_get;
+
+	wt->struct_size = sizeof(wmManipulator);
+}
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
new file mode 100644
index 00000000000..9cde5ffc5e3
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
@@ -0,0 +1,1096 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulator_ruler.c
+ *  \ingroup spview3d
+ */
+
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_rect.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BLT_translation.h"
+
+#include "BKE_context.h"
+#include "BKE_object.h"
+#include "BKE_gpencil.h"
+#include "BKE_unit.h"
+
+#include "DNA_object_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BIF_gl.h"
+
+#include "ED_screen.h"
+#include "ED_transform_snap_object_context.h"
+#include "ED_view3d.h"
+
+#include "UI_resources.h"
+#include "UI_interface.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_toolsystem.h"
+
+#include "view3d_intern.h"  /* own include */
+
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_select.h"
+
+#include "BLF_api.h"
+
+
+static const char *view3d_wgt_ruler_id = "VIEW3D_WGT_ruler";
+
+
+#define MVAL_MAX_PX_DIST 12.0f
+
+/* -------------------------------------------------------------------- */
+/* Ruler Item (we can have many) */
+enum {
+	RULERITEM_USE_ANGLE = (1 << 0),  /* use protractor */
+	RULERITEM_USE_RAYCAST = (1 << 1)
+};
+
+enum {
+	RULERITEM_DIRECTION_IN = 0,
+	RULERITEM_DIRECTION_OUT
+};
+
+/* keep smaller then selection, since we may want click elsewhere without selecting a ruler */
+#define RULER_PICK_DIST 12.0f
+#define RULER_PICK_DIST_SQ (RULER_PICK_DIST * RULER_PICK_DIST)
+
+/* not clicking on a point */
+#define PART_LINE 0xff
+
+/* -------------------------------------------------------------------- */
+/* Ruler Info (wmManipulatorGroup customdata) */
+
+enum {
+	RULER_STATE_NORMAL = 0,
+	RULER_STATE_DRAG
+};
+
+enum {
+	RULER_SNAP_OK = (1 << 0),
+};
+
+typedef struct RulerInfo {
+	// ListBase items;
+	int      item_active;
+	int flag;
+	int snap_flag;
+	int state;
+
+	struct SnapObjectContext *snap_context;
+
+	/* wm state */
+	wmWindow *win;
+	ScrArea *sa;
+	ARegion *ar;  /* re-assigned every modal update */
+} RulerInfo;
+
+/* -------------------------------------------------------------------- */
+/* Ruler Item (two or three points) */
+
+typedef struct RulerItem {
+	wmManipulator mpr;
+
+	/* worldspace coords, middle being optional */
+	float co[3][3];
+
+	int   flag;
+	int   raycast_dir;  /* RULER_DIRECTION_* */
+} RulerItem;
+
+typedef struct RulerInteraction {
+	/* selected coord */
+	char  co_index; /* 0 -> 2 */
+	float drag_start_co[3];
+	uint inside_region : 1;
+} RulerInteraction;
+
+/* -------------------------------------------------------------------- */
+/** \name Internal Ruler Utilities
+ * \{ */
+
+static RulerItem *ruler_item_add(wmManipulatorGroup *mgroup)
+{
+	/* could pass this as an arg */
+	const wmManipulatorType *wt_ruler = WM_manipulatortype_find("VIEW3D_WT_ruler_item", true);
+	RulerItem *ruler_item = (RulerItem *)WM_manipulator_new_ptr(wt_ruler, mgroup, NULL);
+	WM_manipulator_set_flag(&ruler_item->mpr, WM_MANIPULATOR_DRAW_MODAL, true);
+	return ruler_item;
+}
+
+static void ruler_item_remove(bContext *C, wmManipulatorGroup *mgroup, RulerItem *ruler_item)
+{
+	WM_manipulator_unlink(&mgroup->manipulators, mgroup->parent_mmap, &ruler_item->mpr, C);
+}
+
+static void ruler_item_as_string(RulerItem *ruler_item, UnitSettings *unit,
+                                 char *numstr, size_t numstr_size, int prec)
+{
+	const bool do_split = (unit->flag & USER_UNIT_OPT_SPLIT) != 0;
+
+	if (ruler_item->flag & RULERITEM_USE_ANGLE) {
+		const float ruler_angle = angle_v3v3v3(ruler_item->co[0],
+		                                       ruler_item->co[1],
+		                                       ruler_item->co[2]);
+
+		if (unit->system == USER_UNIT_NONE) {
+			BLI_snprintf(numstr, numstr_size, "%.*f°", prec, RAD2DEGF(ruler_angle));
+		}
+		else {
+			bUnit_AsString(numstr, numstr_size,
+			               (double)ruler_angle,
+			               prec, unit->system, B_UNIT_ROTATION, do_split, false);
+		}
+	}
+	else {
+		const float ruler_len = len_v3v3(ruler_item->co[0],
+		                                 ruler_item->co[2]);
+
+		if (unit->system == USER_UNIT_NONE) {
+			BLI_snprintf(numstr, numstr_size, "%.*f", prec, ruler_len);
+		}
+		else {
+			bUnit_AsString(numstr, numstr_size,
+			               (double)(ruler_len * unit->scale_length),
+			               prec, unit->system, B_UNIT_LENGTH, do_split, false);
+		}
+	}
+}
+
+static bool view3d_ruler_pick(
+        wmManipulatorGroup *mgroup, RulerItem *ruler_item, const float mval[2],
+        int *r_co_index)
+{
+	RulerInfo *ruler_info = mgroup->customdata;
+	ARegion *ar = ruler_info->ar;
+	bool found = false;
+
+	float dist_best = RULER_PICK_DIST_SQ;
+	int co_index_best = -1;
+
+	{
+		float co_ss[3][2];
+		float dist;
+		int j;
+
+		/* should these be checked? - ok for now not to */
+		for (j = 0; j < 3; j++) {
+			ED_view3d_project_float_global(ar, ruler_item->co[j], co_ss[j], V3D_PROJ_TEST_NOP);
+		}
+
+		if (ruler_item->flag & RULERITEM_USE_ANGLE) {
+			dist = min_ff(dist_squared_to_line_segment_v2(mval, co_ss[0], co_ss[1]),
+			              dist_squared_to_line_segment_v2(mval, co_ss[1], co_ss[2]));
+			if (dist < dist_best) {
+				dist_best = dist;
+				found = true;
+
+				{
+					const float dist_points[3] = {
+					    len_squared_v2v2(co_ss[0], mval),
+					    len_squared_v2v2(co_ss[1], mval),
+					    len_squared_v2v2(co_ss[2], mval),
+					};
+					if (min_fff(UNPACK3(dist_points)) < RULER_PICK_DIST_SQ) {
+						co_index_best = min_axis_v3(dist_points);
+					}
+					else {
+						co_index_best = -1;
+					}
+				}
+			}
+		}
+		else {
+			dist = dist_squared_to_line_segment_v2(mval, co_ss[0], co_ss[2]);
+			if (dist < dist_best) {
+				dist_best = dist;
+				found = true;
+
+				{
+					const float dist_points[2] = {
+					    len_squared_v2v2(co_ss[0], mval),
+					    len_squared_v2v2(co_ss[2], mval),
+					};
+					if (min_ff(UNPACK2(dist_points)) < RULER_PICK_DIST_SQ) {
+						co_index_best = (dist_points[0] < dist_points[1]) ? 0 : 2;
+					}
+					else {
+						co_index_best = -1;
+					}
+				}
+			}
+		}
+	}
+
+	*r_co_index = co_index_best;
+	return found;
+}
+
+/**
+ * Ensure the 'snap_context' is only cached while dragging,
+ * needed since the user may toggle modes between tool use.
+ */
+static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state)
+{
+	if (state == ruler_info->state) {
+		return;
+	}
+
+	/* always remove */
+	if (ruler_info->snap_context) {
+		ED_transform_snap_object_context_destroy(ruler_info->snap_context);
+		ruler_info->snap_context = NULL;
+	}
+
+	if (state == RULER_STATE_NORMAL) {
+		/* pass */
+	}
+	else if (state == RULER_STATE_DRAG) {
+		ruler_info->snap_context = ED_transform_snap_object_context_create_view3d(
+		        CTX_data_scene(C), CTX_data_depsgraph(C), 0,
+		        ruler_info->ar, CTX_wm_view3d(C));
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	ruler_info->state = state;
+}
+
+static void view3d_ruler_item_project(
+        RulerInfo *ruler_info, float r_co[3],
+        const int xy[2])
+{
+	ED_view3d_win_to_3d_int(ruler_info->sa->spacedata.first, ruler_info->ar, r_co, xy, r_co);
+}
+
+/* use for mousemove events */
+static bool view3d_ruler_item_mousemove(
+        RulerInfo *ruler_info, RulerItem *ruler_item, const int mval[2],
+        const bool do_thickness, const bool do_snap)
+{
+	RulerInteraction *inter = ruler_item->mpr.interaction_data;
+	const float eps_bias = 0.0002f;
+	float dist_px = MVAL_MAX_PX_DIST * U.pixelsize;  /* snap dist */
+
+	ruler_info->snap_flag &= ~RULER_SNAP_OK;
+
+	if (ruler_item) {
+		float *co = ruler_item->co[inter->co_index];
+		/* restore the initial depth */
+		copy_v3_v3(co, inter->drag_start_co);
+		view3d_ruler_item_project(ruler_info, co, mval);
+		if (do_thickness && inter->co_index != 1) {
+			// Scene *scene = CTX_data_scene(C);
+			// View3D *v3d = ruler_info->sa->spacedata.first;
+			const float mval_fl[2] = {UNPACK2(mval)};
+			float ray_normal[3];
+			float ray_start[3];
+			float *co_other;
+
+			co_other = ruler_item->co[inter->co_index == 0 ? 2 : 0];
+
+			if (ED_transform_snap_object_project_view3d(
+			        ruler_info->snap_context,
+			        SCE_SNAP_MODE_FACE,
+			        &(const struct SnapObjectParams){
+			            .snap_select = SNAP_ALL,
+			            .use_object_edit_cage = true,
+			        },
+			        mval_fl, &dist_px,
+			        co, ray_normal))
+			{
+				negate_v3(ray_normal);
+				/* add some bias */
+				madd_v3_v3v3fl(ray_start, co, ray_normal, eps_bias);
+				ED_transform_snap_object_project_ray(
+				        ruler_info->snap_context,
+				        &(const struct SnapObjectParams){
+				            .snap_select = SNAP_ALL,
+				            .use_object_edit_cage = true,
+				        },
+				        ray_start, ray_normal, NULL,
+				        co_other, NULL);
+			}
+		}
+		else if (do_snap) {
+			const float mval_fl[2] = {UNPACK2(mval)};
+
+			if (ED_transform_snap_object_project_view3d(
+			        ruler_info->snap_context,
+			        (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE | SCE_SNAP_MODE_FACE),
+			        &(const struct SnapObjectParams){
+			            .snap_select = SNAP_ALL,
+			            .use_object_edit_cage = true,
+			            .use_occlusion_test = true,
+			        },
+			        mval_fl, &dist_px,
+			        co, NULL))
+			{
+				ruler_info->snap_flag |= RULER_SNAP_OK;
+			}
+		}
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Ruler/Grease Pencil Conversion
+ * \{ */
+
+#define RULER_ID "RulerData3D"
+static bool view3d_ruler_to_gpencil(bContext *C, wmManipulatorGroup *mgroup)
+{
+	// RulerInfo *ruler_info = mgroup->customdata;
+	Scene *scene = CTX_data_scene(C);
+	bGPDlayer *gpl;
+	bGPDframe *gpf;
+	bGPDstroke *gps;
+	bGPDpalette *palette;
+	bGPDpalettecolor *palcolor;
+	RulerItem *ruler_item;
+	const char *ruler_name = RULER_ID;
+	bool changed = false;
+
+	if (scene->gpd == NULL) {
+		scene->gpd = BKE_gpencil_data_addnew("GPencil");
+	}
+
+	gpl = BLI_findstring(&scene->gpd->layers, ruler_name, offsetof(bGPDlayer, info));
+	if (gpl == NULL) {
+		gpl = BKE_gpencil_layer_addnew(scene->gpd, ruler_name, false);
+		gpl->thickness = 1;
+		gpl->flag |= GP_LAYER_HIDE;
+	}
+
+	/* try to get active palette or create a new one */
+	palette = BKE_gpencil_palette_getactive(scene->gpd);
+	if (palette == NULL) {
+		palette = BKE_gpencil_palette_addnew(scene->gpd, DATA_("GP_Palette"), true);
+	}
+	/* try to get color with the ruler name or create a new one */
+	palcolor = BKE_gpencil_palettecolor_getbyname(palette, (char *)ruler_name);
+	if (palcolor == NULL) {
+		palcolor = BKE_gpencil_palettecolor_addnew(palette, (char *)ruler_name, true);
+	}
+
+	gpf = BKE_gpencil_layer_getframe(gpl, CFRA, true);
+	BKE_gpencil_free_strokes(gpf);
+
+	for (ruler_item = mgroup->manipulators.first; ruler_item; ruler_item = (RulerItem *)ruler_item->mpr.next) {
+		bGPDspoint *pt;
+		int j;
+
+		/* allocate memory for a new stroke */
+		gps = MEM_callocN(sizeof(bGPDstroke), "gp_stroke");
+		if (ruler_item->flag & RULERITEM_USE_ANGLE) {
+			gps->totpoints = 3;
+			pt = gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
+			for (j = 0; j < 3; j++) {
+				copy_v3_v3(&pt->x, ruler_item->co[j]);
+				pt->pressure = 1.0f;
+				pt->strength = 1.0f;
+				pt++;
+			}
+		}
+		else {
+			gps->totpoints = 2;
+			pt = gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
+			for (j = 0; j < 3; j += 2) {
+				copy_v3_v3(&pt->x, ruler_item->co[j]);
+				pt->pressure = 1.0f;
+				pt->strength = 1.0f;
+				pt++;
+			}
+		}
+		gps->flag = GP_STROKE_3DSPACE;
+		gps->thickness = 3;
+		/* assign color to stroke */
+		BLI_strncpy(gps->colorname, palcolor->info, sizeof(gps->colorname));
+		gps->palcolor = palcolor;
+		BLI_addtail(&gpf->strokes, gps);
+		changed = true;
+	}
+
+	return changed;
+}
+
+static bool view3d_ruler_from_gpencil(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	Scene *scene = CTX_data_scene(C);
+	bool changed = false;
+
+	if (scene->gpd) {
+		bGPDlayer *gpl;
+		const char *ruler_name = RULER_ID;
+		gpl = BLI_findstring(&scene->gpd->layers, ruler_name, offsetof(bGPDlayer, info));
+		if (gpl) {
+			bGPDframe *gpf;
+			gpf = BKE_gpencil_layer_getframe(gpl, CFRA, false);
+			if (gpf) {
+				bGPDstroke *gps;
+				for (gps = gpf->strokes.first; gps; gps = gps->next) {
+					bGPDspoint *pt = gps->points;
+					int j;
+					RulerItem *ruler_item = NULL;
+					if (gps->totpoints == 3) {
+						ruler_item = ruler_item_add(mgroup);
+						for (j = 0; j < 3; j++) {
+							copy_v3_v3(ruler_item->co[j], &pt->x);
+							pt++;
+						}
+						ruler_item->flag |= RULERITEM_USE_ANGLE;
+						changed = true;
+					}
+					else if (gps->totpoints == 2) {
+						ruler_item = ruler_item_add(mgroup);
+						for (j = 0; j < 3; j += 2) {
+							copy_v3_v3(ruler_item->co[j], &pt->x);
+							pt++;
+						}
+						changed = true;
+					}
+				}
+			}
+		}
+	}
+
+	return changed;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Ruler Item Manipulator Type
+ * \{ */
+
+static void manipulator_ruler_draw(const bContext *C, wmManipulator *mpr)
+{
+	Scene *scene = CTX_data_scene(C);
+	UnitSettings *unit = &scene->unit;
+	RulerInfo *ruler_info = mpr->parent_mgroup->customdata;
+	RulerItem *ruler_item = (RulerItem *)mpr;
+	ARegion *ar = ruler_info->ar;
+	RegionView3D *rv3d = ar->regiondata;
+	const float cap_size = 4.0f;
+	const float bg_margin = 4.0f * U.pixelsize;
+	const float bg_radius = 4.0f * U.pixelsize;
+	const float arc_size = 64.0f * U.pixelsize;
+#define ARC_STEPS 24
+	const int arc_steps = ARC_STEPS;
+	const float color_act[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	const float color_base[4] = {0.0f, 0.0f, 0.0f, 1.0f};
+	unsigned char color_text[3];
+	unsigned char color_wire[3];
+	float color_back[4] = {1.0f, 1.0f, 1.0f, 0.5f};
+
+	/* anti-aliased lines for more consistent appearance */
+	glEnable(GL_LINE_SMOOTH);
+
+	BLF_enable(blf_mono_font, BLF_ROTATION);
+	BLF_size(blf_mono_font, 14 * U.pixelsize, U.dpi);
+	BLF_rotation(blf_mono_font, 0.0f);
+
+	UI_GetThemeColor3ubv(TH_TEXT, color_text);
+	UI_GetThemeColor3ubv(TH_WIRE, color_wire);
+
+	const bool is_act = (mpr->flag & WM_MANIPULATOR_DRAW_HOVER);
+	float dir_ruler[2];
+	float co_ss[3][2];
+	int j;
+
+	/* should these be checked? - ok for now not to */
+	for (j = 0; j < 3; j++) {
+		ED_view3d_project_float_global(ar, ruler_item->co[j], co_ss[j], V3D_PROJ_TEST_NOP);
+	}
+
+	glEnable(GL_BLEND);
+
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	if (ruler_item->flag & RULERITEM_USE_ANGLE) {
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+		immUniform1i("num_colors", 2);  /* "advanced" mode */
+		const float *col = is_act ? color_act : color_base;
+		immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2);
+		immUniform1f("dash_width", 6.0f);
+
+		immBegin(GWN_PRIM_LINE_STRIP, 3);
+
+		immVertex2fv(shdr_pos, co_ss[0]);
+		immVertex2fv(shdr_pos, co_ss[1]);
+		immVertex2fv(shdr_pos, co_ss[2]);
+
+		immEnd();
+
+		immUnbindProgram();
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		/* arc */
+		{
+			float dir_tmp[3];
+			float co_tmp[3];
+			float arc_ss_coord[2];
+
+			float dir_a[3];
+			float dir_b[3];
+			float quat[4];
+			float axis[3];
+			float angle;
+			const float px_scale = (ED_view3d_pixel_size(rv3d, ruler_item->co[1]) *
+			                        min_fff(arc_size,
+			                                len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
+			                                len_v2v2(co_ss[2], co_ss[1]) / 2.0f));
+
+			sub_v3_v3v3(dir_a, ruler_item->co[0], ruler_item->co[1]);
+			sub_v3_v3v3(dir_b, ruler_item->co[2], ruler_item->co[1]);
+			normalize_v3(dir_a);
+			normalize_v3(dir_b);
+
+			cross_v3_v3v3(axis, dir_a, dir_b);
+			angle = angle_normalized_v3v3(dir_a, dir_b);
+
+			axis_angle_to_quat(quat, axis, angle / arc_steps);
+
+			copy_v3_v3(dir_tmp, dir_a);
+
+			immUniformColor3ubv(color_wire);
+
+			immBegin(GWN_PRIM_LINE_STRIP, arc_steps + 1);
+
+			for (j = 0; j <= arc_steps; j++) {
+				madd_v3_v3v3fl(co_tmp, ruler_item->co[1], dir_tmp, px_scale);
+				ED_view3d_project_float_global(ar, co_tmp, arc_ss_coord, V3D_PROJ_TEST_NOP);
+				mul_qt_v3(quat, dir_tmp);
+
+				immVertex2fv(shdr_pos, arc_ss_coord);
+			}
+
+			immEnd();
+		}
+
+		/* capping */
+		{
+			float rot_90_vec_a[2];
+			float rot_90_vec_b[2];
+			float cap[2];
+
+			sub_v2_v2v2(dir_ruler, co_ss[0], co_ss[1]);
+			rot_90_vec_a[0] = -dir_ruler[1];
+			rot_90_vec_a[1] =  dir_ruler[0];
+			normalize_v2(rot_90_vec_a);
+
+			sub_v2_v2v2(dir_ruler, co_ss[1], co_ss[2]);
+			rot_90_vec_b[0] = -dir_ruler[1];
+			rot_90_vec_b[1] =  dir_ruler[0];
+			normalize_v2(rot_90_vec_b);
+
+			glEnable(GL_BLEND);
+
+			immUniformColor3ubv(color_wire);
+
+			immBegin(GWN_PRIM_LINES, 8);
+
+			madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec_a, cap_size);
+			immVertex2fv(shdr_pos, cap);
+			madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec_a, -cap_size);
+			immVertex2fv(shdr_pos, cap);
+
+			madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec_b, cap_size);
+			immVertex2fv(shdr_pos, cap);
+			madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec_b, -cap_size);
+			immVertex2fv(shdr_pos, cap);
+
+			/* angle vertex */
+			immVertex2f(shdr_pos, co_ss[1][0] - cap_size, co_ss[1][1] - cap_size);
+			immVertex2f(shdr_pos, co_ss[1][0] + cap_size, co_ss[1][1] + cap_size);
+			immVertex2f(shdr_pos, co_ss[1][0] - cap_size, co_ss[1][1] + cap_size);
+			immVertex2f(shdr_pos, co_ss[1][0] + cap_size, co_ss[1][1] - cap_size);
+
+			immEnd();
+
+			glDisable(GL_BLEND);
+		}
+
+		immUnbindProgram();
+
+		/* text */
+		{
+			char numstr[256];
+			float numstr_size[2];
+			float posit[2];
+			const int prec = 2;  /* XXX, todo, make optional */
+
+			ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
+
+			BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
+
+			posit[0] = co_ss[1][0] + (cap_size * 2.0f);
+			posit[1] = co_ss[1][1] - (numstr_size[1] / 2.0f);
+
+			/* draw text (bg) */
+			UI_draw_roundbox_corner_set(UI_CNR_ALL);
+			UI_draw_roundbox_aa(
+			        true,
+			        posit[0] - bg_margin,                  posit[1] - bg_margin,
+			        posit[0] + bg_margin + numstr_size[0], posit[1] + bg_margin + numstr_size[1],
+			        bg_radius, color_back);
+			/* draw text */
+			BLF_color3ubv(blf_mono_font, color_text);
+			BLF_position(blf_mono_font, posit[0], posit[1], 0.0f);
+			BLF_rotation(blf_mono_font, 0.0f);
+			BLF_draw(blf_mono_font, numstr, sizeof(numstr));
+		}
+	}
+	else {
+		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+		float viewport_size[4];
+		glGetFloatv(GL_VIEWPORT, viewport_size);
+		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+		immUniform1i("num_colors", 2);  /* "advanced" mode */
+		const float *col = is_act ? color_act : color_base;
+		immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2);
+		immUniform1f("dash_width", 6.0f);
+
+		immBegin(GWN_PRIM_LINES, 2);
+
+		immVertex2fv(shdr_pos, co_ss[0]);
+		immVertex2fv(shdr_pos, co_ss[2]);
+
+		immEnd();
+
+		immUnbindProgram();
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		sub_v2_v2v2(dir_ruler, co_ss[0], co_ss[2]);
+
+		/* capping */
+		{
+			float rot_90_vec[2] = {-dir_ruler[1], dir_ruler[0]};
+			float cap[2];
+
+			normalize_v2(rot_90_vec);
+
+			glEnable(GL_BLEND);
+
+			immUniformColor3ubv(color_wire);
+
+			immBegin(GWN_PRIM_LINES, 4);
+
+			madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec, cap_size);
+			immVertex2fv(shdr_pos, cap);
+			madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec, -cap_size);
+			immVertex2fv(shdr_pos, cap);
+
+			madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec, cap_size);
+			immVertex2fv(shdr_pos, cap);
+			madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec, -cap_size);
+			immVertex2fv(shdr_pos, cap);
+
+			immEnd();
+
+			glDisable(GL_BLEND);
+		}
+
+		immUnbindProgram();
+
+		/* text */
+		{
+			char numstr[256];
+			float numstr_size[2];
+			const int prec = 6;  /* XXX, todo, make optional */
+			float posit[2];
+
+			ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
+
+			BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
+
+			mid_v2_v2v2(posit, co_ss[0], co_ss[2]);
+
+			/* center text */
+			posit[0] -= numstr_size[0] / 2.0f;
+			posit[1] -= numstr_size[1] / 2.0f;
+
+			/* draw text (bg) */
+			UI_draw_roundbox_corner_set(UI_CNR_ALL);
+			UI_draw_roundbox_aa(
+			        true,
+			        posit[0] - bg_margin,                  posit[1] - bg_margin,
+			        posit[0] + bg_margin + numstr_size[0], posit[1] + bg_margin + numstr_size[1],
+			        bg_radius, color_back);
+			/* draw text */
+			BLF_color3ubv(blf_mono_font, color_text);
+			BLF_position(blf_mono_font, posit[0], posit[1], 0.0f);
+			BLF_draw(blf_mono_font, numstr, sizeof(numstr));
+		}
+	}
+
+	glDisable(GL_LINE_SMOOTH);
+
+	BLF_disable(blf_mono_font, BLF_ROTATION);
+
+#undef ARC_STEPS
+
+	/* draw snap */
+	if ((ruler_info->snap_flag & RULER_SNAP_OK) &&
+	    (ruler_info->state == RULER_STATE_DRAG) &&
+	    (ruler_item->mpr.interaction_data != NULL))
+	{
+		RulerInteraction *inter = ruler_item->mpr.interaction_data;
+		/* size from drawSnapping */
+		const float size = 2.5f * UI_GetThemeValuef(TH_VERTEX_SIZE);
+		float co_ss_snap[3];
+		ED_view3d_project_float_global(ar, ruler_item->co[inter->co_index], co_ss_snap, V3D_PROJ_TEST_NOP);
+
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformColor4fv(color_act);
+
+		imm_draw_circle_wire_2d(pos, co_ss_snap[0], co_ss_snap[1], size * U.pixelsize, 32);
+
+		immUnbindProgram();
+	}
+}
+
+static int manipulator_ruler_test_select(
+        bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event)
+{
+	RulerItem *ruler_item_pick = (RulerItem *)mpr;
+	float mval_fl[2] = {UNPACK2(event->mval)};
+	int co_index;
+
+	/* select and drag */
+	if (view3d_ruler_pick(mpr->parent_mgroup, ruler_item_pick, mval_fl, &co_index)) {
+		if (co_index == -1) {
+			if ((ruler_item_pick->flag & RULERITEM_USE_ANGLE) == 0) {
+				return PART_LINE;
+			}
+		}
+		else {
+			return co_index;
+		}
+	}
+	return -1;
+}
+
+static int manipulator_ruler_modal(
+        bContext *C, wmManipulator *mpr, const wmEvent *event,
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	bool do_draw = false;
+	int exit_code = OPERATOR_RUNNING_MODAL;
+	RulerInfo *ruler_info = mpr->parent_mgroup->customdata;
+	RulerItem *ruler_item = (RulerItem *)mpr;
+	RulerInteraction *inter = ruler_item->mpr.interaction_data;
+	ARegion *ar = CTX_wm_region(C);
+
+	ruler_info->ar = ar;
+
+	switch (event->type) {
+		case MOUSEMOVE:
+		{
+			if (ruler_info->state == RULER_STATE_DRAG) {
+				if (view3d_ruler_item_mousemove(
+				        ruler_info, ruler_item, event->mval,
+				        event->shift != 0, event->ctrl != 0))
+				{
+					do_draw = true;
+				}
+				inter->inside_region = BLI_rcti_isect_pt_v(&ar->winrct, &event->x);
+			}
+			break;
+		}
+	}
+	if (do_draw) {
+		ED_region_tag_redraw(ar);
+	}
+	return exit_code;
+}
+
+static int manipulator_ruler_invoke(
+        bContext *C, wmManipulator *mpr, const wmEvent *event)
+{
+	wmManipulatorGroup *mgroup = mpr->parent_mgroup;
+	RulerInfo *ruler_info = mgroup->customdata;
+	RulerItem *ruler_item_pick = (RulerItem *)mpr;
+	RulerInteraction *inter = MEM_callocN(sizeof(RulerInteraction), __func__);
+	mpr->interaction_data = inter;
+
+	ARegion *ar = ruler_info->ar;
+
+	const float mval_fl[2] = {UNPACK2(event->mval)};
+
+	/* select and drag */
+	if (mpr->highlight_part == PART_LINE) {
+		if ((ruler_item_pick->flag & RULERITEM_USE_ANGLE) == 0) {
+			/* Add Center Point */
+			ruler_item_pick->flag |= RULERITEM_USE_ANGLE;
+			inter->co_index = 1;
+			ruler_state_set(C, ruler_info, RULER_STATE_DRAG);
+
+			/* find the factor */
+			{
+				float co_ss[2][2];
+				float fac;
+
+				ED_view3d_project_float_global(ar, ruler_item_pick->co[0], co_ss[0], V3D_PROJ_TEST_NOP);
+				ED_view3d_project_float_global(ar, ruler_item_pick->co[2], co_ss[1], V3D_PROJ_TEST_NOP);
+
+				fac = line_point_factor_v2(mval_fl, co_ss[0], co_ss[1]);
+				CLAMP(fac, 0.0f, 1.0f);
+
+				interp_v3_v3v3(ruler_item_pick->co[1],
+				               ruler_item_pick->co[0],
+				               ruler_item_pick->co[2], fac);
+			}
+
+			/* update the new location */
+			view3d_ruler_item_mousemove(
+			        ruler_info, ruler_item_pick, event->mval,
+			        event->shift != 0, event->ctrl != 0);
+		}
+	}
+	else {
+		inter->co_index = mpr->highlight_part;
+		ruler_state_set(C, ruler_info, RULER_STATE_DRAG);
+
+		/* store the initial depth */
+		copy_v3_v3(inter->drag_start_co, ruler_item_pick->co[inter->co_index]);
+	}
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void manipulator_ruler_exit(bContext *C, wmManipulator *mpr, const bool cancel)
+{
+	wmManipulatorGroup *mgroup = mpr->parent_mgroup;
+	RulerInfo *ruler_info = mgroup->customdata;
+
+	if (!cancel) {
+		if (ruler_info->state == RULER_STATE_DRAG) {
+			RulerItem *ruler_item = (RulerItem *)mpr;
+			RulerInteraction *inter = mpr->interaction_data;
+			/* rubber-band angle removal */
+			if (!inter->inside_region) {
+				if ((inter->co_index == 1) && (ruler_item->flag & RULERITEM_USE_ANGLE)) {
+					ruler_item->flag &= ~RULERITEM_USE_ANGLE;
+				}
+				else {
+					/* Not ideal, since the ruler isn't a mode and we don't want to override delete key
+					 * use dragging out of the view for removal. */
+					ruler_item_remove(C, mgroup, ruler_item);
+					ruler_item = NULL;
+					mpr = NULL;
+					inter = NULL;
+				}
+			}
+			if (ruler_info->snap_flag & RULER_SNAP_OK) {
+				ruler_info->snap_flag &= ~RULER_SNAP_OK;
+			}
+			ruler_state_set(C, ruler_info, RULER_STATE_NORMAL);
+		}
+		/* We could convert only the current manipulator, for now just re-generate. */
+		view3d_ruler_to_gpencil(C, mgroup);
+	}
+
+	if (mpr) {
+		MEM_SAFE_FREE(mpr->interaction_data);
+	}
+
+	ruler_state_set(C, ruler_info, RULER_STATE_NORMAL);
+}
+
+static int manipulator_ruler_cursor_get(wmManipulator *mpr)
+{
+	if (mpr->highlight_part == PART_LINE) {
+		return BC_CROSSCURSOR;
+	}
+	return BC_NSEW_SCROLLCURSOR;
+}
+
+void VIEW3D_WT_ruler_item(wmManipulatorType *wt)
+{
+	/* identifiers */
+	wt->idname = "VIEW3D_WT_ruler_item";
+
+	/* api callbacks */
+	wt->draw = manipulator_ruler_draw;
+	wt->test_select = manipulator_ruler_test_select;
+	wt->modal = manipulator_ruler_modal;
+	wt->invoke = manipulator_ruler_invoke;
+	wt->exit = manipulator_ruler_exit;
+	wt->cursor_get = manipulator_ruler_cursor_get;
+
+	wt->struct_size = sizeof(RulerItem);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Ruler Manipulator Group
+ * \{ */
+
+static bool WIDGETGROUP_ruler_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C);
+	if ((tref_rt == NULL) ||
+	    !STREQ(wgt->idname, tref_rt->manipulator_group))
+	{
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+static void WIDGETGROUP_ruler_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	RulerInfo *ruler_info = MEM_callocN(sizeof(RulerInfo), __func__);
+
+	if (view3d_ruler_from_gpencil(C, mgroup)) {
+		/* nop */
+	}
+
+	wmWindow *win = CTX_wm_window(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	ruler_info->win = win;
+	ruler_info->sa = sa;
+	ruler_info->ar = ar;
+
+	mgroup->customdata = ruler_info;
+}
+
+void VIEW3D_WGT_ruler(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Ruler Widgets";
+	wgt->idname = view3d_wgt_ruler_id;
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_SCALE | WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = WIDGETGROUP_ruler_poll;
+	wgt->setup = WIDGETGROUP_ruler_setup;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Add Ruler Operator
+ * \{ */
+
+static int view3d_ruler_poll(bContext *C)
+{
+	bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C);
+	if ((tref_rt == NULL) ||
+	    !STREQ(view3d_wgt_ruler_id, tref_rt->manipulator_group) ||
+	    CTX_wm_region_view3d(C) == NULL)
+	{
+		return false;
+	}
+	return true;
+}
+
+static int view3d_ruler_add_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	View3D *v3d = CTX_wm_view3d(C);
+	RegionView3D *rv3d = ar->regiondata;
+
+	wmManipulatorMap *mmap = ar->manipulator_map;
+	wmManipulatorGroup *mgroup = WM_manipulatormap_group_find(mmap, view3d_wgt_ruler_id);
+	const bool use_depth = (v3d->drawtype >= OB_SOLID);
+
+	/* Create new line */
+	RulerItem *ruler_item;
+	ruler_item = ruler_item_add(mgroup);
+
+	/* This is a little weak, but there is no real good way to tweak directly. */
+	WM_manipulator_highlight_set(mmap, &ruler_item->mpr);
+	if (WM_operator_name_call(
+	        C, "MANIPULATORGROUP_OT_manipulator_tweak",
+	        WM_OP_INVOKE_REGION_WIN, NULL) == OPERATOR_RUNNING_MODAL)
+	{
+		RulerInfo *ruler_info = mgroup->customdata;
+		RulerInteraction *inter = ruler_item->mpr.interaction_data;
+		if (use_depth) {
+			/* snap the first point added, not essential but handy */
+			inter->co_index = 0;
+			view3d_ruler_item_mousemove(ruler_info, ruler_item, event->mval, false, true);
+			copy_v3_v3(inter->drag_start_co, ruler_item->co[inter->co_index]);
+		}
+		else {
+			negate_v3_v3(inter->drag_start_co, rv3d->ofs);
+			copy_v3_v3(ruler_item->co[0], inter->drag_start_co);
+			view3d_ruler_item_project(ruler_info, ruler_item->co[0], event->mval);
+		}
+
+		copy_v3_v3(ruler_item->co[2], ruler_item->co[0]);
+		ruler_item->mpr.highlight_part = inter->co_index = 2;
+	}
+	return OPERATOR_FINISHED;
+}
+
+void VIEW3D_OT_ruler_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Ruler Add";
+	ot->idname = "VIEW3D_OT_ruler_add";
+	ot->description = "";
+
+	ot->invoke = view3d_ruler_add_invoke;
+	ot->poll = view3d_ruler_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
+}
+
+/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 5734fba84b5..3b800c20ed2 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -45,6 +45,7 @@
 
 #include "BKE_appdir.h"
 #include "BKE_blender_copybuffer.h"
+#include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
@@ -80,12 +81,14 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	for (Group *group = bmain->group.first; group; group = group->id.next) {
-		for (GroupObject *go = group->gobject.first; go; go = go->next) {
-			if (go->ob && (go->ob->id.tag & LIB_TAG_DOIT)) {
-				BKE_copybuffer_tag_ID(&group->id);
+	for (Collection *collection = bmain->collection.first; collection; collection = collection->id.next) {
+		for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+			Object *object = cob->ob;
+
+			if (object && (object->id.tag & LIB_TAG_DOIT)) {
+				BKE_copybuffer_tag_ID(&collection->id);
 				/* don't expand out to all other objects */
-				group->id.tag &= ~LIB_TAG_NEED_EXPAND;
+				collection->id.tag &= ~LIB_TAG_NEED_EXPAND;
 				break;
 			}
 		}
@@ -119,8 +122,8 @@ static int view3d_pastebuffer_exec(bContext *C, wmOperator *op)
 
 	if (RNA_boolean_get(op->ptr, "autoselect"))
 		flag |= FILE_AUTOSELECT;
-	if (RNA_boolean_get(op->ptr, "active_layer"))
-		flag |= FILE_ACTIVELAY;
+	if (RNA_boolean_get(op->ptr, "active_collection"))
+		flag |= FILE_ACTIVE_COLLECTION;
 
 	BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
 	if (BKE_copybuffer_paste(C, str, flag, op->reports)) {
@@ -152,7 +155,7 @@ static void VIEW3D_OT_pastebuffer(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	RNA_def_boolean(ot->srna, "autoselect", true, "Select", "Select pasted objects");
-	RNA_def_boolean(ot->srna, "active_layer", true, "Active Layer", "Put pasted objects on the active layer");
+	RNA_def_boolean(ot->srna, "active_collection", true, "Active Collection", "Put pasted objects on the active collection");
 }
 
 /* ************************** registration **********************************/
@@ -193,16 +196,12 @@ void view3d_operatortypes(void)
 	WM_operatortype_append(VIEW3D_OT_render_border);
 	WM_operatortype_append(VIEW3D_OT_clear_render_border);
 	WM_operatortype_append(VIEW3D_OT_zoom_border);
-	WM_operatortype_append(VIEW3D_OT_manipulator);
-	WM_operatortype_append(VIEW3D_OT_enable_manipulator);
 	WM_operatortype_append(VIEW3D_OT_cursor3d);
 	WM_operatortype_append(VIEW3D_OT_select_lasso);
 	WM_operatortype_append(VIEW3D_OT_select_menu);
 	WM_operatortype_append(VIEW3D_OT_camera_to_view);
 	WM_operatortype_append(VIEW3D_OT_camera_to_view_selected);
 	WM_operatortype_append(VIEW3D_OT_object_as_camera);
-	WM_operatortype_append(VIEW3D_OT_localview);
-	WM_operatortype_append(VIEW3D_OT_game_start);
 	WM_operatortype_append(VIEW3D_OT_fly);
 	WM_operatortype_append(VIEW3D_OT_walk);
 	WM_operatortype_append(VIEW3D_OT_navigate);
@@ -223,6 +222,9 @@ void view3d_operatortypes(void)
 	WM_operatortype_append(VIEW3D_OT_snap_cursor_to_active);
 
 	WM_operatortype_append(VIEW3D_OT_toggle_render);
+	WM_operatortype_append(VIEW3D_OT_toggle_xray_draw_option);
+
+	WM_operatortype_append(VIEW3D_OT_ruler_add);
 
 	transform_operatortypes();
 }
@@ -240,24 +242,7 @@ void view3d_keymap(wmKeyConfig *keyconf)
 	/* only for region 3D window */
 	keymap = WM_keymap_find(keyconf, "3D View", SPACE_VIEW3D, 0);
 
-	/* Shift+LMB behavior first, so it has priority over KM_ANY item below. */
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", true);
-	RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-	RNA_boolean_set(kmi->ptr, "use_accurate", true);
-
-	/* Using KM_ANY here to allow holding modifiers before starting to transform. */
-	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
-	RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-	RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
-	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_CLICK, 0, 0);
 
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_rotate", MIDDLEMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_move", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0);
@@ -373,8 +358,6 @@ void view3d_keymap(wmKeyConfig *keyconf)
 	RNA_enum_set(kmi->ptr, "type", RV3D_VIEW_BOTTOM);
 	RNA_boolean_set(kmi->ptr, "align_active", true);
 
-	WM_keymap_add_item(keymap, "VIEW3D_OT_localview", PADSLASHKEY, KM_PRESS, 0, 0);
-
 #ifdef WITH_INPUT_NDOF
 	/* note: positioned here so keymaps show keyboard keys if assigned */
 	/* 3D mouse */
@@ -406,32 +389,17 @@ void view3d_keymap(wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "align_active", true);
 #endif /* WITH_INPUT_NDOF */
 
-	/* layers, shift + alt are properties set in invoke() */
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ACCENTGRAVEKEY, KM_PRESS, 0, 0)->ptr, "nr", 0);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ONEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 1);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", TWOKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 2);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", THREEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 3);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", FOURKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 4);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", FIVEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 5);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", SIXKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 6);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", SEVENKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 7);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", EIGHTKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 8);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", NINEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 9);
-	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ZEROKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 10);
-
 	/* drawtype */
-
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade");
-	RNA_string_set(kmi->ptr, "value_1", "SOLID");
-	RNA_string_set(kmi->ptr, "value_2", "WIREFRAME");
-
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, KM_ALT, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade");
+	RNA_string_set(kmi->ptr, "data_path", "space_data.shading.type");
 	RNA_string_set(kmi->ptr, "value_1", "SOLID");
 	RNA_string_set(kmi->ptr, "value_2", "TEXTURED");
 
 	WM_keymap_add_item(keymap, "VIEW3D_OT_toggle_render", ZKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "VIEW3D_OT_toggle_xray_draw_option", ZKEY, KM_PRESS, 0, 0);
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", ZKEY, KM_PRESS, 0, 0);
+	RNA_string_set(kmi->ptr, "data_path", "space_data.use_occlude_geometry");
 
 	/* selection*/
 	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
@@ -524,31 +492,32 @@ void view3d_keymap(wmKeyConfig *keyconf)
 
 	/* context ops */
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point");
 	RNA_string_set(kmi->ptr, "value", "BOUNDING_BOX_CENTER");
 
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); /* 2.4x allowed Comma+Shift too, rather not use both */
-	RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
+	/* 2.4x allowed Comma+Shift too, rather not use both */
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point");
 	RNA_string_set(kmi->ptr, "value", "MEDIAN_POINT");
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", COMMAKEY, KM_PRESS, KM_ALT, 0); /* new in 2.5 */
-	RNA_string_set(kmi->ptr, "data_path", "space_data.use_pivot_point_align");
-
-	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* new in 2.5 */
-	RNA_string_set(kmi->ptr, "data_path", "space_data.show_manipulator");
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_transform_pivot_point_align");
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point");
 	RNA_string_set(kmi->ptr, "value", "CURSOR");
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point");
 	RNA_string_set(kmi->ptr, "value", "INDIVIDUAL_ORIGINS");
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_ALT, 0);
-	RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point");
 	RNA_string_set(kmi->ptr, "value", "ACTIVE_ELEMENT");
 
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* new in 2.5 */
+	RNA_string_set(kmi->ptr, "data_path", "space_data.show_manipulator");
+
 	transform_keymap_for_space(keyconf, keymap, SPACE_VIEW3D);
 
 	fly_modal_keymap(keyconf);
diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c
index 767df04c0b0..30b91c1a8ee 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -36,14 +36,13 @@
 
 #include "BLI_sys_types.h"  /* int64_t */
 
-#include "BIF_gl.h"  /* bglMats */
-#include "BIF_glutil.h"  /* bglMats */
-
 #include "BLI_math_vector.h"
 
 #include "BKE_camera.h"
 #include "BKE_screen.h"
 
+#include "GPU_matrix.h"
+
 #include "ED_view3d.h"  /* own include */
 
 #define BL_NEAR_CLIP 0.001
@@ -315,6 +314,7 @@ float ED_view3d_calc_zfac(const RegionView3D *rv3d, const float co[3], bool *r_f
 }
 
 static void view3d_win_to_ray_segment(
+        struct Depsgraph *depsgraph,
         const ARegion *ar, const View3D *v3d, const float mval[2],
         float r_ray_co[3], float r_ray_dir[3], float r_ray_start[3], float r_ray_end[3])
 {
@@ -332,7 +332,7 @@ static void view3d_win_to_ray_segment(
 		start_offset = -end_offset;
 	}
 	else {
-		ED_view3d_clip_range_get(v3d, rv3d, &start_offset, &end_offset, false);
+		ED_view3d_clip_range_get(depsgraph, v3d, rv3d, &start_offset, &end_offset, false);
 	}
 
 	if (r_ray_start) {
@@ -371,12 +371,13 @@ bool ED_view3d_clip_segment(const RegionView3D *rv3d, float ray_start[3], float
  * \return success, false if the ray is totally clipped.
  */
 bool ED_view3d_win_to_ray_ex(
+        struct Depsgraph *depsgraph,
         const ARegion *ar, const View3D *v3d, const float mval[2],
         float r_ray_co[3], float r_ray_normal[3], float r_ray_start[3], bool do_clip)
 {
 	float ray_end[3];
 
-	view3d_win_to_ray_segment(ar, v3d, mval, r_ray_co, r_ray_normal, r_ray_start, ray_end);
+	view3d_win_to_ray_segment(depsgraph, ar, v3d, mval, r_ray_co, r_ray_normal, r_ray_start, ray_end);
 
 	/* bounds clipping */
 	if (do_clip) {
@@ -400,10 +401,11 @@ bool ED_view3d_win_to_ray_ex(
  * \return success, false if the ray is totally clipped.
  */
 bool ED_view3d_win_to_ray(
+        struct Depsgraph *depsgraph,
         const ARegion *ar, const View3D *v3d, const float mval[2],
         float r_ray_start[3], float r_ray_normal[3], const bool do_clip)
 {
-	return ED_view3d_win_to_ray_ex(ar, v3d, mval, NULL, r_ray_normal, r_ray_start, do_clip);
+	return ED_view3d_win_to_ray_ex(depsgraph, ar, v3d, mval, NULL, r_ray_normal, r_ray_start, do_clip);
 }
 
 /**
@@ -633,10 +635,11 @@ void ED_view3d_win_to_vector(const ARegion *ar, const float mval[2], float out[3
  * \param do_clip Optionally clip the ray by the view clipping planes.
  * \return success, false if the segment is totally clipped.
  */
-bool ED_view3d_win_to_segment(const ARegion *ar, View3D *v3d, const float mval[2],
+bool ED_view3d_win_to_segment(struct Depsgraph *depsgraph,
+                              const ARegion *ar, View3D *v3d, const float mval[2],
                               float r_ray_start[3], float r_ray_end[3], const bool do_clip)
 {
-	view3d_win_to_ray_segment(ar, v3d, mval, NULL, NULL, r_ray_start, r_ray_end);
+	view3d_win_to_ray_segment(depsgraph, ar, v3d, mval, NULL, NULL, r_ray_start, r_ray_end);
 
 	/* bounds clipping */
 	if (do_clip) {
@@ -666,16 +669,22 @@ void ED_view3d_ob_project_mat_get_from_obmat(const RegionView3D *rv3d, float obm
 }
 
 /**
- * Uses window coordinates (x,y) and depth component z to find a point in
- * modelspace */
-void ED_view3d_unproject(bglMats *mats, float out[3], const float x, const float y, const float z)
+ * Convert between region relative coordinates (x,y) and depth component z and
+ * a point in world space. */
+void ED_view3d_project(const struct ARegion *ar, const float world[3], float region[3])
 {
-	double ux, uy, uz;
+	// viewport is set up to make coordinates relative to the region, not window
+	RegionView3D *rv3d = ar->regiondata;
+	int viewport[4] = {0, 0, ar->winx, ar->winy};
 
-	gluUnProject(x, y, z, mats->modelview, mats->projection,
-	             (GLint *)mats->viewport, &ux, &uy, &uz);
+	gpuProject(world, rv3d->viewmat, rv3d->winmat, viewport, region);
+}
+
+bool ED_view3d_unproject(const struct ARegion *ar, float regionx, float regiony, float regionz, float world[3])
+{
+	RegionView3D *rv3d = ar->regiondata;
+	int viewport[4] = {0, 0, ar->winx, ar->winy};
+	float region[3] = {regionx, regiony, regionz};
 
-	out[0] = ux;
-	out[1] = uy;
-	out[2] = uz;
+	return gpuUnProject(region, rv3d->viewmat, rv3d->winmat, viewport, world);
 }
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index bcd4da94257..54579e93413 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -43,6 +43,9 @@
 
 #include "BIF_gl.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -279,7 +282,7 @@ static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state)
 	}
 	else if (state == RULER_STATE_DRAG) {
 		ruler_info->snap_context = ED_transform_snap_object_context_create_view3d(
-		        CTX_data_main(C), CTX_data_scene(C), 0,
+		        CTX_data_scene(C), CTX_data_depsgraph(C), 0,
 		        ruler_info->ar, CTX_wm_view3d(C));
 	}
 	else {
@@ -425,12 +428,11 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 #define ARC_STEPS 24
 	const int arc_steps = ARC_STEPS;
 	int i;
-	//unsigned int color_act = 0x666600;
-	unsigned int color_act = 0xffffff;
-	unsigned int color_base = 0x0;
-	unsigned char color_back[4] = {0xff, 0xff, 0xff, 0x80};
+	const float color_act[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+	const float color_base[4] = {0.0f, 0.0f, 0.0f, 1.0f};
 	unsigned char color_text[3];
 	unsigned char color_wire[3];
+	float color_back[4] = {1.0f, 1.0f, 1.0f, 0.5f};
 
 	/* anti-aliased lines for more consistent appearance */
 	glEnable(GL_LINE_SMOOTH);
@@ -455,28 +457,37 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 
 		glEnable(GL_BLEND);
 
-		cpack(is_act ? color_act : color_base);
+		const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
 		if (ruler_item->flag & RULERITEM_USE_ANGLE) {
-			glBegin(GL_LINE_STRIP);
-			for (j = 0; j < 3; j++) {
-				glVertex2fv(co_ss[j]);
-			}
-			glEnd();
-			cpack(0xaaaaaa);
-			setlinestyle(3);
-			glBegin(GL_LINE_STRIP);
-			for (j = 0; j < 3; j++) {
-				glVertex2fv(co_ss[j]);
-			}
-			glEnd();
-			setlinestyle(0);
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+			immUniform1i("num_colors", 2);  /* "advanced" mode */
+			const float *col = is_act ? color_act : color_base;
+			immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2);
+			immUniform1f("dash_width", 6.0f);
+
+			immBegin(GWN_PRIM_LINE_STRIP, 3);
+
+			immVertex2fv(shdr_pos, co_ss[0]);
+			immVertex2fv(shdr_pos, co_ss[1]);
+			immVertex2fv(shdr_pos, co_ss[2]);
+
+			immEnd();
+
+			immUnbindProgram();
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 			/* arc */
 			{
 				float dir_tmp[3];
 				float co_tmp[3];
-				float arc_ss_coords[ARC_STEPS + 1][2];
+				float arc_ss_coord[2];
 
 				float dir_a[3];
 				float dir_b[3];
@@ -500,46 +511,19 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 
 				copy_v3_v3(dir_tmp, dir_a);
 
-				glColor3ubv(color_wire);
+				immUniformColor3ubv(color_wire);
+
+				immBegin(GWN_PRIM_LINE_STRIP, arc_steps + 1);
 
 				for (j = 0; j <= arc_steps; j++) {
 					madd_v3_v3v3fl(co_tmp, ruler_item->co[1], dir_tmp, px_scale);
-					ED_view3d_project_float_global(ar, co_tmp, arc_ss_coords[j], V3D_PROJ_TEST_NOP);
+					ED_view3d_project_float_global(ar, co_tmp, arc_ss_coord, V3D_PROJ_TEST_NOP);
 					mul_qt_v3(quat, dir_tmp);
-				}
-
-				glEnableClientState(GL_VERTEX_ARRAY);
-				glVertexPointer(2, GL_FLOAT, 0, arc_ss_coords);
-				glDrawArrays(GL_LINE_STRIP, 0, arc_steps + 1);
-				glDisableClientState(GL_VERTEX_ARRAY);
-			}
-
-			/* text */
-			{
-				char numstr[256];
-				float numstr_size[2];
-				float pos[2];
-				const int prec = 2;  /* XXX, todo, make optional */
-
-				ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
 
-				BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
-
-				pos[0] = co_ss[1][0] + (cap_size * 2.0f);
-				pos[1] = co_ss[1][1] - (numstr_size[1] / 2.0f);
+					immVertex2fv(shdr_pos, arc_ss_coord);
+				}
 
-				/* draw text (bg) */
-				glColor4ubv(color_back);
-				UI_draw_roundbox_corner_set(UI_CNR_ALL);
-				UI_draw_roundbox(
-				        pos[0] - bg_margin,                  pos[1] - bg_margin,
-				        pos[0] + bg_margin + numstr_size[0], pos[1] + bg_margin + numstr_size[1],
-				        bg_radius);
-				/* draw text */
-				glColor3ubv(color_text);
-				BLF_position(blf_mono_font, pos[0], pos[1], 0.0f);
-				BLF_rotation(blf_mono_font, 0.0f);
-				BLF_draw(blf_mono_font, numstr, sizeof(numstr));
+				immEnd();
 			}
 
 			/* capping */
@@ -560,75 +544,84 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 
 				glEnable(GL_BLEND);
 
-				glColor3ubv(color_wire);
+				immUniformColor3ubv(color_wire);
 
-				glBegin(GL_LINES);
+				immBegin(GWN_PRIM_LINES, 8);
 
 				madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec_a, cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 				madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec_a, -cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 
 				madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec_b, cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 				madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec_b, -cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 
 				/* angle vertex */
-				glVertex2f(co_ss[1][0] - cap_size, co_ss[1][1] - cap_size);
-				glVertex2f(co_ss[1][0] + cap_size, co_ss[1][1] + cap_size);
-				glVertex2f(co_ss[1][0] - cap_size, co_ss[1][1] + cap_size);
-				glVertex2f(co_ss[1][0] + cap_size, co_ss[1][1] - cap_size);
-				glEnd();
+				immVertex2f(shdr_pos, co_ss[1][0] - cap_size, co_ss[1][1] - cap_size);
+				immVertex2f(shdr_pos, co_ss[1][0] + cap_size, co_ss[1][1] + cap_size);
+				immVertex2f(shdr_pos, co_ss[1][0] - cap_size, co_ss[1][1] + cap_size);
+				immVertex2f(shdr_pos, co_ss[1][0] + cap_size, co_ss[1][1] - cap_size);
+
+				immEnd();
 
 				glDisable(GL_BLEND);
 			}
-		}
-		else {
-			glBegin(GL_LINE_STRIP);
-			for (j = 0; j < 3; j += 2) {
-				glVertex2fv(co_ss[j]);
-			}
-			glEnd();
-			cpack(0xaaaaaa);
-			setlinestyle(3);
-			glBegin(GL_LINE_STRIP);
-			for (j = 0; j < 3; j += 2) {
-				glVertex2fv(co_ss[j]);
-			}
-			glEnd();
-			setlinestyle(0);
 
-			sub_v2_v2v2(dir_ruler, co_ss[0], co_ss[2]);
+			immUnbindProgram();
 
 			/* text */
 			{
 				char numstr[256];
 				float numstr_size[2];
-				const int prec = 6;  /* XXX, todo, make optional */
-				float pos[2];
+				float posit[2];
+				const int prec = 2;  /* XXX, todo, make optional */
 
 				ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
 
 				BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
 
-				mid_v2_v2v2(pos, co_ss[0], co_ss[2]);
-
-				/* center text */
-				pos[0] -= numstr_size[0] / 2.0f;
-				pos[1] -= numstr_size[1] / 2.0f;
+				posit[0] = co_ss[1][0] + (cap_size * 2.0f);
+				posit[1] = co_ss[1][1] - (numstr_size[1] / 2.0f);
 
 				/* draw text (bg) */
-				glColor4ubv(color_back);
 				UI_draw_roundbox_corner_set(UI_CNR_ALL);
-				UI_draw_roundbox(pos[0] - bg_margin,                  pos[1] - bg_margin,
-				           pos[0] + bg_margin + numstr_size[0], pos[1] + bg_margin + numstr_size[1],
-				           bg_radius);
+				UI_draw_roundbox_aa(true,
+				        posit[0] - bg_margin,                  posit[1] - bg_margin,
+				        posit[0] + bg_margin + numstr_size[0], posit[1] + bg_margin + numstr_size[1],
+				        bg_radius, color_back);
 				/* draw text */
-				glColor3ubv(color_text);
-				BLF_position(blf_mono_font, pos[0], pos[1], 0.0f);
+				BLF_color3ubv(blf_mono_font, color_text);
+				BLF_position(blf_mono_font, posit[0], posit[1], 0.0f);
+				BLF_rotation(blf_mono_font, 0.0f);
 				BLF_draw(blf_mono_font, numstr, sizeof(numstr));
 			}
+		}
+		else {
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+			immUniform1i("num_colors", 2);  /* "advanced" mode */
+			const float *col = is_act ? color_act : color_base;
+			immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2);
+			immUniform1f("dash_width", 6.0f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+
+			immVertex2fv(shdr_pos, co_ss[0]);
+			immVertex2fv(shdr_pos, co_ss[2]);
+
+			immEnd();
+
+			immUnbindProgram();
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+			sub_v2_v2v2(dir_ruler, co_ss[0], co_ss[2]);
 
 			/* capping */
 			{
@@ -638,22 +631,56 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 				normalize_v2(rot_90_vec);
 
 				glEnable(GL_BLEND);
-				glColor3ubv(color_wire);
 
-				glBegin(GL_LINES);
+				immUniformColor3ubv(color_wire);
+
+				immBegin(GWN_PRIM_LINES, 4);
+
 				madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec, cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 				madd_v2_v2v2fl(cap, co_ss[0], rot_90_vec, -cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 
 				madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec, cap_size);
-				glVertex2fv(cap);
+				immVertex2fv(shdr_pos, cap);
 				madd_v2_v2v2fl(cap, co_ss[2], rot_90_vec, -cap_size);
-				glVertex2fv(cap);
-				glEnd();
+				immVertex2fv(shdr_pos, cap);
+
+				immEnd();
 
 				glDisable(GL_BLEND);
 			}
+
+			immUnbindProgram();
+
+			/* text */
+			{
+				char numstr[256];
+				float numstr_size[2];
+				const int prec = 6;  /* XXX, todo, make optional */
+				float posit[2];
+
+				ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
+
+				BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
+
+				mid_v2_v2v2(posit, co_ss[0], co_ss[2]);
+
+				/* center text */
+				posit[0] -= numstr_size[0] / 2.0f;
+				posit[1] -= numstr_size[1] / 2.0f;
+
+				/* draw text (bg) */
+				UI_draw_roundbox_corner_set(UI_CNR_ALL);
+				UI_draw_roundbox_aa(true,
+				           posit[0] - bg_margin,                  posit[1] - bg_margin,
+				           posit[0] + bg_margin + numstr_size[0], posit[1] + bg_margin + numstr_size[1],
+				           bg_radius, color_back);
+				/* draw text */
+				BLF_color3ubv(blf_mono_font, color_text);
+				BLF_position(blf_mono_font, posit[0], posit[1], 0.0f);
+				BLF_draw(blf_mono_font, numstr, sizeof(numstr));
+			}
 		}
 	}
 
@@ -672,8 +699,14 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 			float co_ss[3];
 			ED_view3d_project_float_global(ar, ruler_item->co[ruler_item->co_index], co_ss, V3D_PROJ_TEST_NOP);
 
-			cpack(color_act);
-			circ(co_ss[0], co_ss[1], size * U.pixelsize);
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			immUniformColor4fv(color_act);
+
+			imm_draw_circle_wire_2d(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32);
+
+			immUnbindProgram();
 		}
 	}
 
@@ -728,14 +761,14 @@ static bool view3d_ruler_item_mousemove(
 
 			co_other = ruler_item->co[ruler_item->co_index == 0 ? 2 : 0];
 
-			if (ED_transform_snap_object_project_view3d_mixed(
+			if (ED_transform_snap_object_project_view3d(
 			        ruler_info->snap_context,
-			        SCE_SELECT_FACE,
+			        SCE_SNAP_MODE_FACE,
 			        &(const struct SnapObjectParams){
 			            .snap_select = SNAP_ALL,
 			            .use_object_edit_cage = true,
 			        },
-			        mval_fl, &dist_px, true,
+			        mval_fl, &dist_px,
 			        co, ray_normal))
 			{
 				negate_v3(ray_normal);
@@ -752,19 +785,17 @@ static bool view3d_ruler_item_mousemove(
 			}
 		}
 		else if (do_snap) {
-			// Scene *scene = CTX_data_scene(C);
-			View3D *v3d = ruler_info->sa->spacedata.first;
 			const float mval_fl[2] = {UNPACK2(mval)};
-			bool use_depth = (v3d->drawtype >= OB_SOLID);
 
-			if (ED_transform_snap_object_project_view3d_mixed(
+			if (ED_transform_snap_object_project_view3d(
 			        ruler_info->snap_context,
-			        (SCE_SELECT_VERTEX | SCE_SELECT_EDGE) | (use_depth ? SCE_SELECT_FACE : 0),
+			        (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE | SCE_SNAP_MODE_FACE),
 			        &(const struct SnapObjectParams){
 			            .snap_select = SNAP_ALL,
 			            .use_object_edit_cage = true,
+			            .use_occlusion_test = true,
 			        },
-			        mval_fl, &dist_px, use_depth,
+			        mval_fl, &dist_px,
 			        co, NULL))
 			{
 				ruler_info->snap_flag |= RULER_SNAP_OK;
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 06481231259..2a3e463d922 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -47,6 +47,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_array.h"
 #include "BLI_math.h"
 #include "BLI_lasso_2d.h"
 #include "BLI_rect.h"
@@ -55,6 +56,10 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#ifdef __BIG_ENDIAN__
+#  include "BLI_endian_switch.h"
+#endif
+
 /* vertex box select */
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
@@ -63,16 +68,16 @@
 #include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
+#include "BKE_layer.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_editmesh.h"
+#include "BKE_scene.h"
 #include "BKE_tracking.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "DEG_depsgraph.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -94,6 +99,8 @@
 #include "UI_interface.h"
 
 #include "GPU_draw.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
 
 #include "view3d_intern.h"  /* own include */
 
@@ -109,7 +116,9 @@ void ED_view3d_viewcontext_init(bContext *C, ViewContext *vc)
 {
 	memset(vc, 0, sizeof(ViewContext));
 	vc->ar = CTX_wm_region(C);
+	vc->depsgraph = CTX_data_depsgraph(C);
 	vc->scene = CTX_data_scene(C);
+	vc->view_layer = CTX_data_view_layer(C);
 	vc->v3d = CTX_wm_view3d(C);
 	vc->win = CTX_wm_window(C);
 	vc->rv3d = CTX_wm_region_view3d(C);
@@ -117,32 +126,19 @@ void ED_view3d_viewcontext_init(bContext *C, ViewContext *vc)
 	vc->obedit = CTX_data_edit_object(C);
 }
 
-/*
- * ob == NULL if you want global matrices
- * */
-void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob, bglMats *mats)
+void ED_view3d_viewcontext_init_object(ViewContext *vc, Object *obact)
 {
-	float cpy[4][4];
-	int i, j;
-
-	if (ob) {
-		mul_m4_m4m4(cpy, rv3d->viewmat, ob->obmat);
-	}
-	else {
-		copy_m4_m4(cpy, rv3d->viewmat);
-	}
+	vc->obact = obact;
+	if (vc->obedit) {
+		BLI_assert(BKE_object_is_in_editmode(obact));
+		vc->obedit = obact;
+		/* previous selections are now invalid. */
+		vc->v3d->flag |= V3D_INVALID_BACKBUF;
 
-	for (i = 0; i < 4; ++i) {
-		for (j = 0; j < 4; ++j) {
-			mats->projection[i * 4 + j] = rv3d->winmat[i][j];
-			mats->modelview[i * 4 + j] = cpy[i][j];
+		if (vc->em) {
+			vc->em = BKE_editmesh_from_object(vc->obedit);
 		}
 	}
-
-	mats->viewport[0] = ar->winrct.xmin;
-	mats->viewport[1] = ar->winrct.ymin;
-	mats->viewport[2] = ar->winx;
-	mats->viewport[3] = ar->winy;
 }
 
 /* ********************** view3d_select: selection manipulations ********************* */
@@ -397,18 +393,20 @@ static void do_lasso_select_pose(ViewContext *vc, Object *ob, const int mcords[]
 		bArmature *arm = ob->data;
 		if (arm->flag & ARM_HAS_VIZ_DEPS) {
 			/* mask modifier ('armature' mode), etc. */
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
+		/* bone selection status is on armature not object */
+		DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 	}
 }
 
-static void object_deselect_all_visible(Scene *scene, View3D *v3d)
+static void object_deselect_all_visible(ViewLayer *view_layer)
 {
 	Base *base;
 
-	for (base = scene->base.first; base; base = base->next) {
-		if (BASE_SELECTABLE(v3d, base)) {
-			ED_base_object_select(base, BA_DESELECT);
+	for (base = view_layer->object_bases.first; base; base = base->next) {
+		if (BASE_SELECTABLE(base)) {
+			ED_object_base_select(base, BA_DESELECT);
 		}
 	}
 }
@@ -417,21 +415,26 @@ static void do_lasso_select_objects(
         ViewContext *vc, const int mcords[][2], const short moves,
         const bool extend, const bool select)
 {
+	bool is_pose_mode = vc->obact ? (vc->obact->mode & OB_MODE_POSE) : false;
 	Base *base;
 
 	if (extend == false && select)
-		object_deselect_all_visible(vc->scene, vc->v3d);
+		object_deselect_all_visible(vc->view_layer);
 
-	for (base = vc->scene->base.first; base; base = base->next) {
-		if (BASE_SELECTABLE(vc->v3d, base)) { /* use this to avoid un-needed lasso lookups */
-			if (ED_view3d_project_base(vc->ar, base) == V3D_PROJ_RET_OK) {
+	for (base = vc->view_layer->object_bases.first; base; base = base->next) {
+		if (BASE_SELECTABLE(base)) { /* use this to avoid un-needed lasso lookups */
+			if (
+#ifdef USE_OBJECT_MODE_STRICT
+			    (is_pose_mode == false) &&
+#endif
+			    ED_view3d_project_base(vc->ar, base) == V3D_PROJ_RET_OK)
+			{
 				if (BLI_lasso_is_point_inside(mcords, moves, base->sx, base->sy, IS_CLIPPED)) {
 
-					ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT);
-					base->object->flag = base->flag;
+					ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT);
 				}
 			}
-			if (vc->obact == base->object && (base->object->mode & OB_MODE_POSE)) {
+			if (is_pose_mode && (base->object->mode & OB_MODE_POSE)) {
 				do_lasso_select_pose(vc, base->object, mcords, moves, select);
 			}
 		}
@@ -486,7 +489,9 @@ static void do_lasso_select_mesh__doSelectFace(void *userData, BMFace *efa, cons
 	}
 }
 
-static void do_lasso_select_mesh(ViewContext *vc, const int mcords[][2], short moves, bool extend, bool select)
+static void do_lasso_select_mesh(
+        ViewContext *vc,
+        const int mcords[][2], short moves, bool extend, bool select)
 {
 	LassoSelectUserData data;
 	ToolSettings *ts = vc->scene->toolsettings;
@@ -506,7 +511,7 @@ static void do_lasso_select_mesh(ViewContext *vc, const int mcords[][2], short m
 	/* for non zbuf projections, don't change the GL state */
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
 
-	glLoadMatrixf(vc->rv3d->viewmat);
+	gpuLoadMatrix(vc->rv3d->viewmat);
 	bbsel = EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
@@ -541,8 +546,7 @@ static void do_lasso_select_mesh(ViewContext *vc, const int mcords[][2], short m
 	EDBM_selectmode_flush(vc->em);
 }
 
-static void do_lasso_select_curve__doSelect(
-        void *userData, Nurb *UNUSED(nu), BPoint *bp, BezTriple *bezt, int beztindex, const float screen_co[2])
+static void do_lasso_select_curve__doSelect(void *userData, Nurb *UNUSED(nu), BPoint *bp, BezTriple *bezt, int beztindex, const float screen_co[2])
 {
 	LassoSelectUserData *data = userData;
 	Object *obedit = data->vc->obedit;
@@ -617,8 +621,7 @@ static void do_lasso_select_lattice(ViewContext *vc, const int mcords[][2], shor
 	lattice_foreachScreenVert(vc, do_lasso_select_lattice__doSelect, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
 }
 
-static void do_lasso_select_armature__doSelectBone(
-        void *userData, struct EditBone *ebone, const float screen_co_a[2], const float screen_co_b[2])
+static void do_lasso_select_armature__doSelectBone(void *userData, struct EditBone *ebone, const float screen_co_a[2], const float screen_co_b[2])
 {
 	LassoSelectUserData *data = userData;
 	bArmature *arm = data->vc->obedit->data;
@@ -724,8 +727,7 @@ static void do_lasso_select_meta(ViewContext *vc, const int mcords[][2], short m
 	mball_foreachScreenElem(vc, do_lasso_select_mball__doSelectElem, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
 }
 
-static void do_lasso_select_meshobject__doSelectVert(
-        void *userData, MVert *mv, const float screen_co[2], int UNUSED(index))
+static void do_lasso_select_meshobject__doSelectVert(void *userData, MVert *mv, const float screen_co[2], int UNUSED(index))
 {
 	LassoSelectUserData *data = userData;
 
@@ -838,44 +840,53 @@ static void view3d_lasso_select(
 	Object *ob = CTX_data_active_object(C);
 
 	if (vc->obedit == NULL) { /* Object Mode */
-		if (BKE_paint_select_face_test(ob))
+		if (BKE_paint_select_face_test(ob)) {
 			do_lasso_select_paintface(vc, mcords, moves, extend, select);
-		else if (BKE_paint_select_vert_test(ob))
+		}
+		else if (BKE_paint_select_vert_test(ob)) {
 			do_lasso_select_paintvert(vc, mcords, moves, extend, select);
+		}
 		else if (ob && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
 			/* pass */
 		}
-		else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT))
+		else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
 			PE_lasso_select(C, mcords, moves, extend, select);
+		}
 		else {
 			do_lasso_select_objects(vc, mcords, moves, extend, select);
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 		}
 	}
 	else { /* Edit Mode */
-		switch (vc->obedit->type) {
-			case OB_MESH:
-				do_lasso_select_mesh(vc, mcords, moves, extend, select);
-				break;
-			case OB_CURVE:
-			case OB_SURF:
-				do_lasso_select_curve(vc, mcords, moves, extend, select);
-				break;
-			case OB_LATTICE:
-				do_lasso_select_lattice(vc, mcords, moves, extend, select);
-				break;
-			case OB_ARMATURE:
-				do_lasso_select_armature(vc, mcords, moves, extend, select);
-				break;
-			case OB_MBALL:
-				do_lasso_select_meta(vc, mcords, moves, extend, select);
-				break;
-			default:
-				assert(!"lasso select on incorrect object type");
-				break;
-		}
 
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc->obedit->data);
+		FOREACH_OBJECT_IN_MODE_BEGIN (vc->view_layer, ob->mode, ob_iter) {
+			ED_view3d_viewcontext_init_object(vc, ob_iter);
+
+			switch (vc->obedit->type) {
+				case OB_MESH:
+					do_lasso_select_mesh(vc, mcords, moves, extend, select);
+					break;
+				case OB_CURVE:
+				case OB_SURF:
+					do_lasso_select_curve(vc, mcords, moves, extend, select);
+					break;
+				case OB_LATTICE:
+					do_lasso_select_lattice(vc, mcords, moves, extend, select);
+					break;
+				case OB_ARMATURE:
+					do_lasso_select_armature(vc, mcords, moves, extend, select);
+					break;
+				case OB_MBALL:
+					do_lasso_select_meta(vc, mcords, moves, extend, select);
+					break;
+				default:
+					assert(!"lasso select on incorrect object type");
+					break;
+			}
+
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc->obedit->data);
+		}
+		FOREACH_OBJECT_IN_MODE_END;
 	}
 }
 
@@ -973,8 +984,8 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 	if (!toggle) {
 		CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 		{
-			if (base->flag & SELECT) {
-				ED_base_object_select(base, BA_DESELECT);
+			if ((base->flag & BASE_SELECTED) != 0) {
+				ED_object_base_select(base, BA_DESELECT);
 				changed = true;
 			}
 		}
@@ -985,8 +996,8 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 	{
 		/* this is a bit dodjy, there should only be ONE object with this name, but library objects can mess this up */
 		if (STREQ(name, base->object->id.name + 2)) {
-			ED_base_object_activate(C, base);
-			ED_base_object_select(base, BA_SELECT);
+			ED_object_base_activate(C, base);
+			ED_object_base_select(base, BA_SELECT);
 			changed = true;
 		}
 	}
@@ -1030,14 +1041,12 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "Toggle selection instead of deselecting everything first");
 }
 
-static void deselectall_except(Scene *scene, Base *b)   /* deselect all except b */
+static void deselectall_except(ViewLayer *view_layer, Base *b)   /* deselect all except b */
 {
-	Base *base;
-
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (base->flag & SELECT) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		if (base->flag & BASE_SELECTED) {
 			if (b != base) {
-				ED_base_object_select(base, BA_DESELECT);
+				ED_object_base_select(base, BA_DESELECT);
 			}
 		}
 	}
@@ -1051,6 +1060,7 @@ static Base *object_mouse_select_menu(
 	bool ok;
 	LinkNode *linklist = NULL;
 
+	/* handle base->object->select_color */
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		ok = false;
@@ -1059,7 +1069,7 @@ static Base *object_mouse_select_menu(
 		if (buffer) {
 			for (int a = 0; a < hits; a++) {
 				/* index was converted */
-				if (base->selcol == (buffer[(4 * a) + 3] & ~0xFFFF0000)) {
+				if (base->object->select_color == (buffer[(4 * a) + 3] & ~0xFFFF0000)) {
 					ok = true;
 					break;
 				}
@@ -1241,6 +1251,25 @@ static int mixed_bones_object_selectbuffer(
 finally:
 	view3d_opengl_select_cache_end();
 
+#ifdef USE_OBJECT_MODE_STRICT
+	{
+		const bool is_pose_mode = (vc->obact && vc->obact->mode & OB_MODE_POSE);
+		struct {
+			uint data[4];
+		} *buffer4 = (void *)buffer;
+		uint j = 0;
+		for (uint i = 0; i < hits; i++) {
+			if (((buffer4[i].data[3] & 0xFFFF0000) != 0) == is_pose_mode) {
+				if (i != j) {
+					buffer4[i] = buffer4[j];
+				}
+				j++;
+			}
+		}
+		hits = j;
+	}
+#endif
+
 	return hits;
 }
 
@@ -1249,8 +1278,7 @@ static Base *mouse_select_eval_buffer(
         ViewContext *vc, const uint *buffer, int hits,
         Base *startbase, bool has_bones, bool do_nearest)
 {
-	Scene *scene = vc->scene;
-	View3D *v3d = vc->v3d;
+	ViewLayer *view_layer = vc->view_layer;
 	Base *base, *basact = NULL;
 	int a;
 
@@ -1270,7 +1298,9 @@ static Base *mouse_select_eval_buffer(
 		}
 		else {
 			/* only exclude active object when it is selected... */
-			if (BASACT && (BASACT->flag & SELECT) && hits > 1) notcol = BASACT->selcol;
+			if (BASACT(view_layer) && (BASACT(view_layer)->flag & BASE_SELECTED) && hits > 1) {
+				notcol = BASACT(view_layer)->object->select_color;
+			}
 
 			for (a = 0; a < hits; a++) {
 				if (min > buffer[4 * a + 1] && notcol != (buffer[4 * a + 3] & 0xFFFF)) {
@@ -1280,10 +1310,10 @@ static Base *mouse_select_eval_buffer(
 			}
 		}
 
-		base = FIRSTBASE;
+		base = FIRSTBASE(view_layer);
 		while (base) {
-			if (BASE_SELECTABLE(v3d, base)) {
-				if (base->selcol == selcol) break;
+			if (BASE_SELECTABLE(base)) {
+				if (base->object->select_color == selcol) break;
 			}
 			base = base->next;
 		}
@@ -1295,23 +1325,23 @@ static Base *mouse_select_eval_buffer(
 		while (base) {
 			/* skip objects with select restriction, to prevent prematurely ending this loop
 			 * with an un-selectable choice */
-			if (base->object->restrictflag & OB_RESTRICT_SELECT) {
+			if ((base->flag & BASE_SELECTABLED) == 0) {
 				base = base->next;
-				if (base == NULL) base = FIRSTBASE;
+				if (base == NULL) base = FIRSTBASE(view_layer);
 				if (base == startbase) break;
 			}
 
-			if (BASE_SELECTABLE(v3d, base)) {
+			if (BASE_SELECTABLE(base)) {
 				for (a = 0; a < hits; a++) {
 					if (has_bones) {
 						/* skip non-bone objects */
 						if ((buffer[4 * a + 3] & 0xFFFF0000)) {
-							if (base->selcol == (buffer[(4 * a) + 3] & 0xFFFF))
+							if (base->object->select_color == (buffer[(4 * a) + 3] & 0xFFFF))
 								basact = base;
 						}
 					}
 					else {
-						if (base->selcol == (buffer[(4 * a) + 3] & 0xFFFF))
+						if (base->object->select_color == (buffer[(4 * a) + 3] & 0xFFFF))
 							basact = base;
 					}
 				}
@@ -1320,7 +1350,7 @@ static Base *mouse_select_eval_buffer(
 			if (basact) break;
 
 			base = base->next;
-			if (base == NULL) base = FIRSTBASE;
+			if (base == NULL) base = FIRSTBASE(view_layer);
 			if (base == startbase) break;
 		}
 	}
@@ -1339,13 +1369,14 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const int mval[2])
 
 	/* setup view context for argument to callbacks */
 	view3d_operator_needs_opengl(C);
+
 	ED_view3d_viewcontext_init(C, &vc);
 
 	hits = mixed_bones_object_selectbuffer(&vc, buffer, mval, false, false, &do_nearest);
 
 	if (hits > 0) {
 		const bool has_bones = selectbuffer_has_bones(buffer, hits);
-		basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.scene->base.first, has_bones, do_nearest);
+		basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.view_layer->object_bases.first, has_bones, do_nearest);
 	}
 
 	return basact;
@@ -1377,16 +1408,16 @@ static bool ed_object_select_pick(
 {
 	ViewContext vc;
 	ARegion *ar = CTX_wm_region(C);
-	View3D *v3d = CTX_wm_view3d(C);
 	Scene *scene = CTX_data_scene(C);
-	Base *base, *startbase = NULL, *basact = NULL, *oldbasact = NULL;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Base *base, *startbase = NULL, *basact = NULL, *oldbasact = BASACT(view_layer);
+	const eObjectMode object_mode = oldbasact ? oldbasact->object->mode : OB_MODE_OBJECT;
 	bool is_obedit;
 	float dist = ED_view3d_select_dist_px() * 1.3333f;
 	bool retval = false;
 	int hits;
 	const float mval_fl[2] = {(float)mval[0], (float)mval[1]};
 
-
 	/* setup view context for argument to callbacks */
 	ED_view3d_viewcontext_init(C, &vc);
 
@@ -1396,9 +1427,12 @@ static bool ed_object_select_pick(
 		vc.obedit = NULL;
 	}
 
+	/* In pose mode we don't want to mess with object selection. */
+	const bool is_pose_mode = (vc.obact && vc.obact->mode & OB_MODE_POSE);
+
 	/* always start list from basact in wire mode */
-	startbase =  FIRSTBASE;
-	if (BASACT && BASACT->next) startbase = BASACT->next;
+	startbase =  FIRSTBASE(view_layer);
+	if (BASACT(view_layer) && BASACT(view_layer)->next) startbase = BASACT(view_layer)->next;
 
 	/* This block uses the control key to make the object selected by its center point rather than its contents */
 	/* in editmode do not activate */
@@ -1411,14 +1445,14 @@ static bool ed_object_select_pick(
 		else {
 			base = startbase;
 			while (base) {
-				if (BASE_SELECTABLE(v3d, base)) {
+				if (BASE_SELECTABLE(base)) {
 					float screen_co[2];
 					if (ED_view3d_project_float_global(
 					            ar, base->object->obmat[3], screen_co,
 					            V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
 					{
 						float dist_temp = len_manhattan_v2v2(mval_fl, screen_co);
-						if (base == BASACT) dist_temp += 10.0f;
+						if (base == BASACT(view_layer)) dist_temp += 10.0f;
 						if (dist_temp < dist) {
 							dist = dist_temp;
 							basact = base;
@@ -1427,10 +1461,23 @@ static bool ed_object_select_pick(
 				}
 				base = base->next;
 
-				if (base == NULL) base = FIRSTBASE;
+				if (base == NULL) base = FIRSTBASE(view_layer);
 				if (base == startbase) break;
 			}
 		}
+#ifdef USE_OBJECT_MODE_STRICT
+		if (is_obedit == false) {
+			if (basact && !BKE_object_is_mode_compat(basact->object, object_mode)) {
+				if (object_mode == OB_MODE_OBJECT) {
+					struct Main *bmain = CTX_data_main(C);
+					ED_object_mode_generic_exit(bmain, vc.depsgraph, scene, basact->object);
+				}
+				if (!BKE_object_is_mode_compat(basact->object, object_mode)) {
+					basact = NULL;
+				}
+			}
+		}
+#endif
 	}
 	else {
 		unsigned int buffer[MAXPICKBUF];
@@ -1455,9 +1502,23 @@ static bool ed_object_select_pick(
 				basact = mouse_select_eval_buffer(&vc, buffer, hits, startbase, has_bones, do_nearest);
 			}
 
+#ifdef USE_OBJECT_MODE_STRICT
+			if (is_obedit == false) {
+				if (basact && !BKE_object_is_mode_compat(basact->object, object_mode)) {
+					if (object_mode == OB_MODE_OBJECT) {
+						struct Main *bmain = CTX_data_main(C);
+						ED_object_mode_generic_exit(bmain, vc.depsgraph, scene, basact->object);
+					}
+					if (!BKE_object_is_mode_compat(basact->object, object_mode)) {
+						basact = NULL;
+					}
+				}
+			}
+#endif
+
 			if (has_bones && basact) {
 				if (basact->object->type == OB_CAMERA) {
-					if (BASACT == basact) {
+					if (BASACT(view_layer) == basact) {
 						int i, hitresult;
 						bool changed = false;
 
@@ -1466,7 +1527,7 @@ static bool ed_object_select_pick(
 
 							/* if there's bundles in buffer select bundles first,
 							 * so non-camera elements should be ignored in buffer */
-							if (basact->selcol != (hitresult & 0xFFFF)) {
+							if (basact->object->select_color != (hitresult & 0xFFFF)) {
 								continue;
 							}
 
@@ -1495,8 +1556,8 @@ static bool ed_object_select_pick(
 										changed = true;
 								}
 
-								basact->flag |= SELECT;
-								basact->object->flag = basact->flag;
+								basact->flag |= BASE_SELECTED;
+								BKE_scene_object_base_flag_sync_from_base(basact);
 
 								retval = true;
 
@@ -1515,70 +1576,84 @@ static bool ed_object_select_pick(
 					}
 				}
 				else if (ED_armature_pose_select_pick_with_buffer(
-				                 scene, basact, buffer, hits, extend, deselect, toggle, do_nearest))
+				                 view_layer, basact, buffer, hits, extend, deselect, toggle, do_nearest))
 				{
 					/* then bone is found */
 
 					/* we make the armature selected:
 					 * not-selected active object in posemode won't work well for tools */
-					basact->flag |= SELECT;
-					basact->object->flag = basact->flag;
+					basact->flag |= BASE_SELECTED;
+					BKE_scene_object_base_flag_sync_from_base(basact);
 
 					retval = true;
 					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, basact->object);
 					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, basact->object);
 
 					/* in weightpaint, we use selected bone to select vertexgroup, so no switch to new active object */
-					if (BASACT && (BASACT->object->mode & OB_MODE_WEIGHT_PAINT)) {
+					if (BASACT(view_layer) && (BASACT(view_layer)->object->mode & OB_MODE_WEIGHT_PAINT)) {
 						/* prevent activating */
 						basact = NULL;
 					}
 
 				}
 				/* prevent bone selecting to pass on to object selecting */
-				if (basact == BASACT)
+				if (basact == BASACT(view_layer))
 					basact = NULL;
 			}
 		}
 	}
 
+#ifdef USE_OBJECT_MODE_STRICT
+	/* Disallow switching modes,
+	 * special exception for edit-mode - vertex-parent operator. */
+	if (is_obedit == false) {
+		if (oldbasact && basact) {
+			if ((oldbasact->object->mode != basact->object->mode) &&
+			    (oldbasact->object->mode & basact->object->mode) == 0)
+			{
+				basact = NULL;
+			}
+		}
+	}
+#endif
+
 	/* so, do we have something selected? */
 	if (basact) {
 		retval = true;
 
 		if (vc.obedit) {
 			/* only do select */
-			deselectall_except(scene, basact);
-			ED_base_object_select(basact, BA_SELECT);
+			deselectall_except(view_layer, basact);
+			ED_object_base_select(basact, BA_SELECT);
 		}
 		/* also prevent making it active on mouse selection */
-		else if (BASE_SELECTABLE(v3d, basact)) {
-
-			oldbasact = BASACT;
-
+		else if (BASE_SELECTABLE(basact)) {
 			if (extend) {
-				ED_base_object_select(basact, BA_SELECT);
+				ED_object_base_select(basact, BA_SELECT);
 			}
 			else if (deselect) {
-				ED_base_object_select(basact, BA_DESELECT);
+				ED_object_base_select(basact, BA_DESELECT);
 			}
 			else if (toggle) {
-				if (basact->flag & SELECT) {
+				if (basact->flag & BASE_SELECTED) {
 					if (basact == oldbasact) {
-						ED_base_object_select(basact, BA_DESELECT);
+						ED_object_base_select(basact, BA_DESELECT);
 					}
 				}
 				else {
-					ED_base_object_select(basact, BA_SELECT);
+					ED_object_base_select(basact, BA_SELECT);
 				}
 			}
 			else {
-				deselectall_except(scene, basact);
-				ED_base_object_select(basact, BA_SELECT);
+				/* When enabled, this puts other objects out of multi pose-mode. */
+				if (is_pose_mode == false) {
+					deselectall_except(view_layer, basact);
+					ED_object_base_select(basact, BA_SELECT);
+				}
 			}
 
 			if ((oldbasact != basact) && (is_obedit == false)) {
-				ED_base_object_activate(C, basact); /* adds notifier */
+				ED_object_base_activate(C, basact); /* adds notifier */
 			}
 		}
 
@@ -1635,7 +1710,8 @@ static void do_paintvert_box_select__doSelectVert(void *userData, MVert *mv, con
 		SET_FLAG_FROM_TEST(mv->flag, data->select, SELECT);
 	}
 }
-static int do_paintvert_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
+static int do_paintvert_box_select(
+        ViewContext *vc, rcti *rect, bool select, bool extend)
 {
 	const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0;
 	Mesh *me;
@@ -1824,7 +1900,8 @@ static void do_mesh_box_select__doSelectFace(void *userData, BMFace *efa, const
 		BM_face_select_set(data->vc->em->bm, efa, data->select);
 	}
 }
-static int do_mesh_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
+static int do_mesh_box_select(
+        ViewContext *vc, rcti *rect, bool select, bool extend)
 {
 	BoxSelectUserData data;
 	ToolSettings *ts = vc->scene->toolsettings;
@@ -1838,7 +1915,7 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, bool select, bool ext
 	/* for non zbuf projections, don't change the GL state */
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
 
-	glLoadMatrixf(vc->rv3d->viewmat);
+	gpuLoadMatrix(vc->rv3d->viewmat);
 	bbsel = EDBM_backbuf_border_init(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
@@ -1877,7 +1954,9 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, bool select, bool ext
 	return OPERATOR_FINISHED;
 }
 
-static int do_meta_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
+static int do_meta_box_select(
+        ViewContext *vc,
+        const rcti *rect, bool select, bool extend)
 {
 	MetaBall *mb = (MetaBall *)vc->obedit->data;
 	MetaElem *ml;
@@ -1911,9 +1990,10 @@ static int do_meta_box_select(ViewContext *vc, rcti *rect, bool select, bool ext
 	return OPERATOR_FINISHED;
 }
 
-static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
+static int do_armature_box_select(
+        ViewContext *vc,
+        const rcti *rect, bool select, bool extend)
 {
-	bArmature *arm = vc->obedit->data;
 	int a;
 
 	unsigned int buffer[MAXPICKBUF];
@@ -1921,12 +2001,21 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool
 
 	hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, rect, VIEW3D_SELECT_ALL);
 
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc->view_layer, &objects_len);
+
 	/* clear flag we use to detect point was affected */
-	for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next)
-		ebone->flag &= ~BONE_DONE;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		bArmature *arm = obedit->data;
+		for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+			ebone->flag &= ~BONE_DONE;
+		}
+	}
 
-	if (extend == false && select)
-		ED_armature_edit_deselect_all_visible(vc->obedit);
+	if (extend == false && select) {
+		ED_armature_edit_deselect_all_visible_multi(objects, objects_len);
+	}
 
 	/* first we only check points inside the border */
 	for (a = 0; a < hits; a++) {
@@ -1935,7 +2024,9 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool
 			if ((index & 0xFFFF0000) == 0) {
 				continue;
 			}
-			EditBone *ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
+
+			EditBone *ebone;
+			ED_armature_object_and_ebone_from_select_buffer(objects, objects_len, index, &ebone);
 			if ((select == false) || ((ebone->flag & BONE_UNSELECTABLE) == 0)) {
 				if (index & BONESEL_TIP) {
 					ebone->flag |= BONE_DONE;
@@ -1953,10 +2044,14 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool
 	}
 
 	/* now we have to flush tag from parents... */
-	for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next) {
-		if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
-			if (ebone->parent->flag & BONE_DONE) {
-				ebone->flag |= BONE_DONE;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		bArmature *arm = obedit->data;
+		for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+			if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
+				if (ebone->parent->flag & BONE_DONE) {
+					ebone->flag |= BONE_DONE;
+				}
 			}
 		}
 	}
@@ -1966,7 +2061,8 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool
 		int index = buffer[(4 * a) + 3];
 		if (index != -1) {
 			if (index & BONESEL_BONE) {
-				EditBone *ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
+				EditBone *ebone;
+				ED_armature_object_and_ebone_from_select_buffer(objects, objects_len, index, &ebone);
 				if ((select == false) || ((ebone->flag & BONE_UNSELECTABLE) == 0)) {
 					if (!(ebone->flag & BONE_DONE)) {
 						if (select) {
@@ -1981,39 +2077,71 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool
 		}
 	}
 
-	ED_armature_edit_sync_selection(arm->edbo);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		bArmature *arm = obedit->data;
+		ED_armature_edit_sync_selection(arm->edbo);
+	}
+
+	MEM_freeN(objects);
 
 	return hits > 0 ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
+/**
+ * Compare result of 'GPU_select': 'uint[4]',
+ * needed for when we need to align with object draw-order.
+ */
+static int opengl_bone_select_buffer_cmp(const void *sel_a_p, const void *sel_b_p)
+{
+	/* 4th element is select id */
+	uint sel_a = ((uint *)sel_a_p)[3];
+	uint sel_b = ((uint *)sel_b_p)[3];
+
+#ifdef __BIG_ENDIAN__
+	BLI_endian_switch_uint32(&sel_a);
+	BLI_endian_switch_uint32(&sel_b);
+#endif
+
+	if (sel_a < sel_b) {
+		return -1;
+	}
+	else if (sel_a > sel_b) {
+		return 1;
+	}
+	else {
+		return 0;
+	}
+}
+
 static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, bool select, bool extend)
 {
-	Bone *bone;
-	Object *ob = vc->obact;
 	unsigned int *vbuffer = NULL; /* selection buffer */
-	unsigned int *col;            /* color in buffer */
 	int bone_only;
-	int bone_selected = 0;
 	int totobj = MAXPICKBUF; /* XXX solve later */
 	int hits;
 
-	if ((ob) && (ob->mode & OB_MODE_POSE))
+	if (vc->obact && (vc->obact->mode & OB_MODE_POSE))
 		bone_only = 1;
 	else
 		bone_only = 0;
 
 	if (extend == false && select) {
 		if (bone_only) {
-			CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones)
-			{
-				if ((select == false) || ((pchan->bone->flag & BONE_UNSELECTABLE) == 0)) {
-					pchan->bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+			FOREACH_OBJECT_IN_MODE_BEGIN (vc->view_layer, OB_MODE_POSE, ob_iter) {
+				bArmature *arm = ob_iter->data;
+				for (bPoseChannel *pchan = ob_iter->pose->chanbase.first; pchan; pchan = pchan->next) {
+					if (PBONE_VISIBLE(arm, pchan->bone)) {
+						if ((select == false) || ((pchan->bone->flag & BONE_UNSELECTABLE) == 0)) {
+							pchan->bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+						}
+					}
 				}
 			}
-			CTX_DATA_END;
+			FOREACH_OBJECT_IN_MODE_END;
 		}
 		else {
-			object_deselect_all_visible(vc->scene, vc->v3d);
+			object_deselect_all_visible(vc->view_layer);
 		}
 	}
 
@@ -2027,59 +2155,91 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
 	 * is the same as the object, we have a hit and can move to the next color
 	 * and object pair, if not, just move to the next object,
 	 * keeping the same color until we have a hit.
-	 *
-	 * The buffer order is defined by OGL standard, hopefully no stupid GFX card
-	 * does it incorrectly.
 	 */
 
 	if (hits > 0) { /* no need to loop if there's no hit */
-		Base *base;
-		col = vbuffer + 3;
-
-		for (base = vc->scene->base.first; base && hits; base = base->next) {
-			if (BASE_SELECTABLE(vc->v3d, base)) {
-				while (base->selcol == (*col & 0xFFFF)) {   /* we got an object */
-					if (*col & 0xFFFF0000) {                    /* we got a bone */
-						bone = ED_armature_bone_find_index(base->object, *col & ~(BONESEL_ANY));
-						if (bone) {
-							if (select) {
-								if ((bone->flag & BONE_UNSELECTABLE) == 0) {
-									bone->flag |= BONE_SELECTED;
-									bone_selected = 1;
-								}
-							}
-							else {
-								bArmature *arm = base->object->data;
-								bone->flag &= ~BONE_SELECTED;
-								if (arm->act_bone == bone)
-									arm->act_bone = NULL;
-							}
+
+		/* The draw order doesn't always match the order we populate the engine, see: T51695. */
+		qsort(vbuffer, hits, sizeof(uint[4]), opengl_bone_select_buffer_cmp);
+
+		Base **bases = NULL;
+		BLI_array_declare(bases);
+
+		for (Base *base = vc->view_layer->object_bases.first; base && hits; base = base->next) {
+			if (BASE_SELECTABLE(base)) {
+				if ((base->object->select_color & 0x0000FFFF) != 0) {
+					BLI_array_append(bases, base);
+				}
+			}
+		}
+
+		for (const uint *col = vbuffer + 3, *col_end = col + (hits * 4); col < col_end; col += 4) {
+			Bone *bone;
+			Base *base = ED_armature_base_and_bone_from_select_buffer(bases, BLI_array_len(bases), *col, &bone);
+
+			if (base == NULL) {
+				continue;
+			}
+			/* Loop over contiguous bone hits for 'base'. */
+			bool changed = false;
+			for (; col != col_end; col += 4) {
+				/* should never fail */
+				if (bone != NULL) {
+					if (select) {
+						if ((bone->flag & BONE_UNSELECTABLE) == 0) {
+							bone->flag |= BONE_SELECTED;
 						}
 					}
-					else if (!bone_only) {
-						ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT);
+					else {
+						bArmature *arm = base->object->data;
+						if ((bone->flag & BONE_UNSELECTABLE) == 0) {
+							bone->flag &= ~BONE_SELECTED;
+							if (arm->act_bone == bone)
+								arm->act_bone = NULL;
+						}
+					}
+					changed = true;
+				}
+				else if (!bone_only) {
+					ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT);
+				}
+
+				/* Select the next bone if we're not switching bases. */
+				if (col + 4 != col_end) {
+					if ((base->object->select_color & 0x0000FFFF) != (col[4] & 0x0000FFFF)) {
+						break;
 					}
 
-					col += 4; /* next color */
-					hits--;
-					if (hits == 0) break;
+					if ((base->object->pose != NULL) && bone_only) {
+						const uint hit_bone = (col[4] & ~BONESEL_ANY) >> 16;
+						bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone);
+						bone = pchan ? pchan->bone : NULL;
+					}
+					else {
+						bone = NULL;
+					}
 				}
 			}
 
-			if (bone_selected) {
+			if (changed) {
 				if (base->object && (base->object->type == OB_ARMATURE)) {
 					bArmature *arm = base->object->data;
 
 					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, base->object);
 
-					if (arm && (arm->flag & ARM_HAS_VIZ_DEPS)) {
+					if (vc->obact && arm && (arm->flag & ARM_HAS_VIZ_DEPS)) {
 						/* mask modifier ('armature' mode), etc. */
-						DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+						DEG_id_tag_update(&vc->obact->id, OB_RECALC_DATA);
 					}
+
+					/* copy on write tag is needed (for the armature), or else no refresh happens */
+					DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 				}
 			}
 		}
 
+		MEM_freeN(bases);
+
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 	}
 	MEM_freeN(vbuffer);
@@ -2106,63 +2266,75 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 	WM_operator_properties_border_to_rcti(op, &rect);
 
 	if (vc.obedit) {
-		switch (vc.obedit->type) {
-			case OB_MESH:
-				vc.em = BKE_editmesh_from_object(vc.obedit);
-				ret = do_mesh_box_select(&vc, &rect, select, extend);
-//			if (EM_texFaceCheck())
-				if (ret & OPERATOR_FINISHED) {
-					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
-				}
-				break;
-			case OB_CURVE:
-			case OB_SURF:
-				ret = do_nurbs_box_select(&vc, &rect, select, extend);
-				if (ret & OPERATOR_FINISHED) {
-					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
-				}
-				break;
-			case OB_MBALL:
-				ret = do_meta_box_select(&vc, &rect, select, extend);
-				if (ret & OPERATOR_FINISHED) {
-					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
-				}
-				break;
-			case OB_ARMATURE:
-				ret = do_armature_box_select(&vc, &rect, select, extend);
-				if (ret & OPERATOR_FINISHED) {
-					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, vc.obedit);
-				}
-				break;
-			case OB_LATTICE:
-				ret = do_lattice_box_select(&vc, &rect, select, extend);
-				if (ret & OPERATOR_FINISHED) {
-					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
-				}
-				break;
-			default:
-				assert(!"border select on incorrect object type");
-				break;
+
+		FOREACH_OBJECT_IN_MODE_BEGIN (vc.view_layer, vc.obedit->mode, ob_iter) {
+			ED_view3d_viewcontext_init_object(&vc, ob_iter);
+
+			switch (vc.obedit->type) {
+				case OB_MESH:
+					vc.em = BKE_editmesh_from_object(vc.obedit);
+					ret |= do_mesh_box_select(&vc, &rect, select, extend);
+					if (ret & OPERATOR_FINISHED) {
+						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+					}
+					break;
+				case OB_CURVE:
+				case OB_SURF:
+					ret |= do_nurbs_box_select(&vc, &rect, select, extend);
+					if (ret & OPERATOR_FINISHED) {
+						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+					}
+					break;
+				case OB_MBALL:
+					ret |= do_meta_box_select(&vc, &rect, select, extend);
+					if (ret & OPERATOR_FINISHED) {
+						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+					}
+					break;
+				case OB_ARMATURE:
+					ret |= do_armature_box_select(&vc, &rect, select, extend);
+					if (ret & OPERATOR_FINISHED) {
+						WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, vc.obedit);
+					}
+					break;
+				case OB_LATTICE:
+					ret |= do_lattice_box_select(&vc, &rect, select, extend);
+					if (ret & OPERATOR_FINISHED) {
+						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+					}
+					break;
+				default:
+					assert(!"border select on incorrect object type");
+					break;
+			}
 		}
+		FOREACH_OBJECT_IN_MODE_END;
 	}
 	else {  /* no editmode, unified for bones and objects */
 		if (vc.obact && vc.obact->mode & OB_MODE_SCULPT) {
-			ret = ED_sculpt_mask_box_select(C, &vc, &rect, select, extend);
+			ret |= ED_sculpt_mask_box_select(C, &vc, &rect, select, extend);
 		}
 		else if (vc.obact && BKE_paint_select_face_test(vc.obact)) {
-			ret = do_paintface_box_select(&vc, &rect, select, extend);
+			ret |= do_paintface_box_select(&vc, &rect, select, extend);
 		}
 		else if (vc.obact && BKE_paint_select_vert_test(vc.obact)) {
-			ret = do_paintvert_box_select(&vc, &rect, select, extend);
+			ret |= do_paintvert_box_select(&vc, &rect, select, extend);
 		}
 		else if (vc.obact && vc.obact->mode & OB_MODE_PARTICLE_EDIT) {
-			ret = PE_border_select(C, &rect, select, extend);
+			ret |= PE_border_select(C, &rect, select, extend);
 		}
 		else { /* object mode with none active */
-			ret = do_object_pose_box_select(C, &vc, &rect, select, extend);
+			ret |= do_object_pose_box_select(C, &vc, &rect, select, extend);
 		}
 	}
 
+	if (ret & OPERATOR_FINISHED) {
+		ret = OPERATOR_FINISHED;
+	}
+	else {
+		ret = OPERATOR_CANCELLED;
+	}
+
 	return ret;
 }
 
@@ -2459,8 +2631,7 @@ static void paint_facesel_circle_select(ViewContext *vc, const bool select, cons
 	}
 }
 
-static void paint_vertsel_circle_select_doSelectVert(
-        void *userData, MVert *mv, const float screen_co[2], int UNUSED(index))
+static void paint_vertsel_circle_select_doSelectVert(void *userData, MVert *mv, const float screen_co[2], int UNUSED(index))
 {
 	CircleSelectUserData *data = userData;
 
@@ -2637,8 +2808,11 @@ static void pose_circle_select(ViewContext *vc, const bool select, const int mva
 
 		if (arm->flag & ARM_HAS_VIZ_DEPS) {
 			/* mask modifier ('armature' mode), etc. */
-			DAG_id_tag_update(&vc->obact->id, OB_RECALC_DATA);
+			DEG_id_tag_update(&vc->obact->id, OB_RECALC_DATA);
 		}
+
+		/* copy on write tag is needed (for the armature), or else no refresh happens */
+		DEG_id_tag_update(&arm->id, DEG_TAG_COPY_ON_WRITE);
 	}
 }
 
@@ -2748,7 +2922,8 @@ static void mball_circle_select(ViewContext *vc, const bool select, const int mv
 
 /** Callbacks for circle selection in Editmode */
 
-static void obedit_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad)
+static void obedit_circle_select(
+        ViewContext *vc, const bool select, const int mval[2], float rad)
 {
 	switch (vc->obedit->type) {
 		case OB_MESH:
@@ -2774,23 +2949,23 @@ static void obedit_circle_select(ViewContext *vc, const bool select, const int m
 
 static bool object_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad)
 {
-	Scene *scene = vc->scene;
+	ViewLayer *view_layer = vc->view_layer;
 	const float radius_squared = rad * rad;
 	const float mval_fl[2] = {mval[0], mval[1]};
 	bool changed = false;
-	const int select_flag = select ? SELECT : 0;
+	const int select_flag = select ? BASE_SELECTED : 0;
 
 
 	Base *base;
-	for (base = FIRSTBASE; base; base = base->next) {
-		if (BASE_SELECTABLE(vc->v3d, base) && ((base->flag & SELECT) != select_flag)) {
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
+		if (BASE_SELECTABLE(base) && ((base->flag & BASE_SELECTED) != select_flag)) {
 			float screen_co[2];
 			if (ED_view3d_project_float_global(
 			            vc->ar, base->object->obmat[3], screen_co,
 			            V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
 			{
 				if (len_squared_v2v2(mval_fl, screen_co) <= radius_squared) {
-					ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT);
+					ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT);
 					changed = true;
 				}
 			}
@@ -2804,37 +2979,48 @@ static bool object_circle_select(ViewContext *vc, const bool select, const int m
 static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 {
 	ViewContext vc;
-	ED_view3d_viewcontext_init(C, &vc);
-	Object *obact = vc.obact;
-	Object *obedit = vc.obedit;
 	const int radius = RNA_int_get(op->ptr, "radius");
 	const bool select = !RNA_boolean_get(op->ptr, "deselect");
 	const int mval[2] = {RNA_int_get(op->ptr, "x"),
 	                     RNA_int_get(op->ptr, "y")};
 
+
+	ED_view3d_viewcontext_init(C, &vc);
+
+	Object *obact = vc.obact;
+	Object *obedit = vc.obedit;
+
 	if (obedit || BKE_paint_select_elem_test(obact) ||
 	    (obact && (obact->mode & (OB_MODE_PARTICLE_EDIT | OB_MODE_POSE))) )
 	{
 		view3d_operator_needs_opengl(C);
 
-		if (CTX_data_edit_object(C)) {
-			obedit_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
-		}
-		else if (BKE_paint_select_face_test(obact)) {
-			paint_facesel_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
-		}
-		else if (BKE_paint_select_vert_test(obact)) {
-			paint_vertsel_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
-		}
-		else if (obact->mode & OB_MODE_POSE) {
-			pose_circle_select(&vc, select, mval, (float)radius);
-		}
-		else {
-			return PE_circle_select(C, select, mval, (float)radius);
+		FOREACH_OBJECT_IN_MODE_BEGIN (vc.view_layer, obact->mode, ob_iter) {
+			ED_view3d_viewcontext_init_object(&vc, ob_iter);
+
+			obact = vc.obact;
+			obedit = vc.obedit;
+
+			if (CTX_data_edit_object(C)) {
+				obedit_circle_select(&vc, select, mval, (float)radius);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
+			}
+			else if (BKE_paint_select_face_test(obact)) {
+				paint_facesel_circle_select(&vc, select, mval, (float)radius);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
+			}
+			else if (BKE_paint_select_vert_test(obact)) {
+				paint_vertsel_circle_select(&vc, select, mval, (float)radius);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
+			}
+			else if (obact->mode & OB_MODE_POSE) {
+				pose_circle_select(&vc, select, mval, (float)radius);
+			}
+			else {
+				return PE_circle_select(C, select, mval, (float)radius);
+			}
 		}
+		FOREACH_OBJECT_IN_MODE_END;
 	}
 	else if (obact && obact->mode & OB_MODE_SCULPT) {
 		return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 80586217691..606c07cd1fa 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -30,6 +30,8 @@
  */
 
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 
@@ -40,13 +42,17 @@
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
+#include "BKE_editmesh.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_mball.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -68,6 +74,8 @@ static bool snap_calc_active_center(bContext *C, const bool select_only, float r
 
 static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
 	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	RegionView3D *rv3d = CTX_wm_region_data(C);
@@ -79,62 +87,83 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 	gridf = rv3d->gridview;
 
 	if (obedit) {
-		if (ED_transverts_check_obedit(obedit))
-			ED_transverts_create_from_obedit(&tvs, obedit, 0);
-		if (tvs.transverts_tot == 0)
-			return OPERATOR_CANCELLED;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		uint objects_len = 0;
+		Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			obedit = objects[ob_index];
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+			if ((em->bm->totvertsel == 0) &&
+			    (em->bm->totedgesel == 0) &&
+			    (em->bm->totfacesel == 0))
+			{
+				continue;
+			}
 
-		copy_m3_m4(bmat, obedit->obmat);
-		invert_m3_m3(imat, bmat);
+			if (ED_transverts_check_obedit(obedit)) {
+				ED_transverts_create_from_obedit(&tvs, obedit, 0);
+			}
 
-		tv = tvs.transverts;
-		for (a = 0; a < tvs.transverts_tot; a++, tv++) {
-			copy_v3_v3(vec, tv->loc);
-			mul_m3_v3(bmat, vec);
-			add_v3_v3(vec, obedit->obmat[3]);
-			vec[0] = gridf * floorf(0.5f + vec[0] / gridf);
-			vec[1] = gridf * floorf(0.5f + vec[1] / gridf);
-			vec[2] = gridf * floorf(0.5f + vec[2] / gridf);
-			sub_v3_v3(vec, obedit->obmat[3]);
-
-			mul_m3_v3(imat, vec);
-			copy_v3_v3(tv->loc, vec);
-		}
+			if (tvs.transverts_tot == 0) {
+				continue;
+			}
 
-		ED_transverts_update_obedit(&tvs, obedit);
-		ED_transverts_free(&tvs);
+			copy_m3_m4(bmat, obedit->obmat);
+			invert_m3_m3(imat, bmat);
+
+			tv = tvs.transverts;
+			for (a = 0; a < tvs.transverts_tot; a++, tv++) {
+				copy_v3_v3(vec, tv->loc);
+				mul_m3_v3(bmat, vec);
+				add_v3_v3(vec, obedit->obmat[3]);
+				vec[0] = gridf * floorf(0.5f + vec[0] / gridf);
+				vec[1] = gridf * floorf(0.5f + vec[1] / gridf);
+				vec[2] = gridf * floorf(0.5f + vec[2] / gridf);
+				sub_v3_v3(vec, obedit->obmat[3]);
+
+				mul_m3_v3(imat, vec);
+				copy_v3_v3(tv->loc, vec);
+			}
+
+			ED_transverts_update_obedit(&tvs, obedit);
+			ED_transverts_free(&tvs);
+		}
+		MEM_freeN(objects);
 	}
 	else {
 		struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
 
-		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+		FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN(view_layer_eval, ob_eval)
 		{
+			Object *ob = DEG_get_original_object(ob_eval);
 			if (ob->mode & OB_MODE_POSE) {
-				bPoseChannel *pchan;
-				bArmature *arm = ob->data;
+				bPoseChannel *pchan_eval;
+				bArmature *arm_eval = ob_eval->data;
 
-				invert_m4_m4(ob->imat, ob->obmat);
+				invert_m4_m4(ob_eval->imat, ob_eval->obmat);
 
-				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-					if (pchan->bone->flag & BONE_SELECTED) {
-						if (pchan->bone->layer & arm->layer) {
-							if ((pchan->bone->flag & BONE_CONNECTED) == 0) {
+				for (pchan_eval = ob_eval->pose->chanbase.first; pchan_eval; pchan_eval = pchan_eval->next) {
+					if (pchan_eval->bone->flag & BONE_SELECTED) {
+						if (pchan_eval->bone->layer & arm_eval->layer) {
+							if ((pchan_eval->bone->flag & BONE_CONNECTED) == 0) {
 								float nLoc[3];
 
 								/* get nearest grid point to snap to */
-								copy_v3_v3(nLoc, pchan->pose_mat[3]);
+								copy_v3_v3(nLoc, pchan_eval->pose_mat[3]);
 								/* We must operate in world space! */
-								mul_m4_v3(ob->obmat, nLoc);
+								mul_m4_v3(ob_eval->obmat, nLoc);
 								vec[0] = gridf * floorf(0.5f + nLoc[0] / gridf);
 								vec[1] = gridf * floorf(0.5f + nLoc[1] / gridf);
 								vec[2] = gridf * floorf(0.5f + nLoc[2] / gridf);
 								/* Back in object space... */
-								mul_m4_v3(ob->imat, vec);
+								mul_m4_v3(ob_eval->imat, vec);
 
 								/* Get location of grid point in pose space. */
-								BKE_armature_loc_pose_to_bone(pchan, vec, vec);
+								BKE_armature_loc_pose_to_bone(pchan_eval, vec, vec);
 
-								/* adjust location */
+								/* adjust location on the original pchan*/
+								bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, pchan_eval->name);
 								if ((pchan->protectflag & OB_LOCK_LOCX) == 0)
 									pchan->loc[0] = vec[0];
 								if ((pchan->protectflag & OB_LOCK_LOCY) == 0)
@@ -153,34 +182,34 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 				}
 				ob->pose->flag |= (POSE_LOCKED | POSE_DO_UNLOCK);
 
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
-				vec[0] = -ob->obmat[3][0] + gridf * floorf(0.5f + ob->obmat[3][0] / gridf);
-				vec[1] = -ob->obmat[3][1] + gridf * floorf(0.5f + ob->obmat[3][1] / gridf);
-				vec[2] = -ob->obmat[3][2] + gridf * floorf(0.5f + ob->obmat[3][2] / gridf);
+				vec[0] = -ob_eval->obmat[3][0] + gridf * floorf(0.5f + ob_eval->obmat[3][0] / gridf);
+				vec[1] = -ob_eval->obmat[3][1] + gridf * floorf(0.5f + ob_eval->obmat[3][1] / gridf);
+				vec[2] = -ob_eval->obmat[3][2] + gridf * floorf(0.5f + ob_eval->obmat[3][2] / gridf);
 
 				if (ob->parent) {
 					float originmat[3][3];
-					BKE_object_where_is_calc_ex(scene, NULL, ob, originmat);
+					BKE_object_where_is_calc_ex(depsgraph, scene, NULL, ob, originmat);
 
 					invert_m3_m3(imat, originmat);
 					mul_m3_v3(imat, vec);
 				}
 				if ((ob->protectflag & OB_LOCK_LOCX) == 0)
-					ob->loc[0] += vec[0];
+					ob->loc[0] = ob_eval->loc[0] + vec[0];
 				if ((ob->protectflag & OB_LOCK_LOCY) == 0)
-					ob->loc[1] += vec[1];
+					ob->loc[1] = ob_eval->loc[1] + vec[1];
 				if ((ob->protectflag & OB_LOCK_LOCZ) == 0)
-					ob->loc[2] += vec[2];
+					ob->loc[2] = ob_eval->loc[2] + vec[2];
 
 				/* auto-keyframing */
 				ED_autokeyframe_object(C, scene, ob, ks);
 
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
 		}
-		CTX_DATA_END;
+		FOREACH_SELECTED_EDITABLE_OBJECT_END;
 	}
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -207,6 +236,7 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot)
 
 static int snap_selected_to_location(bContext *C, const float snap_target_global[3], const bool use_offset)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obact = CTX_data_active_object(C);
@@ -219,7 +249,7 @@ static int snap_selected_to_location(bContext *C, const float snap_target_global
 	int a;
 
 	if (use_offset) {
-		if ((v3d && v3d->around == V3D_AROUND_ACTIVE) &&
+		if ((v3d && scene->toolsettings->transform_pivot_point == V3D_AROUND_ACTIVE) &&
 		    snap_calc_active_center(C, true, center_global))
 		{
 			/* pass */
@@ -329,7 +359,7 @@ static int snap_selected_to_location(bContext *C, const float snap_target_global
 
 		obact->pose->flag |= (POSE_LOCKED | POSE_DO_UNLOCK);
 
-		DAG_id_tag_update(&obact->id, OB_RECALC_DATA);
+		DEG_id_tag_update(&obact->id, OB_RECALC_DATA);
 	}
 	else {
 		struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
@@ -370,7 +400,7 @@ static int snap_selected_to_location(bContext *C, const float snap_target_global
 
 				if (ob->parent) {
 					float originmat[3][3];
-					BKE_object_where_is_calc_ex(scene, NULL, ob, originmat);
+					BKE_object_where_is_calc_ex(depsgraph, scene, NULL, ob, originmat);
 
 					invert_m3_m3(imat, originmat);
 					mul_m3_v3(imat, cursor_parent);
@@ -385,7 +415,7 @@ static int snap_selected_to_location(bContext *C, const float snap_target_global
 				/* auto-keyframing */
 				ED_autokeyframe_object(C, scene, ob, ks);
 
-				DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
 		}
 
@@ -404,7 +434,7 @@ static int snap_selected_to_cursor_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
-	const float *snap_target_global = ED_view3d_cursor3d_get(scene, v3d);
+	const float *snap_target_global = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	return snap_selected_to_location(C, snap_target_global, use_offset);
 }
@@ -465,13 +495,14 @@ static int snap_curs_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 	float gridf, *curs;
 
 	gridf = rv3d->gridview;
-	curs = ED_view3d_cursor3d_get(scene, v3d);
+	curs = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	curs[0] = gridf * floorf(0.5f + curs[0] / gridf);
 	curs[1] = gridf * floorf(0.5f + curs[1] / gridf);
 	curs[2] = gridf * floorf(0.5f + curs[2] / gridf);
 
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);  /* hrm */
+	DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
@@ -493,7 +524,7 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot)
 
 /* **************************************************** */
 
-static void bundle_midpoint(Scene *scene, Object *ob, float vec[3])
+static void bundle_midpoint(Depsgraph *depsgraph, Scene *scene, Object *ob, float vec[3])
 {
 	MovieClip *clip = BKE_object_movieclip_get(scene, ob, false);
 	MovieTracking *tracking;
@@ -508,7 +539,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3])
 
 	copy_m4_m4(cammat, ob->obmat);
 
-	BKE_tracking_get_camera_object_matrix(scene, ob, mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, ob, mat);
 
 	INIT_MINMAX(min, max);
 
@@ -547,6 +578,8 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3])
 
 static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
 	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
@@ -560,7 +593,6 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 	zero_v3(centroid);
 
 	if (obedit) {
-
 		if (ED_transverts_check_obedit(obedit))
 			ED_transverts_create_from_obedit(&tvs, obedit, TM_ALL_JOINTS | TM_SKIP_HANDLES);
 
@@ -568,18 +600,19 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 			return false;
 		}
 
-		copy_m3_m4(bmat, obedit->obmat);
+		Object *obedit_eval = DEG_get_evaluated_object(depsgraph, obedit);
+		copy_m3_m4(bmat, obedit_eval->obmat);
 
 		tv = tvs.transverts;
 		for (a = 0; a < tvs.transverts_tot; a++, tv++) {
 			copy_v3_v3(vec, tv->loc);
 			mul_m3_v3(bmat, vec);
-			add_v3_v3(vec, obedit->obmat[3]);
+			add_v3_v3(vec, obedit_eval->obmat[3]);
 			add_v3_v3(centroid, vec);
 			minmax_v3v3_v3(min, max, vec);
 		}
 
-		if (v3d->around == V3D_AROUND_CENTER_MEAN) {
+		if (scene->toolsettings->transform_pivot_point == V3D_AROUND_CENTER_MEAN) {
 			mul_v3_fl(centroid, 1.0f / (float)tvs.transverts_tot);
 			copy_v3_v3(cursor, centroid);
 		}
@@ -593,13 +626,14 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 		Object *obact = CTX_data_active_object(C);
 
 		if (obact && (obact->mode & OB_MODE_POSE)) {
-			bArmature *arm = obact->data;
+			Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact);
+			bArmature *arm = obact_eval->data;
 			bPoseChannel *pchan;
-			for (pchan = obact->pose->chanbase.first; pchan; pchan = pchan->next) {
+			for (pchan = obact_eval->pose->chanbase.first; pchan; pchan = pchan->next) {
 				if (arm->layer & pchan->bone->layer) {
 					if (pchan->bone->flag & BONE_SELECTED) {
 						copy_v3_v3(vec, pchan->pose_head);
-						mul_m4_v3(obact->obmat, vec);
+						mul_m4_v3(obact_eval->obmat, vec);
 						add_v3_v3(centroid, vec);
 						minmax_v3v3_v3(min, max, vec);
 						count++;
@@ -608,15 +642,15 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 			}
 		}
 		else {
-			CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+			FOREACH_SELECTED_OBJECT_BEGIN(view_layer_eval, ob_eval)
 			{
-				copy_v3_v3(vec, ob->obmat[3]);
+				copy_v3_v3(vec, ob_eval->obmat[3]);
 
 				/* special case for camera -- snap to bundles */
-				if (ob->type == OB_CAMERA) {
+				if (ob_eval->type == OB_CAMERA) {
 					/* snap to bundles should happen only when bundles are visible */
 					if (v3d->flag2 & V3D_SHOW_RECONSTRUCTION) {
-						bundle_midpoint(scene, ob, vec);
+						bundle_midpoint(depsgraph, scene, DEG_get_original_object(ob_eval), vec);
 					}
 				}
 
@@ -624,14 +658,14 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3])
 				minmax_v3v3_v3(min, max, vec);
 				count++;
 			}
-			CTX_DATA_END;
+			FOREACH_SELECTED_OBJECT_END;
 		}
 
 		if (count == 0) {
 			return false;
 		}
 
-		if (v3d->around == V3D_AROUND_CENTER_MEAN) {
+		if (scene->toolsettings->transform_pivot_point == V3D_AROUND_CENTER_MEAN) {
 			mul_v3_fl(centroid, 1.0f / (float)count);
 			copy_v3_v3(cursor, centroid);
 		}
@@ -648,10 +682,11 @@ static int snap_curs_to_sel_exec(bContext *C, wmOperator *UNUSED(op))
 	View3D *v3d = CTX_wm_view3d(C);
 	float *curs;
 
-	curs = ED_view3d_cursor3d_get(scene, v3d);
+	curs = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	if (snap_curs_to_sel_ex(C, curs)) {
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 
 		return OPERATOR_FINISHED;
 	}
@@ -682,31 +717,36 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot)
 
 static bool snap_calc_active_center(bContext *C, const bool select_only, float r_center[3])
 {
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *obedit = CTX_data_edit_object(C);
 
 	if (obedit) {
-		if (ED_object_editmode_calc_active_center(obedit, select_only, r_center)) {
-			mul_m4_v3(obedit->obmat, r_center);
+		Object *ob_edit_eval = DEG_get_evaluated_object(depsgraph, obedit);
+
+		if (ED_object_editmode_calc_active_center(ob_edit_eval, select_only, r_center)) {
+			mul_m4_v3(ob_edit_eval->obmat, r_center);
 			return true;
 		}
 	}
 	else {
 		Object *ob = CTX_data_active_object(C);
-
 		if (ob) {
+			Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+
 			if (ob->mode & OB_MODE_POSE) {
-				bPoseChannel *pchan = BKE_pose_channel_active(ob);
+				bPoseChannel *pchan = BKE_pose_channel_active(ob_eval);
 				if (pchan) {
 					if (!select_only || (pchan->bone->flag & BONE_SELECTED)) {
 						copy_v3_v3(r_center, pchan->pose_head);
-						mul_m4_v3(ob->obmat, r_center);
+						mul_m4_v3(ob_eval->obmat, r_center);
 						return true;
 					}
 				}
 			}
 			else {
-				if (!select_only || (ob->flag & SELECT)) {
-					copy_v3_v3(r_center, ob->obmat[3]);
+
+				if (!select_only || (ob_eval->flag & SELECT)) {
+					copy_v3_v3(r_center, ob_eval->obmat[3]);
 					return true;
 				}
 			}
@@ -722,10 +762,12 @@ static int snap_curs_to_active_exec(bContext *C, wmOperator *UNUSED(op))
 	View3D *v3d = CTX_wm_view3d(C);
 	float *curs;
 
-	curs = ED_view3d_cursor3d_get(scene, v3d);
+	curs = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	if (snap_calc_active_center(C, false, curs)) {
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+		DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+
 		return OPERATOR_FINISHED;
 	}
 	else {
@@ -755,11 +797,12 @@ static int snap_curs_to_center_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	float *curs;
-	curs = ED_view3d_cursor3d_get(scene, v3d);
+	curs = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	zero_v3(curs);
 
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+	DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c
index e7ae0d39a2b..8ea33927c4d 100644
--- a/source/blender/editors/space_view3d/view3d_toolbar.c
+++ b/source/blender/editors/space_view3d/view3d_toolbar.c
@@ -62,70 +62,6 @@
 
 #include "view3d_intern.h"  /* own include */
 
-
-/* ******************* view3d space & buttons ************** */
-
-static void view3d_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOperator *op)
-{
-	uiTemplateOperatorPropertyButs(C, pa->layout, op, NULL, 'V', 0);
-}
-
-static void view3d_panel_operator_redo_header(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-
-	if (op)
-		BLI_strncpy(pa->drawname, RNA_struct_ui_name(op->type->srna), sizeof(pa->drawname));
-	else
-		BLI_strncpy(pa->drawname, IFACE_("Operator"), sizeof(pa->drawname));
-}
-
-static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op)
-{
-	if (op->type->flag & OPTYPE_MACRO) {
-		for (op = op->macro.first; op; op = op->next) {
-			uiItemL(pa->layout, RNA_struct_ui_name(op->type->srna), ICON_NONE);
-			view3d_panel_operator_redo_operator(C, pa, op);
-		}
-	}
-	else {
-		view3d_panel_operator_redo_buts(C, pa, op);
-	}
-}
-
-/* TODO de-duplicate redo panel functions - campbell */
-static void view3d_panel_operator_redo(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-	ARegion *ar;
-	ARegion *ar1;
-
-	if (op == NULL) {
-		return;
-	}
-
-	/* keep in sync with logic in ED_undo_operator_repeat() */
-	ar = CTX_wm_region(C);
-	ar1 = BKE_area_find_region_active_win(CTX_wm_area(C));
-	if (ar1)
-		CTX_wm_region_set((bContext *)C, ar1);
-
-	if (WM_operator_poll((bContext *)C, op->type)) {
-		uiBlock *block = uiLayoutGetBlock(pa->layout);
-
-		if (!WM_operator_check_ui_enabled(C, op->type->name))
-			uiLayoutSetEnabled(pa->layout, false);
-
-		/* note, blockfunc is a default but->func, use Handle func to allow button callbacks too */
-		UI_block_func_handle_set(block, ED_undo_operator_repeat_cb_evt, op);
-
-		view3d_panel_operator_redo_operator(C, pa, op);
-	}
-
-	/* set region back */
-	CTX_wm_region_set((bContext *)C, ar);
-}
-
 /* ******************* */
 
 typedef struct CustomTool {
@@ -239,19 +175,6 @@ void view3d_toolshelf_register(ARegionType *art)
 	BLI_addtail(&art->paneltypes, pt);
 }
 
-void view3d_tool_props_register(ARegionType *art)
-{
-	PanelType *pt;
-
-	pt = MEM_callocN(sizeof(PanelType), "spacetype view3d panel last operator");
-	strcpy(pt->idname, "VIEW3D_PT_last_operator");
-	strcpy(pt->label, N_("Operator"));
-	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
-	pt->draw_header = view3d_panel_operator_redo_header;
-	pt->draw = view3d_panel_operator_redo;
-	BLI_addtail(&art->paneltypes, pt);
-}
-
 /* ********** operator to open/close toolshelf region */
 
 static int view3d_toolshelf_toggle_exec(bContext *C, wmOperator *UNUSED(op))
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c
index e06ae89fa89..8b0b461d443 100644
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@ -48,11 +48,15 @@
 #include "BKE_context.h"
 #include "BKE_object.h"
 #include "BKE_screen.h"
-#include "BKE_depsgraph.h" /* for ED_view3d_camera_lock_sync */
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_matrix.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -67,10 +71,27 @@
  *
  * \{ */
 
-float *ED_view3d_cursor3d_get(Scene *scene, View3D *v3d)
+View3DCursor *ED_view3d_cursor3d_get(Scene *scene, View3D *v3d)
+{
+	if (v3d && v3d->localvd) {
+		return &v3d->cursor;
+	}
+	else {
+		return &scene->cursor;
+	}
+}
+
+void ED_view3d_cursor3d_calc_mat3(const Scene *scene, const View3D *v3d, float mat[3][3])
+{
+	const View3DCursor *cursor = ED_view3d_cursor3d_get((Scene *)scene, (View3D *)v3d);
+	quat_to_mat3(mat, cursor->rotation);
+}
+
+void ED_view3d_cursor3d_calc_mat4(const Scene *scene, const View3D *v3d, float mat[4][4])
 {
-	if (v3d && v3d->localvd) return v3d->cursor;
-	else return scene->cursor;
+	const View3DCursor *cursor = ED_view3d_cursor3d_get((Scene *)scene, (View3D *)v3d);
+	quat_to_mat4(mat, cursor->rotation);
+	copy_v3_v3(mat[3], cursor->location);
 }
 
 Camera *ED_view3d_camera_data_get(View3D *v3d, RegionView3D *rv3d)
@@ -96,6 +117,7 @@ void ED_view3d_dist_range_get(
  * \note copies logic of #ED_view3d_viewplane_get(), keep in sync.
  */
 bool ED_view3d_clip_range_get(
+        Depsgraph *depsgraph,
         const View3D *v3d, const RegionView3D *rv3d,
         float *r_clipsta, float *r_clipend,
         const bool use_ortho_factor)
@@ -103,7 +125,7 @@ bool ED_view3d_clip_range_get(
 	CameraParams params;
 
 	BKE_camera_params_init(&params);
-	BKE_camera_params_from_view3d(&params, v3d, rv3d);
+	BKE_camera_params_from_view3d(&params, depsgraph, v3d, rv3d);
 
 	if (use_ortho_factor && params.is_ortho) {
 		const float fac = 2.0f / (params.clipend - params.clipsta);
@@ -118,13 +140,14 @@ bool ED_view3d_clip_range_get(
 }
 
 bool ED_view3d_viewplane_get(
+        Depsgraph *depsgraph,
         const View3D *v3d, const RegionView3D *rv3d, int winx, int winy,
         rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize)
 {
 	CameraParams params;
 
 	BKE_camera_params_init(&params);
-	BKE_camera_params_from_view3d(&params, v3d, rv3d);
+	BKE_camera_params_from_view3d(&params, depsgraph, v3d, rv3d);
 	BKE_camera_params_compute_viewplane(&params, winx, winy, 1.0f, 1.0f);
 
 	if (r_viewplane) *r_viewplane = params.viewplane;
@@ -155,7 +178,7 @@ void view3d_operator_needs_opengl(const bContext *C)
 	view3d_region_operator_needs_opengl(win, ar);
 }
 
-void view3d_region_operator_needs_opengl(wmWindow *win, ARegion *ar)
+void view3d_region_operator_needs_opengl(wmWindow *UNUSED(win), ARegion *ar)
 {
 	/* for debugging purpose, context should always be OK */
 	if ((ar == NULL) || (ar->regiontype != RGN_TYPE_WINDOW)) {
@@ -164,11 +187,9 @@ void view3d_region_operator_needs_opengl(wmWindow *win, ARegion *ar)
 	else {
 		RegionView3D *rv3d = ar->regiondata;
 
-		wmSubWindowSet(win, ar->swinid);
-		glMatrixMode(GL_PROJECTION);
-		glLoadMatrixf(rv3d->winmat);
-		glMatrixMode(GL_MODELVIEW);
-		glLoadMatrixf(rv3d->viewmat);
+		wmViewport(&ar->winrct); // TODO: bad
+		gpuLoadProjectionMatrix(rv3d->winmat);
+		gpuLoadMatrix(rv3d->viewmat);
 	}
 }
 
@@ -230,6 +251,7 @@ bool ED_view3d_context_activate(bContext *C)
 /** \name View Clipping Utilities
  *
  * \{ */
+
 void ED_view3d_clipping_calc_from_boundbox(float clip[4][4], const BoundBox *bb, const bool is_flip)
 {
 	int val;
@@ -244,40 +266,35 @@ void ED_view3d_clipping_calc_from_boundbox(float clip[4][4], const BoundBox *bb,
 	}
 }
 
-void ED_view3d_clipping_calc(BoundBox *bb, float planes[4][4], bglMats *mats, const rcti *rect)
+void ED_view3d_clipping_calc(BoundBox *bb, float planes[4][4], const ARegion *ar, const Object *ob, const rcti *rect)
 {
-	float modelview[4][4];
-	double xs, ys, p[3];
-	int val, flip_sign, a;
-
-	/* near zero floating point values can give issues with gluUnProject
-	 * in side view on some implementations */
-	if (fabs(mats->modelview[0]) < 1e-6) mats->modelview[0] = 0.0;
-	if (fabs(mats->modelview[5]) < 1e-6) mats->modelview[5] = 0.0;
-
-	/* Set up viewport so that gluUnProject will give correct values */
-	mats->viewport[0] = 0;
-	mats->viewport[1] = 0;
+	/* init in case unproject fails */
+	memset(bb->vec, 0, sizeof(bb->vec));
 
 	/* four clipping planes and bounding volume */
 	/* first do the bounding volume */
-	for (val = 0; val < 4; val++) {
-		xs = (val == 0 || val == 3) ? rect->xmin : rect->xmax;
-		ys = (val == 0 || val == 1) ? rect->ymin : rect->ymax;
+	for (int val = 0; val < 4; val++) {
+		float xs = (val == 0 || val == 3) ? rect->xmin : rect->xmax;
+		float ys = (val == 0 || val == 1) ? rect->ymin : rect->ymax;
+
+		ED_view3d_unproject(ar, xs, ys, 0.0, bb->vec[val]);
+		ED_view3d_unproject(ar, xs, ys, 1.0, bb->vec[4 + val]);
+	}
 
-		gluUnProject(xs, ys, 0.0, mats->modelview, mats->projection, mats->viewport, &p[0], &p[1], &p[2]);
-		copy_v3fl_v3db(bb->vec[val], p);
+	/* optionally transform to object space */
+	if (ob) {
+		float imat[4][4];
+		invert_m4_m4(imat, ob->obmat);
 
-		gluUnProject(xs, ys, 1.0, mats->modelview, mats->projection, mats->viewport, &p[0], &p[1], &p[2]);
-		copy_v3fl_v3db(bb->vec[4 + val], p);
+		for (int val = 0; val < 8; val++) {
+			mul_m4_v3(imat, bb->vec[val]);
+		}
 	}
 
 	/* verify if we have negative scale. doing the transform before cross
 	 * product flips the sign of the vector compared to doing cross product
 	 * before transform then, so we correct for that. */
-	for (a = 0; a < 16; a++)
-		((float *)modelview)[a] = mats->modelview[a];
-	flip_sign = is_negative_m4(modelview);
+	int flip_sign = (ob) ? is_negative_m4(ob->obmat) : false;
 
 	ED_view3d_clipping_calc_from_boundbox(planes, bb, flip_sign);
 }
@@ -378,14 +395,15 @@ void ED_view3d_lock_clear(View3D *v3d)
  * sets the ``ofs`` and ``dist`` values of the viewport so it matches the camera,
  * otherwise switching out of camera view may jump to a different part of the scene.
  */
-void ED_view3d_persp_switch_from_camera(View3D *v3d, RegionView3D *rv3d, const char persp)
+void ED_view3d_persp_switch_from_camera(const Depsgraph *depsgraph, View3D *v3d, RegionView3D *rv3d, const char persp)
 {
 	BLI_assert(rv3d->persp == RV3D_CAMOB);
 	BLI_assert(persp != RV3D_CAMOB);
 
 	if (v3d->camera) {
-		rv3d->dist = ED_view3d_offset_distance(v3d->camera->obmat, rv3d->ofs, VIEW3D_DIST_FALLBACK);
-		ED_view3d_from_object(v3d->camera, rv3d->ofs, rv3d->viewquat, &rv3d->dist, NULL);
+		Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
+		rv3d->dist = ED_view3d_offset_distance(ob_camera_eval->obmat, rv3d->ofs, VIEW3D_DIST_FALLBACK);
+		ED_view3d_from_object(ob_camera_eval, rv3d->ofs, rv3d->viewquat, &rv3d->dist, NULL);
 	}
 
 	if (!ED_view3d_camera_lock_check(v3d, rv3d)) {
@@ -398,7 +416,7 @@ void ED_view3d_persp_switch_from_camera(View3D *v3d, RegionView3D *rv3d, const c
  *
  * shared with NDOF.
  */
-bool ED_view3d_persp_ensure(struct View3D *v3d, ARegion *ar)
+bool ED_view3d_persp_ensure(const Depsgraph *depsgraph, View3D *v3d, ARegion *ar)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	const bool autopersp = (U.uiflag & USER_AUTOPERSP) != 0;
@@ -412,7 +430,7 @@ bool ED_view3d_persp_ensure(struct View3D *v3d, ARegion *ar)
 		if (rv3d->persp == RV3D_CAMOB) {
 			/* If autopersp and previous view was an axis one, switch back to PERSP mode, else reuse previous mode. */
 			char persp = (autopersp && RV3D_VIEW_IS_AXIS(rv3d->lview)) ? RV3D_PERSP : rv3d->lpersp;
-			ED_view3d_persp_switch_from_camera(v3d, rv3d, persp);
+			ED_view3d_persp_switch_from_camera(depsgraph, v3d, rv3d, persp);
 		}
 		else if (autopersp && RV3D_VIEW_IS_AXIS(rv3d->view)) {
 			rv3d->persp = RV3D_PERSP;
@@ -446,20 +464,21 @@ bool ED_view3d_camera_lock_check(const View3D *v3d, const RegionView3D *rv3d)
  * Apply the camera object transformation to the view-port.
  * (needed so we can use regular view-port manipulation operators, that sync back to the camera).
  */
-void ED_view3d_camera_lock_init_ex(View3D *v3d, RegionView3D *rv3d, const bool calc_dist)
+void ED_view3d_camera_lock_init_ex(const Depsgraph *depsgraph, View3D *v3d, RegionView3D *rv3d, const bool calc_dist)
 {
 	if (ED_view3d_camera_lock_check(v3d, rv3d)) {
+		Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
 		if (calc_dist) {
 			/* using a fallback dist is OK here since ED_view3d_from_object() compensates for it */
-			rv3d->dist = ED_view3d_offset_distance(v3d->camera->obmat, rv3d->ofs, VIEW3D_DIST_FALLBACK);
+			rv3d->dist = ED_view3d_offset_distance(ob_camera_eval->obmat, rv3d->ofs, VIEW3D_DIST_FALLBACK);
 		}
-		ED_view3d_from_object(v3d->camera, rv3d->ofs, rv3d->viewquat, &rv3d->dist, NULL);
+		ED_view3d_from_object(ob_camera_eval, rv3d->ofs, rv3d->viewquat, &rv3d->dist, NULL);
 	}
 }
 
-void ED_view3d_camera_lock_init(View3D *v3d, RegionView3D *rv3d)
+void ED_view3d_camera_lock_init(const Depsgraph *depsgraph, View3D *v3d, RegionView3D *rv3d)
 {
-	ED_view3d_camera_lock_init_ex(v3d, rv3d, true);
+	ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, true);
 }
 
 /**
@@ -467,7 +486,7 @@ void ED_view3d_camera_lock_init(View3D *v3d, RegionView3D *rv3d)
  *
  * \return true if the camera is moved.
  */
-bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d)
+bool ED_view3d_camera_lock_sync(const Depsgraph *depsgraph, View3D *v3d, RegionView3D *rv3d)
 {
 	if (ED_view3d_camera_lock_check(v3d, rv3d)) {
 		ObjectTfmProtectedChannels obtfm;
@@ -484,15 +503,17 @@ bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d)
 			while (root_parent->parent) {
 				root_parent = root_parent->parent;
 			}
+			Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
+			Object *root_parent_eval = DEG_get_evaluated_object(depsgraph, root_parent);
 
 			ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist);
 
-			normalize_m4_m4(tmat, v3d->camera->obmat);
+			normalize_m4_m4(tmat, ob_camera_eval->obmat);
 
 			invert_m4_m4(imat, tmat);
 			mul_m4_m4m4(diff_mat, view_mat, imat);
 
-			mul_m4_m4m4(parent_mat, diff_mat, root_parent->obmat);
+			mul_m4_m4m4(parent_mat, diff_mat, root_parent_eval->obmat);
 
 			BKE_object_tfm_protected_backup(root_parent, &obtfm);
 			BKE_object_apply_mat4(root_parent, parent_mat, true, false);
@@ -500,7 +521,7 @@ bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d)
 
 			ob_update = v3d->camera;
 			while (ob_update) {
-				DAG_id_tag_update(&ob_update->id, OB_RECALC_OB);
+				DEG_id_tag_update(&ob_update->id, OB_RECALC_OB);
 				WM_main_add_notifier(NC_OBJECT | ND_TRANSFORM, ob_update);
 				ob_update = ob_update->parent;
 			}
@@ -509,10 +530,10 @@ bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d)
 			/* always maintain the same scale */
 			const short protect_scale_all = (OB_LOCK_SCALEX | OB_LOCK_SCALEY | OB_LOCK_SCALEZ);
 			BKE_object_tfm_protected_backup(v3d->camera, &obtfm);
-			ED_view3d_to_object(v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
+			ED_view3d_to_object(depsgraph, v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
 			BKE_object_tfm_protected_restore(v3d->camera, &obtfm, v3d->camera->protectflag | protect_scale_all);
 
-			DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
+			DEG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
 			WM_main_add_notifier(NC_OBJECT | ND_TRANSFORM, v3d->camera);
 		}
 
@@ -593,6 +614,7 @@ bool ED_view3d_camera_lock_autokey(
 /** \} */
 
 
+
 /* -------------------------------------------------------------------- */
 /** \name Box View Support
  *
@@ -877,22 +899,17 @@ static float view_autodist_depth_margin(ARegion *ar, const int mval[2], int marg
  * \param fallback_depth_pt: Use this points depth when no depth can be found.
  */
 bool ED_view3d_autodist(
-        Scene *scene, ARegion *ar, View3D *v3d,
+        struct Depsgraph *depsgraph, ARegion *ar, View3D *v3d,
         const int mval[2], float mouse_worldloc[3],
         const bool alphaoverride, const float fallback_depth_pt[3])
 {
-	bglMats mats; /* ZBuffer depth vars */
 	float depth_close;
-	double cent[2],  p[3];
 	int margin_arr[] = {0, 2, 4};
 	int i;
 	bool depth_ok = false;
 
 	/* Get Z Depths, needed for perspective, nice for ortho */
-	ED_view3d_draw_depth(scene, ar, v3d, alphaoverride);
-
-	/* call after in case settings have been modified since last drawing, see: T47089 */
-	bgl_get_mats(&mats);
+	ED_view3d_draw_depth(depsgraph, ar, v3d, alphaoverride);
 
 	/* Attempt with low margin's first */
 	i = 0;
@@ -902,15 +919,10 @@ bool ED_view3d_autodist(
 	} while ((depth_ok == false) && (i < ARRAY_SIZE(margin_arr)));
 
 	if (depth_ok) {
-		cent[0] = (double)mval[0] + 0.5;
-		cent[1] = (double)mval[1] + 0.5;
+		float centx = (float)mval[0] + 0.5f;
+		float centy = (float)mval[1] + 0.5f;
 
-		if (gluUnProject(cent[0], cent[1], depth_close,
-		                 mats.modelview, mats.projection, (GLint *)mats.viewport, &p[0], &p[1], &p[2]))
-		{
-			mouse_worldloc[0] = (float)p[0];
-			mouse_worldloc[1] = (float)p[1];
-			mouse_worldloc[2] = (float)p[2];
+		if (ED_view3d_unproject(ar, centx, centy, depth_close, mouse_worldloc)) {
 			return true;
 		}
 	}
@@ -924,27 +936,28 @@ bool ED_view3d_autodist(
 	}
 }
 
-void ED_view3d_autodist_init(Scene *scene, ARegion *ar, View3D *v3d, int mode)
+void ED_view3d_autodist_init(struct Depsgraph *depsgraph,
+        ARegion *ar, View3D *v3d, int mode)
 {
 	/* Get Z Depths, needed for perspective, nice for ortho */
 	switch (mode) {
 		case 0:
-			ED_view3d_draw_depth(scene, ar, v3d, true);
+			ED_view3d_draw_depth(depsgraph, ar, v3d, true);
 			break;
 		case 1:
-			ED_view3d_draw_depth_gpencil(scene, ar, v3d);
+		{
+			Scene *scene = DEG_get_evaluated_scene(depsgraph);
+			ED_view3d_draw_depth_gpencil(depsgraph, scene, ar, v3d);
 			break;
+		}
 	}
 }
 
 /* no 4x4 sampling, run #ED_view3d_autodist_init first */
-bool ED_view3d_autodist_simple(
-        ARegion *ar, const int mval[2], float mouse_worldloc[3],
-        int margin, float *force_depth)
+bool ED_view3d_autodist_simple(ARegion *ar, const int mval[2], float mouse_worldloc[3],
+                               int margin, float *force_depth)
 {
-	bglMats mats; /* ZBuffer depth vars, could cache? */
 	float depth;
-	double cent[2],  p[3];
 
 	/* Get Z Depths, needed for perspective, nice for ortho */
 	if (force_depth)
@@ -955,21 +968,9 @@ bool ED_view3d_autodist_simple(
 	if (depth == FLT_MAX)
 		return false;
 
-	cent[0] = (double)mval[0] + 0.5;
-	cent[1] = (double)mval[1] + 0.5;
-
-	bgl_get_mats(&mats);
-
-	if (!gluUnProject(cent[0], cent[1], depth,
-	                  mats.modelview, mats.projection, (GLint *)mats.viewport, &p[0], &p[1], &p[2]))
-	{
-		return false;
-	}
-
-	mouse_worldloc[0] = (float)p[0];
-	mouse_worldloc[1] = (float)p[1];
-	mouse_worldloc[2] = (float)p[2];
-	return true;
+	float centx = (float)mval[0] + 0.5f;
+	float centy = (float)mval[1] + 0.5f;
+	return ED_view3d_unproject(ar, centx, centy, depth, mouse_worldloc);
 }
 
 bool ED_view3d_autodist_depth(ARegion *ar, const int mval[2], int margin, float *depth)
@@ -1065,6 +1066,7 @@ float ED_view3d_radius_to_dist_ortho(const float lens, const float radius)
  */
 float ED_view3d_radius_to_dist(
         const View3D *v3d, const ARegion *ar,
+        const struct Depsgraph *depsgraph,
         const char persp, const bool use_aspect,
         const float radius)
 {
@@ -1085,7 +1087,8 @@ float ED_view3d_radius_to_dist(
 			BKE_camera_params_init(&params);
 			params.clipsta = v3d->near;
 			params.clipend = v3d->far;
-			BKE_camera_params_from_object(&params, v3d->camera);
+			Object *camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
+			BKE_camera_params_from_object(&params, camera_eval);
 
 			lens = params.lens;
 			sensor_size = BKE_camera_sensor_size(params.sensor_fit, params.sensor_x, params.sensor_y);
@@ -1275,7 +1278,7 @@ bool ED_view3d_lock(RegionView3D *rv3d)
  * \param quat The view rotation, quaternion normally from RegionView3D.viewquat.
  * \param dist The view distance from ofs, normally from RegionView3D.dist.
  */
-void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist)
+void ED_view3d_from_m4(const float mat[4][4], float ofs[3], float quat[4], float *dist)
 {
 	float nmat[3][3];
 
@@ -1320,13 +1323,14 @@ void ED_view3d_to_m4(float mat[4][4], const float ofs[3], const float quat[4], c
 
 /**
  * Set the RegionView3D members from an objects transformation and optionally lens.
+ * \param depsgraph The depsgraph to get the evaluated object for the lens calculation.
  * \param ob The object to set the view to.
  * \param ofs The view offset to be set, normally from RegionView3D.ofs.
  * \param quat The view rotation to be set, quaternion normally from RegionView3D.viewquat.
  * \param dist The view distance from ofs to be set, normally from RegionView3D.dist.
  * \param lens The view lens angle set for cameras and lamps, normally from View3D.lens.
  */
-void ED_view3d_from_object(Object *ob, float ofs[3], float quat[4], float *dist, float *lens)
+void ED_view3d_from_object(const Object *ob, float ofs[3], float quat[4], float *dist, float *lens)
 {
 	ED_view3d_from_m4(ob->obmat, ofs, quat, dist);
 
@@ -1341,16 +1345,19 @@ void ED_view3d_from_object(Object *ob, float ofs[3], float quat[4], float *dist,
 
 /**
  * Set the object transformation from RegionView3D members.
+ * \param depsgraph The depsgraph to get the evaluated object parent for the transformation calculation.
  * \param ob The object which has the transformation assigned.
  * \param ofs The view offset, normally from RegionView3D.ofs.
  * \param quat The view rotation, quaternion normally from RegionView3D.viewquat.
  * \param dist The view distance from ofs, normally from RegionView3D.dist.
  */
-void ED_view3d_to_object(Object *ob, const float ofs[3], const float quat[4], const float dist)
+void ED_view3d_to_object(const Depsgraph *depsgraph, Object *ob, const float ofs[3], const float quat[4], const float dist)
 {
 	float mat[4][4];
 	ED_view3d_to_m4(mat, ofs, quat, dist);
-	BKE_object_apply_mat4(ob, mat, true, true);
+
+	Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+	BKE_object_apply_mat4_ex(ob, mat, ob_eval->parent, ob_eval->parentinv, true);
 }
 
 /** \} */
@@ -1376,7 +1383,7 @@ float ED_view3d_depth_read_cached(const ViewContext *vc, const int mval[2])
 }
 
 bool ED_view3d_depth_read_cached_normal(
-        const ViewContext *vc, const bglMats *mats, const int mval[2],
+        const ViewContext *vc, const int mval[2],
         float r_normal[3])
 {
 	/* Note: we could support passing in a radius.
@@ -1395,7 +1402,7 @@ bool ED_view3d_depth_read_cached_normal(
 
 			const double depth = (double)ED_view3d_depth_read_cached(vc, mval_ofs);
 			if ((depth > depths->depth_range[0]) && (depth < depths->depth_range[1])) {
-				if (ED_view3d_depth_unproject(ar, mats, mval_ofs, depth, coords[i])) {
+				if (ED_view3d_depth_unproject(ar, mval_ofs, depth, coords[i])) {
 					depths_valid[i] = true;
 				}
 			}
@@ -1437,21 +1444,13 @@ bool ED_view3d_depth_read_cached_normal(
 }
 
 bool ED_view3d_depth_unproject(
-        const ARegion *ar, const bglMats *mats,
+        const ARegion *ar,
         const int mval[2], const double depth,
         float r_location_world[3])
 {
-	double p[3];
-	if (gluUnProject(
-	        (double)ar->winrct.xmin + mval[0] + 0.5,
-	        (double)ar->winrct.ymin + mval[1] + 0.5,
-	        depth, mats->modelview, mats->projection, (const GLint *)mats->viewport,
-	        &p[0], &p[1], &p[2]))
-	{
-		copy_v3fl_v3db(r_location_world, p);
-		return true;
-	}
-	return false;
+	float centx = (float)mval[0] + 0.5f;
+	float centy = (float)mval[1] + 0.5f;
+	return ED_view3d_unproject(ar, centx, centy, depth, r_location_world);
 }
 
 void ED_view3d_depth_tag_update(RegionView3D *rv3d)
@@ -1461,46 +1460,3 @@ void ED_view3d_depth_tag_update(RegionView3D *rv3d)
 }
 
 /** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Background Image Utilities
- * \{ */
-
-BGpic *ED_view3d_background_image_new(View3D *v3d)
-{
-	BGpic *bgpic = MEM_callocN(sizeof(BGpic), "Background Image");
-
-	bgpic->rotation = 0.0f;
-	bgpic->size = 5.0f;
-	bgpic->blend = 0.5f;
-	bgpic->iuser.fie_ima = 2;
-	bgpic->iuser.ok = 1;
-	bgpic->view = 0; /* 0 for all */
-	bgpic->flag |= V3D_BGPIC_EXPANDED;
-
-	BLI_addtail(&v3d->bgpicbase, bgpic);
-
-	return bgpic;
-}
-
-void ED_view3d_background_image_remove(View3D *v3d, BGpic *bgpic)
-{
-	BLI_remlink(&v3d->bgpicbase, bgpic);
-
-	MEM_freeN(bgpic);
-}
-
-void ED_view3d_background_image_clear(View3D *v3d)
-{
-	BGpic *bgpic = v3d->bgpicbase.first;
-
-	while (bgpic) {
-		BGpic *next_bgpic = bgpic->next;
-
-		ED_view3d_background_image_remove(v3d, bgpic);
-
-		bgpic = next_bgpic;
-	}
-}
-
-/** \} */
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 608580c0a08..73b9a67ac56 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -41,32 +41,27 @@
 #include "BKE_action.h"
 #include "BKE_camera.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "BIF_gl.h"
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "UI_resources.h"
 
+#include "GPU_glew.h"
 #include "GPU_select.h"
+#include "GPU_matrix.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_screen.h"
 
-#ifdef WITH_GAMEENGINE
-#  include "BLI_listbase.h"
-#  include "BLI_callbacks.h"
-
-#  include "GPU_draw.h"
-
-#  include "BL_System.h"
-#endif
+#include "DRW_engine.h"
 
 #include "view3d_intern.h"  /* own include */
 
@@ -125,7 +120,7 @@ static void view3d_smooth_view_state_restore(const struct SmoothView3DState *sms
 /* the arguments are the desired situation */
 void ED_view3d_smooth_view_ex(
         /* avoid passing in the context */
-        wmWindowManager *wm, wmWindow *win, ScrArea *sa,
+        const Depsgraph *depsgraph, wmWindowManager *wm, wmWindow *win, ScrArea *sa,
         View3D *v3d, ARegion *ar, const int smooth_viewtx,
         const V3D_SmoothParams *sview)
 {
@@ -156,7 +151,7 @@ void ED_view3d_smooth_view_ex(
 	 * we allow camera option locking to initialize the view settings from the camera.
 	 */
 	if (sview->camera == NULL && sview->camera_old == NULL) {
-		ED_view3d_camera_lock_init(v3d, rv3d);
+		ED_view3d_camera_lock_init(depsgraph, v3d, rv3d);
 	}
 
 	/* store the options we want to end with */
@@ -181,8 +176,9 @@ void ED_view3d_smooth_view_ex(
 	}
 
 	if (sview->camera) {
-		sms.dst.dist = ED_view3d_offset_distance(sview->camera->obmat, sview->ofs, VIEW3D_DIST_FALLBACK);
-		ED_view3d_from_object(sview->camera, sms.dst.ofs, sms.dst.quat, &sms.dst.dist, &sms.dst.lens);
+		Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, sview->camera);
+		sms.dst.dist = ED_view3d_offset_distance(ob_camera_eval->obmat, sview->ofs, VIEW3D_DIST_FALLBACK);
+		ED_view3d_from_object(ob_camera_eval, sms.dst.ofs, sms.dst.quat, &sms.dst.dist, &sms.dst.lens);
 		sms.to_camera = true; /* restore view3d values in end */
 	}
 
@@ -206,9 +202,10 @@ void ED_view3d_smooth_view_ex(
 		if (changed) {
 			/* original values */
 			if (sview->camera_old) {
-				sms.src.dist = ED_view3d_offset_distance(sview->camera_old->obmat, rv3d->ofs, 0.0f);
+				Object *ob_camera_old_eval = DEG_get_evaluated_object(depsgraph, sview->camera_old);
+				sms.src.dist = ED_view3d_offset_distance(ob_camera_old_eval->obmat, rv3d->ofs, 0.0f);
 				/* this */
-				ED_view3d_from_object(sview->camera_old, sms.src.ofs, sms.src.quat, &sms.src.dist, &sms.src.lens);
+				ED_view3d_from_object(ob_camera_old_eval, sms.src.ofs, sms.src.quat, &sms.src.dist, &sms.src.lens);
 			}
 			/* grid draw as floor */
 			if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
@@ -230,9 +227,10 @@ void ED_view3d_smooth_view_ex(
 			/* ensure it shows correct */
 			if (sms.to_camera) {
 				/* use ortho if we move from an ortho view to an ortho camera */
+				Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, sview->camera);
 				rv3d->persp = (((rv3d->is_persp == false) &&
-				                (sview->camera->type == OB_CAMERA) &&
-				                (((Camera *)sview->camera->data)->type == CAM_ORTHO)) ?
+				                (ob_camera_eval->type == OB_CAMERA) &&
+				                (((Camera *)ob_camera_eval->data)->type == CAM_ORTHO)) ?
 				                RV3D_ORTHO : RV3D_PERSP);
 			}
 
@@ -265,7 +263,7 @@ void ED_view3d_smooth_view_ex(
 			rv3d->dist = sms.dst.dist;
 			v3d->lens = sms.dst.lens;
 
-			ED_view3d_camera_lock_sync(v3d, rv3d);
+			ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 		}
 
 		if (rv3d->viewlock & RV3D_BOXVIEW) {
@@ -281,11 +279,13 @@ void ED_view3d_smooth_view(
         View3D *v3d, ARegion *ar, const int smooth_viewtx,
         const struct V3D_SmoothParams *sview)
 {
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 
 	ED_view3d_smooth_view_ex(
+	        depsgraph,
 	        wm, win, sa,
 	        v3d, ar, smooth_viewtx,
 	        sview);
@@ -294,6 +294,7 @@ void ED_view3d_smooth_view(
 /* only meant for timer usage */
 static void view3d_smoothview_apply(bContext *C, View3D *v3d, ARegion *ar, bool sync_boxview)
 {
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	RegionView3D *rv3d = ar->regiondata;
 	struct SmoothView3DStore *sms = rv3d->sms;
 	float step, step_inv;
@@ -314,7 +315,7 @@ static void view3d_smoothview_apply(bContext *C, View3D *v3d, ARegion *ar, bool
 		else {
 			view3d_smooth_view_state_restore(&sms->dst, v3d, rv3d);
 
-			ED_view3d_camera_lock_sync(v3d, rv3d);
+			ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 			ED_view3d_camera_lock_autokey(v3d, rv3d, C, true, true);
 		}
 
@@ -347,7 +348,7 @@ static void view3d_smoothview_apply(bContext *C, View3D *v3d, ARegion *ar, bool
 		rv3d->dist = sms->dst.dist * step + sms->src.dist * step_inv;
 		v3d->lens  = sms->dst.lens * step + sms->src.lens * step_inv;
 
-		ED_view3d_camera_lock_sync(v3d, rv3d);
+		ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 		if (ED_screen_animation_playing(CTX_wm_manager(C))) {
 			ED_view3d_camera_lock_autokey(v3d, rv3d, C, true, true);
 		}
@@ -405,8 +406,9 @@ void ED_view3d_smooth_view_force_finish(
 
 		/* force update of view matrix so tools that run immediately after
 		 * can use them without redrawing first */
+		Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		Scene *scene = CTX_data_scene(C);
-		ED_view3d_update_viewmat(scene, v3d, ar, NULL, NULL, NULL);
+		ED_view3d_update_viewmat(depsgraph, scene, v3d, ar, NULL, NULL, NULL);
 	}
 }
 
@@ -434,6 +436,7 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot)
 
 static int view3d_camera_to_view_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	View3D *v3d;
 	ARegion *ar;
 	RegionView3D *rv3d;
@@ -447,11 +450,11 @@ static int view3d_camera_to_view_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BKE_object_tfm_protected_backup(v3d->camera, &obtfm);
 
-	ED_view3d_to_object(v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
+	ED_view3d_to_object(depsgraph, v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
 
 	BKE_object_tfm_protected_restore(v3d->camera, &obtfm, v3d->camera->protectflag);
 
-	DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
+	DEG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
 	rv3d->persp = RV3D_CAMOB;
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, v3d->camera);
@@ -504,29 +507,31 @@ void VIEW3D_OT_camera_to_view(wmOperatorType *ot)
  * meant to take into account vertex/bone selection for eg. */
 static int view3d_camera_to_view_selected_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	View3D *v3d = CTX_wm_view3d(C);  /* can be NULL */
 	Object *camera_ob = v3d ? v3d->camera : scene->camera;
+	Object *camera_ob_eval = DEG_get_evaluated_object(depsgraph, camera_ob);
 
 	float r_co[3]; /* the new location to apply */
 	float r_scale; /* only for ortho cameras */
 
-	if (camera_ob == NULL) {
+	if (camera_ob_eval == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active camera");
 		return OPERATOR_CANCELLED;
 	}
 
 	/* this function does all the important stuff */
-	if (BKE_camera_view_frame_fit_to_scene(bmain, scene, v3d, camera_ob, r_co, &r_scale)) {
+	if (BKE_camera_view_frame_fit_to_scene(depsgraph, scene, view_layer, camera_ob_eval, r_co, &r_scale)) {
 		ObjectTfmProtectedChannels obtfm;
 		float obmat_new[4][4];
 
-		if ((camera_ob->type == OB_CAMERA) && (((Camera *)camera_ob->data)->type == CAM_ORTHO)) {
+		if ((camera_ob_eval->type == OB_CAMERA) && (((Camera *)camera_ob_eval->data)->type == CAM_ORTHO)) {
 			((Camera *)camera_ob->data)->ortho_scale = r_scale;
 		}
 
-		copy_m4_m4(obmat_new, camera_ob->obmat);
+		copy_m4_m4(obmat_new, camera_ob_eval->obmat);
 		copy_v3_v3(obmat_new[3], r_co);
 
 		/* only touch location */
@@ -535,7 +540,7 @@ static int view3d_camera_to_view_selected_exec(bContext *C, wmOperator *op)
 		BKE_object_tfm_protected_restore(camera_ob, &obtfm, OB_LOCK_SCALE | OB_LOCK_ROT4D);
 
 		/* notifiers */
-		DAG_id_tag_update(&camera_ob->id, OB_RECALC_OB);
+		DEG_id_tag_update(&camera_ob->id, OB_RECALC_OB);
 		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, camera_ob);
 		return OPERATOR_FINISHED;
 	}
@@ -690,14 +695,14 @@ void VIEW3D_OT_object_as_camera(wmOperatorType *ot)
 /**
  * \param rect optional for picking (can be NULL).
  */
-void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rcti *rect)
+void view3d_winmatrix_set(Depsgraph *depsgraph, ARegion *ar, const View3D *v3d, const rcti *rect)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	rctf viewplane;
 	float clipsta, clipend;
 	bool is_ortho;
 
-	is_ortho = ED_view3d_viewplane_get(v3d, rv3d, ar->winx, ar->winy, &viewplane, &clipsta, &clipend, NULL);
+	is_ortho = ED_view3d_viewplane_get(depsgraph, v3d, rv3d, ar->winx, ar->winy, &viewplane, &clipsta, &clipend, NULL);
 	rv3d->is_persp = !is_ortho;
 
 #if 0
@@ -716,14 +721,14 @@ void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rcti *rect)
 	}
 
 	if (is_ortho) {
-		wmOrtho(viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
+		gpuOrtho(viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
 	}
 	else {
-		wmFrustum(viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
+		gpuFrustum(viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
 	}
 
 	/* update matrix in 3d view region */
-	glGetFloatv(GL_PROJECTION_MATRIX, (float *)rv3d->winmat);
+	gpuGetProjectionMatrix(rv3d->winmat);
 }
 
 static void obmat_to_viewmat(RegionView3D *rv3d, Object *ob)
@@ -742,6 +747,7 @@ static void obmat_to_viewmat(RegionView3D *rv3d, Object *ob)
 /**
  * Sets #RegionView3D.viewmat
  *
+ * \param depsgraph: Depsgraph.
  * \param scene: Scene for camera and cursor location.
  * \param v3d: View 3D space data.
  * \param rv3d: 3D region which stores the final matrices.
@@ -751,13 +757,14 @@ static void obmat_to_viewmat(RegionView3D *rv3d, Object *ob)
  * \note don't set windows active in here, is used by renderwin too.
  */
 void view3d_viewmatrix_set(
-        Scene *scene,
+        Depsgraph *depsgraph, Scene *scene,
         const View3D *v3d, RegionView3D *rv3d, const float rect_scale[2])
 {
 	if (rv3d->persp == RV3D_CAMOB) {      /* obs/camera */
 		if (v3d->camera) {
-			BKE_object_where_is_calc(scene, v3d->camera);
-			obmat_to_viewmat(rv3d, v3d->camera);
+			Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera);
+			BKE_object_where_is_calc(depsgraph, scene, ob_camera_eval);
+			obmat_to_viewmat(rv3d, ob_camera_eval);
 		}
 		else {
 			quat_to_mat4(rv3d->viewmat, rv3d->viewquat);
@@ -775,15 +782,15 @@ void view3d_viewmatrix_set(
 		quat_to_mat4(rv3d->viewmat, rv3d->viewquat);
 		if (rv3d->persp == RV3D_PERSP) rv3d->viewmat[3][2] -= rv3d->dist;
 		if (v3d->ob_centre) {
-			Object *ob = v3d->ob_centre;
+			Object *ob_eval = DEG_get_evaluated_object(depsgraph, v3d->ob_centre);
 			float vec[3];
 
-			copy_v3_v3(vec, ob->obmat[3]);
-			if (ob->type == OB_ARMATURE && v3d->ob_centre_bone[0]) {
-				bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, v3d->ob_centre_bone);
+			copy_v3_v3(vec, ob_eval->obmat[3]);
+			if (ob_eval->type == OB_ARMATURE && v3d->ob_centre_bone[0]) {
+				bPoseChannel *pchan = BKE_pose_channel_find_name(ob_eval->pose, v3d->ob_centre_bone);
 				if (pchan) {
 					copy_v3_v3(vec, pchan->pose_mat[3]);
-					mul_m4_v3(ob->obmat, vec);
+					mul_m4_v3(ob_eval->obmat, vec);
 				}
 			}
 			translate_m4(rv3d->viewmat, -vec[0], -vec[1], -vec[2]);
@@ -791,7 +798,7 @@ void view3d_viewmatrix_set(
 		}
 		else if (v3d->ob_centre_cursor) {
 			float vec[3];
-			copy_v3_v3(vec, ED_view3d_cursor3d_get(scene, (View3D *)v3d));
+			copy_v3_v3(vec, ED_view3d_cursor3d_get(scene, (View3D *)v3d)->location);
 			translate_m4(rv3d->viewmat, -vec[0], -vec[1], -vec[2]);
 			use_lock_ofs = true;
 		}
@@ -850,6 +857,45 @@ void view3d_opengl_select_cache_end(void)
 	GPU_select_cache_end();
 }
 
+#ifndef WITH_OPENGL_LEGACY
+struct DrawSelectLoopUserData {
+	uint  pass;
+	uint  hits;
+	uint *buffer;
+	uint  buffer_len;
+	const rcti *rect;
+	char gpu_select_mode;
+};
+
+static bool drw_select_loop_pass(eDRWSelectStage stage, void *user_data)
+{
+	bool continue_pass = false;
+	struct DrawSelectLoopUserData *data = user_data;
+	if (stage == DRW_SELECT_PASS_PRE) {
+		GPU_select_begin(data->buffer, data->buffer_len, data->rect, data->gpu_select_mode, data->hits);
+		/* always run POST after PRE. */
+		continue_pass = true;
+	}
+	else if (stage == DRW_SELECT_PASS_POST) {
+		int hits = GPU_select_end();
+		if (data->pass == 0) {
+			/* quirk of GPU_select_end, only take hits value from first call. */
+			data->hits = hits;
+		}
+		if (data->gpu_select_mode == GPU_SELECT_NEAREST_FIRST_PASS) {
+			data->gpu_select_mode = GPU_SELECT_NEAREST_SECOND_PASS;
+			continue_pass = (hits > 0);
+		}
+		data->pass += 1;
+	}
+	else {
+		BLI_assert(0);
+	}
+	return continue_pass;
+
+}
+#endif /* WITH_OPENGL_LEGACY */
+
 /**
  * \warning be sure to account for a negative return value
  * This is an error, "Too many objects in select buffer"
@@ -862,12 +908,13 @@ int view3d_opengl_select(
         eV3DSelectMode select_mode)
 {
 	struct bThemeState theme_state;
+	Depsgraph *depsgraph = vc->depsgraph;
 	Scene *scene = vc->scene;
 	View3D *v3d = vc->v3d;
 	ARegion *ar = vc->ar;
 	rcti rect;
 	int hits;
-	const bool use_obedit_skip = (scene->obedit != NULL) && (vc->obedit == NULL);
+	const bool use_obedit_skip = (OBEDIT_FROM_VIEW_LAYER(vc->view_layer) != NULL) && (vc->obedit == NULL);
 	const bool is_pick_select = (U.gpu_select_pick_deph != 0);
 	const bool do_passes = (
 	        (is_pick_select == false) &&
@@ -919,11 +966,16 @@ int view3d_opengl_select(
 		goto finally;
 	}
 
+#ifndef WITH_OPENGL_LEGACY
+	/* All of the queries need to be perform on the drawing context. */
+	DRW_opengl_context_enable();
+#endif
+
 	G.f |= G_PICKSEL;
 
 	/* Important we use the 'viewmat' and don't re-calculate since
 	 * the object & bone view locking takes 'rect' into account, see: T51629. */
-	ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, vc->rv3d->viewmat, NULL, &rect);
+	ED_view3d_draw_setup_view(vc->win, depsgraph, scene, ar, v3d, vc->rv3d->viewmat, NULL, &rect);
 
 	if (v3d->drawtype > OB_WIRE) {
 		v3d->zbuf = true;
@@ -933,23 +985,42 @@ int view3d_opengl_select(
 	if (vc->rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_set(vc->rv3d);
 
-	GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0);
-
-	ED_view3d_draw_select_loop(vc, scene, v3d, ar, use_obedit_skip, use_nearest);
 
-	hits = GPU_select_end();
-
-	/* second pass, to get the closest object to camera */
-	if (do_passes && (hits > 0)) {
-		GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits);
-
-		ED_view3d_draw_select_loop(vc, scene, v3d, ar, use_obedit_skip, use_nearest);
+#ifdef WITH_OPENGL_LEGACY
+	if (IS_VIEWPORT_LEGACY(vc->v3d)) {
+		GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0);
+		ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest);
+		hits = GPU_select_end();
 
-		GPU_select_end();
+		if (do_passes && (hits > 0)) {
+			GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits);
+			ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest);
+			GPU_select_end();
+		}
 	}
+	else
+#else
+	{
+		/* We need to call "GPU_select_*" API's inside DRW_draw_select_loop
+		 * because the OpenGL context created & destroyed inside this function. */
+		struct DrawSelectLoopUserData drw_select_loop_user_data = {
+			.pass = 0,
+			.hits = 0,
+			.buffer = buffer,
+			.buffer_len = bufsize,
+			.rect = &rect,
+			.gpu_select_mode = gpu_select_mode,
+		};
+		DRW_draw_select_loop(
+		        depsgraph, ar, v3d,
+		        use_obedit_skip, use_nearest, &rect,
+		        drw_select_loop_pass, &drw_select_loop_user_data);
+		hits = drw_select_loop_user_data.hits;
+	}
+#endif /* WITH_OPENGL_LEGACY */
 
 	G.f &= ~G_PICKSEL;
-	ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, vc->rv3d->viewmat, NULL, NULL);
+	ED_view3d_draw_setup_view(vc->win, depsgraph, scene, ar, v3d, vc->rv3d->viewmat, NULL, NULL);
 
 	if (v3d->drawtype > OB_WIRE) {
 		v3d->zbuf = 0;
@@ -959,7 +1030,12 @@ int view3d_opengl_select(
 	if (vc->rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_disable();
 
+#ifndef WITH_OPENGL_LEGACY
+	DRW_opengl_context_disable();
+#endif
+
 finally:
+
 	if (hits < 0) printf("Too many objects in select buffer\n");  /* XXX make error message */
 
 	UI_Theme_Restore(&theme_state);
@@ -970,44 +1046,10 @@ finally:
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Local View Operators
+/** \name View Layer Utilities
  * \{ */
 
-static unsigned int free_localbit(Main *bmain)
-{
-	unsigned int lay;
-	ScrArea *sa;
-	bScreen *sc;
-
-	lay = 0;
-
-	/* sometimes we loose a localview: when an area is closed */
-	/* check all areas: which localviews are in use? */
-	for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-		for (sa = sc->areabase.first; sa; sa = sa->next) {
-			SpaceLink *sl = sa->spacedata.first;
-			for (; sl; sl = sl->next) {
-				if (sl->spacetype == SPACE_VIEW3D) {
-					View3D *v3d = (View3D *) sl;
-					lay |= v3d->lay;
-				}
-			}
-		}
-	}
-
-	if ((lay & 0x01000000) == 0) return 0x01000000;
-	if ((lay & 0x02000000) == 0) return 0x02000000;
-	if ((lay & 0x04000000) == 0) return 0x04000000;
-	if ((lay & 0x08000000) == 0) return 0x08000000;
-	if ((lay & 0x10000000) == 0) return 0x10000000;
-	if ((lay & 0x20000000) == 0) return 0x20000000;
-	if ((lay & 0x40000000) == 0) return 0x40000000;
-	if ((lay & 0x80000000) == 0) return 0x80000000;
-
-	return 0;
-}
-
-int ED_view3d_scene_layer_set(int lay, const int *values, int *active)
+int ED_view3d_view_layer_set(int lay, const int *values, int *active)
 {
 	int i, tot = 0;
 
@@ -1045,476 +1087,4 @@ int ED_view3d_scene_layer_set(int lay, const int *values, int *active)
 	return lay;
 }
 
-static bool view3d_localview_init(
-        wmWindowManager *wm, wmWindow *win,
-        Main *bmain, Scene *scene, ScrArea *sa, const int smooth_viewtx,
-        ReportList *reports)
-{
-	View3D *v3d = sa->spacedata.first;
-	Base *base;
-	float min[3], max[3], box[3], mid[3];
-	float size = 0.0f;
-	unsigned int locallay;
-	bool ok = false;
-
-	if (v3d->localvd) {
-		return ok;
-	}
-
-	INIT_MINMAX(min, max);
-
-	locallay = free_localbit(bmain);
-
-	if (locallay == 0) {
-		BKE_report(reports, RPT_ERROR, "No more than 8 local views");
-		ok = false;
-	}
-	else {
-		if (scene->obedit) {
-			BKE_object_minmax(scene->obedit, min, max, false);
-
-			ok = true;
-
-			BASACT->lay |= locallay;
-			scene->obedit->lay = BASACT->lay;
-		}
-		else {
-			for (base = FIRSTBASE; base; base = base->next) {
-				if (TESTBASE(v3d, base)) {
-					BKE_object_minmax(base->object, min, max, false);
-					base->lay |= locallay;
-					base->object->lay = base->lay;
-					ok = true;
-				}
-			}
-		}
-
-		sub_v3_v3v3(box, max, min);
-		size = max_fff(box[0], box[1], box[2]);
-	}
-
-	if (ok == true) {
-		ARegion *ar;
-
-		v3d->localvd = MEM_mallocN(sizeof(View3D), "localview");
-
-		memcpy(v3d->localvd, v3d, sizeof(View3D));
-
-		mid_v3_v3v3(mid, min, max);
-
-		copy_v3_v3(v3d->cursor, mid);
-
-		for (ar = sa->regionbase.first; ar; ar = ar->next) {
-			if (ar->regiontype == RGN_TYPE_WINDOW) {
-				RegionView3D *rv3d = ar->regiondata;
-				bool ok_dist = true;
-
-				/* new view values */
-				Object *camera_old = NULL;
-				float dist_new, ofs_new[3];
-
-				rv3d->localvd = MEM_mallocN(sizeof(RegionView3D), "localview region");
-				memcpy(rv3d->localvd, rv3d, sizeof(RegionView3D));
-
-				negate_v3_v3(ofs_new, mid);
-
-				if (rv3d->persp == RV3D_CAMOB) {
-					rv3d->persp = RV3D_PERSP;
-					camera_old = v3d->camera;
-				}
-
-				if (rv3d->persp == RV3D_ORTHO) {
-					if (size < 0.0001f) {
-						ok_dist = false;
-					}
-				}
-
-				if (ok_dist) {
-					dist_new = ED_view3d_radius_to_dist(v3d, ar, rv3d->persp, true, (size / 2) * VIEW3D_MARGIN);
-					if (rv3d->persp == RV3D_PERSP) {
-						/* don't zoom closer than the near clipping plane */
-						dist_new = max_ff(dist_new, v3d->near * 1.5f);
-					}
-				}
-
-				ED_view3d_smooth_view_ex(
-				        wm, win, sa, v3d, ar, smooth_viewtx,
-				            &(const V3D_SmoothParams) {
-				                .camera_old = camera_old,
-				                .ofs = ofs_new, .quat = rv3d->viewquat,
-				                .dist = ok_dist ? &dist_new : NULL, .lens = &v3d->lens});
-			}
-		}
-
-		v3d->lay = locallay;
-	}
-	else {
-		/* clear flags */
-		for (base = FIRSTBASE; base; base = base->next) {
-			if (base->lay & locallay) {
-				base->lay -= locallay;
-				if (base->lay == 0) base->lay = v3d->layact;
-				if (base->object != scene->obedit) base->flag |= SELECT;
-				base->object->lay = base->lay;
-			}
-		}
-	}
-
-	DAG_on_visible_update(bmain, false);
-
-	return ok;
-}
-
-static void restore_localviewdata(wmWindowManager *wm, wmWindow *win, Main *bmain, ScrArea *sa, const int smooth_viewtx)
-{
-	const bool free = true;
-	ARegion *ar;
-	View3D *v3d = sa->spacedata.first;
-	Object *camera_old, *camera_new;
-
-	if (v3d->localvd == NULL) return;
-
-	camera_old = v3d->camera;
-	camera_new = v3d->localvd->camera;
-
-	v3d->lay = v3d->localvd->lay;
-	v3d->layact = v3d->localvd->layact;
-	v3d->drawtype = v3d->localvd->drawtype;
-	v3d->camera = v3d->localvd->camera;
-
-	if (free) {
-		MEM_freeN(v3d->localvd);
-		v3d->localvd = NULL;
-	}
-
-	for (ar = sa->regionbase.first; ar; ar = ar->next) {
-		if (ar->regiontype == RGN_TYPE_WINDOW) {
-			RegionView3D *rv3d = ar->regiondata;
-
-			if (rv3d->localvd) {
-				Object *camera_old_rv3d, *camera_new_rv3d;
-
-				camera_old_rv3d = (rv3d->persp          == RV3D_CAMOB) ? camera_old : NULL;
-				camera_new_rv3d = (rv3d->localvd->persp == RV3D_CAMOB) ? camera_new : NULL;
-
-				rv3d->view = rv3d->localvd->view;
-				rv3d->persp = rv3d->localvd->persp;
-				rv3d->camzoom = rv3d->localvd->camzoom;
-
-				ED_view3d_smooth_view_ex(
-				        wm, win, sa,
-				        v3d, ar, smooth_viewtx,
-				        &(const V3D_SmoothParams) {
-				            .camera_old = camera_old_rv3d, .camera = camera_new_rv3d,
-				            .ofs = rv3d->localvd->ofs, .quat = rv3d->localvd->viewquat,
-				            .dist = &rv3d->localvd->dist});
-
-				if (free) {
-					MEM_freeN(rv3d->localvd);
-					rv3d->localvd = NULL;
-				}
-			}
-
-			ED_view3d_shade_update(bmain, v3d, sa);
-		}
-	}
-}
-
-static bool view3d_localview_exit(
-        wmWindowManager *wm, wmWindow *win,
-        Main *bmain, Scene *scene, ScrArea *sa, const int smooth_viewtx)
-{
-	View3D *v3d = sa->spacedata.first;
-	struct Base *base;
-	unsigned int locallay;
-
-	if (v3d->localvd) {
-
-		locallay = v3d->lay & 0xFF000000;
-
-		restore_localviewdata(wm, win, bmain, sa, smooth_viewtx);
-
-		/* for when in other window the layers have changed */
-		if (v3d->scenelock) v3d->lay = scene->lay;
-
-		for (base = FIRSTBASE; base; base = base->next) {
-			if (base->lay & locallay) {
-				base->lay -= locallay;
-				if (base->lay == 0) base->lay = v3d->layact;
-				if (base->object != scene->obedit) {
-					base->flag |= SELECT;
-					base->object->flag |= SELECT;
-				}
-				base->object->lay = base->lay;
-			}
-		}
-
-		DAG_on_visible_update(bmain, false);
-
-		return true;
-	}
-	else {
-		return false;
-	}
-}
-
-static int localview_exec(bContext *C, wmOperator *op)
-{
-	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
-	wmWindowManager *wm = CTX_wm_manager(C);
-	wmWindow *win = CTX_wm_window(C);
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = CTX_wm_view3d(C);
-	bool changed;
-
-	if (v3d->localvd) {
-		changed = view3d_localview_exit(wm, win, bmain, scene, sa, smooth_viewtx);
-	}
-	else {
-		changed = view3d_localview_init(wm, win, bmain, scene, sa, smooth_viewtx, op->reports);
-	}
-
-	if (changed) {
-		DAG_id_type_tag(bmain, ID_OB);
-		ED_area_tag_redraw(sa);
-
-		/* unselected objects become selected when exiting */
-		if (v3d->localvd == NULL) {
-			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-		}
-
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
-}
-
-void VIEW3D_OT_localview(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Local View";
-	ot->description = "Toggle display of selected object(s) separately and centered in view";
-	ot->idname = "VIEW3D_OT_localview";
-
-	/* api callbacks */
-	ot->exec = localview_exec;
-	ot->flag = OPTYPE_UNDO; /* localview changes object layer bitflags */
-
-	ot->poll = ED_operator_view3d_active;
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Game Engine Operator
- *
- * Start the game engine (handles context switching).
- * \{ */
-
-#ifdef WITH_GAMEENGINE
-
-static ListBase queue_back;
-static void game_engine_save_state(bContext *C, wmWindow *win)
-{
-	Object *obact = CTX_data_active_object(C);
-
-	glPushAttrib(GL_ALL_ATTRIB_BITS);
-
-	if (obact && obact->mode & OB_MODE_TEXTURE_PAINT)
-		GPU_paint_set_mipmap(1);
-
-	queue_back = win->queue;
-
-	BLI_listbase_clear(&win->queue);
-}
-
-static void game_engine_restore_state(bContext *C, wmWindow *win)
-{
-	Object *obact = CTX_data_active_object(C);
-
-	if (obact && obact->mode & OB_MODE_TEXTURE_PAINT)
-		GPU_paint_set_mipmap(0);
-
-	/* check because closing win can set to NULL */
-	if (win) {
-		win->queue = queue_back;
-	}
-
-	GPU_state_init();
-	GPU_set_tpage(NULL, 0, 0);
-
-	glPopAttrib();
-}
-
-/* was space_set_commmandline_options in 2.4x */
-static void game_set_commmandline_options(GameData *gm)
-{
-	SYS_SystemHandle syshandle;
-	int test;
-
-	if ((syshandle = SYS_GetSystem())) {
-		/* User defined settings */
-		test = (U.gameflags & USER_DISABLE_MIPMAP);
-		GPU_set_mipmap(!test);
-		SYS_WriteCommandLineInt(syshandle, "nomipmap", test);
-
-		/* File specific settings: */
-		/* Only test the first one. These two are switched
-		 * simultaneously. */
-		test = (gm->flag & GAME_SHOW_FRAMERATE);
-		SYS_WriteCommandLineInt(syshandle, "show_framerate", test);
-		SYS_WriteCommandLineInt(syshandle, "show_profile", test);
-
-		test = (gm->flag & GAME_SHOW_DEBUG_PROPS);
-		SYS_WriteCommandLineInt(syshandle, "show_properties", test);
-
-		test = (gm->flag & GAME_SHOW_PHYSICS);
-		SYS_WriteCommandLineInt(syshandle, "show_physics", test);
-
-		test = (gm->flag & GAME_ENABLE_ALL_FRAMES);
-		SYS_WriteCommandLineInt(syshandle, "fixedtime", test);
-
-		test = (gm->flag & GAME_ENABLE_ANIMATION_RECORD);
-		SYS_WriteCommandLineInt(syshandle, "animation_record", test);
-
-		test = (gm->flag & GAME_IGNORE_DEPRECATION_WARNINGS);
-		SYS_WriteCommandLineInt(syshandle, "ignore_deprecation_warnings", test);
-
-		test = (gm->matmode == GAME_MAT_MULTITEX);
-		SYS_WriteCommandLineInt(syshandle, "blender_material", test);
-		test = (gm->matmode == GAME_MAT_GLSL);
-		SYS_WriteCommandLineInt(syshandle, "blender_glsl_material", test);
-		test = (gm->flag & GAME_DISPLAY_LISTS);
-		SYS_WriteCommandLineInt(syshandle, "displaylists", test);
-
-
-	}
-}
-
-#endif /* WITH_GAMEENGINE */
-
-static int game_engine_poll(bContext *C)
-{
-	bScreen *screen;
-	/* we need a context and area to launch BGE
-	 * it's a temporary solution to avoid crash at load time
-	 * if we try to auto run the BGE. Ideally we want the
-	 * context to be set as soon as we load the file. */
-
-	if (CTX_wm_window(C) == NULL) return 0;
-	if ((screen = CTX_wm_screen(C)) == NULL) return 0;
-
-	if (CTX_data_mode_enum(C) != CTX_MODE_OBJECT)
-		return 0;
-
-	if (!BKE_scene_uses_blender_game(screen->scene))
-		return 0;
-
-	return 1;
-}
-
-static int game_engine_exec(bContext *C, wmOperator *op)
-{
-#ifdef WITH_GAMEENGINE
-	Scene *startscene = CTX_data_scene(C);
-	Main *bmain = CTX_data_main(C);
-	ScrArea /* *sa, */ /* UNUSED */ *prevsa = CTX_wm_area(C);
-	ARegion *ar, *prevar = CTX_wm_region(C);
-	wmWindow *prevwin = CTX_wm_window(C);
-	RegionView3D *rv3d;
-	rcti cam_frame;
-
-	UNUSED_VARS(op);
-
-	/* bad context switch .. */
-	if (!ED_view3d_context_activate(C))
-		return OPERATOR_CANCELLED;
-
-	/* redraw to hide any menus/popups, we don't go back to
-	 * the window manager until after this operator exits */
-	WM_redraw_windows(C);
-
-	BLI_callback_exec(bmain, &startscene->id, BLI_CB_EVT_GAME_PRE);
-
-	rv3d = CTX_wm_region_view3d(C);
-	/* sa = CTX_wm_area(C); */ /* UNUSED */
-	ar = CTX_wm_region(C);
-
-	view3d_operator_needs_opengl(C);
-
-	game_set_commmandline_options(&startscene->gm);
-
-	if ((rv3d->persp == RV3D_CAMOB) &&
-	    (startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) &&
-	    (startscene->gm.stereoflag != STEREO_DOME))
-	{
-		/* Letterbox */
-		rctf cam_framef;
-		ED_view3d_calc_camera_border(startscene, ar, CTX_wm_view3d(C), rv3d, &cam_framef, false);
-		cam_frame.xmin = cam_framef.xmin + ar->winrct.xmin;
-		cam_frame.xmax = cam_framef.xmax + ar->winrct.xmin;
-		cam_frame.ymin = cam_framef.ymin + ar->winrct.ymin;
-		cam_frame.ymax = cam_framef.ymax + ar->winrct.ymin;
-		BLI_rcti_isect(&ar->winrct, &cam_frame, &cam_frame);
-	}
-	else {
-		cam_frame.xmin = ar->winrct.xmin;
-		cam_frame.xmax = ar->winrct.xmax;
-		cam_frame.ymin = ar->winrct.ymin;
-		cam_frame.ymax = ar->winrct.ymax;
-	}
-
-
-	game_engine_save_state(C, prevwin);
-
-	StartKetsjiShell(C, ar, &cam_frame, 1);
-
-	/* window wasnt closed while the BGE was running */
-	if (BLI_findindex(&CTX_wm_manager(C)->windows, prevwin) == -1) {
-		prevwin = NULL;
-		CTX_wm_window_set(C, NULL);
-	}
-
-	ED_area_tag_redraw(CTX_wm_area(C));
-
-	if (prevwin) {
-		/* restore context, in case it changed in the meantime, for
-		 * example by working in another window or closing it */
-		CTX_wm_region_set(C, prevar);
-		CTX_wm_window_set(C, prevwin);
-		CTX_wm_area_set(C, prevsa);
-	}
-
-	game_engine_restore_state(C, prevwin);
-
-	//XXX restore_all_scene_cfra(scene_cfra_store);
-	BKE_scene_set_background(CTX_data_main(C), startscene);
-	//XXX BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
-
-	BLI_callback_exec(bmain, &startscene->id, BLI_CB_EVT_GAME_POST);
-
-	return OPERATOR_FINISHED;
-#else
-	UNUSED_VARS(C);
-	BKE_report(op->reports, RPT_ERROR, "Game engine is disabled in this build");
-	return OPERATOR_CANCELLED;
-#endif
-}
-
-void VIEW3D_OT_game_start(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Start Game Engine";
-	ot->description = "Start game engine";
-	ot->idname = "VIEW3D_OT_game_start";
-
-	/* api callbacks */
-	ot->exec = game_engine_exec;
-
-	ot->poll = game_engine_poll;
-}
-
 /** \} */
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index f780ca35f30..a7c97ba4d4a 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -56,6 +56,10 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
+#include "GPU_immediate.h"
+
+#include "DEG_depsgraph.h"
+
 #include "view3d_intern.h"  /* own include */
 
 #ifdef WITH_INPUT_NDOF
@@ -245,6 +249,7 @@ typedef struct WalkInfo {
 	RegionView3D *rv3d;
 	View3D *v3d;
 	ARegion *ar;
+	struct Depsgraph *depsgraph;
 	Scene *scene;
 
 	wmTimer *timer; /* needed for redraws */
@@ -328,7 +333,7 @@ static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *ar, void *a
 	rctf viewborder;
 
 	if (walk->scene->camera) {
-		ED_view3d_calc_camera_border(walk->scene, ar, walk->v3d, walk->rv3d, &viewborder, false);
+		ED_view3d_calc_camera_border(walk->scene, walk->depsgraph, ar, walk->v3d, walk->rv3d, &viewborder, false);
 		xoff = viewborder.xmin + BLI_rctf_size_x(&viewborder) * 0.5f;
 		yoff = viewborder.ymin + BLI_rctf_size_y(&viewborder) * 0.5f;
 	}
@@ -337,24 +342,33 @@ static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *ar, void *a
 		yoff = walk->ar->winy / 2;
 	}
 
-	UI_ThemeColor(TH_VIEW_OVERLAY);
-	glBegin(GL_LINES);
+	Gwn_VertFormat *format = immVertexFormat();
+	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+	immUniformThemeColor(TH_VIEW_OVERLAY);
+
+	immBegin(GWN_PRIM_LINES, 8);
+
 	/* North */
-	glVertex2i(xoff, yoff + inner_length);
-	glVertex2i(xoff, yoff + outter_length);
+	immVertex2i(pos, xoff, yoff + inner_length);
+	immVertex2i(pos, xoff, yoff + outter_length);
 
 	/* East */
-	glVertex2i(xoff + inner_length, yoff);
-	glVertex2i(xoff + outter_length, yoff);
+	immVertex2i(pos, xoff + inner_length, yoff);
+	immVertex2i(pos, xoff + outter_length, yoff);
 
 	/* South */
-	glVertex2i(xoff, yoff - inner_length);
-	glVertex2i(xoff, yoff - outter_length);
+	immVertex2i(pos, xoff, yoff - inner_length);
+	immVertex2i(pos, xoff, yoff - outter_length);
 
 	/* West */
-	glVertex2i(xoff - inner_length, yoff);
-	glVertex2i(xoff - outter_length, yoff);
-	glEnd();
+	immVertex2i(pos, xoff - inner_length, yoff);
+	immVertex2i(pos, xoff - outter_length, yoff);
+
+	immEnd();
+	immUnbindProgram();
 }
 
 static void walk_update_header(bContext *C, wmOperator *op, WalkInfo *walk)
@@ -498,6 +512,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
 	walk->rv3d = CTX_wm_region_view3d(C);
 	walk->v3d = CTX_wm_view3d(C);
 	walk->ar = CTX_wm_region(C);
+	walk->depsgraph = CTX_data_depsgraph(C);
 	walk->scene = CTX_data_scene(C);
 
 #ifdef NDOF_WALK_DEBUG
@@ -587,11 +602,11 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
 	walk->rv3d->rflag |= RV3D_NAVIGATING;
 
 	walk->snap_context = ED_transform_snap_object_context_create_view3d(
-	        CTX_data_main(C), walk->scene, 0,
+	        walk->scene, CTX_data_depsgraph(C), 0,
 	        walk->ar, walk->v3d);
 
 	walk->v3d_camera_control = ED_view3d_cameracontrol_acquire(
-	        walk->scene, walk->v3d, walk->rv3d,
+	        walk->depsgraph, walk->scene, walk->v3d, walk->rv3d,
 	        (U.uiflag & USER_CAM_LOCK_NO_PARENT) == 0);
 
 	/* center the mouse */
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index b7de49d8158..3e132192875 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -29,6 +29,7 @@ set(INC
 	../../ikplugin
 	../../makesdna
 	../../makesrna
+	../../render/extern/include
 	../../windowmanager
 	../../depsgraph
 	../../../../intern/guardedalloc
@@ -45,7 +46,8 @@ set(SRC
 	transform_conversions.c
 	transform_generics.c
 	transform_input.c
-	transform_manipulator.c
+	transform_manipulator_2d.c
+	transform_manipulator_3d.c
 	transform_ops.c
 	transform_orientations.c
 	transform_snap.c
@@ -58,10 +60,6 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 add_definitions(${GL_DEFINITIONS})
 
 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 69e8ebf5ca4..a4d08b15a6d 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -43,6 +43,7 @@
 #include "DNA_mask_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"  /* PET modes */
+#include "DNA_workspace_types.h"
 
 #include "BLI_alloca.h"
 #include "BLI_utildefines.h"
@@ -61,12 +62,19 @@
 #include "BKE_constraint.h"
 #include "BKE_particle.h"
 #include "BKE_unit.h"
+#include "BKE_scene.h"
 #include "BKE_mask.h"
 #include "BKE_report.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+
 #include "ED_image.h"
 #include "ED_keyframing.h"
 #include "ED_screen.h"
@@ -103,7 +111,7 @@ static void drawEdgeSlide(TransInfo *t);
 static void drawVertSlide(TransInfo *t);
 static void postInputRotation(TransInfo *t, float values[3]);
 
-static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], const short around);
+static void ElementRotation(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3], const short around);
 static void initSnapSpatial(TransInfo *t, float r_snap[3]);
 
 
@@ -204,7 +212,8 @@ static bool transdata_check_local_center(TransInfo *t, short around)
 {
 	return ((around == V3D_AROUND_LOCAL_ORIGINS) && (
 	            (t->flag & (T_OBJECT | T_POSE)) ||
-	            (t->obedit && ELEM(t->obedit->type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE)) ||
+	            /* implicit: (t->flag & T_EDIT) */
+	            (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE)) ||
 	            (t->spacetype == SPACE_IPO) ||
 	            (t->options & (CTX_MOVIECLIP | CTX_MASK | CTX_PAINT_CURVE)))
 	        );
@@ -213,7 +222,7 @@ static bool transdata_check_local_center(TransInfo *t, short around)
 bool transdata_check_local_islands(TransInfo *t, short around)
 {
 	return ((around == V3D_AROUND_LOCAL_ORIGINS) && (
-	        (t->obedit && ELEM(t->obedit->type, OB_MESH))));
+	        (ELEM(t->obedit_type, OB_MESH))));
 }
 
 /* ************************** SPACE DEPENDANT CODE **************************** */
@@ -238,6 +247,7 @@ void setTransformViewMatrices(TransInfo *t)
 	}
 
 	calculateCenter2D(t);
+	calculateCenterLocal(t, t->center_global);
 }
 
 void setTransformViewAspect(TransInfo *t, float r_aspect[3])
@@ -612,8 +622,12 @@ static void viewRedrawForce(const bContext *C, TransInfo *t)
 		else {
 			// XXX how to deal with lock?
 			SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first;
-			if (sima->lock) WM_event_add_notifier(C, NC_GEOM | ND_DATA, t->obedit->data);
-			else ED_area_tag_redraw(t->sa);
+			if (sima->lock) {
+				WM_event_add_notifier(C, NC_GEOM | ND_DATA, OBEDIT_FROM_VIEW_LAYER(t->view_layer)->data);
+			}
+			else {
+				ED_area_tag_redraw(t->sa);
+			}
 		}
 	}
 	else if (t->spacetype == SPACE_CLIP) {
@@ -1017,7 +1031,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
 					handled = true;
 				}
 				else {
-					if (t->obedit && t->obedit->type == OB_MESH) {
+					if (t->obedit_type == OB_MESH) {
 						if ((t->mode == TFM_TRANSLATION) && (t->spacetype == SPACE_VIEW3D)) {
 							restoreTransObjects(t);
 							resetTransModal(t);
@@ -1027,11 +1041,13 @@ int transformEvent(TransInfo *t, const wmEvent *event)
 							initEdgeSlide(t);
 							/* if that fails, do vertex slide */
 							if (t->state == TRANS_CANCEL) {
+								resetTransModal(t);
 								t->state = TRANS_STARTING;
 								initVertSlide(t);
 							}
 							/* vert slide can fail on unconnected vertices (rare but possible) */
 							if (t->state == TRANS_CANCEL) {
+								resetTransModal(t);
 								t->mode = TFM_TRANSLATION;
 								t->state = TRANS_STARTING;
 								restoreTransObjects(t);
@@ -1547,6 +1563,8 @@ bool calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], floa
 	TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data");
 	bool success;
 
+	t->context = C;
+
 	t->state = TRANS_RUNNING;
 
 	/* avoid calculating PET */
@@ -1563,7 +1581,7 @@ bool calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], floa
 
 	t->around = centerMode;             // override userdefined mode
 
-	if (t->total == 0) {
+	if (t->data_len_all == 0) {
 		success = false;
 	}
 	else {
@@ -1598,8 +1616,16 @@ typedef enum {
 	LEFT,
 	RIGHT
 } ArrowDirection;
+
+#define POS_INDEX 0
+/* NOTE: this --^ is a bit hackish, but simplifies Gwn_VertFormat usage among functions
+ * private to this file  - merwin
+ */
+
 static void drawArrow(ArrowDirection d, short offset, short length, short size)
 {
+	immBegin(GWN_PRIM_LINES, 6);
+
 	switch (d) {
 		case LEFT:
 			offset = -offset;
@@ -1607,14 +1633,12 @@ static void drawArrow(ArrowDirection d, short offset, short length, short size)
 			size = -size;
 			ATTR_FALLTHROUGH;
 		case RIGHT:
-			glBegin(GL_LINES);
-			glVertex2s(offset, 0);
-			glVertex2s(offset + length, 0);
-			glVertex2s(offset + length, 0);
-			glVertex2s(offset + length - size, -size);
-			glVertex2s(offset + length, 0);
-			glVertex2s(offset + length - size,  size);
-			glEnd();
+			immVertex2f(POS_INDEX, offset, 0);
+			immVertex2f(POS_INDEX, offset + length, 0);
+			immVertex2f(POS_INDEX, offset + length, 0);
+			immVertex2f(POS_INDEX, offset + length - size, -size);
+			immVertex2f(POS_INDEX, offset + length, 0);
+			immVertex2f(POS_INDEX, offset + length - size,  size);
 			break;
 
 		case DOWN:
@@ -1623,45 +1647,45 @@ static void drawArrow(ArrowDirection d, short offset, short length, short size)
 			size = -size;
 			ATTR_FALLTHROUGH;
 		case UP:
-			glBegin(GL_LINES);
-			glVertex2s(0, offset);
-			glVertex2s(0, offset + length);
-			glVertex2s(0, offset + length);
-			glVertex2s(-size, offset + length - size);
-			glVertex2s(0, offset + length);
-			glVertex2s(size, offset + length - size);
-			glEnd();
+			immVertex2f(POS_INDEX, 0, offset);
+			immVertex2f(POS_INDEX, 0, offset + length);
+			immVertex2f(POS_INDEX, 0, offset + length);
+			immVertex2f(POS_INDEX, -size, offset + length - size);
+			immVertex2f(POS_INDEX, 0, offset + length);
+			immVertex2f(POS_INDEX, size, offset + length - size);
 			break;
 	}
+
+	immEnd();
 }
 
 static void drawArrowHead(ArrowDirection d, short size)
 {
+	immBegin(GWN_PRIM_LINES, 4);
+
 	switch (d) {
 		case LEFT:
 			size = -size;
 			ATTR_FALLTHROUGH;
 		case RIGHT:
-			glBegin(GL_LINES);
-			glVertex2s(0, 0);
-			glVertex2s(-size, -size);
-			glVertex2s(0, 0);
-			glVertex2s(-size,  size);
-			glEnd();
+			immVertex2f(POS_INDEX, 0, 0);
+			immVertex2f(POS_INDEX, -size, -size);
+			immVertex2f(POS_INDEX, 0, 0);
+			immVertex2f(POS_INDEX, -size,  size);
 			break;
 
 		case DOWN:
 			size = -size;
 			ATTR_FALLTHROUGH;
 		case UP:
-			glBegin(GL_LINES);
-			glVertex2s(0, 0);
-			glVertex2s(-size, -size);
-			glVertex2s(0, 0);
-			glVertex2s(size, -size);
-			glEnd();
+			immVertex2f(POS_INDEX, 0, 0);
+			immVertex2f(POS_INDEX, -size, -size);
+			immVertex2f(POS_INDEX, 0, 0);
+			immVertex2f(POS_INDEX, size, -size);
 			break;
 	}
+
+	immEnd();
 }
 
 static void drawArc(float size, float angle_start, float angle_end, int segments)
@@ -1670,14 +1694,14 @@ static void drawArc(float size, float angle_start, float angle_end, int segments
 	float angle;
 	int a;
 
-	glBegin(GL_LINE_STRIP);
+	immBegin(GWN_PRIM_LINE_STRIP, segments + 1);
 
 	for (angle = angle_start, a = 0; a < segments; angle += delta, a++) {
-		glVertex2f(cosf(angle) * size, sinf(angle) * size);
+		immVertex2f(POS_INDEX, cosf(angle) * size, sinf(angle) * size);
 	}
-	glVertex2f(cosf(angle_end) * size, sinf(angle_end) * size);
+	immVertex2f(POS_INDEX, cosf(angle_end) * size, sinf(angle_end) * size);
 
-	glEnd();
+	immEnd();
 }
 
 static int helpline_poll(bContext *C)
@@ -1693,88 +1717,122 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
 {
 	TransInfo *t = (TransInfo *)customdata;
 
-	if (t->helpline != HLP_NONE && !(t->flag & T_USES_MANIPULATOR)) {
+	if (t->helpline != HLP_NONE) {
 		float cent[2];
-		int mval[2];
-
-		mval[0] = x;
-		mval[1] = y;
+		float mval[3] = {
+		    x,
+		    y,
+		    0.0f,
+		};
+		float tmval[2] = {
+		    (float)t->mval[0],
+		    (float)t->mval[1],
+		};
 
 		projectFloatViewEx(t, t->center_global, cent, V3D_PROJ_TEST_CLIP_ZERO);
 
-		glPushMatrix();
+		/* Offset the values for the area region. */
+		const float offset[2] = {
+		    t->ar->winrct.xmin,
+		    t->ar->winrct.ymin,
+		};
+
+		for (int i = 0; i < 2; i++) {
+			cent[i] += offset[i];
+			tmval[i] += offset[i];
+		}
+
+		gpuPushMatrix();
+
+		/* Dashed lines first. */
+		if (ELEM(t->helpline, HLP_SPRING, HLP_ANGLE)) {
+			const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			UNUSED_VARS_NDEBUG(shdr_pos); /* silence warning */
+			BLI_assert(shdr_pos == POS_INDEX);
+
+			glLineWidth(1.0f);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+			immUniform1i("num_colors", 0);  /* "simple" mode */
+			immUniformThemeColor(TH_VIEW_OVERLAY);
+			immUniform1f("dash_width", 6.0f);
+			immUniform1f("dash_factor", 0.5f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex2fv(POS_INDEX, cent);
+			immVertex2f(POS_INDEX, tmval[0], tmval[1]);
+			immEnd();
+
+			immUnbindProgram();
+		}
+
+		/* And now, solid lines. */
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		UNUSED_VARS_NDEBUG(pos); /* silence warning */
+		BLI_assert(pos == POS_INDEX);
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 		switch (t->helpline) {
 			case HLP_SPRING:
-				UI_ThemeColor(TH_VIEW_OVERLAY);
+				immUniformThemeColor(TH_VIEW_OVERLAY);
 
-				setlinestyle(3);
-				glLineWidth(1);
-				glBegin(GL_LINES);
-				glVertex2iv(t->mval);
-				glVertex2fv(cent);
-				glEnd();
+				gpuTranslate3fv(mval);
+				gpuRotateAxis(-RAD2DEGF(atan2f(cent[0] - tmval[0], cent[1] - tmval[1])), 'Z');
 
-				glTranslate2iv(mval);
-				glRotatef(-RAD2DEGF(atan2f(cent[0] - t->mval[0], cent[1] - t->mval[1])), 0, 0, 1);
-
-				setlinestyle(0);
-				glLineWidth(3.0);
+				glLineWidth(3.0f);
 				drawArrow(UP, 5, 10, 5);
 				drawArrow(DOWN, 5, 10, 5);
 				break;
 			case HLP_HARROW:
-				UI_ThemeColor(TH_VIEW_OVERLAY);
-
-				glTranslate2iv(mval);
+				immUniformThemeColor(TH_VIEW_OVERLAY);
+				gpuTranslate3fv(mval);
 
-				glLineWidth(3.0);
+				glLineWidth(3.0f);
 				drawArrow(RIGHT, 5, 10, 5);
 				drawArrow(LEFT, 5, 10, 5);
 				break;
 			case HLP_VARROW:
-				UI_ThemeColor(TH_VIEW_OVERLAY);
+				immUniformThemeColor(TH_VIEW_OVERLAY);
 
-				glTranslate2iv(mval);
+				gpuTranslate3fv(mval);
 
-				glLineWidth(3.0);
+				glLineWidth(3.0f);
 				drawArrow(UP, 5, 10, 5);
 				drawArrow(DOWN, 5, 10, 5);
 				break;
 			case HLP_ANGLE:
 			{
-				float dx = t->mval[0] - cent[0], dy = t->mval[1] - cent[1];
+				float dx = tmval[0] - cent[0], dy = tmval[1] - cent[1];
 				float angle = atan2f(dy, dx);
 				float dist = hypotf(dx, dy);
 				float delta_angle = min_ff(15.0f / dist, (float)M_PI / 4.0f);
 				float spacing_angle = min_ff(5.0f / dist, (float)M_PI / 12.0f);
-				UI_ThemeColor(TH_VIEW_OVERLAY);
 
-				setlinestyle(3);
-				glLineWidth(1);
-				glBegin(GL_LINES);
-				glVertex2iv(t->mval);
-				glVertex2fv(cent);
-				glEnd();
+				immUniformThemeColor(TH_VIEW_OVERLAY);
 
-				glTranslatef(cent[0] - t->mval[0] + mval[0], cent[1] - t->mval[1] + mval[1], 0);
+				gpuTranslate3f(cent[0] - tmval[0] + mval[0], cent[1] - tmval[1] + mval[1], 0);
 
-				setlinestyle(0);
-				glLineWidth(3.0);
+				glLineWidth(3.0f);
 				drawArc(dist, angle - delta_angle, angle - spacing_angle, 10);
 				drawArc(dist, angle + spacing_angle, angle + delta_angle, 10);
 
-				glPushMatrix();
+				gpuPushMatrix();
 
-				glTranslatef(cosf(angle - delta_angle) * dist, sinf(angle - delta_angle) * dist, 0);
-				glRotatef(RAD2DEGF(angle - delta_angle), 0, 0, 1);
+				gpuTranslate3f(cosf(angle - delta_angle) * dist, sinf(angle - delta_angle) * dist, 0);
+				gpuRotateAxis(RAD2DEGF(angle - delta_angle), 'Z');
 
 				drawArrowHead(DOWN, 5);
 
-				glPopMatrix();
+				gpuPopMatrix();
 
-				glTranslatef(cosf(angle + delta_angle) * dist, sinf(angle + delta_angle) * dist, 0);
-				glRotatef(RAD2DEGF(angle + delta_angle), 0, 0, 1);
+				gpuTranslate3f(cosf(angle + delta_angle) * dist, sinf(angle + delta_angle) * dist, 0);
+				gpuRotateAxis(RAD2DEGF(angle + delta_angle), 'Z');
 
 				drawArrowHead(UP, 5);
 				break;
@@ -1784,18 +1842,18 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
 				unsigned char col[3], col2[3];
 				UI_GetThemeColor3ubv(TH_GRID, col);
 
-				glTranslate2iv(mval);
+				gpuTranslate3fv(mval);
 
-				glLineWidth(3.0);
+				glLineWidth(3.0f);
 
 				UI_make_axis_color(col, col2, 'X');
-				glColor3ubv((GLubyte *)col2);
+				immUniformColor3ubv((GLubyte *)col2);
 
 				drawArrow(RIGHT, 5, 10, 5);
 				drawArrow(LEFT, 5, 10, 5);
 
 				UI_make_axis_color(col, col2, 'Y');
-				glColor3ubv((GLubyte *)col2);
+				immUniformColor3ubv((GLubyte *)col2);
 
 				drawArrow(UP, 5, 10, 5);
 				drawArrow(DOWN, 5, 10, 5);
@@ -1803,7 +1861,8 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
 			}
 		}
 
-		glPopMatrix();
+		immUnbindProgram();
+		gpuPopMatrix();
 	}
 }
 
@@ -1811,7 +1870,7 @@ static void drawTransformView(const struct bContext *C, ARegion *UNUSED(ar), voi
 {
 	TransInfo *t = arg;
 
-	glLineWidth(1.0);
+	glLineWidth(1.0f);
 
 	drawConstraint(t);
 	drawPropCircle(C, t);
@@ -1832,7 +1891,8 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *ar)
 
 	ED_region_visible_rect(ar, &rect);
 
-	BLF_width_and_height_default(printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
+	const int font_id = BLF_default();
+	BLF_width_and_height(font_id, printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
 
 	xco = (rect.xmax - U.widget_unit) - (int)printable_size[0];
 	yco = (rect.ymax - U.widget_unit);
@@ -1840,7 +1900,9 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *ar)
 	/* warning text (to clarify meaning of overlays)
 	 * - original color was red to match the icon, but that clashes badly with a less nasty border
 	 */
-	UI_ThemeColorShade(TH_TEXT_HI, -50);
+	unsigned char color[3];
+	UI_GetThemeColorShade3ubv(TH_TEXT_HI, -50, color);
+	BLF_color3ubv(font_id, color);
 #ifdef WITH_INTERNATIONAL
 	BLF_draw_default(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
 #else
@@ -1848,7 +1910,7 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *ar)
 #endif
 
 	/* autokey recording icon... */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
 
 	xco -= U.widget_unit;
@@ -1863,7 +1925,8 @@ static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *ar, vo
 {
 	TransInfo *t = arg;
 	Scene *scene = t->scene;
-	Object *ob = OBACT;
+	ViewLayer *view_layer = t->view_layer;
+	Object *ob = OBACT(view_layer);
 
 	/* draw autokeyframing hint in the corner
 	 * - only draw if enabled (advanced users may be distracted/annoyed),
@@ -1938,7 +2001,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 					ts->proportional_fcurve = proportional;
 				else if (t->spacetype == SPACE_ACTION)
 					ts->proportional_action = proportional;
-				else if (t->obedit)
+				else if (t->obedit_type != -1)
 					ts->proportional = proportional;
 				else if (t->options & CTX_MASK)
 					ts->proportional_mask = (proportional != PROP_EDIT_OFF);
@@ -1970,9 +2033,10 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 			if ((prop = RNA_struct_find_property(op->ptr, "constraint_orientation")) &&
 			    !RNA_property_is_set(op->ptr, prop))
 			{
-				View3D *v3d = t->view;
-
-				v3d->twmode = t->current_orientation;
+				t->scene->orientation_type = t->current_orientation;
+				BLI_assert(((t->scene->orientation_index_custom == -1) && (t->custom_orientation == NULL)) ||
+				           (BKE_scene_transform_orientation_get_index(
+				                    t->scene, t->custom_orientation) == t->scene->orientation_index_custom));
 			}
 		}
 	}
@@ -1992,15 +2056,19 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 	}
 
 	if ((prop = RNA_struct_find_property(op->ptr, "constraint_axis"))) {
-		/* constraint orientation can be global, event if user selects something else
-		 * so use the orientation in the constraint if set
-		 * */
-		if (t->con.mode & CON_APPLY) {
-			RNA_enum_set(op->ptr, "constraint_orientation", t->con.orientation);
-		}
-		else {
-			RNA_enum_set(op->ptr, "constraint_orientation", t->current_orientation);
+		/* constraint orientation can be global, even if user selects something else
+		 * so use the orientation in the constraint if set */
+		short orientation = (t->con.mode & CON_APPLY) ? t->con.orientation : t->current_orientation;
+
+		if (orientation == V3D_MANIP_CUSTOM) {
+			const int orientation_index_custom = BKE_scene_transform_orientation_get_index(
+			        t->scene, t->custom_orientation);
+
+			/* Maybe we need a t->con.custom_orientation? Seems like it would always match t->custom_orientation. */
+			orientation = V3D_MANIP_CUSTOM + orientation_index_custom;
+			BLI_assert(orientation >= V3D_MANIP_CUSTOM);
 		}
+		RNA_enum_set(op->ptr, "constraint_orientation", orientation);
 
 		if (t->con.mode & CON_APPLY) {
 			if (t->con.mode & CON_AXIS0) {
@@ -2050,6 +2118,12 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 
 	t->state = TRANS_STARTING;
 
+	if ((prop = RNA_struct_find_property(op->ptr, "cursor_transform")) && RNA_property_is_set(op->ptr, prop)) {
+		if (RNA_property_boolean_get(op->ptr, prop)) {
+			options |= CTX_CURSOR;
+		}
+	}
+
 	if ((prop = RNA_struct_find_property(op->ptr, "texture_space")) && RNA_property_is_set(op->ptr, prop)) {
 		if (RNA_property_boolean_get(op->ptr, prop)) {
 			options |= CTX_TEXTURE;
@@ -2119,7 +2193,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 
 	createTransData(C, t);          // make TransData structs from selection
 
-	if (t->total == 0) {
+	if (t->data_len_all == 0) {
 		postTrans(C, t);
 		return 0;
 	}
@@ -2164,6 +2238,63 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	calculatePropRatio(t);
 	calculateCenter(t);
 
+	/* Overwrite initial values if operator supplied a non-null vector.
+	 *
+	 * Run before init functions so 'values_modal_offset' can be applied on mouse input.
+	 */
+	BLI_assert(is_zero_v4(t->values_modal_offset));
+	if ((prop = RNA_struct_find_property(op->ptr, "value")) && RNA_property_is_set(op->ptr, prop)) {
+		float values[4] = {0}; /* in case value isn't length 4, avoid uninitialized memory  */
+
+		if (RNA_property_array_check(prop)) {
+			RNA_float_get_array(op->ptr, "value", values);
+		}
+		else {
+			values[0] = RNA_float_get(op->ptr, "value");
+		}
+
+		copy_v4_v4(t->values, values);
+
+		if (t->flag & T_MODAL) {
+			copy_v4_v4(t->values_modal_offset, values);
+			t->redraw = TREDRAW_HARD;
+		}
+		else {
+			copy_v4_v4(t->auto_values, values);
+			t->flag |= T_AUTOVALUES;
+		}
+	}
+
+	/* Transformation axis from operator */
+	if ((prop = RNA_struct_find_property(op->ptr, "axis")) && RNA_property_is_set(op->ptr, prop)) {
+		RNA_property_float_get_array(op->ptr, prop, t->axis);
+		normalize_v3(t->axis);
+		copy_v3_v3(t->axis_orig, t->axis);
+	}
+
+	/* Constraint init from operator */
+	if ((prop = RNA_struct_find_property(op->ptr, "constraint_axis")) && RNA_property_is_set(op->ptr, prop)) {
+		int constraint_axis[3];
+
+		RNA_property_boolean_get_array(op->ptr, prop, constraint_axis);
+
+		if (constraint_axis[0] || constraint_axis[1] || constraint_axis[2]) {
+			t->con.mode |= CON_APPLY;
+
+			if (constraint_axis[0]) {
+				t->con.mode |= CON_AXIS0;
+			}
+			if (constraint_axis[1]) {
+				t->con.mode |= CON_AXIS1;
+			}
+			if (constraint_axis[2]) {
+				t->con.mode |= CON_AXIS2;
+			}
+
+			setUserConstraint(t, t->current_orientation, t->con.mode, "%s");
+		}
+	}
+
 	if (event) {
 		/* Initialize accurate transform to settings requested by keymap. */
 		bool use_accurate = false;
@@ -2223,7 +2354,9 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 			break;
 		case TFM_BONESIZE:
 		{   /* used for both B-Bone width (bonesize) as for deform-dist (envelope) */
-			bArmature *arm = t->poseobj->data;
+			/* Note: we have to pick one, use the active object. */
+			TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_OK(t);
+			bArmature *arm = tc->poseobj->data;
 			if (arm->drawtype == ARM_ENVELOPE) {
 				initBoneEnvelope(t);
 				t->mode = TFM_BONE_ENVELOPE_DIST;
@@ -2310,55 +2443,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		return 0;
 	}
 
-	/* Transformation axis from operator */
-	if ((prop = RNA_struct_find_property(op->ptr, "axis")) && RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_float_get_array(op->ptr, prop, t->axis);
-		normalize_v3(t->axis);
-		copy_v3_v3(t->axis_orig, t->axis);
-	}
-
-	/* Constraint init from operator */
-	if ((prop = RNA_struct_find_property(op->ptr, "constraint_axis")) && RNA_property_is_set(op->ptr, prop)) {
-		int constraint_axis[3];
-
-		RNA_property_boolean_get_array(op->ptr, prop, constraint_axis);
-
-		if (constraint_axis[0] || constraint_axis[1] || constraint_axis[2]) {
-			t->con.mode |= CON_APPLY;
-
-			if (constraint_axis[0]) {
-				t->con.mode |= CON_AXIS0;
-			}
-			if (constraint_axis[1]) {
-				t->con.mode |= CON_AXIS1;
-			}
-			if (constraint_axis[2]) {
-				t->con.mode |= CON_AXIS2;
-			}
-
-			setUserConstraint(t, t->current_orientation, t->con.mode, "%s");
-		}
-	}
-
-	/* overwrite initial values if operator supplied a non-null vector
-	 *
-	 * keep last so we can apply the constraints space.
-	 */
-	if ((prop = RNA_struct_find_property(op->ptr, "value")) && RNA_property_is_set(op->ptr, prop)) {
-		float values[4] = {0}; /* in case value isn't length 4, avoid uninitialized memory  */
-
-		if (RNA_property_array_check(prop)) {
-			RNA_float_get_array(op->ptr, "value", values);
-		}
-		else {
-			values[0] = RNA_float_get(op->ptr, "value");
-		}
-
-		copy_v4_v4(t->values, values);
-		copy_v4_v4(t->auto_values, values);
-		t->flag |= T_AUTOVALUES;
-	}
-
 	t->context = NULL;
 
 	return 1;
@@ -2621,7 +2705,7 @@ static void constraintTransLim(TransInfo *t, TransData *td)
 				}
 
 				/* get constraint targets if needed */
-				BKE_constraint_targets_for_solving_get(con, &cob, &targets, ctime);
+				BKE_constraint_targets_for_solving_get(t->depsgraph, con, &cob, &targets, ctime);
 
 				/* do constraint */
 				cti->evaluate_constraint(con, &cob, &targets);
@@ -2828,6 +2912,7 @@ static void constraintSizeLim(TransInfo *t, TransData *td)
  * \{ */
 
 struct BendCustomData {
+	/* All values are in global space. */
 	float warp_sta[3];
 	float warp_end[3];
 
@@ -2868,23 +2953,19 @@ static void initBend(TransInfo *t)
 
 	//copy_v3_v3(t->center, ED_view3d_cursor3d_get(t->scene, t->view));
 	if ((t->flag & T_OVERRIDE_CENTER) == 0) {
-		calculateCenterCursor(t, t->center);
+		calculateCenterCursor(t, t->center_global);
 	}
-	calculateCenterGlobal(t, t->center, t->center_global);
+	calculateCenterLocal(t, t->center_global);
 
 	t->val = 0.0f;
 
 	data = MEM_callocN(sizeof(*data), __func__);
 
-	curs = ED_view3d_cursor3d_get(t->scene, t->view);
+	curs = ED_view3d_cursor3d_get(t->scene, t->view)->location;
 	copy_v3_v3(data->warp_sta, curs);
 	ED_view3d_win_to_3d(t->sa->spacedata.first, t->ar, curs, mval_fl, data->warp_end);
 
 	copy_v3_v3(data->warp_nor, t->viewinv[2]);
-	if (t->flag & T_EDIT) {
-		sub_v3_v3(data->warp_sta, t->obedit->obmat[3]);
-		sub_v3_v3(data->warp_end, t->obedit->obmat[3]);
-	}
 	normalize_v3(data->warp_nor);
 
 	/* tangent */
@@ -2911,10 +2992,9 @@ static eRedrawFlag handleEventBend(TransInfo *UNUSED(t), const wmEvent *event)
 
 static void Bend(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float vec[3];
-	float pivot[3];
-	float warp_end_radius[3];
+	float pivot_global[3];
+	float warp_end_radius_global[3];
 	int i;
 	char str[UI_MAX_DRAW_STR];
 	const struct BendCustomData *data = t->custom.mode.data;
@@ -2933,7 +3013,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2]))
 #else
 	/* hrmf, snapping radius is using 'angle' steps, need to convert to something else
 	 * this isnt essential but nicer to give reasonable snapping values for radius */
-	if (t->tsnap.mode == SCE_SNAP_MODE_INCREMENT) {
+	if (t->tsnap.mode & SCE_SNAP_MODE_INCREMENT) {
 		const float radius_snap = 0.1f;
 		const float snap_hack = (t->snap[1] * data->warp_init_dist) / radius_snap;
 		values.scale *= snap_hack;
@@ -2969,64 +3049,87 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2]))
 	values.scale *= data->warp_init_dist;
 
 	/* calc 'data->warp_end' from 'data->warp_end_init' */
-	copy_v3_v3(warp_end_radius, data->warp_end);
-	dist_ensure_v3_v3fl(warp_end_radius, data->warp_sta, values.scale);
+	copy_v3_v3(warp_end_radius_global, data->warp_end);
+	dist_ensure_v3_v3fl(warp_end_radius_global, data->warp_sta, values.scale);
 	/* done */
 
 	/* calculate pivot */
-	copy_v3_v3(pivot, data->warp_sta);
+	copy_v3_v3(pivot_global, data->warp_sta);
 	if (values.angle > 0.0f) {
-		madd_v3_v3fl(pivot, data->warp_tan, -values.scale * shell_angle_to_dist((float)M_PI_2 - values.angle));
+		madd_v3_v3fl(pivot_global, data->warp_tan, -values.scale * shell_angle_to_dist((float)M_PI_2 - values.angle));
 	}
 	else {
-		madd_v3_v3fl(pivot, data->warp_tan, +values.scale * shell_angle_to_dist((float)M_PI_2 + values.angle));
+		madd_v3_v3fl(pivot_global, data->warp_tan, +values.scale * shell_angle_to_dist((float)M_PI_2 + values.angle));
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		float mat[3][3];
-		float delta[3];
-		float fac, fac_scaled;
+	/* TODO(campbell): xform, compensate object center. */
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
 
-		if (td->flag & TD_NOACTION)
-			break;
-
-		if (td->flag & TD_SKIP)
-			continue;
+		float warp_sta_local[3];
+		float warp_end_local[3];
+		float warp_end_radius_local[3];
+		float pivot_local[3];
 
-		if (UNLIKELY(values.angle == 0.0f)) {
-			copy_v3_v3(td->loc, td->iloc);
-			continue;
+		if (tc->use_local_mat) {
+			sub_v3_v3v3(warp_sta_local, data->warp_sta, tc->mat[3]);
+			sub_v3_v3v3(warp_end_local, data->warp_end, tc->mat[3]);
+			sub_v3_v3v3(warp_end_radius_local, warp_end_radius_global, tc->mat[3]);
+			sub_v3_v3v3(pivot_local, pivot_global, tc->mat[3]);
+		}
+		else {
+			copy_v3_v3(warp_sta_local, data->warp_sta);
+			copy_v3_v3(warp_end_local, data->warp_end);
+			copy_v3_v3(warp_end_radius_local, warp_end_radius_global);
+			copy_v3_v3(pivot_local, pivot_global);
 		}
 
-		copy_v3_v3(vec, td->iloc);
-		mul_m3_v3(td->mtx, vec);
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float mat[3][3];
+			float delta[3];
+			float fac, fac_scaled;
 
-		fac = line_point_factor_v3(vec, data->warp_sta, warp_end_radius);
-		if (is_clamp) {
-			CLAMP(fac, 0.0f, 1.0f);
-		}
+			if (td->flag & TD_NOACTION)
+				break;
 
-		fac_scaled = fac * td->factor;
-		axis_angle_normalized_to_mat3(mat, data->warp_nor, values.angle * fac_scaled);
-		interp_v3_v3v3(delta, data->warp_sta, warp_end_radius, fac_scaled);
-		sub_v3_v3(delta, data->warp_sta);
+			if (td->flag & TD_SKIP)
+				continue;
 
-		/* delta is subtracted, rotation adds back this offset */
-		sub_v3_v3(vec, delta);
+			if (UNLIKELY(values.angle == 0.0f)) {
+				copy_v3_v3(td->loc, td->iloc);
+				continue;
+			}
 
-		sub_v3_v3(vec, pivot);
-		mul_m3_v3(mat, vec);
-		add_v3_v3(vec, pivot);
+			copy_v3_v3(vec, td->iloc);
+			mul_m3_v3(td->mtx, vec);
 
-		mul_m3_v3(td->smtx, vec);
+			fac = line_point_factor_v3(vec, warp_sta_local, warp_end_radius_local);
+			if (is_clamp) {
+				CLAMP(fac, 0.0f, 1.0f);
+			}
 
-		/* rotation */
-		if ((t->flag & T_POINTS) == 0) {
-			ElementRotation(t, td, mat, V3D_AROUND_LOCAL_ORIGINS);
-		}
+			fac_scaled = fac * td->factor;
+			axis_angle_normalized_to_mat3(mat, data->warp_nor, values.angle * fac_scaled);
+			interp_v3_v3v3(delta, warp_sta_local, warp_end_radius_local, fac_scaled);
+			sub_v3_v3(delta, warp_sta_local);
+
+			/* delta is subtracted, rotation adds back this offset */
+			sub_v3_v3(vec, delta);
 
-		/* location */
-		copy_v3_v3(td->loc, vec);
+			sub_v3_v3(vec, pivot_local);
+			mul_m3_v3(mat, vec);
+			add_v3_v3(vec, pivot_local);
+
+			mul_m3_v3(td->smtx, vec);
+
+			/* rotation */
+			if ((t->flag & T_POINTS) == 0) {
+				ElementRotation(t, tc, td, mat, V3D_AROUND_LOCAL_ORIGINS);
+			}
+
+			/* location */
+			copy_v3_v3(td->loc, vec);
+		}
 	}
 
 	recalcData(t);
@@ -3099,7 +3202,6 @@ static eRedrawFlag handleEventShear(TransInfo *t, const wmEvent *event)
 
 static void applyShear(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float vec[3];
 	float smat[3][3], tmat[3][3], totmat[3][3], persmat[3][3], persinv[3][3];
 	float value;
@@ -3142,43 +3244,46 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2]))
 	mul_m3_m3m3(tmat, smat, persmat);
 	mul_m3_m3m3(totmat, persinv, tmat);
 
-	for (i = 0; i < t->total; i++, td++) {
-		const float *center, *co;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			const float *center, *co;
 
-		if (td->flag & TD_NOACTION)
-			break;
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (t->obedit) {
-			float mat3[3][3];
-			mul_m3_m3m3(mat3, totmat, td->mtx);
-			mul_m3_m3m3(tmat, td->smtx, mat3);
-		}
-		else {
-			copy_m3_m3(tmat, totmat);
-		}
+			if (t->flag & T_EDIT) {
+				float mat3[3][3];
+				mul_m3_m3m3(mat3, totmat, td->mtx);
+				mul_m3_m3m3(tmat, td->smtx, mat3);
+			}
+			else {
+				copy_m3_m3(tmat, totmat);
+			}
 
-		if (is_local_center) {
-			center = td->center;
-			co = td->loc;
-		}
-		else {
-			center = t->center;
-			co = td->center;
-		}
+			if (is_local_center) {
+				center = td->center;
+				co = td->loc;
+			}
+			else {
+				center = tc->center_local;
+				co = td->center;
+			}
 
-		sub_v3_v3v3(vec, co, center);
+			sub_v3_v3v3(vec, co, center);
 
-		mul_m3_v3(tmat, vec);
+			mul_m3_v3(tmat, vec);
 
-		add_v3_v3(vec, center);
-		sub_v3_v3(vec, co);
+			add_v3_v3(vec, center);
+			sub_v3_v3(vec, co);
 
-		mul_v3_fl(vec, td->factor);
+			mul_v3_fl(vec, td->factor);
 
-		add_v3_v3v3(td->loc, td->iloc, vec);
+			add_v3_v3v3(td->loc, td->iloc, vec);
+		}
 	}
 
 	recalcData(t);
@@ -3206,7 +3311,7 @@ static void initResize(TransInfo *t)
 	t->num.val_flag[1] |= NUM_NULL_ONE;
 	t->num.val_flag[2] |= NUM_NULL_ONE;
 	t->num.flag |= NUM_AFFECT_ALL;
-	if (!t->obedit) {
+	if ((t->flag & T_EDIT) == 0) {
 		t->flag |= T_NO_ZERO;
 #ifdef USE_NUM_NO_ZERO
 		t->num.val_flag[0] |= NUM_NO_ZERO;
@@ -3290,7 +3395,7 @@ static void TransMat3ToSize(float mat[3][3], float smat[3][3], float size[3])
 	if (dot_v3v3(rmat[2], smat[2]) < 0.0f) size[2] = -size[2];
 }
 
-static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
+static void ElementResize(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3])
 {
 	float tmat[3][3], smat[3][3], center[3];
 	float vec[3];
@@ -3304,7 +3409,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 	}
 
 	if (t->con.applySize) {
-		t->con.applySize(t, td, tmat);
+		t->con.applySize(t, tc, td, tmat);
 	}
 
 	/* local constraint shouldn't alter center */
@@ -3316,11 +3421,11 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 			copy_v3_v3(center, td->center);
 		}
 		else {
-			copy_v3_v3(center, t->center);
+			copy_v3_v3(center, tc->center_local);
 		}
 	}
 	else {
-		copy_v3_v3(center, t->center);
+		copy_v3_v3(center, tc->center_local);
 	}
 
 	if (td->ext) {
@@ -3391,9 +3496,8 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 	constraintTransLim(t, td);
 }
 
-static void applyResize(TransInfo *t, const int mval[2])
+static void applyResize(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td;
 	float mat[3][3];
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -3402,15 +3506,7 @@ static void applyResize(TransInfo *t, const int mval[2])
 		copy_v3_v3(t->values, t->auto_values);
 	}
 	else {
-		float ratio;
-
-		/* for manipulator, center handle, the scaling can't be done relative to center */
-		if ((t->flag & T_USES_MANIPULATOR) && t->con.mode == 0) {
-			ratio = 1.0f - ((t->mouse.imval[0] - mval[0]) + (t->mouse.imval[1] - mval[1])) / 100.0f;
-		}
-		else {
-			ratio = t->values[0];
-		}
+		float ratio = t->values[0];
 
 		copy_v3_fl(t->values, ratio);
 
@@ -3426,21 +3522,24 @@ static void applyResize(TransInfo *t, const int mval[2])
 	size_to_mat3(mat, t->values);
 
 	if (t->con.applySize) {
-		t->con.applySize(t, NULL, mat);
+		t->con.applySize(t, NULL, NULL, mat);
 	}
 
 	copy_m3_m3(t->mat, mat);    // used in manipulator
 
 	headerResize(t, t->values, str);
 
-	for (i = 0, td = t->data; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		ElementResize(t, td, mat);
+			ElementResize(t, tc, td, mat);
+		}
 	}
 
 	/* evil hack - redo resize if cliping needed */
@@ -3448,17 +3547,21 @@ static void applyResize(TransInfo *t, const int mval[2])
 		size_to_mat3(mat, t->values);
 
 		if (t->con.applySize)
-			t->con.applySize(t, NULL, mat);
+			t->con.applySize(t, NULL, NULL, mat);
 
-		for (i = 0, td = t->data; i < t->total; i++, td++)
-			ElementResize(t, td, mat);
 
-		/* In proportional edit it can happen that */
-		/* vertices in the radius of the brush end */
-		/* outside the clipping area               */
-		/* XXX HACK - dg */
-		if (t->flag & T_PROP_EDIT_ALL) {
-			clipUVData(t);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++)
+				ElementResize(t, tc, td, mat);
+
+			/* In proportional edit it can happen that */
+			/* vertices in the radius of the brush end */
+			/* outside the clipping area               */
+			/* XXX HACK - dg */
+			if (t->flag & T_PROP_EDIT_ALL) {
+				clipUVData(t);
+			}
 		}
 	}
 
@@ -3487,7 +3590,7 @@ static void initSkinResize(TransInfo *t)
 	t->num.val_flag[1] |= NUM_NULL_ONE;
 	t->num.val_flag[2] |= NUM_NULL_ONE;
 	t->num.flag |= NUM_AFFECT_ALL;
-	if (!t->obedit) {
+	if ((t->flag & T_EDIT) == 0) {
 		t->flag |= T_NO_ZERO;
 #ifdef USE_NUM_NO_ZERO
 		t->num.val_flag[0] |= NUM_NO_ZERO;
@@ -3511,7 +3614,6 @@ static void initSkinResize(TransInfo *t)
 
 static void applySkinResize(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td;
 	float size[3], mat[3][3];
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -3536,31 +3638,34 @@ static void applySkinResize(TransInfo *t, const int UNUSED(mval[2]))
 
 	headerResize(t, size, str);
 
-	for (i = 0, td = t->data; i < t->total; i++, td++) {
-		float tmat[3][3], smat[3][3];
-		float fsize[3];
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float tmat[3][3], smat[3][3];
+			float fsize[3];
 
-		if (td->flag & TD_NOACTION)
-			break;
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (t->flag & T_EDIT) {
-			mul_m3_m3m3(smat, mat, td->mtx);
-			mul_m3_m3m3(tmat, td->smtx, smat);
-		}
-		else {
-			copy_m3_m3(tmat, mat);
-		}
+			if (t->flag & T_EDIT) {
+				mul_m3_m3m3(smat, mat, td->mtx);
+				mul_m3_m3m3(tmat, td->smtx, smat);
+			}
+			else {
+				copy_m3_m3(tmat, mat);
+			}
 
-		if (t->con.applySize) {
-			t->con.applySize(t, NULL, tmat);
-		}
+			if (t->con.applySize) {
+				t->con.applySize(t, NULL, NULL, tmat);
+			}
 
-		mat3_to_size(fsize, tmat);
-		td->val[0] = td->ext->isize[0] * (1 + (fsize[0] - 1) * td->factor);
-		td->val[1] = td->ext->isize[1] * (1 + (fsize[1] - 1) * td->factor);
+			mat3_to_size(fsize, tmat);
+			td->val[0] = td->ext->isize[0] * (1 + (fsize[0] - 1) * td->factor);
+			td->val[1] = td->ext->isize[1] * (1 + (fsize[1] - 1) * td->factor);
+		}
 	}
 
 	recalcData(t);
@@ -3578,7 +3683,6 @@ static void applySkinResize(TransInfo *t, const int UNUSED(mval[2]))
 
 static void initToSphere(TransInfo *t)
 {
-	TransData *td = t->data;
 	int i;
 
 	t->mode = TFM_TOSPHERE;
@@ -3600,11 +3704,14 @@ static void initToSphere(TransInfo *t)
 	t->flag |= T_NO_CONSTRAINT;
 
 	// Calculate average radius
-	for (i = 0; i < t->total; i++, td++) {
-		t->val += len_v3v3(t->center, td->iloc);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			t->val += len_v3v3(tc->center_local, td->iloc);
+		}
 	}
 
-	t->val /= (float)t->total;
+	t->val /= (float)t->data_len_all;
 }
 
 static void applyToSphere(TransInfo *t, const int UNUSED(mval[2]))
@@ -3613,7 +3720,6 @@ static void applyToSphere(TransInfo *t, const int UNUSED(mval[2]))
 	float ratio, radius;
 	int i;
 	char str[UI_MAX_DRAW_STR];
-	TransData *td = t->data;
 
 	ratio = t->values[0];
 
@@ -3638,27 +3744,28 @@ static void applyToSphere(TransInfo *t, const int UNUSED(mval[2]))
 		BLI_snprintf(str, sizeof(str), IFACE_("To Sphere: %.4f %s"), ratio, t->proptext);
 	}
 
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float tratio;
+			if (td->flag & TD_NOACTION)
+				break;
 
-	for (i = 0; i < t->total; i++, td++) {
-		float tratio;
-		if (td->flag & TD_NOACTION)
-			break;
-
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		sub_v3_v3v3(vec, td->iloc, t->center);
+			sub_v3_v3v3(vec, td->iloc, tc->center_local);
 
-		radius = normalize_v3(vec);
+			radius = normalize_v3(vec);
 
-		tratio = ratio * td->factor;
+			tratio = ratio * td->factor;
 
-		mul_v3_fl(vec, radius * (1.0f - tratio) + t->val * tratio);
+			mul_v3_fl(vec, radius * (1.0f - tratio) + t->val * tratio);
 
-		add_v3_v3v3(td->loc, t->center, vec);
+			add_v3_v3v3(td->loc, tc->center_local, vec);
+		}
 	}
 
-
 	recalcData(t);
 
 	ED_area_headerprint(t->sa, str);
@@ -3675,7 +3782,7 @@ static void applyToSphere(TransInfo *t, const int UNUSED(mval[2]))
 static void postInputRotation(TransInfo *t, float values[3])
 {
 	if ((t->con.mode & CON_APPLY) && t->con.applyRot) {
-		t->con.applyRot(t, NULL, t->axis, values);
+		t->con.applyRot(t, NULL, NULL, t->axis, values);
 	}
 }
 
@@ -3720,7 +3827,7 @@ static void initRotation(TransInfo *t)
  *
  * Protected axis and other transform settings are taken into account.
  */
-static void ElementRotation_ex(TransInfo *t, TransData *td, float mat[3][3], const float *center)
+static void ElementRotation_ex(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3], const float *center)
 {
 	float vec[3], totmat[3][3], smat[3][3];
 	float eul[3], fmat[3][3], quat[4];
@@ -3764,18 +3871,14 @@ static void ElementRotation_ex(TransInfo *t, TransData *td, float mat[3][3], con
 	 * has been computed, it has to be converted back into the bone's space.
 	 */
 	else if (t->flag & T_POSE) {
-		float pmtx[3][3], imtx[3][3];
-
 		// Extract and invert armature object matrix
-		copy_m3_m4(pmtx, t->poseobj->obmat);
-		invert_m3_m3(imtx, pmtx);
 
 		if ((td->flag & TD_NO_LOC) == 0) {
 			sub_v3_v3v3(vec, td->center, center);
 
-			mul_m3_v3(pmtx, vec);   // To Global space
+			mul_m3_v3(tc->mat3, vec);   // To Global space
 			mul_m3_v3(mat, vec);        // Applying rotation
-			mul_m3_v3(imtx, vec);   // To Local space
+			mul_m3_v3(tc->imat3, vec);  // To Local space
 
 			add_v3_v3(vec, center);
 			/* vec now is the location where the object has to be */
@@ -3787,11 +3890,11 @@ static void ElementRotation_ex(TransInfo *t, TransData *td, float mat[3][3], con
 				/* do nothing */
 			}
 			else if (td->flag & TD_PBONE_LOCAL_MTX_C) {
-				mul_m3_v3(pmtx, vec);   // To Global space
+				mul_m3_v3(tc->mat3, vec);        // To Global space
 				mul_m3_v3(td->ext->l_smtx, vec); // To Pose space (Local Location)
 			}
 			else {
-				mul_m3_v3(pmtx, vec);   // To Global space
+				mul_m3_v3(tc->mat3, vec); // To Global space
 				mul_m3_v3(td->smtx, vec); // To Pose space
 			}
 
@@ -3933,7 +4036,7 @@ static void ElementRotation_ex(TransInfo *t, TransData *td, float mat[3][3], con
 	}
 }
 
-static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], const short around)
+static void ElementRotation(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3], const short around)
 {
 	const float *center;
 
@@ -3942,37 +4045,39 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], const
 		center = td->center;
 	}
 	else {
-		center = t->center;
+		center = tc->center_local;
 	}
 
-	ElementRotation_ex(t, td, mat, center);
+	ElementRotation_ex(t, tc, td, mat, center);
 }
 
 static void applyRotationValue(TransInfo *t, float angle, float axis[3])
 {
-	TransData *td = t->data;
 	float mat[3][3];
 	int i;
 
 	axis_angle_normalized_to_mat3(mat, axis, angle);
 
-	for (i = 0; i < t->total; i++, td++) {
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
 
-		if (td->flag & TD_NOACTION)
-			break;
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (t->con.applyRot) {
-			t->con.applyRot(t, td, axis, NULL);
-			axis_angle_normalized_to_mat3(mat, axis, angle * td->factor);
-		}
-		else if (t->flag & T_PROP_EDIT) {
-			axis_angle_normalized_to_mat3(mat, axis, angle * td->factor);
-		}
+			if (t->con.applyRot) {
+				t->con.applyRot(t, tc, td, axis, NULL);
+				axis_angle_normalized_to_mat3(mat, axis, angle * td->factor);
+			}
+			else if (t->flag & T_PROP_EDIT) {
+				axis_angle_normalized_to_mat3(mat, axis, angle * td->factor);
+			}
 
-		ElementRotation(t, td, mat, t->around);
+			ElementRotation(t, tc, td, mat, t->around);
+		}
 	}
 }
 
@@ -3988,7 +4093,7 @@ static void applyRotation(TransInfo *t, const int UNUSED(mval[2]))
 	snapGridIncrement(t, &final);
 
 	if ((t->con.mode & CON_APPLY) && t->con.applyRot) {
-		t->con.applyRot(t, NULL, t->axis, NULL);
+		t->con.applyRot(t, NULL, NULL, t->axis, NULL);
 	}
 	else {
 		/* reset axis if constraint is not set */
@@ -4057,7 +4162,6 @@ static void initTrackball(TransInfo *t)
 
 static void applyTrackballValue(TransInfo *t, const float axis1[3], const float axis2[3], float angles[2])
 {
-	TransData *td = t->data;
 	float mat[3][3];
 	float axis[3];
 	float angle;
@@ -4068,18 +4172,21 @@ static void applyTrackballValue(TransInfo *t, const float axis1[3], const float
 	angle = normalize_v3(axis);
 	axis_angle_normalized_to_mat3(mat, axis, angle);
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (t->flag & T_PROP_EDIT) {
-			axis_angle_normalized_to_mat3(mat, axis, td->factor * angle);
-		}
+			if (t->flag & T_PROP_EDIT) {
+				axis_angle_normalized_to_mat3(mat, axis, td->factor * angle);
+			}
 
-		ElementRotation(t, td, mat, t->around);
+			ElementRotation(t, tc, td, mat, t->around);
+		}
 	}
 }
 
@@ -4334,81 +4441,83 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_
 
 static void applyTranslationValue(TransInfo *t, const float vec[3])
 {
-	TransData *td = t->data;
+	const bool apply_snap_align_rotation = usingSnappingNormal(t);// && (t->tsnap.status & POINT_INIT);
 	float tvec[3];
 
 	/* The ideal would be "apply_snap_align_rotation" only when a snap point is found
 	 * so, maybe inside this function is not the best place to apply this rotation.
 	 * but you need "handle snapping rotation before doing the translation" (really?) */
-	const bool apply_snap_align_rotation = usingSnappingNormal(t);// && (t->tsnap.status & POINT_INIT);
-	float pivot[3];
-	if (apply_snap_align_rotation) {
-		copy_v3_v3(pivot, t->tsnap.snapTarget);
-		/* The pivot has to be in local-space (see T49494) */
-		if (t->flag & (T_EDIT | T_POSE)) {
-			Object *ob = t->obedit ? t->obedit : t->poseobj;
-			mul_m4_v3(ob->imat, pivot);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+
+		float pivot[3];
+		if (apply_snap_align_rotation) {
+			copy_v3_v3(pivot, t->tsnap.snapTarget);
+			/* The pivot has to be in local-space (see T49494) */
+			if (tc->use_local_mat) {
+				mul_m4_v3(tc->imat, pivot);
+			}
 		}
-	}
 
-	for (int i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+		TransData *td = tc->data;
+		for (int i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		float rotate_offset[3] = {0};
-		bool use_rotate_offset = false;
+			float rotate_offset[3] = {0};
+			bool use_rotate_offset = false;
 
-		/* handle snapping rotation before doing the translation */
-		if (apply_snap_align_rotation) {
-			float mat[3][3];
+			/* handle snapping rotation before doing the translation */
+			if (apply_snap_align_rotation) {
+				float mat[3][3];
 
-			if (validSnappingNormal(t)) {
-				const float *original_normal;
+				if (validSnappingNormal(t)) {
+					const float *original_normal;
 
-				/* In pose mode, we want to align normals with Y axis of bones... */
-				if (t->flag & T_POSE)
-					original_normal = td->axismtx[1];
-				else
-					original_normal = td->axismtx[2];
+					/* In pose mode, we want to align normals with Y axis of bones... */
+					if (t->flag & T_POSE)
+						original_normal = td->axismtx[1];
+					else
+						original_normal = td->axismtx[2];
 
-				rotation_between_vecs_to_mat3(mat, original_normal, t->tsnap.snapNormal);
-			}
-			else {
-				unit_m3(mat);
-			}
+					rotation_between_vecs_to_mat3(mat, original_normal, t->tsnap.snapNormal);
+				}
+				else {
+					unit_m3(mat);
+				}
 
-			ElementRotation_ex(t, td, mat, pivot);
+				ElementRotation_ex(t, tc, td, mat, pivot);
 
-			if (td->loc) {
-				use_rotate_offset = true;
-				sub_v3_v3v3(rotate_offset, td->loc, td->iloc);
+				if (td->loc) {
+					use_rotate_offset = true;
+					sub_v3_v3v3(rotate_offset, td->loc, td->iloc);
+				}
 			}
-		}
 
-		if (t->con.applyVec) {
-			float pvec[3];
-			t->con.applyVec(t, td, vec, tvec, pvec);
-		}
-		else {
-			copy_v3_v3(tvec, vec);
-		}
+			if (t->con.applyVec) {
+				float pvec[3];
+				t->con.applyVec(t, tc, td, vec, tvec, pvec);
+			}
+			else {
+				copy_v3_v3(tvec, vec);
+			}
 
-		if (use_rotate_offset) {
-			add_v3_v3(tvec, rotate_offset);
-		}
+			if (use_rotate_offset) {
+				add_v3_v3(tvec, rotate_offset);
+			}
 
-		mul_m3_v3(td->smtx, tvec);
-		mul_v3_fl(tvec, td->factor);
+			mul_m3_v3(td->smtx, tvec);
+			mul_v3_fl(tvec, td->factor);
 
-		protectedTransBits(td->protectflag, tvec);
+			protectedTransBits(td->protectflag, tvec);
 
-		if (td->loc)
-			add_v3_v3v3(td->loc, td->iloc, tvec);
+			if (td->loc)
+				add_v3_v3v3(td->loc, td->iloc, tvec);
 
-		constraintTransLim(t, td);
+			constraintTransLim(t, td);
+		}
 	}
 }
 
@@ -4434,7 +4543,7 @@ static void applyTranslation(TransInfo *t, const int UNUSED(mval[2]))
 
 	if (t->con.mode & CON_APPLY) {
 		float pvec[3] = {0.0f, 0.0f, 0.0f};
-		t->con.applyVec(t, NULL, t->values, value_final, pvec);
+		t->con.applyVec(t, NULL, NULL, t->values, value_final, pvec);
 		headerTranslation(t, pvec, str);
 
 		/* only so we have re-usable value with redo, see T46741. */
@@ -4478,7 +4587,7 @@ static void applyTranslation(TransInfo *t, const int UNUSED(mval[2]))
 static void initShrinkFatten(TransInfo *t)
 {
 	// If not in mesh edit mode, fallback to Resize
-	if (t->obedit == NULL || t->obedit->type != OB_MESH) {
+	if ((t->flag & T_EDIT) == 0 || (t->obedit_type != OB_MESH)) {
 		initResize(t);
 	}
 	else {
@@ -4508,7 +4617,6 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 	int i;
 	char str[UI_MAX_DRAW_STR];
 	size_t ofs = 0;
-	TransData *td = t->data;
 
 	distance = -t->values[0];
 
@@ -4545,21 +4653,24 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 	             WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0));
 	/* done with header string */
 
-	for (i = 0; i < t->total; i++, td++) {
-		float tdistance;  /* temp dist */
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float tdistance;  /* temp dist */
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		/* get the final offset */
-		tdistance = distance * td->factor;
-		if (td->ext && (t->flag & T_ALT_TRANSFORM)) {
-			tdistance *= td->ext->isize[0];  /* shell factor */
-		}
+			/* get the final offset */
+			tdistance = distance * td->factor;
+			if (td->ext && (t->flag & T_ALT_TRANSFORM)) {
+				tdistance *= td->ext->isize[0];  /* shell factor */
+			}
 
-		madd_v3_v3v3fl(td->loc, td->iloc, td->axismtx[2], tdistance);
+			madd_v3_v3v3fl(td->loc, td->iloc, td->axismtx[2], tdistance);
+		}
 	}
 
 	recalcData(t);
@@ -4599,7 +4710,6 @@ static void initTilt(TransInfo *t)
 
 static void applyTilt(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	int i;
 	char str[UI_MAX_DRAW_STR];
 
@@ -4627,15 +4737,18 @@ static void applyTilt(TransInfo *t, const int UNUSED(mval[2]))
 		BLI_snprintf(str, sizeof(str), IFACE_("Tilt: %.2f° %s"), RAD2DEGF(final), t->proptext);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			*td->val = td->ival + final * td->factor;
+			if (td->val) {
+				*td->val = td->ival + final * td->factor;
+			}
 		}
 	}
 
@@ -4679,7 +4792,6 @@ static void initCurveShrinkFatten(TransInfo *t)
 
 static void applyCurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float ratio;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -4703,18 +4815,21 @@ static void applyCurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 		BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			*td->val = td->ival * ratio;
-			/* apply PET */
-			*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
-			if (*td->val <= 0.0f) *td->val = 0.001f;
+			if (td->val) {
+				*td->val = td->ival * ratio;
+				/* apply PET */
+				*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+				if (*td->val <= 0.0f) *td->val = 0.001f;
+			}
 		}
 	}
 
@@ -4758,7 +4873,6 @@ static void initMaskShrinkFatten(TransInfo *t)
 
 static void applyMaskShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td;
 	float ratio;
 	int i;
 	bool initial_feather = false;
@@ -4787,35 +4901,41 @@ static void applyMaskShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 	if (ratio > 1.0f) {
 		initial_feather = true;
 
-		for (td = t->data, i = 0; i < t->total; i++, td++) {
-			if (td->flag & TD_NOACTION)
-				break;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				if (td->flag & TD_NOACTION)
+					break;
 
-			if (td->flag & TD_SKIP)
-				continue;
+				if (td->flag & TD_SKIP)
+					continue;
 
-			if (td->ival >= 0.001f)
-				initial_feather = false;
+				if (td->ival >= 0.001f)
+					initial_feather = false;
+			}
 		}
 	}
 
 	/* apply shrink/fatten */
-	for (td = t->data, i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (td = tc->data, i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			if (initial_feather)
-				*td->val = td->ival + (ratio - 1.0f) * 0.01f;
-			else
-				*td->val = td->ival * ratio;
+			if (td->val) {
+				if (initial_feather)
+					*td->val = td->ival + (ratio - 1.0f) * 0.01f;
+				else
+					*td->val = td->ival * ratio;
 
-			/* apply PET */
-			*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
-			if (*td->val <= 0.0f) *td->val = 0.001f;
+				/* apply PET */
+				*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+				if (*td->val <= 0.0f) *td->val = 0.001f;
+			}
 		}
 	}
 
@@ -4859,7 +4979,6 @@ static void initGPShrinkFatten(TransInfo *t)
 
 static void applyGPShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float ratio;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -4883,18 +5002,21 @@ static void applyGPShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 		BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			*td->val = td->ival * ratio;
-			/* apply PET */
-			*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
-			if (*td->val <= 0.0f) *td->val = 0.001f;
+			if (td->val) {
+				*td->val = td->ival * ratio;
+				/* apply PET */
+				*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+				if (*td->val <= 0.0f) *td->val = 0.001f;
+			}
 		}
 	}
 
@@ -4936,7 +5058,6 @@ static void applyPushPull(TransInfo *t, const int UNUSED(mval[2]))
 	float distance;
 	int i;
 	char str[UI_MAX_DRAW_STR];
-	TransData *td = t->data;
 
 	distance = t->values[0];
 
@@ -4960,35 +5081,38 @@ static void applyPushPull(TransInfo *t, const int UNUSED(mval[2]))
 	}
 
 	if (t->con.applyRot && t->con.mode & CON_APPLY) {
-		t->con.applyRot(t, NULL, axis_global, NULL);
+		t->con.applyRot(t, NULL, NULL, axis_global, NULL);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
-
-		if (td->flag & TD_SKIP)
-			continue;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		sub_v3_v3v3(vec, t->center, td->center);
-		if (t->con.applyRot && t->con.mode & CON_APPLY) {
-			float axis[3];
-			copy_v3_v3(axis, axis_global);
-			t->con.applyRot(t, td, axis, NULL);
+			if (td->flag & TD_SKIP)
+				continue;
 
-			mul_m3_v3(td->smtx, axis);
-			if (isLockConstraint(t)) {
-				float dvec[3];
-				project_v3_v3v3(dvec, vec, axis);
-				sub_v3_v3(vec, dvec);
-			}
-			else {
-				project_v3_v3v3(vec, vec, axis);
+			sub_v3_v3v3(vec, tc->center_local, td->center);
+			if (t->con.applyRot && t->con.mode & CON_APPLY) {
+				float axis[3];
+				copy_v3_v3(axis, axis_global);
+				t->con.applyRot(t, tc, td, axis, NULL);
+
+				mul_m3_v3(td->smtx, axis);
+				if (isLockConstraint(t)) {
+					float dvec[3];
+					project_v3_v3v3(dvec, vec, axis);
+					sub_v3_v3(vec, dvec);
+				}
+				else {
+					project_v3_v3v3(vec, vec, axis);
+				}
 			}
-		}
-		normalize_v3_length(vec, distance * td->factor);
+			normalize_v3_length(vec, distance * td->factor);
 
-		add_v3_v3v3(td->loc, td->iloc, vec);
+			add_v3_v3v3(td->loc, td->iloc, vec);
+		}
 	}
 
 	recalcData(t);
@@ -5026,7 +5150,6 @@ static void initBevelWeight(TransInfo *t)
 
 static void applyBevelWeight(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float weight;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -5060,14 +5183,17 @@ static void applyBevelWeight(TransInfo *t, const int UNUSED(mval[2]))
 			BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: %.3f %s"), weight, t->proptext);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->val) {
-			*td->val = td->ival + weight * td->factor;
-			if (*td->val < 0.0f) *td->val = 0.0f;
-			if (*td->val > 1.0f) *td->val = 1.0f;
+			if (td->val) {
+				*td->val = td->ival + weight * td->factor;
+				if (*td->val < 0.0f) *td->val = 0.0f;
+				if (*td->val > 1.0f) *td->val = 1.0f;
+			}
 		}
 	}
 
@@ -5106,7 +5232,6 @@ static void initCrease(TransInfo *t)
 
 static void applyCrease(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float crease;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -5140,17 +5265,20 @@ static void applyCrease(TransInfo *t, const int UNUSED(mval[2]))
 			BLI_snprintf(str, sizeof(str), IFACE_("Crease: %.3f %s"), crease, t->proptext);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			*td->val = td->ival + crease * td->factor;
-			if (*td->val < 0.0f) *td->val = 0.0f;
-			if (*td->val > 1.0f) *td->val = 1.0f;
+			if (td->val) {
+				*td->val = td->ival + crease * td->factor;
+				if (*td->val < 0.0f) *td->val = 0.0f;
+				if (*td->val > 1.0f) *td->val = 1.0f;
+			}
 		}
 	}
 
@@ -5217,7 +5345,7 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA
 	}
 }
 
-static void ElementBoneSize(TransInfo *t, TransData *td, float mat[3][3])
+static void ElementBoneSize(TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3])
 {
 	float tmat[3][3], smat[3][3], oldy;
 	float sizemat[3][3];
@@ -5226,7 +5354,7 @@ static void ElementBoneSize(TransInfo *t, TransData *td, float mat[3][3])
 	mul_m3_m3m3(tmat, td->smtx, smat);
 
 	if (t->con.applySize) {
-		t->con.applySize(t, td, tmat);
+		t->con.applySize(t, tc, td, tmat);
 	}
 
 	/* we've tucked the scale in loc */
@@ -5237,23 +5365,13 @@ static void ElementBoneSize(TransInfo *t, TransData *td, float mat[3][3])
 	td->loc[1] = oldy;
 }
 
-static void applyBoneSize(TransInfo *t, const int mval[2])
+static void applyBoneSize(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float size[3], mat[3][3];
-	float ratio;
+	float ratio = t->values[0];
 	int i;
 	char str[UI_MAX_DRAW_STR];
 
-	// TRANSFORM_FIX_ME MOVE TO MOUSE INPUT
-	/* for manipulator, center handle, the scaling can't be done relative to center */
-	if ((t->flag & T_USES_MANIPULATOR) && t->con.mode == 0) {
-		ratio = 1.0f - ((t->mouse.imval[0] - mval[0]) + (t->mouse.imval[1] - mval[1])) / 100.0f;
-	}
-	else {
-		ratio = t->values[0];
-	}
-
 	copy_v3_fl(size, ratio);
 
 	snapGridIncrement(t, size);
@@ -5267,21 +5385,24 @@ static void applyBoneSize(TransInfo *t, const int mval[2])
 	size_to_mat3(mat, size);
 
 	if (t->con.applySize) {
-		t->con.applySize(t, NULL, mat);
+		t->con.applySize(t, NULL, NULL, mat);
 	}
 
 	copy_m3_m3(t->mat, mat);    // used in manipulator
 
 	headerBoneSize(t, size, str);
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		ElementBoneSize(t, td, mat);
+			ElementBoneSize(t, tc, td, mat);
+		}
 	}
 
 	recalcData(t);
@@ -5319,7 +5440,6 @@ static void initBoneEnvelope(TransInfo *t)
 
 static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float ratio;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -5343,19 +5463,22 @@ static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
 		BLI_snprintf(str, sizeof(str), IFACE_("Envelope: %3f"), ratio);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			/* if the old/original value was 0.0f, then just use ratio */
-			if (td->ival)
-				*td->val = td->ival * ratio;
-			else
-				*td->val = ratio;
+			if (td->val) {
+				/* if the old/original value was 0.0f, then just use ratio */
+				if (td->ival)
+					*td->val = td->ival * ratio;
+				else
+					*td->val = ratio;
+			}
 		}
 	}
 
@@ -5372,9 +5495,9 @@ static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
  * \{ */
 
 static void slide_origdata_init_flag(
-        TransInfo *t, SlideOrigData *sod)
+        TransInfo *t, TransDataContainer *tc, SlideOrigData *sod)
 {
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+	BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 	BMesh *bm = em->bm;
 	const bool has_layer_math = CustomData_has_math(&bm->ldata);
 	const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, CD_MDISPS);
@@ -5395,10 +5518,10 @@ static void slide_origdata_init_flag(
 }
 
 static void slide_origdata_init_data(
-        TransInfo *t, SlideOrigData *sod)
+        TransDataContainer *tc, SlideOrigData *sod)
 {
 	if (sod->use_origfaces) {
-		BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+		BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 		BMesh *bm = em->bm;
 
 		sod->origfaces = BLI_ghash_ptr_new(__func__);
@@ -5459,11 +5582,11 @@ static void slide_origdata_create_data_vert(
 }
 
 static void slide_origdata_create_data(
-        TransInfo *t, SlideOrigData *sod,
+        TransInfo *t, TransDataContainer *tc, SlideOrigData *sod,
         TransDataGenericSlideVert *sv_array, unsigned int v_stride, unsigned int v_num)
 {
 	if (sod->use_origfaces) {
-		BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+		BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 		BMesh *bm = em->bm;
 		unsigned int i;
 		TransDataGenericSlideVert *sv;
@@ -5495,15 +5618,15 @@ static void slide_origdata_create_data(
 		}
 
 		if (t->flag & T_MIRROR) {
-			TransData *td = t->data;
+			TransData *td = tc->data;
 			TransDataGenericSlideVert *sv_mirror;
 
-			sod->sv_mirror = MEM_callocN(sizeof(*sv_mirror) * t->total, __func__);
-			sod->totsv_mirror = t->total;
+			sod->sv_mirror = MEM_callocN(sizeof(*sv_mirror) * tc->data_len, __func__);
+			sod->totsv_mirror = tc->data_len;
 
 			sv_mirror = sod->sv_mirror;
 
-			for (i = 0; i < t->total; i++, td++) {
+			for (i = 0; i < tc->data_len; i++, td++) {
 				BMVert *eve = td->extra;
 				if (eve) {
 					sv_mirror->v = eve;
@@ -5657,12 +5780,12 @@ static void slide_origdata_interp_data_vert(
 }
 
 static void slide_origdata_interp_data(
-        TransInfo *t, SlideOrigData *sod,
+        Object *obedit, SlideOrigData *sod,
         TransDataGenericSlideVert *sv, unsigned int v_stride, unsigned int v_num,
         bool is_final)
 {
 	if (sod->use_origfaces) {
-		BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		BMesh *bm = em->bm;
 		unsigned int i;
 		const bool has_mdisps = (sod->cd_loop_mdisp_offset != -1);
@@ -5725,7 +5848,7 @@ static void slide_origdata_free_date(
 
 static void calcEdgeSlideCustomPoints(struct TransInfo *t)
 {
-	EdgeSlideData *sld = t->custom.mode.data;
+	EdgeSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 
 	setCustomPoints(t, &t->mouse, sld->mval_end, sld->mval_start);
 
@@ -5793,6 +5916,7 @@ static bool bm_loop_calc_opposite_co(BMLoop *l_tmp,
 	BMLoop *l_last  = l_tmp->prev;
 	BMLoop *l_iter;
 	float dist = FLT_MAX;
+	bool found = false;
 
 	l_iter = l_first;
 	do {
@@ -5811,12 +5935,13 @@ static bool bm_loop_calc_opposite_co(BMLoop *l_tmp,
 				if (tdist < dist) {
 					copy_v3_v3(r_co, tvec);
 					dist = tdist;
+					found = true;
 				}
 			}
 		}
 	} while ((l_iter = l_iter->next) != l_last);
 
-	return (dist != FLT_MAX);
+	return found;
 }
 
 /**
@@ -5922,11 +6047,11 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
  * Calculate screenspace `mval_start` / `mval_end`, optionally slide direction.
  */
 static void calcEdgeSlide_mval_range(
-        TransInfo *t, EdgeSlideData *sld, const int *sv_table, const int loop_nr,
+        TransInfo *t, TransDataContainer *tc, EdgeSlideData *sld, const int *sv_table, const int loop_nr,
         const float mval[2], const bool use_occlude_geometry, const bool use_calc_direction)
 {
 	TransDataEdgeSlideVert *sv_array = sld->sv;
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+	BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 	BMesh *bm = em->bm;
 	ARegion *ar = t->ar;
 	View3D *v3d = NULL;
@@ -5953,7 +6078,7 @@ static void calcEdgeSlide_mval_range(
 		unit_m4(projectMat);
 	}
 	else {
-		ED_view3d_ob_project_mat_get(rv3d, t->obedit, projectMat);
+		ED_view3d_ob_project_mat_get(rv3d, tc->obedit, projectMat);
 	}
 
 	if (use_occlude_geometry) {
@@ -5995,7 +6120,9 @@ static void calcEdgeSlide_mval_range(
 						continue;
 
 					/* This test is only relevant if object is not wire-drawn! See [#32068]. */
-					if (use_occlude_geometry && !BMBVH_EdgeVisible(bmbvh, e_other, ar, v3d, t->obedit)) {
+					if (use_occlude_geometry &&
+					    !BMBVH_EdgeVisible(bmbvh, e_other, t->depsgraph, ar, v3d, tc->obedit))
+					{
 						continue;
 					}
 
@@ -6082,7 +6209,7 @@ static void calcEdgeSlide_mval_range(
 }
 
 static void calcEdgeSlide_even(
-        TransInfo *t, EdgeSlideData *sld, const float mval[2])
+        TransInfo *t, TransDataContainer *tc, EdgeSlideData *sld, const float mval[2])
 {
 	TransDataEdgeSlideVert *sv = sld->sv;
 
@@ -6107,7 +6234,7 @@ static void calcEdgeSlide_even(
 			unit_m4(projectMat);
 		}
 		else {
-			ED_view3d_ob_project_mat_get(rv3d, t->obedit, projectMat);
+			ED_view3d_ob_project_mat_get(rv3d, tc->obedit, projectMat);
 		}
 
 		for (i = 0; i < sld->totsv; i++, sv++) {
@@ -6127,9 +6254,9 @@ static void calcEdgeSlide_even(
 	}
 }
 
-static bool createEdgeSlideVerts_double_side(TransInfo *t, bool use_even, bool flipped, bool use_clamp)
+static bool createEdgeSlideVerts_double_side(TransInfo *t, TransDataContainer *tc)
 {
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+	BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 	BMesh *bm = em->bm;
 	BMIter iter;
 	BMEdge *e;
@@ -6144,13 +6271,9 @@ static bool createEdgeSlideVerts_double_side(TransInfo *t, bool use_even, bool f
 	View3D *v3d = NULL;
 	RegionView3D *rv3d = NULL;
 
-	slide_origdata_init_flag(t, &sld->orig_data);
+	slide_origdata_init_flag(t, tc, &sld->orig_data);
 
-	sld->use_even = use_even;
 	sld->curr_sv_index = 0;
-	sld->flipped = flipped;
-	if (!use_clamp)
-		t->flag |= T_ALT_TRANSFORM;
 
 	/*ensure valid selection*/
 	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
@@ -6466,25 +6589,23 @@ static bool createEdgeSlideVerts_double_side(TransInfo *t, bool use_even, bool f
 	if (t->spacetype == SPACE_VIEW3D) {
 		v3d = t->sa ? t->sa->spacedata.first : NULL;
 		rv3d = t->ar ? t->ar->regiondata : NULL;
-		use_occlude_geometry = (v3d && t->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE);
+		use_occlude_geometry = (v3d && TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE);
 	}
 
-	calcEdgeSlide_mval_range(t, sld, sv_table, loop_nr, mval, use_occlude_geometry, true);
+	calcEdgeSlide_mval_range(t, tc, sld, sv_table, loop_nr, mval, use_occlude_geometry, true);
 
 	/* create copies of faces for customdata projection */
 	bmesh_edit_begin(bm, BMO_OPTYPE_FLAG_UNTAN_MULTIRES);
-	slide_origdata_init_data(t, &sld->orig_data);
-	slide_origdata_create_data(t, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
+	slide_origdata_init_data(tc, &sld->orig_data);
+	slide_origdata_create_data(t, tc, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
 
 	if (rv3d) {
-		calcEdgeSlide_even(t, sld, mval);
+		calcEdgeSlide_even(t, tc, sld, mval);
 	}
 
 	sld->em = em;
 
-	sld->perc = 0.0f;
-
-	t->custom.mode.data = sld;
+	tc->custom.mode.data = sld;
 
 	MEM_freeN(sv_table);
 
@@ -6495,9 +6616,9 @@ static bool createEdgeSlideVerts_double_side(TransInfo *t, bool use_even, bool f
  * A simple version of #createEdgeSlideVerts_double_side
  * Which assumes the longest unselected.
  */
-static bool createEdgeSlideVerts_single_side(TransInfo *t, bool use_even, bool flipped, bool use_clamp)
+static bool createEdgeSlideVerts_single_side(TransInfo *t, TransDataContainer *tc)
 {
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+	BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 	BMesh *bm = em->bm;
 	BMIter iter;
 	BMEdge *e;
@@ -6517,15 +6638,9 @@ static bool createEdgeSlideVerts_single_side(TransInfo *t, bool use_even, bool f
 		rv3d = t->ar ? t->ar->regiondata : NULL;
 	}
 
-	slide_origdata_init_flag(t, &sld->orig_data);
+	slide_origdata_init_flag(t, tc, &sld->orig_data);
 
-	sld->use_even = use_even;
 	sld->curr_sv_index = 0;
-	/* happens to be best for single-sided */
-	sld->flipped = !flipped;
-	if (!use_clamp)
-		t->flag |= T_ALT_TRANSFORM;
-
 	/* ensure valid selection */
 	{
 		int i = 0, j = 0;
@@ -6669,25 +6784,23 @@ static bool createEdgeSlideVerts_single_side(TransInfo *t, bool use_even, bool f
 	if (t->spacetype == SPACE_VIEW3D) {
 		v3d = t->sa ? t->sa->spacedata.first : NULL;
 		rv3d = t->ar ? t->ar->regiondata : NULL;
-		use_occlude_geometry = (v3d && t->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE);
+		use_occlude_geometry = (v3d && TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE);
 	}
 
-	calcEdgeSlide_mval_range(t, sld, sv_table, loop_nr, mval, use_occlude_geometry, false);
+	calcEdgeSlide_mval_range(t, tc, sld, sv_table, loop_nr, mval, use_occlude_geometry, false);
 
 	/* create copies of faces for customdata projection */
 	bmesh_edit_begin(bm, BMO_OPTYPE_FLAG_UNTAN_MULTIRES);
-	slide_origdata_init_data(t, &sld->orig_data);
-	slide_origdata_create_data(t, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
+	slide_origdata_init_data(tc, &sld->orig_data);
+	slide_origdata_create_data(t, tc, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
 
 	if (rv3d) {
-		calcEdgeSlide_even(t, sld, mval);
+		calcEdgeSlide_even(t, tc, sld, mval);
 	}
 
 	sld->em = em;
 
-	sld->perc = 0.0f;
-
-	t->custom.mode.data = sld;
+	tc->custom.mode.data = sld;
 
 	MEM_freeN(sv_table);
 
@@ -6696,14 +6809,16 @@ static bool createEdgeSlideVerts_single_side(TransInfo *t, bool use_even, bool f
 
 void projectEdgeSlideData(TransInfo *t, bool is_final)
 {
-	EdgeSlideData *sld = t->custom.mode.data;
-	SlideOrigData *sod = &sld->orig_data;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		EdgeSlideData *sld = tc->custom.mode.data;
+		SlideOrigData *sod = &sld->orig_data;
 
-	if (sod->use_origfaces == false) {
-		return;
-	}
+		if (sod->use_origfaces == false) {
+			return;
+		}
 
-	slide_origdata_interp_data(t, sod, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv, is_final);
+		slide_origdata_interp_data(tc->obedit, sod, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv, is_final);
+	}
 }
 
 void freeEdgeSlideTempFaces(EdgeSlideData *sld)
@@ -6711,7 +6826,7 @@ void freeEdgeSlideTempFaces(EdgeSlideData *sld)
 	slide_origdata_free_date(&sld->orig_data);
 }
 
-void freeEdgeSlideVerts(TransInfo *UNUSED(t), TransCustomData *custom_data)
+void freeEdgeSlideVerts(TransInfo *UNUSED(t), TransDataContainer *UNUSED(tc), TransCustomData *custom_data)
 {
 	EdgeSlideData *sld = custom_data->data;
 
@@ -6731,17 +6846,39 @@ void freeEdgeSlideVerts(TransInfo *UNUSED(t), TransCustomData *custom_data)
 static void initEdgeSlide_ex(TransInfo *t, bool use_double_side, bool use_even, bool flipped, bool use_clamp)
 {
 	EdgeSlideData *sld;
-	bool ok;
+	bool ok = false;
 
 	t->mode = TFM_EDGE_SLIDE;
 	t->transform = applyEdgeSlide;
 	t->handleEvent = handleEventEdgeSlide;
 
+	{
+		EdgeSlideParams *slp = MEM_callocN(sizeof(*slp), __func__);
+		slp->use_even = use_even;
+		slp->flipped = flipped;
+		/* happens to be best for single-sided */
+		if (use_double_side == false) {
+			slp->flipped = !flipped;
+		}
+		slp->perc = 0.0f;
+
+		if (!use_clamp) {
+			t->flag |= T_ALT_TRANSFORM;
+		}
+
+		t->custom.mode.data = slp;
+		t->custom.mode.use_free = true;
+	}
+
 	if (use_double_side) {
-		ok = createEdgeSlideVerts_double_side(t, use_even, flipped, use_clamp);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			ok |= createEdgeSlideVerts_double_side(t, tc);
+		}
 	}
 	else {
-		ok = createEdgeSlideVerts_single_side(t, use_even, flipped, use_clamp);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			ok |= createEdgeSlideVerts_single_side(t, tc);
+		}
 	}
 
 	if (!ok) {
@@ -6749,12 +6886,13 @@ static void initEdgeSlide_ex(TransInfo *t, bool use_double_side, bool use_even,
 		return;
 	}
 
-	sld = t->custom.mode.data;
-
-	if (!sld)
-		return;
-
-	t->custom.mode.free_cb = freeEdgeSlideVerts;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		sld = tc->custom.mode.data;
+		if (!sld) {
+			continue;
+		}
+		tc->custom.mode.free_cb = freeEdgeSlideVerts;
+	}
 
 	/* set custom point first if you want value to be initialized by init */
 	calcEdgeSlideCustomPoints(t);
@@ -6781,20 +6919,20 @@ static void initEdgeSlide(TransInfo *t)
 static eRedrawFlag handleEventEdgeSlide(struct TransInfo *t, const struct wmEvent *event)
 {
 	if (t->mode == TFM_EDGE_SLIDE) {
-		EdgeSlideData *sld = t->custom.mode.data;
+		EdgeSlideParams *slp = t->custom.mode.data;
 
-		if (sld) {
+		if (slp) {
 			switch (event->type) {
 				case EKEY:
 					if (event->val == KM_PRESS) {
-						sld->use_even = !sld->use_even;
+						slp->use_even = !slp->use_even;
 						calcEdgeSlideCustomPoints(t);
 						return TREDRAW_HARD;
 					}
 					break;
 				case FKEY:
 					if (event->val == KM_PRESS) {
-						sld->flipped = !sld->flipped;
+						slp->flipped = !slp->flipped;
 						calcEdgeSlideCustomPoints(t);
 						return TREDRAW_HARD;
 					}
@@ -6808,6 +6946,7 @@ static eRedrawFlag handleEventEdgeSlide(struct TransInfo *t, const struct wmEven
 					}
 					break;
 				case EVT_MODAL_MAP:
+#if 0
 					switch (event->val) {
 						case TFM_MODAL_EDGESLIDE_DOWN:
 							sld->curr_sv_index = ((sld->curr_sv_index - 1) + sld->totsv) % sld->totsv;
@@ -6816,6 +6955,7 @@ static eRedrawFlag handleEventEdgeSlide(struct TransInfo *t, const struct wmEven
 							sld->curr_sv_index = (sld->curr_sv_index + 1) % sld->totsv;
 							return TREDRAW_HARD;
 					}
+#endif
 					break;
 				case MOUSEMOVE:
 					calcEdgeSlideCustomPoints(t);
@@ -6830,12 +6970,13 @@ static eRedrawFlag handleEventEdgeSlide(struct TransInfo *t, const struct wmEven
 
 static void drawEdgeSlide(TransInfo *t)
 {
-	if ((t->mode == TFM_EDGE_SLIDE) && t->custom.mode.data) {
-		EdgeSlideData *sld = t->custom.mode.data;
+	if ((t->mode == TFM_EDGE_SLIDE) && TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data) {
+		const EdgeSlideParams *slp = t->custom.mode.data;
+		EdgeSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 		const bool is_clamp = !(t->flag & T_ALT_TRANSFORM);
 
 		/* Even mode */
-		if ((sld->use_even == true) || (is_clamp == false)) {
+		if ((slp->use_even == true) || (is_clamp == false)) {
 			View3D *v3d = t->view;
 			const float line_size = UI_GetThemeValuef(TH_OUTLINE_WIDTH) + 0.5f;
 
@@ -6843,17 +6984,19 @@ static void drawEdgeSlide(TransInfo *t)
 				glDisable(GL_DEPTH_TEST);
 
 			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+			gpuPushMatrix();
+			gpuMultMatrix(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat);
 
-			glPushAttrib(GL_CURRENT_BIT | GL_LINE_BIT | GL_POINT_BIT);
-			glPushMatrix();
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
 
-			glMultMatrixf(t->obedit->obmat);
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 
-			if (sld->use_even == true) {
+			if (slp->use_even == true) {
 				float co_a[3], co_b[3], co_mark[3];
 				TransDataEdgeSlideVert *curr_sv = &sld->sv[sld->curr_sv_index];
-				const float fac = (sld->perc + 1.0f) / 2.0f;
+				const float fac = (slp->perc + 1.0f) / 2.0f;
 				const float ctrl_size = UI_GetThemeValuef(TH_FACEDOT_SIZE) + 1.5f;
 				const float guide_size = ctrl_size - 0.5f;
 				const int alpha_shade = -30;
@@ -6862,39 +7005,35 @@ static void drawEdgeSlide(TransInfo *t)
 				add_v3_v3v3(co_b, curr_sv->v_co_orig, curr_sv->dir_side[1]);
 
 				glLineWidth(line_size);
-				UI_ThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
-				glBegin(GL_LINES);
+				immUniformThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
+				immBeginAtMost(GWN_PRIM_LINES, 4);
 				if (curr_sv->v_side[0]) {
-					glVertex3fv(curr_sv->v_side[0]->co);
-					glVertex3fv(curr_sv->v_co_orig);
+					immVertex3fv(pos, curr_sv->v_side[0]->co);
+					immVertex3fv(pos, curr_sv->v_co_orig);
 				}
 				if (curr_sv->v_side[1]) {
-					glVertex3fv(curr_sv->v_side[1]->co);
-					glVertex3fv(curr_sv->v_co_orig);
+					immVertex3fv(pos, curr_sv->v_side[1]->co);
+					immVertex3fv(pos, curr_sv->v_co_orig);
 				}
-				glEnd();
+				immEnd();
 
-				UI_ThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
+				immUniformThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
 				glPointSize(ctrl_size);
-				glBegin(GL_POINTS);
-				if (sld->flipped) {
-					if (curr_sv->v_side[1]) glVertex3fv(curr_sv->v_side[1]->co);
+				immBegin(GWN_PRIM_POINTS, 1);
+				if (slp->flipped) {
+					if (curr_sv->v_side[1]) immVertex3fv(pos, curr_sv->v_side[1]->co);
 				}
 				else {
-					if (curr_sv->v_side[0]) glVertex3fv(curr_sv->v_side[0]->co);
+					if (curr_sv->v_side[0]) immVertex3fv(pos, curr_sv->v_side[0]->co);
 				}
-				glEnd();
+				immEnd();
 
-				UI_ThemeColorShadeAlpha(TH_SELECT, 255, alpha_shade);
+				immUniformThemeColorShadeAlpha(TH_SELECT, 255, alpha_shade);
 				glPointSize(guide_size);
-				glBegin(GL_POINTS);
-#if 0
-				interp_v3_v3v3(co_mark, co_b, co_a, fac);
-				glVertex3fv(co_mark);
-#endif
+				immBegin(GWN_PRIM_POINTS, 1);
 				interp_line_v3_v3v3v3(co_mark, co_b, curr_sv->v_co_orig, co_a, fac);
-				glVertex3fv(co_mark);
-				glEnd();
+				immVertex3fv(pos, co_mark);
+				immEnd();
 			}
 			else {
 				if (is_clamp == false) {
@@ -6904,9 +7043,10 @@ static void drawEdgeSlide(TransInfo *t)
 					const int alpha_shade = -160;
 
 					glLineWidth(line_size);
-					UI_ThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
-					glBegin(GL_LINES);
+					immUniformThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
+					immBegin(GWN_PRIM_LINES, sld->totsv * 2);
 
+					/* TODO(campbell): Loop over all verts  */
 					sv = sld->sv;
 					for (i = 0; i < sld->totsv; i++, sv++) {
 						float a[3], b[3];
@@ -6923,18 +7063,19 @@ static void drawEdgeSlide(TransInfo *t)
 						add_v3_v3(a, sv->v_co_orig);
 						add_v3_v3(b, sv->v_co_orig);
 
-						glVertex3fv(a);
-						glVertex3fv(b);
+						immVertex3fv(pos, a);
+						immVertex3fv(pos, b);
 					}
-					glEnd();
+					immEnd();
 				}
 				else {
 					BLI_assert(0);
 				}
 			}
 
-			glPopMatrix();
-			glPopAttrib();
+			immUnbindProgram();
+
+			gpuPopMatrix();
 
 			glDisable(GL_BLEND);
 
@@ -6946,38 +7087,43 @@ static void drawEdgeSlide(TransInfo *t)
 
 static void doEdgeSlide(TransInfo *t, float perc)
 {
-	EdgeSlideData *sld = t->custom.mode.data;
-	TransDataEdgeSlideVert *svlist = sld->sv, *sv;
-	int i;
+	EdgeSlideParams *slp = t->custom.mode.data;
+	EdgeSlideData *sld_active = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 
-	sld->perc = perc;
-	sv = svlist;
+	slp->perc = perc;
 
-	if (sld->use_even == false) {
+	if (slp->use_even == false) {
 		const bool is_clamp = !(t->flag & T_ALT_TRANSFORM);
 		if (is_clamp) {
 			const int side_index = (perc < 0.0f);
 			const float perc_final = fabsf(perc);
-			for (i = 0; i < sld->totsv; i++, sv++) {
-				madd_v3_v3v3fl(sv->v->co, sv->v_co_orig, sv->dir_side[side_index], perc_final);
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				EdgeSlideData *sld = tc->custom.mode.data;
+				TransDataEdgeSlideVert *sv = sld->sv;
+				for (int i = 0; i < sld->totsv; i++, sv++) {
+					madd_v3_v3v3fl(sv->v->co, sv->v_co_orig, sv->dir_side[side_index], perc_final);
+				}
+				sld->curr_side_unclamp = side_index;
 			}
-
-			sld->curr_side_unclamp = side_index;
 		}
 		else {
-			const int side_index = sld->curr_side_unclamp;
-			const float perc_init = fabsf(perc) * ((sld->curr_side_unclamp == (perc < 0.0f)) ? 1 : -1);
-			for (i = 0; i < sld->totsv; i++, sv++) {
-				float dir_flip[3];
-				float perc_final = perc_init;
-				if (!is_zero_v3(sv->dir_side[side_index])) {
-					copy_v3_v3(dir_flip, sv->dir_side[side_index]);
-				}
-				else {
-					copy_v3_v3(dir_flip, sv->dir_side[!side_index]);
-					perc_final *= -1;
+			const float perc_init = fabsf(perc) * ((sld_active->curr_side_unclamp == (perc < 0.0f)) ? 1 : -1);
+			const int side_index = sld_active->curr_side_unclamp;
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				EdgeSlideData *sld = tc->custom.mode.data;
+				TransDataEdgeSlideVert *sv = sld->sv;
+				for (int i = 0; i < sld->totsv; i++, sv++) {
+					float dir_flip[3];
+					float perc_final = perc_init;
+					if (!is_zero_v3(sv->dir_side[side_index])) {
+						copy_v3_v3(dir_flip, sv->dir_side[side_index]);
+					}
+					else {
+						copy_v3_v3(dir_flip, sv->dir_side[!side_index]);
+						perc_final *= -1;
+					}
+					madd_v3_v3v3fl(sv->v->co, sv->v_co_orig, dir_flip, perc_final);
 				}
-				madd_v3_v3v3fl(sv->v->co, sv->v_co_orig, dir_flip, perc_final);
 			}
 		}
 	}
@@ -6990,24 +7136,28 @@ static void doEdgeSlide(TransInfo *t, float perc)
 		 * \note len_v3v3(curr_sv->dir_side[0], curr_sv->dir_side[1])
 		 * is the same as the distance between the original vert locations, same goes for the lines below.
 		 */
-		TransDataEdgeSlideVert *curr_sv = &sld->sv[sld->curr_sv_index];
-		const float curr_length_perc = curr_sv->edge_len * (((sld->flipped ? perc : -perc) + 1.0f) / 2.0f);
+		TransDataEdgeSlideVert *curr_sv = &sld_active->sv[sld_active->curr_sv_index];
+		const float curr_length_perc = curr_sv->edge_len * (((slp->flipped ? perc : -perc) + 1.0f) / 2.0f);
 
 		float co_a[3];
 		float co_b[3];
 
-		for (i = 0; i < sld->totsv; i++, sv++) {
-			if (sv->edge_len > FLT_EPSILON) {
-				const float fac = min_ff(sv->edge_len, curr_length_perc) / sv->edge_len;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			EdgeSlideData *sld = tc->custom.mode.data;
+			TransDataEdgeSlideVert *sv = sld->sv;
+			for (int i = 0; i < sld->totsv; i++, sv++) {
+				if (sv->edge_len > FLT_EPSILON) {
+					const float fac = min_ff(sv->edge_len, curr_length_perc) / sv->edge_len;
 
-				add_v3_v3v3(co_a, sv->v_co_orig, sv->dir_side[0]);
-				add_v3_v3v3(co_b, sv->v_co_orig, sv->dir_side[1]);
+					add_v3_v3v3(co_a, sv->v_co_orig, sv->dir_side[0]);
+					add_v3_v3v3(co_b, sv->v_co_orig, sv->dir_side[1]);
 
-				if (sld->flipped) {
-					interp_line_v3_v3v3v3(sv->v->co, co_b, sv->v_co_orig, co_a, fac);
-				}
-				else {
-					interp_line_v3_v3v3v3(sv->v->co, co_a, sv->v_co_orig, co_b, fac);
+					if (slp->flipped) {
+						interp_line_v3_v3v3v3(sv->v->co, co_b, sv->v_co_orig, co_a, fac);
+					}
+					else {
+						interp_line_v3_v3v3v3(sv->v->co, co_a, sv->v_co_orig, co_b, fac);
+					}
 				}
 			}
 		}
@@ -7019,9 +7169,9 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2]))
 	char str[UI_MAX_DRAW_STR];
 	size_t ofs = 0;
 	float final;
-	EdgeSlideData *sld =  t->custom.mode.data;
-	bool flipped = sld->flipped;
-	bool use_even = sld->use_even;
+	EdgeSlideParams *slp =  t->custom.mode.data;
+	bool flipped = slp->flipped;
+	bool use_even = slp->use_even;
 	const bool is_clamp = !(t->flag & T_ALT_TRANSFORM);
 	const bool is_constrained = !(is_clamp == false || hasNumInput(&t->num));
 
@@ -7073,7 +7223,8 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2]))
 
 static void calcVertSlideCustomPoints(struct TransInfo *t)
 {
-	VertSlideData *sld = t->custom.mode.data;
+	VertSlideParams *slp = t->custom.mode.data;
+	VertSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 	TransDataVertSlideVert *sv = &sld->sv[sld->curr_sv_index];
 
 	const float *co_orig_3d = sv->co_orig_3d;
@@ -7090,7 +7241,7 @@ static void calcVertSlideCustomPoints(struct TransInfo *t)
 	ARRAY_SET_ITEMS(mval_start, co_orig_2d[0] + mval_ofs[0], co_orig_2d[1] + mval_ofs[1]);
 	ARRAY_SET_ITEMS(mval_end, co_curr_2d[0] + mval_ofs[0], co_curr_2d[1] + mval_ofs[1]);
 
-	if (sld->flipped && sld->use_even) {
+	if (slp->flipped && slp->use_even) {
 		setCustomPoints(t, &t->mouse, mval_start, mval_end);
 	}
 	else {
@@ -7108,7 +7259,8 @@ static void calcVertSlideCustomPoints(struct TransInfo *t)
  */
 static void calcVertSlideMouseActiveVert(struct TransInfo *t, const int mval[2])
 {
-	VertSlideData *sld = t->custom.mode.data;
+	/* Active object may have no selected vertices. */
+	VertSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 	float mval_fl[2] = {UNPACK2(mval)};
 	TransDataVertSlideVert *sv;
 
@@ -7135,7 +7287,7 @@ static void calcVertSlideMouseActiveVert(struct TransInfo *t, const int mval[2])
  */
 static void calcVertSlideMouseActiveEdges(struct TransInfo *t, const int mval[2])
 {
-	VertSlideData *sld = t->custom.mode.data;
+	VertSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 	float imval_fl[2] = {UNPACK2(t->mouse.imval)};
 	float  mval_fl[2] = {UNPACK2(mval)};
 
@@ -7163,7 +7315,7 @@ static void calcVertSlideMouseActiveEdges(struct TransInfo *t, const int mval[2]
 				float dir_dot;
 
 				sub_v3_v3v3(tdir, sv->co_orig_3d, sv->co_link_orig_3d[j]);
-				mul_mat3_m4_v3(t->obedit->obmat, tdir);
+				mul_mat3_m4_v3(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat, tdir);
 				project_plane_v3_v3v3(tdir, tdir, t->viewinv[2]);
 
 				normalize_v3(tdir);
@@ -7181,9 +7333,9 @@ static void calcVertSlideMouseActiveEdges(struct TransInfo *t, const int mval[2]
 	}
 }
 
-static bool createVertSlideVerts(TransInfo *t, bool use_even, bool flipped, bool use_clamp)
+static bool createVertSlideVerts(TransInfo *t, TransDataContainer *tc)
 {
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+	BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
 	BMesh *bm = em->bm;
 	BMIter iter;
 	BMIter eiter;
@@ -7193,13 +7345,9 @@ static bool createVertSlideVerts(TransInfo *t, bool use_even, bool flipped, bool
 	VertSlideData *sld = MEM_callocN(sizeof(*sld), "sld");
 	int j;
 
-	slide_origdata_init_flag(t, &sld->orig_data);
+	slide_origdata_init_flag(t, tc, &sld->orig_data);
 
-	sld->use_even = use_even;
 	sld->curr_sv_index = 0;
-	sld->flipped = flipped;
-	if (!use_clamp)
-		t->flag |= T_ALT_TRANSFORM;
 
 	j = 0;
 	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
@@ -7262,14 +7410,12 @@ static bool createVertSlideVerts(TransInfo *t, bool use_even, bool flipped, bool
 	sld->totsv = j;
 
 	bmesh_edit_begin(bm, BMO_OPTYPE_FLAG_UNTAN_MULTIRES);
-	slide_origdata_init_data(t, &sld->orig_data);
-	slide_origdata_create_data(t, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
+	slide_origdata_init_data(tc, &sld->orig_data);
+	slide_origdata_create_data(t, tc, &sld->orig_data, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv);
 
 	sld->em = em;
 
-	sld->perc = 0.0f;
-
-	t->custom.mode.data = sld;
+	tc->custom.mode.data = sld;
 
 	/* most likely will be set below */
 	unit_m4(sld->proj_mat);
@@ -7281,9 +7427,12 @@ static bool createVertSlideVerts(TransInfo *t, bool use_even, bool flipped, bool
 
 		rv3d = ar ? ar->regiondata : NULL;
 		if (rv3d) {
-			ED_view3d_ob_project_mat_get(rv3d, t->obedit, sld->proj_mat);
+			ED_view3d_ob_project_mat_get(rv3d, tc->obedit, sld->proj_mat);
 		}
+	}
 
+	/* XXX, calc vert slide across all objects */
+	if (tc == t->data_container) {
 		calcVertSlideMouseActiveVert(t, t->mval);
 		calcVertSlideMouseActiveEdges(t, t->mval);
 	}
@@ -7293,14 +7442,13 @@ static bool createVertSlideVerts(TransInfo *t, bool use_even, bool flipped, bool
 
 void projectVertSlideData(TransInfo *t, bool is_final)
 {
-	VertSlideData *sld = t->custom.mode.data;
-	SlideOrigData *sod = &sld->orig_data;
-
-	if (sod->use_origfaces == false) {
-		return;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		VertSlideData *sld = tc->custom.mode.data;
+		SlideOrigData *sod = &sld->orig_data;
+		if (sod->use_origfaces == true) {
+			slide_origdata_interp_data(tc->obedit, sod, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv, is_final);
+		}
 	}
-
-	slide_origdata_interp_data(t, sod, (TransDataGenericSlideVert *)sld->sv, sizeof(*sld->sv), sld->totsv, is_final);
 }
 
 void freeVertSlideTempFaces(VertSlideData *sld)
@@ -7308,7 +7456,7 @@ void freeVertSlideTempFaces(VertSlideData *sld)
 	slide_origdata_free_date(&sld->orig_data);
 }
 
-void freeVertSlideVerts(TransInfo *UNUSED(t), TransCustomData *custom_data)
+void freeVertSlideVerts(TransInfo *UNUSED(t), TransDataContainer *UNUSED(tc), TransCustomData *custom_data)
 {
 	VertSlideData *sld = custom_data->data;
 
@@ -7335,23 +7483,38 @@ void freeVertSlideVerts(TransInfo *UNUSED(t), TransCustomData *custom_data)
 
 static void initVertSlide_ex(TransInfo *t, bool use_even, bool flipped, bool use_clamp)
 {
-	VertSlideData *sld;
 
 	t->mode = TFM_VERT_SLIDE;
 	t->transform = applyVertSlide;
 	t->handleEvent = handleEventVertSlide;
 
-	if (!createVertSlideVerts(t, use_even, flipped, use_clamp)) {
-		t->state = TRANS_CANCEL;
-		return;
+	{
+		VertSlideParams *slp = MEM_callocN(sizeof(*slp), __func__);
+		slp->use_even = use_even;
+		slp->flipped = flipped;
+		slp->perc = 0.0f;
+
+		if (!use_clamp) {
+			t->flag |= T_ALT_TRANSFORM;
+		}
+
+		t->custom.mode.data = slp;
+		t->custom.mode.use_free = true;
 	}
 
-	sld = t->custom.mode.data;
+	bool ok = false;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		ok |= createVertSlideVerts(t, tc);
+		VertSlideData *sld = tc->custom.mode.data;
+		if (sld) {
+			tc->custom.mode.free_cb = freeVertSlideVerts;
+		}
+	}
 
-	if (!sld)
+	if (ok == false) {
+		t->state = TRANS_CANCEL;
 		return;
-
-	t->custom.mode.free_cb = freeVertSlideVerts;
+	}
 
 	/* set custom point first if you want value to be initialized by init */
 	calcVertSlideCustomPoints(t);
@@ -7378,14 +7541,14 @@ static void initVertSlide(TransInfo *t)
 static eRedrawFlag handleEventVertSlide(struct TransInfo *t, const struct wmEvent *event)
 {
 	if (t->mode == TFM_VERT_SLIDE) {
-		VertSlideData *sld = t->custom.mode.data;
+		VertSlideParams *slp = t->custom.mode.data;
 
-		if (sld) {
+		if (slp) {
 			switch (event->type) {
 				case EKEY:
 					if (event->val == KM_PRESS) {
-						sld->use_even = !sld->use_even;
-						if (sld->flipped) {
+						slp->use_even = !slp->use_even;
+						if (slp->flipped) {
 							calcVertSlideCustomPoints(t);
 						}
 						return TREDRAW_HARD;
@@ -7393,7 +7556,7 @@ static eRedrawFlag handleEventVertSlide(struct TransInfo *t, const struct wmEven
 					break;
 				case FKEY:
 					if (event->val == KM_PRESS) {
-						sld->flipped = !sld->flipped;
+						slp->flipped = !slp->flipped;
 						calcVertSlideCustomPoints(t);
 						return TREDRAW_HARD;
 					}
@@ -7438,8 +7601,9 @@ static eRedrawFlag handleEventVertSlide(struct TransInfo *t, const struct wmEven
 
 static void drawVertSlide(TransInfo *t)
 {
-	if ((t->mode == TFM_VERT_SLIDE) && t->custom.mode.data) {
-		VertSlideData *sld = t->custom.mode.data;
+	if ((t->mode == TFM_VERT_SLIDE) && TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data) {
+		const VertSlideParams *slp = t->custom.mode.data;
+		VertSlideData *sld = TRANS_DATA_CONTAINER_FIRST_OK(t)->custom.mode.data;
 		const bool is_clamp = !(t->flag & T_ALT_TRANSFORM);
 
 		/* Non-Prop mode */
@@ -7456,21 +7620,24 @@ static void drawVertSlide(TransInfo *t)
 				glDisable(GL_DEPTH_TEST);
 
 			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-			glPushAttrib(GL_CURRENT_BIT | GL_LINE_BIT | GL_POINT_BIT);
-			glPushMatrix();
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-			glMultMatrixf(t->obedit->obmat);
+			gpuPushMatrix();
+			gpuMultMatrix(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat);
 
 			glLineWidth(line_size);
-			UI_ThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
-			glBegin(GL_LINES);
+
+			const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+			immUniformThemeColorShadeAlpha(TH_EDGE_SELECT, 80, alpha_shade);
+
+			immBegin(GWN_PRIM_LINES, sld->totsv * 2);
 			if (is_clamp) {
 				sv = sld->sv;
 				for (i = 0; i < sld->totsv; i++, sv++) {
-					glVertex3fv(sv->co_orig_3d);
-					glVertex3fv(sv->co_link_orig_3d[sv->co_link_curr]);
+					immVertex3fv(shdr_pos, sv->co_orig_3d);
+					immVertex3fv(shdr_pos, sv->co_link_orig_3d[sv->co_link_curr]);
 				}
 			}
 			else {
@@ -7483,21 +7650,21 @@ static void drawVertSlide(TransInfo *t)
 					add_v3_v3(a, sv->co_orig_3d);
 					add_v3_v3(b, sv->co_orig_3d);
 
-					glVertex3fv(a);
-					glVertex3fv(b);
+					immVertex3fv(shdr_pos, a);
+					immVertex3fv(shdr_pos, b);
 				}
 			}
-			glEnd();
+			immEnd();
 
 			glPointSize(ctrl_size);
 
-			glBegin(GL_POINTS);
-			glVertex3fv((sld->flipped && sld->use_even) ?
+			immBegin(GWN_PRIM_POINTS, 1);
+			immVertex3fv(shdr_pos, (slp->flipped && slp->use_even) ?
 			            curr_sv->co_link_orig_3d[curr_sv->co_link_curr] :
 			            curr_sv->co_orig_3d);
-			glEnd();
+			immEnd();
 
-			glDisable(GL_BLEND);
+			immUnbindProgram();
 
 			/* direction from active vertex! */
 			if ((t->mval[0] != t->mouse.imval[0]) ||
@@ -7511,29 +7678,38 @@ static void drawVertSlide(TransInfo *t)
 				mval_ofs[0] = t->mval[0] - t->mouse.imval[0];
 				mval_ofs[1] = t->mval[1] - t->mouse.imval[1];
 
-				mul_v3_m4v3(co_orig_3d, t->obedit->obmat, curr_sv->co_orig_3d);
+				mul_v3_m4v3(co_orig_3d, TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat, curr_sv->co_orig_3d);
 				zfac = ED_view3d_calc_zfac(t->ar->regiondata, co_orig_3d, NULL);
 
 				ED_view3d_win_to_delta(t->ar, mval_ofs, co_dest_3d, zfac);
 
-				invert_m4_m4(t->obedit->imat, t->obedit->obmat);
-				mul_mat3_m4_v3(t->obedit->imat, co_dest_3d);
+				invert_m4_m4(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->imat, TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat);
+				mul_mat3_m4_v3(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->imat, co_dest_3d);
 
 				add_v3_v3(co_dest_3d, curr_sv->co_orig_3d);
 
-				glLineWidth(1);
-				setlinestyle(1);
+				glLineWidth(1.0f);
+
+				immBindBuiltinProgram(GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR);
+
+				float viewport_size[4];
+				glGetFloatv(GL_VIEWPORT, viewport_size);
+				immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+				immUniform1i("num_colors", 0);  /* "simple" mode */
+				immUniformColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+				immUniform1f("dash_width", 6.0f);
+				immUniform1f("dash_factor", 0.5f);
 
-				cpack(0xffffff);
-				glBegin(GL_LINES);
-				glVertex3fv(curr_sv->co_orig_3d);
-				glVertex3fv(co_dest_3d);
+				immBegin(GWN_PRIM_LINES, 2);
+				immVertex3fv(shdr_pos, curr_sv->co_orig_3d);
+				immVertex3fv(shdr_pos, co_dest_3d);
+				immEnd();
 
-				glEnd();
+				immUnbindProgram();
 			}
 
-			glPopMatrix();
-			glPopAttrib();
+			gpuPopMatrix();
 
 			if (v3d && v3d->zbuf)
 				glEnable(GL_DEPTH_TEST);
@@ -7543,41 +7719,46 @@ static void drawVertSlide(TransInfo *t)
 
 static void doVertSlide(TransInfo *t, float perc)
 {
-	VertSlideData *sld = t->custom.mode.data;
-	TransDataVertSlideVert *svlist = sld->sv, *sv;
-	int i;
+	VertSlideParams *slp = t->custom.mode.data;
 
-	sld->perc = perc;
-	sv = svlist;
+	slp->perc = perc;
 
-	if (sld->use_even == false) {
-		for (i = 0; i < sld->totsv; i++, sv++) {
-			interp_v3_v3v3(sv->v->co, sv->co_orig_3d, sv->co_link_orig_3d[sv->co_link_curr], perc);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		VertSlideData *sld = tc->custom.mode.data;
+		TransDataVertSlideVert *svlist = sld->sv, *sv;
+		int i;
+
+		sv = svlist;
+
+		if (slp->use_even == false) {
+			for (i = 0; i < sld->totsv; i++, sv++) {
+				interp_v3_v3v3(sv->v->co, sv->co_orig_3d, sv->co_link_orig_3d[sv->co_link_curr], perc);
+			}
 		}
-	}
-	else {
-		TransDataVertSlideVert *sv_curr = &sld->sv[sld->curr_sv_index];
-		const float edge_len_curr = len_v3v3(sv_curr->co_orig_3d, sv_curr->co_link_orig_3d[sv_curr->co_link_curr]);
-		const float tperc = perc * edge_len_curr;
+		else {
+			TransDataVertSlideVert *sv_curr = &sld->sv[sld->curr_sv_index];
+			const float edge_len_curr = len_v3v3(sv_curr->co_orig_3d, sv_curr->co_link_orig_3d[sv_curr->co_link_curr]);
+			const float tperc = perc * edge_len_curr;
 
-		for (i = 0; i < sld->totsv; i++, sv++) {
-			float edge_len;
-			float dir[3];
+			for (i = 0; i < sld->totsv; i++, sv++) {
+				float edge_len;
+				float dir[3];
 
-			sub_v3_v3v3(dir, sv->co_link_orig_3d[sv->co_link_curr], sv->co_orig_3d);
-			edge_len = normalize_v3(dir);
+				sub_v3_v3v3(dir, sv->co_link_orig_3d[sv->co_link_curr], sv->co_orig_3d);
+				edge_len = normalize_v3(dir);
 
-			if (edge_len > FLT_EPSILON) {
-				if (sld->flipped) {
-					madd_v3_v3v3fl(sv->v->co, sv->co_link_orig_3d[sv->co_link_curr], dir, -tperc);
+				if (edge_len > FLT_EPSILON) {
+					if (slp->flipped) {
+						madd_v3_v3v3fl(sv->v->co, sv->co_link_orig_3d[sv->co_link_curr], dir, -tperc);
+					}
+					else {
+						madd_v3_v3v3fl(sv->v->co, sv->co_orig_3d, dir, tperc);
+					}
 				}
 				else {
-					madd_v3_v3v3fl(sv->v->co, sv->co_orig_3d, dir, tperc);
+					copy_v3_v3(sv->v->co, sv->co_orig_3d);
 				}
 			}
-			else {
-				copy_v3_v3(sv->v->co, sv->co_orig_3d);
-			}
 		}
 	}
 }
@@ -7587,9 +7768,9 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2]))
 	char str[UI_MAX_DRAW_STR];
 	size_t ofs = 0;
 	float final;
-	VertSlideData *sld =  t->custom.mode.data;
-	const bool flipped = sld->flipped;
-	const bool use_even = sld->use_even;
+	VertSlideParams *slp =  t->custom.mode.data;
+	const bool flipped = slp->flipped;
+	const bool use_even = slp->use_even;
 	const bool is_clamp = !(t->flag & T_ALT_TRANSFORM);
 	const bool is_constrained = !(is_clamp == false || hasNumInput(&t->num));
 
@@ -7662,7 +7843,6 @@ static void initBoneRoll(TransInfo *t)
 
 static void applyBoneRoll(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	int i;
 	char str[UI_MAX_DRAW_STR];
 
@@ -7688,14 +7868,17 @@ static void applyBoneRoll(TransInfo *t, const int UNUSED(mval[2]))
 	}
 
 	/* set roll values */
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		*(td->val) = td->ival - final;
+			*(td->val) = td->ival - final;
+		}
 	}
 
 	recalcData(t);
@@ -7729,7 +7912,6 @@ static void initBakeTime(TransInfo *t)
 
 static void applyBakeTime(TransInfo *t, const int mval[2])
 {
-	TransData *td = t->data;
 	float time;
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -7773,17 +7955,20 @@ static void applyBakeTime(TransInfo *t, const int mval[2])
 			BLI_snprintf(str, sizeof(str), IFACE_("Time: %.3f %s"), time, t->proptext);
 	}
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if (td->val) {
-			*td->val = td->ival + time * td->factor;
-			if (td->ext->size && *td->val < *td->ext->size) *td->val = *td->ext->size;
-			if (td->ext->quat && *td->val > *td->ext->quat) *td->val = *td->ext->quat;
+			if (td->val) {
+				*td->val = td->ival + time * td->factor;
+				if (td->ext->size && *td->val < *td->ext->size) *td->val = *td->ext->size;
+				if (td->ext->quat && *td->val > *td->ext->quat) *td->val = *td->ext->quat;
+			}
 		}
 	}
 
@@ -7806,14 +7991,13 @@ static void initMirror(TransInfo *t)
 	initMouseInputMode(t, &t->mouse, INPUT_NONE);
 
 	t->flag |= T_NULL_ONE;
-	if (!t->obedit) {
+	if ((t->flag & T_EDIT) == 0) {
 		t->flag |= T_NO_ZERO;
 	}
 }
 
 static void applyMirror(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td;
 	float size[3], mat[3][3];
 	int i;
 	char str[UI_MAX_DRAW_STR];
@@ -7831,19 +8015,22 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2]))
 		size_to_mat3(mat, size);
 
 		if (t->con.applySize) {
-			t->con.applySize(t, NULL, mat);
+			t->con.applySize(t, NULL, NULL, mat);
 		}
 
 		BLI_snprintf(str, sizeof(str), IFACE_("Mirror%s"), t->con.text);
 
-		for (i = 0, td = t->data; i < t->total; i++, td++) {
-			if (td->flag & TD_NOACTION)
-				break;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				if (td->flag & TD_NOACTION)
+					break;
 
-			if (td->flag & TD_SKIP)
-				continue;
+				if (td->flag & TD_SKIP)
+					continue;
 
-			ElementResize(t, td, mat);
+				ElementResize(t, tc, td, mat);
+			}
 		}
 
 		recalcData(t);
@@ -7855,14 +8042,17 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2]))
 
 		size_to_mat3(mat, size);
 
-		for (i = 0, td = t->data; i < t->total; i++, td++) {
-			if (td->flag & TD_NOACTION)
-				break;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				if (td->flag & TD_NOACTION)
+					break;
 
-			if (td->flag & TD_SKIP)
-				continue;
+				if (td->flag & TD_SKIP)
+					continue;
 
-			ElementResize(t, td, mat);
+				ElementResize(t, tc, td, mat);
+			}
 		}
 
 		recalcData(t);
@@ -7893,42 +8083,43 @@ static void initAlign(TransInfo *t)
 
 static void applyAlign(TransInfo *t, const int UNUSED(mval[2]))
 {
-	TransData *td = t->data;
 	float center[3];
 	int i;
 
-	/* saving original center */
-	copy_v3_v3(center, t->center);
 
-	for (i = 0; i < t->total; i++, td++) {
-		float mat[3][3], invmat[3][3];
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		/* saving original center */
+		copy_v3_v3(center, tc->center_local);
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float mat[3][3], invmat[3][3];
 
-		if (td->flag & TD_NOACTION)
-			break;
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		/* around local centers */
-		if (t->flag & (T_OBJECT | T_POSE)) {
-			copy_v3_v3(t->center, td->center);
-		}
-		else {
-			if (t->settings->selectmode & SCE_SELECT_FACE) {
-				copy_v3_v3(t->center, td->center);
+			/* around local centers */
+			if (t->flag & (T_OBJECT | T_POSE)) {
+				copy_v3_v3(tc->center_local, td->center);
+			}
+			else {
+				if (t->settings->selectmode & SCE_SELECT_FACE) {
+					copy_v3_v3(tc->center_local, td->center);
+				}
 			}
-		}
 
-		invert_m3_m3(invmat, td->axismtx);
+			invert_m3_m3(invmat, td->axismtx);
 
-		mul_m3_m3m3(mat, t->spacemtx, invmat);
+			mul_m3_m3m3(mat, t->spacemtx, invmat);
 
-		ElementRotation(t, td, mat, t->around);
+			ElementRotation(t, tc, td, mat, t->around);
+		}
+		/* restoring original center */
+		copy_v3_v3(tc->center_local, center);
 	}
 
-	/* restoring original center */
-	copy_v3_v3(t->center, center);
-
 	recalcData(t);
 
 	ED_area_headerprint(t->sa, IFACE_("Align"));
@@ -7989,17 +8180,19 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA
 
 static void applySeqSlideValue(TransInfo *t, const float val[2])
 {
-	TransData *td = t->data;
 	int i;
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		madd_v2_v2v2fl(td->loc, td->iloc, val, td->factor);
+			madd_v2_v2v2fl(td->loc, td->iloc, val, td->factor);
+		}
 	}
 }
 
@@ -8012,7 +8205,7 @@ static void applySeqSlide(TransInfo *t, const int mval[2])
 	if (t->con.mode & CON_APPLY) {
 		float pvec[3] = {0.0f, 0.0f, 0.0f};
 		float tvec[3];
-		t->con.applyVec(t, NULL, t->values, tvec, pvec);
+		t->con.applyVec(t, NULL, NULL, t->values, tvec, pvec);
 		copy_v3_v3(t->values, tvec);
 	}
 	else {
@@ -8232,8 +8425,6 @@ static void headerTimeTranslate(TransInfo *t, char str[UI_MAX_DRAW_STR])
 
 static void applyTimeTranslateValue(TransInfo *t)
 {
-	TransData *td = t->data;
-	TransData2D *td2d = t->data2d;
 	Scene *scene = t->scene;
 	int i;
 
@@ -8242,46 +8433,50 @@ static void applyTimeTranslateValue(TransInfo *t)
 
 	float deltax, val /* , valprev */;
 
-	/* it doesn't matter whether we apply to t->data or t->data2d, but t->data2d is more convenient */
-	for (i = 0; i < t->total; i++, td++, td2d++) {
-		/* it is assumed that td->extra is a pointer to the AnimData,
-		 * whose active action is where this keyframe comes from
-		 * (this is only valid when not in NLA)
-		 */
-		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		TransData2D *td2d = tc->data_2d;
+		/* it doesn't matter whether we apply to t->data or t->data2d, but t->data2d is more convenient */
+		for (i = 0; i < tc->data_len; i++, td++, td2d++) {
+			/* it is assumed that td->extra is a pointer to the AnimData,
+			 * whose active action is where this keyframe comes from
+			 * (this is only valid when not in NLA)
+			 */
+			AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
 
-		/* valprev = *td->val; */ /* UNUSED */
+			/* valprev = *td->val; */ /* UNUSED */
 
-		/* check if any need to apply nla-mapping */
-		if (adt && (t->spacetype != SPACE_SEQ)) {
-			deltax = t->values[0];
+			/* check if any need to apply nla-mapping */
+			if (adt && (t->spacetype != SPACE_SEQ)) {
+				deltax = t->values[0];
 
-			if (autosnap == SACTSNAP_TSTEP) {
-				deltax = (float)(floor(((double)deltax / secf) + 0.5) * secf);
-			}
-			else if (autosnap == SACTSNAP_STEP) {
-				deltax = floorf(deltax + 0.5f);
+				if (autosnap == SACTSNAP_TSTEP) {
+					deltax = (float)(floor(((double)deltax / secf) + 0.5) * secf);
+				}
+				else if (autosnap == SACTSNAP_STEP) {
+					deltax = floorf(deltax + 0.5f);
+				}
+
+				val = BKE_nla_tweakedit_remap(adt, td->ival, NLATIME_CONVERT_MAP);
+				val += deltax * td->factor;
+				*(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
 			}
+			else {
+				deltax = val = t->values[0];
 
-			val = BKE_nla_tweakedit_remap(adt, td->ival, NLATIME_CONVERT_MAP);
-			val += deltax * td->factor;
-			*(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
-		}
-		else {
-			deltax = val = t->values[0];
+				if (autosnap == SACTSNAP_TSTEP) {
+					val = (float)(floor(((double)deltax / secf) + 0.5) * secf);
+				}
+				else if (autosnap == SACTSNAP_STEP) {
+					val = floorf(val + 0.5f);
+				}
 
-			if (autosnap == SACTSNAP_TSTEP) {
-				val = (float)(floor(((double)deltax / secf) + 0.5) * secf);
-			}
-			else if (autosnap == SACTSNAP_STEP) {
-				val = floorf(val + 0.5f);
+				*(td->val) = td->ival + val;
 			}
 
-			*(td->val) = td->ival + val;
+			/* apply nearest snapping */
+			doAnimEdit_SnapFrame(t, td, td2d, adt, autosnap);
 		}
-
-		/* apply nearest snapping */
-		doAnimEdit_SnapFrame(t, td, td2d, adt, autosnap);
 	}
 }
 
@@ -8348,18 +8543,19 @@ static void initTimeSlide(TransInfo *t)
 
 		float min = 999999999.0f, max = -999999999.0f;
 		int i;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+				float val = *(td->val);
 
-		TransData  *td = t->data;
-		for (i = 0; i < t->total; i++, td++) {
-			AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
-			float val = *(td->val);
-
-			/* strip/action time to global (mapped) time */
-			if (adt)
-				val = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_MAP);
+				/* strip/action time to global (mapped) time */
+				if (adt)
+					val = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_MAP);
 
-			if (min > val) min = val;
-			if (max < val) max = val;
+				if (min > val) min = val;
+				if (max < val) max = val;
+			}
 		}
 
 		if (min == max) {
@@ -8412,7 +8608,6 @@ static void headerTimeSlide(TransInfo *t, const float sval, char str[UI_MAX_DRAW
 
 static void applyTimeSlideValue(TransInfo *t, float sval)
 {
-	TransData *td = t->data;
 	int i;
 	const float *range = t->custom.mode.data;
 	float minx = range[0];
@@ -8427,44 +8622,47 @@ static void applyTimeSlideValue(TransInfo *t, float sval)
 	}
 
 	/* it doesn't matter whether we apply to t->data or t->data2d, but t->data2d is more convenient */
-	for (i = 0; i < t->total; i++, td++) {
-		/* it is assumed that td->extra is a pointer to the AnimData,
-		 * whose active action is where this keyframe comes from
-		 * (this is only valid when not in NLA)
-		 */
-		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
-		float cval = t->values[0];
-
-		/* only apply to data if in range */
-		if ((sval > minx) && (sval < maxx)) {
-			float cvalc = CLAMPIS(cval, minx, maxx);
-			float ival = td->ival;
-			float timefac;
-
-			/* NLA mapping magic here works as follows:
-			 * - "ival" goes from strip time to global time
-			 * - calculation is performed into td->val in global time
-			 *   (since sval and min/max are all in global time)
-			 * - "td->val" then gets put back into strip time
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			/* it is assumed that td->extra is a pointer to the AnimData,
+			 * whose active action is where this keyframe comes from
+			 * (this is only valid when not in NLA)
 			 */
-			if (adt) {
-				/* strip to global */
-				ival = BKE_nla_tweakedit_remap(adt, ival, NLATIME_CONVERT_MAP);
-			}
+			AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+			float cval = t->values[0];
+
+			/* only apply to data if in range */
+			if ((sval > minx) && (sval < maxx)) {
+				float cvalc = CLAMPIS(cval, minx, maxx);
+				float ival = td->ival;
+				float timefac;
+
+				/* NLA mapping magic here works as follows:
+				 * - "ival" goes from strip time to global time
+				 * - calculation is performed into td->val in global time
+				 *   (since sval and min/max are all in global time)
+				 * - "td->val" then gets put back into strip time
+				 */
+				if (adt) {
+					/* strip to global */
+					ival = BKE_nla_tweakedit_remap(adt, ival, NLATIME_CONVERT_MAP);
+				}
 
-			/* left half? */
-			if (ival < sval) {
-				timefac = (sval - ival) / (sval - minx);
-				*(td->val) = cvalc - timefac * (cvalc - minx);
-			}
-			else {
-				timefac = (ival - sval) / (maxx - sval);
-				*(td->val) = cvalc + timefac * (maxx - cvalc);
-			}
+				/* left half? */
+				if (ival < sval) {
+					timefac = (sval - ival) / (sval - minx);
+					*(td->val) = cvalc - timefac * (cvalc - minx);
+				}
+				else {
+					timefac = (ival - sval) / (maxx - sval);
+					*(td->val) = cvalc + timefac * (maxx - cvalc);
+				}
 
-			if (adt) {
-				/* global to strip */
-				*(td->val) = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_UNMAP);
+				if (adt) {
+					/* global to strip */
+					*(td->val) = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_UNMAP);
+				}
 			}
 		}
 	}
@@ -8525,8 +8723,8 @@ static void initTimeScale(TransInfo *t)
 	/* recalculate center2d to use CFRA and mouse Y, since that's
 	 * what is used in time scale */
 	if ((t->flag & T_OVERRIDE_CENTER) == 0) {
-		t->center[0] = t->scene->r.cfra;
-		projectFloatView(t, t->center, center);
+		t->center_global[0] = t->scene->r.cfra;
+		projectFloatView(t, t->center_global, center);
 		center[1] = t->mouse.imval[1];
 	}
 
@@ -8567,39 +8765,40 @@ static void headerTimeScale(TransInfo *t, char str[UI_MAX_DRAW_STR])
 static void applyTimeScaleValue(TransInfo *t)
 {
 	Scene *scene = t->scene;
-	TransData *td = t->data;
-	TransData2D *td2d = t->data2d;
 	int i;
 
 	const short autosnap = getAnimEdit_SnapMode(t);
 	const double secf = FPS;
 
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		TransData2D *td2d = tc->data_2d;
+		for (i = 0; i < tc->data_len; i++, td++, td2d++) {
+			/* it is assumed that td->extra is a pointer to the AnimData,
+			 * whose active action is where this keyframe comes from
+			 * (this is only valid when not in NLA)
+			 */
+			AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+			float startx = CFRA;
+			float fac = t->values[0];
 
-	for (i = 0; i < t->total; i++, td++, td2d++) {
-		/* it is assumed that td->extra is a pointer to the AnimData,
-		 * whose active action is where this keyframe comes from
-		 * (this is only valid when not in NLA)
-		 */
-		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
-		float startx = CFRA;
-		float fac = t->values[0];
-
-		if (autosnap == SACTSNAP_TSTEP) {
-			fac = (float)(floor((double)fac / secf + 0.5) * secf);
-		}
-		else if (autosnap == SACTSNAP_STEP) {
-			fac = floorf(fac + 0.5f);
-		}
+			if (autosnap == SACTSNAP_TSTEP) {
+				fac = (float)(floor((double)fac / secf + 0.5) * secf);
+			}
+			else if (autosnap == SACTSNAP_STEP) {
+				fac = floorf(fac + 0.5f);
+			}
 
-		/* check if any need to apply nla-mapping */
-		if (adt)
-			startx = BKE_nla_tweakedit_remap(adt, startx, NLATIME_CONVERT_UNMAP);
+			/* check if any need to apply nla-mapping */
+			if (adt)
+				startx = BKE_nla_tweakedit_remap(adt, startx, NLATIME_CONVERT_UNMAP);
 
-		/* now, calculate the new value */
-		*(td->val) = ((td->ival - startx) * fac) + startx;
+			/* now, calculate the new value */
+			*(td->val) = ((td->ival - startx) * fac) + startx;
 
-		/* apply nearest snapping */
-		doAnimEdit_SnapFrame(t, td, td2d, adt, autosnap);
+			/* apply nearest snapping */
+			doAnimEdit_SnapFrame(t, td, td2d, adt, autosnap);
+		}
 	}
 }
 
@@ -8628,7 +8827,7 @@ bool checkUseAxisMatrix(TransInfo *t)
 	/* currently only checks for editmode */
 	if (t->flag & T_EDIT) {
 		if ((t->around == V3D_AROUND_LOCAL_ORIGINS) &&
-		    (ELEM(t->obedit->type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE)))
+		    (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE)))
 		{
 			/* not all editmode supports axis-matrix */
 			return true;
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index b1b1dd36bf0..b9f42a0d9fc 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -37,11 +37,17 @@
 #include "ED_numinput.h"
 #include "ED_view3d.h"
 
+#include "RE_engine.h"
+
 #include "DNA_listBase.h"
 
+#include "DEG_depsgraph.h"
+
 /* ************************** Types ***************************** */
 
+struct Depsgraph;
 struct TransInfo;
+struct TransDataContainer;
 struct TransData;
 struct TransformOrientation;
 struct TransSnap;
@@ -50,6 +56,7 @@ struct Object;
 struct View3D;
 struct ScrArea;
 struct Scene;
+struct ViewLayer;
 struct bConstraint;
 struct wmKeyMap;
 struct wmKeyConfig;
@@ -59,8 +66,11 @@ struct wmTimer;
 struct ARegion;
 struct ReportList;
 struct EditBone;
+struct RenderEngineType;
 struct SnapObjectContext;
 
+#include "DNA_object_enums.h"
+
 /* transinfo->redraw */
 typedef enum {
 	TREDRAW_NOTHING   = 0,
@@ -100,7 +110,7 @@ typedef struct TransSnap {
 	 * \note Return value can be anything,
 	 * where the smallest absolute value defines whats closest.
 	 */
-	float  (*distance)(struct TransInfo *, const float p1[3], const float p2[3]);
+	float  (*distance)(struct TransInfo *t, const float p1[3], const float p2[3]);
 
 	/**
 	 * Re-usable snap context data.
@@ -118,14 +128,16 @@ typedef struct TransCon {
 	                     /* the one in TransInfo is not garanty to stay the same (Rotates change it)  */
 	int   mode;          /* Mode flags of the Constraint                                              */
 	void  (*drawExtra)(struct TransInfo *t);
+
+	                     /* Note: if 'tc' is NULL, 'td' must also be NULL. */
 	                     /* For constraints that needs to draw differently from the other
 	                      * uses this instead of the generic draw function                            */
-	void  (*applyVec)(struct TransInfo *t, struct TransData *td, const float in[3], float out[3], float pvec[3]);
+	void  (*applyVec)(struct TransInfo *t, struct TransDataContainer *tc, struct TransData *td, const float in[3], float out[3], float pvec[3]);
 	                     /* Apply function pointer for linear vectorial transformation                */
 	                     /* The last three parameters are pointers to the in/out/printable vectors    */
-	void  (*applySize)(struct TransInfo *t, struct TransData *td, float smat[3][3]);
+	void  (*applySize)(struct TransInfo *t, struct TransDataContainer *tc, struct TransData *td, float smat[3][3]);
 	                     /* Apply function pointer for size transformation */
-	void  (*applyRot)(struct TransInfo *t, struct TransData *td, float vec[3], float *angle);
+	void  (*applyRot)(struct TransInfo *t, struct TransDataContainer *tc, struct TransData *td, float vec[3], float *angle);
 	                     /* Apply function pointer for rotation transformation */
 } TransCon;
 
@@ -261,10 +273,6 @@ typedef struct EdgeSlideData {
 
 	SlideOrigData orig_data;
 
-	float perc;
-
-	bool use_even;
-	bool flipped;
 
 	int curr_sv_index;
 
@@ -272,6 +280,12 @@ typedef struct EdgeSlideData {
 	int curr_side_unclamp;
 } EdgeSlideData;
 
+typedef struct EdgeSlideParams {
+	float perc;
+
+	bool use_even;
+	bool flipped;
+} EdgeSlideParams;
 
 typedef struct TransDataVertSlideVert {
 	/* TransDataGenericSlideVert */
@@ -293,17 +307,19 @@ typedef struct VertSlideData {
 
 	SlideOrigData orig_data;
 
-	float perc;
-
-	bool use_even;
-	bool flipped;
-
 	int curr_sv_index;
 
 	/* result of ED_view3d_ob_project_mat_get */
 	float proj_mat[4][4];
 } VertSlideData;
 
+typedef struct VertSlideParams {
+	float perc;
+
+	bool use_even;
+	bool flipped;
+} VertSlideParams;
+
 typedef struct BoneInitData {
 	struct EditBone *bone;
 	float tail[3];
@@ -364,16 +380,80 @@ typedef struct MouseInput {
 
 typedef struct TransCustomData {
 	void       *data;
-	void      (*free_cb)(struct TransInfo *, struct TransCustomData *);
+	void      (*free_cb)(struct TransInfo *, struct TransDataContainer *tc, struct TransCustomData *custom_data);
 	unsigned int use_free : 1;
 } TransCustomData;
 
 typedef struct TransCenterData {
-	float local[3], global[3];
+	float global[3];
 	unsigned int is_set : 1;
 } TransCenterData;
 
+/**
+ * Rule of thumb for choosing between mode/type:
+ * - If transform mode uses the data, assign to `mode`
+ *   (typically in transform.c).
+ * - If conversion uses the data as an extension to the #TransData, assign to `type`
+ *   (typically in transform_conversion.c).
+ */
+typedef struct TransCustomDataContainer {
+	/** Owned by the mode (grab, scale, bend... ).*/
+	union {
+		TransCustomData mode, first_elem;
+	};
+	TransCustomData type;
+} TransCustomDataContainer;
+#define TRANS_CUSTOM_DATA_ELEM_MAX (sizeof(TransCustomDataContainer) / sizeof(TransCustomData))
+
+typedef struct TransDataContainer {
+	/**
+	 * Use for cases we care about the active, eg: active vert of active mesh.
+	 * if set this will _always_ be the first item in the array.
+	 */
+	bool is_active;
+
+	/** Transformed data (array). */
+	TransData *data;
+	/** Total number of transformed data. */
+	int data_len;
+
+	/** Transformed data extension (array). */
+	TransDataExtension *data_ext;
+	/** Transformed data for 2d (array). */
+	TransData2D *data_2d;
+
+	struct Object *obedit;
+
+	/**
+	 * Use when #T_LOCAL_MATRIX is set.
+	 * Typically: 'obedit->obmat' or 'poseobj->obmat', but may be used elsewhere too.
+	 */
+	bool use_local_mat;
+	float  mat[4][4];
+	float imat[4][4];
+	/** 3x3 copies of matrices above. */
+	float  mat3[3][3];
+	float imat3[3][3];
+
+	/** Normalized 'mat3' */
+	float  mat3_unit[3][3];
+
+	/** if 't->flag & T_POSE', this denotes pose object */
+	struct Object *poseobj;
+
+	/** Center of transformation (in local-space), Calculated from #TransInfo.center_global. */
+	float center_local[3];
+
+	TransCustomDataContainer custom;
+} TransDataContainer;
+
 typedef struct TransInfo {
+	TransDataContainer *data_container;
+	int                 data_container_len;
+	/** Combine length of all #TransDataContainer.data_len
+	 * Use to check if nothing is selected or if we have a single selection. */
+	int data_len_all;
+
 	int         mode;           /* current mode                         */
 	int	        flag;           /* generic flags for special behaviors  */
 	int			modifiers;		/* special modifiers, by function, not key */
@@ -384,10 +464,6 @@ typedef struct TransInfo {
 								/* transform function pointer           */
 	eRedrawFlag (*handleEvent)(struct TransInfo *, const struct wmEvent *);
 								/* event handler function pointer  RETURN 1 if redraw is needed */
-	int         total;          /* total number of transformed data     */
-	TransData  *data;           /* transformed data (array)             */
-	TransDataExtension *ext;	/* transformed data extension (array)   */
-	TransData2D *data2d;		/* transformed data for 2d (array)      */
 	TransCon    con;            /* transformed constraint               */
 	TransSnap	tsnap;
 	NumInput    num;            /* numerical input                      */
@@ -397,7 +473,6 @@ typedef struct TransInfo {
 	char		proptext[20];	/* proportional falloff text			*/
 	float       aspect[3];      /* spaces using non 1:1 aspect, (uv's, f-curve, movie-clip... etc)
 	                             * use for conversion and snapping. */
-	float       center[3];      /* center of transformation (in local-space) */
 	float       center_global[3];  /* center of transformation (in global-space) */
 	float       center2d[2];    /* center in screen coordinates         */
 	/* Lazy initialize center data for when we need other center values.
@@ -415,7 +490,8 @@ typedef struct TransInfo {
 	short		persp;
 	short		around;
 	char		spacetype;		/* spacetype where transforming is      */
-	char		helpline;		/* helpline modes (not to be confused with hotline) */
+	char		helpline;		/* Choice of custom cursor with or without a help line from the manipulator to the mouse position. */
+	short		obedit_type;	/* Avoid looking inside TransDataContainer obedit. */
 
 	float		vec[3];			/* translation, to show for widget   	*/
 	float		mat[3][3];		/* rot/rescale, to show for widget   	*/
@@ -423,36 +499,19 @@ typedef struct TransInfo {
 	float		spacemtx[3][3];	/* orientation matrix of the current space	*/
 	char		spacename[64];	/* name of the current space, MAX_NAME		*/
 
-	struct Object *poseobj;		/* if t->flag & T_POSE, this denotes pose object */
-
-	/**
-	 * Rule of thumb for choosing between mode/type:
-	 * - If transform mode uses the data, assign to `mode`
-	 *   (typically in transform.c).
-	 * - If conversion uses the data as an extension to the #TransData, assign to `type`
-	 *   (typically in transform_conversion.c).
-	 */
-	struct {
-		/* owned by the mode (grab, scale, bend... )*/
-		union {
-			TransCustomData mode, first_elem;
-		};
-		/* owned by the type (mesh, armature, nla...) */
-		TransCustomData type;
-	} custom;
-#define TRANS_CUSTOM_DATA_ELEM_MAX (sizeof(((TransInfo *)NULL)->custom) / sizeof(TransCustomData))
-
 	/*************** NEW STUFF *********************/
 	short		launch_event; 	/* event type used to launch transform */
 
 	short		current_orientation;
-	short		twtype;			/* backup from view3d, to restore on end */
+	TransformOrientation *custom_orientation; /* this gets used when current_orientation is V3D_MANIP_CUSTOM */
+	short		twflag;			/* backup from view3d, to restore on end */
 
 	short		prop_mode;
 
 	short		mirror;
 
 	float		values[4];
+	float		values_modal_offset[4];  /* Offset applied ontop of modal input. */
 	float		auto_values[4];
 	float		axis[3];
 	float		axis_orig[3];	/* TransCon can change 'axis', store the original value here */
@@ -463,19 +522,22 @@ typedef struct TransInfo {
 	struct bContext *context; /* Only valid (non null) during an operator called function. */
 	struct ScrArea	*sa;
 	struct ARegion	*ar;
+	struct Depsgraph *depsgraph;
 	struct Scene	*scene;
+	struct ViewLayer *view_layer;
 	struct ToolSettings *settings;
 	struct wmTimer *animtimer;
 	struct wmKeyMap *keymap;  /* so we can do lookups for header text */
 	struct ReportList *reports;  /* assign from the operator, or can be NULL */
 	int         mval[2];        /* current mouse position               */
 	float       zfac;           /* use for 3d view */
-	struct Object *obedit;
-	float          obedit_mat[3][3]; /* normalized editmode matrix (T_EDIT only) */
 	void		*draw_handle_apply;
 	void		*draw_handle_view;
 	void		*draw_handle_pixel;
 	void		*draw_handle_cursor;
+
+	/** Typically for mode settings. */
+	TransCustomDataContainer custom;
 } TransInfo;
 
 
@@ -489,15 +551,20 @@ typedef struct TransInfo {
 
 /* transinfo->flag */
 #define T_OBJECT		(1 << 0)
+/** \note We could remove 'T_EDIT' and use 'obedit_type', for now ensure they're in sync. */
 #define T_EDIT			(1 << 1)
 #define T_POSE			(1 << 2)
 #define T_TEXTURE		(1 << 3)
 	/* transforming the camera while in camera view */
 #define T_CAMERA		(1 << 4)
+	/* transforming the 3D cursor. */
+#define T_CURSOR		(1 << 5)
 		 // trans on points, having no rotation/scale
 #define T_POINTS		(1 << 6)
-		// for manipulator exceptions, like scaling using center point, drawing help lines
-#define T_USES_MANIPULATOR	(1 << 7)
+/**
+ * Apply matrix #TransDataContainer.matrix, this avoids having to have duplicate check all over
+ * that happen to apply to spesiifc modes (edit & pose for eg). */
+#define T_LOCAL_MATRIX (1 << 7)
 
 	/* restrictions flags */
 #define T_ALL_RESTRICTIONS	((1 << 8)|(1 << 9)|(1 << 10))
@@ -536,6 +603,8 @@ typedef struct TransInfo {
 	/** #TransInfo.center has been set, don't change it. */
 #define T_OVERRIDE_CENTER	(1 << 25)
 
+#define T_MODAL_CURSOR_SET	(1 << 26)
+
 /* TransInfo->modifiers */
 #define	MOD_CONSTRAINT_SELECT	0x01
 #define	MOD_PRECISION			0x02
@@ -635,10 +704,14 @@ void flushTransSeq(TransInfo *t);
 void flushTransTracking(TransInfo *t);
 void flushTransMasking(TransInfo *t);
 void flushTransPaintCurve(TransInfo *t);
-void restoreBones(TransInfo *t);
+void restoreBones(TransDataContainer *tc);
 
-/*********************** exported from transform_manipulator.c ********** */
-bool gimbal_axis(struct Object *ob, float gmat[3][3]); /* return 0 when no gimbal for selection */
+/*********************** transform_manipulator.c ********** */
+
+#define MANIPULATOR_AXIS_LINE_WIDTH 2.0f
+
+/* return 0 when no gimbal for selection */
+bool gimbal_axis(struct Object *ob, float gmat[3][3]);
 
 /*********************** TransData Creation and General Handling *********** */
 void createTransData(struct bContext *C, TransInfo *t);
@@ -653,9 +726,9 @@ int count_set_pose_transflags(int *out_mode, short around, struct Object *ob);
 
 /* auto-keying stuff used by special_aftertrans_update */
 void autokeyframe_ob_cb_func(
-        struct bContext *C, struct Scene *scene, struct View3D *v3d, struct Object *ob, int tmode);
+        struct bContext *C, struct Scene *scene, struct ViewLayer *view_layer, struct Object *ob, int tmode);
 void autokeyframe_pose_cb_func(
-        struct bContext *C, struct Scene *scene, struct View3D *v3d, struct Object *ob, int tmode, short targetless_ik);
+        struct bContext *C, struct Scene *scene, struct Object *ob, int tmode, short targetless_ik);
 
 /*********************** Constraints *****************************/
 
@@ -743,7 +816,9 @@ void setInputPostFct(MouseInput *mi, void	(*post)(struct TransInfo *t, float val
 
 /*********************** Generics ********************************/
 
+void initTransDataContainers_FromObjectData(TransInfo *t);
 void initTransInfo(struct bContext *C, TransInfo *t, struct wmOperator *op, const struct wmEvent *event);
+void freeTransCustomDataForMode(TransInfo *t);
 void postTrans(struct bContext *C, TransInfo *t);
 void resetTransModal(TransInfo *t);
 void resetTransRestrictions(TransInfo *t);
@@ -758,9 +833,7 @@ void restoreTransObjects(TransInfo *t);
 void recalcData(TransInfo *t);
 
 void calculateCenter2D(TransInfo *t);
-void calculateCenterGlobal(
-        TransInfo *t, const float center_local[3],
-        float r_center_global[3]);
+void calculateCenterLocal(TransInfo *t, const float center_global[3]);
 
 const TransCenterData *transformCenter_from_type(TransInfo *t, int around);
 void calculateCenter(TransInfo *t);
@@ -789,7 +862,7 @@ bool createSpaceNormalTangent(float mat[3][3], const float normal[3], const floa
 
 struct TransformOrientation *addMatrixSpace(struct bContext *C, float mat[3][3],
                                             const char *name, const bool overwrite);
-bool applyTransformOrientation(const struct bContext *C, float mat[3][3], char r_name[64], int index);
+bool applyTransformOrientation(const struct TransformOrientation *ts, float r_mat[3][3], char r_name[64]);
 
 #define ORIENTATION_NONE	0
 #define ORIENTATION_NORMAL	1
@@ -801,19 +874,36 @@ int getTransformOrientation_ex(const struct bContext *C, float normal[3], float
 int getTransformOrientation(const struct bContext *C, float normal[3], float plane[3]);
 
 void freeEdgeSlideTempFaces(EdgeSlideData *sld);
-void freeEdgeSlideVerts(TransInfo *t, TransCustomData *custom_data);
+void freeEdgeSlideVerts(TransInfo *t, TransDataContainer *tc, TransCustomData *custom_data);
 void projectEdgeSlideData(TransInfo *t, bool is_final);
 
 void freeVertSlideTempFaces(VertSlideData *sld);
-void freeVertSlideVerts(TransInfo *t, TransCustomData *custom_data);
+void freeVertSlideVerts(TransInfo *t, TransDataContainer *tc, TransCustomData *custom_data);
 void projectVertSlideData(TransInfo *t, bool is_final);
 
 
 /* TODO. transform_queries.c */
 bool checkUseAxisMatrix(TransInfo *t);
 
-#define TRANSFORM_DIST_MAX_PX 1000.0f
 #define TRANSFORM_SNAP_MAX_PX 100.0f
 #define TRANSFORM_DIST_INVALID -FLT_MAX
 
+/* Temp macros. */
+
+/* This is to be replaced, just to get things compiling early on. */
+#define TRANS_DATA_CONTAINER_FIRST_EVIL(t) (&(t)->data_container[0])
+#define TRANS_DATA_CONTAINER_FIRST_OK(t) (&(t)->data_container[0])
+/* For cases we _know_ there is only one handle. */
+#define TRANS_DATA_CONTAINER_FIRST_SINGLE(t) (BLI_assert((t)->data_container_len == 1), (&(t)->data_container[0]))
+
+#define FOREACH_TRANS_DATA_CONTAINER(t, th) \
+	for (TransDataContainer *tc = t->data_container, *tc_end = t->data_container + t->data_container_len; \
+	     th != tc_end; \
+	     th++)
+
+#define FOREACH_TRANS_DATA_CONTAINER_INDEX(t, th, i) \
+	for (TransDataContainer *tc = ((i = 0), t->data_container), *tc_end = t->data_container + t->data_container_len; \
+	     th != tc_end; \
+	     th++, i++)
+
 #endif
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 719a6e11ce7..3c70eaae2d3 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -40,9 +40,11 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
@@ -333,15 +335,15 @@ static void planeProjection(const TransInfo *t, const float in[3], float out[3])
  *
  */
 
-static void applyAxisConstraintVec(TransInfo *t, TransData *td, const float in[3], float out[3], float pvec[3])
+static void applyAxisConstraintVec(
+        TransInfo *t, TransDataContainer *UNUSED(tc), TransData *td, const float in[3], float out[3], float pvec[3])
 {
 	copy_v3_v3(out, in);
 	if (!td && t->con.mode & CON_APPLY) {
 		mul_m3_v3(t->con.pmtx, out);
 
 		// With snap, a projection is alright, no need to correct for view alignment
-		if (!(!ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID) && activeSnap(t))) {
-
+		if (!validSnap(t)) {
 			const int dims = getConstraintSpaceDimension(t);
 			if (dims == 2) {
 				if (!is_zero_v3(out)) {
@@ -380,7 +382,8 @@ static void applyAxisConstraintVec(TransInfo *t, TransData *td, const float in[3
  * Further down, that vector is mapped to each data's space.
  */
 
-static void applyObjectConstraintVec(TransInfo *t, TransData *td, const float in[3], float out[3], float pvec[3])
+static void applyObjectConstraintVec(
+        TransInfo *t, TransDataContainer *tc, TransData *td, const float in[3], float out[3], float pvec[3])
 {
 	copy_v3_v3(out, in);
 	if (t->con.mode & CON_APPLY) {
@@ -428,7 +431,7 @@ static void applyObjectConstraintVec(TransInfo *t, TransData *td, const float in
 
 			mul_m3_v3(td->axismtx, out);
 			if (t->flag & T_EDIT) {
-				mul_m3_v3(t->obedit_mat, out);
+				mul_m3_v3(tc->mat3_unit, out);
 			}
 		}
 	}
@@ -438,7 +441,8 @@ static void applyObjectConstraintVec(TransInfo *t, TransData *td, const float in
  * Generic callback for constant spatial constraints applied to resize motion
  */
 
-static void applyAxisConstraintSize(TransInfo *t, TransData *td, float smat[3][3])
+static void applyAxisConstraintSize(
+        TransInfo *t, TransDataContainer *UNUSED(tc), TransData *td, float smat[3][3])
 {
 	if (!td && t->con.mode & CON_APPLY) {
 		float tmat[3][3];
@@ -462,7 +466,8 @@ static void applyAxisConstraintSize(TransInfo *t, TransData *td, float smat[3][3
  * Callback for object based spatial constraints applied to resize motion
  */
 
-static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3][3])
+static void applyObjectConstraintSize(
+        TransInfo *t, TransDataContainer *tc, TransData *td, float smat[3][3])
 {
 	if (td && t->con.mode & CON_APPLY) {
 		float tmat[3][3];
@@ -482,7 +487,7 @@ static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3]
 
 		mul_m3_m3m3(tmat, smat, imat);
 		if (t->flag & T_EDIT) {
-			mul_m3_m3m3(smat, t->obedit_mat, smat);
+			mul_m3_m3m3(smat, tc->mat3_unit, smat);
 		}
 		mul_m3_m3m3(smat, td->axismtx, tmat);
 	}
@@ -502,7 +507,7 @@ static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3]
  * (ie: not doing counterclockwise rotations when the mouse moves clockwise).
  */
 
-static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
+static void applyAxisConstraintRot(TransInfo *t, TransDataContainer *UNUSED(tc), TransData *td, float vec[3], float *angle)
 {
 	if (!td && t->con.mode & CON_APPLY) {
 		int mode = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
@@ -544,7 +549,8 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3], fl
  * (ie: not doing counterclockwise rotations when the mouse moves clockwise).
  */
 
-static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
+static void applyObjectConstraintRot(
+        TransInfo *t, TransDataContainer *tc, TransData *td, float vec[3], float *angle)
 {
 	if (t->con.mode & CON_APPLY) {
 		int mode = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
@@ -553,11 +559,11 @@ static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3],
 
 		/* on setup call, use first object */
 		if (td == NULL) {
-			td = t->data;
+			td = tc->data;
 		}
 
 		if (t->flag & T_EDIT) {
-			mul_m3_m3m3(tmp_axismtx, t->obedit_mat, td->axismtx);
+			mul_m3_m3m3(tmp_axismtx, tc->mat3_unit, td->axismtx);
 			axismtx = tmp_axismtx;
 		}
 		else {
@@ -607,20 +613,21 @@ void setConstraint(TransInfo *t, float space[3][3], int mode, const char text[])
 /* applies individual td->axismtx constraints */
 void setAxisMatrixConstraint(TransInfo *t, int mode, const char text[])
 {
-	if (t->total == 1) {
+	TransDataContainer *tc = t->data_container;
+	if (t->data_len_all == 1) {
 		float axismtx[3][3];
 		if (t->flag & T_EDIT) {
-			mul_m3_m3m3(axismtx, t->obedit_mat, t->data->axismtx);
+			mul_m3_m3m3(axismtx, tc->mat3_unit, tc->data->axismtx);
 		}
 		else {
-			copy_m3_m3(axismtx, t->data->axismtx);
+			copy_m3_m3(axismtx, tc->data->axismtx);
 		}
 
 		setConstraint(t, axismtx, mode, text);
 	}
 	else {
 		BLI_strncpy(t->con.text + 1, text, sizeof(t->con.text) - 1);
-		copy_m3_m3(t->con.mtx, t->data->axismtx);
+		copy_m3_m3(t->con.mtx, tc->data->axismtx);
 		t->con.mode = mode;
 		getConstraintMatrix(t);
 
@@ -638,7 +645,9 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[])
 {
 	/* edit-mode now allows local transforms too */
 	if (t->flag & T_EDIT) {
-		setConstraint(t, t->obedit_mat, mode, text);
+		/* Use the active (first) edit object. */
+		TransDataContainer *tc = t->data_container;
+		setConstraint(t, tc->mat3_unit, mode, text);
 	}
 	else {
 		setAxisMatrixConstraint(t, mode, text);
@@ -653,7 +662,7 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[])
  */
 void setUserConstraint(TransInfo *t, short orientation, int mode, const char ftext[])
 {
-	char text[40];
+	char text[256];
 
 	switch (orientation) {
 		case V3D_MANIP_GLOBAL:
@@ -681,14 +690,23 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte
 			BLI_snprintf(text, sizeof(text), ftext, IFACE_("view"));
 			setConstraint(t, t->spacemtx, mode, text);
 			break;
+		case V3D_MANIP_CURSOR:
+			BLI_snprintf(text, sizeof(text), ftext, IFACE_("cursor"));
+			setConstraint(t, t->spacemtx, mode, text);
+			break;
 		case V3D_MANIP_GIMBAL:
 			BLI_snprintf(text, sizeof(text), ftext, IFACE_("gimbal"));
 			setConstraint(t, t->spacemtx, mode, text);
 			break;
-		default: /* V3D_MANIP_CUSTOM */
-			BLI_snprintf(text, sizeof(text), ftext, t->spacename);
+		case V3D_MANIP_CUSTOM:
+		{
+			char orientation_str[128];
+			BLI_snprintf(orientation_str, sizeof(orientation_str), "%s \"%s\"",
+			             IFACE_("custom orientation"), t->custom_orientation->name);
+			BLI_snprintf(text, sizeof(text), ftext, orientation_str);
 			setConstraint(t, t->spacemtx, mode, text);
 			break;
+		}
 	}
 
 	t->con.orientation = orientation;
@@ -706,8 +724,6 @@ void drawConstraint(TransInfo *t)
 		return;
 	if (!(tc->mode & CON_APPLY))
 		return;
-	if (t->flag & T_USES_MANIPULATOR)
-		return;
 	if (t->flag & T_NO_CONSTRAINT)
 		return;
 
@@ -717,7 +733,6 @@ void drawConstraint(TransInfo *t)
 	else {
 		if (tc->mode & CON_SELECT) {
 			float vec[3];
-			char col2[3] = {255, 255, 255};
 			int depth_test_enabled;
 
 			convertViewVec(t, vec, (t->mval[0] - t->con.imval[0]), (t->mval[1] - t->con.imval[1]));
@@ -727,18 +742,29 @@ void drawConstraint(TransInfo *t)
 			drawLine(t, t->center_global, tc->mtx[1], 'Y', 0);
 			drawLine(t, t->center_global, tc->mtx[2], 'Z', 0);
 
-			glColor3ubv((GLubyte *)col2);
-
 			depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
 			if (depth_test_enabled)
 				glDisable(GL_DEPTH_TEST);
 
-			setlinestyle(1);
-			glBegin(GL_LINES);
-			glVertex3fv(t->center_global);
-			glVertex3fv(vec);
-			glEnd();
-			setlinestyle(0);
+			const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR);
+
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
+
+			immUniform1i("num_colors", 0);  /* "simple" mode */
+			immUniformColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+			immUniform1f("dash_width", 2.0f);
+			immUniform1f("dash_factor", 0.5f);
+
+			immBegin(GWN_PRIM_LINES, 2);
+			immVertex3fv(shdr_pos, t->center_global);
+			immVertex3fv(shdr_pos, vec);
+			immEnd();
+
+			immUnbindProgram();
 
 			if (depth_test_enabled)
 				glEnable(GL_DEPTH_TEST);
@@ -764,8 +790,6 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 		float tmat[4][4], imat[4][4];
 		int depth_test_enabled;
 
-		UI_ThemeColor(TH_GRID);
-
 		if (t->spacetype == SPACE_VIEW3D && rv3d != NULL) {
 			copy_m4_m4(tmat, rv3d->viewmat);
 			invert_m4_m4(imat, tmat);
@@ -775,13 +799,13 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 			unit_m4(imat);
 		}
 
-		glPushMatrix();
+		gpuPushMatrix();
 
 		if (t->spacetype == SPACE_VIEW3D) {
 			/* pass */
 		}
 		else if (t->spacetype == SPACE_IMAGE) {
-			glScalef(1.0f / t->aspect[0], 1.0f / t->aspect[1], 1.0f);
+			gpuScale2f(1.0f / t->aspect[0], 1.0f / t->aspect[1]);
 		}
 		else if (ELEM(t->spacetype, SPACE_IPO, SPACE_ACTION)) {
 			/* only scale y */
@@ -791,21 +815,28 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 			float ysize = BLI_rctf_size_y(datamask);
 			float xmask = BLI_rcti_size_x(mask);
 			float ymask = BLI_rcti_size_y(mask);
-			glScalef(1.0f, (ysize / xsize) * (xmask / ymask), 1.0f);
+			gpuScale2f(1.0f, (ysize / xsize) * (xmask / ymask));
 		}
 
 		depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
 		if (depth_test_enabled)
 			glDisable(GL_DEPTH_TEST);
 
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_GRID);
+
 		set_inverted_drawing(1);
-		drawcircball(GL_LINE_LOOP, t->center_global, t->prop_size, imat);
+		imm_drawcircball(t->center_global, t->prop_size, imat, pos);
 		set_inverted_drawing(0);
 
+		immUnbindProgram();
+
 		if (depth_test_enabled)
 			glEnable(GL_DEPTH_TEST);
 
-		glPopMatrix();
+		gpuPopMatrix();
 	}
 }
 
@@ -818,57 +849,59 @@ static void drawObjectConstraint(TransInfo *t)
 	 * Without drawing the first light, users have little clue what they are doing.
 	 */
 	short options = DRAWLIGHT;
-	TransData *td = t->data;
 	int i;
 	float tmp_axismtx[3][3];
 
-	for (i = 0; i < t->total; i++, td++) {
-		float co[3];
-		float (*axismtx)[3];
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			float co[3];
+			float (*axismtx)[3];
 
-		if (t->flag & T_PROP_EDIT) {
-			/* we're sorted, so skip the rest */
-			if (td->factor == 0.0f) {
-				break;
+			if (t->flag & T_PROP_EDIT) {
+				/* we're sorted, so skip the rest */
+				if (td->factor == 0.0f) {
+					break;
+				}
 			}
-		}
 
-		if (t->options & CTX_GPENCIL_STROKES) {
-			/* only draw a constraint line for one point, otherwise we can't see anything */
-			if ((options & DRAWLIGHT) == 0) {
-				break;
+			if (t->options & CTX_GPENCIL_STROKES) {
+				/* only draw a constraint line for one point, otherwise we can't see anything */
+				if ((options & DRAWLIGHT) == 0) {
+					break;
+				}
 			}
-		}
 
-		if (t->flag & T_OBJECT) {
-			copy_v3_v3(co, td->ob->obmat[3]);
-			axismtx = td->axismtx;
-		}
-		else if (t->flag & T_EDIT) {
-			mul_v3_m4v3(co, t->obedit->obmat, td->center);
+			if (t->flag & T_OBJECT) {
+				copy_v3_v3(co, td->ob->obmat[3]);
+				axismtx = td->axismtx;
+			}
+			else if (t->flag & T_EDIT) {
+				mul_v3_m4v3(co, tc->mat, td->center);
 
-			mul_m3_m3m3(tmp_axismtx, t->obedit_mat, td->axismtx);
-			axismtx = tmp_axismtx;
-		}
-		else if (t->flag & T_POSE) {
-			mul_v3_m4v3(co, t->poseobj->obmat, td->center);
-			axismtx = td->axismtx;
-		}
-		else {
-			copy_v3_v3(co, td->center);
-			axismtx = td->axismtx;
-		}
+				mul_m3_m3m3(tmp_axismtx, tc->mat3_unit, td->axismtx);
+				axismtx = tmp_axismtx;
+			}
+			else if (t->flag & T_POSE) {
+				mul_v3_m4v3(co, tc->mat, td->center);
+				axismtx = td->axismtx;
+			}
+			else {
+				copy_v3_v3(co, td->center);
+				axismtx = td->axismtx;
+			}
 
-		if (t->con.mode & CON_AXIS0) {
-			drawLine(t, co, axismtx[0], 'X', options);
-		}
-		if (t->con.mode & CON_AXIS1) {
-			drawLine(t, co, axismtx[1], 'Y', options);
-		}
-		if (t->con.mode & CON_AXIS2) {
-			drawLine(t, co, axismtx[2], 'Z', options);
+			if (t->con.mode & CON_AXIS0) {
+				drawLine(t, co, axismtx[0], 'X', options);
+			}
+			if (t->con.mode & CON_AXIS1) {
+				drawLine(t, co, axismtx[1], 'Y', options);
+			}
+			if (t->con.mode & CON_AXIS2) {
+				drawLine(t, co, axismtx[2], 'Z', options);
+			}
+			options &= ~DRAWLIGHT;
 		}
-		options &= ~DRAWLIGHT;
 	}
 }
 
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a9b12a34593..8bfe14dc6ea 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -68,10 +68,10 @@
 #include "BKE_context.h"
 #include "BKE_crazyspace.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
+#include "BKE_layer.h"
 #include "BKE_key.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
@@ -118,6 +118,8 @@
 #include "RNA_access.h"
 
 #include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
 
 #include "transform.h"
 #include "bmesh.h"
@@ -128,7 +130,7 @@
  */
 static void transform_around_single_fallback(TransInfo *t)
 {
-	if ((t->total == 1) &&
+	if ((t->data_len_all == 1) &&
 	    (ELEM(t->around, V3D_AROUND_CENTER_BOUNDS, V3D_AROUND_CENTER_MEAN, V3D_AROUND_ACTIVE)) &&
 	    (ELEM(t->mode, TFM_RESIZE, TFM_ROTATION, TFM_TRACKBALL)))
 	{
@@ -169,45 +171,50 @@ static int trans_data_compare_rdist(const void *a, const void *b)
 
 void sort_trans_data_dist(TransInfo *t)
 {
-	TransData *start = t->data;
-	int i;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *start = tc->data;
+		int i;
 
-	for (i = 0; i < t->total && start->flag & TD_SELECTED; i++)
-		start++;
+		for (i = 0; i < tc->data_len && start->flag & TD_SELECTED; i++) {
+			start++;
+		}
 
-	if (i < t->total) {
-		if (t->flag & T_PROP_CONNECTED)
-			qsort(start, t->total - i, sizeof(TransData), trans_data_compare_dist);
-		else
-			qsort(start, t->total - i, sizeof(TransData), trans_data_compare_rdist);
+		if (i < tc->data_len) {
+			if (t->flag & T_PROP_CONNECTED)
+				qsort(start, tc->data_len - i, sizeof(TransData), trans_data_compare_dist);
+			else
+				qsort(start, tc->data_len - i, sizeof(TransData), trans_data_compare_rdist);
+		}
 	}
 }
 
 static void sort_trans_data(TransInfo *t)
 {
-	TransData *sel, *unsel;
-	TransData temp;
-	unsel = t->data;
-	sel = t->data;
-	sel += t->total - 1;
-	while (sel > unsel) {
-		while (unsel->flag & TD_SELECTED) {
-			unsel++;
-			if (unsel == sel) {
-				return;
-			}
-		}
-		while (!(sel->flag & TD_SELECTED)) {
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *sel, *unsel;
+		TransData temp;
+		unsel = tc->data;
+		sel = tc->data;
+		sel += tc->data_len - 1;
+		while (sel > unsel) {
+			while (unsel->flag & TD_SELECTED) {
+				unsel++;
+				if (unsel == sel) {
+					return;
+				}
+			}
+			while (!(sel->flag & TD_SELECTED)) {
+				sel--;
+				if (unsel == sel) {
+					return;
+				}
+			}
+			temp = *unsel;
+			*unsel = *sel;
+			*sel = temp;
 			sel--;
-			if (unsel == sel) {
-				return;
-			}
+			unsel++;
 		}
-		temp = *unsel;
-		*unsel = *sel;
-		*sel = temp;
-		sel--;
-		unsel++;
 	}
 }
 
@@ -215,7 +222,6 @@ static void sort_trans_data(TransInfo *t)
  * warning; this is loops inside loop, has minor N^2 issues, but by sorting list it is OK */
 static void set_prop_dist(TransInfo *t, const bool with_dist)
 {
-	TransData *tob;
 	int a;
 
 	float _proj_vec[3];
@@ -232,49 +238,52 @@ static void set_prop_dist(TransInfo *t, const bool with_dist)
 		}
 	}
 
-	for (a = 0, tob = t->data; a < t->total; a++, tob++) {
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *tob = tc->data;
+		for (a = 0; a < tc->data_len; a++, tob++) {
 
-		tob->rdist = 0.0f; // init, it was mallocced
+			tob->rdist = 0.0f; // init, it was mallocced
 
-		if ((tob->flag & TD_SELECTED) == 0) {
-			TransData *td;
-			int i;
-			float dist_sq, vec[3];
+			if ((tob->flag & TD_SELECTED) == 0) {
+				TransData *td;
+				int i;
+				float dist_sq, vec[3];
 
-			tob->rdist = -1.0f; // signal for next loop
+				tob->rdist = -1.0f; // signal for next loop
 
-			for (i = 0, td = t->data; i < t->total; i++, td++) {
-				if (td->flag & TD_SELECTED) {
-					if (use_island) {
-						sub_v3_v3v3(vec, tob->iloc, td->iloc);
-					}
-					else {
-						sub_v3_v3v3(vec, tob->center, td->center);
-					}
-					mul_m3_v3(tob->mtx, vec);
+				for (i = 0, td = tc->data; i < tc->data_len; i++, td++) {
+					if (td->flag & TD_SELECTED) {
+						if (use_island) {
+							sub_v3_v3v3(vec, tob->iloc, td->iloc);
+						}
+						else {
+							sub_v3_v3v3(vec, tob->center, td->center);
+						}
+						mul_m3_v3(tob->mtx, vec);
 
-					if (proj_vec) {
-						float vec_p[3];
-						project_v3_v3v3(vec_p, vec, proj_vec);
-						sub_v3_v3(vec, vec_p);
-					}
+						if (proj_vec) {
+							float vec_p[3];
+							project_v3_v3v3(vec_p, vec, proj_vec);
+							sub_v3_v3(vec, vec_p);
+						}
 
-					dist_sq = len_squared_v3(vec);
-					if ((tob->rdist == -1.0f) || (dist_sq < SQUARE(tob->rdist))) {
-						tob->rdist = sqrtf(dist_sq);
-						if (use_island) {
-							copy_v3_v3(tob->center, td->center);
-							copy_m3_m3(tob->axismtx, td->axismtx);
+						dist_sq = len_squared_v3(vec);
+						if ((tob->rdist == -1.0f) || (dist_sq < SQUARE(tob->rdist))) {
+							tob->rdist = sqrtf(dist_sq);
+							if (use_island) {
+								copy_v3_v3(tob->center, td->center);
+								copy_m3_m3(tob->axismtx, td->axismtx);
+							}
 						}
 					}
+					else {
+						break;  /* by definition transdata has selected items in beginning */
+					}
 				}
-				else {
-					break;  /* by definition transdata has selected items in beginning */
+				if (with_dist) {
+					tob->dist = tob->rdist;
 				}
 			}
-			if (with_dist) {
-				tob->dist = tob->rdist;
-			}
 		}
 	}
 }
@@ -285,35 +294,37 @@ static void set_prop_dist(TransInfo *t, const bool with_dist)
 
 static void createTransTexspace(TransInfo *t)
 {
-	Scene *scene = t->scene;
+	ViewLayer *view_layer = t->view_layer;
 	TransData *td;
 	Object *ob;
 	ID *id;
 	short *texflag;
 
-	ob = OBACT;
+	ob = OBACT(view_layer);
 
 	if (ob == NULL) { // Shouldn't logically happen, but still...
-		t->total = 0;
 		return;
 	}
 
 	id = ob->data;
 	if (id == NULL || !ELEM(GS(id->name), ID_ME, ID_CU, ID_MB)) {
 		BKE_report(t->reports, RPT_ERROR, "Unsupported object type for text-space transform");
-		t->total = 0;
 		return;
 	}
 
 	if (BKE_object_obdata_is_libdata(ob)) {
 		BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform");
-		t->total = 0;
 		return;
 	}
 
-	t->total = 1;
-	td = t->data = MEM_callocN(sizeof(TransData), "TransTexspace");
-	td->ext = t->ext = MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
+
+	{
+		BLI_assert(t->data_container_len == 1);
+		TransDataContainer *tc = t->data_container;
+		tc->data_len = 1;
+		td = tc->data = MEM_callocN(sizeof(TransData), "TransTexspace");
+		td->ext = tc->data_ext = MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
+	}
 
 	td->flag = TD_SELECTED;
 	copy_v3_v3(td->center, ob->obmat[3]);
@@ -334,76 +345,118 @@ static void createTransTexspace(TransInfo *t)
 	copy_v3_v3(td->ext->isize, td->ext->size);
 }
 
+static void createTransCursor3D(TransInfo *t)
+{
+	TransData *td;
+
+	Scene *scene = t->scene;
+	View3D *v3d = ((t->spacetype == SPACE_VIEW3D) && (t->ar->regiontype == RGN_TYPE_WINDOW)) ? t->view : NULL;
+	View3DCursor *cursor = ED_view3d_cursor3d_get(scene, v3d);
+
+	if ((cursor == &scene->cursor) && ID_IS_LINKED(scene)) {
+		BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform");
+		return;
+	}
+
+	{
+		BLI_assert(t->data_container_len == 1);
+		TransDataContainer *tc = t->data_container;
+		tc->data_len = 1;
+		td = tc->data = MEM_callocN(sizeof(TransData), "TransTexspace");
+		td->ext = tc->data_ext = MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
+	}
+
+	td->flag = TD_SELECTED;
+	copy_v3_v3(td->center, cursor->location);
+	td->ob = NULL;
+
+	unit_m3(td->mtx);
+	quat_to_mat3(td->axismtx, cursor->rotation);
+	normalize_m3(td->axismtx);
+	pseudoinverse_m3_m3(td->smtx, td->mtx, PSEUDOINVERSE_EPSILON);
+
+	td->loc = cursor->location;
+	copy_v3_v3(td->iloc, cursor->location);
+
+	td->ext->quat = cursor->rotation;
+	copy_qt_qt(td->ext->iquat, cursor->rotation);
+}
+
 /* ********************* edge (for crease) ***** */
 
 static void createTransEdge(TransInfo *t)
 {
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
-	TransData *td = NULL;
-	BMEdge *eed;
-	BMIter iter;
-	float mtx[3][3], smtx[3][3];
-	int count = 0, countsel = 0;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
-	int cd_edge_float_offset;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++;
-			if (is_prop_edit) count++;
+		BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+		TransData *td = NULL;
+		BMEdge *eed;
+		BMIter iter;
+		float mtx[3][3], smtx[3][3];
+		int count = 0, countsel = 0;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+		int cd_edge_float_offset;
+
+		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+				if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++;
+				if (is_prop_edit) count++;
+			}
 		}
-	}
 
-	if (countsel == 0)
-		return;
+		if (countsel == 0) {
+			tc->data_len = 0;
+			continue;
+		}
 
-	if (is_prop_edit) {
-		t->total = count;
-	}
-	else {
-		t->total = countsel;
-	}
+		if (is_prop_edit) {
+			tc->data_len = count;
+		}
+		else {
+			tc->data_len = countsel;
+		}
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransCrease");
+		td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransCrease");
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	/* create data we need */
-	if (t->mode == TFM_BWEIGHT) {
-		BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(t->obedit), ME_CDFLAG_EDGE_BWEIGHT);
-		cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_BWEIGHT);
-	}
-	else { //if (t->mode == TFM_CREASE) {
-		BLI_assert(t->mode == TFM_CREASE);
-		BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(t->obedit), ME_CDFLAG_EDGE_CREASE);
-		cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_CREASE);
-	}
+		/* create data we need */
+		if (t->mode == TFM_BWEIGHT) {
+			BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(tc->obedit), ME_CDFLAG_EDGE_BWEIGHT);
+			cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_BWEIGHT);
+		}
+		else { //if (t->mode == TFM_CREASE) {
+			BLI_assert(t->mode == TFM_CREASE);
+			BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(tc->obedit), ME_CDFLAG_EDGE_CREASE);
+			cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_CREASE);
+		}
 
-	BLI_assert(cd_edge_float_offset != -1);
+		BLI_assert(cd_edge_float_offset != -1);
 
-	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || is_prop_edit)) {
-			float *fl_ptr;
-			/* need to set center for center calculations */
-			mid_v3_v3v3(td->center, eed->v1->co, eed->v2->co);
+		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+			if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || is_prop_edit)) {
+				float *fl_ptr;
+				/* need to set center for center calculations */
+				mid_v3_v3v3(td->center, eed->v1->co, eed->v2->co);
 
-			td->loc = NULL;
-			if (BM_elem_flag_test(eed, BM_ELEM_SELECT))
-				td->flag = TD_SELECTED;
-			else
-				td->flag = 0;
+				td->loc = NULL;
+				if (BM_elem_flag_test(eed, BM_ELEM_SELECT))
+					td->flag = TD_SELECTED;
+				else
+					td->flag = 0;
 
-			copy_m3_m3(td->smtx, smtx);
-			copy_m3_m3(td->mtx, mtx);
+				copy_m3_m3(td->smtx, smtx);
+				copy_m3_m3(td->mtx, mtx);
 
-			td->ext = NULL;
+				td->ext = NULL;
 
-			fl_ptr = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_float_offset);
-			td->val  =  fl_ptr;
-			td->ival = *fl_ptr;
+				fl_ptr = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_float_offset);
+				td->val  =  fl_ptr;
+				td->ival = *fl_ptr;
 
-			td++;
+				td++;
+			}
 		}
 	}
 }
@@ -521,14 +574,17 @@ static short apply_targetless_ik(Object *ob)
 	return apply;
 }
 
-static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, TransData *td)
+static void add_pose_transdata(
+        TransInfo *t, Object *ob, bPoseChannel *pchan,
+        Object *ob_eval, bPoseChannel *pchan_eval,
+        TransDataContainer *tc, TransData *td)
 {
-	Bone *bone = pchan->bone;
+	Bone *bone = pchan_eval->bone;
 	float pmat[3][3], omat[3][3];
 	float cmat[3][3], tmat[3][3];
 	float vec[3];
 
-	copy_v3_v3(vec, pchan->pose_mat[3]);
+	copy_v3_v3(vec, pchan_eval->pose_mat[3]);
 	copy_v3_v3(td->center, vec);
 
 	td->ob = ob;
@@ -545,10 +601,10 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 	td->protectflag = pchan->protectflag;
 
 	td->loc = pchan->loc;
-	copy_v3_v3(td->iloc, pchan->loc);
+	copy_v3_v3(td->iloc, pchan_eval->loc);
 
 	td->ext->size = pchan->size;
-	copy_v3_v3(td->ext->isize, pchan->size);
+	copy_v3_v3(td->ext->isize, pchan_eval->size);
 
 	if (pchan->rotmode > 0) {
 		td->ext->rot = pchan->eul;
@@ -556,7 +612,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		td->ext->rotAngle = NULL;
 		td->ext->quat = NULL;
 
-		copy_v3_v3(td->ext->irot, pchan->eul);
+		copy_v3_v3(td->ext->irot, pchan_eval->eul);
 	}
 	else if (pchan->rotmode == ROT_MODE_AXISANGLE) {
 		td->ext->rot = NULL;
@@ -564,8 +620,8 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		td->ext->rotAngle = &pchan->rotAngle;
 		td->ext->quat = NULL;
 
-		td->ext->irotAngle = pchan->rotAngle;
-		copy_v3_v3(td->ext->irotAxis, pchan->rotAxis);
+		td->ext->irotAngle = pchan_eval->rotAngle;
+		copy_v3_v3(td->ext->irotAxis, pchan_eval->rotAxis);
 	}
 	else {
 		td->ext->rot = NULL;
@@ -573,20 +629,20 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		td->ext->rotAngle = NULL;
 		td->ext->quat = pchan->quat;
 
-		copy_qt_qt(td->ext->iquat, pchan->quat);
+		copy_qt_qt(td->ext->iquat, pchan_eval->quat);
 	}
 	td->ext->rotOrder = pchan->rotmode;
 
 
 	/* proper way to get parent transform + own transform + constraints transform */
-	copy_m3_m4(omat, ob->obmat);
+	copy_m3_m4(omat, ob_eval->obmat);
 
 	/* New code, using "generic" BKE_pchan_to_pose_mat(). */
 	{
 		float rotscale_mat[4][4], loc_mat[4][4];
 		float rpmat[3][3];
 
-		BKE_pchan_to_pose_mat(pchan, rotscale_mat, loc_mat);
+		BKE_pchan_to_pose_mat(pchan_eval, rotscale_mat, loc_mat);
 		if (t->mode == TFM_TRANSLATION)
 			copy_m3_m4(pmat, loc_mat);
 		else
@@ -599,7 +655,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		copy_m3_m4(rpmat, rotscale_mat);
 
 		if (constraints_list_needinv(t, &pchan->constraints)) {
-			copy_m3_m4(tmat, pchan->constinv);
+			copy_m3_m4(tmat, pchan_eval->constinv);
 			invert_m3_m3(cmat, tmat);
 			mul_m3_series(td->mtx, cmat, omat, pmat);
 			mul_m3_series(td->ext->r_mtx, cmat, omat, rpmat);
@@ -619,7 +675,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		if (pchan->parent) {
 			/* same as td->smtx but without pchan->bone->bone_mat */
 			td->flag |= TD_PBONE_LOCAL_MTX_C;
-			mul_m3_m3m3(td->ext->l_smtx, pchan->bone->bone_mat, td->smtx);
+			mul_m3_m3m3(td->ext->l_smtx, pchan_eval->bone->bone_mat, td->smtx);
 		}
 		else {
 			td->flag |= TD_PBONE_LOCAL_MTX_P;
@@ -627,12 +683,12 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 	}
 
 	/* for axismat we use bone's own transform */
-	copy_m3_m4(pmat, pchan->pose_mat);
+	copy_m3_m4(pmat, pchan_eval->pose_mat);
 	mul_m3_m3m3(td->axismtx, omat, pmat);
 	normalize_m3(td->axismtx);
 
 	if (ELEM(t->mode, TFM_BONESIZE, TFM_BONE_ENVELOPE_DIST)) {
-		bArmature *arm = t->poseobj->data;
+		bArmature *arm = tc->poseobj->data;
 
 		if ((t->mode == TFM_BONE_ENVELOPE_DIST) || (arm->drawtype == ARM_ENVELOPE)) {
 			td->loc = NULL;
@@ -652,10 +708,10 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		bKinematicConstraint *data = has_targetless_ik(pchan);
 		if (data) {
 			if (data->flag & CONSTRAINT_IK_TIP) {
-				copy_v3_v3(data->grabtarget, pchan->pose_tail);
+				copy_v3_v3(data->grabtarget, pchan_eval->pose_tail);
 			}
 			else {
-				copy_v3_v3(data->grabtarget, pchan->pose_head);
+				copy_v3_v3(data->grabtarget, pchan_eval->pose_head);
 			}
 			td->loc = data->grabtarget;
 			copy_v3_v3(td->iloc, td->loc);
@@ -754,13 +810,18 @@ int count_set_pose_transflags(int *out_mode, short around, Object *ob)
 		}
 	}
 
-	/* if there are no translatable bones, do rotation */
-	if (mode == TFM_TRANSLATION && !has_translation) {
-		if (has_rotation) {
-			*out_mode = TFM_ROTATION;
-		}
-		else {
-			*out_mode = TFM_RESIZE;
+	/* only modify transform mode if there are bones here that do something...
+	 * otherwise we get problems when multiple objects are selected
+	 */
+	if (total) {
+		/* if there are no translatable bones, do rotation */
+		if (mode == TFM_TRANSLATION && !has_translation) {
+			if (has_rotation) {
+				*out_mode = TFM_ROTATION;
+			}
+			else {
+				*out_mode = TFM_RESIZE;
+			}
 		}
 	}
 
@@ -826,24 +887,24 @@ void transform_autoik_update(TransInfo *t, short mode)
 		}
 	}
 
-	/* sanity checks (don't assume t->poseobj is set, or that it is an armature) */
-	if (ELEM(NULL, t->poseobj, t->poseobj->pose))
-		return;
-
 	/* apply to all pose-channels */
 	bool changed = false;
-	for (pchan = t->poseobj->pose->chanbase.first; pchan; pchan = pchan->next) {
-		changed |= pchan_autoik_adjust(pchan, *chainlen);
-	}
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!DEG_depsgraph_use_legacy())
-#endif
-	{
-		if (changed) {
-			/* TODO(sergey): Consider doing partial update only. */
-			DAG_relations_tag_update(G.main);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+
+		/* sanity checks (don't assume t->poseobj is set, or that it is an armature) */
+		if (ELEM(NULL, tc->poseobj, tc->poseobj->pose)) {
+			continue;
 		}
+
+		for (pchan = tc->poseobj->pose->chanbase.first; pchan; pchan = pchan->next) {
+			changed |= pchan_autoik_adjust(pchan, *chainlen);
+		}
+	}
+
+	if (changed) {
+		/* TODO(sergey): Consider doing partial update only. */
+		DEG_relations_tag_update(G.main);
 	}
 }
 
@@ -853,9 +914,7 @@ static void pose_grab_with_ik_clear(Object *ob)
 	bKinematicConstraint *data;
 	bPoseChannel *pchan;
 	bConstraint *con, *next;
-#ifdef WITH_LEGACY_DEPSGRAPH
-	bool need_dependency_update = false;
-#endif
+	bool relations_changed = false;
 
 	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		/* clear all temporary lock flags */
@@ -869,10 +928,9 @@ static void pose_grab_with_ik_clear(Object *ob)
 			if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
 				data = con->data;
 				if (data->flag & CONSTRAINT_IK_TEMP) {
+					relations_changed = true;
+
 					/* iTaSC needs clear for removed constraints */
-#ifdef WITH_LEGACY_DEPSGRAPH
-					need_dependency_update = true;
-#endif
 					BIK_clear_data(ob->pose);
 
 					BLI_remlink(&pchan->constraints, con);
@@ -887,12 +945,9 @@ static void pose_grab_with_ik_clear(Object *ob)
 		}
 	}
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!DEG_depsgraph_use_legacy() && need_dependency_update)
-#endif
-	{
+	if (relations_changed) {
 		/* TODO(sergey): Consider doing partial update only. */
-		DAG_relations_tag_update(G.main);
+		DEG_relations_tag_update(G.main);
 	}
 }
 
@@ -1046,88 +1101,108 @@ static short pose_grab_with_ik(Object *ob)
 	/* iTaSC needs clear for new IK constraints */
 	if (tot_ik) {
 		BIK_clear_data(ob->pose);
-#ifdef WITH_LEGACY_DEPSGRAPH
-		if (!DEG_depsgraph_use_legacy())
-#endif
-		{
-			/* TODO(sergey): Consuder doing partial update only. */
-			DAG_relations_tag_update(G.main);
-		}
+		/* TODO(sergey): Consuder doing partial update only. */
+		DEG_relations_tag_update(G.main);
 	}
 
 	return (tot_ik) ? 1 : 0;
 }
 
 
-/* only called with pose mode active object now */
-static void createTransPose(TransInfo *t, Object *ob)
+/**
+ * When objects array is NULL, use 't->data_container' as is.
+ */
+static void createTransPose(TransInfo *t, Object **objects, uint objects_len)
 {
-	bArmature *arm;
-	bPoseChannel *pchan;
-	TransData *td;
-	TransDataExtension *tdx;
-	short ik_on = 0;
-	int i;
+	if (objects != NULL) {
+		if (t->data_container) {
+			MEM_freeN(t->data_container);
+		}
+		t->data_container = MEM_callocN(sizeof(*t->data_container) * objects_len, __func__);
+		t->data_container_len = objects_len;
+		int th_index;
+		FOREACH_TRANS_DATA_CONTAINER_INDEX (t, tc, th_index) {
+			tc->poseobj = objects[th_index];
+		}
+	}
 
-	t->total = 0;
+	t->data_len_all = 0;
 
-	/* check validity of state */
-	arm = BKE_armature_from_object(ob);
-	if ((arm == NULL) || (ob->pose == NULL)) return;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		Object *ob = tc->poseobj;
 
-	if (arm->flag & ARM_RESTPOS) {
-		if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
-			BKE_report(t->reports, RPT_ERROR, "Cannot change Pose when 'Rest Position' is enabled");
-			return;
+		bArmature *arm;
+		TransData *td;
+		TransDataExtension *tdx;
+		short ik_on = 0;
+		int i;
+
+
+		/* check validity of state */
+		arm = BKE_armature_from_object(tc->poseobj);
+		if ((arm == NULL) || (ob->pose == NULL)) {
+			continue;
 		}
-	}
 
-	/* do we need to add temporal IK chains? */
-	if ((arm->flag & ARM_AUTO_IK) && t->mode == TFM_TRANSLATION) {
-		ik_on = pose_grab_with_ik(ob);
-		if (ik_on) t->flag |= T_AUTOIK;
-	}
+		if (arm->flag & ARM_RESTPOS) {
+			if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
+				BKE_report(t->reports, RPT_ERROR, "Cannot change Pose when 'Rest Position' is enabled");
+				return;
+			}
+		}
 
-	/* set flags and count total (warning, can change transform to rotate) */
-	t->total = count_set_pose_transflags(&t->mode, t->around, ob);
+		/* do we need to add temporal IK chains? */
+		if ((arm->flag & ARM_AUTO_IK) && t->mode == TFM_TRANSLATION) {
+			ik_on = pose_grab_with_ik(ob);
+			if (ik_on) t->flag |= T_AUTOIK;
+		}
 
-	if (t->total == 0) return;
+		/* set flags and count total (warning, can change transform to rotate) */
+		tc->data_len = count_set_pose_transflags(&t->mode, t->around, ob);
 
-	t->flag |= T_POSE;
-	t->poseobj = ob; /* we also allow non-active objects to be transformed, in weightpaint */
+		if (tc->data_len == 0) {
+			continue;
+		}
 
-	/* disable PET, its not usable in pose mode yet [#32444] */
-	t->flag &= ~T_PROP_EDIT_ALL;
+		tc->poseobj = ob; /* we also allow non-active objects to be transformed, in weightpaint */
 
-	/* init trans data */
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransPoseBone");
-	tdx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "TransPoseBoneExt");
-	for (i = 0; i < t->total; i++, td++, tdx++) {
-		td->ext = tdx;
-		td->val = NULL;
-	}
+		/* init trans data */
+		td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransPoseBone");
+		tdx = tc->data_ext = MEM_callocN(tc->data_len * sizeof(TransDataExtension), "TransPoseBoneExt");
+		for (i = 0; i < tc->data_len; i++, td++, tdx++) {
+			td->ext = tdx;
+			td->val = NULL;
+		}
 
-	/* use pose channels to fill trans data */
-	td = t->data;
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		if (pchan->bone->flag & BONE_TRANSFORM) {
-			add_pose_transdata(t, pchan, ob, td);
-			td++;
+		/* use pose channels to fill trans data */
+		td = tc->data;
+		for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+			if (pchan->bone->flag & BONE_TRANSFORM) {
+				add_pose_transdata(t, ob, pchan, ob, pchan, tc, td);
+				td++;
+			}
+		}
+
+		if (td != (tc->data + tc->data_len)) {
+			BKE_report(t->reports, RPT_DEBUG, "Bone selection count error");
 		}
-	}
 
-	if (td != (t->data + t->total)) {
-		BKE_report(t->reports, RPT_DEBUG, "Bone selection count error");
+		/* initialize initial auto=ik chainlen's? */
+		if (ik_on) {
+			transform_autoik_update(t, 0);
+		}
 	}
 
-	/* initialize initial auto=ik chainlen's? */
-	if (ik_on) transform_autoik_update(t, 0);
+	t->flag |= T_POSE;
+	/* disable PET, its not usable in pose mode yet [#32444] */
+	t->flag &= ~T_PROP_EDIT_ALL;
+
 }
 
-void restoreBones(TransInfo *t)
+void restoreBones(TransDataContainer *tc)
 {
-	bArmature *arm = t->obedit->data;
-	BoneInitData *bid = t->custom.type.data;
+	bArmature *arm = tc->obedit->data;
+	BoneInitData *bid = tc->custom.type.data;
 	EditBone *ebo;
 
 	while (bid->bone) {
@@ -1168,226 +1243,230 @@ void restoreBones(TransInfo *t)
 /* ********************* armature ************** */
 static void createTransArmatureVerts(TransInfo *t)
 {
-	EditBone *ebo, *eboflip;
-	bArmature *arm = t->obedit->data;
-	ListBase *edbo = arm->edbo;
-	TransData *td, *td_old;
-	float mtx[3][3], smtx[3][3], bonemat[3][3];
-	bool mirror = ((arm->flag & ARM_MIRROR_EDIT) != 0);
-	int total_mirrored = 0, i;
-	int oldtot;
-	BoneInitData *bid;
-
-	t->total = 0;
-	for (ebo = edbo->first; ebo; ebo = ebo->next) {
-		oldtot = t->total;
-
-		if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) {
-			if (ELEM(t->mode, TFM_BONESIZE, TFM_BONE_ENVELOPE_DIST)) {
-				if (ebo->flag & BONE_SELECTED)
-					t->total++;
-			}
-			else if (t->mode == TFM_BONE_ROLL) {
-				if (ebo->flag & BONE_SELECTED)
-					t->total++;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		EditBone *ebo, *eboflip;
+		bArmature *arm = tc->obedit->data;
+		ListBase *edbo = arm->edbo;
+		TransData *td, *td_old;
+		float mtx[3][3], smtx[3][3], bonemat[3][3];
+		bool mirror = ((arm->flag & ARM_MIRROR_EDIT) != 0);
+		int total_mirrored = 0, i;
+		int oldtot;
+		BoneInitData *bid;
+
+		tc->data_len = 0;
+		for (ebo = edbo->first; ebo; ebo = ebo->next) {
+			oldtot = tc->data_len;
+
+			if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) {
+				if (ELEM(t->mode, TFM_BONESIZE, TFM_BONE_ENVELOPE_DIST)) {
+					if (ebo->flag & BONE_SELECTED)
+						tc->data_len++;
+				}
+				else if (t->mode == TFM_BONE_ROLL) {
+					if (ebo->flag & BONE_SELECTED)
+						tc->data_len++;
+				}
+				else {
+					if (ebo->flag & BONE_TIPSEL)
+						tc->data_len++;
+					if (ebo->flag & BONE_ROOTSEL)
+						tc->data_len++;
+				}
 			}
-			else {
-				if (ebo->flag & BONE_TIPSEL)
-					t->total++;
-				if (ebo->flag & BONE_ROOTSEL)
-					t->total++;
+
+			if (mirror && (oldtot < tc->data_len)) {
+				eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebo);
+				if (eboflip)
+					total_mirrored++;
 			}
 		}
 
-		if (mirror && (oldtot < t->total)) {
-			eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebo);
-			if (eboflip)
-				total_mirrored++;
+		if (!tc->data_len) {
+			continue;
 		}
-	}
 
-	if (!t->total) return;
+		transform_around_single_fallback(t);
 
-	transform_around_single_fallback(t);
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransEditBone");
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransEditBone");
+		if (mirror) {
+			tc->custom.type.data = bid = MEM_mallocN((total_mirrored + 1) * sizeof(BoneInitData), "BoneInitData");
+			tc->custom.type.use_free = true;
+		}
 
-	if (mirror) {
-		t->custom.type.data = bid = MEM_mallocN((total_mirrored + 1) * sizeof(BoneInitData), "BoneInitData");
-		t->custom.type.use_free = true;
-	}
+		i = 0;
 
-	i = 0;
+		for (ebo = edbo->first; ebo; ebo = ebo->next) {
+			td_old = td;
+			ebo->oldlength = ebo->length;   // length==0.0 on extrude, used for scaling radius of bone points
 
-	for (ebo = edbo->first; ebo; ebo = ebo->next) {
-		td_old = td;
-		ebo->oldlength = ebo->length;   // length==0.0 on extrude, used for scaling radius of bone points
+			if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) {
+				if (t->mode == TFM_BONE_ENVELOPE) {
+					if (ebo->flag & BONE_ROOTSEL) {
+						td->val = &ebo->rad_head;
+						td->ival = *td->val;
 
-		if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) {
-			if (t->mode == TFM_BONE_ENVELOPE) {
-				if (ebo->flag & BONE_ROOTSEL) {
-					td->val = &ebo->rad_head;
-					td->ival = *td->val;
+						copy_v3_v3(td->center, ebo->head);
+						td->flag = TD_SELECTED;
 
-					copy_v3_v3(td->center, ebo->head);
-					td->flag = TD_SELECTED;
+						copy_m3_m3(td->smtx, smtx);
+						copy_m3_m3(td->mtx, mtx);
 
-					copy_m3_m3(td->smtx, smtx);
-					copy_m3_m3(td->mtx, mtx);
+						td->loc = NULL;
+						td->ext = NULL;
+						td->ob = tc->obedit;
 
-					td->loc = NULL;
-					td->ext = NULL;
-					td->ob = t->obedit;
+						td++;
+					}
+					if (ebo->flag & BONE_TIPSEL) {
+						td->val = &ebo->rad_tail;
+						td->ival = *td->val;
+						copy_v3_v3(td->center, ebo->tail);
+						td->flag = TD_SELECTED;
 
-					td++;
-				}
-				if (ebo->flag & BONE_TIPSEL) {
-					td->val = &ebo->rad_tail;
-					td->ival = *td->val;
-					copy_v3_v3(td->center, ebo->tail);
-					td->flag = TD_SELECTED;
+						copy_m3_m3(td->smtx, smtx);
+						copy_m3_m3(td->mtx, mtx);
 
-					copy_m3_m3(td->smtx, smtx);
-					copy_m3_m3(td->mtx, mtx);
+						td->loc = NULL;
+						td->ext = NULL;
+						td->ob = tc->obedit;
 
-					td->loc = NULL;
-					td->ext = NULL;
-					td->ob = t->obedit;
+						td++;
+					}
 
-					td++;
 				}
+				else if (ELEM(t->mode, TFM_BONESIZE, TFM_BONE_ENVELOPE_DIST)) {
+					if (ebo->flag & BONE_SELECTED) {
+						if ((t->mode == TFM_BONE_ENVELOPE_DIST) || (arm->drawtype == ARM_ENVELOPE)) {
+							td->loc = NULL;
+							td->val = &ebo->dist;
+							td->ival = ebo->dist;
+						}
+						else {
+							// abusive storage of scale in the loc pointer :)
+							td->loc = &ebo->xwidth;
+							copy_v3_v3(td->iloc, td->loc);
+							td->val = NULL;
+						}
+						copy_v3_v3(td->center, ebo->head);
+						td->flag = TD_SELECTED;
 
-			}
-			else if (ELEM(t->mode, TFM_BONESIZE, TFM_BONE_ENVELOPE_DIST)) {
-				if (ebo->flag & BONE_SELECTED) {
-					if ((t->mode == TFM_BONE_ENVELOPE_DIST) || (arm->drawtype == ARM_ENVELOPE)) {
-						td->loc = NULL;
-						td->val = &ebo->dist;
-						td->ival = ebo->dist;
-					}
-					else {
-						// abusive storage of scale in the loc pointer :)
-						td->loc = &ebo->xwidth;
-						copy_v3_v3(td->iloc, td->loc);
-						td->val = NULL;
-					}
-					copy_v3_v3(td->center, ebo->head);
-					td->flag = TD_SELECTED;
-
-					/* use local bone matrix */
-					ED_armature_ebone_to_mat3(ebo, bonemat);
-					mul_m3_m3m3(td->mtx, mtx, bonemat);
-					invert_m3_m3(td->smtx, td->mtx);
+						/* use local bone matrix */
+						ED_armature_ebone_to_mat3(ebo, bonemat);
+						mul_m3_m3m3(td->mtx, mtx, bonemat);
+						invert_m3_m3(td->smtx, td->mtx);
 
-					copy_m3_m3(td->axismtx, td->mtx);
-					normalize_m3(td->axismtx);
+						copy_m3_m3(td->axismtx, td->mtx);
+						normalize_m3(td->axismtx);
 
-					td->ext = NULL;
-					td->ob = t->obedit;
+						td->ext = NULL;
+						td->ob = tc->obedit;
 
-					td++;
+						td++;
+					}
 				}
-			}
-			else if (t->mode == TFM_BONE_ROLL) {
-				if (ebo->flag & BONE_SELECTED) {
-					td->loc = NULL;
-					td->val = &(ebo->roll);
-					td->ival = ebo->roll;
+				else if (t->mode == TFM_BONE_ROLL) {
+					if (ebo->flag & BONE_SELECTED) {
+						td->loc = NULL;
+						td->val = &(ebo->roll);
+						td->ival = ebo->roll;
 
-					copy_v3_v3(td->center, ebo->head);
-					td->flag = TD_SELECTED;
+						copy_v3_v3(td->center, ebo->head);
+						td->flag = TD_SELECTED;
 
-					td->ext = NULL;
-					td->ob = t->obedit;
+						td->ext = NULL;
+						td->ob = tc->obedit;
 
-					td++;
-				}
-			}
-			else {
-				if (ebo->flag & BONE_TIPSEL) {
-					copy_v3_v3(td->iloc, ebo->tail);
-
-					/* Don't allow single selected tips to have a modified center,
-					 * causes problem with snapping (see T45974).
-					 * However, in rotation mode, we want to keep that 'rotate bone around root with
-					 * only its tip selected' behavior (see T46325). */
-					if ((t->around == V3D_AROUND_LOCAL_ORIGINS) &&
-					    ((t->mode == TFM_ROTATION) || (ebo->flag & BONE_ROOTSEL)))
-					{
-						copy_v3_v3(td->center, ebo->head);
-					}
-					else {
-						copy_v3_v3(td->center, td->iloc);
+						td++;
 					}
+				}
+				else {
+					if (ebo->flag & BONE_TIPSEL) {
+						copy_v3_v3(td->iloc, ebo->tail);
+
+						/* Don't allow single selected tips to have a modified center,
+						 * causes problem with snapping (see T45974).
+						 * However, in rotation mode, we want to keep that 'rotate bone around root with
+						 * only its tip selected' behavior (see T46325). */
+						if ((t->around == V3D_AROUND_LOCAL_ORIGINS) &&
+						    ((t->mode == TFM_ROTATION) || (ebo->flag & BONE_ROOTSEL)))
+						{
+							copy_v3_v3(td->center, ebo->head);
+						}
+						else {
+							copy_v3_v3(td->center, td->iloc);
+						}
 
-					td->loc = ebo->tail;
-					td->flag = TD_SELECTED;
-					if (ebo->flag & BONE_EDITMODE_LOCKED)
-						td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
+						td->loc = ebo->tail;
+						td->flag = TD_SELECTED;
+						if (ebo->flag & BONE_EDITMODE_LOCKED)
+							td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
 
-					copy_m3_m3(td->smtx, smtx);
-					copy_m3_m3(td->mtx, mtx);
+						copy_m3_m3(td->smtx, smtx);
+						copy_m3_m3(td->mtx, mtx);
 
-					ED_armature_ebone_to_mat3(ebo, td->axismtx);
+						ED_armature_ebone_to_mat3(ebo, td->axismtx);
 
-					if ((ebo->flag & BONE_ROOTSEL) == 0) {
-						td->extra = ebo;
-						td->ival = ebo->roll;
-					}
+						if ((ebo->flag & BONE_ROOTSEL) == 0) {
+							td->extra = ebo;
+							td->ival = ebo->roll;
+						}
 
-					td->ext = NULL;
-					td->val = NULL;
-					td->ob = t->obedit;
+						td->ext = NULL;
+						td->val = NULL;
+						td->ob = tc->obedit;
 
-					td++;
-				}
-				if (ebo->flag & BONE_ROOTSEL) {
-					copy_v3_v3(td->iloc, ebo->head);
-					copy_v3_v3(td->center, td->iloc);
-					td->loc = ebo->head;
-					td->flag = TD_SELECTED;
-					if (ebo->flag & BONE_EDITMODE_LOCKED)
-						td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
+						td++;
+					}
+					if (ebo->flag & BONE_ROOTSEL) {
+						copy_v3_v3(td->iloc, ebo->head);
+						copy_v3_v3(td->center, td->iloc);
+						td->loc = ebo->head;
+						td->flag = TD_SELECTED;
+						if (ebo->flag & BONE_EDITMODE_LOCKED)
+							td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
 
-					copy_m3_m3(td->smtx, smtx);
-					copy_m3_m3(td->mtx, mtx);
+						copy_m3_m3(td->smtx, smtx);
+						copy_m3_m3(td->mtx, mtx);
 
-					ED_armature_ebone_to_mat3(ebo, td->axismtx);
+						ED_armature_ebone_to_mat3(ebo, td->axismtx);
 
-					td->extra = ebo; /* to fix roll */
-					td->ival = ebo->roll;
+						td->extra = ebo; /* to fix roll */
+						td->ival = ebo->roll;
 
-					td->ext = NULL;
-					td->val = NULL;
-					td->ob = t->obedit;
+						td->ext = NULL;
+						td->val = NULL;
+						td->ob = tc->obedit;
 
-					td++;
+						td++;
+					}
 				}
 			}
-		}
 
-		if (mirror && (td_old != td)) {
-			eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebo);
-			if (eboflip) {
-				bid[i].bone = eboflip;
-				bid[i].dist = eboflip->dist;
-				bid[i].rad_tail = eboflip->rad_tail;
-				bid[i].roll = eboflip->roll;
-				bid[i].xwidth = eboflip->xwidth;
-				bid[i].zwidth = eboflip->zwidth;
-				copy_v3_v3(bid[i].head, eboflip->head);
-				copy_v3_v3(bid[i].tail, eboflip->tail);
-				i++;
+			if (mirror && (td_old != td)) {
+				eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebo);
+				if (eboflip) {
+					bid[i].bone = eboflip;
+					bid[i].dist = eboflip->dist;
+					bid[i].rad_tail = eboflip->rad_tail;
+					bid[i].roll = eboflip->roll;
+					bid[i].xwidth = eboflip->xwidth;
+					bid[i].zwidth = eboflip->zwidth;
+					copy_v3_v3(bid[i].head, eboflip->head);
+					copy_v3_v3(bid[i].tail, eboflip->tail);
+					i++;
+				}
 			}
 		}
-	}
 
-	if (mirror) {
-		/* trick to terminate iteration */
-		bid[total_mirrored].bone = NULL;
+		if (mirror) {
+			/* trick to terminate iteration */
+			bid[total_mirrored].bone = NULL;
+		}
 	}
 }
 
@@ -1395,72 +1474,76 @@ static void createTransArmatureVerts(TransInfo *t)
 
 static void createTransMBallVerts(TransInfo *t)
 {
-	MetaBall *mb = (MetaBall *)t->obedit->data;
-	MetaElem *ml;
-	TransData *td;
-	TransDataExtension *tx;
-	float mtx[3][3], smtx[3][3];
-	int count = 0, countsel = 0;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
-
-	/* count totals */
-	for (ml = mb->editelems->first; ml; ml = ml->next) {
-		if (ml->flag & SELECT) countsel++;
-		if (is_prop_edit) count++;
-	}
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		MetaBall *mb = (MetaBall *)tc->obedit->data;
+		MetaElem *ml;
+		TransData *td;
+		TransDataExtension *tx;
+		float mtx[3][3], smtx[3][3];
+		int count = 0, countsel = 0;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+
+		/* count totals */
+		for (ml = mb->editelems->first; ml; ml = ml->next) {
+			if (ml->flag & SELECT) countsel++;
+			if (is_prop_edit) count++;
+		}
 
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel == 0) return;
+		/* note: in prop mode we need at least 1 selected */
+		if (countsel == 0) {
+			continue;
+		}
 
-	if (is_prop_edit) t->total = count;
-	else t->total = countsel;
+		if (is_prop_edit) tc->data_len = count;
+		else tc->data_len = countsel;
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(MBall EditMode)");
-	tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "MetaElement_TransExtension");
+		td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(MBall EditMode)");
+		tx = tc->data_ext = MEM_callocN(tc->data_len * sizeof(TransDataExtension), "MetaElement_TransExtension");
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	for (ml = mb->editelems->first; ml; ml = ml->next) {
-		if (is_prop_edit || (ml->flag & SELECT)) {
-			td->loc = &ml->x;
-			copy_v3_v3(td->iloc, td->loc);
-			copy_v3_v3(td->center, td->loc);
+		for (ml = mb->editelems->first; ml; ml = ml->next) {
+			if (is_prop_edit || (ml->flag & SELECT)) {
+				td->loc = &ml->x;
+				copy_v3_v3(td->iloc, td->loc);
+				copy_v3_v3(td->center, td->loc);
 
-			quat_to_mat3(td->axismtx, ml->quat);
+				quat_to_mat3(td->axismtx, ml->quat);
 
-			if (ml->flag & SELECT) td->flag = TD_SELECTED | TD_USEQUAT | TD_SINGLESIZE;
-			else td->flag = TD_USEQUAT;
+				if (ml->flag & SELECT) td->flag = TD_SELECTED | TD_USEQUAT | TD_SINGLESIZE;
+				else td->flag = TD_USEQUAT;
 
-			copy_m3_m3(td->smtx, smtx);
-			copy_m3_m3(td->mtx, mtx);
+				copy_m3_m3(td->smtx, smtx);
+				copy_m3_m3(td->mtx, mtx);
 
-			td->ext = tx;
+				td->ext = tx;
 
-			/* Radius of MetaElem (mass of MetaElem influence) */
-			if (ml->flag & MB_SCALE_RAD) {
-				td->val = &ml->rad;
-				td->ival = ml->rad;
-			}
-			else {
-				td->val = &ml->s;
-				td->ival = ml->s;
-			}
+				/* Radius of MetaElem (mass of MetaElem influence) */
+				if (ml->flag & MB_SCALE_RAD) {
+					td->val = &ml->rad;
+					td->ival = ml->rad;
+				}
+				else {
+					td->val = &ml->s;
+					td->ival = ml->s;
+				}
 
-			/* expx/expy/expz determine "shape" of some MetaElem types */
-			tx->size = &ml->expx;
-			tx->isize[0] = ml->expx;
-			tx->isize[1] = ml->expy;
-			tx->isize[2] = ml->expz;
+				/* expx/expy/expz determine "shape" of some MetaElem types */
+				tx->size = &ml->expx;
+				tx->isize[0] = ml->expx;
+				tx->isize[1] = ml->expy;
+				tx->isize[2] = ml->expz;
 
-			/* quat is used for rotation of MetaElem */
-			tx->quat = ml->quat;
-			copy_qt_qt(tx->iquat, ml->quat);
+				/* quat is used for rotation of MetaElem */
+				tx->quat = ml->quat;
+				copy_qt_qt(tx->iquat, ml->quat);
 
-			tx->rot = NULL;
+				tx->rot = NULL;
 
-			td++;
-			tx++;
+				td++;
+				tx++;
+			}
 		}
 	}
 }
@@ -1569,271 +1652,277 @@ static int bezt_select_to_transform_triple_flag(
 
 static void createTransCurveVerts(TransInfo *t)
 {
-	Curve *cu = t->obedit->data;
-	TransData *td = NULL;
-	Nurb *nu;
-	BezTriple *bezt;
-	BPoint *bp;
-	float mtx[3][3], smtx[3][3];
-	int a;
-	int count = 0, countsel = 0;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
-	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
-	ListBase *nurbs;
-
-	/* to be sure */
-	if (cu->editnurb == NULL) return;
 
 #define SEL_F1 (1 << 0)
 #define SEL_F2 (1 << 1)
 #define SEL_F3 (1 << 2)
 
-	/* count total of vertices, check identical as in 2nd loop for making transdata! */
-	nurbs = BKE_curve_editNurbs_get(cu);
-	for (nu = nurbs->first; nu; nu = nu->next) {
-		if (nu->type == CU_BEZIER) {
-			for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
-				if (bezt->hide == 0) {
-					const int bezt_tx = bezt_select_to_transform_triple_flag(bezt, hide_handles);
-					if (bezt_tx & SEL_F1) { countsel++; }
-					if (bezt_tx & SEL_F2) { countsel++; }
-					if (bezt_tx & SEL_F3) { countsel++; }
-					if (is_prop_edit) count += 3;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
+		Curve *cu = tc->obedit->data;
+		TransData *td = NULL;
+		Nurb *nu;
+		BezTriple *bezt;
+		BPoint *bp;
+		float mtx[3][3], smtx[3][3];
+		int a;
+		int count = 0, countsel = 0;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+		short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
+		ListBase *nurbs;
+
+		/* to be sure */
+		if (cu->editnurb == NULL) return;
+
+		/* count total of vertices, check identical as in 2nd loop for making transdata! */
+		nurbs = BKE_curve_editNurbs_get(cu);
+		for (nu = nurbs->first; nu; nu = nu->next) {
+			if (nu->type == CU_BEZIER) {
+				for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
+					if (bezt->hide == 0) {
+						const int bezt_tx = bezt_select_to_transform_triple_flag(bezt, hide_handles);
+						if (bezt_tx & SEL_F1) { countsel++; }
+						if (bezt_tx & SEL_F2) { countsel++; }
+						if (bezt_tx & SEL_F3) { countsel++; }
+						if (is_prop_edit) count += 3;
+
+					}
 				}
 			}
-		}
-		else {
-			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
-				if (bp->hide == 0) {
-					if (is_prop_edit) count++;
-					if (bp->f1 & SELECT) countsel++;
+			else {
+				for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
+					if (bp->hide == 0) {
+						if (is_prop_edit) count++;
+						if (bp->f1 & SELECT) countsel++;
+					}
 				}
 			}
 		}
-	}
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel == 0) return;
+		/* note: in prop mode we need at least 1 selected */
+		if (countsel == 0) {
+			tc->data_len = 0;
+			continue;
+		}
 
-	if (is_prop_edit) t->total = count;
-	else t->total = countsel;
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Curve EditMode)");
+		if (is_prop_edit) tc->data_len = count;
+		else tc->data_len = countsel;
+		tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(Curve EditMode)");
 
-	transform_around_single_fallback(t);
+		transform_around_single_fallback(t);
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	td = t->data;
-	for (nu = nurbs->first; nu; nu = nu->next) {
-		if (nu->type == CU_BEZIER) {
-			TransData *head, *tail;
-			head = tail = td;
-			for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
-				if (bezt->hide == 0) {
-					TransDataCurveHandleFlags *hdata = NULL;
-					float axismtx[3][3];
+		td = tc->data;
+		for (nu = nurbs->first; nu; nu = nu->next) {
+			if (nu->type == CU_BEZIER) {
+				TransData *head, *tail;
+				head = tail = td;
+				for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
+					if (bezt->hide == 0) {
+						TransDataCurveHandleFlags *hdata = NULL;
+						float axismtx[3][3];
 
-					if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-						float normal[3], plane[3];
+						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+							float normal[3], plane[3];
 
-						BKE_nurb_bezt_calc_normal(nu, bezt, normal);
-						BKE_nurb_bezt_calc_plane(nu, bezt, plane);
+							BKE_nurb_bezt_calc_normal(nu, bezt, normal);
+							BKE_nurb_bezt_calc_plane(nu, bezt, plane);
 
-						if (createSpaceNormalTangent(axismtx, normal, plane)) {
-							/* pass */
-						}
-						else {
-							normalize_v3(normal);
-							axis_dominant_v3_to_m3(axismtx, normal);
-							invert_m3(axismtx);
+							if (createSpaceNormalTangent(axismtx, normal, plane)) {
+								/* pass */
+							}
+							else {
+								normalize_v3(normal);
+								axis_dominant_v3_to_m3(axismtx, normal);
+								invert_m3(axismtx);
+							}
 						}
-					}
 
-					/* Elements that will be transform (not always a match to selection). */
-					const int bezt_tx = bezt_select_to_transform_triple_flag(bezt, hide_handles);
+						/* Elements that will be transform (not always a match to selection). */
+						const int bezt_tx = bezt_select_to_transform_triple_flag(bezt, hide_handles);
+
+						if (is_prop_edit || bezt_tx & SEL_F1) {
+							copy_v3_v3(td->iloc, bezt->vec[0]);
+							td->loc = bezt->vec[0];
+							copy_v3_v3(td->center, bezt->vec[(hide_handles ||
+							                                  (t->around == V3D_AROUND_LOCAL_ORIGINS) ||
+							                                  (bezt->f2 & SELECT)) ? 1 : 0]);
+							if (hide_handles) {
+								if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+								else td->flag = 0;
+							}
+							else {
+								if (bezt->f1 & SELECT) td->flag = TD_SELECTED;
+								else td->flag = 0;
+							}
+							td->ext = NULL;
+							td->val = NULL;
 
-					if (is_prop_edit || bezt_tx & SEL_F1) {
-						copy_v3_v3(td->iloc, bezt->vec[0]);
-						td->loc = bezt->vec[0];
-						copy_v3_v3(td->center, bezt->vec[(hide_handles ||
-						                                  (t->around == V3D_AROUND_LOCAL_ORIGINS) ||
-						                                  (bezt->f2 & SELECT)) ? 1 : 0]);
-						if (hide_handles) {
-							if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
-							else td->flag = 0;
-						}
-						else {
-							if (bezt->f1 & SELECT) td->flag = TD_SELECTED;
-							else td->flag = 0;
-						}
-						td->ext = NULL;
-						td->val = NULL;
+							hdata = initTransDataCurveHandles(td, bezt);
 
-						hdata = initTransDataCurveHandles(td, bezt);
+							copy_m3_m3(td->smtx, smtx);
+							copy_m3_m3(td->mtx, mtx);
+							if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+								copy_m3_m3(td->axismtx, axismtx);
+							}
 
-						copy_m3_m3(td->smtx, smtx);
-						copy_m3_m3(td->mtx, mtx);
-						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-							copy_m3_m3(td->axismtx, axismtx);
+							td++;
+							count++;
+							tail++;
 						}
 
-						td++;
-						count++;
-						tail++;
-					}
+						/* This is the Curve Point, the other two are handles */
+						if (is_prop_edit || bezt_tx & SEL_F2) {
+							copy_v3_v3(td->iloc, bezt->vec[1]);
+							td->loc = bezt->vec[1];
+							copy_v3_v3(td->center, td->loc);
+							if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
+							td->ext = NULL;
 
-					/* This is the Curve Point, the other two are handles */
-					if (is_prop_edit || bezt_tx & SEL_F2) {
-						copy_v3_v3(td->iloc, bezt->vec[1]);
-						td->loc = bezt->vec[1];
-						copy_v3_v3(td->center, td->loc);
-						if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
-						else td->flag = 0;
-						td->ext = NULL;
+							if (t->mode == TFM_CURVE_SHRINKFATTEN) { /* || t->mode==TFM_RESIZE) {*/ /* TODO - make points scale */
+								td->val = &(bezt->radius);
+								td->ival = bezt->radius;
+							}
+							else if (t->mode == TFM_TILT) {
+								td->val = &(bezt->alfa);
+								td->ival = bezt->alfa;
+							}
+							else {
+								td->val = NULL;
+							}
 
-						if (t->mode == TFM_CURVE_SHRINKFATTEN) { /* || t->mode==TFM_RESIZE) {*/ /* TODO - make points scale */
-							td->val = &(bezt->radius);
-							td->ival = bezt->radius;
-						}
-						else if (t->mode == TFM_TILT) {
-							td->val = &(bezt->alfa);
-							td->ival = bezt->alfa;
-						}
-						else {
-							td->val = NULL;
-						}
+							copy_m3_m3(td->smtx, smtx);
+							copy_m3_m3(td->mtx, mtx);
+							if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+								copy_m3_m3(td->axismtx, axismtx);
+							}
 
-						copy_m3_m3(td->smtx, smtx);
-						copy_m3_m3(td->mtx, mtx);
-						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-							copy_m3_m3(td->axismtx, axismtx);
+							if ((bezt_tx & SEL_F1) == 0 && (bezt_tx & SEL_F3) == 0)
+								/* If the middle is selected but the sides arnt, this is needed */
+								if (hdata == NULL) { /* if the handle was not saved by the previous handle */
+									hdata = initTransDataCurveHandles(td, bezt);
+								}
+
+							td++;
+							count++;
+							tail++;
 						}
+						if (is_prop_edit || bezt_tx & SEL_F3) {
+							copy_v3_v3(td->iloc, bezt->vec[2]);
+							td->loc = bezt->vec[2];
+							copy_v3_v3(td->center, bezt->vec[(hide_handles ||
+							                                  (t->around == V3D_AROUND_LOCAL_ORIGINS) ||
+							                                  (bezt->f2 & SELECT)) ? 1 : 2]);
+							if (hide_handles) {
+								if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+								else td->flag = 0;
+							}
+							else {
+								if (bezt->f3 & SELECT) td->flag = TD_SELECTED;
+								else td->flag = 0;
+							}
+							td->ext = NULL;
+							td->val = NULL;
 
-						if ((bezt_tx & SEL_F1) == 0 && (bezt_tx & SEL_F3) == 0)
-							/* If the middle is selected but the sides arnt, this is needed */
 							if (hdata == NULL) { /* if the handle was not saved by the previous handle */
 								hdata = initTransDataCurveHandles(td, bezt);
 							}
 
-						td++;
-						count++;
-						tail++;
-					}
-					if (is_prop_edit || bezt_tx & SEL_F3) {
-						copy_v3_v3(td->iloc, bezt->vec[2]);
-						td->loc = bezt->vec[2];
-						copy_v3_v3(td->center, bezt->vec[(hide_handles ||
-						                                  (t->around == V3D_AROUND_LOCAL_ORIGINS) ||
-						                                  (bezt->f2 & SELECT)) ? 1 : 2]);
-						if (hide_handles) {
-							if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
-							else td->flag = 0;
-						}
-						else {
-							if (bezt->f3 & SELECT) td->flag = TD_SELECTED;
-							else td->flag = 0;
-						}
-						td->ext = NULL;
-						td->val = NULL;
-
-						if (hdata == NULL) { /* if the handle was not saved by the previous handle */
-							hdata = initTransDataCurveHandles(td, bezt);
-						}
+							copy_m3_m3(td->smtx, smtx);
+							copy_m3_m3(td->mtx, mtx);
+							if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+								copy_m3_m3(td->axismtx, axismtx);
+							}
 
-						copy_m3_m3(td->smtx, smtx);
-						copy_m3_m3(td->mtx, mtx);
-						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-							copy_m3_m3(td->axismtx, axismtx);
+							td++;
+							count++;
+							tail++;
 						}
 
-						td++;
-						count++;
-						tail++;
+						(void)hdata;  /* quiet warning */
+					}
+					else if (is_prop_edit && head != tail) {
+						calc_distanceCurveVerts(head, tail - 1);
+						head = tail;
 					}
-
-					(void)hdata;  /* quiet warning */
 				}
-				else if (is_prop_edit && head != tail) {
+				if (is_prop_edit && head != tail)
 					calc_distanceCurveVerts(head, tail - 1);
-					head = tail;
-				}
-			}
-			if (is_prop_edit && head != tail)
-				calc_distanceCurveVerts(head, tail - 1);
 
-			/* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles
-			 * but for now just don't change handle types */
-			if (ELEM(t->mode, TFM_CURVE_SHRINKFATTEN, TFM_TILT, TFM_DUMMY) == 0) {
-				/* sets the handles based on their selection, do this after the data is copied to the TransData */
-				BKE_nurb_handles_test(nu, !hide_handles);
+				/* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles
+				 * but for now just don't change handle types */
+				if (ELEM(t->mode, TFM_CURVE_SHRINKFATTEN, TFM_TILT, TFM_DUMMY) == 0) {
+					/* sets the handles based on their selection, do this after the data is copied to the TransData */
+					BKE_nurb_handles_test(nu, !hide_handles);
+				}
 			}
-		}
-		else {
-			TransData *head, *tail;
-			head = tail = td;
-			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
-				if (bp->hide == 0) {
-					if (is_prop_edit || (bp->f1 & SELECT)) {
-						float axismtx[3][3];
-
-						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-							if (nu->pntsv == 1) {
-								float normal[3], plane[3];
-
-								BKE_nurb_bpoint_calc_normal(nu, bp, normal);
-								BKE_nurb_bpoint_calc_plane(nu, bp, plane);
-
-								if (createSpaceNormalTangent(axismtx, normal, plane)) {
-									/* pass */
-								}
-								else {
-									normalize_v3(normal);
-									axis_dominant_v3_to_m3(axismtx, normal);
-									invert_m3(axismtx);
+			else {
+				TransData *head, *tail;
+				head = tail = td;
+				for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
+					if (bp->hide == 0) {
+						if (is_prop_edit || (bp->f1 & SELECT)) {
+							float axismtx[3][3];
+
+							if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+								if (nu->pntsv == 1) {
+									float normal[3], plane[3];
+
+									BKE_nurb_bpoint_calc_normal(nu, bp, normal);
+									BKE_nurb_bpoint_calc_plane(nu, bp, plane);
+
+									if (createSpaceNormalTangent(axismtx, normal, plane)) {
+										/* pass */
+									}
+									else {
+										normalize_v3(normal);
+										axis_dominant_v3_to_m3(axismtx, normal);
+										invert_m3(axismtx);
+									}
 								}
 							}
-						}
 
-						copy_v3_v3(td->iloc, bp->vec);
-						td->loc = bp->vec;
-						copy_v3_v3(td->center, td->loc);
-						if (bp->f1 & SELECT) td->flag = TD_SELECTED;
-						else td->flag = 0;
-						td->ext = NULL;
+							copy_v3_v3(td->iloc, bp->vec);
+							td->loc = bp->vec;
+							copy_v3_v3(td->center, td->loc);
+							if (bp->f1 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
+							td->ext = NULL;
 
-						if (t->mode == TFM_CURVE_SHRINKFATTEN || t->mode == TFM_RESIZE) {
-							td->val = &(bp->radius);
-							td->ival = bp->radius;
-						}
-						else {
-							td->val = &(bp->alfa);
-							td->ival = bp->alfa;
-						}
+							if (t->mode == TFM_CURVE_SHRINKFATTEN || t->mode == TFM_RESIZE) {
+								td->val = &(bp->radius);
+								td->ival = bp->radius;
+							}
+							else {
+								td->val = &(bp->alfa);
+								td->ival = bp->alfa;
+							}
 
-						copy_m3_m3(td->smtx, smtx);
-						copy_m3_m3(td->mtx, mtx);
-						if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
-							if (nu->pntsv == 1) {
-								copy_m3_m3(td->axismtx, axismtx);
+							copy_m3_m3(td->smtx, smtx);
+							copy_m3_m3(td->mtx, mtx);
+							if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
+								if (nu->pntsv == 1) {
+									copy_m3_m3(td->axismtx, axismtx);
+								}
 							}
-						}
 
-						td++;
-						count++;
-						tail++;
+							td++;
+							count++;
+							tail++;
+						}
+					}
+					else if (is_prop_edit && head != tail) {
+						calc_distanceCurveVerts(head, tail - 1);
+						head = tail;
 					}
 				}
-				else if (is_prop_edit && head != tail) {
+				if (is_prop_edit && head != tail)
 					calc_distanceCurveVerts(head, tail - 1);
-					head = tail;
-				}
 			}
-			if (is_prop_edit && head != tail)
-				calc_distanceCurveVerts(head, tail - 1);
 		}
 	}
-
 #undef SEL_F1
 #undef SEL_F2
 #undef SEL_F3
@@ -1843,226 +1932,236 @@ static void createTransCurveVerts(TransInfo *t)
 
 static void createTransLatticeVerts(TransInfo *t)
 {
-	Lattice *latt = ((Lattice *)t->obedit->data)->editlatt->latt;
-	TransData *td = NULL;
-	BPoint *bp;
-	float mtx[3][3], smtx[3][3];
-	int a;
-	int count = 0, countsel = 0;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	bp = latt->def;
-	a  = latt->pntsu * latt->pntsv * latt->pntsw;
-	while (a--) {
-		if (bp->hide == 0) {
-			if (bp->f1 & SELECT) countsel++;
-			if (is_prop_edit) count++;
+		Lattice *latt = ((Lattice *)tc->obedit->data)->editlatt->latt;
+		TransData *td = NULL;
+		BPoint *bp;
+		float mtx[3][3], smtx[3][3];
+		int a;
+		int count = 0, countsel = 0;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+
+		bp = latt->def;
+		a  = latt->pntsu * latt->pntsv * latt->pntsw;
+		while (a--) {
+			if (bp->hide == 0) {
+				if (bp->f1 & SELECT) countsel++;
+				if (is_prop_edit) count++;
+			}
+			bp++;
 		}
-		bp++;
-	}
 
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel == 0) return;
+		/* note: in prop mode we need at least 1 selected */
+		if (countsel == 0) return;
 
-	if (is_prop_edit) t->total = count;
-	else t->total = countsel;
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Lattice EditMode)");
+		if (is_prop_edit) tc->data_len = count;
+		else tc->data_len = countsel;
+		tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(Lattice EditMode)");
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	td = t->data;
-	bp = latt->def;
-	a  = latt->pntsu * latt->pntsv * latt->pntsw;
-	while (a--) {
-		if (is_prop_edit || (bp->f1 & SELECT)) {
-			if (bp->hide == 0) {
-				copy_v3_v3(td->iloc, bp->vec);
-				td->loc = bp->vec;
-				copy_v3_v3(td->center, td->loc);
-				if (bp->f1 & SELECT) {
-					td->flag = TD_SELECTED;
-				}
-				else {
-					td->flag = 0;
-				}
-				copy_m3_m3(td->smtx, smtx);
-				copy_m3_m3(td->mtx, mtx);
+		td = tc->data;
+		bp = latt->def;
+		a  = latt->pntsu * latt->pntsv * latt->pntsw;
+		while (a--) {
+			if (is_prop_edit || (bp->f1 & SELECT)) {
+				if (bp->hide == 0) {
+					copy_v3_v3(td->iloc, bp->vec);
+					td->loc = bp->vec;
+					copy_v3_v3(td->center, td->loc);
+					if (bp->f1 & SELECT) {
+						td->flag = TD_SELECTED;
+					}
+					else {
+						td->flag = 0;
+					}
+					copy_m3_m3(td->smtx, smtx);
+					copy_m3_m3(td->mtx, mtx);
 
-				td->ext = NULL;
-				td->val = NULL;
+					td->ext = NULL;
+					td->val = NULL;
 
-				td++;
-				count++;
+					td++;
+					count++;
+				}
 			}
+			bp++;
 		}
-		bp++;
 	}
 }
 
 /* ******************* particle edit **************** */
 static void createTransParticleVerts(bContext *C, TransInfo *t)
 {
-	TransData *td = NULL;
-	TransDataExtension *tx;
-	Object *ob = CTX_data_active_object(C);
-	ParticleEditSettings *pset = PE_settings(t->scene);
-	PTCacheEdit *edit = PE_get_current(t->scene, ob);
-	ParticleSystem *psys = NULL;
-	ParticleSystemModifierData *psmd = NULL;
-	PTCacheEditPoint *point;
-	PTCacheEditKey *key;
-	float mat[4][4];
-	int i, k, transformparticle;
-	int count = 0, hasselected = 0;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
-
-	if (edit == NULL || t->settings->particle.selectmode == SCE_SELECT_PATH) return;
-
-	psys = edit->psys;
-
-	if (psys)
-		psmd = psys_get_modifier(ob, psys);
-
-	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
-		point->flag &= ~PEP_TRANSFORM;
-		transformparticle = 0;
-
-		if ((point->flag & PEP_HIDE) == 0) {
-			for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
-				if ((key->flag & PEK_HIDE) == 0) {
-					if (key->flag & PEK_SELECT) {
-						hasselected = 1;
-						transformparticle = 1;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+
+		TransData *td = NULL;
+		TransDataExtension *tx;
+		Object *ob = CTX_data_active_object(C);
+		ParticleEditSettings *pset = PE_settings(t->scene);
+		PTCacheEdit *edit = PE_get_current(t->scene, ob);
+		ParticleSystem *psys = NULL;
+		ParticleSystemModifierData *psmd = NULL;
+		PTCacheEditPoint *point;
+		PTCacheEditKey *key;
+		float mat[4][4];
+		int i, k, transformparticle;
+		int count = 0, hasselected = 0;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+
+		if (edit == NULL || t->settings->particle.selectmode == SCE_SELECT_PATH) return;
+
+		psys = edit->psys;
+
+		if (psys)
+			psmd = psys_get_modifier(ob, psys);
+
+		for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
+			point->flag &= ~PEP_TRANSFORM;
+			transformparticle = 0;
+
+			if ((point->flag & PEP_HIDE) == 0) {
+				for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
+					if ((key->flag & PEK_HIDE) == 0) {
+						if (key->flag & PEK_SELECT) {
+							hasselected = 1;
+							transformparticle = 1;
+						}
+						else if (is_prop_edit)
+							transformparticle = 1;
 					}
-					else if (is_prop_edit)
-						transformparticle = 1;
 				}
 			}
-		}
 
-		if (transformparticle) {
-			count += point->totkey;
-			point->flag |= PEP_TRANSFORM;
+			if (transformparticle) {
+				count += point->totkey;
+				point->flag |= PEP_TRANSFORM;
+			}
 		}
-	}
 
-	/* note: in prop mode we need at least 1 selected */
-	if (hasselected == 0) return;
+		/* note: in prop mode we need at least 1 selected */
+		if (hasselected == 0) return;
 
-	t->total = count;
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Particle Mode)");
+		tc->data_len = count;
+		td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(Particle Mode)");
 
-	if (t->mode == TFM_BAKE_TIME)
-		tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "Particle_TransExtension");
-	else
-		tx = t->ext = NULL;
+		if (t->mode == TFM_BAKE_TIME)
+			tx = tc->data_ext = MEM_callocN(tc->data_len * sizeof(TransDataExtension), "Particle_TransExtension");
+		else
+			tx = tc->data_ext = NULL;
 
-	unit_m4(mat);
+		unit_m4(mat);
 
-	invert_m4_m4(ob->imat, ob->obmat);
+		invert_m4_m4(ob->imat, ob->obmat);
 
-	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
-		TransData *head, *tail;
-		head = tail = td;
+		for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
+			TransData *head, *tail;
+			head = tail = td;
 
-		if (!(point->flag & PEP_TRANSFORM)) continue;
+			if (!(point->flag & PEP_TRANSFORM)) continue;
 
-		if (psys && !(psys->flag & PSYS_GLOBAL_HAIR))
-			psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles + i, mat);
+			if (psys && !(psys->flag & PSYS_GLOBAL_HAIR))
+				psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, psys->particles + i, mat);
 
-		for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
-			if (key->flag & PEK_USE_WCO) {
-				copy_v3_v3(key->world_co, key->co);
-				mul_m4_v3(mat, key->world_co);
-				td->loc = key->world_co;
-			}
-			else
-				td->loc = key->co;
+			for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
+				if (key->flag & PEK_USE_WCO) {
+					copy_v3_v3(key->world_co, key->co);
+					mul_m4_v3(mat, key->world_co);
+					td->loc = key->world_co;
+				}
+				else
+					td->loc = key->co;
 
-			copy_v3_v3(td->iloc, td->loc);
-			copy_v3_v3(td->center, td->loc);
+				copy_v3_v3(td->iloc, td->loc);
+				copy_v3_v3(td->center, td->loc);
 
-			if (key->flag & PEK_SELECT)
-				td->flag |= TD_SELECTED;
-			else if (!is_prop_edit)
-				td->flag |= TD_SKIP;
+				if (key->flag & PEK_SELECT)
+					td->flag |= TD_SELECTED;
+				else if (!is_prop_edit)
+					td->flag |= TD_SKIP;
 
-			unit_m3(td->mtx);
-			unit_m3(td->smtx);
+				unit_m3(td->mtx);
+				unit_m3(td->smtx);
 
-			/* don't allow moving roots */
-			if (k == 0 && pset->flag & PE_LOCK_FIRST && (!psys || !(psys->flag & PSYS_GLOBAL_HAIR)))
-				td->protectflag |= OB_LOCK_LOC;
+				/* don't allow moving roots */
+				if (k == 0 && pset->flag & PE_LOCK_FIRST && (!psys || !(psys->flag & PSYS_GLOBAL_HAIR)))
+					td->protectflag |= OB_LOCK_LOC;
 
-			td->ob = ob;
-			td->ext = tx;
-			if (t->mode == TFM_BAKE_TIME) {
-				td->val = key->time;
-				td->ival = *(key->time);
-				/* abuse size and quat for min/max values */
-				td->flag |= TD_NO_EXT;
-				if (k == 0) tx->size = NULL;
-				else tx->size = (key - 1)->time;
+				td->ob = ob;
+				td->ext = tx;
+				if (t->mode == TFM_BAKE_TIME) {
+					td->val = key->time;
+					td->ival = *(key->time);
+					/* abuse size and quat for min/max values */
+					td->flag |= TD_NO_EXT;
+					if (k == 0) tx->size = NULL;
+					else tx->size = (key - 1)->time;
 
-				if (k == point->totkey - 1) tx->quat = NULL;
-				else tx->quat = (key + 1)->time;
-			}
+					if (k == point->totkey - 1) tx->quat = NULL;
+					else tx->quat = (key + 1)->time;
+				}
 
-			td++;
-			if (tx)
-				tx++;
-			tail++;
+				td++;
+				if (tx)
+					tx++;
+				tail++;
+			}
+			if (is_prop_edit && head != tail)
+				calc_distanceCurveVerts(head, tail - 1);
 		}
-		if (is_prop_edit && head != tail)
-			calc_distanceCurveVerts(head, tail - 1);
 	}
 }
 
 void flushTransParticles(TransInfo *t)
 {
-	Scene *scene = t->scene;
-	Object *ob = OBACT;
-	PTCacheEdit *edit = PE_get_current(scene, ob);
-	ParticleSystem *psys = edit->psys;
-	ParticleSystemModifierData *psmd = NULL;
-	PTCacheEditPoint *point;
-	PTCacheEditKey *key;
-	TransData *td;
-	float mat[4][4], imat[4][4], co[3];
-	int i, k;
-	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
-
-	if (psys)
-		psmd = psys_get_modifier(ob, psys);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	/* we do transform in world space, so flush world space position
-	 * back to particle local space (only for hair particles) */
-	td = t->data;
-	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++, td++) {
-		if (!(point->flag & PEP_TRANSFORM)) continue;
-
-		if (psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
-			psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles + i, mat);
-			invert_m4_m4(imat, mat);
-
-			for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
-				copy_v3_v3(co, key->world_co);
-				mul_m4_v3(imat, co);
-
-
-				/* optimization for proportional edit */
-				if (!is_prop_edit || !compare_v3v3(key->co, co, 0.0001f)) {
-					copy_v3_v3(key->co, co);
-					point->flag |= PEP_EDIT_RECALC;
+		Scene *scene = t->scene;
+		ViewLayer *view_layer = t->view_layer;
+		Object *ob = OBACT(view_layer);
+		PTCacheEdit *edit = PE_get_current(scene, ob);
+		ParticleSystem *psys = edit->psys;
+		ParticleSystemModifierData *psmd = NULL;
+		PTCacheEditPoint *point;
+		PTCacheEditKey *key;
+		TransData *td;
+		float mat[4][4], imat[4][4], co[3];
+		int i, k;
+		const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+
+		if (psys)
+			psmd = psys_get_modifier(ob, psys);
+
+		/* we do transform in world space, so flush world space position
+		 * back to particle local space (only for hair particles) */
+		td = tc->data;
+		for (i = 0, point = edit->points; i < edit->totpoint; i++, point++, td++) {
+			if (!(point->flag & PEP_TRANSFORM)) continue;
+
+			if (psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
+				psys_mat_hair_to_global(ob, psmd->mesh_final, psys->part->from, psys->particles + i, mat);
+				invert_m4_m4(imat, mat);
+
+				for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
+					copy_v3_v3(co, key->world_co);
+					mul_m4_v3(imat, co);
+
+
+					/* optimization for proportional edit */
+					if (!is_prop_edit || !compare_v3v3(key->co, co, 0.0001f)) {
+						copy_v3_v3(key->co, co);
+						point->flag |= PEP_EDIT_RECALC;
+					}
 				}
 			}
+			else
+				point->flag |= PEP_EDIT_RECALC;
 		}
-		else
-			point->flag |= PEP_EDIT_RECALC;
-	}
 
-	PE_update_object(scene, OBACT, 1);
+		PE_update_object(t->depsgraph, scene, OBACT(view_layer), 1);
+	}
 }
 
 /* ********************* mesh ****************** */
@@ -2472,243 +2571,248 @@ static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx
 
 static void createTransEditVerts(TransInfo *t)
 {
-	TransData *tob = NULL;
-	TransDataExtension *tx = NULL;
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
-	Mesh *me = t->obedit->data;
-	BMesh *bm = em->bm;
-	BMVert *eve;
-	BMIter iter;
-	float (*mappedcos)[3] = NULL, (*quats)[4] = NULL;
-	float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
-	float *dists = NULL;
-	int a;
-	const int prop_mode = (t->flag & T_PROP_EDIT) ? (t->flag & T_PROP_EDIT_ALL) : 0;
-	int mirror = 0;
-	int cd_vert_bweight_offset = -1;
-	bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	struct TransIslandData *island_info = NULL;
-	int island_info_tot;
-	int *island_vert_map = NULL;
+		TransData *tob = NULL;
+		TransDataExtension *tx = NULL;
+		BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+		Mesh *me = tc->obedit->data;
+		BMesh *bm = em->bm;
+		BMVert *eve;
+		BMIter iter;
+		float (*mappedcos)[3] = NULL, (*quats)[4] = NULL;
+		float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
+		float *dists = NULL;
+		int a;
+		const int prop_mode = (t->flag & T_PROP_EDIT) ? (t->flag & T_PROP_EDIT_ALL) : 0;
+		int mirror = 0;
+		int cd_vert_bweight_offset = -1;
+		bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
 
-	/* Even for translation this is needed because of island-orientation, see: T51651. */
-	const bool is_island_center = (t->around == V3D_AROUND_LOCAL_ORIGINS);
-	/* Original index of our connected vertex when connected distances are calculated.
-	 * Optional, allocate if needed. */
-	int *dists_index = NULL;
+		struct TransIslandData *island_info = NULL;
+		int island_info_tot;
+		int *island_vert_map = NULL;
 
-	if (t->flag & T_MIRROR) {
-		EDBM_verts_mirror_cache_begin(em, 0, false, (t->flag & T_PROP_EDIT) == 0, use_topology);
-		mirror = 1;
-	}
+		/* Even for translation this is needed because of island-orientation, see: T51651. */
+		const bool is_island_center = (t->around == V3D_AROUND_LOCAL_ORIGINS);
+		/* Original index of our connected vertex when connected distances are calculated.
+		 * Optional, allocate if needed. */
+		int *dists_index = NULL;
 
-	/**
-	 * Quick check if we can transform.
-	 *
-	 * \note ignore modes here, even in edge/face modes, transform data is created by selected vertices.
-	 * \note in prop mode we need at least 1 selected.
-	 */
-	if (bm->totvertsel == 0) {
-		goto cleanup;
-	}
+		if (t->flag & T_MIRROR) {
+			/* TODO(campbell): xform: We need support for many mirror objects at once! */
+			if (tc->is_active) {
+				EDBM_verts_mirror_cache_begin(em, 0, false, (t->flag & T_PROP_EDIT) == 0, use_topology);
+				mirror = 1;
+			}
+		}
 
-	if (t->mode == TFM_BWEIGHT) {
-		BM_mesh_cd_flag_ensure(bm, BKE_mesh_from_object(t->obedit), ME_CDFLAG_VERT_BWEIGHT);
-		cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT);
-	}
+		/**
+		 * Quick check if we can transform.
+		 *
+		 * \note ignore modes here, even in edge/face modes, transform data is created by selected vertices.
+		 * \note in prop mode we need at least 1 selected.
+		 */
+		if (bm->totvertsel == 0) {
+			goto cleanup;
+		}
 
-	if (prop_mode) {
-		unsigned int count = 0;
-		BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-				count++;
-			}
+		if (t->mode == TFM_BWEIGHT) {
+			BM_mesh_cd_flag_ensure(bm, BKE_mesh_from_object(tc->obedit), ME_CDFLAG_VERT_BWEIGHT);
+			cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT);
 		}
 
-		t->total = count;
+		if (prop_mode) {
+			unsigned int count = 0;
+			BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+				if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+					count++;
+				}
+			}
 
-		/* allocating scratch arrays */
-		if (prop_mode & T_PROP_CONNECTED) {
-			dists = MEM_mallocN(em->bm->totvert * sizeof(float), __func__);
-			if (is_island_center) {
-				dists_index =  MEM_mallocN(em->bm->totvert * sizeof(int), __func__);
+			tc->data_len = count;
+
+			/* allocating scratch arrays */
+			if (prop_mode & T_PROP_CONNECTED) {
+				dists = MEM_mallocN(em->bm->totvert * sizeof(float), __func__);
+				if (is_island_center) {
+					dists_index =  MEM_mallocN(em->bm->totvert * sizeof(int), __func__);
+				}
 			}
 		}
-	}
-	else {
-		t->total = bm->totvertsel;
-	}
-
-	tob = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mesh EditMode)");
-	if (ELEM(t->mode, TFM_SKIN_RESIZE, TFM_SHRINKFATTEN)) {
-		/* warning, this is overkill, we only need 2 extra floats,
-		 * but this stores loads of extra stuff, for TFM_SHRINKFATTEN its even more overkill
-		 * since we may not use the 'alt' transform mode to maintain shell thickness,
-		 * but with generic transform code its hard to lazy init vars */
-		tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension),
-		                          "TransObData ext");
-	}
+		else {
+			tc->data_len = bm->totvertsel;
+		}
 
-	copy_m3_m4(mtx, t->obedit->obmat);
-	/* we use a pseudoinverse so that when one of the axes is scaled to 0,
-	 * matrix inversion still works and we can still moving along the other */
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
+		tob = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(Mesh EditMode)");
+		if (ELEM(t->mode, TFM_SKIN_RESIZE, TFM_SHRINKFATTEN)) {
+			/* warning, this is overkill, we only need 2 extra floats,
+			 * but this stores loads of extra stuff, for TFM_SHRINKFATTEN its even more overkill
+			 * since we may not use the 'alt' transform mode to maintain shell thickness,
+			 * but with generic transform code its hard to lazy init vars */
+			tx = tc->data_ext = MEM_callocN(tc->data_len * sizeof(TransDataExtension), "TransObData ext");
+		}
 
-	if (prop_mode & T_PROP_CONNECTED) {
-		editmesh_set_connectivity_distance(em->bm, mtx, dists, dists_index);
-	}
+		copy_m3_m4(mtx, tc->obedit->obmat);
+		/* we use a pseudoinverse so that when one of the axes is scaled to 0,
+		 * matrix inversion still works and we can still moving along the other */
+		pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	if (is_island_center) {
-		/* In this specific case, near-by vertices will need to know the island of the nearest connected vertex. */
-		const bool calc_single_islands = (
-		        (prop_mode & T_PROP_CONNECTED) &&
-		        (t->around == V3D_AROUND_LOCAL_ORIGINS) &&
-		        (em->selectmode & SCE_SELECT_VERTEX));
+		if (prop_mode & T_PROP_CONNECTED) {
+			editmesh_set_connectivity_distance(em->bm, mtx, dists, dists_index);
+		}
 
-		island_info = editmesh_islands_info_calc(em, &island_info_tot, &island_vert_map, calc_single_islands);
-	}
+		if (is_island_center) {
+			/* In this specific case, near-by vertices will need to know the island of the nearest connected vertex. */
+			const bool calc_single_islands = (
+			        (prop_mode & T_PROP_CONNECTED) &&
+			        (t->around == V3D_AROUND_LOCAL_ORIGINS) &&
+			        (em->selectmode & SCE_SELECT_VERTEX));
 
-	/* detect CrazySpace [tm] */
-	if (modifiers_getCageIndex(t->scene, t->obedit, NULL, 1) != -1) {
-		int totleft = -1;
-		if (modifiers_isCorrectableDeformed(t->scene, t->obedit)) {
-			/* check if we can use deform matrices for modifier from the
-			 * start up to stack, they are more accurate than quats */
-			totleft = BKE_crazyspace_get_first_deform_matrices_editbmesh(t->scene, t->obedit, em, &defmats, &defcos);
+			island_info = editmesh_islands_info_calc(em, &island_info_tot, &island_vert_map, calc_single_islands);
 		}
 
-		/* if we still have more modifiers, also do crazyspace
-		 * correction with quats, relative to the coordinates after
-		 * the modifiers that support deform matrices (defcos) */
+		/* detect CrazySpace [tm] */
+		if (modifiers_getCageIndex(t->scene, tc->obedit, NULL, 1) != -1) {
+			int totleft = -1;
+			if (modifiers_isCorrectableDeformed(t->scene, tc->obedit)) {
+				/* check if we can use deform matrices for modifier from the
+				 * start up to stack, they are more accurate than quats */
+				totleft = BKE_crazyspace_get_first_deform_matrices_editbmesh(t->depsgraph, t->scene, tc->obedit, em, &defmats, &defcos);
+			}
+
+			/* if we still have more modifiers, also do crazyspace
+			 * correction with quats, relative to the coordinates after
+			 * the modifiers that support deform matrices (defcos) */
 
 #if 0	/* TODO, fix crazyspace+extrude so it can be enabled for general use - campbell */
-		if ((totleft > 0) || (totleft == -1))
+			if ((totleft > 0) || (totleft == -1))
 #else
-		if (totleft > 0)
+			if (totleft > 0)
 #endif
-		{
-			mappedcos = BKE_crazyspace_get_mapped_editverts(t->scene, t->obedit);
-			quats = MEM_mallocN(em->bm->totvert * sizeof(*quats), "crazy quats");
-			BKE_crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !prop_mode);
-			if (mappedcos)
-				MEM_freeN(mappedcos);
-		}
+			{
+				mappedcos = BKE_crazyspace_get_mapped_editverts(t->depsgraph, t->scene, tc->obedit);
+				quats = MEM_mallocN(em->bm->totvert * sizeof(*quats), "crazy quats");
+				BKE_crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !prop_mode);
+				if (mappedcos)
+					MEM_freeN(mappedcos);
+			}
 
-		if (defcos) {
-			MEM_freeN(defcos);
+			if (defcos) {
+				MEM_freeN(defcos);
+			}
 		}
-	}
 
-	/* find out which half we do */
-	if (mirror) {
-		BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-			if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve->co[0] != 0.0f) {
-				if (eve->co[0] < 0.0f) {
-					t->mirror = -1;
-					mirror = -1;
+		/* find out which half we do */
+		if (mirror) {
+			BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+				if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve->co[0] != 0.0f) {
+					if (eve->co[0] < 0.0f) {
+						t->mirror = -1;
+						mirror = -1;
+					}
+					break;
 				}
-				break;
 			}
 		}
-	}
-
-	BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, a) {
-		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-			if (prop_mode || BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
-				struct TransIslandData *v_island = NULL;
-				float *bweight = (cd_vert_bweight_offset != -1) ? BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset) : NULL;
 
-				if (island_info) {
-					const int connected_index = (dists_index && dists_index[a] != -1) ? dists_index[a] : a;
-					v_island = (island_vert_map[connected_index] != -1) ?
-					           &island_info[island_vert_map[connected_index]] : NULL;
-				}
+		BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, a) {
+			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+				if (prop_mode || BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+					struct TransIslandData *v_island = NULL;
+					float *bweight = (cd_vert_bweight_offset != -1) ? BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset) : NULL;
+
+					if (island_info) {
+						const int connected_index = (dists_index && dists_index[a] != -1) ? dists_index[a] : a;
+						v_island = (island_vert_map[connected_index] != -1) ?
+						           &island_info[island_vert_map[connected_index]] : NULL;
+					}
 
 
-				VertsToTransData(t, tob, tx, em, eve, bweight, v_island);
-				if (tx)
-					tx++;
+					VertsToTransData(t, tob, tx, em, eve, bweight, v_island);
+					if (tx)
+						tx++;
 
-				/* selected */
-				if (BM_elem_flag_test(eve, BM_ELEM_SELECT))
-					tob->flag |= TD_SELECTED;
+					/* selected */
+					if (BM_elem_flag_test(eve, BM_ELEM_SELECT))
+						tob->flag |= TD_SELECTED;
 
-				if (prop_mode) {
-					if (prop_mode & T_PROP_CONNECTED) {
-						tob->dist = dists[a];
-					}
-					else {
-						tob->flag |= TD_NOTCONNECTED;
-						tob->dist = FLT_MAX;
+					if (prop_mode) {
+						if (prop_mode & T_PROP_CONNECTED) {
+							tob->dist = dists[a];
+						}
+						else {
+							tob->flag |= TD_NOTCONNECTED;
+							tob->dist = FLT_MAX;
+						}
 					}
-				}
 
-				/* CrazySpace */
-				if (defmats || (quats && BM_elem_flag_test(eve, BM_ELEM_TAG))) {
-					float mat[3][3], qmat[3][3], imat[3][3];
+					/* CrazySpace */
+					if (defmats || (quats && BM_elem_flag_test(eve, BM_ELEM_TAG))) {
+						float mat[3][3], qmat[3][3], imat[3][3];
 
-					/* use both or either quat and defmat correction */
-					if (quats && BM_elem_flag_test(eve, BM_ELEM_TAG)) {
-						quat_to_mat3(qmat, quats[BM_elem_index_get(eve)]);
+						/* use both or either quat and defmat correction */
+						if (quats && BM_elem_flag_test(eve, BM_ELEM_TAG)) {
+							quat_to_mat3(qmat, quats[BM_elem_index_get(eve)]);
 
-						if (defmats)
-							mul_m3_series(mat, defmats[a], qmat, mtx);
+							if (defmats)
+								mul_m3_series(mat, defmats[a], qmat, mtx);
+							else
+								mul_m3_m3m3(mat, mtx, qmat);
+						}
 						else
-							mul_m3_m3m3(mat, mtx, qmat);
-					}
-					else
-						mul_m3_m3m3(mat, mtx, defmats[a]);
+							mul_m3_m3m3(mat, mtx, defmats[a]);
 
-					invert_m3_m3(imat, mat);
+						invert_m3_m3(imat, mat);
 
-					copy_m3_m3(tob->smtx, imat);
-					copy_m3_m3(tob->mtx, mat);
-				}
-				else {
-					copy_m3_m3(tob->smtx, smtx);
-					copy_m3_m3(tob->mtx, mtx);
-				}
+						copy_m3_m3(tob->smtx, imat);
+						copy_m3_m3(tob->mtx, mat);
+					}
+					else {
+						copy_m3_m3(tob->smtx, smtx);
+						copy_m3_m3(tob->mtx, mtx);
+					}
 
-				/* Mirror? */
-				if ((mirror > 0 && tob->iloc[0] > 0.0f) || (mirror < 0 && tob->iloc[0] < 0.0f)) {
-					BMVert *vmir = EDBM_verts_mirror_get(em, eve); //t->obedit, em, eve, tob->iloc, a);
-					if (vmir && vmir != eve) {
-						tob->extra = vmir;
+					/* Mirror? */
+					if ((mirror > 0 && tob->iloc[0] > 0.0f) || (mirror < 0 && tob->iloc[0] < 0.0f)) {
+						BMVert *vmir = EDBM_verts_mirror_get(em, eve); //t->obedit, em, eve, tob->iloc, a);
+						if (vmir && vmir != eve) {
+							tob->extra = vmir;
+						}
 					}
+					tob++;
 				}
-				tob++;
 			}
 		}
-	}
 
-	if (island_info) {
-		MEM_freeN(island_info);
-		MEM_freeN(island_vert_map);
-	}
+		if (island_info) {
+			MEM_freeN(island_info);
+			MEM_freeN(island_vert_map);
+		}
 
-	if (mirror != 0) {
-		tob = t->data;
-		for (a = 0; a < t->total; a++, tob++) {
-			if (ABS(tob->loc[0]) <= 0.00001f) {
-				tob->flag |= TD_MIRROR_EDGE;
+		if (mirror != 0) {
+			tob = tc->data;
+			for (a = 0; a < tc->data_len; a++, tob++) {
+				if (ABS(tob->loc[0]) <= 0.00001f) {
+					tob->flag |= TD_MIRROR_EDGE;
+				}
 			}
 		}
-	}
 
 cleanup:
-	/* crazy space free */
-	if (quats)
-		MEM_freeN(quats);
-	if (defmats)
-		MEM_freeN(defmats);
-	if (dists)
-		MEM_freeN(dists);
-	if (dists_index)
-		MEM_freeN(dists_index);
-
-	if (t->flag & T_MIRROR) {
-		EDBM_verts_mirror_cache_end(em);
+		/* crazy space free */
+		if (quats)
+			MEM_freeN(quats);
+		if (defmats)
+			MEM_freeN(defmats);
+		if (dists)
+			MEM_freeN(dists);
+		if (dists_index)
+			MEM_freeN(dists_index);
+
+		if (t->flag & T_MIRROR) {
+			EDBM_verts_mirror_cache_end(em);
+		}
 	}
 }
 
@@ -2716,39 +2820,42 @@ cleanup:
 void flushTransNodes(TransInfo *t)
 {
 	const float dpi_fac = UI_DPI_FAC;
-	int a;
-	TransData *td;
-	TransData2D *td2d;
 
-	applyGridAbsolute(t);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		int a;
+		TransData *td;
+		TransData2D *td2d;
 
-	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
-		bNode *node = td->extra;
-		float locx, locy;
+		applyGridAbsolute(t);
+
+		/* flush to 2d vector from internally used 3d vector */
+		for (a = 0, td = tc->data, td2d = tc->data_2d; a < tc->data_len; a++, td++, td2d++) {
+			bNode *node = td->extra;
+			float locx, locy;
 
-		/* weirdo - but the node system is a mix of free 2d elements and dpi sensitive UI */
+			/* weirdo - but the node system is a mix of free 2d elements and dpi sensitive UI */
 #ifdef USE_NODE_CENTER
-		locx = (td2d->loc[0] - (BLI_rctf_size_x(&node->totr)) * +0.5f) / dpi_fac;
-		locy = (td2d->loc[1] - (BLI_rctf_size_y(&node->totr)) * -0.5f) / dpi_fac;
+			locx = (td2d->loc[0] - (BLI_rctf_size_x(&node->totr)) * +0.5f) / dpi_fac;
+			locy = (td2d->loc[1] - (BLI_rctf_size_y(&node->totr)) * -0.5f) / dpi_fac;
 #else
-		locx = td2d->loc[0] / dpi_fac;
-		locy = td2d->loc[1] / dpi_fac;
+			locx = td2d->loc[0] / dpi_fac;
+			locy = td2d->loc[1] / dpi_fac;
 #endif
 
-		/* account for parents (nested nodes) */
-		if (node->parent) {
-			nodeFromView(node->parent, locx, locy, &node->locx, &node->locy);
-		}
-		else {
-			node->locx = locx;
-			node->locy = locy;
+			/* account for parents (nested nodes) */
+			if (node->parent) {
+				nodeFromView(node->parent, locx, locy, &node->locx, &node->locy);
+			}
+			else {
+				node->locx = locx;
+				node->locy = locy;
+			}
 		}
-	}
 
-	/* handle intersection with noodles */
-	if (t->total == 1) {
-		ED_node_link_intersect_test(t->sa, 1);
+		/* handle intersection with noodles */
+		if (tc->data_len == 1) {
+			ED_node_link_intersect_test(t->sa, 1);
+		}
 	}
 }
 
@@ -2778,13 +2885,14 @@ BLI_INLINE void trans_update_seq(Scene *sce, Sequence *seq, int old_start, int s
 void flushTransSeq(TransInfo *t)
 {
 	ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, false)->seqbasep; /* Editing null check already done */
+
 	int a, new_frame;
 	TransData *td = NULL;
 	TransData2D *td2d = NULL;
 	TransDataSeq *tdsq = NULL;
 	Sequence *seq;
 
-
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
 
 	/* prevent updating the same seq twice
 	 * if the transdata order is changed this will mess up
@@ -2793,7 +2901,7 @@ void flushTransSeq(TransInfo *t)
 	int old_start_prev = 0, sel_flag_prev = 0;
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
+	for (a = 0, td = tc->data, td2d = tc->data_2d; a < tc->data_len; a++, td++, td2d++) {
 		int old_start;
 		tdsq = (TransDataSeq *)td->extra;
 		seq = tdsq->seq;
@@ -2866,8 +2974,8 @@ void flushTransSeq(TransInfo *t)
 		}
 
 		/* update effects inside meta's */
-		for (a = 0, seq_prev = NULL, td = t->data, td2d = t->data2d;
-		     a < t->total;
+		for (a = 0, seq_prev = NULL, td = tc->data, td2d = tc->data_2d;
+		     a < tc->data_len;
 		     a++, td++, td2d++, seq_prev = seq)
 		{
 			tdsq = (TransDataSeq *)td->extra;
@@ -2883,7 +2991,7 @@ void flushTransSeq(TransInfo *t)
 	/* need to do the overlap check in a new loop otherwise adjacent strips
 	 * will not be updated and we'll get false positives */
 	seq_prev = NULL;
-	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
+	for (a = 0, td = tc->data, td2d = tc->data_2d; a < tc->data_len; a++, td++, td2d++) {
 
 		tdsq = (TransDataSeq *)td->extra;
 		seq = tdsq->seq;
@@ -2944,159 +3052,167 @@ static void createTransUVs(bContext *C, TransInfo *t)
 	Image *ima = CTX_data_edit_image(C);
 	Scene *scene = t->scene;
 	ToolSettings *ts = CTX_data_tool_settings(C);
-	TransData *td = NULL;
-	TransData2D *td2d = NULL;
-	BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
-	BMFace *efa;
-	BMIter iter, liter;
-	UvElementMap *elementmap = NULL;
-	BLI_bitmap *island_enabled = NULL;
-	struct { float co[2]; int co_num; } *island_center = NULL;
-	int count = 0, countsel = 0, count_rejected = 0;
+
 	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 	const bool is_prop_connected = (t->flag & T_PROP_CONNECTED) != 0;
 	const bool is_island_center = (t->around == V3D_AROUND_LOCAL_ORIGINS);
-	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
-	if (!ED_space_image_show_uvedit(sima, t->obedit))
-		return;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	/* count */
-	if (is_prop_connected || is_island_center) {
-		/* create element map with island information */
-		const bool use_facesel = (ts->uv_flag & UV_SYNC_SELECTION) == 0;
-		elementmap = BM_uv_element_map_create(em->bm, use_facesel, false, true);
-		if (elementmap == NULL) {
-			return;
-		}
+		TransData *td = NULL;
+		TransData2D *td2d = NULL;
+		BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+		BMFace *efa;
+		BMIter iter, liter;
+		UvElementMap *elementmap = NULL;
+		BLI_bitmap *island_enabled = NULL;
+		struct { float co[2]; int co_num; } *island_center = NULL;
+		int count = 0, countsel = 0, count_rejected = 0;
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-		if (is_prop_connected) {
-			island_enabled = BLI_BITMAP_NEW(elementmap->totalIslands, "TransIslandData(UV Editing)");
+		if (!ED_space_image_show_uvedit(sima, tc->obedit)) {
+			continue;
 		}
 
-		if (is_island_center) {
-			island_center = MEM_callocN(sizeof(*island_center) * elementmap->totalIslands, __func__);
-		}
-	}
+		/* count */
+		if (is_prop_connected || is_island_center) {
+			/* create element map with island information */
+			const bool use_facesel = (ts->uv_flag & UV_SYNC_SELECTION) == 0;
+			elementmap = BM_uv_element_map_create(em->bm, use_facesel, false, true);
+			if (elementmap == NULL) {
+				return;
+			}
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		BMLoop *l;
+			if (is_prop_connected) {
+				island_enabled = BLI_BITMAP_NEW(elementmap->totalIslands, "TransIslandData(UV Editing)");
+			}
 
-		if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
-			BM_elem_flag_disable(efa, BM_ELEM_TAG);
-			continue;
+			if (is_island_center) {
+				island_center = MEM_callocN(sizeof(*island_center) * elementmap->totalIslands, __func__);
+			}
 		}
 
-		BM_elem_flag_enable(efa, BM_ELEM_TAG);
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
-				countsel++;
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			BMLoop *l;
 
-				if (is_prop_connected || island_center) {
-					UvElement *element = BM_uv_element_get(elementmap, efa, l);
+			if (!uvedit_face_visible_test(scene, tc->obedit, ima, efa)) {
+				BM_elem_flag_disable(efa, BM_ELEM_TAG);
+				continue;
+			}
 
-					if (is_prop_connected) {
-						BLI_BITMAP_ENABLE(island_enabled, element->island);
-					}
+			BM_elem_flag_enable(efa, BM_ELEM_TAG);
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+					countsel++;
 
-					if (is_island_center) {
-						if (element->flag == false) {
-							MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-							add_v2_v2(island_center[element->island].co, luv->uv);
-							island_center[element->island].co_num++;
-							element->flag = true;
+					if (is_prop_connected || island_center) {
+						UvElement *element = BM_uv_element_get(elementmap, efa, l);
+
+						if (is_prop_connected) {
+							BLI_BITMAP_ENABLE(island_enabled, element->island);
+						}
+
+						if (is_island_center) {
+							if (element->flag == false) {
+								MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+								add_v2_v2(island_center[element->island].co, luv->uv);
+								island_center[element->island].co_num++;
+								element->flag = true;
+							}
 						}
 					}
 				}
-			}
 
-			if (is_prop_edit) {
-				count++;
+				if (is_prop_edit) {
+					count++;
+				}
 			}
 		}
-	}
 
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel == 0) {
-		goto finally;
-	}
+		/* note: in prop mode we need at least 1 selected */
+		if (countsel == 0) {
+			goto finally;
+		}
 
-	if (is_island_center) {
-		int i;
+		if (is_island_center) {
+			int i;
 
-		for (i = 0; i < elementmap->totalIslands; i++) {
-			mul_v2_fl(island_center[i].co, 1.0f / island_center[i].co_num);
-			mul_v2_v2(island_center[i].co, t->aspect);
+			for (i = 0; i < elementmap->totalIslands; i++) {
+				mul_v2_fl(island_center[i].co, 1.0f / island_center[i].co_num);
+				mul_v2_v2(island_center[i].co, t->aspect);
+			}
 		}
-	}
 
-	t->total = (is_prop_edit) ? count : countsel;
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(UV Editing)");
-	/* for each 2d uv coord a 3d vector is allocated, so that they can be
-	 * treated just as if they were 3d verts */
-	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransObData2D(UV Editing)");
+		tc->data_len = (is_prop_edit) ? count : countsel;
+		tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(UV Editing)");
+		/* for each 2d uv coord a 3d vector is allocated, so that they can be
+		 * treated just as if they were 3d verts */
+		tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransObData2D(UV Editing)");
 
-	if (sima->flag & SI_CLIP_UV)
-		t->flag |= T_CLIP_UV;
+		if (sima->flag & SI_CLIP_UV)
+			t->flag |= T_CLIP_UV;
 
-	td = t->data;
-	td2d = t->data2d;
+		td = tc->data;
+		td2d = tc->data_2d;
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		BMLoop *l;
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			BMLoop *l;
 
-		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
-			continue;
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+				continue;
 
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			const bool selected = uvedit_uv_select_test(scene, l, cd_loop_uv_offset);
-			MLoopUV *luv;
-			const float *center = NULL;
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				const bool selected = uvedit_uv_select_test(scene, l, cd_loop_uv_offset);
+				MLoopUV *luv;
+				const float *center = NULL;
 
-			if (!is_prop_edit && !selected)
-				continue;
+				if (!is_prop_edit && !selected)
+					continue;
 
-			if (is_prop_connected || is_island_center) {
-				UvElement *element = BM_uv_element_get(elementmap, efa, l);
+				if (is_prop_connected || is_island_center) {
+					UvElement *element = BM_uv_element_get(elementmap, efa, l);
 
-				if (is_prop_connected) {
-					if (!BLI_BITMAP_TEST(island_enabled, element->island)) {
-						count_rejected++;
-						continue;
+					if (is_prop_connected) {
+						if (!BLI_BITMAP_TEST(island_enabled, element->island)) {
+							count_rejected++;
+							continue;
+						}
 					}
-				}
 
-				if (is_island_center) {
-					center = island_center[element->island].co;
+					if (is_island_center) {
+						center = island_center[element->island].co;
+					}
 				}
-			}
 
-			BM_elem_flag_enable(l, BM_ELEM_TAG);
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-			UVsToTransData(t->aspect, td++, td2d++, luv->uv, center, selected);
+				BM_elem_flag_enable(l, BM_ELEM_TAG);
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+				UVsToTransData(t->aspect, td++, td2d++, luv->uv, center, selected);
+			}
 		}
-	}
 
-	if (is_prop_connected) {
-		t->total -= count_rejected;
-	}
-
-	if (sima->flag & SI_LIVE_UNWRAP)
-		ED_uvedit_live_unwrap_begin(t->scene, t->obedit);
+		if (is_prop_connected) {
+			tc->data_len -= count_rejected;
+		}
 
+		if (sima->flag & SI_LIVE_UNWRAP) {
+			/* TODO(campbell): xform: Only active object currently!
+			 * it uses a static variable. */
+			if (tc->is_active) {
+				ED_uvedit_live_unwrap_begin(t->scene, tc->obedit);
+			}
+		}
 
 finally:
-	if (is_prop_connected || is_island_center) {
-		BM_uv_element_map_free(elementmap);
+		if (is_prop_connected || is_island_center) {
+			BM_uv_element_map_free(elementmap);
 
-		if (is_prop_connected) {
-			MEM_freeN(island_enabled);
-		}
+			if (is_prop_connected) {
+				MEM_freeN(island_enabled);
+			}
 
-		if (island_center) {
-			MEM_freeN(island_center);
+			if (island_center) {
+				MEM_freeN(island_center);
+			}
 		}
 	}
 }
@@ -3104,37 +3220,38 @@ finally:
 void flushTransUVs(TransInfo *t)
 {
 	SpaceImage *sima = t->sa->spacedata.first;
-	TransData2D *td;
-	int a;
-	float aspect_inv[2], size[2];
 	const bool use_pixel_snap = ((sima->flag & SI_PIXELSNAP) && (t->state != TRANS_CANCEL));
 
-	aspect_inv[0] = 1.0f / t->aspect[0];
-	aspect_inv[1] = 1.0f / t->aspect[1];
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData2D *td;
+		int a;
+		float aspect_inv[2], size[2];
 
-	if (use_pixel_snap) {
-		int size_i[2];
-		ED_space_image_get_size(sima, &size_i[0], &size_i[1]);
-		size[0] = size_i[0];
-		size[1] = size_i[1];
-	}
-
-	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data2d; a < t->total; a++, td++) {
-		td->loc2d[0] = td->loc[0] * aspect_inv[0];
-		td->loc2d[1] = td->loc[1] * aspect_inv[1];
+		aspect_inv[0] = 1.0f / t->aspect[0];
+		aspect_inv[1] = 1.0f / t->aspect[1];
 
 		if (use_pixel_snap) {
-			td->loc2d[0] = roundf(td->loc2d[0] * size[0]) / size[0];
-			td->loc2d[1] = roundf(td->loc2d[1] * size[1]) / size[1];
+			int size_i[2];
+			ED_space_image_get_size(sima, &size_i[0], &size_i[1]);
+			size[0] = size_i[0];
+			size[1] = size_i[1];
+		}
+
+		/* flush to 2d vector from internally used 3d vector */
+		for (a = 0, td = tc->data_2d; a < tc->data_len; a++, td++) {
+			td->loc2d[0] = td->loc[0] * aspect_inv[0];
+			td->loc2d[1] = td->loc[1] * aspect_inv[1];
+
+			if (use_pixel_snap) {
+				td->loc2d[0] = roundf(td->loc2d[0] * size[0]) / size[0];
+				td->loc2d[1] = roundf(td->loc2d[1] * size[1]) / size[1];
+			}
 		}
 	}
 }
 
 bool clipUVTransform(TransInfo *t, float vec[2], const bool resize)
 {
-	TransData *td;
-	int a;
 	bool clipx = true, clipy = true;
 	float min[2], max[2];
 
@@ -3142,39 +3259,45 @@ bool clipUVTransform(TransInfo *t, float vec[2], const bool resize)
 	max[0] = t->aspect[0];
 	max[1] = t->aspect[1];
 
-	for (a = 0, td = t->data; a < t->total; a++, td++) {
-		minmax_v2v2_v2(min, max, td->loc);
-	}
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	if (resize) {
-		if (min[0] < 0.0f && t->center[0] > 0.0f && t->center[0] < t->aspect[0] * 0.5f)
-			vec[0] *= t->center[0] / (t->center[0] - min[0]);
-		else if (max[0] > t->aspect[0] && t->center[0] < t->aspect[0])
-			vec[0] *= (t->center[0] - t->aspect[0]) / (t->center[0] - max[0]);
-		else
-			clipx = 0;
+		TransData *td;
+		int a;
 
-		if (min[1] < 0.0f && t->center[1] > 0.0f && t->center[1] < t->aspect[1] * 0.5f)
-			vec[1] *= t->center[1] / (t->center[1] - min[1]);
-		else if (max[1] > t->aspect[1] && t->center[1] < t->aspect[1])
-			vec[1] *= (t->center[1] - t->aspect[1]) / (t->center[1] - max[1]);
-		else
-			clipy = 0;
-	}
-	else {
-		if (min[0] < 0.0f)
-			vec[0] -= min[0];
-		else if (max[0] > t->aspect[0])
-			vec[0] -= max[0] - t->aspect[0];
-		else
-			clipx = 0;
+		for (a = 0, td = tc->data; a < tc->data_len; a++, td++) {
+			minmax_v2v2_v2(min, max, td->loc);
+		}
 
-		if (min[1] < 0.0f)
-			vec[1] -= min[1];
-		else if (max[1] > t->aspect[1])
-			vec[1] -= max[1] - t->aspect[1];
-		else
-			clipy = 0;
+		if (resize) {
+			if (min[0] < 0.0f && t->center_global[0] > 0.0f && t->center_global[0] < t->aspect[0] * 0.5f)
+				vec[0] *= t->center_global[0] / (t->center_global[0] - min[0]);
+			else if (max[0] > t->aspect[0] && t->center_global[0] < t->aspect[0])
+				vec[0] *= (t->center_global[0] - t->aspect[0]) / (t->center_global[0] - max[0]);
+			else
+				clipx = 0;
+
+			if (min[1] < 0.0f && t->center_global[1] > 0.0f && t->center_global[1] < t->aspect[1] * 0.5f)
+				vec[1] *= t->center_global[1] / (t->center_global[1] - min[1]);
+			else if (max[1] > t->aspect[1] && t->center_global[1] < t->aspect[1])
+				vec[1] *= (t->center_global[1] - t->aspect[1]) / (t->center_global[1] - max[1]);
+			else
+				clipy = 0;
+		}
+		else {
+			if (min[0] < 0.0f)
+				vec[0] -= min[0];
+			else if (max[0] > t->aspect[0])
+				vec[0] -= max[0] - t->aspect[0];
+			else
+				clipx = 0;
+
+			if (min[1] < 0.0f)
+				vec[1] -= min[1];
+			else if (max[1] > t->aspect[1])
+				vec[1] -= max[1] - t->aspect[1];
+			else
+				clipy = 0;
+		}
 	}
 
 	return (clipx || clipy);
@@ -3182,18 +3305,18 @@ bool clipUVTransform(TransInfo *t, float vec[2], const bool resize)
 
 void clipUVData(TransInfo *t)
 {
-	TransData *td = NULL;
-	int a;
-
-	for (a = 0, td = t->data; a < t->total; a++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		for (int a = 0; a < tc->data_len; a++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if ((td->flag & TD_SKIP) || (!td->loc))
-			continue;
+			if ((td->flag & TD_SKIP) || (!td->loc))
+				continue;
 
-		td->loc[0] = min_ff(max_ff(0.0f, td->loc[0]), t->aspect[0]);
-		td->loc[1] = min_ff(max_ff(0.0f, td->loc[1]), t->aspect[1]);
+			td->loc[0] = min_ff(max_ff(0.0f, td->loc[0]), t->aspect[0]);
+			td->loc[1] = min_ff(max_ff(0.0f, td->loc[1]), t->aspect[1]);
+		}
 	}
 }
 
@@ -3228,6 +3351,8 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 
 	int count = 0;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* determine what type of data we are operating on */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return;
@@ -3287,12 +3412,12 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 	}
 
 	/* allocate memory for data */
-	t->total = count;
+	tc->data_len = count;
 
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData(NLA Editor)");
-	td = t->data;
-	t->custom.type.data = tdn = MEM_callocN(t->total * sizeof(TransDataNla), "TransDataNla (NLA Editor)");
-	t->custom.type.use_free = true;
+	tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransData(NLA Editor)");
+	td = tc->data;
+	tc->custom.type.data = tdn = MEM_callocN(tc->data_len * sizeof(TransDataNla), "TransDataNla (NLA Editor)");
+	tc->custom.type.use_free = true;
 
 	/* loop 2: build transdata array */
 	for (ale = anim_data.first; ale; ale = ale->next) {
@@ -3822,11 +3947,11 @@ typedef struct tGPFtransdata {
 /* This function helps flush transdata written to tempdata into the gp-frames  */
 void flushTransIntFrameActionData(TransInfo *t)
 {
-	tGPFtransdata *tfd = t->custom.type.data;
-	int i;
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+	tGPFtransdata *tfd = tc->custom.type.data;
 
 	/* flush data! */
-	for (i = 0; i < t->total; i++, tfd++) {
+	for (int i = 0; i < tc->data_len; i++, tfd++) {
 		*(tfd->sdata) = round_fl_to_int(tfd->val);
 	}
 }
@@ -3983,17 +4108,19 @@ static void createTransActionData(bContext *C, TransInfo *t)
 		return;
 	}
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* allocate memory for data */
-	t->total = count;
+	tc->data_len = count;
 
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData(Action Editor)");
-	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "transdata2d");
-	td = t->data;
-	td2d = t->data2d;
+	tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransData(Action Editor)");
+	tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "transdata2d");
+	td = tc->data;
+	td2d = tc->data_2d;
 
 	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
-		t->custom.type.data = tfd = MEM_callocN(sizeof(tGPFtransdata) * count, "tGPFtransdata");
-		t->custom.type.use_free = true;
+		tc->custom.type.data = tfd = MEM_callocN(sizeof(tGPFtransdata) * count, "tGPFtransdata");
+		tc->custom.type.use_free = true;
 	}
 
 	/* loop 2: build transdata array */
@@ -4038,7 +4165,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 
 	/* calculate distances for proportional editing */
 	if (is_prop_edit) {
-		td = t->data;
+		td = tc->data;
 
 		for (ale = anim_data.first; ale; ale = ale->next) {
 			AnimData *adt;
@@ -4381,18 +4508,20 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		return;
 	}
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* allocate memory for data */
-	t->total = count;
+	tc->data_len = count;
 
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData (Graph Editor)");
+	tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransData (Graph Editor)");
 	/* for each 2d vert a 3d vector is allocated, so that they can be treated just as if they were 3d verts */
-	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransData2D (Graph Editor)");
-	t->custom.type.data = MEM_callocN(t->total * sizeof(TransDataGraph), "TransDataGraph");
-	t->custom.type.use_free = true;
+	tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransData2D (Graph Editor)");
+	tc->custom.type.data = MEM_callocN(tc->data_len * sizeof(TransDataGraph), "TransDataGraph");
+	tc->custom.type.use_free = true;
 
-	td = t->data;
-	td2d = t->data2d;
-	tdg = t->custom.type.data;
+	td = tc->data;
+	td2d = tc->data_2d;
+	tdg = tc->custom.type.data;
 
 	/* precompute space-conversion matrices for dealing with non-uniform scaling of Graph Editor */
 	unit_m3(mtx);
@@ -4519,7 +4648,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 
 	if (is_prop_edit) {
 		/* loop 2: build transdata arrays */
-		td = t->data;
+		td = tc->data;
 
 		for (ale = anim_data.first; ale; ale = ale->next) {
 			AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
@@ -4676,11 +4805,13 @@ static void beztmap_to_data(TransInfo *t, FCurve *fcu, BeztMap *bezms, int totve
 	int i, j;
 	char *adjusted;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* dynamically allocate an array of chars to mark whether an TransData's
 	 * pointers have been fixed already, so that we don't override ones that are
 	 * already done
 	 */
-	adjusted = MEM_callocN(t->total, "beztmap_adjusted_map");
+	adjusted = MEM_callocN(tc->data_len, "beztmap_adjusted_map");
 
 	/* for each beztmap item, find if it is used anywhere */
 	bezm = bezms;
@@ -4688,9 +4819,9 @@ static void beztmap_to_data(TransInfo *t, FCurve *fcu, BeztMap *bezms, int totve
 		/* loop through transdata, testing if we have a hit
 		 * for the handles (vec[0]/vec[2]), we must also check if they need to be swapped...
 		 */
-		td2d = t->data2d;
-		td = t->data;
-		for (j = 0; j < t->total; j++, td2d++, td++) {
+		td2d = tc->data_2d;
+		td = tc->data;
+		for (j = 0; j < tc->data_len; j++, td2d++, td++) {
 			/* skip item if already marked */
 			if (adjusted[j] != 0) continue;
 
@@ -4793,9 +4924,11 @@ void flushTransGraphData(TransInfo *t)
 	double secf = FPS;
 	int a;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data, td2d = t->data2d, tdg = t->custom.type.data;
-	     a < t->total;
+	for (a = 0, td = tc->data, td2d = tc->data_2d, tdg = tc->custom.type.data;
+	     a < tc->data_len;
 	     a++, td++, td2d++, tdg++)
 	{
 		AnimData *adt = (AnimData *)td->extra; /* pointers to relevant AnimData blocks are stored in the td->extra pointers */
@@ -5157,13 +5290,15 @@ static void SeqTransDataBounds(TransInfo *t, ListBase *seqbase, TransSeq *ts)
 }
 
 
-static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
+static void freeSeqData(TransInfo *t, TransDataContainer *tc, TransCustomData *custom_data)
 {
 	Editing *ed = BKE_sequencer_editing_get(t->scene, false);
 
 	if (ed != NULL) {
+
+
 		ListBase *seqbasep = ed->seqbasep;
-		TransData *td = t->data;
+		TransData *td = tc->data;
 		int a;
 
 		/* prevent updating the same seq twice
@@ -5191,7 +5326,7 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 			{
 				int overlap = 0;
 
-				for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) {
+				for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) {
 					seq = ((TransDataSeq *)td->extra)->seq;
 					if ((seq != seq_prev) && (seq->depth == 0) && (seq->flag & SEQ_OVERLAP)) {
 						overlap = 1;
@@ -5204,8 +5339,8 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 					for (seq = seqbasep->first; seq; seq = seq->next)
 						seq->tmp = NULL;
 
-					td = t->data;
-					for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) {
+					td = tc->data;
+					for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) {
 						seq = ((TransDataSeq *)td->extra)->seq;
 						if ((seq != seq_prev)) {
 							/* check effects strips, we cant change their time */
@@ -5228,8 +5363,8 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 
 					if (t->flag & T_ALT_TRANSFORM) {
 						int minframe = MAXFRAME;
-						td = t->data;
-						for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) {
+						td = tc->data;
+						for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) {
 							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev) && (seq->depth == 0)) {
 								minframe = min_ii(minframe, seq->startdisp);
@@ -5265,8 +5400,8 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 
 					if (has_effect_any) {
 						/* update effects strips based on strips just moved in time */
-						td = t->data;
-						for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) {
+						td = tc->data;
+						for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) {
 							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev)) {
 								if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
@@ -5278,8 +5413,8 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 
 					if (has_effect_root) {
 						/* now if any effects _still_ overlap, we need to move them up */
-						td = t->data;
-						for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) {
+						td = tc->data;
+						for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) {
 							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev) && (seq->depth == 0)) {
 								if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
@@ -5308,7 +5443,7 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 		}
 		else {
 			/* Canceled, need to update the strips display */
-			for (a = 0; a < t->total; a++, td++) {
+			for (a = 0; a < tc->data_len; a++, td++) {
 				seq = ((TransDataSeq *)td->extra)->seq;
 				if ((seq != seq_prev) && (seq->depth == 0)) {
 					if (seq->flag & SEQ_OVERLAP)
@@ -5327,9 +5462,9 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data)
 		MEM_freeN(custom_data->data);
 		custom_data->data = NULL;
 	}
-	if (t->data) {
-		MEM_freeN(t->data); // XXX postTrans usually does this
-		t->data = NULL;
+	if (tc->data) {
+		MEM_freeN(tc->data); // XXX postTrans usually does this
+		tc->data = NULL;
 	}
 }
 
@@ -5348,12 +5483,14 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 
 	int count = 0;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	if (ed == NULL) {
-		t->total = 0;
+		tc->data_len = 0;
 		return;
 	}
 
-	t->custom.type.free_cb = freeSeqData;
+	tc->custom.type.free_cb = freeSeqData;
 
 	xmouse = (int)UI_view2d_region_to_view_x(v2d, t->mouse.imval[0]);
 
@@ -5392,18 +5529,18 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 	count = SeqTransCount(t, NULL, ed->seqbasep, 0);
 
 	/* allocate memory for data */
-	t->total = count;
+	tc->data_len = count;
 
 	/* stop if trying to build list if nothing selected */
 	if (count == 0) {
 		return;
 	}
 
-	t->custom.type.data = ts = MEM_callocN(sizeof(TransSeq), "transseq");
-	t->custom.type.use_free = true;
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransSeq TransData");
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransSeq TransData2D");
-	ts->tdseq = tdsq = MEM_callocN(t->total * sizeof(TransDataSeq), "TransSeq TransDataSeq");
+	tc->custom.type.data = ts = MEM_callocN(sizeof(TransSeq), "transseq");
+	tc->custom.type.use_free = true;
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransSeq TransData");
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransSeq TransData2D");
+	ts->tdseq = tdsq = MEM_callocN(tc->data_len * sizeof(TransDataSeq), "TransSeq TransDataSeq");
 
 	/* loop 2: build transdata array */
 	SeqToTransData_Recursive(t, ed->seqbasep, td, td2d, tdsq);
@@ -5482,17 +5619,18 @@ static bool constraints_list_needinv(TransInfo *t, ListBase *list)
 /* transcribe given object into TransData for Transforming */
 static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 {
+	Depsgraph *depsgraph = t->depsgraph;
 	Scene *scene = t->scene;
 	bool constinv;
 	bool skip_invert = false;
 
 	if (t->mode != TFM_DUMMY && ob->rigidbody_object) {
 		float rot[3][3], scale[3];
-		float ctime = BKE_scene_frame_get(scene);
+		float ctime = DEG_get_ctime(depsgraph);
 
 		/* only use rigid body transform if simulation is running, avoids problems with initial setup of rigid bodies */
+		// XXX: This needs fixing for COW. May need rigidbody_world from scene
 		if (BKE_rigidbody_check_sim_running(scene->rigidbody_world, ctime)) {
-
 			/* save original object transform */
 			copy_v3_v3(td->ext->oloc, ob->loc);
 
@@ -5527,21 +5665,26 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 	constinv = constraints_list_needinv(t, &ob->constraints);
 
 	/* disable constraints inversion for dummy pass */
+	// XXX: Should this use ob or ob_eval?! It's not clear!
 	if (t->mode == TFM_DUMMY)
 		skip_invert = true;
 
+	Scene *scene_eval = DEG_get_evaluated_scene(t->depsgraph);
 	if (skip_invert == false && constinv == false) {
-		ob->transflag |= OB_NO_CONSTRAINTS;  /* BKE_object_where_is_calc_time checks this */
-		BKE_object_where_is_calc(t->scene, ob);
-		ob->transflag &= ~OB_NO_CONSTRAINTS;
+		Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+		ob_eval->transflag |= OB_NO_CONSTRAINTS;  /* BKE_object_where_is_calc_time checks this */
+		BKE_object_where_is_calc(t->depsgraph, scene_eval, ob_eval);
+		ob_eval->transflag &= ~OB_NO_CONSTRAINTS;
+	}
+	else {
+		Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+		BKE_object_where_is_calc(t->depsgraph, scene_eval, ob_eval);
 	}
-	else
-		BKE_object_where_is_calc(t->scene, ob);
 
 	td->ob = ob;
 
 	td->loc = ob->loc;
-	copy_v3_v3(td->iloc, td->loc);
+	copy_v3_v3(td->iloc, ob->loc);
 
 	if (ob->rotmode > 0) {
 		td->ext->rot = ob->rot;
@@ -5603,84 +5746,97 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 	}
 }
 
+static void trans_object_base_deps_flag_prepare(ViewLayer *view_layer)
+{
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		base->object->id.tag &= ~LIB_TAG_DOIT;
+	}
+}
+
+static void set_trans_object_base_deps_flag_cb(ID *id, void *UNUSED(user_data))
+{
+	/* Here we only handle object IDs. */
+	if (GS(id->name) != ID_OB) {
+		return;
+	}
+	id->tag |= LIB_TAG_DOIT;
+}
+
+static void flush_trans_object_base_deps_flag(Depsgraph *depsgraph, Object *object)
+{
+	object->id.tag |= LIB_TAG_DOIT;
+	DEG_foreach_dependent_ID(depsgraph, &object->id,
+	                         set_trans_object_base_deps_flag_cb, NULL);
+}
+
+static void trans_object_base_deps_flag_finish(ViewLayer *view_layer)
+{
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		if (base->object->id.tag & LIB_TAG_DOIT) {
+			base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
+		}
+	}
+}
 
 /* sets flags in Bases to define whether they take part in transform */
 /* it deselects Bases, so we have to call the clear function always after */
 static void set_trans_object_base_flags(TransInfo *t)
 {
+	/* TODO(sergey): Get rid of global, use explicit main. */
+	Main *bmain = G.main;
+	ViewLayer *view_layer = t->view_layer;
 	Scene *scene = t->scene;
-	View3D *v3d = t->view;
-
-	/*
-	 * if Base selected and has parent selected:
-	 * base->flag = BA_WAS_SEL
+	Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
+	/* NOTE: if Base selected and has parent selected:
+	 *   base->flag_legacy = BA_WAS_SEL
 	 */
-	Base *base;
-
-	/* don't do it if we're not actually going to recalculate anything */
-	if (t->mode == TFM_DUMMY)
+	/* Don't do it if we're not actually going to recalculate anything. */
+	if (t->mode == TFM_DUMMY) {
 		return;
-
-	/* makes sure base flags and object flags are identical */
-	BKE_scene_base_flag_to_objects(t->scene);
-
-	/* Make sure depsgraph is here. */
-	DAG_scene_relations_update(G.main, t->scene);
-
-	/* handle pending update events, otherwise they got copied below */
-	for (base = scene->base.first; base; base = base->next) {
-		if (base->object->recalc & OB_RECALC_ALL) {
-			/* TODO(sergey): Ideally, it's not needed. */
-			BKE_object_handle_update(G.main->eval_ctx, t->scene, base->object);
-		}
 	}
-
-	for (base = scene->base.first; base; base = base->next) {
-		base->flag &= ~BA_WAS_SEL;
-
-		if (TESTBASELIB_BGMODE(v3d, scene, base)) {
+	/* Makes sure base flags and object flags are identical. */
+	BKE_scene_base_flag_to_objects(t->view_layer);
+	/* Make sure depsgraph is here. */
+	DEG_graph_relations_update(depsgraph, bmain, scene, view_layer);
+	/* Clear all flags we need. It will be used to detect dependencies. */
+	trans_object_base_deps_flag_prepare(view_layer);
+	/* Traverse all bases and set all possible flags. */
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		base->flag_legacy &= ~BA_WAS_SEL;
+		if (TESTBASELIB_BGMODE(base)) {
 			Object *ob = base->object;
 			Object *parsel = ob->parent;
-
-			/* if parent selected, deselect */
-			while (parsel) {
-				if (parsel->flag & SELECT) {
-					Base *parbase = BKE_scene_base_find(scene, parsel);
-					if (parbase) { /* in rare cases this can fail */
-						if (TESTBASELIB_BGMODE(v3d, scene, parbase)) {
+			/* If parent selected, deselect. */
+			while (parsel != NULL) {
+				if (parsel->base_flag & BASE_SELECTED) {
+					Base *parbase = BKE_view_layer_base_find(view_layer, parsel);
+					if (parbase != NULL) { /* in rare cases this can fail */
+						if (TESTBASELIB_BGMODE(parbase)) {
 							break;
 						}
 					}
 				}
 				parsel = parsel->parent;
 			}
-
-			if (parsel) {
-				/* rotation around local centers are allowed to propagate */
+			if (parsel != NULL) {
+				/* Rotation around local centers are allowed to propagate. */
 				if ((t->around == V3D_AROUND_LOCAL_ORIGINS) &&
 				    (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL))
 				{
-					base->flag |= BA_TRANSFORM_CHILD;
+					base->flag_legacy |= BA_TRANSFORM_CHILD;
 				}
 				else {
-					base->flag &= ~SELECT;
-					base->flag |= BA_WAS_SEL;
+					base->flag &= ~BASE_SELECTED;
+					base->flag_legacy |= BA_WAS_SEL;
 				}
 			}
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
-		}
-	}
-
-	/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
-	DAG_scene_flush_update(G.main, t->scene, -1, 0);
-
-	/* and we store them temporal in base (only used for transform code) */
-	/* this because after doing updates, the object->recalc is cleared */
-	for (base = scene->base.first; base; base = base->next) {
-		if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
-			base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
+			flush_trans_object_base_deps_flag(depsgraph, ob);
 		}
 	}
+	/* Store temporary bits in base indicating that base is being modified
+	 * (directly or indirectly) by transforming objects.
+	 */
+	trans_object_base_deps_flag_finish(view_layer);
 }
 
 static bool mark_children(Object *ob)
@@ -5701,78 +5857,69 @@ static bool mark_children(Object *ob)
 static int count_proportional_objects(TransInfo *t)
 {
 	int total = 0;
+	ViewLayer *view_layer = t->view_layer;
 	Scene *scene = t->scene;
-	View3D *v3d = t->view;
-	Base *base;
-
-	/* rotations around local centers are allowed to propagate, so we take all objects */
+	Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
+	/* Clear all flags we need. It will be used to detect dependencies. */
+	trans_object_base_deps_flag_prepare(view_layer);
+	/* Rotations around local centers are allowed to propagate, so we take all objects. */
 	if (!((t->around == V3D_AROUND_LOCAL_ORIGINS) &&
 	      (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL)))
 	{
-		/* mark all parents */
-		for (base = scene->base.first; base; base = base->next) {
-			if (TESTBASELIB_BGMODE(v3d, scene, base)) {
+		/* Mark all parents. */
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+			if (TESTBASELIB_BGMODE(base)) {
 				Object *parent = base->object->parent;
-
 				/* flag all parents */
-				while (parent) {
+				while (parent != NULL) {
 					parent->flag |= BA_TRANSFORM_PARENT;
 					parent = parent->parent;
 				}
 			}
 		}
-
-		/* mark all children */
-		for (base = scene->base.first; base; base = base->next) {
+		/* Mark all children. */
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 			/* all base not already selected or marked that is editable */
-			if ((base->object->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
-			    (BASE_EDITABLE_BGMODE(v3d, scene, base)))
+			if ((base->object->flag & (BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
+			    (base->flag & BASE_SELECTED) == 0 &&
+			    (BASE_EDITABLE_BGMODE(base)))
 			{
 				mark_children(base->object);
 			}
 		}
 	}
-
-	for (base = scene->base.first; base; base = base->next) {
+	/* Flush changed flags to all dependencies. */
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 		Object *ob = base->object;
-
-		/* if base is not selected, not a parent of selection or not a child of selection and it is editable */
-		if ((ob->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
-		    (BASE_EDITABLE_BGMODE(v3d, scene, base)))
+		/* If base is not selected, not a parent of selection or not a child of
+		 * selection and it is editable.
+		 */
+		if ((ob->flag & (BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
+		    (base->flag & BASE_SELECTED) == 0 &&
+		    (BASE_EDITABLE_BGMODE(base)))
 		{
-
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
-
+			flush_trans_object_base_deps_flag(depsgraph, ob);
 			total += 1;
 		}
 	}
-
-
-	/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
-	DAG_scene_relations_update(G.main, t->scene);
-	DAG_scene_flush_update(G.main, t->scene, -1, 0);
-
-	/* and we store them temporal in base (only used for transform code) */
-	/* this because after doing updates, the object->recalc is cleared */
-	for (base = scene->base.first; base; base = base->next) {
-		if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
-			base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
-		}
-	}
-
+	/* Store temporary bits in base indicating that base is being modified
+	 * (directly or indirectly) by transforming objects.
+	 */
+	trans_object_base_deps_flag_finish(view_layer);
 	return total;
 }
 
 static void clear_trans_object_base_flags(TransInfo *t)
 {
-	Scene *sce = t->scene;
+	ViewLayer *view_layer = t->view_layer;
 	Base *base;
 
-	for (base = sce->base.first; base; base = base->next) {
-		if (base->flag & BA_WAS_SEL)
-			base->flag |= SELECT;
+	for (base = view_layer->object_bases.first; base; base = base->next) {
+		if (base->flag_legacy & BA_WAS_SEL) {
+			base->flag |= BASE_SELECTED;
+		}
 
-		base->flag &= ~(BA_WAS_SEL | BA_SNAP_FIX_DEPS_FIASCO | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT);
+		base->flag_legacy &= ~(BA_WAS_SEL | BA_SNAP_FIX_DEPS_FIASCO | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT);
 	}
 }
 
@@ -5780,13 +5927,14 @@ static void clear_trans_object_base_flags(TransInfo *t)
  *  tmode: should be a transform mode
  */
 // NOTE: context may not always be available, so must check before using it as it's a luxury for a few cases
-void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob, int tmode)
+void autokeyframe_ob_cb_func(bContext *C, Scene *scene, ViewLayer *view_layer, Object *ob, int tmode)
 {
 	ID *id = &ob->id;
 	FCurve *fcu;
 
 	// TODO: this should probably be done per channel instead...
 	if (autokeyframe_cfra_can_key(scene, id)) {
+		Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		ReportList *reports = CTX_wm_reports(C);
 		ToolSettings *ts = scene->toolsettings;
 		KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
@@ -5813,7 +5961,7 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 			if (adt && adt->action) {
 				for (fcu = adt->action->curves.first; fcu; fcu = fcu->next) {
 					fcu->flag &= ~FCURVE_SELECTED;
-					insert_keyframe(reports, id, adt->action,
+					insert_keyframe(depsgraph, reports, id, adt->action,
 					                (fcu->grp ? fcu->grp->name : NULL),
 					                fcu->rna_path, fcu->array_index, cfra,
 					                ts->keyframe_type, flag);
@@ -5828,26 +5976,30 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 				do_loc = true;
 			}
 			else if (ELEM(tmode, TFM_ROTATION, TFM_TRACKBALL)) {
-				if (v3d->around == V3D_AROUND_ACTIVE) {
-					if (ob != OBACT)
+				if (scene->toolsettings->transform_pivot_point == V3D_AROUND_ACTIVE) {
+					if (ob != OBACT(view_layer))
 						do_loc = true;
 				}
-				else if (v3d->around == V3D_AROUND_CURSOR)
+				else if (scene->toolsettings->transform_pivot_point == V3D_AROUND_CURSOR) {
 					do_loc = true;
+				}
 
-				if ((v3d->flag & V3D_ALIGN) == 0)
+				if ((scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) == 0) {
 					do_rot = true;
+				}
 			}
 			else if (tmode == TFM_RESIZE) {
-				if (v3d->around == V3D_AROUND_ACTIVE) {
-					if (ob != OBACT)
+				if (scene->toolsettings->transform_pivot_point == V3D_AROUND_ACTIVE) {
+					if (ob != OBACT(view_layer))
 						do_loc = true;
 				}
-				else if (v3d->around == V3D_AROUND_CURSOR)
+				else if (scene->toolsettings->transform_pivot_point == V3D_AROUND_CURSOR) {
 					do_loc = true;
+				}
 
-				if ((v3d->flag & V3D_ALIGN) == 0)
+				if ((scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) == 0) {
 					do_scale = true;
+				}
 			}
 
 			/* insert keyframes for the affected sets of channels using the builtin KeyingSets found */
@@ -5896,7 +6048,7 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
  *	targetless_ik: has targetless ik been done on any channels?
  */
 // NOTE: context may not always be available, so must check before using it as it's a luxury for a few cases
-void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob, int tmode, short targetless_ik)
+void autokeyframe_pose_cb_func(bContext *C, Scene *scene, Object *ob, int tmode, short targetless_ik)
 {
 	ID *id = &ob->id;
 	AnimData *adt = ob->adt;
@@ -5907,6 +6059,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 
 	// TODO: this should probably be done per channel instead...
 	if (autokeyframe_cfra_can_key(scene, id)) {
+		Depsgraph *depsgraph = CTX_data_depsgraph(C);
 		ReportList *reports = CTX_wm_reports(C);
 		ToolSettings *ts = scene->toolsettings;
 		KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
@@ -5950,7 +6103,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 								 * NOTE: this will do constraints too, but those are ok to do here too?
 								 */
 								if (pchanName && STREQ(pchanName, pchan->name)) {
-									insert_keyframe(reports, id, act,
+									insert_keyframe(depsgraph, reports, id, act,
 									                ((fcu->grp) ? (fcu->grp->name) : (NULL)),
 									                fcu->rna_path, fcu->array_index, cfra,
 									                ts->keyframe_type, flag);
@@ -5973,18 +6126,22 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 							do_loc = true;
 					}
 					else if (ELEM(tmode, TFM_ROTATION, TFM_TRACKBALL)) {
-						if (ELEM(v3d->around, V3D_AROUND_CURSOR, V3D_AROUND_ACTIVE))
+						if (ELEM(scene->toolsettings->transform_pivot_point, V3D_AROUND_CURSOR, V3D_AROUND_ACTIVE)) {
 							do_loc = true;
+						}
 
-						if ((v3d->flag & V3D_ALIGN) == 0)
+						if ((scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) == 0) {
 							do_rot = true;
+						}
 					}
 					else if (tmode == TFM_RESIZE) {
-						if (ELEM(v3d->around, V3D_AROUND_CURSOR, V3D_AROUND_ACTIVE))
+						if (ELEM(scene->toolsettings->transform_pivot_point, V3D_AROUND_CURSOR, V3D_AROUND_ACTIVE)) {
 							do_loc = true;
+						}
 
-						if ((v3d->flag & V3D_ALIGN) == 0)
+						if ((scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) == 0) {
 							do_scale = true;
+						}
 					}
 
 					if (do_loc) {
@@ -6018,7 +6175,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 		 */
 		if (C && (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) {
 			//ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
-			ED_pose_recalculate_paths(scene, ob);
+			ED_pose_recalculate_paths(C, scene, ob);
 		}
 	}
 	else {
@@ -6129,39 +6286,42 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
 {
 	/* so automerge supports mirror */
 	if ((t->scene->toolsettings->automerge) &&
-	    (t->obedit && t->obedit->type == OB_MESH))
+	    ((t->flag & T_EDIT) && t->obedit_type == OB_MESH))
 	{
-		BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
-		BMesh *bm = em->bm;
-		char hflag;
-		bool has_face_sel = (bm->totfacesel != 0);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-		if (t->flag & T_MIRROR) {
-			TransData *td;
-			int i;
+			BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+			BMesh *bm = em->bm;
+			char hflag;
+			bool has_face_sel = (bm->totfacesel != 0);
+
+			if (t->flag & T_MIRROR) {
+				TransData *td;
+				int i;
 
-			/* rather then adjusting the selection (which the user would notice)
-			 * tag all mirrored verts, then automerge those */
-			BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false);
+				/* rather then adjusting the selection (which the user would notice)
+				 * tag all mirrored verts, then automerge those */
+				BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false);
 
-			for (i = 0, td = t->data; i < t->total; i++, td++) {
-				if (td->extra) {
-					BM_elem_flag_enable((BMVert *)td->extra, BM_ELEM_TAG);
+				for (i = 0, td = tc->data; i < tc->data_len; i++, td++) {
+					if (td->extra) {
+						BM_elem_flag_enable((BMVert *)td->extra, BM_ELEM_TAG);
+					}
 				}
-			}
 
-			hflag = BM_ELEM_SELECT | BM_ELEM_TAG;
-		}
-		else {
-			hflag = BM_ELEM_SELECT;
-		}
+				hflag = BM_ELEM_SELECT | BM_ELEM_TAG;
+			}
+			else {
+				hflag = BM_ELEM_SELECT;
+			}
 
-		EDBM_automerge(t->scene, t->obedit, true, hflag);
+			EDBM_automerge(t->scene, tc->obedit, true, hflag);
 
-		/* Special case, this is needed or faces won't re-select.
-		 * Flush selected edges to faces. */
-		if (has_face_sel && (em->selectmode == SCE_SELECT_FACE)) {
-			EDBM_selectmode_flush_ex(em, SCE_SELECT_EDGE);
+			/* Special case, this is needed or faces won't re-select.
+			 * Flush selected edges to faces. */
+			if (has_face_sel && (em->selectmode == SCE_SELECT_FACE)) {
+				EDBM_selectmode_flush_ex(em, SCE_SELECT_EDGE);
+			}
 		}
 	}
 }
@@ -6179,50 +6339,53 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 	const bool duplicate = (t->mode == TFM_TIME_DUPLICATE);
 
 	/* early out when nothing happened */
-	if (t->total == 0 || t->mode == TFM_DUMMY)
+	if (t->data_len_all == 0 || t->mode == TFM_DUMMY) {
 		return;
+	}
 
 	if (t->spacetype == SPACE_VIEW3D) {
-		if (t->obedit) {
+		if (t->flag & T_EDIT) {
 			/* Special Exception:
 			 * We don't normally access 't->custom.mode' here, but its needed in this case. */
 
 			if (canceled == 0) {
 				/* we need to delete the temporary faces before automerging */
 				if (t->mode == TFM_EDGE_SLIDE) {
-					EdgeSlideData *sld = t->custom.mode.data;
-
 					/* handle multires re-projection, done
 					 * on transform completion since it's
 					 * really slow -joeedh */
 					projectEdgeSlideData(t, true);
 
-					/* free temporary faces to avoid automerging and deleting
-					 * during cleanup - psy-fi */
-					freeEdgeSlideTempFaces(sld);
+					FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+						EdgeSlideData *sld = tc->custom.mode.data;
+
+						/* free temporary faces to avoid automerging and deleting
+						 * during cleanup - psy-fi */
+						freeEdgeSlideTempFaces(sld);
+					}
 				}
 				else if (t->mode == TFM_VERT_SLIDE) {
 					/* as above */
-					VertSlideData *sld = t->custom.mode.data;
 					projectVertSlideData(t, true);
-					freeVertSlideTempFaces(sld);
+					FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+						VertSlideData *sld = tc->custom.mode.data;
+						freeVertSlideTempFaces(sld);
+					}
 				}
 
-				if (t->obedit->type == OB_MESH) {
+				if (t->obedit_type == OB_MESH) {
 					special_aftertrans_update__mesh(C, t);
 				}
 			}
 			else {
 				if (t->mode == TFM_EDGE_SLIDE) {
-					EdgeSlideData *sld = t->custom.mode.data;
-
-					sld->perc = 0.0;
+					EdgeSlideParams *slp = t->custom.mode.data;
+					slp->perc = 0.0;
 					projectEdgeSlideData(t, false);
 				}
 				else if (t->mode == TFM_VERT_SLIDE) {
-					VertSlideData *sld = t->custom.mode.data;
-
-					sld->perc = 0.0;
+					EdgeSlideParams *slp = t->custom.mode.data;
+					slp->perc = 0.0;
 					projectVertSlideData(t, false);
 				}
 			}
@@ -6328,9 +6491,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			// fixme... some of this stuff is not good
 			if (ob) {
 				if (ob->pose || BKE_key_from_object(ob))
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 				else
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+					DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
 
 			/* 3 cases here for curve cleanups:
@@ -6496,78 +6659,94 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			ED_nla_postop_refresh(&ac);
 		}
 	}
-	else if (t->obedit) {
-		if (t->obedit->type == OB_MESH) {
-			BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
-			/* table needs to be created for each edit command, since vertices can move etc */
-			ED_mesh_mirror_spatial_table(t->obedit, em, NULL, NULL, 'e');
+	else if (t->flag & T_EDIT) {
+		if (t->obedit_type == OB_MESH) {
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+				/* table needs to be created for each edit command, since vertices can move etc */
+				ED_mesh_mirror_spatial_table(tc->obedit, em, NULL, NULL, 'e');
+				/* TODO(campbell): xform: We need support for many mirror objects at once! */
+				break;
+			}
 		}
 	}
-	else if ((t->flag & T_POSE) && (t->poseobj)) {
-		bArmature *arm;
-		bPoseChannel *pchan;
-		short targetless_ik = 0;
+	else if (t->flag & T_POSE) {
 
-		ob = t->poseobj;
-		arm = ob->data;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-		if ((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) {
-			/* when running transform non-interactively (operator exec),
-			 * we need to update the pose otherwise no updates get called during
-			 * transform and the auto-ik is not applied. see [#26164] */
-			struct Object *pose_ob = t->poseobj;
-			BKE_pose_where_is(t->scene, pose_ob);
-		}
+			bArmature *arm;
+			bPoseChannel *pchan;
+			short targetless_ik = 0;
 
-		/* set BONE_TRANSFORM flags for autokey, manipulator draw might have changed them */
-		if (!canceled && (t->mode != TFM_DUMMY))
-			count_set_pose_transflags(&t->mode, t->around, ob);
+			ob = tc->poseobj;
+			arm = ob->data;
 
-		/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */
-		if (!canceled && t->mode == TFM_TRANSLATION)
-			targetless_ik = apply_targetless_ik(ob);
-		else {
-			/* not forget to clear the auto flag */
-			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-				bKinematicConstraint *data = has_targetless_ik(pchan);
-				if (data) data->flag &= ~CONSTRAINT_IK_AUTO;
+			if ((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) {
+				/* when running transform non-interactively (operator exec),
+				 * we need to update the pose otherwise no updates get called during
+				 * transform and the auto-ik is not applied. see [#26164] */
+				struct Object *pose_ob = tc->poseobj;
+				BKE_pose_where_is(t->depsgraph, t->scene, pose_ob);
 			}
-		}
 
-		if (t->mode == TFM_TRANSLATION)
-			pose_grab_with_ik_clear(ob);
+			/* set BONE_TRANSFORM flags for autokey, manipulator draw might have changed them */
+			if (!canceled && (t->mode != TFM_DUMMY))
+				count_set_pose_transflags(&t->mode, t->around, ob);
 
-		/* automatic inserting of keys and unkeyed tagging - only if transform wasn't canceled (or TFM_DUMMY) */
-		if (!canceled && (t->mode != TFM_DUMMY)) {
-			autokeyframe_pose_cb_func(C, t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-		}
-		else if (arm->flag & ARM_DELAYDEFORM) {
-			/* old optimize trick... this enforces to bypass the depgraph */
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-			ob->recalc = 0;  // is set on OK position already by recalcData()
-		}
-		else
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */
+			if (!canceled && t->mode == TFM_TRANSLATION)
+				targetless_ik = apply_targetless_ik(ob);
+			else {
+				/* not forget to clear the auto flag */
+				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+					bKinematicConstraint *data = has_targetless_ik(pchan);
+					if (data) data->flag &= ~CONSTRAINT_IK_AUTO;
+				}
+			}
+
+			if (t->mode == TFM_TRANSLATION)
+				pose_grab_with_ik_clear(ob);
 
+			/* automatic inserting of keys and unkeyed tagging - only if transform wasn't canceled (or TFM_DUMMY) */
+			if (!canceled && (t->mode != TFM_DUMMY)) {
+				autokeyframe_pose_cb_func(C, t->scene, ob, t->mode, targetless_ik);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+			else if (arm->flag & ARM_DELAYDEFORM) {
+				/* TODO(sergey): Armature is already updated by recalcData(), so we
+				 * might save some time by skipping re-evaluating it. But this isn't
+				 * possible yet within new dependency graph, and also other contexts
+				 * might need to update their CoW copies.
+				 */
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+			else {
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
+		}
 	}
 	else if (t->options & CTX_PAINT_CURVE) {
 		/* pass */
 	}
-	else if ((t->scene->basact) &&
-	         (ob = t->scene->basact->object) &&
+	else if ((t->view_layer->basact) &&
+	         (ob = t->view_layer->basact->object) &&
 	         (ob->mode & OB_MODE_PARTICLE_EDIT) &&
 	         PE_get_current(t->scene, ob))
 	{
 		/* do nothing */
 	}
+	else if (t->flag & T_CURSOR) {
+		/* do nothing */
+	}
 	else { /* Objects */
 		int i;
 
 		BLI_assert(t->flag & (T_OBJECT | T_TEXTURE));
 
-		for (i = 0; i < t->total; i++) {
-			TransData *td = t->data + i;
+		TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+		for (i = 0; i < tc->data_len; i++) {
+			TransData *td = tc->data + i;
 			ListBase pidlist;
 			PTCacheID *pid;
 			ob = td->ob;
@@ -6588,17 +6767,17 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 
 			/* pointcache refresh */
 			if (BKE_ptcache_object_reset(t->scene, ob, PTCACHE_RESET_OUTDATED))
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 			/* Needed for proper updating of "quick cached" dynamics. */
 			/* Creates troubles for moving animated objects without */
 			/* autokey though, probably needed is an anim sys override? */
 			/* Please remove if some other solution is found. -jahka */
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+			DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 			/* Set autokey if necessary */
 			if (!canceled) {
-				autokeyframe_ob_cb_func(C, t->scene, (View3D *)t->view, ob, t->mode);
+				autokeyframe_ob_cb_func(C, t->scene, t->view_layer, ob, t->mode);
 			}
 
 			/* restore rigid body transform */
@@ -6621,7 +6800,7 @@ int special_transform_moving(TransInfo *t)
 	else if (t->spacetype == SPACE_IPO) {
 		return G_TRANSFORM_FCURVES;
 	}
-	else if (t->obedit || ((t->flag & T_POSE) && (t->poseobj))) {
+	else if ((t->flag & T_EDIT) || (t->flag & T_POSE)) {
 		return G_TRANSFORM_EDIT;
 	}
 	else if (t->flag & (T_OBJECT | T_TEXTURE)) {
@@ -6633,29 +6812,29 @@ int special_transform_moving(TransInfo *t)
 
 static void createTransObject(bContext *C, TransInfo *t)
 {
-	Scene *scene = t->scene;
-
 	TransData *td = NULL;
 	TransDataExtension *tx;
 	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	set_trans_object_base_flags(t);
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* count */
-	t->total = CTX_DATA_COUNT(C, selected_objects);
+	tc->data_len = CTX_DATA_COUNT(C, selected_objects);
 
-	if (!t->total) {
+	if (!tc->data_len) {
 		/* clear here, main transform function escapes too */
 		clear_trans_object_base_flags(t);
 		return;
 	}
 
 	if (is_prop_edit) {
-		t->total += count_proportional_objects(t);
+		tc->data_len += count_proportional_objects(t);
 	}
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransOb");
-	tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "TransObExtension");
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransOb");
+	tx = tc->data_ext = MEM_callocN(tc->data_len * sizeof(TransDataExtension), "TransObExtension");
 
 	CTX_DATA_BEGIN(C, Base *, base, selected_bases)
 	{
@@ -6684,15 +6863,16 @@ static void createTransObject(bContext *C, TransInfo *t)
 	CTX_DATA_END;
 
 	if (is_prop_edit) {
-		View3D *v3d = t->view;
+		ViewLayer *view_layer = t->view_layer;
 		Base *base;
 
-		for (base = scene->base.first; base; base = base->next) {
+		for (base = view_layer->object_bases.first; base; base = base->next) {
 			Object *ob = base->object;
 
 			/* if base is not selected, not a parent of selection or not a child of selection and it is editable */
-			if ((ob->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
-			    BASE_EDITABLE_BGMODE(v3d, scene, base))
+			if ((ob->flag & (BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
+			    (base->flag & BASE_SELECTED) == 0 &&
+			    BASE_EDITABLE_BGMODE(base))
 			{
 				td->protectflag = ob->protectflag;
 				td->ext = tx;
@@ -6774,7 +6954,9 @@ static void createTransNodeData(bContext *UNUSED(C), TransInfo *t)
 	SpaceNode *snode = t->sa->spacedata.first;
 	bNode *node;
 
-	t->total = 0;
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	tc->data_len = 0;
 
 	if (!snode->edittree) {
 		return;
@@ -6787,15 +6969,15 @@ static void createTransNodeData(bContext *UNUSED(C), TransInfo *t)
 	for (node = snode->edittree->nodes.first; node; node = node->next) {
 		if (node->flag & NODE_SELECT && is_node_parent_select(node) == false) {
 			node->flag |= NODE_TRANSFORM;
-			t->total++;
+			tc->data_len++;
 		}
 		else {
 			node->flag &= ~NODE_TRANSFORM;
 		}
 	}
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransNode TransData");
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransNode TransData2D");
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransNode TransData");
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransNode TransData2D");
 
 	for (node = snode->edittree->nodes.first; node; node = node->next) {
 		if (node->flag & NODE_TRANSFORM) {
@@ -6980,7 +7162,7 @@ static void planeTrackToTransData(const int framenr, TransData *td, TransData2D
 	}
 }
 
-static void transDataTrackingFree(TransInfo *UNUSED(t), TransCustomData *custom_data)
+static void transDataTrackingFree(TransInfo *UNUSED(t), TransDataContainer *UNUSED(tc), TransCustomData *custom_data)
 {
 	if (custom_data->data) {
 		TransDataTracking *tdt = custom_data->data;
@@ -7005,22 +7187,24 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	TransDataTracking *tdt;
 	int framenr = ED_space_clip_get_clip_frame_number(sc);
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* count */
-	t->total = 0;
+	tc->data_len = 0;
 
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
-			t->total++; /* offset */
+			tc->data_len++; /* offset */
 
 			if (track->flag & SELECT)
-				t->total++;
+				tc->data_len++;
 
 			if (track->pat_flag & SELECT)
-				t->total += 4;
+				tc->data_len += 4;
 
 			if (track->search_flag & SELECT)
-				t->total += 2;
+				tc->data_len += 2;
 		}
 
 		track = track->next;
@@ -7031,18 +7215,18 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	     plane_track = plane_track->next)
 	{
 		if (PLANE_TRACK_VIEW_SELECTED(plane_track)) {
-			t->total += 4;
+			tc->data_len += 4;
 		}
 	}
 
-	if (t->total == 0)
+	if (tc->data_len == 0)
 		return;
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransTracking TransData");
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransTracking TransData2D");
-	tdt = t->custom.type.data = MEM_callocN(t->total * sizeof(TransDataTracking), "TransTracking TransDataTracking");
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransTracking TransData");
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransTracking TransData2D");
+	tdt = tc->custom.type.data = MEM_callocN(tc->data_len * sizeof(TransDataTracking), "TransTracking TransDataTracking");
 
-	t->custom.type.free_cb = transDataTrackingFree;
+	tc->custom.type.free_cb = transDataTrackingFree;
 
 	/* create actual data */
 	track = tracksbase->first;
@@ -7144,8 +7328,10 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 
 	BKE_movieclip_get_size(clip, &sc->user, &width, &height);
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* count */
-	t->total = 0;
+	tc->data_len = 0;
 
 	if ((sc->flag & SC_SHOW_GRAPH_TRACKS_MOTION) == 0) {
 		return;
@@ -7162,23 +7348,23 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 					continue;
 
 				if (marker->flag & MARKER_GRAPH_SEL_X)
-					t->total += 1;
+					tc->data_len += 1;
 
 				if (marker->flag & MARKER_GRAPH_SEL_Y)
-					t->total += 1;
+					tc->data_len += 1;
 			}
 		}
 
 		track = track->next;
 	}
 
-	if (t->total == 0)
+	if (tc->data_len == 0)
 		return;
 
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransTracking TransData");
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransTracking TransData2D");
-	t->custom.type.data = tdt = MEM_callocN(t->total * sizeof(TransDataTracking), "TransTracking TransDataTracking");
-	t->custom.type.free_cb = transDataTrackingFree;
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransTracking TransData");
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransTracking TransData2D");
+	tc->custom.type.data = tdt = MEM_callocN(tc->data_len * sizeof(TransDataTracking), "TransTracking TransDataTracking");
+	tc->custom.type.free_cb = transDataTrackingFree;
 
 	/* create actual data */
 	track = tracksbase->first;
@@ -7219,7 +7405,9 @@ static void createTransTrackingData(bContext *C, TransInfo *t)
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	int width, height;
 
-	t->total = 0;
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	tc->data_len = 0;
 
 	if (!clip)
 		return;
@@ -7240,12 +7428,14 @@ static void createTransTrackingData(bContext *C, TransInfo *t)
 
 static void cancelTransTracking(TransInfo *t)
 {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
 	SpaceClip *sc = t->sa->spacedata.first;
 	int i, framenr = ED_space_clip_get_clip_frame_number(sc);
-	TransDataTracking *tdt_array = t->custom.type.data;
+	TransDataTracking *tdt_array = tc->custom.type.data;
+
 
 	i = 0;
-	while (i < t->total) {
+	while (i < tc->data_len) {
 		TransDataTracking *tdt = &tdt_array[i];
 
 		if (tdt->mode == transDataTracking_ModeTracks) {
@@ -7302,8 +7492,10 @@ void flushTransTracking(TransInfo *t)
 	if (t->state == TRANS_CANCEL)
 		cancelTransTracking(t);
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data, td2d = t->data2d, tdt = t->custom.type.data; a < t->total; a++, td2d++, td++, tdt++) {
+	for (a = 0, td = tc->data, td2d = tc->data_2d, tdt = tc->custom.type.data; a < tc->data_len; a++, td2d++, td++, tdt++) {
 		if (tdt->mode == transDataTracking_ModeTracks) {
 			float loc2d[2];
 
@@ -7569,7 +7761,9 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 	const bool is_prop_edit = (t->flag & T_PROP_EDIT);
 	float asp[2];
 
-	t->total = 0;
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	tc->data_len = 0;
 
 	if (!mask)
 		return;
@@ -7629,13 +7823,13 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 
 	ED_mask_get_aspect(t->sa, t->ar, &asp[0], &asp[1]);
 
-	t->total = (is_prop_edit) ? count : countsel;
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mask Editing)");
+	tc->data_len = (is_prop_edit) ? count : countsel;
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransObData(Mask Editing)");
 	/* for each 2d uv coord a 3d vector is allocated, so that they can be
 	 * treated just as if they were 3d verts */
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransObData2D(Mask Editing)");
-	t->custom.type.data = tdm = MEM_callocN(t->total * sizeof(TransDataMasking), "TransDataMasking(Mask Editing)");
-	t->custom.type.use_free = true;
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransObData2D(Mask Editing)");
+	tc->custom.type.data = tdm = MEM_callocN(tc->data_len * sizeof(TransDataMasking), "TransDataMasking(Mask Editing)");
+	tc->custom.type.use_free = true;
 
 	/* create data */
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
@@ -7692,12 +7886,14 @@ void flushTransMasking(TransInfo *t)
 	int a;
 	float asp[2], inv[2];
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	ED_mask_get_aspect(t->sa, t->ar, &asp[0], &asp[1]);
 	inv[0] = 1.0f / asp[0];
 	inv[1] = 1.0f / asp[1];
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a = 0, td = t->data2d, tdm = t->custom.type.data; a < t->total; a++, td++, tdm++) {
+	for (a = 0, td = tc->data_2d, tdm = tc->custom.type.data; a < tc->data_len; a++, td++, tdm++) {
 		td->loc2d[0] = td->loc[0] * inv[0];
 		td->loc2d[1] = td->loc[1] * inv[1];
 		mul_m3_v2(tdm->parent_inverse_matrix, td->loc2d);
@@ -7816,7 +8012,9 @@ static void createTransPaintCurveVerts(bContext *C, TransInfo *t)
 	int i;
 	int total = 0;
 
-	t->total = 0;
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	tc->data_len = 0;
 
 	if (!paint || !paint->brush || !paint->brush->paint_curve)
 		return;
@@ -7842,11 +8040,11 @@ static void createTransPaintCurveVerts(bContext *C, TransInfo *t)
 	if (!total)
 		return;
 
-	t->total = total;
-	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransData2D");
-	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransData");
-	t->custom.type.data = tdpc = MEM_callocN(t->total * sizeof(TransDataPaintCurve), "TransDataPaintCurve");
-	t->custom.type.use_free = true;
+	tc->data_len = total;
+	td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransData2D");
+	td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransData");
+	tc->custom.type.data = tdpc = MEM_callocN(tc->data_len * sizeof(TransDataPaintCurve), "TransDataPaintCurve");
+	tc->custom.type.use_free = true;
 
 	for (pcp = pc->points, i = 0; i < pc->tot_points; i++, pcp++) {
 		if (PC_IS_ANY_SEL(pcp)) {
@@ -7877,10 +8075,13 @@ static void createTransPaintCurveVerts(bContext *C, TransInfo *t)
 void flushTransPaintCurve(TransInfo *t)
 {
 	int i;
-	TransData2D *td2d = t->data2d;
-	TransDataPaintCurve *tdpc = t->custom.type.data;
 
-	for (i = 0; i < t->total; i++, tdpc++, td2d++) {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	TransData2D *td2d = tc->data_2d;
+	TransDataPaintCurve *tdpc = tc->custom.type.data;
+
+	for (i = 0; i < tc->data_len; i++, tdpc++, td2d++) {
 		PaintCurvePoint *pcp = tdpc->pcp;
 		copy_v2_v2(pcp->bez.vec[tdpc->id], td2d->loc);
 	}
@@ -7900,6 +8101,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 	const bool is_prop_edit_connected = (t->flag & T_PROP_CONNECTED) != 0;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
 
 	/* == Grease Pencil Strokes to Transform Data ==
 	 * Grease Pencil stroke points can be a mixture of 2D (screen-space),
@@ -7907,7 +8109,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 	 * For now, we just do these without creating TransData2D for the 2D
 	 * strokes. This may cause issues in future though.
 	 */
-	t->total = 0;
+	tc->data_len = 0;
 
 	if (gpd == NULL)
 		return;
@@ -7936,11 +8138,11 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 					if (is_prop_edit_connected) {
 						/* connected only - so only if selected */
 						if (gps->flag & GP_STROKE_SELECT)
-							t->total += gps->totpoints;
+							tc->data_len += gps->totpoints;
 					}
 					else {
 						/* everything goes - connection status doesn't matter */
-						t->total += gps->totpoints;
+						tc->data_len += gps->totpoints;
 					}
 				}
 				else {
@@ -7952,7 +8154,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 						// TODO: 2D vs 3D?
 						for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
 							if (pt->flag & GP_SPOINT_SELECT)
-								t->total++;
+								tc->data_len++;
 						}
 					}
 				}
@@ -7961,13 +8163,13 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 	}
 
 	/* Stop trying if nothing selected */
-	if (t->total == 0) {
+	if (tc->data_len == 0) {
 		return;
 	}
 
 	/* Allocate memory for data */
-	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData(GPencil)");
-	td = t->data;
+	tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransData(GPencil)");
+	td = tc->data;
 
 	unit_m3(smtx);
 	unit_m3(mtx);
@@ -8135,22 +8337,65 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 	}
 }
 
+static int countAndCleanTransDataContainer(TransInfo *t)
+{
+	BLI_assert(ELEM(t->data_len_all, 0, -1));
+	t->data_len_all = 0;
+	uint data_container_len_orig = t->data_container_len;
+	for (TransDataContainer *th_end = t->data_container - 1, *tc = t->data_container + (t->data_container_len - 1); tc != th_end; tc--) {
+		if (tc->data_len == 0) {
+			uint index = tc - t->data_container;
+			if (index + 1 != t->data_container_len) {
+				SWAP(TransDataContainer, t->data_container[index], t->data_container[t->data_container_len - 1]);
+			}
+			t->data_container_len -= 1;
+		}
+		else {
+			t->data_len_all += tc->data_len;
+		}
+	}
+	if (data_container_len_orig != t->data_container_len) {
+		t->data_container = MEM_reallocN(t->data_container, sizeof(*t->data_container) * t->data_container_len);
+	}
+	return t->data_len_all;
+}
+
 
 void createTransData(bContext *C, TransInfo *t)
 {
 	Scene *scene = t->scene;
-	Object *ob = OBACT;
+	ViewLayer *view_layer = t->view_layer;
+	Object *ob = OBACT(view_layer);
+
+	t->data_len_all = -1;
 
 	/* if tests must match recalcData for correct updates */
-	if (t->options & CTX_TEXTURE) {
+	if (t->options & CTX_CURSOR) {
+		t->flag |= T_CURSOR;
+		t->obedit_type = -1;
+
+		createTransCursor3D(t);
+		countAndCleanTransDataContainer(t);
+	}
+	else if (t->options & CTX_TEXTURE) {
 		t->flag |= T_TEXTURE;
+		t->obedit_type = -1;
+
 		createTransTexspace(t);
+		countAndCleanTransDataContainer(t);
 	}
 	else if (t->options & CTX_EDGE) {
-		t->ext = NULL;
+		/* Multi object editing. */
+		initTransDataContainers_FromObjectData(t);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			tc->data_ext = NULL;
+		}
 		t->flag |= T_EDIT;
+
 		createTransEdge(t);
-		if (t->data && t->flag & T_PROP_EDIT) {
+		countAndCleanTransDataContainer(t);
+
+		if (t->data_len_all && t->flag & T_PROP_EDIT) {
 			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
@@ -8159,9 +8404,11 @@ void createTransData(bContext *C, TransInfo *t)
 	else if (t->options & CTX_GPENCIL_STROKES) {
 		t->options |= CTX_GPENCIL_STROKES;
 		t->flag |= T_POINTS;
+
 		createTransGPencil(C, t);
+		countAndCleanTransDataContainer(t);
 
-		if (t->data && (t->flag & T_PROP_EDIT)) {
+		if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
@@ -8170,22 +8417,32 @@ void createTransData(bContext *C, TransInfo *t)
 	else if (t->spacetype == SPACE_IMAGE) {
 		t->flag |= T_POINTS | T_2D_EDIT;
 		if (t->options & CTX_MASK) {
+
 			/* copied from below */
 			createTransMaskingData(C, t);
+			countAndCleanTransDataContainer(t);
 
-			if (t->data && (t->flag & T_PROP_EDIT)) {
+			if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 				sort_trans_data(t); // makes selected become first in array
 				set_prop_dist(t, true);
 				sort_trans_data_dist(t);
 			}
 		}
 		else if (t->options & CTX_PAINT_CURVE) {
-			if (!ELEM(t->mode, TFM_SHEAR, TFM_SHRINKFATTEN))
+			if (!ELEM(t->mode, TFM_SHEAR, TFM_SHRINKFATTEN)) {
 				createTransPaintCurveVerts(C, t);
+				countAndCleanTransDataContainer(t);
+			}
 		}
-		else if (t->obedit) {
+		else if (t->obedit_type == OB_MESH) {
+
+			initTransDataContainers_FromObjectData(t);
 			createTransUVs(C, t);
-			if (t->data && (t->flag & T_PROP_EDIT)) {
+			countAndCleanTransDataContainer(t);
+
+			t->flag |= T_EDIT;
+
+			if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 				sort_trans_data(t); // makes selected become first in array
 				set_prop_dist(t, 1);
 				sort_trans_data_dist(t);
@@ -8194,9 +8451,11 @@ void createTransData(bContext *C, TransInfo *t)
 	}
 	else if (t->spacetype == SPACE_ACTION) {
 		t->flag |= T_POINTS | T_2D_EDIT;
+
 		createTransActionData(C, t);
+		countAndCleanTransDataContainer(t);
 
-		if (t->data && (t->flag & T_PROP_EDIT)) {
+		if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 			sort_trans_data(t); // makes selected become first in array
 			//set_prop_dist(t, false); /* don't do that, distance has been set in createTransActionData already */
 			sort_trans_data_dist(t);
@@ -8205,17 +8464,20 @@ void createTransData(bContext *C, TransInfo *t)
 	else if (t->spacetype == SPACE_NLA) {
 		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransNlaData(C, t);
+		countAndCleanTransDataContainer(t);
 	}
 	else if (t->spacetype == SPACE_SEQ) {
 		t->flag |= T_POINTS | T_2D_EDIT;
 		t->num.flag |= NUM_NO_FRACTION; /* sequencer has no use for floating point transformations */
 		createTransSeqData(C, t);
+		countAndCleanTransDataContainer(t);
 	}
 	else if (t->spacetype == SPACE_IPO) {
 		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransGraphEditData(C, t);
+		countAndCleanTransDataContainer(t);
 
-		if (t->data && (t->flag & T_PROP_EDIT)) {
+		if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, false); /* don't do that, distance has been set in createTransGraphEditData already */
 			sort_trans_data_dist(t);
@@ -8223,8 +8485,11 @@ void createTransData(bContext *C, TransInfo *t)
 	}
 	else if (t->spacetype == SPACE_NODE) {
 		t->flag |= T_POINTS | T_2D_EDIT;
+
 		createTransNodeData(C, t);
-		if (t->data && (t->flag & T_PROP_EDIT)) {
+		countAndCleanTransDataContainer(t);
+
+		if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
@@ -8232,34 +8497,42 @@ void createTransData(bContext *C, TransInfo *t)
 	}
 	else if (t->spacetype == SPACE_CLIP) {
 		t->flag |= T_POINTS | T_2D_EDIT;
-		if (t->options & CTX_MOVIECLIP)
+		if (t->options & CTX_MOVIECLIP) {
 			createTransTrackingData(C, t);
+			countAndCleanTransDataContainer(t);
+		}
 		else if (t->options & CTX_MASK) {
 			/* copied from above */
 			createTransMaskingData(C, t);
+			countAndCleanTransDataContainer(t);
 
-			if (t->data && (t->flag & T_PROP_EDIT)) {
+			if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
 				sort_trans_data(t); // makes selected become first in array
 				set_prop_dist(t, true);
 				sort_trans_data_dist(t);
 			}
 		}
 	}
-	else if (t->obedit) {
-		t->ext = NULL;
-		if (t->obedit->type == OB_MESH) {
+	else if (t->obedit_type != -1) {
+		/* Multi object editing. */
+		initTransDataContainers_FromObjectData(t);
+
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			tc->data_ext = NULL;
+		}
+		if (t->obedit_type == OB_MESH) {
 			createTransEditVerts(t);
 		}
-		else if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
+		else if (ELEM(t->obedit_type, OB_CURVE, OB_SURF)) {
 			createTransCurveVerts(t);
 		}
-		else if (t->obedit->type == OB_LATTICE) {
+		else if (t->obedit_type == OB_LATTICE) {
 			createTransLatticeVerts(t);
 		}
-		else if (t->obedit->type == OB_MBALL) {
+		else if (t->obedit_type == OB_MBALL) {
 			createTransMBallVerts(t);
 		}
-		else if (t->obedit->type == OB_ARMATURE) {
+		else if (t->obedit_type == OB_ARMATURE) {
 			t->flag &= ~T_PROP_EDIT;
 			createTransArmatureVerts(t);
 		}
@@ -8267,12 +8540,14 @@ void createTransData(bContext *C, TransInfo *t)
 			printf("edit type not implemented!\n");
 		}
 
+		countAndCleanTransDataContainer(t);
+
 		t->flag |= T_EDIT | T_POINTS;
 
-		if (t->data && t->flag & T_PROP_EDIT) {
-			if (ELEM(t->obedit->type, OB_CURVE, OB_MESH)) {
+		if (t->data_len_all && t->flag & T_PROP_EDIT) {
+			if (ELEM(t->obedit_type, OB_CURVE, OB_MESH)) {
 				sort_trans_data(t); // makes selected become first in array
-				if ((t->obedit->type == OB_MESH) && (t->flag & T_PROP_CONNECTED)) {
+				if ((t->obedit_type == OB_MESH) && (t->flag & T_PROP_CONNECTED)) {
 					/* already calculated by editmesh_set_connectivity_distance */
 				}
 				else {
@@ -8291,24 +8566,36 @@ void createTransData(bContext *C, TransInfo *t)
 		if (t->mode == TFM_BONESIZE) {
 			t->flag &= ~(T_EDIT | T_POINTS);
 			t->flag |= T_POSE;
-			t->poseobj = ob;    /* <- tsk tsk, this is going to give issues one day */
+			t->obedit_type = -1;
+
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				tc->poseobj = tc->obedit;
+				tc->obedit = NULL;
+			}
 		}
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
 		// XXX this is currently limited to active armature only...
 		// XXX active-layer checking isn't done as that should probably be checked through context instead
-		createTransPose(t, ob);
+
+		/* Multi object editing. */
+		initTransDataContainers_FromObjectData(t);
+		createTransPose(t, NULL, 0);
+		countAndCleanTransDataContainer(t);
 	}
 	else if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT) && !(t->options & CTX_PAINT_CURVE)) {
 		/* important that ob_armature can be set even when its not selected [#23412]
 		 * lines below just check is also visible */
 		Object *ob_armature = modifiers_isDeformedByArmature(ob);
 		if (ob_armature && ob_armature->mode & OB_MODE_POSE) {
-			Base *base_arm = BKE_scene_base_find(t->scene, ob_armature);
+			Base *base_arm = BKE_view_layer_base_find(t->view_layer, ob_armature);
 			if (base_arm) {
-				View3D *v3d = t->view;
-				if (BASE_VISIBLE(v3d, base_arm)) {
-					createTransPose(t, ob_armature);
+				if (BASE_VISIBLE(base_arm)) {
+					Object *objects[1];
+					objects[0] = ob_armature;
+					uint objects_len = 1;
+					createTransPose(t, objects, objects_len);
+					countAndCleanTransDataContainer(t);
 				}
 			}
 
@@ -8316,9 +8603,10 @@ void createTransData(bContext *C, TransInfo *t)
 	}
 	else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT) && PE_start_edit(PE_get_current(scene, ob))) {
 		createTransParticleVerts(C, t);
+		countAndCleanTransDataContainer(t);
 		t->flag |= T_POINTS;
 
-		if (t->data && t->flag & T_PROP_EDIT) {
+		if (t->data_len_all && t->flag & T_PROP_EDIT) {
 			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
@@ -8328,13 +8616,15 @@ void createTransData(bContext *C, TransInfo *t)
 		if ((t->options & CTX_PAINT_CURVE) && !ELEM(t->mode, TFM_SHEAR, TFM_SHRINKFATTEN)) {
 			t->flag |= T_POINTS | T_2D_EDIT;
 			createTransPaintCurveVerts(C, t);
+			countAndCleanTransDataContainer(t);
 		}
 	}
 	else {
 		createTransObject(C, t);
+		countAndCleanTransDataContainer(t);
 		t->flag |= T_OBJECT;
 
-		if (t->data && t->flag & T_PROP_EDIT) {
+		if (t->data_len_all && t->flag & T_PROP_EDIT) {
 			// selected objects are already first, no need to presort
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
@@ -8346,10 +8636,15 @@ void createTransData(bContext *C, TransInfo *t)
 			RegionView3D *rv3d = t->ar->regiondata;
 			if ((rv3d->persp == RV3D_CAMOB) && v3d->camera) {
 				/* we could have a flag to easily check an object is being transformed */
-				if (v3d->camera->recalc) {
+				if (v3d->camera->id.tag & LIB_TAG_DOIT) {
 					t->flag |= T_CAMERA;
 				}
 			}
 		}
 	}
+
+	/* Check that 'countAndCleanTransDataContainer' ran. */
+	BLI_assert(t->data_len_all != -1);
+
+	BLI_assert((!(t->flag & T_EDIT)) == (!(t->obedit_type != -1)));
 }
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index ad88bbe53f4..576bfddd28c 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -62,8 +62,8 @@
 
 #include "RNA_access.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
 
 #include "BIK_api.h"
 
@@ -71,7 +71,6 @@
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
@@ -82,6 +81,11 @@
 #include "BKE_editmesh.h"
 #include "BKE_tracking.h"
 #include "BKE_mask.h"
+#include "BKE_workspace.h"
+#include "BKE_layer.h"
+#include "BKE_scene.h"
+
+#include "DEG_depsgraph.h"
 
 #include "ED_anim_api.h"
 #include "ED_armature.h"
@@ -102,6 +106,8 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
+#include "RE_engine.h"
+
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
@@ -123,98 +129,101 @@ void getViewVector(const TransInfo *t, const float coord[3], float vec[3])
 /* ************************** GENERICS **************************** */
 
 
-static void clipMirrorModifier(TransInfo *t, Object *ob)
+static void clipMirrorModifier(TransInfo *t)
 {
-	ModifierData *md = ob->modifiers.first;
-	float tolerance[3] = {0.0f, 0.0f, 0.0f};
-	int axis = 0;
-
-	for (; md; md = md->next) {
-		if ((md->type == eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
-			MirrorModifierData *mmd = (MirrorModifierData *) md;
-
-			if (mmd->flag & MOD_MIR_CLIPPING) {
-				axis = 0;
-				if (mmd->flag & MOD_MIR_AXIS_X) {
-					axis |= 1;
-					tolerance[0] = mmd->tolerance;
-				}
-				if (mmd->flag & MOD_MIR_AXIS_Y) {
-					axis |= 2;
-					tolerance[1] = mmd->tolerance;
-				}
-				if (mmd->flag & MOD_MIR_AXIS_Z) {
-					axis |= 4;
-					tolerance[2] = mmd->tolerance;
-				}
-				if (axis) {
-					float mtx[4][4], imtx[4][4];
-					int i;
-					TransData *td = t->data;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		Object *ob = tc->obedit;
+		ModifierData *md = ob->modifiers.first;
+		float tolerance[3] = {0.0f, 0.0f, 0.0f};
+		int axis = 0;
+
+		for (; md; md = md->next) {
+			if ((md->type == eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
+				MirrorModifierData *mmd = (MirrorModifierData *) md;
+
+				if (mmd->flag & MOD_MIR_CLIPPING) {
+					axis = 0;
+					if (mmd->flag & MOD_MIR_AXIS_X) {
+						axis |= 1;
+						tolerance[0] = mmd->tolerance;
+					}
+					if (mmd->flag & MOD_MIR_AXIS_Y) {
+						axis |= 2;
+						tolerance[1] = mmd->tolerance;
+					}
+					if (mmd->flag & MOD_MIR_AXIS_Z) {
+						axis |= 4;
+						tolerance[2] = mmd->tolerance;
+					}
+					if (axis) {
+						float mtx[4][4], imtx[4][4];
+						int i;
 
-					if (mmd->mirror_ob) {
-						float obinv[4][4];
+						if (mmd->mirror_ob) {
+							float obinv[4][4];
 
-						invert_m4_m4(obinv, mmd->mirror_ob->obmat);
-						mul_m4_m4m4(mtx, obinv, ob->obmat);
-						invert_m4_m4(imtx, mtx);
-					}
+							invert_m4_m4(obinv, mmd->mirror_ob->obmat);
+							mul_m4_m4m4(mtx, obinv, ob->obmat);
+							invert_m4_m4(imtx, mtx);
+						}
 
-					for (i = 0; i < t->total; i++, td++) {
-						int clip;
-						float loc[3], iloc[3];
+						TransData *td = tc->data;
+						for (i = 0; i < tc->data_len; i++, td++) {
+							int clip;
+							float loc[3], iloc[3];
 
-						if (td->flag & TD_NOACTION)
-							break;
-						if (td->loc == NULL)
-							break;
+							if (td->flag & TD_NOACTION)
+								break;
+							if (td->loc == NULL)
+								break;
 
-						if (td->flag & TD_SKIP)
-							continue;
+							if (td->flag & TD_SKIP)
+								continue;
 
-						copy_v3_v3(loc,  td->loc);
-						copy_v3_v3(iloc, td->iloc);
+							copy_v3_v3(loc,  td->loc);
+							copy_v3_v3(iloc, td->iloc);
 
-						if (mmd->mirror_ob) {
-							mul_m4_v3(mtx, loc);
-							mul_m4_v3(mtx, iloc);
-						}
+							if (mmd->mirror_ob) {
+								mul_m4_v3(mtx, loc);
+								mul_m4_v3(mtx, iloc);
+							}
 
-						clip = 0;
-						if (axis & 1) {
-							if (fabsf(iloc[0]) <= tolerance[0] ||
-							    loc[0] * iloc[0] < 0.0f)
-							{
-								loc[0] = 0.0f;
-								clip = 1;
+							clip = 0;
+							if (axis & 1) {
+								if (fabsf(iloc[0]) <= tolerance[0] ||
+								    loc[0] * iloc[0] < 0.0f)
+								{
+									loc[0] = 0.0f;
+									clip = 1;
+								}
 							}
-						}
 
-						if (axis & 2) {
-							if (fabsf(iloc[1]) <= tolerance[1] ||
-							    loc[1] * iloc[1] < 0.0f)
-							{
-								loc[1] = 0.0f;
-								clip = 1;
+							if (axis & 2) {
+								if (fabsf(iloc[1]) <= tolerance[1] ||
+								    loc[1] * iloc[1] < 0.0f)
+								{
+									loc[1] = 0.0f;
+									clip = 1;
+								}
 							}
-						}
-						if (axis & 4) {
-							if (fabsf(iloc[2]) <= tolerance[2] ||
-							    loc[2] * iloc[2] < 0.0f)
-							{
-								loc[2] = 0.0f;
-								clip = 1;
+							if (axis & 4) {
+								if (fabsf(iloc[2]) <= tolerance[2] ||
+								    loc[2] * iloc[2] < 0.0f)
+								{
+									loc[2] = 0.0f;
+									clip = 1;
+								}
 							}
-						}
-						if (clip) {
-							if (mmd->mirror_ob) {
-								mul_m4_v3(imtx, loc);
+							if (clip) {
+								if (mmd->mirror_ob) {
+									mul_m4_v3(imtx, loc);
+								}
+								copy_v3_v3(td->loc, loc);
 							}
-							copy_v3_v3(td->loc, loc);
 						}
 					}
-				}
 
+				}
 			}
 		}
 	}
@@ -223,27 +232,29 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 /* assumes obedit set to mesh object */
 static void editbmesh_apply_to_mirror(TransInfo *t)
 {
-	TransData *td = t->data;
-	BMVert *eve;
-	int i;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		TransData *td = tc->data;
+		BMVert *eve;
+		int i;
 
-	for (i = 0; i < t->total; i++, td++) {
-		if (td->flag & TD_NOACTION)
-			break;
-		if (td->loc == NULL)
-			break;
-		if (td->flag & TD_SKIP)
-			continue;
+		for (i = 0; i < tc->data_len; i++, td++) {
+			if (td->flag & TD_NOACTION)
+				break;
+			if (td->loc == NULL)
+				break;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		eve = td->extra;
-		if (eve) {
-			eve->co[0] = -td->loc[0];
-			eve->co[1] = td->loc[1];
-			eve->co[2] = td->loc[2];
-		}
+			eve = td->extra;
+			if (eve) {
+				eve->co[0] = -td->loc[0];
+				eve->co[1] = td->loc[1];
+				eve->co[2] = td->loc[2];
+			}
 
-		if (td->flag & TD_MIRROR_EDGE) {
-			td->loc[0] = 0;
+			if (td->flag & TD_MIRROR_EDGE) {
+				td->loc[0] = 0;
+			}
 		}
 	}
 }
@@ -338,7 +349,7 @@ static bool fcu_test_selected(FCurve *fcu)
 /* helper for recalcData() - for Action Editor transforms */
 static void recalcData_actedit(TransInfo *t)
 {
-	Scene *scene = t->scene;
+	ViewLayer *view_layer = t->view_layer;
 	SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 
 	bAnimContext ac = {NULL};
@@ -349,7 +360,8 @@ static void recalcData_actedit(TransInfo *t)
 	/* initialize relevant anim-context 'context' data from TransInfo data */
 	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
 	ac.scene = t->scene;
-	ac.obact = OBACT;
+	ac.view_layer = t->view_layer;
+	ac.obact = OBACT(view_layer);
 	ac.sa = t->sa;
 	ac.ar = t->ar;
 	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;
@@ -386,7 +398,7 @@ static void recalcData_actedit(TransInfo *t)
 static void recalcData_graphedit(TransInfo *t)
 {
 	SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
-	Scene *scene;
+	ViewLayer *view_layer = t->view_layer;
 
 	ListBase anim_data = {NULL, NULL};
 	bAnimContext ac = {NULL};
@@ -397,8 +409,9 @@ static void recalcData_graphedit(TransInfo *t)
 
 	/* initialize relevant anim-context 'context' data from TransInfo data */
 	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
-	scene = ac.scene = t->scene;
-	ac.obact = OBACT;
+	ac.scene = t->scene;
+	ac.view_layer = t->view_layer;
+	ac.obact = OBACT(view_layer);
 	ac.sa = t->sa;
 	ac.ar = t->ar;
 	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;
@@ -451,11 +464,13 @@ static void recalcData_nla(TransInfo *t)
 	double secf = FPS;
 	int i;
 
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	/* for each strip we've got, perform some additional validation of the values that got set before
 	 * using RNA to set the value (which does some special operations when setting these values to make
 	 * sure that everything works ok)
 	 */
-	for (i = 0; i < t->total; i++, tdn++) {
+	for (i = 0; i < tc->data_len; i++, tdn++) {
 		NlaStrip *strip = tdn->strip;
 		PointerRNA strip_ptr;
 		short pExceeded, nExceeded, iter;
@@ -660,7 +675,7 @@ static void recalcData_mask_common(TransInfo *t)
 
 	flushTransMasking(t);
 
-	DAG_id_tag_update(&mask->id, 0);
+	DEG_id_tag_update(&mask->id, 0);
 }
 
 /* helper for recalcData() - for Image Editor transforms */
@@ -672,14 +687,18 @@ static void recalcData_image(TransInfo *t)
 	else if (t->options & CTX_PAINT_CURVE) {
 		flushTransPaintCurve(t);
 	}
-	else if (t->obedit && t->obedit->type == OB_MESH) {
+	else if ((t->flag & T_EDIT) && t->obedit_type == OB_MESH) {
 		SpaceImage *sima = t->sa->spacedata.first;
 
 		flushTransUVs(t);
 		if (sima->flag & SI_LIVE_UNWRAP)
 			ED_uvedit_live_unwrap_re_solve();
 
-		DAG_id_tag_update(t->obedit->data, 0);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			if (tc->data_len) {
+				DEG_id_tag_update(tc->obedit->data, 0);
+			}
+		}
 	}
 }
 
@@ -722,7 +741,7 @@ static void recalcData_spaceclip(TransInfo *t)
 			track = track->next;
 		}
 
-		DAG_id_tag_update(&clip->id, 0);
+		DEG_id_tag_update(&clip->id, 0);
 	}
 	else if (t->options & CTX_MASK) {
 		recalcData_mask_common(t);
@@ -732,54 +751,59 @@ static void recalcData_spaceclip(TransInfo *t)
 /* helper for recalcData() - for object transforms, typically in the 3D view */
 static void recalcData_objects(TransInfo *t)
 {
-	Base *base = t->scene->basact;
+	Base *base = t->view_layer->basact;
 
-	if (t->obedit) {
-		if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu = t->obedit->data;
-			ListBase *nurbs = BKE_curve_editNurbs_get(cu);
-			Nurb *nu = nurbs->first;
+	if (t->obedit_type != -1) {
+		if (ELEM(t->obedit_type, OB_CURVE, OB_SURF)) {
 
 			if (t->state != TRANS_CANCEL) {
-				clipMirrorModifier(t, t->obedit);
+				clipMirrorModifier(t);
 				applyProject(t);
 			}
 
-			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				Curve *cu = tc->obedit->data;
+				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
+				Nurb *nu = nurbs->first;
+
+				DEG_id_tag_update(tc->obedit->data, 0);  /* sets recalc flags */
 
-			if (t->state == TRANS_CANCEL) {
-				while (nu) {
-					BKE_nurb_handles_calc(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */
-					nu = nu->next;
+				if (t->state == TRANS_CANCEL) {
+					while (nu) {
+						BKE_nurb_handles_calc(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */
+						nu = nu->next;
+					}
 				}
-			}
-			else {
-				/* Normal updating */
-				while (nu) {
-					BKE_nurb_test2D(nu);
-					BKE_nurb_handles_calc(nu);
-					nu = nu->next;
+				else {
+					/* Normal updating */
+					while (nu) {
+						BKE_nurb_test2D(nu);
+						BKE_nurb_handles_calc(nu);
+						nu = nu->next;
+					}
 				}
 			}
 		}
-		else if (t->obedit->type == OB_LATTICE) {
-			Lattice *la = t->obedit->data;
+		else if (t->obedit_type == OB_LATTICE) {
 
 			if (t->state != TRANS_CANCEL) {
 				applyProject(t);
 			}
 
-			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
-
-			if (la->editlatt->latt->flag & LT_OUTSIDE) outside_lattice(la->editlatt->latt);
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				Lattice *la = tc->obedit->data;
+				DEG_id_tag_update(tc->obedit->data, 0);  /* sets recalc flags */
+				if (la->editlatt->latt->flag & LT_OUTSIDE) {
+					outside_lattice(la->editlatt->latt);
+				}
+			}
 		}
-		else if (t->obedit->type == OB_MESH) {
-			BMEditMesh *em = BKE_editmesh_from_object(t->obedit);
+		else if (t->obedit_type == OB_MESH) {
 			/* mirror modifier clipping? */
 			if (t->state != TRANS_CANCEL) {
 				/* apply clipping after so we never project past the clip plane [#25423] */
 				applyProject(t);
-				clipMirrorModifier(t, t->obedit);
+				clipMirrorModifier(t);
 			}
 			if ((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR))
 				editbmesh_apply_to_mirror(t);
@@ -791,135 +815,152 @@ static void recalcData_objects(TransInfo *t)
 				projectVertSlideData(t, false);
 			}
 
-			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
-
-			EDBM_mesh_normals_update(em);
-			BKE_editmesh_tessface_calc(em);
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				DEG_id_tag_update(tc->obedit->data, 0);  /* sets recalc flags */
+				BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
+				EDBM_mesh_normals_update(em);
+				BKE_editmesh_tessface_calc(em);
+			}
 		}
-		else if (t->obedit->type == OB_ARMATURE) { /* no recalc flag, does pose */
-			bArmature *arm = t->obedit->data;
-			ListBase *edbo = arm->edbo;
-			EditBone *ebo, *ebo_parent;
-			TransData *td = t->data;
-			int i;
+		else if (t->obedit_type == OB_ARMATURE) { /* no recalc flag, does pose */
 
 			if (t->state != TRANS_CANCEL) {
 				applyProject(t);
 			}
 
-			/* Ensure all bones are correctly adjusted */
-			for (ebo = edbo->first; ebo; ebo = ebo->next) {
-				ebo_parent = (ebo->flag & BONE_CONNECTED) ? ebo->parent : NULL;
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				bArmature *arm = tc->obedit->data;
+				ListBase *edbo = arm->edbo;
+				EditBone *ebo, *ebo_parent;
+				TransData *td = tc->data;
+				int i;
 
-				if (ebo_parent) {
-					/* If this bone has a parent tip that has been moved */
-					if (ebo_parent->flag & BONE_TIPSEL) {
-						copy_v3_v3(ebo->head, ebo_parent->tail);
-						if (t->mode == TFM_BONE_ENVELOPE) ebo->rad_head = ebo_parent->rad_tail;
-					}
-					/* If this bone has a parent tip that has NOT been moved */
-					else {
-						copy_v3_v3(ebo_parent->tail, ebo->head);
-						if (t->mode == TFM_BONE_ENVELOPE) ebo_parent->rad_tail = ebo->rad_head;
-					}
-				}
+				/* Ensure all bones are correctly adjusted */
+				for (ebo = edbo->first; ebo; ebo = ebo->next) {
+					ebo_parent = (ebo->flag & BONE_CONNECTED) ? ebo->parent : NULL;
 
-				/* on extrude bones, oldlength==0.0f, so we scale radius of points */
-				ebo->length = len_v3v3(ebo->head, ebo->tail);
-				if (ebo->oldlength == 0.0f) {
-					ebo->rad_head = 0.25f * ebo->length;
-					ebo->rad_tail = 0.10f * ebo->length;
-					ebo->dist = 0.25f * ebo->length;
-					if (ebo->parent) {
-						if (ebo->rad_head > ebo->parent->rad_tail)
-							ebo->rad_head = ebo->parent->rad_tail;
+					if (ebo_parent) {
+						/* If this bone has a parent tip that has been moved */
+						if (ebo_parent->flag & BONE_TIPSEL) {
+							copy_v3_v3(ebo->head, ebo_parent->tail);
+							if (t->mode == TFM_BONE_ENVELOPE) ebo->rad_head = ebo_parent->rad_tail;
+						}
+						/* If this bone has a parent tip that has NOT been moved */
+						else {
+							copy_v3_v3(ebo_parent->tail, ebo->head);
+							if (t->mode == TFM_BONE_ENVELOPE) ebo_parent->rad_tail = ebo->rad_head;
+						}
 					}
-				}
-				else if (t->mode != TFM_BONE_ENVELOPE) {
-					/* if bones change length, lets do that for the deform distance as well */
-					ebo->dist *= ebo->length / ebo->oldlength;
-					ebo->rad_head *= ebo->length / ebo->oldlength;
-					ebo->rad_tail *= ebo->length / ebo->oldlength;
-					ebo->oldlength = ebo->length;
 
-					if (ebo_parent) {
-						ebo_parent->rad_tail = ebo->rad_head;
+					/* on extrude bones, oldlength==0.0f, so we scale radius of points */
+					ebo->length = len_v3v3(ebo->head, ebo->tail);
+					if (ebo->oldlength == 0.0f) {
+						ebo->rad_head = 0.25f * ebo->length;
+						ebo->rad_tail = 0.10f * ebo->length;
+						ebo->dist = 0.25f * ebo->length;
+						if (ebo->parent) {
+							if (ebo->rad_head > ebo->parent->rad_tail)
+								ebo->rad_head = ebo->parent->rad_tail;
+						}
+					}
+					else if (t->mode != TFM_BONE_ENVELOPE) {
+						/* if bones change length, lets do that for the deform distance as well */
+						ebo->dist *= ebo->length / ebo->oldlength;
+						ebo->rad_head *= ebo->length / ebo->oldlength;
+						ebo->rad_tail *= ebo->length / ebo->oldlength;
+						ebo->oldlength = ebo->length;
+
+						if (ebo_parent) {
+							ebo_parent->rad_tail = ebo->rad_head;
+						}
 					}
 				}
-			}
 
-			if (!ELEM(t->mode, TFM_BONE_ROLL, TFM_BONE_ENVELOPE, TFM_BONE_ENVELOPE_DIST, TFM_BONESIZE)) {
-				/* fix roll */
-				for (i = 0; i < t->total; i++, td++) {
-					if (td->extra) {
-						float vec[3], up_axis[3];
-						float qrot[4];
-						float roll;
+				if (!ELEM(t->mode, TFM_BONE_ROLL, TFM_BONE_ENVELOPE, TFM_BONE_ENVELOPE_DIST, TFM_BONESIZE)) {
+					/* fix roll */
+					for (i = 0; i < tc->data_len; i++, td++) {
+						if (td->extra) {
+							float vec[3], up_axis[3];
+							float qrot[4];
+							float roll;
 
-						ebo = td->extra;
+							ebo = td->extra;
 
-						if (t->state == TRANS_CANCEL) {
-							/* restore roll */
-							ebo->roll = td->ival;
-						}
-						else {
-							copy_v3_v3(up_axis, td->axismtx[2]);
+							if (t->state == TRANS_CANCEL) {
+								/* restore roll */
+								ebo->roll = td->ival;
+							}
+							else {
+								copy_v3_v3(up_axis, td->axismtx[2]);
 
-							sub_v3_v3v3(vec, ebo->tail, ebo->head);
-							normalize_v3(vec);
-							rotation_between_vecs_to_quat(qrot, td->axismtx[1], vec);
-							mul_qt_v3(qrot, up_axis);
+								sub_v3_v3v3(vec, ebo->tail, ebo->head);
+								normalize_v3(vec);
+								rotation_between_vecs_to_quat(qrot, td->axismtx[1], vec);
+								mul_qt_v3(qrot, up_axis);
 
-							/* roll has a tendency to flip in certain orientations - [#34283], [#33974] */
-							roll = ED_armature_ebone_roll_to_vector(ebo, up_axis, false);
-							ebo->roll = angle_compat_rad(roll, td->ival);
+								/* roll has a tendency to flip in certain orientations - [#34283], [#33974] */
+								roll = ED_armature_ebone_roll_to_vector(ebo, up_axis, false);
+								ebo->roll = angle_compat_rad(roll, td->ival);
+							}
 						}
 					}
 				}
-			}
 
-			if (arm->flag & ARM_MIRROR_EDIT) {
-				if (t->state != TRANS_CANCEL)
-					ED_armature_edit_transform_mirror_update(t->obedit);
-				else
-					restoreBones(t);
+				if (arm->flag & ARM_MIRROR_EDIT) {
+					if (t->state != TRANS_CANCEL) {
+						ED_armature_edit_transform_mirror_update(tc->obedit);
+					}
+					else {
+						restoreBones(tc);
+					}
+				}
 			}
 		}
 		else {
 			if (t->state != TRANS_CANCEL) {
 				applyProject(t);
 			}
-			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
+			FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+				if (tc->data_len) {
+					DEG_id_tag_update(tc->obedit->data, 0);  /* sets recalc flags */
+				}
+			}
 		}
+
 	}
-	else if ((t->flag & T_POSE) && t->poseobj) {
-		Object *ob = t->poseobj;
-		bArmature *arm = ob->data;
+	else if (t->flag & T_POSE) {
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			Object *ob = tc->poseobj;
+			bArmature *arm = ob->data;
 
-		/* if animtimer is running, and the object already has animation data,
-		 * check if the auto-record feature means that we should record 'samples'
-		 * (i.e. uneditable animation values)
-		 *
-		 * context is needed for keying set poll() functions.
-		 */
-		// TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes?
-		if ((t->animtimer) && (t->context) && IS_AUTOKEY_ON(t->scene)) {
-			int targetless_ik = (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet!
+			/* if animtimer is running, and the object already has animation data,
+			 * check if the auto-record feature means that we should record 'samples'
+			 * (i.e. uneditable animation values)
+			 *
+			 * context is needed for keying set poll() functions.
+			 */
+			// TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes?
+			if ((t->animtimer) && (t->context) && IS_AUTOKEY_ON(t->scene)) {
+				int targetless_ik = (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet!
 
-			animrecord_check_state(t->scene, &ob->id, t->animtimer);
-			autokeyframe_pose_cb_func(t->context, t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
-		}
+				animrecord_check_state(t->scene, &ob->id, t->animtimer);
+				autokeyframe_pose_cb_func(t->context, t->scene, ob, t->mode, targetless_ik);
+			}
 
-		/* old optimize trick... this enforces to bypass the depgraph */
-		if (!(arm->flag & ARM_DELAYDEFORM)) {
-			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
-			/* transformation of pose may affect IK tree, make sure it is rebuilt */
-			BIK_clear_data(ob->pose);
+			/* old optimize trick... this enforces to bypass the depgraph */
+			if (!(arm->flag & ARM_DELAYDEFORM)) {
+				DEG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+				/* transformation of pose may affect IK tree, make sure it is rebuilt */
+				BIK_clear_data(ob->pose);
+			}
+			else {
+				BKE_pose_where_is(t->depsgraph, t->scene, ob);
+			}
 		}
-		else
-			BKE_pose_where_is(t->scene, ob);
 	}
-	else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(t->scene, base->object)) {
+	else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) &&
+	         PE_get_current(t->scene, base->object))
+	{
 		if (t->state != TRANS_CANCEL) {
 			applyProject(t);
 		}
@@ -932,37 +973,45 @@ static void recalcData_objects(TransInfo *t)
 			applyProject(t);
 		}
 
-		for (i = 0; i < t->total; i++) {
-			TransData *td = t->data + i;
-			Object *ob = td->ob;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
 
-			if (td->flag & TD_NOACTION)
-				break;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				Object *ob = td->ob;
 
-			if (td->flag & TD_SKIP)
-				continue;
+				if (td->flag & TD_NOACTION)
+					break;
 
-			/* if animtimer is running, and the object already has animation data,
-			 * check if the auto-record feature means that we should record 'samples'
-			 * (i.e. uneditable animation values)
-			 */
-			// TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes?
-			if ((t->animtimer) && IS_AUTOKEY_ON(t->scene)) {
-				animrecord_check_state(t->scene, &ob->id, t->animtimer);
-				autokeyframe_ob_cb_func(t->context, t->scene, (View3D *)t->view, ob, t->mode);
-			}
+				if (td->flag & TD_SKIP)
+					continue;
 
-			/* sets recalc flags fully, instead of flushing existing ones
-			 * otherwise proxies don't function correctly
-			 */
-			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+				/* if animtimer is running, and the object already has animation data,
+				 * check if the auto-record feature means that we should record 'samples'
+				 * (i.e. uneditable animation values)
+				 */
+				// TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes?
+				if ((t->animtimer) && IS_AUTOKEY_ON(t->scene)) {
+					animrecord_check_state(t->scene, &ob->id, t->animtimer);
+					autokeyframe_ob_cb_func(t->context, t->scene, t->view_layer, ob, t->mode);
+				}
+
+				/* sets recalc flags fully, instead of flushing existing ones
+				 * otherwise proxies don't function correctly
+				 */
+				DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
-			if (t->flag & T_TEXTURE)
-				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+				if (t->flag & T_TEXTURE)
+					DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+			}
 		}
 	}
 }
 
+static void recalcData_cursor(TransInfo *t)
+{
+	DEG_id_tag_update(&t->scene->id, DEG_TAG_COPY_ON_WRITE);
+}
+
 /* helper for recalcData() - for sequencer transforms */
 static void recalcData_sequencer(TransInfo *t)
 {
@@ -970,7 +1019,9 @@ static void recalcData_sequencer(TransInfo *t)
 	int a;
 	Sequence *seq_prev = NULL;
 
-	for (a = 0, td = t->data; a < t->total; a++, td++) {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	for (a = 0, td = tc->data; a < tc->data_len; a++, td++) {
 		TransDataSeq *tdsq = (TransDataSeq *) td->extra;
 		Sequence *seq = tdsq->seq;
 
@@ -995,8 +1046,10 @@ static void recalcData_sequencer(TransInfo *t)
 /* force recalculation of triangles during transformation */
 static void recalcData_gpencil_strokes(TransInfo *t)
 {
-	TransData *td = t->data;
-	for (int i = 0; i < t->total; i++, td++) {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+	TransData *td = tc->data;
+	for (int i = 0; i < tc->data_len; i++, td++) {
 		bGPDstroke *gps = td->extra;
 		if (gps != NULL) {
 			gps->flag |= GP_STROKE_RECALC_CACHES;
@@ -1008,7 +1061,10 @@ static void recalcData_gpencil_strokes(TransInfo *t)
 void recalcData(TransInfo *t)
 {
 	/* if tests must match createTransData for correct updates */
-	if (t->options & CTX_TEXTURE) {
+	if (t->options & CTX_CURSOR) {
+		recalcData_cursor(t);
+	}
+	else if (t->options & CTX_TEXTURE) {
 		recalcData_objects(t);
 	}
 	else if (t->options & CTX_EDGE) {
@@ -1055,10 +1111,7 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis
 	if (t->spacetype == SPACE_VIEW3D) {
 		View3D *v3d = t->view;
 
-		glPushMatrix();
-
-		//if (t->obedit) glLoadMatrixf(t->obedit->obmat);	// sets opengl viewing
-
+		gpuPushMatrix();
 
 		copy_v3_v3(v3, dir);
 		mul_v3_fl(v3, v3d->far);
@@ -1073,15 +1126,20 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis
 			UI_GetThemeColor3ubv(TH_GRID, col);
 		}
 		UI_make_axis_color(col, col2, axis);
-		glColor3ubv(col2);
 
-		setlinestyle(0);
-		glBegin(GL_LINES);
-		glVertex3fv(v1);
-		glVertex3fv(v2);
-		glEnd();
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+		immUniformColor3ubv(col2);
+
+		immBegin(GWN_PRIM_LINES, 2);
+		immVertex3fv(pos, v1);
+		immVertex3fv(pos, v2);
+		immEnd();
+
+		immUnbindProgram();
 
-		glPopMatrix();
+		gpuPopMatrix();
 	}
 }
 
@@ -1090,12 +1148,7 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis
  */
 void resetTransModal(TransInfo *t)
 {
-	if (t->mode == TFM_EDGE_SLIDE) {
-		freeEdgeSlideVerts(t, &t->custom.mode);
-	}
-	else if (t->mode == TFM_VERT_SLIDE) {
-		freeVertSlideVerts(t, &t->custom.mode);
-	}
+	freeTransCustomDataForMode(t);
 }
 
 void resetTransRestrictions(TransInfo *t)
@@ -1117,6 +1170,53 @@ static int initTransInfo_edit_pet_to_flag(const int proportional)
 	}
 }
 
+void initTransDataContainers_FromObjectData(TransInfo *t)
+{
+	const eObjectMode object_mode = OBACT(t->view_layer) ? OBACT(t->view_layer)->mode : OB_MODE_OBJECT;
+	const short object_type = OBACT(t->view_layer) ? OBACT(t->view_layer)->type : -1;
+
+	if ((object_mode & OB_MODE_EDIT) ||
+	    ((object_mode & OB_MODE_POSE) && (object_type == OB_ARMATURE)))
+	{
+		if (t->data_container) {
+			MEM_freeN(t->data_container);
+		}
+		uint objects_len;
+		Object **objects = BKE_view_layer_array_from_objects_in_mode(
+		        t->view_layer, &objects_len, {
+		            .object_mode = object_mode,
+		            .no_dup_data = true});
+		t->data_container = MEM_callocN(sizeof(*t->data_container) * objects_len, __func__);
+		t->data_container_len = objects_len;
+
+		for (int i = 0; i < objects_len; i++) {
+			TransDataContainer *tc = &t->data_container[i];
+			if (object_mode & OB_MODE_EDIT) {
+				tc->obedit = objects[i];
+				/* Check needed for UV's */
+				if ((t->flag & T_2D_EDIT) == 0) {
+					tc->use_local_mat = true;
+				}
+			}
+			else if (object_mode & OB_MODE_POSE) {
+				tc->poseobj = objects[i];
+				tc->use_local_mat = true;
+			}
+
+			if (tc->use_local_mat) {
+				BLI_assert((t->flag & T_2D_EDIT) == 0);
+				copy_m4_m4(tc->mat, objects[i]->obmat);
+				copy_m3_m4(tc->mat3, tc->mat);
+				invert_m4_m4(tc->imat, tc->mat);
+				invert_m3_m3(tc->imat3, tc->mat3);
+				normalize_m3_m3(tc->mat3_unit, tc->mat3);
+			}
+			/* Otherwise leave as zero. */
+		}
+		MEM_freeN(objects);
+	}
+}
+
 /**
  * Setup internal data, mouse, vectors
  *
@@ -1126,34 +1226,38 @@ static int initTransInfo_edit_pet_to_flag(const int proportional)
  */
 void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *event)
 {
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *sce = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	const eObjectMode object_mode = OBACT(view_layer) ? OBACT(view_layer)->mode : OB_MODE_OBJECT;
+	const short object_type = OBACT(view_layer) ? OBACT(view_layer)->type : -1;
 	ToolSettings *ts = CTX_data_tool_settings(C);
 	ARegion *ar = CTX_wm_region(C);
 	ScrArea *sa = CTX_wm_area(C);
-	Object *obedit = CTX_data_edit_object(C);
-	Object *ob = CTX_data_active_object(C);
+
 	bGPdata *gpd = CTX_data_gpencil_data(C);
 	PropertyRNA *prop;
 
+	t->depsgraph = depsgraph;
 	t->scene = sce;
+	t->view_layer = view_layer;
 	t->sa = sa;
 	t->ar = ar;
-	t->obedit = obedit;
 	t->settings = ts;
 	t->reports = op ? op->reports : NULL;
 
-	if (obedit) {
-		copy_m3_m4(t->obedit_mat, obedit->obmat);
-		normalize_m3(t->obedit_mat);
-	}
-
-	t->data = NULL;
-	t->ext = NULL;
-
 	t->helpline = HLP_NONE;
 
 	t->flag = 0;
 
+	t->obedit_type = (object_mode == OB_MODE_EDIT) ? object_type : -1;
+
+	/* Many kinds of transform only use a single handle. */
+	if (t->data_container == NULL) {
+		t->data_container = MEM_callocN(sizeof(*t->data_container), __func__);
+		t->data_container_len = 1;
+	}
+
 	t->redraw = TREDRAW_HARD;  /* redraw first time */
 
 	if (event) {
@@ -1174,12 +1278,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	t->transform        = NULL;
 	t->handleEvent      = NULL;
 
-	t->total            = 0;
+	t->data_len_all = 0;
 
 	t->val = 0.0f;
 
 	zero_v3(t->vec);
-	zero_v3(t->center);
 	zero_v3(t->center_global);
 
 	unit_m3(t->mat);
@@ -1228,9 +1331,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 			prop_id = "use_even_offset";
 		}
 
-		if (prop_id && (prop = RNA_struct_find_property(op->ptr, prop_id)) &&
-		    RNA_property_is_set(op->ptr, prop))
-		{
+		if (prop_id && (prop = RNA_struct_find_property(op->ptr, prop_id))) {
 			SET_FLAG_FROM_TEST(t->flag, RNA_property_boolean_get(op->ptr, prop), T_ALT_TRANSFORM);
 		}
 	}
@@ -1243,34 +1344,37 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		t->animtimer = (animscreen) ? animscreen->animtimer : NULL;
 
 		/* turn manipulator off during transform */
-		// FIXME: but don't do this when USING the manipulator...
 		if (t->flag & T_MODAL) {
-			t->twtype = v3d->twtype;
-			v3d->twtype = 0;
+			t->twflag = v3d->twflag;
+			v3d->twflag = 0;
 		}
 
-		if (v3d->flag & V3D_ALIGN) t->flag |= T_V3D_ALIGN;
-		t->around = v3d->around;
+		if (t->scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) {
+			t->flag |= T_V3D_ALIGN;
+		}
+		t->around = t->scene->toolsettings->transform_pivot_point;
 
 		/* bend always uses the cursor */
 		if (t->mode == TFM_BEND) {
 			t->around = V3D_AROUND_CURSOR;
 		}
 
-		t->current_orientation = v3d->twmode;
+		t->current_orientation = t->scene->orientation_type;
+		t->custom_orientation = BKE_scene_transform_orientation_find(
+		        t->scene, t->scene->orientation_index_custom);
 
 		/* exceptional case */
 		if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
 			if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL)) {
 				const bool use_island = transdata_check_local_islands(t, t->around);
 
-				if (obedit && !use_island) {
+				if ((t->obedit_type != -1) && !use_island) {
 					t->options |= CTX_NO_PET;
 				}
 			}
 		}
 
-		if (ob && ob->mode & OB_MODE_ALL_PAINT) {
+		if (object_mode & OB_MODE_ALL_PAINT) {
 			Paint *p = BKE_paint_get_active_from_context(C);
 			if (p && p->brush && (p->brush->flag & BRUSH_CURVE)) {
 				t->options |= CTX_PAINT_CURVE;
@@ -1299,7 +1403,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		t->view = &ar->v2d;
 		t->around = sima->around;
 
-		if (ED_space_image_show_uvedit(sima, t->obedit)) {
+		if (ED_space_image_show_uvedit(sima, OBACT(t->view_layer))) {
 			/* UV transform */
 		}
 		else if (sima->mode == SI_MODE_MASK) {
@@ -1348,11 +1452,22 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	if (op && ((prop = RNA_struct_find_property(op->ptr, "constraint_orientation")) &&
 	           RNA_property_is_set(op->ptr, prop)))
 	{
-		t->current_orientation = RNA_property_enum_get(op->ptr, prop);
+		short orientation = RNA_property_enum_get(op->ptr, prop);
+		TransformOrientation *custom_orientation = NULL;
 
-		if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
-			t->current_orientation = V3D_MANIP_GLOBAL;
+		if (orientation >= V3D_MANIP_CUSTOM) {
+			if (orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
+				orientation = V3D_MANIP_GLOBAL;
+			}
+			else {
+				custom_orientation = BKE_scene_transform_orientation_find(
+				        t->scene, orientation - V3D_MANIP_CUSTOM);
+				orientation = V3D_MANIP_CUSTOM;
+			}
 		}
+
+		t->current_orientation = orientation;
+		t->custom_orientation = custom_orientation;
 	}
 
 	if (op && ((prop = RNA_struct_find_property(op->ptr, "release_confirm")) &&
@@ -1378,7 +1493,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	}
 	// Need stuff to take it from edit mesh or whatnot here
 	else if (t->spacetype == SPACE_VIEW3D) {
-		if (t->obedit && t->obedit->type == OB_MESH && (((Mesh *)t->obedit->data)->editflag & ME_EDIT_MIRROR_X)) {
+		/* TODO(campbell): xform, get mirror from each object. */
+		if (t->obedit_type == OB_MESH && (((Mesh *)OBACT(t->view_layer)->data)->editflag & ME_EDIT_MIRROR_X)) {
 			t->flag |= T_MIRROR;
 			t->mirror = 1;
 		}
@@ -1399,7 +1515,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 					else if (t->spacetype == SPACE_ACTION) {
 						t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_action);
 					}
-					else if (t->obedit) {
+					else if (t->obedit_type != -1) {
 						t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional);
 					}
 					else if (t->options & CTX_GPENCIL_STROKES) {
@@ -1414,7 +1530,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 							}
 						}
 					}
-					else if (t->obedit == NULL && ts->proportional_objects) {
+					else if ((t->obedit_type == -1) && ts->proportional_objects) {
 						t->flag |= T_PROP_EDIT;
 					}
 				}
@@ -1460,8 +1576,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	setTransformViewAspect(t, t->aspect);
 
 	if (op && (prop = RNA_struct_find_property(op->ptr, "center_override")) && RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_float_get_array(op->ptr, prop, t->center);
-		mul_v3_v3(t->center, t->aspect);
+		RNA_property_float_get_array(op->ptr, prop, t->center_global);
+		mul_v3_v3(t->center_global, t->aspect);
 		t->flag |= T_OVERRIDE_CENTER;
 	}
 
@@ -1469,11 +1585,47 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	initNumInput(&t->num);
 }
 
+
+static void freeTransCustomData(
+        TransInfo *t, TransDataContainer *tc,
+        TransCustomData *custom_data)
+{
+	if (custom_data->free_cb) {
+		/* Can take over freeing t->data and data_2d etc... */
+		custom_data->free_cb(t, tc, custom_data);
+		BLI_assert(custom_data->data == NULL);
+	}
+	else if ((custom_data->data != NULL) && custom_data->use_free) {
+		MEM_freeN(custom_data->data);
+		custom_data->data = NULL;
+	}
+	/* In case modes are switched in the same transform session. */
+	custom_data->free_cb = false;
+	custom_data->use_free = false;
+}
+
+static void freeTransCustomDataContainer(TransInfo *t, TransDataContainer *tc, TransCustomDataContainer *tcdc)
+{
+	TransCustomData *custom_data = &tcdc->first_elem;
+	for (int i = 0; i < TRANS_CUSTOM_DATA_ELEM_MAX; i++, custom_data++) {
+		freeTransCustomData(t, tc, custom_data);
+	}
+}
+
+/**
+ * Needed for mode switching.
+ */
+void freeTransCustomDataForMode(TransInfo *t)
+{
+	freeTransCustomData(t, NULL, &t->custom.mode);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		freeTransCustomData(t, tc, &tc->custom.mode);
+	}
+}
+
 /* Here I would suggest only TransInfo related issues, like free data & reset vars. Not redraws */
 void postTrans(bContext *C, TransInfo *t)
 {
-	TransData *td;
-
 	if (t->draw_handle_view)
 		ED_region_draw_cb_exit(t->ar->type, t->draw_handle_view);
 	if (t->draw_handle_apply)
@@ -1483,46 +1635,41 @@ void postTrans(bContext *C, TransInfo *t)
 	if (t->draw_handle_cursor)
 		WM_paint_cursor_end(CTX_wm_manager(C), t->draw_handle_cursor);
 
+	if (t->flag & T_MODAL_CURSOR_SET) {
+		WM_cursor_modal_restore(CTX_wm_window(C));
+	}
+
 	/* Free all custom-data */
-	{
-		TransCustomData *custom_data = &t->custom.first_elem;
-		for (int i = 0; i < TRANS_CUSTOM_DATA_ELEM_MAX; i++, custom_data++) {
-			if (custom_data->free_cb) {
-				/* Can take over freeing t->data and data2d etc... */
-				custom_data->free_cb(t, custom_data);
-				BLI_assert(custom_data->data == NULL);
-			}
-			else if ((custom_data->data != NULL) && custom_data->use_free) {
-				MEM_freeN(custom_data->data);
-				custom_data->data = NULL;
-			}
-		}
+	freeTransCustomDataContainer(t, NULL, &t->custom);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		freeTransCustomDataContainer(t, tc, &tc->custom);
 	}
 
 	/* postTrans can be called when nothing is selected, so data is NULL already */
-	if (t->data) {
-
-		/* free data malloced per trans-data */
-		if ((t->obedit && ELEM(t->obedit->type, OB_CURVE, OB_SURF)) ||
-		    (t->spacetype == SPACE_IPO))
-		{
-			int a;
-			for (a = 0, td = t->data; a < t->total; a++, td++) {
-				if (td->flag & TD_BEZTRIPLE) {
-					MEM_freeN(td->hdata);
+	if (t->data_len_all != 0) {
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			/* free data malloced per trans-data */
+			if (ELEM(t->obedit_type, OB_CURVE, OB_SURF) ||
+			    (t->spacetype == SPACE_IPO))
+			{
+				TransData *td = tc->data;
+				for (int a = 0; a < tc->data_len; a++, td++) {
+					if (td->flag & TD_BEZTRIPLE) {
+						MEM_freeN(td->hdata);
+					}
 				}
 			}
+			MEM_freeN(tc->data);
+
+			MEM_SAFE_FREE(tc->data_ext);
+			MEM_SAFE_FREE(tc->data_2d);
 		}
-		MEM_freeN(t->data);
 	}
 
-	BLI_freelistN(&t->tsnap.points);
+	MEM_SAFE_FREE(t->data_container);
+	t->data_container = NULL;
 
-	if (t->ext) MEM_freeN(t->ext);
-	if (t->data2d) {
-		MEM_freeN(t->data2d);
-		t->data2d = NULL;
-	}
+	BLI_freelistN(&t->tsnap.points);
 
 	if (t->spacetype == SPACE_IMAGE) {
 		if (t->options & (CTX_MASK | CTX_PAINT_CURVE)) {
@@ -1538,7 +1685,7 @@ void postTrans(bContext *C, TransInfo *t)
 		View3D *v3d = t->sa->spacedata.first;
 		/* restore manipulator */
 		if (t->flag & T_MODAL) {
-			v3d->twtype = t->twtype;
+			v3d->twflag = t->twflag;
 		}
 	}
 
@@ -1551,9 +1698,11 @@ void postTrans(bContext *C, TransInfo *t)
 
 void applyTransObjects(TransInfo *t)
 {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
 	TransData *td;
 
-	for (td = t->data; td < t->data + t->total; td++) {
+	for (td = tc->data; td < tc->data + tc->data_len; td++) {
 		copy_v3_v3(td->iloc, td->loc);
 		if (td->ext->rot) {
 			copy_v3_v3(td->ext->irot, td->ext->rot);
@@ -1602,25 +1751,29 @@ static void restoreElement(TransData *td)
 
 void restoreTransObjects(TransInfo *t)
 {
-	TransData *td;
-	TransData2D *td2d;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
-	for (td = t->data; td < t->data + t->total; td++) {
-		restoreElement(td);
-	}
+		TransData *td;
+		TransData2D *td2d;
 
-	for (td2d = t->data2d; t->data2d && td2d < t->data2d + t->total; td2d++) {
-		if (td2d->h1) {
-			td2d->h1[0] = td2d->ih1[0];
-			td2d->h1[1] = td2d->ih1[1];
+		for (td = tc->data; td < tc->data + tc->data_len; td++) {
+			restoreElement(td);
 		}
-		if (td2d->h2) {
-			td2d->h2[0] = td2d->ih2[0];
-			td2d->h2[1] = td2d->ih2[1];
+
+		for (td2d = tc->data_2d; tc->data_2d && td2d < tc->data_2d + tc->data_len; td2d++) {
+			if (td2d->h1) {
+				td2d->h1[0] = td2d->ih1[0];
+				td2d->h1[1] = td2d->ih1[1];
+			}
+			if (td2d->h2) {
+				td2d->h2[0] = td2d->ih2[0];
+				td2d->h2[1] = td2d->ih2[1];
+			}
 		}
-	}
 
-	unit_m3(t->mat);
+		unit_m3(t->mat);
+
+	}
 
 	recalcData(t);
 }
@@ -1628,32 +1781,21 @@ void restoreTransObjects(TransInfo *t)
 void calculateCenter2D(TransInfo *t)
 {
 	BLI_assert(!is_zero_v3(t->aspect));
-
-	if (t->flag & (T_EDIT | T_POSE)) {
-		Object *ob = t->obedit ? t->obedit : t->poseobj;
-		float vec[3];
-
-		copy_v3_v3(vec, t->center);
-		mul_m4_v3(ob->obmat, vec);
-		projectFloatView(t, vec, t->center2d);
-	}
-	else {
-		projectFloatView(t, t->center, t->center2d);
-	}
+	projectFloatView(t, t->center_global, t->center2d);
 }
 
-void calculateCenterGlobal(
-        TransInfo *t, const float center_local[3],
-        float r_center_global[3])
+void calculateCenterLocal(
+        TransInfo *t, const float center_global[3])
 {
 	/* setting constraint center */
 	/* note, init functions may over-ride t->center */
-	if (t->flag & (T_EDIT | T_POSE)) {
-		Object *ob = t->obedit ? t->obedit : t->poseobj;
-		mul_v3_m4v3(r_center_global, ob->obmat, center_local);
-	}
-	else {
-		copy_v3_v3(r_center_global, center_local);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		if (tc->use_local_mat) {
+			mul_v3_m4v3(tc->center_local, tc->imat, center_global);
+		}
+		else {
+			copy_v3_v3(tc->center_local, center_global);
+		}
 	}
 }
 
@@ -1661,20 +1803,11 @@ void calculateCenterCursor(TransInfo *t, float r_center[3])
 {
 	const float *cursor;
 
-	cursor = ED_view3d_cursor3d_get(t->scene, t->view);
+	cursor = ED_view3d_cursor3d_get(t->scene, t->view)->location;
 	copy_v3_v3(r_center, cursor);
 
 	/* If edit or pose mode, move cursor in local space */
-	if (t->flag & (T_EDIT | T_POSE)) {
-		Object *ob = t->obedit ? t->obedit : t->poseobj;
-		float mat[3][3], imat[3][3];
-
-		sub_v3_v3v3(r_center, r_center, ob->obmat[3]);
-		copy_m3_m4(mat, ob->obmat);
-		invert_m3_m3(imat, mat);
-		mul_m3_v3(imat, r_center);
-	}
-	else if (t->options & CTX_PAINT_CURVE) {
+	if (t->options & CTX_PAINT_CURVE) {
 		if (ED_view3d_project_float_global(t->ar, cursor, r_center, V3D_PROJ_TEST_NOP) != V3D_PROJ_RET_OK) {
 			r_center[0] = t->ar->winx / 2.0f;
 			r_center[1] = t->ar->winy / 2.0f;
@@ -1748,13 +1881,21 @@ void calculateCenterMedian(TransInfo *t, float r_center[3])
 {
 	float partial[3] = {0.0f, 0.0f, 0.0f};
 	int total = 0;
-	int i;
 
-	for (i = 0; i < t->total; i++) {
-		if (t->data[i].flag & TD_SELECTED) {
-			if (!(t->data[i].flag & TD_NOCENTER)) {
-				add_v3_v3(partial, t->data[i].center);
-				total++;
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		for (int i = 0; i < tc->data_len; i++) {
+			if (tc->data[i].flag & TD_SELECTED) {
+				if (!(tc->data[i].flag & TD_NOCENTER)) {
+					if (tc->use_local_mat) {
+						float v[3];
+						mul_v3_m4v3(v, tc->mat, tc->data[i].center);
+						add_v3_v3(partial, v);
+					}
+					else {
+						add_v3_v3(partial, tc->data[i].center);
+					}
+					total++;
+				}
 			}
 		}
 	}
@@ -1766,22 +1907,29 @@ void calculateCenterMedian(TransInfo *t, float r_center[3])
 
 void calculateCenterBound(TransInfo *t, float r_center[3])
 {
-	float max[3];
-	float min[3];
-	int i;
-	for (i = 0; i < t->total; i++) {
-		if (i) {
-			if (t->data[i].flag & TD_SELECTED) {
-				if (!(t->data[i].flag & TD_NOCENTER))
-					minmax_v3v3_v3(min, max, t->data[i].center);
+	float max[3], min[3];
+	bool changed = false;
+	INIT_MINMAX(min, max);
+	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+		for (int i = 0; i < tc->data_len; i++) {
+			if (tc->data[i].flag & TD_SELECTED) {
+				if (!(tc->data[i].flag & TD_NOCENTER)) {
+					if (tc->use_local_mat) {
+						float v[3];
+						mul_v3_m4v3(v, tc->mat, tc->data[i].center);
+						minmax_v3v3_v3(min, max, v);
+					}
+					else {
+						minmax_v3v3_v3(min, max, tc->data[i].center);
+					}
+					changed = true;
+				}
 			}
 		}
-		else {
-			copy_v3_v3(max, t->data[i].center);
-			copy_v3_v3(min, t->data[i].center);
-		}
 	}
-	mid_v3_v3v3(r_center, min, max);
+	if (changed) {
+		mid_v3_v3v3(r_center, min, max);
+	}
 }
 
 /**
@@ -1789,26 +1937,30 @@ void calculateCenterBound(TransInfo *t, float r_center[3])
  */
 bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3])
 {
+	TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_OK(t);
+
 	bool ok = false;
 
-	if (t->obedit) {
-		if (ED_object_editmode_calc_active_center(t->obedit, select_only, r_center)) {
+	if (tc->obedit) {
+		if (ED_object_editmode_calc_active_center(tc->obedit, select_only, r_center)) {
+			mul_m4_v3(tc->obedit->obmat, r_center);
 			ok = true;
 		}
 	}
 	else if (t->flag & T_POSE) {
-		Scene *scene = t->scene;
-		Object *ob = OBACT;
+		ViewLayer *view_layer = t->view_layer;
+		Object *ob = OBACT(view_layer);
 		if (ob) {
 			bPoseChannel *pchan = BKE_pose_channel_active(ob);
 			if (pchan && (!select_only || (pchan->bone->flag & BONE_SELECTED))) {
 				copy_v3_v3(r_center, pchan->pose_head);
+				mul_m4_v3(tc->obedit->obmat, r_center);
 				ok = true;
 			}
 		}
 	}
 	else if (t->options & CTX_PAINT_CURVE) {
-		Paint *p = BKE_paint_get_active(t->scene);
+		Paint *p = BKE_paint_get_active(t->scene, t->view_layer);
 		Brush *br = p->brush;
 		PaintCurve *pc = br->paint_curve;
 		copy_v3_v3(r_center, pc->points[pc->add_index - 1].bez.vec[1]);
@@ -1817,9 +1969,10 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3])
 	}
 	else {
 		/* object mode */
-		Scene *scene = t->scene;
-		Object *ob = OBACT;
-		if (ob && (!select_only || (ob->flag & SELECT))) {
+		ViewLayer *view_layer = t->view_layer;
+		Object *ob = OBACT(view_layer);
+		Base *base = BASACT(view_layer);
+		if (ob && ((!select_only) || ((base->flag & BASE_SELECTED) != 0))) {
 			copy_v3_v3(r_center, ob->obmat[3]);
 			ok = true;
 		}
@@ -1866,14 +2019,13 @@ static void calculateCenter_FromAround(TransInfo *t, int around, float r_center[
 void calculateCenter(TransInfo *t)
 {
 	if ((t->flag & T_OVERRIDE_CENTER) == 0) {
-		calculateCenter_FromAround(t, t->around, t->center);
+		calculateCenter_FromAround(t, t->around, t->center_global);
 	}
-	calculateCenterGlobal(t, t->center, t->center_global);
+	calculateCenterLocal(t, t->center_global);
 
 	/* avoid calculating again */
 	{
 		TransCenterData *cd = &t->center_cache[t->around];
-		copy_v3_v3(cd->local, t->center);
 		copy_v3_v3(cd->global, t->center_global);
 		cd->is_set = true;
 	}
@@ -1891,16 +2043,15 @@ void calculateCenter(TransInfo *t)
 				normalize_v3(axis);
 
 				/* 6.0 = 6 grid units */
-				axis[0] = t->center[0] - 6.0f * axis[0];
-				axis[1] = t->center[1] - 6.0f * axis[1];
-				axis[2] = t->center[2] - 6.0f * axis[2];
+				axis[0] = t->center_global[0] - 6.0f * axis[0];
+				axis[1] = t->center_global[1] - 6.0f * axis[1];
+				axis[2] = t->center_global[2] - 6.0f * axis[2];
 
 				projectFloatView(t, axis, t->center2d);
 
 				/* rotate only needs correct 2d center, grab needs ED_view3d_calc_zfac() value */
 				if (t->mode == TFM_TRANSLATION) {
-					copy_v3_v3(t->center, axis);
-					copy_v3_v3(t->center_global, t->center);
+					copy_v3_v3(t->center_global, axis);
 				}
 			}
 		}
@@ -1934,8 +2085,7 @@ const TransCenterData *transformCenter_from_type(TransInfo *t, int around)
 	BLI_assert(around <= V3D_AROUND_ACTIVE);
 	TransCenterData *cd = &t->center_cache[around];
 	if (cd->is_set == false) {
-		calculateCenter_FromAround(t, around, cd->local);
-		calculateCenterGlobal(t, cd->local, cd->global);
+		calculateCenter_FromAround(t, around, cd->global);
 		cd->is_set = true;
 	}
 	return cd;
@@ -1943,7 +2093,6 @@ const TransCenterData *transformCenter_from_type(TransInfo *t, int around)
 
 void calculatePropRatio(TransInfo *t)
 {
-	TransData *td = t->data;
 	int i;
 	float dist;
 	const bool connected = (t->flag & T_PROP_CONNECTED) != 0;
@@ -1952,75 +2101,79 @@ void calculatePropRatio(TransInfo *t)
 
 	if (t->flag & T_PROP_EDIT) {
 		const char *pet_id = NULL;
-		for (i = 0; i < t->total; i++, td++) {
-			if (td->flag & TD_SELECTED) {
-				td->factor = 1.0f;
-			}
-			else if (t->flag & T_MIRROR && td->loc[0] * t->mirror < -0.00001f) {
-				td->flag |= TD_SKIP;
-				td->factor = 0.0f;
-				restoreElement(td);
-			}
-			else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
-			         (connected == 0 && td->rdist > t->prop_size))
-			{
-				/*
-				 * The elements are sorted according to their dist member in the array,
-				 * that means we can stop when it finds one element outside of the propsize.
-				 * do not set 'td->flag |= TD_NOACTION', the prop circle is being changed.
-				 */
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				if (td->flag & TD_SELECTED) {
+					td->factor = 1.0f;
+				}
+				else if (t->flag & T_MIRROR && td->loc[0] * t->mirror < -0.00001f) {
+					td->flag |= TD_SKIP;
+					td->factor = 0.0f;
+					restoreElement(td);
+				}
+				else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
+				         (connected == 0 && td->rdist > t->prop_size))
+				{
+					/*
+					 * The elements are sorted according to their dist member in the array,
+					 * that means we can stop when it finds one element outside of the propsize.
+					 * do not set 'td->flag |= TD_NOACTION', the prop circle is being changed.
+					 */
 
-				td->factor = 0.0f;
-				restoreElement(td);
-			}
-			else {
-				/* Use rdist for falloff calculations, it is the real distance */
-				td->flag &= ~TD_NOACTION;
-
-				if (connected)
-					dist = (t->prop_size - td->dist) / t->prop_size;
-				else
-					dist = (t->prop_size - td->rdist) / t->prop_size;
-
-				/*
-				 * Clamp to positive numbers.
-				 * Certain corner cases with connectivity and individual centers
-				 * can give values of rdist larger than propsize.
-				 */
-				if (dist < 0.0f)
-					dist = 0.0f;
+					td->factor = 0.0f;
+					restoreElement(td);
+				}
+				else {
+					/* Use rdist for falloff calculations, it is the real distance */
+					td->flag &= ~TD_NOACTION;
+
+					if (connected)
+						dist = (t->prop_size - td->dist) / t->prop_size;
+					else
+						dist = (t->prop_size - td->rdist) / t->prop_size;
+
+					/*
+					 * Clamp to positive numbers.
+					 * Certain corner cases with connectivity and individual centers
+					 * can give values of rdist larger than propsize.
+					 */
+					if (dist < 0.0f)
+						dist = 0.0f;
 
-				switch (t->prop_mode) {
-					case PROP_SHARP:
-						td->factor = dist * dist;
-						break;
-					case PROP_SMOOTH:
-						td->factor = 3.0f * dist * dist - 2.0f * dist * dist * dist;
-						break;
-					case PROP_ROOT:
-						td->factor = sqrtf(dist);
-						break;
-					case PROP_LIN:
-						td->factor = dist;
-						break;
-					case PROP_CONST:
-						td->factor = 1.0f;
-						break;
-					case PROP_SPHERE:
-						td->factor = sqrtf(2 * dist - dist * dist);
-						break;
-					case PROP_RANDOM:
-						td->factor = BLI_frand() * dist;
-						break;
-					case PROP_INVSQUARE:
-						td->factor = dist * (2.0f - dist);
-						break;
-					default:
-						td->factor = 1;
-						break;
+					switch (t->prop_mode) {
+						case PROP_SHARP:
+							td->factor = dist * dist;
+							break;
+						case PROP_SMOOTH:
+							td->factor = 3.0f * dist * dist - 2.0f * dist * dist * dist;
+							break;
+						case PROP_ROOT:
+							td->factor = sqrtf(dist);
+							break;
+						case PROP_LIN:
+							td->factor = dist;
+							break;
+						case PROP_CONST:
+							td->factor = 1.0f;
+							break;
+						case PROP_SPHERE:
+							td->factor = sqrtf(2 * dist - dist * dist);
+							break;
+						case PROP_RANDOM:
+							td->factor = BLI_frand() * dist;
+							break;
+						case PROP_INVSQUARE:
+							td->factor = dist * (2.0f - dist);
+							break;
+						default:
+							td->factor = 1;
+							break;
+					}
 				}
 			}
 		}
+
 		switch (t->prop_mode) {
 			case PROP_SHARP:
 				pet_id = N_("(Sharp)");
@@ -2055,8 +2208,11 @@ void calculatePropRatio(TransInfo *t)
 		}
 	}
 	else {
-		for (i = 0; i < t->total; i++, td++) {
-			td->factor = 1.0;
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				td->factor = 1.0;
+			}
 		}
 	}
 }
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c
index b60c8bf47f6..270ef08be50 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -30,10 +30,13 @@
 
 #include "DNA_screen_types.h"
 
+#include "BKE_context.h"
+
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "WM_types.h"
+#include "WM_api.h"
 
 #include "transform.h"
 
@@ -341,6 +344,31 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode)
 			break;
 	}
 
+	/* setup for the mouse cursor: either set a custom one,
+	 * or hide it if it will be drawn with the helpline */
+	wmWindow *win = CTX_wm_window(t->context);
+	switch (t->helpline) {
+		case HLP_NONE:
+			/* INPUT_VECTOR, INPUT_CUSTOM_RATIO, INPUT_CUSTOM_RATIO_FLIP */
+			if (t->flag & T_MODAL) {
+				t->flag |= T_MODAL_CURSOR_SET;
+				WM_cursor_modal_set(win, BC_NSEW_SCROLLCURSOR);
+			}
+			break;
+		case HLP_SPRING:
+		case HLP_ANGLE:
+		case HLP_TRACKBALL:
+		case HLP_HARROW:
+		case HLP_VARROW:
+			if (t->flag & T_MODAL) {
+				t->flag |= T_MODAL_CURSOR_SET;
+				WM_cursor_modal_set(win, CURSOR_NONE);
+			}
+			break;
+		default:
+			break;
+	}
+
 	/* if we've allocated new data, free the old data
 	 * less hassle then checking before every alloc above */
 	if (mi_data_prev && (mi_data_prev != mi->data)) {
@@ -391,6 +419,17 @@ void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float outp
 		mi->apply(t, mi, mval_db, output);
 	}
 
+	if (!is_zero_v3(t->values_modal_offset)) {
+		float values_ofs[3];
+		if (t->con.mode & CON_APPLY) {
+			mul_v3_m3v3(values_ofs, t->spacemtx, t->values_modal_offset);
+		}
+		else {
+			copy_v3_v3(values_ofs, t->values_modal_offset);
+		}
+		add_v3_v3(t->values, values_ofs);
+	}
+
 	if (mi->post) {
 		mi->post(t, output);
 	}
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
deleted file mode 100644
index 5997777f635..00000000000
--- a/source/blender/editors/transform/transform_manipulator.c
+++ /dev/null
@@ -1,1981 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2005 Blender Foundation
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/transform/transform_manipulator.c
- *  \ingroup edtransform
- */
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
-
-#include "DNA_armature_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_lattice_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_view3d_types.h"
-
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
-#include "RNA_access.h"
-
-#include "BKE_action.h"
-#include "BKE_context.h"
-#include "BKE_curve.h"
-#include "BKE_global.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_editmesh.h"
-#include "BKE_lattice.h"
-#include "BKE_gpencil.h"
-
-#include "BIF_gl.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "ED_armature.h"
-#include "ED_curve.h"
-#include "ED_particle.h"
-#include "ED_view3d.h"
-#include "ED_gpencil.h"
-
-#include "UI_resources.h"
-
-/* local module include */
-#include "transform.h"
-
-#include "GPU_select.h"
-
-/* return codes for select, and drawing flags */
-
-#define MAN_TRANS_X		(1 << 0)
-#define MAN_TRANS_Y		(1 << 1)
-#define MAN_TRANS_Z		(1 << 2)
-#define MAN_TRANS_C		(MAN_TRANS_X | MAN_TRANS_Y | MAN_TRANS_Z)
-
-#define MAN_ROT_X		(1 << 3)
-#define MAN_ROT_Y		(1 << 4)
-#define MAN_ROT_Z		(1 << 5)
-#define MAN_ROT_V		(1 << 6)
-#define MAN_ROT_T		(1 << 7)
-#define MAN_ROT_C		(MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z | MAN_ROT_V | MAN_ROT_T)
-
-#define MAN_SCALE_X		(1 << 8)
-#define MAN_SCALE_Y		(1 << 9)
-#define MAN_SCALE_Z		(1 << 10)
-#define MAN_SCALE_C		(MAN_SCALE_X | MAN_SCALE_Y | MAN_SCALE_Z)
-
-/* color codes */
-
-#define MAN_RGB     0
-#define MAN_GHOST   1
-#define MAN_MOVECOL 2
-
-/* threshold for testing view aligned manipulator axis */
-#define TW_AXIS_DOT_MIN 0.02f
-#define TW_AXIS_DOT_MAX 0.1f
-
-struct TransformBounds {
-	float center[3];		/* Center for transform widget. */
-	float min[3], max[3];	/* Boundbox of selection for transform widget. */
-};
-
-/* transform widget center calc helper for below */
-static void calc_tw_center(struct TransformBounds *tbounds, const float co[3])
-{
-	minmax_v3v3_v3(tbounds->min, tbounds->max, co);
-	add_v3_v3(tbounds->center, co);
-}
-
-static void protectflag_to_drawflags(short protectflag, short *drawflags)
-{
-	if (protectflag & OB_LOCK_LOCX)
-		*drawflags &= ~MAN_TRANS_X;
-	if (protectflag & OB_LOCK_LOCY)
-		*drawflags &= ~MAN_TRANS_Y;
-	if (protectflag & OB_LOCK_LOCZ)
-		*drawflags &= ~MAN_TRANS_Z;
-
-	if (protectflag & OB_LOCK_ROTX)
-		*drawflags &= ~MAN_ROT_X;
-	if (protectflag & OB_LOCK_ROTY)
-		*drawflags &= ~MAN_ROT_Y;
-	if (protectflag & OB_LOCK_ROTZ)
-		*drawflags &= ~MAN_ROT_Z;
-
-	if (protectflag & OB_LOCK_SCALEX)
-		*drawflags &= ~MAN_SCALE_X;
-	if (protectflag & OB_LOCK_SCALEY)
-		*drawflags &= ~MAN_SCALE_Y;
-	if (protectflag & OB_LOCK_SCALEZ)
-		*drawflags &= ~MAN_SCALE_Z;
-}
-
-/* for pose mode */
-static void protectflag_to_drawflags_pchan(RegionView3D *rv3d, const bPoseChannel *pchan)
-{
-	protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
-}
-
-/* for editmode*/
-static void protectflag_to_drawflags_ebone(RegionView3D *rv3d, const EditBone *ebo)
-{
-	if (ebo->flag & BONE_EDITMODE_LOCKED) {
-		protectflag_to_drawflags(OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE, &rv3d->twdrawflag);
-	}
-}
-
-/* could move into BLI_math however this is only useful for display/editing purposes */
-static void axis_angle_to_gimbal_axis(float gmat[3][3], const float axis[3], const float angle)
-{
-	/* X/Y are arbitrary axies, most importantly Z is the axis of rotation */
-
-	float cross_vec[3];
-	float quat[4];
-
-	/* this is an un-scientific method to get a vector to cross with
-	 * XYZ intentionally YZX */
-	cross_vec[0] = axis[1];
-	cross_vec[1] = axis[2];
-	cross_vec[2] = axis[0];
-
-	/* X-axis */
-	cross_v3_v3v3(gmat[0], cross_vec, axis);
-	normalize_v3(gmat[0]);
-	axis_angle_to_quat(quat, axis, angle);
-	mul_qt_v3(quat, gmat[0]);
-
-	/* Y-axis */
-	axis_angle_to_quat(quat, axis, M_PI_2);
-	copy_v3_v3(gmat[1], gmat[0]);
-	mul_qt_v3(quat, gmat[1]);
-
-	/* Z-axis */
-	copy_v3_v3(gmat[2], axis);
-
-	normalize_m3(gmat);
-}
-
-
-static bool test_rotmode_euler(short rotmode)
-{
-	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0 : 1;
-}
-
-bool gimbal_axis(Object *ob, float gmat[3][3])
-{
-	if (ob->mode & OB_MODE_POSE) {
-		bPoseChannel *pchan = BKE_pose_channel_active(ob);
-
-		if (pchan) {
-			float mat[3][3], tmat[3][3], obmat[3][3];
-			if (test_rotmode_euler(pchan->rotmode)) {
-				eulO_to_gimbal_axis(mat, pchan->eul, pchan->rotmode);
-			}
-			else if (pchan->rotmode == ROT_MODE_AXISANGLE) {
-				axis_angle_to_gimbal_axis(mat, pchan->rotAxis, pchan->rotAngle);
-			}
-			else { /* quat */
-				return 0;
-			}
-
-
-			/* apply bone transformation */
-			mul_m3_m3m3(tmat, pchan->bone->bone_mat, mat);
-
-			if (pchan->parent) {
-				float parent_mat[3][3];
-
-				copy_m3_m4(parent_mat, pchan->parent->pose_mat);
-				mul_m3_m3m3(mat, parent_mat, tmat);
-
-				/* needed if object transformation isn't identity */
-				copy_m3_m4(obmat, ob->obmat);
-				mul_m3_m3m3(gmat, obmat, mat);
-			}
-			else {
-				/* needed if object transformation isn't identity */
-				copy_m3_m4(obmat, ob->obmat);
-				mul_m3_m3m3(gmat, obmat, tmat);
-			}
-
-			normalize_m3(gmat);
-			return 1;
-		}
-	}
-	else {
-		if (test_rotmode_euler(ob->rotmode)) {
-			eulO_to_gimbal_axis(gmat, ob->rot, ob->rotmode);
-		}
-		else if (ob->rotmode == ROT_MODE_AXISANGLE) {
-			axis_angle_to_gimbal_axis(gmat, ob->rotAxis, ob->rotAngle);
-		}
-		else { /* quat */
-			return 0;
-		}
-
-		if (ob->parent) {
-			float parent_mat[3][3];
-			copy_m3_m4(parent_mat, ob->parent->obmat);
-			normalize_m3(parent_mat);
-			mul_m3_m3m3(gmat, parent_mat, gmat);
-		}
-		return 1;
-	}
-
-	return 0;
-}
-
-
-/* centroid, boundbox, of selection */
-/* returns total items selected */
-static int calc_manipulator_stats(const bContext *C, struct TransformBounds *tbounds)
-{
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	View3D *v3d = sa->spacedata.first;
-	RegionView3D *rv3d = ar->regiondata;
-	Base *base;
-	Object *ob = OBACT;
-	bGPdata *gpd = CTX_data_gpencil_data(C);
-	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
-	int a, totsel = 0;
-
-	/* transform widget matrix */
-	unit_m4(rv3d->twmat);
-
-	rv3d->twdrawflag = 0xFFFF;
-
-	/* transform widget centroid/center */
-	INIT_MINMAX(tbounds->min, tbounds->max);
-	zero_v3(tbounds->center);
-
-	if (is_gp_edit) {
-		float diff_mat[4][4];
-		float fpt[3];
-
-		for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
-			/* only editable and visible layers are considered */
-			if (gpencil_layer_is_editable(gpl) && (gpl->actframe != NULL)) {
-
-				/* calculate difference matrix if parent object */
-				if (gpl->parent != NULL) {
-					ED_gpencil_parent_location(gpl, diff_mat);
-				}
-
-				for (bGPDstroke *gps = gpl->actframe->strokes.first; gps; gps = gps->next) {
-					/* skip strokes that are invalid for current view */
-					if (ED_gpencil_stroke_can_use(C, gps) == false) {
-						continue;
-					}
-
-					/* we're only interested in selected points here... */
-					if (gps->flag & GP_STROKE_SELECT) {
-						bGPDspoint *pt;
-						int i;
-
-						/* Change selection status of all points, then make the stroke match */
-						for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
-							if (pt->flag & GP_SPOINT_SELECT) {
-								if (gpl->parent == NULL) {
-									calc_tw_center(tbounds, &pt->x);
-									totsel++;
-								}
-								else {
-									mul_v3_m4v3(fpt, diff_mat, &pt->x);
-									calc_tw_center(tbounds, fpt);
-									totsel++;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-
-		/* selection center */
-		if (totsel) {
-			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);
-		}
-	}
-	else if (obedit) {
-		ob = obedit;
-		if ((ob->lay & v3d->lay) == 0) return 0;
-
-		if (obedit->type == OB_MESH) {
-			BMEditMesh *em = BKE_editmesh_from_object(obedit);
-			BMEditSelection ese;
-			float vec[3] = {0, 0, 0};
-
-			/* USE LAST SELECTE WITH ACTIVE */
-			if ((v3d->around == V3D_AROUND_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) {
-				BM_editselection_center(&ese, vec);
-				calc_tw_center(tbounds, vec);
-				totsel = 1;
-			}
-			else {
-				BMesh *bm = em->bm;
-				BMVert *eve;
-
-				BMIter iter;
-
-				BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-					if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-						if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
-							totsel++;
-							calc_tw_center(tbounds, eve->co);
-						}
-					}
-				}
-			}
-		} /* end editmesh */
-		else if (obedit->type == OB_ARMATURE) {
-			bArmature *arm = obedit->data;
-			EditBone *ebo;
-
-			if ((v3d->around == V3D_AROUND_ACTIVE) && (ebo = arm->act_edbone)) {
-				/* doesn't check selection or visibility intentionally */
-				if (ebo->flag & BONE_TIPSEL) {
-					calc_tw_center(tbounds, ebo->tail);
-					totsel++;
-				}
-				if ((ebo->flag & BONE_ROOTSEL) ||
-				    ((ebo->flag & BONE_TIPSEL) == false))  /* ensure we get at least one point */
-				{
-					calc_tw_center(tbounds, ebo->head);
-					totsel++;
-				}
-				protectflag_to_drawflags_ebone(rv3d, ebo);
-			}
-			else {
-				for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
-					if (EBONE_VISIBLE(arm, ebo)) {
-						if (ebo->flag & BONE_TIPSEL) {
-							calc_tw_center(tbounds, ebo->tail);
-							totsel++;
-						}
-						if ((ebo->flag & BONE_ROOTSEL) &&
-						    /* don't include same point multiple times */
-						    ((ebo->flag & BONE_CONNECTED) &&
-						     (ebo->parent != NULL) &&
-						     (ebo->parent->flag & BONE_TIPSEL) &&
-						     EBONE_VISIBLE(arm, ebo->parent)) == 0)
-						{
-							calc_tw_center(tbounds, ebo->head);
-							totsel++;
-						}
-						if (ebo->flag & BONE_SELECTED) {
-							protectflag_to_drawflags_ebone(rv3d, ebo);
-						}
-					}
-				}
-			}
-		}
-		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu = obedit->data;
-			float center[3];
-
-			if (v3d->around == V3D_AROUND_ACTIVE && ED_curve_active_center(cu, center)) {
-				calc_tw_center(tbounds, center);
-				totsel++;
-			}
-			else {
-				Nurb *nu;
-				BezTriple *bezt;
-				BPoint *bp;
-				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
-
-				nu = nurbs->first;
-				while (nu) {
-					if (nu->type == CU_BEZIER) {
-						bezt = nu->bezt;
-						a = nu->pntsu;
-						while (a--) {
-							/* exceptions
-							 * if handles are hidden then only check the center points.
-							 * If the center knot is selected then only use this as the center point.
-							 */
-							if (cu->drawflag & CU_HIDE_HANDLES) {
-								if (bezt->f2 & SELECT) {
-									calc_tw_center(tbounds, bezt->vec[1]);
-									totsel++;
-								}
-							}
-							else if (bezt->f2 & SELECT) {
-								calc_tw_center(tbounds, bezt->vec[1]);
-								totsel++;
-							}
-							else {
-								if (bezt->f1 & SELECT) {
-									calc_tw_center(
-									        tbounds,
-									        bezt->vec[(v3d->around == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 0]);
-									totsel++;
-								}
-								if (bezt->f3 & SELECT) {
-									calc_tw_center(
-									        tbounds,
-									        bezt->vec[(v3d->around == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 2]);
-									totsel++;
-								}
-							}
-							bezt++;
-						}
-					}
-					else {
-						bp = nu->bp;
-						a = nu->pntsu * nu->pntsv;
-						while (a--) {
-							if (bp->f1 & SELECT) {
-								calc_tw_center(tbounds, bp->vec);
-								totsel++;
-							}
-							bp++;
-						}
-					}
-					nu = nu->next;
-				}
-			}
-		}
-		else if (obedit->type == OB_MBALL) {
-			MetaBall *mb = (MetaBall *)obedit->data;
-			MetaElem *ml;
-
-			if ((v3d->around == V3D_AROUND_ACTIVE) && (ml = mb->lastelem)) {
-				calc_tw_center(tbounds, &ml->x);
-				totsel++;
-			}
-			else {
-				for (ml = mb->editelems->first; ml; ml = ml->next) {
-					if (ml->flag & SELECT) {
-						calc_tw_center(tbounds, &ml->x);
-						totsel++;
-					}
-				}
-			}
-		}
-		else if (obedit->type == OB_LATTICE) {
-			Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
-			BPoint *bp;
-
-			if ((v3d->around == V3D_AROUND_ACTIVE) && (bp = BKE_lattice_active_point_get(lt))) {
-				calc_tw_center(tbounds, bp->vec);
-				totsel++;
-			}
-			else {
-				bp = lt->def;
-				a = lt->pntsu * lt->pntsv * lt->pntsw;
-				while (a--) {
-					if (bp->f1 & SELECT) {
-						calc_tw_center(tbounds, bp->vec);
-						totsel++;
-					}
-					bp++;
-				}
-			}
-		}
-
-		/* selection center */
-		if (totsel) {
-			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);
-			mul_m4_v3(obedit->obmat, tbounds->center);
-			mul_m4_v3(obedit->obmat, tbounds->min);
-			mul_m4_v3(obedit->obmat, tbounds->max);
-		}
-	}
-	else if (ob && (ob->mode & OB_MODE_POSE)) {
-		bPoseChannel *pchan;
-		int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed
-		bool ok = false;
-
-		if ((ob->lay & v3d->lay) == 0) return 0;
-
-		if ((v3d->around == V3D_AROUND_ACTIVE) && (pchan = BKE_pose_channel_active(ob))) {
-			/* doesn't check selection or visibility intentionally */
-			Bone *bone = pchan->bone;
-			if (bone) {
-				calc_tw_center(tbounds, pchan->pose_head);
-				protectflag_to_drawflags_pchan(rv3d, pchan);
-				totsel = 1;
-				ok = true;
-			}
-		}
-		else {
-			totsel = count_set_pose_transflags(&mode, 0, ob);
-
-			if (totsel) {
-				/* use channels to get stats */
-				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-					Bone *bone = pchan->bone;
-					if (bone && (bone->flag & BONE_TRANSFORM)) {
-						calc_tw_center(tbounds, pchan->pose_head);
-						protectflag_to_drawflags_pchan(rv3d, pchan);
-					}
-				}
-				ok = true;
-			}
-		}
-
-		if (ok) {
-			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);
-			mul_m4_v3(ob->obmat, tbounds->center);
-			mul_m4_v3(ob->obmat, tbounds->min);
-			mul_m4_v3(ob->obmat, tbounds->max);
-		}
-	}
-	else if (ob && (ob->mode & OB_MODE_ALL_PAINT)) {
-		/* pass */
-	}
-	else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
-		PTCacheEdit *edit = PE_get_current(scene, ob);
-		PTCacheEditPoint *point;
-		PTCacheEditKey *ek;
-		int k;
-
-		if (edit) {
-			point = edit->points;
-			for (a = 0; a < edit->totpoint; a++, point++) {
-				if (point->flag & PEP_HIDE) continue;
-
-				for (k = 0, ek = point->keys; k < point->totkey; k++, ek++) {
-					if (ek->flag & PEK_SELECT) {
-						calc_tw_center(tbounds, (ek->flag & PEK_USE_WCO) ? ek->world_co : ek->co);
-						totsel++;
-					}
-				}
-			}
-
-			/* selection center */
-			if (totsel)
-				mul_v3_fl(tbounds->center, 1.0f / (float)totsel);
-		}
-	}
-	else {
-
-		/* we need the one selected object, if its not active */
-		ob = OBACT;
-		if (ob && !(ob->flag & SELECT)) ob = NULL;
-
-		for (base = scene->base.first; base; base = base->next) {
-			if (TESTBASELIB(v3d, base)) {
-				if (ob == NULL)
-					ob = base->object;
-				calc_tw_center(tbounds, base->object->obmat[3]);
-				protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
-				totsel++;
-			}
-		}
-
-		/* selection center */
-		if (totsel) {
-			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);
-		}
-	}
-
-	/* global, local or normal orientation? */
-	if (ob && totsel && !is_gp_edit) {
-
-		switch (v3d->twmode) {
-
-			case V3D_MANIP_GLOBAL:
-			{
-				break; /* nothing to do */
-			}
-			case V3D_MANIP_GIMBAL:
-			{
-				float mat[3][3];
-				if (gimbal_axis(ob, mat)) {
-					copy_m4_m3(rv3d->twmat, mat);
-					break;
-				}
-				/* if not gimbal, fall through to normal */
-				ATTR_FALLTHROUGH;
-			}
-			case V3D_MANIP_NORMAL:
-			{
-				if (obedit || ob->mode & OB_MODE_POSE) {
-					float mat[3][3];
-					ED_getTransformOrientationMatrix(C, mat, v3d->around);
-					copy_m4_m3(rv3d->twmat, mat);
-					break;
-				}
-				/* no break we define 'normal' as 'local' in Object mode */
-				ATTR_FALLTHROUGH;
-			}
-			case V3D_MANIP_LOCAL:
-			{
-				if (ob->mode & OB_MODE_POSE) {
-					/* each bone moves on its own local axis, but  to avoid confusion,
-					 * use the active pones axis for display [#33575], this works as expected on a single bone
-					 * and users who select many bones will understand whats going on and what local means
-					 * when they start transforming */
-					float mat[3][3];
-					ED_getTransformOrientationMatrix(C, mat, v3d->around);
-					copy_m4_m3(rv3d->twmat, mat);
-					break;
-				}
-				copy_m4_m4(rv3d->twmat, ob->obmat);
-				normalize_m4(rv3d->twmat);
-				break;
-			}
-			case V3D_MANIP_VIEW:
-			{
-				float mat[3][3];
-				copy_m3_m4(mat, rv3d->viewinv);
-				normalize_m3(mat);
-				copy_m4_m3(rv3d->twmat, mat);
-				break;
-			}
-			default: /* V3D_MANIP_CUSTOM */
-			{
-				float mat[3][3];
-				if (applyTransformOrientation(C, mat, NULL, v3d->twmode - V3D_MANIP_CUSTOM)) {
-					copy_m4_m3(rv3d->twmat, mat);
-				}
-				break;
-			}
-		}
-
-	}
-
-	return totsel;
-}
-
-/* don't draw axis perpendicular to the view */
-static void test_manipulator_axis(const bContext *C)
-{
-	RegionView3D *rv3d = CTX_wm_region_view3d(C);
-	float view_vec[3], axis_vec[3];
-	float idot;
-	int i;
-
-	const int twdrawflag_axis[3] = {
-	    (MAN_TRANS_X | MAN_SCALE_X),
-	    (MAN_TRANS_Y | MAN_SCALE_Y),
-	    (MAN_TRANS_Z | MAN_SCALE_Z)};
-
-	ED_view3d_global_to_vector(rv3d, rv3d->twmat[3], view_vec);
-
-	for (i = 0; i < 3; i++) {
-		normalize_v3_v3(axis_vec, rv3d->twmat[i]);
-		rv3d->tw_idot[i] = idot = 1.0f - fabsf(dot_v3v3(view_vec, axis_vec));
-		if (idot < TW_AXIS_DOT_MIN) {
-			rv3d->twdrawflag &= ~twdrawflag_axis[i];
-		}
-	}
-}
-
-
-/* ******************** DRAWING STUFFIES *********** */
-
-static float screen_aligned(RegionView3D *rv3d, float mat[4][4])
-{
-	glTranslate3fv(mat[3]);
-
-	/* sets view screen aligned */
-	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
-
-	return len_v3(mat[0]); /* draw scale */
-}
-
-
-/**
- * \param radring: Radius of doughnut rings.
- * \param radhole: Radius hole.
- * \param start: Starting segment (based on \a nrings).
- * \param end: End segment.
- * \param nsides: Number of points in ring.
- * \param nrings: Number of rings.
- */
-static void partial_doughnut(float radring, float radhole, int start, int end, int nsides, int nrings)
-{
-	float theta, phi, theta1;
-	float cos_theta, sin_theta;
-	float cos_theta1, sin_theta1;
-	float ring_delta, side_delta;
-	int i, j, do_caps = true;
-
-	if (start == 0 && end == nrings) do_caps = false;
-
-	ring_delta = 2.0f * (float)M_PI / (float)nrings;
-	side_delta = 2.0f * (float)M_PI / (float)nsides;
-
-	theta = (float)M_PI + 0.5f * ring_delta;
-	cos_theta = cosf(theta);
-	sin_theta = sinf(theta);
-
-	for (i = nrings - 1; i >= 0; i--) {
-		theta1 = theta + ring_delta;
-		cos_theta1 = cosf(theta1);
-		sin_theta1 = sinf(theta1);
-
-		if (do_caps && i == start) {  // cap
-			glBegin(GL_POLYGON);
-			phi = 0.0;
-			for (j = nsides; j >= 0; j--) {
-				float cos_phi, sin_phi, dist;
-
-				phi += side_delta;
-				cos_phi = cosf(phi);
-				sin_phi = sinf(phi);
-				dist = radhole + radring * cos_phi;
-
-				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist,  radring * sin_phi);
-			}
-			glEnd();
-		}
-		if (i >= start && i <= end) {
-			glBegin(GL_QUAD_STRIP);
-			phi = 0.0;
-			for (j = nsides; j >= 0; j--) {
-				float cos_phi, sin_phi, dist;
-
-				phi += side_delta;
-				cos_phi = cosf(phi);
-				sin_phi = sinf(phi);
-				dist = radhole + radring * cos_phi;
-
-				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist, radring * sin_phi);
-				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
-			}
-			glEnd();
-		}
-
-		if (do_caps && i == end) {    // cap
-			glBegin(GL_POLYGON);
-			phi = 0.0;
-			for (j = nsides; j >= 0; j--) {
-				float cos_phi, sin_phi, dist;
-
-				phi -= side_delta;
-				cos_phi = cosf(phi);
-				sin_phi = sinf(phi);
-				dist = radhole + radring * cos_phi;
-
-				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
-			}
-			glEnd();
-		}
-
-
-		theta = theta1;
-		cos_theta = cos_theta1;
-		sin_theta = sin_theta1;
-	}
-}
-
-static char axisBlendAngle(float idot)
-{
-	if (idot > TW_AXIS_DOT_MAX) {
-		return 255;
-	}
-	else if (idot < TW_AXIS_DOT_MIN) {
-		return 0;
-	}
-	else {
-		return (char)(255.0f * (idot - TW_AXIS_DOT_MIN) / (TW_AXIS_DOT_MAX - TW_AXIS_DOT_MIN));
-	}
-}
-
-/* three colors can be set:
- * gray for ghosting
- * moving: in transform theme color
- * else the red/green/blue
- */
-static void manipulator_setcolor(View3D *v3d, char axis, int colcode, unsigned char alpha)
-{
-	unsigned char col[4] = {0};
-	col[3] = alpha;
-
-	if (colcode == MAN_GHOST) {
-		col[3] = 70;
-	}
-	else if (colcode == MAN_MOVECOL) {
-		UI_GetThemeColor3ubv(TH_TRANSFORM, col);
-	}
-	else {
-		switch (axis) {
-			case 'C':
-				UI_GetThemeColor3ubv(TH_TRANSFORM, col);
-				if (v3d->twmode == V3D_MANIP_LOCAL) {
-					col[0] = col[0] > 200 ? 255 : col[0] + 55;
-					col[1] = col[1] > 200 ? 255 : col[1] + 55;
-					col[2] = col[2] > 200 ? 255 : col[2] + 55;
-				}
-				else if (v3d->twmode == V3D_MANIP_NORMAL) {
-					col[0] = col[0] < 55 ? 0 : col[0] - 55;
-					col[1] = col[1] < 55 ? 0 : col[1] - 55;
-					col[2] = col[2] < 55 ? 0 : col[2] - 55;
-				}
-				break;
-			case 'X':
-				UI_GetThemeColor3ubv(TH_AXIS_X, col);
-				break;
-			case 'Y':
-				UI_GetThemeColor3ubv(TH_AXIS_Y, col);
-				break;
-			case 'Z':
-				UI_GetThemeColor3ubv(TH_AXIS_Z, col);
-				break;
-			default:
-				BLI_assert(0);
-				break;
-		}
-	}
-
-	glColor4ubv(col);
-}
-
-static void manipulator_axis_order(RegionView3D *rv3d, int r_axis_order[3])
-{
-	float axis_values[3];
-	float vec[3];
-
-	ED_view3d_global_to_vector(rv3d, rv3d->twmat[3], vec);
-
-	axis_values[0] = -dot_v3v3(rv3d->twmat[0], vec);
-	axis_values[1] = -dot_v3v3(rv3d->twmat[1], vec);
-	axis_values[2] = -dot_v3v3(rv3d->twmat[2], vec);
-
-	axis_sort_v3(axis_values, r_axis_order);
-}
-
-/* viewmatrix should have been set OK, also no shademode! */
-static void draw_manipulator_axes_single(View3D *v3d, RegionView3D *rv3d, int colcode,
-                                         int flagx, int flagy, int flagz, int axis,
-                                         const bool is_picksel)
-{
-	switch (axis) {
-		case 0:
-			/* axes */
-			if (flagx) {
-				if (is_picksel) {
-					if      (flagx & MAN_SCALE_X) GPU_select_load_id(MAN_SCALE_X);
-					else if (flagx & MAN_TRANS_X) GPU_select_load_id(MAN_TRANS_X);
-				}
-				else {
-					manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->tw_idot[0]));
-				}
-				glBegin(GL_LINES);
-				glVertex3f(0.2f, 0.0f, 0.0f);
-				glVertex3f(1.0f, 0.0f, 0.0f);
-				glEnd();
-			}
-			break;
-		case 1:
-			if (flagy) {
-				if (is_picksel) {
-					if      (flagy & MAN_SCALE_Y) GPU_select_load_id(MAN_SCALE_Y);
-					else if (flagy & MAN_TRANS_Y) GPU_select_load_id(MAN_TRANS_Y);
-				}
-				else {
-					manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->tw_idot[1]));
-				}
-				glBegin(GL_LINES);
-				glVertex3f(0.0f, 0.2f, 0.0f);
-				glVertex3f(0.0f, 1.0f, 0.0f);
-				glEnd();
-			}
-			break;
-		case 2:
-			if (flagz) {
-				if (is_picksel) {
-					if      (flagz & MAN_SCALE_Z) GPU_select_load_id(MAN_SCALE_Z);
-					else if (flagz & MAN_TRANS_Z) GPU_select_load_id(MAN_TRANS_Z);
-				}
-				else {
-					manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->tw_idot[2]));
-				}
-				glBegin(GL_LINES);
-				glVertex3f(0.0f, 0.0f, 0.2f);
-				glVertex3f(0.0f, 0.0f, 1.0f);
-				glEnd();
-			}
-			break;
-	}
-}
-static void draw_manipulator_axes(View3D *v3d, RegionView3D *rv3d, int colcode,
-                                  int flagx, int flagy, int flagz,
-                                  const int axis_order[3], const bool is_picksel)
-{
-	int i;
-	for (i = 0; i < 3; i++) {
-		draw_manipulator_axes_single(v3d, rv3d, colcode, flagx, flagy, flagz, axis_order[i], is_picksel);
-	}
-}
-
-static void preOrthoFront(const bool ortho, float twmat[4][4], int axis)
-{
-	if (ortho == false) {
-		float omat[4][4];
-		copy_m4_m4(omat, twmat);
-		orthogonalize_m4(omat, axis);
-		glPushMatrix();
-		glMultMatrixf(omat);
-		glFrontFace(is_negative_m4(omat) ? GL_CW : GL_CCW);
-	}
-}
-
-static void postOrtho(const bool ortho)
-{
-	if (ortho == false) {
-		glPopMatrix();
-	}
-}
-
-BLI_INLINE bool manipulator_rotate_is_visible(const int drawflags)
-{
-	return (drawflags & (MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z));
-}
-
-static void draw_manipulator_rotate(
-        View3D *v3d, RegionView3D *rv3d, const int drawflags, const int combo,
-        const bool is_moving, const bool is_picksel)
-{
-	double plane[4];
-	float matt[4][4];
-	float size, unitmat[4][4];
-	float cywid = 0.33f * 0.01f * (float)U.tw_handlesize;
-	float cusize = cywid * 0.65f;
-	int arcs = (G.debug_value != 2);
-	const int colcode = (is_moving) ? MAN_MOVECOL : MAN_RGB;
-	bool ortho;
-
-	/* skip drawing if all axes are locked */
-	if (manipulator_rotate_is_visible(drawflags) == false) return;
-
-	/* Init stuff */
-	glDisable(GL_DEPTH_TEST);
-	unit_m4(unitmat);
-
-	/* prepare for screen aligned draw */
-	size = len_v3(rv3d->twmat[0]);
-	glPushMatrix();
-	glTranslate3fv(rv3d->twmat[3]);
-
-	if (arcs) {
-		/* clipplane makes nice handles, calc here because of multmatrix but with translate! */
-		copy_v3db_v3fl(plane, rv3d->viewinv[2]);
-		plane[3] = -0.02f * size; // clip just a bit more
-		glClipPlane(GL_CLIP_PLANE0, plane);
-	}
-	/* sets view screen aligned */
-	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
-
-	/* Screen aligned help circle */
-	if (arcs) {
-		if (is_picksel == false) {
-			UI_ThemeColorShade(TH_BACK, -30);
-			drawcircball(GL_LINE_LOOP, unitmat[3], size, unitmat);
-		}
-	}
-
-	/* Screen aligned trackball rot circle */
-	if (drawflags & MAN_ROT_T) {
-		if (is_picksel) GPU_select_load_id(MAN_ROT_T);
-		else UI_ThemeColor(TH_TRANSFORM);
-
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
-	}
-
-	/* Screen aligned view rot circle */
-	if (drawflags & MAN_ROT_V) {
-		if (is_picksel) GPU_select_load_id(MAN_ROT_V);
-		else UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
-
-		if (is_moving) {
-			float vec[3];
-			vec[0] = 0; // XXX (float)(t->mouse.imval[0] - t->center2d[0]);
-			vec[1] = 0; // XXX (float)(t->mouse.imval[1] - t->center2d[1]);
-			vec[2] = 0.0f;
-			normalize_v3_length(vec, 1.2f * size);
-			glBegin(GL_LINES);
-			glVertex3f(0.0f, 0.0f, 0.0f);
-			glVertex3fv(vec);
-			glEnd();
-		}
-	}
-	glPopMatrix();
-
-
-	ortho = is_orthogonal_m4(rv3d->twmat);
-
-	/* apply the transform delta */
-	if (is_moving) {
-		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
-		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
-		if (ortho) {
-			glMultMatrixf(matt);
-			glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
-		}
-	}
-	else {
-		if (ortho) {
-			glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
-			glMultMatrixf(rv3d->twmat);
-		}
-	}
-
-	/* axes */
-	if (arcs == 0) {
-		if (!is_picksel) {
-			if ((combo & V3D_MANIP_SCALE) == 0) {
-				/* axis */
-				if ((drawflags & MAN_ROT_X) || (is_moving && (drawflags & MAN_ROT_Z))) {
-					preOrthoFront(ortho, rv3d->twmat, 2);
-					manipulator_setcolor(v3d, 'X', colcode, 255);
-					glBegin(GL_LINES);
-					glVertex3f(0.2f, 0.0f, 0.0f);
-					glVertex3f(1.0f, 0.0f, 0.0f);
-					glEnd();
-					postOrtho(ortho);
-				}
-				if ((drawflags & MAN_ROT_Y) || (is_moving && (drawflags & MAN_ROT_X))) {
-					preOrthoFront(ortho, rv3d->twmat, 0);
-					manipulator_setcolor(v3d, 'Y', colcode, 255);
-					glBegin(GL_LINES);
-					glVertex3f(0.0f, 0.2f, 0.0f);
-					glVertex3f(0.0f, 1.0f, 0.0f);
-					glEnd();
-					postOrtho(ortho);
-				}
-				if ((drawflags & MAN_ROT_Z) || (is_moving && (drawflags & MAN_ROT_Y))) {
-					preOrthoFront(ortho, rv3d->twmat, 1);
-					manipulator_setcolor(v3d, 'Z', colcode, 255);
-					glBegin(GL_LINES);
-					glVertex3f(0.0f, 0.0f, 0.2f);
-					glVertex3f(0.0f, 0.0f, 1.0f);
-					glEnd();
-					postOrtho(ortho);
-				}
-			}
-		}
-	}
-
-	if (arcs == 0 && is_moving) {
-
-		/* Z circle */
-		if (drawflags & MAN_ROT_Z) {
-			preOrthoFront(ortho, matt, 2);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Z);
-			else manipulator_setcolor(v3d, 'Z', colcode, 255);
-			drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
-			postOrtho(ortho);
-		}
-		/* X circle */
-		if (drawflags & MAN_ROT_X) {
-			preOrthoFront(ortho, matt, 0);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_X);
-			else manipulator_setcolor(v3d, 'X', colcode, 255);
-			glRotatef(90.0, 0.0, 1.0, 0.0);
-			drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
-			glRotatef(-90.0, 0.0, 1.0, 0.0);
-			postOrtho(ortho);
-		}
-		/* Y circle */
-		if (drawflags & MAN_ROT_Y) {
-			preOrthoFront(ortho, matt, 1);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Y);
-			else manipulator_setcolor(v3d, 'Y', colcode, 255);
-			glRotatef(-90.0, 1.0, 0.0, 0.0);
-			drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
-			glRotatef(90.0, 1.0, 0.0, 0.0);
-			postOrtho(ortho);
-		}
-	}
-	// donut arcs
-	if (arcs) {
-		glEnable(GL_CLIP_PLANE0);
-
-		/* Z circle */
-		if (drawflags & MAN_ROT_Z) {
-			preOrthoFront(ortho, rv3d->twmat, 2);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Z);
-			else manipulator_setcolor(v3d, 'Z', colcode, 255);
-			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
-			postOrtho(ortho);
-		}
-		/* X circle */
-		if (drawflags & MAN_ROT_X) {
-			preOrthoFront(ortho, rv3d->twmat, 0);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_X);
-			else manipulator_setcolor(v3d, 'X', colcode, 255);
-			glRotatef(90.0, 0.0, 1.0, 0.0);
-			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
-			glRotatef(-90.0, 0.0, 1.0, 0.0);
-			postOrtho(ortho);
-		}
-		/* Y circle */
-		if (drawflags & MAN_ROT_Y) {
-			preOrthoFront(ortho, rv3d->twmat, 1);
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Y);
-			else manipulator_setcolor(v3d, 'Y', colcode, 255);
-			glRotatef(-90.0, 1.0, 0.0, 0.0);
-			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
-			glRotatef(90.0, 1.0, 0.0, 0.0);
-			postOrtho(ortho);
-		}
-
-		glDisable(GL_CLIP_PLANE0);
-	}
-
-	if (arcs == 0) {
-
-		/* Z handle on X axis */
-		if (drawflags & MAN_ROT_Z) {
-			preOrthoFront(ortho, rv3d->twmat, 2);
-			glPushMatrix();
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Z);
-			else manipulator_setcolor(v3d, 'Z', colcode, 255);
-
-			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
-
-			glPopMatrix();
-			postOrtho(ortho);
-		}
-
-		/* Y handle on X axis */
-		if (drawflags & MAN_ROT_Y) {
-			preOrthoFront(ortho, rv3d->twmat, 1);
-			glPushMatrix();
-			if (is_picksel) GPU_select_load_id(MAN_ROT_Y);
-			else manipulator_setcolor(v3d, 'Y', colcode, 255);
-
-			glRotatef(90.0, 1.0, 0.0, 0.0);
-			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
-
-			glPopMatrix();
-			postOrtho(ortho);
-		}
-
-		/* X handle on Z axis */
-		if (drawflags & MAN_ROT_X) {
-			preOrthoFront(ortho, rv3d->twmat, 0);
-			glPushMatrix();
-			if (is_picksel) GPU_select_load_id(MAN_ROT_X);
-			else manipulator_setcolor(v3d, 'X', colcode, 255);
-
-			glRotatef(-90.0, 0.0, 1.0, 0.0);
-			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
-
-			glPopMatrix();
-			postOrtho(ortho);
-		}
-
-	}
-
-	/* restore */
-	glLoadMatrixf(rv3d->viewmat);
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-}
-
-static void drawsolidcube(float size)
-{
-	const float cube[8][3] = {
-		{-1.0, -1.0, -1.0},
-		{-1.0, -1.0,  1.0},
-		{-1.0,  1.0,  1.0},
-		{-1.0,  1.0, -1.0},
-		{ 1.0, -1.0, -1.0},
-		{ 1.0, -1.0,  1.0},
-		{ 1.0,  1.0,  1.0},
-		{ 1.0,  1.0, -1.0},
-	};
-	float n[3] = {0.0f};
-
-	glPushMatrix();
-	glScalef(size, size, size);
-
-	glBegin(GL_QUADS);
-	n[0] = -1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-	n[0] = 0;
-	glEnd();
-
-	glBegin(GL_QUADS);
-	n[1] = -1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
-	n[1] = 0;
-	glEnd();
-
-	glBegin(GL_QUADS);
-	n[0] = 1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
-	n[0] = 0;
-	glEnd();
-
-	glBegin(GL_QUADS);
-	n[1] = 1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
-	n[1] = 0;
-	glEnd();
-
-	glBegin(GL_QUADS);
-	n[2] = 1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
-	n[2] = 0;
-	glEnd();
-
-	glBegin(GL_QUADS);
-	n[2] = -1.0;
-	glNormal3fv(n);
-	glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
-	glEnd();
-
-	glPopMatrix();
-}
-
-
-static void draw_manipulator_scale(
-        View3D *v3d, RegionView3D *rv3d, const int drawflags, const int combo, const int colcode,
-        const bool is_moving, const bool is_picksel)
-{
-	float cywid = 0.25f * 0.01f * (float)U.tw_handlesize;
-	float cusize = cywid * 0.75f, dz;
-	int axis_order[3] = {2, 0, 1};
-	int i;
-
-	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_SCALE_C) == 0) return;
-
-	manipulator_axis_order(rv3d, axis_order);
-
-	glDisable(GL_DEPTH_TEST);
-
-	/* not in combo mode */
-	if ((combo & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE)) == 0) {
-		float size, unitmat[4][4];
-		int shift = 0; // XXX
-
-		/* center circle, do not add to selection when shift is pressed (planar constraint)  */
-		if (is_picksel && shift == 0) GPU_select_load_id(MAN_SCALE_C);
-		else manipulator_setcolor(v3d, 'C', colcode, 255);
-
-		glPushMatrix();
-		size = screen_aligned(rv3d, rv3d->twmat);
-		unit_m4(unitmat);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
-		glPopMatrix();
-
-		dz = 1.0;
-	}
-	else {
-		dz = 1.0f - 4.0f * cusize;
-	}
-
-	if (is_moving) {
-		float matt[4][4];
-
-		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
-		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
-		glMultMatrixf(matt);
-		glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
-	}
-	else {
-		glMultMatrixf(rv3d->twmat);
-		glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
-	}
-
-	/* axis */
-
-	/* in combo mode, this is always drawn as first type */
-	draw_manipulator_axes(v3d, rv3d, colcode,
-	                      drawflags & MAN_SCALE_X, drawflags & MAN_SCALE_Y, drawflags & MAN_SCALE_Z,
-	                      axis_order, is_picksel);
-
-
-	for (i = 0; i < 3; i++) {
-		switch (axis_order[i]) {
-			case 0: /* X cube */
-				if (drawflags & MAN_SCALE_X) {
-					glTranslatef(dz, 0.0, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_SCALE_X);
-					else manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->tw_idot[0]));
-					drawsolidcube(cusize);
-					glTranslatef(-dz, 0.0, 0.0);
-				}
-				break;
-			case 1: /* Y cube */
-				if (drawflags & MAN_SCALE_Y) {
-					glTranslatef(0.0, dz, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_SCALE_Y);
-					else manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->tw_idot[1]));
-					drawsolidcube(cusize);
-					glTranslatef(0.0, -dz, 0.0);
-				}
-				break;
-			case 2: /* Z cube */
-				if (drawflags & MAN_SCALE_Z) {
-					glTranslatef(0.0, 0.0, dz);
-					if (is_picksel) GPU_select_load_id(MAN_SCALE_Z);
-					else manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->tw_idot[2]));
-					drawsolidcube(cusize);
-					glTranslatef(0.0, 0.0, -dz);
-				}
-				break;
-		}
-	}
-
-#if 0 // XXX
-	/* if shiftkey, center point as last, for selectbuffer order */
-	if (is_picksel) {
-		int shift = 0; // XXX
-
-		if (shift) {
-			glTranslatef(0.0, -dz, 0.0);
-			GPU_select_load_id(MAN_SCALE_C);
-			/* TODO: set glPointSize before drawing center point */
-			glBegin(GL_POINTS);
-			glVertex3f(0.0, 0.0, 0.0);
-			glEnd();
-		}
-	}
-#endif
-
-	/* restore */
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-	glFrontFace(GL_CCW);
-}
-
-
-static void draw_cone(GLUquadricObj *qobj, float len, float width)
-{
-	glTranslatef(0.0, 0.0, -0.5f * len);
-	gluCylinder(qobj, width, 0.0, len, 8, 1);
-	gluQuadricOrientation(qobj, GLU_INSIDE);
-	gluDisk(qobj, 0.0, width, 8, 1);
-	gluQuadricOrientation(qobj, GLU_OUTSIDE);
-	glTranslatef(0.0, 0.0, 0.5f * len);
-}
-
-static void draw_cylinder(GLUquadricObj *qobj, float len, float width)
-{
-
-	width *= 0.8f;   // just for beauty
-
-	glTranslatef(0.0, 0.0, -0.5f * len);
-	gluCylinder(qobj, width, width, len, 8, 1);
-	gluQuadricOrientation(qobj, GLU_INSIDE);
-	gluDisk(qobj, 0.0, width, 8, 1);
-	gluQuadricOrientation(qobj, GLU_OUTSIDE);
-	glTranslatef(0.0, 0.0, len);
-	gluDisk(qobj, 0.0, width, 8, 1);
-	glTranslatef(0.0, 0.0, -0.5f * len);
-}
-
-
-static void draw_manipulator_translate(
-        View3D *v3d, RegionView3D *rv3d, int drawflags, int combo, int colcode,
-        const bool UNUSED(is_moving), const bool is_picksel)
-{
-	GLUquadricObj *qobj;
-	float cylen = 0.01f * (float)U.tw_handlesize;
-	float cywid = 0.25f * cylen, dz, size;
-	float unitmat[4][4];
-	int shift = 0; // XXX
-	int axis_order[3] = {0, 1, 2};
-	int i;
-
-	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_TRANS_C) == 0) return;
-
-	manipulator_axis_order(rv3d, axis_order);
-
-	// XXX if (moving) glTranslate3fv(t->vec);
-	glDisable(GL_DEPTH_TEST);
-
-	/* center circle, do not add to selection when shift is pressed (planar constraint) */
-	if (is_picksel && shift == 0) GPU_select_load_id(MAN_TRANS_C);
-	else manipulator_setcolor(v3d, 'C', colcode, 255);
-
-	glPushMatrix();
-	size = screen_aligned(rv3d, rv3d->twmat);
-	unit_m4(unitmat);
-	drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
-	glPopMatrix();
-
-	/* and now apply matrix, we move to local matrix drawing */
-	glMultMatrixf(rv3d->twmat);
-
-	/* axis */
-	GPU_select_load_id(-1);
-
-	// translate drawn as last, only axis when no combo with scale, or for ghosting
-	if ((combo & V3D_MANIP_SCALE) == 0 || colcode == MAN_GHOST) {
-		draw_manipulator_axes(v3d, rv3d, colcode,
-		                      drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z,
-		                      axis_order, is_picksel);
-	}
-
-
-	/* offset in combo mode, for rotate a bit more */
-	if (combo & (V3D_MANIP_ROTATE)) dz = 1.0f + 2.0f * cylen;
-	else if (combo & (V3D_MANIP_SCALE)) dz = 1.0f + 0.5f * cylen;
-	else dz = 1.0f;
-
-	qobj = gluNewQuadric();
-	gluQuadricDrawStyle(qobj, GLU_FILL);
-
-	for (i = 0; i < 3; i++) {
-		switch (axis_order[i]) {
-			case 0: /* Z Cone */
-				if (drawflags & MAN_TRANS_Z) {
-					glTranslatef(0.0, 0.0, dz);
-					if (is_picksel) GPU_select_load_id(MAN_TRANS_Z);
-					else manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->tw_idot[2]));
-					draw_cone(qobj, cylen, cywid);
-					glTranslatef(0.0, 0.0, -dz);
-				}
-				break;
-			case 1: /* X Cone */
-				if (drawflags & MAN_TRANS_X) {
-					glTranslatef(dz, 0.0, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_TRANS_X);
-					else manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->tw_idot[0]));
-					glRotatef(90.0, 0.0, 1.0, 0.0);
-					draw_cone(qobj, cylen, cywid);
-					glRotatef(-90.0, 0.0, 1.0, 0.0);
-					glTranslatef(-dz, 0.0, 0.0);
-				}
-				break;
-			case 2: /* Y Cone */
-				if (drawflags & MAN_TRANS_Y) {
-					glTranslatef(0.0, dz, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_TRANS_Y);
-					else manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->tw_idot[1]));
-					glRotatef(-90.0, 1.0, 0.0, 0.0);
-					draw_cone(qobj, cylen, cywid);
-					glRotatef(90.0, 1.0, 0.0, 0.0);
-					glTranslatef(0.0, -dz, 0.0);
-				}
-				break;
-		}
-	}
-
-	gluDeleteQuadric(qobj);
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-}
-
-static void draw_manipulator_rotate_cyl(
-        View3D *v3d, RegionView3D *rv3d, int drawflags, const int combo, const int colcode,
-        const bool is_moving, const bool is_picksel)
-{
-	GLUquadricObj *qobj;
-	float size;
-	float cylen = 0.01f * (float)U.tw_handlesize;
-	float cywid = 0.25f * cylen;
-	int axis_order[3] = {2, 0, 1};
-	int i;
-
-	/* skip drawing if all axes are locked */
-	if (manipulator_rotate_is_visible(drawflags) == false) return;
-
-	manipulator_axis_order(rv3d, axis_order);
-
-	/* prepare for screen aligned draw */
-	glPushMatrix();
-	size = screen_aligned(rv3d, rv3d->twmat);
-
-	glDisable(GL_DEPTH_TEST);
-
-	qobj = gluNewQuadric();
-
-	/* Screen aligned view rot circle */
-	if (drawflags & MAN_ROT_V) {
-		float unitmat[4][4];
-
-		unit_m4(unitmat);
-
-		if (is_picksel) GPU_select_load_id(MAN_ROT_V);
-		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
-
-		if (is_moving) {
-			float vec[3];
-			vec[0] = 0; // XXX (float)(t->mouse.imval[0] - t->center2d[0]);
-			vec[1] = 0; // XXX (float)(t->mouse.imval[1] - t->center2d[1]);
-			vec[2] = 0.0f;
-			normalize_v3_length(vec, 1.2f * size);
-			glBegin(GL_LINES);
-			glVertex3f(0.0, 0.0, 0.0);
-			glVertex3fv(vec);
-			glEnd();
-		}
-	}
-	glPopMatrix();
-
-	/* apply the transform delta */
-	if (is_moving) {
-		float matt[4][4];
-		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
-		// XXX      if (t->flag & T_USES_MANIPULATOR) {
-		// XXX          mul_m4_m3m4(matt, t->mat, rv3d->twmat);
-		// XXX }
-		glMultMatrixf(matt);
-	}
-	else {
-		glMultMatrixf(rv3d->twmat);
-	}
-
-	glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
-
-	/* axis */
-	if (is_picksel == false) {
-
-		// only draw axis when combo didn't draw scale axes
-		if ((combo & V3D_MANIP_SCALE) == 0) {
-			draw_manipulator_axes(v3d, rv3d, colcode,
-			                      drawflags & MAN_ROT_X, drawflags & MAN_ROT_Y, drawflags & MAN_ROT_Z,
-			                      axis_order, is_picksel);
-		}
-
-		/* only has to be set when not in picking */
-		gluQuadricDrawStyle(qobj, GLU_FILL);
-	}
-
-	for (i = 0; i < 3; i++) {
-		switch (axis_order[i]) {
-			case 0: /* X cylinder */
-				if (drawflags & MAN_ROT_X) {
-					glTranslatef(1.0, 0.0, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_ROT_X);
-					glRotatef(90.0, 0.0, 1.0, 0.0);
-					manipulator_setcolor(v3d, 'X', colcode, 255);
-					draw_cylinder(qobj, cylen, cywid);
-					glRotatef(-90.0, 0.0, 1.0, 0.0);
-					glTranslatef(-1.0, 0.0, 0.0);
-				}
-				break;
-			case 1: /* Y cylinder */
-				if (drawflags & MAN_ROT_Y) {
-					glTranslatef(0.0, 1.0, 0.0);
-					if (is_picksel) GPU_select_load_id(MAN_ROT_Y);
-					glRotatef(-90.0, 1.0, 0.0, 0.0);
-					manipulator_setcolor(v3d, 'Y', colcode, 255);
-					draw_cylinder(qobj, cylen, cywid);
-					glRotatef(90.0, 1.0, 0.0, 0.0);
-					glTranslatef(0.0, -1.0, 0.0);
-				}
-				break;
-			case 2: /* Z cylinder */
-				if (drawflags & MAN_ROT_Z) {
-					glTranslatef(0.0, 0.0, 1.0);
-					if (is_picksel) GPU_select_load_id(MAN_ROT_Z);
-					manipulator_setcolor(v3d, 'Z', colcode, 255);
-					draw_cylinder(qobj, cylen, cywid);
-					glTranslatef(0.0, 0.0, -1.0);
-				}
-				break;
-		}
-	}
-
-	/* restore */
-
-	gluDeleteQuadric(qobj);
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
-}
-
-
-/* ********************************************* */
-
-/* main call, does calc centers & orientation too */
-static int drawflags = 0xFFFF;       // only for the calls below, belongs in scene...?
-
-void BIF_draw_manipulator(const bContext *C)
-{
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
-	Scene *scene = CTX_data_scene(C);
-	View3D *v3d = sa->spacedata.first;
-	RegionView3D *rv3d = ar->regiondata;
-	int totsel;
-
-	const bool is_picksel = false;
-
-	if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return;
-
-	if ((v3d->twtype & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE | V3D_MANIP_SCALE)) == 0) return;
-
-	{
-		struct TransformBounds tbounds;
-		v3d->twflag &= ~V3D_DRAW_MANIPULATOR;
-
-		totsel = calc_manipulator_stats(C, &tbounds);
-		if (totsel == 0) return;
-
-		v3d->twflag |= V3D_DRAW_MANIPULATOR;
-
-		/* now we can define center */
-		switch (v3d->around) {
-			case V3D_AROUND_CENTER_BOUNDS:
-			case V3D_AROUND_ACTIVE:
-			{
-				bGPdata *gpd = CTX_data_gpencil_data(C);
-				Object *ob = OBACT;
-
-				if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) &&
-				    ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
-				    (ob && !(ob->mode & OB_MODE_POSE)))
-				{
-					copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
-				}
-				else {
-					mid_v3_v3v3(rv3d->twmat[3], tbounds.min, tbounds.max);
-				}
-				break;
-			}
-			case V3D_AROUND_LOCAL_ORIGINS:
-			case V3D_AROUND_CENTER_MEAN:
-				copy_v3_v3(rv3d->twmat[3], tbounds.center);
-				break;
-			case V3D_AROUND_CURSOR:
-				copy_v3_v3(rv3d->twmat[3], ED_view3d_cursor3d_get(scene, v3d));
-				break;
-		}
-
-		mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size);
-	}
-
-	/* when looking through a selected camera, the manipulator can be at the
-	 * exact same position as the view, skip so we don't break selection */
-	if (fabsf(mat4_to_scale(rv3d->twmat)) < 1e-7f)
-		return;
-
-	test_manipulator_axis(C);
-	drawflags = rv3d->twdrawflag;    /* set in calc_manipulator_stats */
-
-	if (v3d->twflag & V3D_DRAW_MANIPULATOR) {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glEnable(GL_BLEND);
-		glLineWidth(1.0f);
-
-		if (v3d->twtype & V3D_MANIP_ROTATE) {
-			if (G.debug_value == 3) {
-				if (G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT))
-					draw_manipulator_rotate_cyl(v3d, rv3d, drawflags, v3d->twtype, MAN_MOVECOL, true, is_picksel);
-				else
-					draw_manipulator_rotate_cyl(v3d, rv3d, drawflags, v3d->twtype, MAN_RGB, false, is_picksel);
-			}
-			else {
-				draw_manipulator_rotate(v3d, rv3d, drawflags, v3d->twtype, false, is_picksel);
-			}
-		}
-		if (v3d->twtype & V3D_MANIP_SCALE) {
-			draw_manipulator_scale(v3d, rv3d, drawflags, v3d->twtype, MAN_RGB, false, is_picksel);
-		}
-		if (v3d->twtype & V3D_MANIP_TRANSLATE) {
-			draw_manipulator_translate(v3d, rv3d, drawflags, v3d->twtype, MAN_RGB, false, is_picksel);
-		}
-
-		glDisable(GL_BLEND);
-	}
-}
-
-static int manipulator_selectbuf(Scene *scene, ScrArea *sa, ARegion *ar, const int mval[2], float hotspot)
-{
-	View3D *v3d = sa->spacedata.first;
-	RegionView3D *rv3d = ar->regiondata;
-	rcti rect;
-	GLuint buffer[64];      // max 4 items per select, so large enuf
-	short hits;
-	const bool is_picksel = true;
-	const bool do_passes = GPU_select_query_check_active();
-
-	/* when looking through a selected camera, the manipulator can be at the
-	 * exact same position as the view, skip so we don't break selection */
-	if (fabsf(mat4_to_scale(rv3d->twmat)) < 1e-7f)
-		return 0;
-
-	rect.xmin = mval[0] - hotspot;
-	rect.xmax = mval[0] + hotspot;
-	rect.ymin = mval[1] - hotspot;
-	rect.ymax = mval[1] + hotspot;
-
-	ED_view3d_draw_setup_view(NULL, scene, ar, v3d, NULL, NULL, &rect);
-
-	if (do_passes)
-		GPU_select_begin(buffer, 64, &rect, GPU_SELECT_NEAREST_FIRST_PASS, 0);
-	else
-		GPU_select_begin(buffer, 64, &rect, GPU_SELECT_ALL, 0);
-
-	/* do the drawing */
-	if (v3d->twtype & V3D_MANIP_ROTATE) {
-		if (G.debug_value == 3) draw_manipulator_rotate_cyl(v3d, rv3d, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-		else draw_manipulator_rotate(v3d, rv3d, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, false, is_picksel);
-	}
-	if (v3d->twtype & V3D_MANIP_SCALE)
-		draw_manipulator_scale(v3d, rv3d, MAN_SCALE_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-	if (v3d->twtype & V3D_MANIP_TRANSLATE)
-		draw_manipulator_translate(v3d, rv3d, MAN_TRANS_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-
-	hits = GPU_select_end();
-
-	if (do_passes && (hits > 0)) {
-		GPU_select_begin(buffer, 64, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits);
-
-		/* do the drawing */
-		if (v3d->twtype & V3D_MANIP_ROTATE) {
-			if (G.debug_value == 3) draw_manipulator_rotate_cyl(v3d, rv3d, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-			else draw_manipulator_rotate(v3d, rv3d, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, false, is_picksel);
-		}
-		if (v3d->twtype & V3D_MANIP_SCALE)
-			draw_manipulator_scale(v3d, rv3d, MAN_SCALE_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-		if (v3d->twtype & V3D_MANIP_TRANSLATE)
-			draw_manipulator_translate(v3d, rv3d, MAN_TRANS_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB, false, is_picksel);
-
-		GPU_select_end();
-	}
-
-	ED_view3d_draw_setup_view(NULL, scene, ar, v3d, NULL, NULL, NULL);
-
-	if (hits == 1) return buffer[3];
-	else if (hits > 1) {
-		GLuint val, dep, mindep = 0, mindeprot = 0, minval = 0, minvalrot = 0;
-		int a;
-
-		/* we compare the hits in buffer, but value centers highest */
-		/* we also store the rotation hits separate (because of arcs) and return hits on other widgets if there are */
-
-		for (a = 0; a < hits; a++) {
-			dep = buffer[4 * a + 1];
-			val = buffer[4 * a + 3];
-
-			if (val == MAN_TRANS_C) {
-				return MAN_TRANS_C;
-			}
-			else if (val == MAN_SCALE_C) {
-				return MAN_SCALE_C;
-			}
-			else {
-				if (val & MAN_ROT_C) {
-					if (minvalrot == 0 || dep < mindeprot) {
-						mindeprot = dep;
-						minvalrot = val;
-					}
-				}
-				else {
-					if (minval == 0 || dep < mindep) {
-						mindep = dep;
-						minval = val;
-					}
-				}
-			}
-		}
-
-		if (minval)
-			return minval;
-		else
-			return minvalrot;
-	}
-	return 0;
-}
-
-static const char *manipulator_get_operator_name(int man_val)
-{
-	if (man_val & MAN_TRANS_C) {
-		return "TRANSFORM_OT_translate";
-	}
-	else if (man_val == MAN_ROT_T) {
-		return "TRANSFORM_OT_trackball";
-	}
-	else if (man_val & MAN_ROT_C) {
-		return "TRANSFORM_OT_rotate";
-	}
-	else if (man_val & MAN_SCALE_C) {
-		return "TRANSFORM_OT_resize";
-	}
-
-	return NULL;
-}
-
-/* return 0; nothing happened */
-int BIF_do_manipulator(bContext *C, const struct wmEvent *event, wmOperator *op)
-{
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	View3D *v3d = sa->spacedata.first;
-	ARegion *ar = CTX_wm_region(C);
-	int constraint_axis[3] = {0, 0, 0};
-	int val;
-	const bool use_planar = RNA_boolean_get(op->ptr, "use_planar_constraint");
-
-	if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return 0;
-	if (!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return 0;
-
-	/* Force orientation */
-	RNA_enum_set(op->ptr, "constraint_orientation", v3d->twmode);
-
-	// find the hotspots first test narrow hotspot
-	val = manipulator_selectbuf(scene, sa, ar, event->mval, 0.5f * (float)U.tw_hotspot);
-	if (val) {
-		wmOperatorType *ot;
-		PointerRNA props_ptr;
-		PropertyRNA *prop;
-		const char *opname;
-
-		// drawflags still global, for drawing call above
-		drawflags = manipulator_selectbuf(scene, sa, ar, event->mval, 0.2f * (float)U.tw_hotspot);
-		if (drawflags == 0) drawflags = val;
-
-		/* Planar constraint doesn't make sense for rotation, give other keymaps a chance */
-		if ((drawflags & MAN_ROT_C) && use_planar) {
-			return 0;
-		}
-
-		opname = manipulator_get_operator_name(drawflags);
-		ot = WM_operatortype_find(opname, true);
-		WM_operator_properties_create_ptr(&props_ptr, ot);
-
-		if (drawflags & MAN_TRANS_C) {
-			switch (drawflags) {
-				case MAN_TRANS_C:
-					break;
-				case MAN_TRANS_X:
-					if (use_planar) {
-						constraint_axis[1] = 1;
-						constraint_axis[2] = 1;
-					}
-					else
-						constraint_axis[0] = 1;
-					break;
-				case MAN_TRANS_Y:
-					if (use_planar) {
-						constraint_axis[0] = 1;
-						constraint_axis[2] = 1;
-					}
-					else
-						constraint_axis[1] = 1;
-					break;
-				case MAN_TRANS_Z:
-					if (use_planar) {
-						constraint_axis[0] = 1;
-						constraint_axis[1] = 1;
-					}
-					else
-						constraint_axis[2] = 1;
-					break;
-			}
-			RNA_boolean_set_array(&props_ptr, "constraint_axis", constraint_axis);
-		}
-		else if (drawflags & MAN_SCALE_C) {
-			switch (drawflags) {
-				case MAN_SCALE_X:
-					if (use_planar) {
-						constraint_axis[1] = 1;
-						constraint_axis[2] = 1;
-					}
-					else
-						constraint_axis[0] = 1;
-					break;
-				case MAN_SCALE_Y:
-					if (use_planar) {
-						constraint_axis[0] = 1;
-						constraint_axis[2] = 1;
-					}
-					else
-						constraint_axis[1] = 1;
-					break;
-				case MAN_SCALE_Z:
-					if (use_planar) {
-						constraint_axis[0] = 1;
-						constraint_axis[1] = 1;
-					}
-					else
-						constraint_axis[2] = 1;
-					break;
-			}
-			RNA_boolean_set_array(&props_ptr, "constraint_axis", constraint_axis);
-		}
-		else if (drawflags == MAN_ROT_T) {
-			/* pass */
-		}
-		else if (drawflags & MAN_ROT_C) {
-			switch (drawflags) {
-				case MAN_ROT_X:
-					constraint_axis[0] = 1;
-					break;
-				case MAN_ROT_Y:
-					constraint_axis[1] = 1;
-					break;
-				case MAN_ROT_Z:
-					constraint_axis[2] = 1;
-					break;
-			}
-			RNA_boolean_set_array(&props_ptr, "constraint_axis", constraint_axis);
-		}
-
-		/* pass operator properties on to transform operators */
-		prop = RNA_struct_find_property(op->ptr, "use_accurate");
-		if (RNA_property_is_set(op->ptr, prop)) {
-			RNA_property_boolean_set(&props_ptr, prop, RNA_property_boolean_get(op->ptr, prop));
-		}
-		prop = RNA_struct_find_property(op->ptr, "release_confirm");
-		if (RNA_property_is_set(op->ptr, prop)) {
-			RNA_property_boolean_set(&props_ptr, prop, RNA_property_boolean_get(op->ptr, prop));
-		}
-		prop = RNA_struct_find_property(op->ptr, "constraint_orientation");
-		if (RNA_property_is_set(op->ptr, prop)) {
-			RNA_property_enum_set(&props_ptr, prop, RNA_property_enum_get(op->ptr, prop));
-		}
-
-		WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr);
-		WM_operator_properties_free(&props_ptr);
-	}
-	/* after transform, restore drawflags */
-	drawflags = 0xFFFF;
-
-	return val;
-}
-
diff --git a/source/blender/editors/transform/transform_manipulator_2d.c b/source/blender/editors/transform/transform_manipulator_2d.c
new file mode 100644
index 00000000000..d2743f47000
--- /dev/null
+++ b/source/blender/editors/transform/transform_manipulator_2d.c
@@ -0,0 +1,382 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/transform/transform_manipulator_2d.c
+ *  \ingroup edtransform
+ *
+ * \name 2D Transform Manipulator
+ *
+ * Used for UV/Image Editor
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BKE_context.h"
+#include "BKE_editmesh.h"
+
+#include "RNA_access.h"
+
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "wm.h" /* XXX */
+
+#include "ED_image.h"
+#include "ED_screen.h"
+#include "ED_uvedit.h"
+#include "ED_manipulator_library.h"
+
+#include "transform.h" /* own include */
+
+/* axes as index */
+enum {
+	MAN2D_AXIS_TRANS_X = 0,
+	MAN2D_AXIS_TRANS_Y,
+
+	MAN2D_AXIS_LAST,
+};
+
+typedef struct ManipulatorGroup2D {
+	wmManipulator *translate_x,
+	         *translate_y;
+
+	wmManipulator *cage;
+
+	/* Current origin in view space, used to update widget origin for possible view changes */
+	float origin[2];
+	float min[2];
+	float max[2];
+
+} ManipulatorGroup2D;
+
+
+/* **************** Utilities **************** */
+
+/* loop over axes */
+#define MAN2D_ITER_AXES_BEGIN(axis, axis_idx) \
+	{ \
+		wmManipulator *axis; \
+		int axis_idx; \
+		for (axis_idx = 0; axis_idx < MAN2D_AXIS_LAST; axis_idx++) { \
+			axis = manipulator2d_get_axis_from_index(man, axis_idx);
+
+#define MAN2D_ITER_AXES_END \
+		} \
+	} ((void)0)
+
+static wmManipulator *manipulator2d_get_axis_from_index(const ManipulatorGroup2D *man, const short axis_idx)
+{
+	BLI_assert(IN_RANGE_INCL(axis_idx, (float)MAN2D_AXIS_TRANS_X, (float)MAN2D_AXIS_TRANS_Y));
+
+	switch (axis_idx) {
+		case MAN2D_AXIS_TRANS_X:
+			return man->translate_x;
+		case MAN2D_AXIS_TRANS_Y:
+			return man->translate_y;
+	}
+
+	return NULL;
+}
+
+static void manipulator2d_get_axis_color(const int axis_idx, float *r_col, float *r_col_hi)
+{
+	const float alpha = 0.6f;
+	const float alpha_hi = 1.0f;
+	int col_id;
+
+	switch (axis_idx) {
+		case MAN2D_AXIS_TRANS_X:
+			col_id = TH_AXIS_X;
+			break;
+		case MAN2D_AXIS_TRANS_Y:
+			col_id = TH_AXIS_Y;
+			break;
+	}
+
+	UI_GetThemeColor4fv(col_id, r_col);
+
+	copy_v4_v4(r_col_hi, r_col);
+	r_col[3] *= alpha;
+	r_col_hi[3] *= alpha_hi;
+}
+
+static ManipulatorGroup2D *manipulatorgroup2d_init(wmManipulatorGroup *mgroup)
+{
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_2d", true);
+	const wmManipulatorType *wt_cage = WM_manipulatortype_find("MANIPULATOR_WT_cage_2d", true);
+
+	ManipulatorGroup2D *man = MEM_callocN(sizeof(ManipulatorGroup2D), __func__);
+
+	man->translate_x = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+	man->translate_y = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+	man->cage = WM_manipulator_new_ptr(wt_cage, mgroup, NULL);
+
+	RNA_enum_set(man->cage->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_ROTATE);
+
+	return man;
+}
+
+/**
+ * Calculates origin in view space, use with #manipulator2d_origin_to_region.
+ */
+static void manipulator2d_calc_bounds(const bContext *C, float *r_center, float *r_min, float *r_max)
+{
+	SpaceImage *sima = CTX_wm_space_image(C);
+	Image *ima = ED_space_image(sima);
+
+	float min_buf[2], max_buf[2];
+	if (r_min == NULL) {
+		r_min = min_buf;
+	}
+	if (r_max == NULL) {
+		r_max = max_buf;
+	}
+
+	if (!ED_uvedit_minmax(CTX_data_scene(C), ima, CTX_data_edit_object(C), r_min, r_max)) {
+		zero_v2(r_min);
+		zero_v2(r_max);
+	}
+	mid_v2_v2v2(r_center, r_min, r_max);
+}
+
+/**
+ * Convert origin (or any other point) from view to region space.
+ */
+BLI_INLINE void manipulator2d_origin_to_region(ARegion *ar, float *r_origin)
+{
+	UI_view2d_view_to_region_fl(&ar->v2d, r_origin[0], r_origin[1], &r_origin[0], &r_origin[1]);
+}
+
+/**
+ * Custom handler for manipulator widgets
+ */
+static int manipulator2d_modal(
+        bContext *C, wmManipulator *widget, const wmEvent *UNUSED(event),
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	ARegion *ar = CTX_wm_region(C);
+	float origin[3];
+
+	manipulator2d_calc_bounds(C, origin, NULL, NULL);
+	manipulator2d_origin_to_region(ar, origin);
+	WM_manipulator_set_matrix_location(widget, origin);
+
+	ED_region_tag_redraw(ar);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+void ED_widgetgroup_manipulator2d_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	wmOperatorType *ot_translate = WM_operatortype_find("TRANSFORM_OT_translate", true);
+	ManipulatorGroup2D *man = manipulatorgroup2d_init(mgroup);
+	mgroup->customdata = man;
+
+	MAN2D_ITER_AXES_BEGIN(axis, axis_idx)
+	{
+		const float offset[3] = {0.0f, 0.2f};
+
+		float color[4], color_hi[4];
+		manipulator2d_get_axis_color(axis_idx, color, color_hi);
+
+		/* custom handler! */
+		WM_manipulator_set_fn_custom_modal(axis, manipulator2d_modal);
+		/* set up widget data */
+		RNA_float_set(axis->ptr, "angle", -M_PI_2 * axis_idx);
+		RNA_float_set(axis->ptr, "length", 0.8f);
+		WM_manipulator_set_matrix_offset_location(axis, offset);
+		WM_manipulator_set_line_width(axis, MANIPULATOR_AXIS_LINE_WIDTH);
+		WM_manipulator_set_scale(axis, U.manipulator_size);
+		WM_manipulator_set_color(axis, color);
+		WM_manipulator_set_color_highlight(axis, color_hi);
+
+		/* assign operator */
+		PointerRNA *ptr = WM_manipulator_operator_set(axis, 0, ot_translate, NULL);
+		int constraint[3] = {0};
+		constraint[(axis_idx + 1) % 2] = 1;
+		if (RNA_struct_find_property(ptr, "constraint_axis"))
+			RNA_boolean_set_array(ptr, "constraint_axis", constraint);
+		RNA_boolean_set(ptr, "release_confirm", 1);
+	}
+	MAN2D_ITER_AXES_END;
+
+	{
+		wmOperatorType *ot_resize = WM_operatortype_find("TRANSFORM_OT_resize", true);
+		wmOperatorType *ot_rotate = WM_operatortype_find("TRANSFORM_OT_rotate", true);
+		PointerRNA *ptr;
+
+		/* assign operator */
+		ptr = WM_manipulator_operator_set(man->cage, 0, ot_translate, NULL);
+		RNA_boolean_set(ptr, "release_confirm", 1);
+
+		int constraint_x[3] = {1, 0, 0};
+		int constraint_y[3] = {0, 1, 0};
+
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X, ot_resize, NULL);
+		PropertyRNA *prop_release_confirm = RNA_struct_find_property(ptr, "release_confirm");
+		PropertyRNA *prop_constraint_axis = RNA_struct_find_property(ptr, "constraint_axis");
+		RNA_property_boolean_set_array(ptr, prop_constraint_axis, constraint_x);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X, ot_resize, NULL);
+		RNA_property_boolean_set_array(ptr, prop_constraint_axis, constraint_x);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y, ot_resize, NULL);
+		RNA_property_boolean_set_array(ptr, prop_constraint_axis, constraint_y);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y, ot_resize, NULL);
+		RNA_property_boolean_set_array(ptr, prop_constraint_axis, constraint_y);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y, ot_resize, NULL);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y, ot_resize, NULL);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y, ot_resize, NULL);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y, ot_resize, NULL);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+		ptr = WM_manipulator_operator_set(man->cage, ED_MANIPULATOR_CAGE2D_PART_ROTATE, ot_rotate, NULL);
+		RNA_property_boolean_set(ptr, prop_release_confirm, true);
+	}
+}
+
+void ED_widgetgroup_manipulator2d_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup2D *man = mgroup->customdata;
+	float origin[3];
+	manipulator2d_calc_bounds(C, origin, man->min, man->max);
+	copy_v2_v2(man->origin, origin);
+	bool show_cage = !equals_v2v2(man->min, man->max);
+
+	if (show_cage) {
+		man->cage->flag &= ~WM_MANIPULATOR_HIDDEN;
+		man->translate_x->flag |= WM_MANIPULATOR_HIDDEN;
+		man->translate_y->flag |= WM_MANIPULATOR_HIDDEN;
+	}
+	else {
+		man->cage->flag |= WM_MANIPULATOR_HIDDEN;
+		man->translate_x->flag &= ~WM_MANIPULATOR_HIDDEN;
+		man->translate_y->flag &= ~WM_MANIPULATOR_HIDDEN;
+	}
+
+	if (show_cage) {
+		wmManipulatorOpElem *mpop;
+		float mid[2];
+		const float *min = man->min;
+		const float *max = man->max;
+		mid_v2_v2v2(mid, min, max);
+
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X);
+		PropertyRNA *prop_center_override = RNA_struct_find_property(&mpop->ptr, "center_override");
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], mid[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], mid[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], max[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], min[1], 0.0f});
+
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MIN_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], max[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MIN_X_MAX_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], min[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MIN_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], max[1], 0.0f});
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_SCALE_MAX_X_MAX_Y);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], min[1], 0.0f});
+
+		mpop = WM_manipulator_operator_get(man->cage, ED_MANIPULATOR_CAGE2D_PART_ROTATE);
+		RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], mid[1], 0.0f});
+	}
+}
+
+void ED_widgetgroup_manipulator2d_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ARegion *ar = CTX_wm_region(C);
+	ManipulatorGroup2D *man = mgroup->customdata;
+	float origin[3] = {UNPACK2(man->origin), 0.0f};
+	float origin_aa[3] = {UNPACK2(man->origin), 0.0f};
+
+	manipulator2d_origin_to_region(ar, origin);
+
+	MAN2D_ITER_AXES_BEGIN(axis, axis_idx)
+	{
+		WM_manipulator_set_matrix_location(axis, origin);
+	}
+	MAN2D_ITER_AXES_END;
+
+	UI_view2d_view_to_region_m4(&ar->v2d, man->cage->matrix_space);
+	WM_manipulator_set_matrix_offset_location(man->cage, origin_aa);
+	man->cage->matrix_offset[0][0] = (man->max[0] - man->min[0]);
+	man->cage->matrix_offset[1][1] = (man->max[1] - man->min[1]);
+}
+
+/* TODO (Julian)
+ * - Called on every redraw, better to do a more simple poll and check for selection in _refresh
+ * - UV editing only, could be expanded for other things.
+ */
+bool ED_widgetgroup_manipulator2d_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
+{
+	if ((U.manipulator_flag & USER_MANIPULATOR_DRAW) == 0) {
+		return false;
+	}
+
+	SpaceImage *sima = CTX_wm_space_image(C);
+	Object *obedit = CTX_data_edit_object(C);
+
+	if (ED_space_image_show_uvedit(sima, obedit)) {
+		Image *ima = ED_space_image(sima);
+		Scene *scene = CTX_data_scene(C);
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+
+		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
+		/* check if there's a selected poly */
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
+				continue;
+
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
diff --git a/source/blender/editors/transform/transform_manipulator_3d.c b/source/blender/editors/transform/transform_manipulator_3d.c
new file mode 100644
index 00000000000..b94ccf42325
--- /dev/null
+++ b/source/blender/editors/transform/transform_manipulator_3d.c
@@ -0,0 +1,1753 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/transform/transform_manipulator_3d.c
+ *  \ingroup edtransform
+ *
+ * \name 3D Transform Manipulator
+ *
+ * Used for 3D View
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+
+#include "DNA_armature_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "RNA_access.h"
+
+#include "BKE_action.h"
+#include "BKE_context.h"
+#include "BKE_curve.h"
+#include "BKE_global.h"
+#include "BKE_particle.h"
+#include "BKE_pointcache.h"
+#include "BKE_editmesh.h"
+#include "BKE_lattice.h"
+#include "BKE_gpencil.h"
+#include "BKE_scene.h"
+#include "BKE_workspace.h"
+
+#include "BIF_gl.h"
+
+#include "DEG_depsgraph.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+#include "WM_message.h"
+#include "WM_toolsystem.h"
+
+#include "ED_armature.h"
+#include "ED_curve.h"
+#include "ED_object.h"
+#include "ED_particle.h"
+#include "ED_view3d.h"
+#include "ED_gpencil.h"
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
+#include "UI_resources.h"
+
+/* local module include */
+#include "transform.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "GPU_select.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
+
+#include "DEG_depsgraph_query.h"
+
+/* return codes for select, and drawing flags */
+
+#define MAN_TRANS_X		(1 << 0)
+#define MAN_TRANS_Y		(1 << 1)
+#define MAN_TRANS_Z		(1 << 2)
+#define MAN_TRANS_C		(MAN_TRANS_X | MAN_TRANS_Y | MAN_TRANS_Z)
+
+#define MAN_ROT_X		(1 << 3)
+#define MAN_ROT_Y		(1 << 4)
+#define MAN_ROT_Z		(1 << 5)
+#define MAN_ROT_C		(MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z)
+
+#define MAN_SCALE_X		(1 << 8)
+#define MAN_SCALE_Y		(1 << 9)
+#define MAN_SCALE_Z		(1 << 10)
+#define MAN_SCALE_C		(MAN_SCALE_X | MAN_SCALE_Y | MAN_SCALE_Z)
+
+/* threshold for testing view aligned manipulator axis */
+#define TW_AXIS_DOT_MIN 0.02f
+#define TW_AXIS_DOT_MAX 0.1f
+
+/* axes as index */
+enum {
+	MAN_AXIS_TRANS_X = 0,
+	MAN_AXIS_TRANS_Y,
+	MAN_AXIS_TRANS_Z,
+	MAN_AXIS_TRANS_C,
+
+	MAN_AXIS_TRANS_XY,
+	MAN_AXIS_TRANS_YZ,
+	MAN_AXIS_TRANS_ZX,
+#define MAN_AXIS_RANGE_TRANS_START MAN_AXIS_TRANS_X
+#define MAN_AXIS_RANGE_TRANS_END (MAN_AXIS_TRANS_ZX + 1)
+
+	MAN_AXIS_ROT_X,
+	MAN_AXIS_ROT_Y,
+	MAN_AXIS_ROT_Z,
+	MAN_AXIS_ROT_C,
+	MAN_AXIS_ROT_T, /* trackball rotation */
+#define MAN_AXIS_RANGE_ROT_START MAN_AXIS_ROT_X
+#define MAN_AXIS_RANGE_ROT_END (MAN_AXIS_ROT_T + 1)
+
+	MAN_AXIS_SCALE_X,
+	MAN_AXIS_SCALE_Y,
+	MAN_AXIS_SCALE_Z,
+	MAN_AXIS_SCALE_C,
+	MAN_AXIS_SCALE_XY,
+	MAN_AXIS_SCALE_YZ,
+	MAN_AXIS_SCALE_ZX,
+#define MAN_AXIS_RANGE_SCALE_START MAN_AXIS_SCALE_X
+#define MAN_AXIS_RANGE_SCALE_END (MAN_AXIS_SCALE_ZX + 1)
+
+	MAN_AXIS_LAST = MAN_AXIS_RANGE_SCALE_END,
+};
+
+/* axis types */
+enum {
+	MAN_AXES_ALL = 0,
+	MAN_AXES_TRANSLATE,
+	MAN_AXES_ROTATE,
+	MAN_AXES_SCALE,
+};
+
+/* naming from old blender we may combine. */
+enum {
+	V3D_MANIP_TRANSLATE      = 1,
+	V3D_MANIP_ROTATE         = 2,
+	V3D_MANIP_SCALE          = 4,
+};
+
+
+typedef struct ManipulatorGroup {
+	bool all_hidden;
+	int twtype;
+
+	struct wmManipulator *manipulators[MAN_AXIS_LAST];
+} ManipulatorGroup;
+
+/* -------------------------------------------------------------------- */
+/** \name Utilities
+ * \{ */
+
+/* loop over axes */
+#define MAN_ITER_AXES_BEGIN(axis, axis_idx) \
+	{ \
+		wmManipulator *axis; \
+		int axis_idx; \
+		for (axis_idx = 0; axis_idx < MAN_AXIS_LAST; axis_idx++) { \
+			axis = manipulator_get_axis_from_index(man, axis_idx);
+
+#define MAN_ITER_AXES_END \
+		} \
+	} ((void)0)
+
+static wmManipulator *manipulator_get_axis_from_index(const ManipulatorGroup *man, const short axis_idx)
+{
+	BLI_assert(IN_RANGE_INCL(axis_idx, (float)MAN_AXIS_TRANS_X, (float)MAN_AXIS_LAST));
+	return man->manipulators[axis_idx];
+}
+
+static short manipulator_get_axis_type(const int axis_idx)
+{
+	if (axis_idx >= MAN_AXIS_RANGE_TRANS_START && axis_idx < MAN_AXIS_RANGE_TRANS_END) {
+		return MAN_AXES_TRANSLATE;
+	}
+	if (axis_idx >= MAN_AXIS_RANGE_ROT_START && axis_idx < MAN_AXIS_RANGE_ROT_END) {
+		return MAN_AXES_ROTATE;
+	}
+	if (axis_idx >= MAN_AXIS_RANGE_SCALE_START && axis_idx < MAN_AXIS_RANGE_SCALE_END) {
+		return MAN_AXES_SCALE;
+	}
+	BLI_assert(0);
+	return -1;
+}
+
+static uint manipulator_orientation_axis(const int axis_idx, bool *r_is_plane)
+{
+	switch (axis_idx) {
+		case MAN_AXIS_TRANS_YZ:
+		case MAN_AXIS_SCALE_YZ:
+			if (r_is_plane) {
+				*r_is_plane = true;
+			}
+			ATTR_FALLTHROUGH;
+		case MAN_AXIS_TRANS_X:
+		case MAN_AXIS_ROT_X:
+		case MAN_AXIS_SCALE_X:
+			return 0;
+
+		case MAN_AXIS_TRANS_ZX:
+		case MAN_AXIS_SCALE_ZX:
+			if (r_is_plane) {
+				*r_is_plane = true;
+			}
+			ATTR_FALLTHROUGH;
+		case MAN_AXIS_TRANS_Y:
+		case MAN_AXIS_ROT_Y:
+		case MAN_AXIS_SCALE_Y:
+			return 1;
+
+		case MAN_AXIS_TRANS_XY:
+		case MAN_AXIS_SCALE_XY:
+			if (r_is_plane) {
+				*r_is_plane = true;
+			}
+			ATTR_FALLTHROUGH;
+		case MAN_AXIS_TRANS_Z:
+		case MAN_AXIS_ROT_Z:
+		case MAN_AXIS_SCALE_Z:
+			return 2;
+	}
+	return 3;
+}
+
+static bool manipulator_is_axis_visible(
+        const RegionView3D *rv3d, const int twtype,
+        const float idot[3], const int axis_type, const int axis_idx)
+{
+	bool is_plane = false;
+	const uint aidx_norm = manipulator_orientation_axis(axis_idx, &is_plane);
+	/* don't draw axis perpendicular to the view */
+	if (aidx_norm < 3) {
+		float idot_axis = idot[aidx_norm];
+		if (is_plane) {
+			idot_axis = 1.0f - idot_axis;
+		}
+		if (idot_axis < TW_AXIS_DOT_MIN) {
+			return false;
+		}
+	}
+
+	if ((axis_type == MAN_AXES_TRANSLATE && !(twtype & V3D_MANIP_TRANSLATE)) ||
+	    (axis_type == MAN_AXES_ROTATE && !(twtype & V3D_MANIP_ROTATE)) ||
+	    (axis_type == MAN_AXES_SCALE && !(twtype & V3D_MANIP_SCALE)))
+	{
+		return false;
+	}
+
+	switch (axis_idx) {
+		case MAN_AXIS_TRANS_X:
+			return (rv3d->twdrawflag & MAN_TRANS_X);
+		case MAN_AXIS_TRANS_Y:
+			return (rv3d->twdrawflag & MAN_TRANS_Y);
+		case MAN_AXIS_TRANS_Z:
+			return (rv3d->twdrawflag & MAN_TRANS_Z);
+		case MAN_AXIS_TRANS_C:
+			return (rv3d->twdrawflag & MAN_TRANS_C);
+		case MAN_AXIS_ROT_X:
+			return (rv3d->twdrawflag & MAN_ROT_X);
+		case MAN_AXIS_ROT_Y:
+			return (rv3d->twdrawflag & MAN_ROT_Y);
+		case MAN_AXIS_ROT_Z:
+			return (rv3d->twdrawflag & MAN_ROT_Z);
+		case MAN_AXIS_ROT_C:
+		case MAN_AXIS_ROT_T:
+			return (rv3d->twdrawflag & MAN_ROT_C);
+		case MAN_AXIS_SCALE_X:
+			return (rv3d->twdrawflag & MAN_SCALE_X);
+		case MAN_AXIS_SCALE_Y:
+			return (rv3d->twdrawflag & MAN_SCALE_Y);
+		case MAN_AXIS_SCALE_Z:
+			return (rv3d->twdrawflag & MAN_SCALE_Z);
+		case MAN_AXIS_SCALE_C:
+			return (rv3d->twdrawflag & MAN_SCALE_C && (twtype & V3D_MANIP_TRANSLATE) == 0);
+		case MAN_AXIS_TRANS_XY:
+			return (rv3d->twdrawflag & MAN_TRANS_X &&
+			        rv3d->twdrawflag & MAN_TRANS_Y &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+		case MAN_AXIS_TRANS_YZ:
+			return (rv3d->twdrawflag & MAN_TRANS_Y &&
+			        rv3d->twdrawflag & MAN_TRANS_Z &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+		case MAN_AXIS_TRANS_ZX:
+			return (rv3d->twdrawflag & MAN_TRANS_Z &&
+			        rv3d->twdrawflag & MAN_TRANS_X &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+		case MAN_AXIS_SCALE_XY:
+			return (rv3d->twdrawflag & MAN_SCALE_X &&
+			        rv3d->twdrawflag & MAN_SCALE_Y &&
+			        (twtype & V3D_MANIP_TRANSLATE) == 0 &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+		case MAN_AXIS_SCALE_YZ:
+			return (rv3d->twdrawflag & MAN_SCALE_Y &&
+			        rv3d->twdrawflag & MAN_SCALE_Z &&
+			        (twtype & V3D_MANIP_TRANSLATE) == 0 &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+		case MAN_AXIS_SCALE_ZX:
+			return (rv3d->twdrawflag & MAN_SCALE_Z &&
+			        rv3d->twdrawflag & MAN_SCALE_X &&
+			        (twtype & V3D_MANIP_TRANSLATE) == 0 &&
+			        (twtype & V3D_MANIP_ROTATE) == 0);
+	}
+	return false;
+}
+
+static void manipulator_get_axis_color(
+        const int axis_idx, const float idot[3],
+        float r_col[4], float r_col_hi[4])
+{
+	/* alpha values for normal/highlighted states */
+	const float alpha = 0.6f;
+	const float alpha_hi = 1.0f;
+	float alpha_fac;
+
+	bool is_plane = false;
+	const int axis_idx_norm = manipulator_orientation_axis(axis_idx, &is_plane);
+	/* get alpha fac based on axis angle, to fade axis out when hiding it because it points towards view */
+	if (axis_idx_norm < 3) {
+		float idot_axis = idot[axis_idx_norm];
+		if (is_plane) {
+			idot_axis = 1.0f - idot_axis;
+		}
+		alpha_fac = (idot_axis > TW_AXIS_DOT_MAX) ?
+		        1.0f : (idot_axis < TW_AXIS_DOT_MIN) ?
+		        0.0f : ((idot_axis - TW_AXIS_DOT_MIN) / (TW_AXIS_DOT_MAX - TW_AXIS_DOT_MIN));
+	}
+	else {
+		/* trackball rotation axis is a special case, we only draw a slight overlay */
+		alpha_fac = (axis_idx == MAN_AXIS_ROT_T) ? 0.1f : 1.0f;
+	}
+
+	switch (axis_idx) {
+		case MAN_AXIS_TRANS_X:
+		case MAN_AXIS_ROT_X:
+		case MAN_AXIS_SCALE_X:
+		case MAN_AXIS_TRANS_YZ:
+		case MAN_AXIS_SCALE_YZ:
+			UI_GetThemeColor4fv(TH_AXIS_X, r_col);
+			break;
+		case MAN_AXIS_TRANS_Y:
+		case MAN_AXIS_ROT_Y:
+		case MAN_AXIS_SCALE_Y:
+		case MAN_AXIS_TRANS_ZX:
+		case MAN_AXIS_SCALE_ZX:
+			UI_GetThemeColor4fv(TH_AXIS_Y, r_col);
+			break;
+		case MAN_AXIS_TRANS_Z:
+		case MAN_AXIS_ROT_Z:
+		case MAN_AXIS_SCALE_Z:
+		case MAN_AXIS_TRANS_XY:
+		case MAN_AXIS_SCALE_XY:
+			UI_GetThemeColor4fv(TH_AXIS_Z, r_col);
+			break;
+		case MAN_AXIS_TRANS_C:
+		case MAN_AXIS_ROT_C:
+		case MAN_AXIS_SCALE_C:
+		case MAN_AXIS_ROT_T:
+			copy_v4_fl(r_col, 1.0f);
+			break;
+	}
+
+	copy_v4_v4(r_col_hi, r_col);
+
+	r_col[3] = alpha * alpha_fac;
+	r_col_hi[3] = alpha_hi * alpha_fac;
+}
+
+static void manipulator_get_axis_constraint(const int axis_idx, int r_axis[3])
+{
+	zero_v3_int(r_axis);
+
+	switch (axis_idx) {
+		case MAN_AXIS_TRANS_X:
+		case MAN_AXIS_ROT_X:
+		case MAN_AXIS_SCALE_X:
+			r_axis[0] = 1;
+			break;
+		case MAN_AXIS_TRANS_Y:
+		case MAN_AXIS_ROT_Y:
+		case MAN_AXIS_SCALE_Y:
+			r_axis[1] = 1;
+			break;
+		case MAN_AXIS_TRANS_Z:
+		case MAN_AXIS_ROT_Z:
+		case MAN_AXIS_SCALE_Z:
+			r_axis[2] = 1;
+			break;
+		case MAN_AXIS_TRANS_XY:
+		case MAN_AXIS_SCALE_XY:
+			r_axis[0] = r_axis[1] = 1;
+			break;
+		case MAN_AXIS_TRANS_YZ:
+		case MAN_AXIS_SCALE_YZ:
+			r_axis[1] = r_axis[2] = 1;
+			break;
+		case MAN_AXIS_TRANS_ZX:
+		case MAN_AXIS_SCALE_ZX:
+			r_axis[2] = r_axis[0] = 1;
+			break;
+		default:
+			break;
+	}
+}
+
+
+/* **************** Preparation Stuff **************** */
+
+/* transform widget center calc helper for below */
+static void calc_tw_center(struct TransformBounds *tbounds, const float co[3])
+{
+	minmax_v3v3_v3(tbounds->min, tbounds->max, co);
+	add_v3_v3(tbounds->center, co);
+
+	for (int i = 0; i < 3; i++) {
+		const float d = dot_v3v3(tbounds->axis[i], co);
+		tbounds->axis_min[i] = min_ff(d, tbounds->axis_min[i]);
+		tbounds->axis_max[i] = max_ff(d, tbounds->axis_max[i]);
+	}
+}
+
+static void protectflag_to_drawflags(short protectflag, short *drawflags)
+{
+	if (protectflag & OB_LOCK_LOCX)
+		*drawflags &= ~MAN_TRANS_X;
+	if (protectflag & OB_LOCK_LOCY)
+		*drawflags &= ~MAN_TRANS_Y;
+	if (protectflag & OB_LOCK_LOCZ)
+		*drawflags &= ~MAN_TRANS_Z;
+
+	if (protectflag & OB_LOCK_ROTX)
+		*drawflags &= ~MAN_ROT_X;
+	if (protectflag & OB_LOCK_ROTY)
+		*drawflags &= ~MAN_ROT_Y;
+	if (protectflag & OB_LOCK_ROTZ)
+		*drawflags &= ~MAN_ROT_Z;
+
+	if (protectflag & OB_LOCK_SCALEX)
+		*drawflags &= ~MAN_SCALE_X;
+	if (protectflag & OB_LOCK_SCALEY)
+		*drawflags &= ~MAN_SCALE_Y;
+	if (protectflag & OB_LOCK_SCALEZ)
+		*drawflags &= ~MAN_SCALE_Z;
+}
+
+/* for pose mode */
+static void protectflag_to_drawflags_pchan(RegionView3D *rv3d, const bPoseChannel *pchan)
+{
+	protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
+}
+
+/* for editmode*/
+static void protectflag_to_drawflags_ebone(RegionView3D *rv3d, const EditBone *ebo)
+{
+	if (ebo->flag & BONE_EDITMODE_LOCKED) {
+		protectflag_to_drawflags(OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE, &rv3d->twdrawflag);
+	}
+}
+
+/* could move into BLI_math however this is only useful for display/editing purposes */
+static void axis_angle_to_gimbal_axis(float gmat[3][3], const float axis[3], const float angle)
+{
+	/* X/Y are arbitrary axies, most importantly Z is the axis of rotation */
+
+	float cross_vec[3];
+	float quat[4];
+
+	/* this is an un-scientific method to get a vector to cross with
+	 * XYZ intentionally YZX */
+	cross_vec[0] = axis[1];
+	cross_vec[1] = axis[2];
+	cross_vec[2] = axis[0];
+
+	/* X-axis */
+	cross_v3_v3v3(gmat[0], cross_vec, axis);
+	normalize_v3(gmat[0]);
+	axis_angle_to_quat(quat, axis, angle);
+	mul_qt_v3(quat, gmat[0]);
+
+	/* Y-axis */
+	axis_angle_to_quat(quat, axis, M_PI_2);
+	copy_v3_v3(gmat[1], gmat[0]);
+	mul_qt_v3(quat, gmat[1]);
+
+	/* Z-axis */
+	copy_v3_v3(gmat[2], axis);
+
+	normalize_m3(gmat);
+}
+
+
+static bool test_rotmode_euler(short rotmode)
+{
+	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0 : 1;
+}
+
+bool gimbal_axis(Object *ob, float gmat[3][3])
+{
+	if (ob->mode & OB_MODE_POSE) {
+		bPoseChannel *pchan = BKE_pose_channel_active(ob);
+
+		if (pchan) {
+			float mat[3][3], tmat[3][3], obmat[3][3];
+			if (test_rotmode_euler(pchan->rotmode)) {
+				eulO_to_gimbal_axis(mat, pchan->eul, pchan->rotmode);
+			}
+			else if (pchan->rotmode == ROT_MODE_AXISANGLE) {
+				axis_angle_to_gimbal_axis(mat, pchan->rotAxis, pchan->rotAngle);
+			}
+			else { /* quat */
+				return 0;
+			}
+
+
+			/* apply bone transformation */
+			mul_m3_m3m3(tmat, pchan->bone->bone_mat, mat);
+
+			if (pchan->parent) {
+				float parent_mat[3][3];
+
+				copy_m3_m4(parent_mat, pchan->parent->pose_mat);
+				mul_m3_m3m3(mat, parent_mat, tmat);
+
+				/* needed if object transformation isn't identity */
+				copy_m3_m4(obmat, ob->obmat);
+				mul_m3_m3m3(gmat, obmat, mat);
+			}
+			else {
+				/* needed if object transformation isn't identity */
+				copy_m3_m4(obmat, ob->obmat);
+				mul_m3_m3m3(gmat, obmat, tmat);
+			}
+
+			normalize_m3(gmat);
+			return 1;
+		}
+	}
+	else {
+		if (test_rotmode_euler(ob->rotmode)) {
+			eulO_to_gimbal_axis(gmat, ob->rot, ob->rotmode);
+		}
+		else if (ob->rotmode == ROT_MODE_AXISANGLE) {
+			axis_angle_to_gimbal_axis(gmat, ob->rotAxis, ob->rotAngle);
+		}
+		else { /* quat */
+			return 0;
+		}
+
+		if (ob->parent) {
+			float parent_mat[3][3];
+			copy_m3_m4(parent_mat, ob->parent->obmat);
+			normalize_m3(parent_mat);
+			mul_m3_m3m3(gmat, parent_mat, gmat);
+		}
+		return 1;
+	}
+
+	return 0;
+}
+
+
+/* centroid, boundbox, of selection */
+/* returns total items selected */
+int ED_transform_calc_manipulator_stats(
+        const bContext *C,
+        const struct TransformCalcParams *params,
+        struct TransformBounds *tbounds)
+{
+	const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *obedit = CTX_data_edit_object(C);
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
+	Base *base;
+	Object *ob = OBACT(view_layer);
+	Object *ob_eval = NULL;
+	Object *obedit_eval = NULL;
+	bGPdata *gpd = CTX_data_gpencil_data(C);
+	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
+	int a, totsel = 0;
+	const int pivot_point = scene->toolsettings->transform_pivot_point;
+
+	/* transform widget matrix */
+	unit_m4(rv3d->twmat);
+
+	unit_m3(rv3d->tw_axis_matrix);
+	zero_v3(rv3d->tw_axis_min);
+	zero_v3(rv3d->tw_axis_max);
+
+	rv3d->twdrawflag = 0xFFFF;
+
+	ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+	obedit_eval = DEG_get_evaluated_object(depsgraph, obedit);
+
+	/* global, local or normal orientation?
+	 * if we could check 'totsel' now, this should be skipped with no selection. */
+	if (ob && !is_gp_edit) {
+		const short orientation_type = params->orientation_type ? (params->orientation_type - 1) : scene->orientation_type;
+
+		switch (orientation_type) {
+
+			case V3D_MANIP_GLOBAL:
+			{
+				break; /* nothing to do */
+			}
+			case V3D_MANIP_GIMBAL:
+			{
+				float mat[3][3];
+				if (gimbal_axis(ob_eval, mat)) {
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
+				/* if not gimbal, fall through to normal */
+				ATTR_FALLTHROUGH;
+			}
+			case V3D_MANIP_NORMAL:
+			{
+				if (obedit || ob->mode & OB_MODE_POSE) {
+					float mat[3][3];
+					ED_getTransformOrientationMatrix(C, mat, pivot_point);
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
+				/* no break we define 'normal' as 'local' in Object mode */
+				ATTR_FALLTHROUGH;
+			}
+			case V3D_MANIP_LOCAL:
+			{
+				if (ob->mode & OB_MODE_POSE) {
+					/* each bone moves on its own local axis, but  to avoid confusion,
+					 * use the active pones axis for display [#33575], this works as expected on a single bone
+					 * and users who select many bones will understand whats going on and what local means
+					 * when they start transforming */
+					float mat[3][3];
+					ED_getTransformOrientationMatrix(C, mat, pivot_point);
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
+				copy_m4_m4(rv3d->twmat, ob_eval->obmat);
+				normalize_m4(rv3d->twmat);
+				break;
+			}
+			case V3D_MANIP_VIEW:
+			{
+				float mat[3][3];
+				copy_m3_m4(mat, rv3d->viewinv);
+				normalize_m3(mat);
+				copy_m4_m3(rv3d->twmat, mat);
+				break;
+			}
+			case V3D_MANIP_CURSOR:
+			{
+				float mat[3][3];
+				ED_view3d_cursor3d_calc_mat3(scene, v3d, mat);
+				copy_m4_m3(rv3d->twmat, mat);
+				break;
+			}
+			case V3D_MANIP_CUSTOM:
+			{
+				TransformOrientation *custom_orientation = BKE_scene_transform_orientation_find(
+				        scene, scene->orientation_index_custom);
+				float mat[3][3];
+
+				if (applyTransformOrientation(custom_orientation, mat, NULL)) {
+					copy_m4_m3(rv3d->twmat, mat);
+				}
+				break;
+			}
+		}
+	}
+
+	/* transform widget centroid/center */
+	INIT_MINMAX(tbounds->min, tbounds->max);
+	zero_v3(tbounds->center);
+
+	copy_m3_m4(tbounds->axis, rv3d->twmat);
+	if (params->use_local_axis && (ob && ob->mode & OB_MODE_EDIT)) {
+		float diff_mat[3][3];
+		copy_m3_m4(diff_mat, ob_eval->obmat);
+		normalize_m3(diff_mat);
+		invert_m3(diff_mat);
+		mul_m3_m3m3(tbounds->axis, tbounds->axis, diff_mat);
+		normalize_m3(tbounds->axis);
+	}
+
+	for (int i = 0; i < 3; i++) {
+		tbounds->axis_min[i] = +FLT_MAX;
+		tbounds->axis_max[i] = -FLT_MAX;
+	}
+
+	if (is_gp_edit) {
+		float diff_mat[4][4];
+		float fpt[3];
+
+		for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+			/* only editable and visible layers are considered */
+			if (gpencil_layer_is_editable(gpl) && (gpl->actframe != NULL)) {
+
+				/* calculate difference matrix if parent object */
+				if (gpl->parent != NULL) {
+					ED_gpencil_parent_location(gpl, diff_mat);
+				}
+
+				for (bGPDstroke *gps = gpl->actframe->strokes.first; gps; gps = gps->next) {
+					/* skip strokes that are invalid for current view */
+					if (ED_gpencil_stroke_can_use(C, gps) == false) {
+						continue;
+					}
+
+					/* we're only interested in selected points here... */
+					if (gps->flag & GP_STROKE_SELECT) {
+						bGPDspoint *pt;
+						int i;
+
+						/* Change selection status of all points, then make the stroke match */
+						for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+							if (pt->flag & GP_SPOINT_SELECT) {
+								if (gpl->parent == NULL) {
+									calc_tw_center(tbounds, &pt->x);
+									totsel++;
+								}
+								else {
+									mul_v3_m4v3(fpt, diff_mat, &pt->x);
+									calc_tw_center(tbounds, fpt);
+									totsel++;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+
+		/* selection center */
+		if (totsel) {
+			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);   /* centroid! */
+		}
+	}
+	else if (obedit) {
+		ob = obedit;
+		ob_eval = obedit_eval;
+		if (obedit->type == OB_MESH) {
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
+			BMEditSelection ese;
+			float vec[3] = {0, 0, 0};
+
+			/* USE LAST SELECTE WITH ACTIVE */
+			if ((pivot_point == V3D_AROUND_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) {
+				BM_editselection_center(&ese, vec);
+				calc_tw_center(tbounds, vec);
+				totsel = 1;
+			}
+			else {
+				BMesh *bm = em->bm;
+				BMVert *eve;
+
+				BMIter iter;
+
+				BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+					if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+							totsel++;
+							calc_tw_center(tbounds, eve->co);
+						}
+					}
+				}
+			}
+		} /* end editmesh */
+		else if (obedit->type == OB_ARMATURE) {
+			bArmature *arm = obedit->data;
+			EditBone *ebo;
+
+			if ((pivot_point == V3D_AROUND_ACTIVE) && (ebo = arm->act_edbone)) {
+				/* doesn't check selection or visibility intentionally */
+				if (ebo->flag & BONE_TIPSEL) {
+					calc_tw_center(tbounds, ebo->tail);
+					totsel++;
+				}
+				if ((ebo->flag & BONE_ROOTSEL) ||
+				    ((ebo->flag & BONE_TIPSEL) == false))  /* ensure we get at least one point */
+				{
+					calc_tw_center(tbounds, ebo->head);
+					totsel++;
+				}
+				protectflag_to_drawflags_ebone(rv3d, ebo);
+			}
+			else {
+				for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
+					if (EBONE_VISIBLE(arm, ebo)) {
+						if (ebo->flag & BONE_TIPSEL) {
+							calc_tw_center(tbounds, ebo->tail);
+							totsel++;
+						}
+						if ((ebo->flag & BONE_ROOTSEL) &&
+						    /* don't include same point multiple times */
+						    ((ebo->flag & BONE_CONNECTED) &&
+						     (ebo->parent != NULL) &&
+						     (ebo->parent->flag & BONE_TIPSEL) &&
+						     EBONE_VISIBLE(arm, ebo->parent)) == 0)
+						{
+							calc_tw_center(tbounds, ebo->head);
+							totsel++;
+						}
+						if (ebo->flag & BONE_SELECTED) {
+							protectflag_to_drawflags_ebone(rv3d, ebo);
+						}
+					}
+				}
+			}
+		}
+		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
+			Curve *cu = obedit->data;
+			float center[3];
+
+			if ((pivot_point == V3D_AROUND_ACTIVE) && ED_curve_active_center(cu, center)) {
+				calc_tw_center(tbounds, center);
+				totsel++;
+			}
+			else {
+				Nurb *nu;
+				BezTriple *bezt;
+				BPoint *bp;
+				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
+
+				nu = nurbs->first;
+				while (nu) {
+					if (nu->type == CU_BEZIER) {
+						bezt = nu->bezt;
+						a = nu->pntsu;
+						while (a--) {
+							/* exceptions
+							 * if handles are hidden then only check the center points.
+							 * If the center knot is selected then only use this as the center point.
+							 */
+							if (cu->drawflag & CU_HIDE_HANDLES) {
+								if (bezt->f2 & SELECT) {
+									calc_tw_center(tbounds, bezt->vec[1]);
+									totsel++;
+								}
+							}
+							else if (bezt->f2 & SELECT) {
+								calc_tw_center(tbounds, bezt->vec[1]);
+								totsel++;
+							}
+							else {
+								if (bezt->f1 & SELECT) {
+									calc_tw_center(
+									        tbounds, bezt->vec[(pivot_point == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 0]);
+									totsel++;
+								}
+								if (bezt->f3 & SELECT) {
+									calc_tw_center(
+									        tbounds, bezt->vec[(pivot_point == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 2]);
+									totsel++;
+								}
+							}
+							bezt++;
+						}
+					}
+					else {
+						bp = nu->bp;
+						a = nu->pntsu * nu->pntsv;
+						while (a--) {
+							if (bp->f1 & SELECT) {
+								calc_tw_center(tbounds, bp->vec);
+								totsel++;
+							}
+							bp++;
+						}
+					}
+					nu = nu->next;
+				}
+			}
+		}
+		else if (obedit->type == OB_MBALL) {
+			MetaBall *mb = (MetaBall *)obedit->data;
+			MetaElem *ml;
+
+			if ((pivot_point == V3D_AROUND_ACTIVE) && (ml = mb->lastelem)) {
+				calc_tw_center(tbounds, &ml->x);
+				totsel++;
+			}
+			else {
+				for (ml = mb->editelems->first; ml; ml = ml->next) {
+					if (ml->flag & SELECT) {
+						calc_tw_center(tbounds, &ml->x);
+						totsel++;
+					}
+				}
+			}
+		}
+		else if (obedit->type == OB_LATTICE) {
+			Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
+			BPoint *bp;
+
+			if ((pivot_point == V3D_AROUND_ACTIVE) && (bp = BKE_lattice_active_point_get(lt))) {
+				calc_tw_center(tbounds, bp->vec);
+				totsel++;
+			}
+			else {
+				bp = lt->def;
+				a = lt->pntsu * lt->pntsv * lt->pntsw;
+				while (a--) {
+					if (bp->f1 & SELECT) {
+						calc_tw_center(tbounds, bp->vec);
+						totsel++;
+					}
+					bp++;
+				}
+			}
+		}
+
+		/* selection center */
+		if (totsel) {
+			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);   // centroid!
+			mul_m4_v3(obedit_eval->obmat, tbounds->center);
+			mul_m4_v3(obedit_eval->obmat, tbounds->min);
+			mul_m4_v3(obedit_eval->obmat, tbounds->max);
+		}
+	}
+	else if (ob && (ob->mode & OB_MODE_POSE)) {
+		bPoseChannel *pchan;
+		int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed
+		bool ok = false;
+
+		if ((pivot_point == V3D_AROUND_ACTIVE) && (pchan = BKE_pose_channel_active(ob_eval))) {
+			/* doesn't check selection or visibility intentionally */
+			Bone *bone = pchan->bone;
+			if (bone) {
+				calc_tw_center(tbounds, pchan->pose_head);
+				protectflag_to_drawflags_pchan(rv3d, pchan);
+				totsel = 1;
+				ok = true;
+			}
+		}
+		else {
+			totsel = count_set_pose_transflags(&mode, 0, ob_eval);
+
+			if (totsel) {
+				/* use channels to get stats */
+				for (pchan = ob_eval->pose->chanbase.first; pchan; pchan = pchan->next) {
+					Bone *bone = pchan->bone;
+					if (bone && (bone->flag & BONE_TRANSFORM)) {
+						calc_tw_center(tbounds, pchan->pose_head);
+						protectflag_to_drawflags_pchan(rv3d, pchan);
+					}
+				}
+				ok = true;
+			}
+		}
+
+		if (ok) {
+			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);   // centroid!
+			mul_m4_v3(ob_eval->obmat, tbounds->center);
+			mul_m4_v3(ob_eval->obmat, tbounds->min);
+			mul_m4_v3(ob_eval->obmat, tbounds->max);
+		}
+	}
+	else if (ob && (ob->mode & OB_MODE_ALL_PAINT)) {
+		/* pass */
+	}
+	else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
+		PTCacheEdit *edit = PE_get_current(scene, ob);
+		PTCacheEditPoint *point;
+		PTCacheEditKey *ek;
+		int k;
+
+		if (edit) {
+			point = edit->points;
+			for (a = 0; a < edit->totpoint; a++, point++) {
+				if (point->flag & PEP_HIDE) continue;
+
+				for (k = 0, ek = point->keys; k < point->totkey; k++, ek++) {
+					if (ek->flag & PEK_SELECT) {
+						calc_tw_center(tbounds, (ek->flag & PEK_USE_WCO) ? ek->world_co : ek->co);
+						totsel++;
+					}
+				}
+			}
+
+			/* selection center */
+			if (totsel)
+				mul_v3_fl(tbounds->center, 1.0f / (float)totsel);  // centroid!
+		}
+	}
+	else {
+
+		/* we need the one selected object, if its not active */
+		base = BASACT(view_layer);
+		ob = OBACT(view_layer);
+		if (base && ((base->flag & BASE_SELECTED) == 0)) ob = NULL;
+
+		for (base = view_layer->object_bases.first; base; base = base->next) {
+			if (!TESTBASELIB(base)) {
+				continue;
+			}
+			Object *base_object_eval = DEG_get_evaluated_object(depsgraph, base->object);
+			if (ob == NULL) {
+				ob = base->object;
+				ob_eval = base_object_eval;
+			}
+			if (params->use_only_center || base_object_eval->bb == NULL) {
+				calc_tw_center(tbounds, base_object_eval->obmat[3]);
+			}
+			else {
+				for (uint j = 0; j < 8; j++) {
+					float co[3];
+					mul_v3_m4v3(co, base_object_eval->obmat, base_object_eval->bb->vec[j]);
+					calc_tw_center(tbounds, co);
+				}
+			}
+			protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
+			totsel++;
+		}
+
+		/* selection center */
+		if (totsel) {
+			mul_v3_fl(tbounds->center, 1.0f / (float)totsel);   // centroid!
+		}
+	}
+
+	if (totsel == 0) {
+		unit_m4(rv3d->twmat);
+	}
+	else {
+		copy_v3_v3(rv3d->tw_axis_min, tbounds->axis_min);
+		copy_v3_v3(rv3d->tw_axis_max, tbounds->axis_max);
+		copy_m3_m3(rv3d->tw_axis_matrix, tbounds->axis);
+	}
+
+	return totsel;
+}
+
+static void manipulator_get_idot(RegionView3D *rv3d, float r_idot[3])
+{
+	float view_vec[3], axis_vec[3];
+	ED_view3d_global_to_vector(rv3d, rv3d->twmat[3], view_vec);
+	for (int i = 0; i < 3; i++) {
+		normalize_v3_v3(axis_vec, rv3d->twmat[i]);
+		r_idot[i] = 1.0f - fabsf(dot_v3v3(view_vec, axis_vec));
+	}
+}
+
+static void manipulator_prepare_mat(
+        const bContext *C, View3D *v3d, RegionView3D *rv3d, const struct TransformBounds *tbounds)
+{
+	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+
+	switch (scene->toolsettings->transform_pivot_point) {
+		case V3D_AROUND_CENTER_BOUNDS:
+		case V3D_AROUND_ACTIVE:
+		{
+			bGPdata *gpd = CTX_data_gpencil_data(C);
+			Object *ob = OBACT(view_layer);
+
+			if (((scene->toolsettings->transform_pivot_point == V3D_AROUND_ACTIVE) &&
+			     (OBEDIT_FROM_OBACT(ob) == NULL)) &&
+			    ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
+			    (!(ob->mode & OB_MODE_POSE)))
+			{
+				copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
+			}
+			else {
+				mid_v3_v3v3(rv3d->twmat[3], tbounds->min, tbounds->max);
+			}
+			break;
+		}
+		case V3D_AROUND_LOCAL_ORIGINS:
+		case V3D_AROUND_CENTER_MEAN:
+			copy_v3_v3(rv3d->twmat[3], tbounds->center);
+			break;
+		case V3D_AROUND_CURSOR:
+			copy_v3_v3(rv3d->twmat[3], ED_view3d_cursor3d_get(scene, v3d)->location);
+			break;
+	}
+}
+
+/**
+ * Sets up \a r_start and \a r_len to define arrow line range.
+ * Needed to adjust line drawing for combined manipulator axis types.
+ */
+static void manipulator_line_range(const int twtype, const short axis_type, float *r_start, float *r_len)
+{
+	const float ofs = 0.2f;
+
+	*r_start = 0.2f;
+	*r_len = 1.0f;
+
+	switch (axis_type) {
+		case MAN_AXES_TRANSLATE:
+			if (twtype & V3D_MANIP_SCALE) {
+				*r_start = *r_len - ofs + 0.075f;
+			}
+			if (twtype & V3D_MANIP_ROTATE) {
+				*r_len += ofs;
+			}
+			break;
+		case MAN_AXES_SCALE:
+			if (twtype & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE)) {
+				*r_len -= ofs + 0.025f;
+			}
+			break;
+	}
+
+	*r_len -= *r_start;
+}
+
+static void manipulator_xform_message_subscribe(
+        wmManipulatorGroup *mgroup, struct wmMsgBus *mbus,
+        Scene *scene, bScreen *UNUSED(screen), ScrArea *UNUSED(sa), ARegion *ar, const void *type_fn)
+{
+	/* Subscribe to view properties */
+	wmMsgSubscribeValue msg_sub_value_mpr_tag_refresh = {
+		.owner = ar,
+		.user_data = mgroup->parent_mmap,
+		.notify = WM_manipulator_do_msg_notify_tag_refresh,
+	};
+
+	PointerRNA scene_ptr;
+	RNA_id_pointer_create(&scene->id, &scene_ptr);
+
+	{
+		extern PropertyRNA rna_Scene_transform_orientation;
+		extern PropertyRNA rna_Scene_cursor_location;
+		const PropertyRNA *props[] = {
+			&rna_Scene_transform_orientation,
+			(scene->toolsettings->transform_pivot_point == V3D_AROUND_CURSOR) ? &rna_Scene_cursor_location : NULL,
+		};
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			if (props[i]) {
+				WM_msg_subscribe_rna(mbus, &scene_ptr, props[i], &msg_sub_value_mpr_tag_refresh, __func__);
+			}
+		}
+	}
+
+	PointerRNA toolsettings_ptr;
+	RNA_pointer_create(&scene->id, &RNA_ToolSettings, scene->toolsettings, &toolsettings_ptr);
+
+	if (type_fn == TRANSFORM_WGT_manipulator) {
+		extern PropertyRNA rna_ToolSettings_transform_pivot_point;
+		const PropertyRNA *props[] = {
+			&rna_ToolSettings_transform_pivot_point
+		};
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
+			WM_msg_subscribe_rna(mbus, &toolsettings_ptr, props[i], &msg_sub_value_mpr_tag_refresh, __func__);
+		}
+	}
+	else if (type_fn == VIEW3D_WGT_xform_cage) {
+		/* pass */
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_mpr_tag_refresh);
+}
+
+/** \} */
+
+
+/* -------------------------------------------------------------------- */
+/** \name Transform Manipulator
+ * \{ */
+
+static ManipulatorGroup *manipulatorgroup_init(wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup *man;
+
+	man = MEM_callocN(sizeof(ManipulatorGroup), "manipulator_data");
+
+	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
+	const wmManipulatorType *wt_dial = WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true);
+	const wmManipulatorType *wt_prim = WM_manipulatortype_find("MANIPULATOR_WT_primitive_3d", true);
+
+#define MANIPULATOR_NEW_ARROW(v, draw_style) { \
+	man->manipulators[v] = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL); \
+	RNA_enum_set(man->manipulators[v]->ptr, "draw_style", draw_style); \
+} ((void)0)
+#define MANIPULATOR_NEW_DIAL(v, draw_options) { \
+	man->manipulators[v] = WM_manipulator_new_ptr(wt_dial, mgroup, NULL); \
+	RNA_enum_set(man->manipulators[v]->ptr, "draw_options", draw_options); \
+} ((void)0)
+#define MANIPULATOR_NEW_PRIM(v, draw_style) { \
+	man->manipulators[v] = WM_manipulator_new_ptr(wt_prim, mgroup, NULL); \
+	RNA_enum_set(man->manipulators[v]->ptr, "draw_style", draw_style); \
+} ((void)0)
+
+	/* add/init widgets - order matters! */
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_ROT_T, ED_MANIPULATOR_DIAL_DRAW_FLAG_FILL);
+
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_SCALE_C, ED_MANIPULATOR_DIAL_DRAW_FLAG_NOP);
+
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_SCALE_X, ED_MANIPULATOR_ARROW_STYLE_BOX);
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_SCALE_Y, ED_MANIPULATOR_ARROW_STYLE_BOX);
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_SCALE_Z, ED_MANIPULATOR_ARROW_STYLE_BOX);
+
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_SCALE_XY, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_SCALE_YZ, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_SCALE_ZX, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_ROT_X, ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP);
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_ROT_Y, ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP);
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_ROT_Z, ED_MANIPULATOR_DIAL_DRAW_FLAG_CLIP);
+
+	/* init screen aligned widget last here, looks better, behaves better */
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_ROT_C, ED_MANIPULATOR_DIAL_DRAW_FLAG_NOP);
+
+	MANIPULATOR_NEW_DIAL(MAN_AXIS_TRANS_C, ED_MANIPULATOR_DIAL_DRAW_FLAG_NOP);
+
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_TRANS_X, ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_TRANS_Y, ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+	MANIPULATOR_NEW_ARROW(MAN_AXIS_TRANS_Z, ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_TRANS_XY, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_TRANS_YZ, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+	MANIPULATOR_NEW_PRIM(MAN_AXIS_TRANS_ZX, ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE);
+
+	return man;
+}
+
+/**
+ * Custom handler for manipulator widgets
+ */
+static int manipulator_modal(
+        bContext *C, wmManipulator *widget, const wmEvent *UNUSED(event),
+        eWM_ManipulatorTweak UNUSED(tweak_flag))
+{
+	const ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
+	struct TransformBounds tbounds;
+
+
+	if (ED_transform_calc_manipulator_stats(
+	            C, &(struct TransformCalcParams){
+	                .use_only_center = true,
+	            }, &tbounds))
+	{
+		manipulator_prepare_mat(C, v3d, rv3d, &tbounds);
+		WM_manipulator_set_matrix_location(widget, rv3d->twmat[3]);
+	}
+
+	ED_region_tag_redraw(ar);
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static void WIDGETGROUP_manipulator_setup(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup *man = manipulatorgroup_init(mgroup);
+	struct {
+		wmOperatorType *translate, *rotate, *trackball, *resize;
+	} ot_store = {NULL};
+
+	mgroup->customdata = man;
+
+	{
+		/* TODO: support mixing modes again? - it's supported but tool system makes it unobvious. */
+		man->twtype = 0;
+		ScrArea *sa = CTX_wm_area(C);
+		bToolRef_Runtime *tref_rt = sa->runtime.tool ? sa->runtime.tool->runtime : NULL;
+		wmKeyMap *km = tref_rt ? WM_keymap_find_all(C, tref_rt->keymap, sa->spacetype, RGN_TYPE_WINDOW) : NULL;
+		/* Weak, check first event */
+		wmKeyMapItem *kmi = km ? km->items.first : NULL;
+
+		if (kmi == NULL) {
+			man->twtype |= V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE | V3D_MANIP_SCALE;
+		}
+		else if (STREQ(kmi->idname, "TRANSFORM_OT_translate")) {
+			man->twtype |= V3D_MANIP_TRANSLATE;
+		}
+		else if (STREQ(kmi->idname, "TRANSFORM_OT_rotate")) {
+			man->twtype |= V3D_MANIP_ROTATE;
+		}
+		else if (STREQ(kmi->idname, "TRANSFORM_OT_resize")) {
+			man->twtype |= V3D_MANIP_SCALE;
+		}
+		BLI_assert(man->twtype != 0);
+	}
+
+	/* *** set properties for axes *** */
+
+	MAN_ITER_AXES_BEGIN(axis, axis_idx)
+	{
+		const short axis_type = manipulator_get_axis_type(axis_idx);
+		int constraint_axis[3] = {1, 0, 0};
+		PointerRNA *ptr;
+
+		manipulator_get_axis_constraint(axis_idx, constraint_axis);
+
+		/* custom handler! */
+		WM_manipulator_set_fn_custom_modal(axis, manipulator_modal);
+
+		switch (axis_idx) {
+			case MAN_AXIS_TRANS_X:
+			case MAN_AXIS_TRANS_Y:
+			case MAN_AXIS_TRANS_Z:
+			case MAN_AXIS_SCALE_X:
+			case MAN_AXIS_SCALE_Y:
+			case MAN_AXIS_SCALE_Z:
+				WM_manipulator_set_line_width(axis, MANIPULATOR_AXIS_LINE_WIDTH);
+				break;
+			case MAN_AXIS_ROT_X:
+			case MAN_AXIS_ROT_Y:
+			case MAN_AXIS_ROT_Z:
+				/* increased line width for better display */
+				WM_manipulator_set_line_width(axis, MANIPULATOR_AXIS_LINE_WIDTH + 1.0f);
+				WM_manipulator_set_flag(axis, WM_MANIPULATOR_DRAW_VALUE, true);
+				break;
+			case MAN_AXIS_TRANS_XY:
+			case MAN_AXIS_TRANS_YZ:
+			case MAN_AXIS_TRANS_ZX:
+			case MAN_AXIS_SCALE_XY:
+			case MAN_AXIS_SCALE_YZ:
+			case MAN_AXIS_SCALE_ZX:
+			{
+				const float ofs_ax = 7.0f;
+				const float ofs[3] = {ofs_ax, ofs_ax, 0.0f};
+				WM_manipulator_set_scale(axis, 0.07f);
+				WM_manipulator_set_matrix_offset_location(axis, ofs);
+				WM_manipulator_set_flag(axis, WM_MANIPULATOR_DRAW_OFFSET_SCALE, true);
+				break;
+			}
+			case MAN_AXIS_TRANS_C:
+			case MAN_AXIS_ROT_C:
+			case MAN_AXIS_SCALE_C:
+			case MAN_AXIS_ROT_T:
+				WM_manipulator_set_line_width(axis, MANIPULATOR_AXIS_LINE_WIDTH);
+				if (axis_idx == MAN_AXIS_ROT_T) {
+					WM_manipulator_set_flag(axis, WM_MANIPULATOR_DRAW_HOVER, true);
+				}
+				else if (axis_idx == MAN_AXIS_ROT_C) {
+					WM_manipulator_set_flag(axis, WM_MANIPULATOR_DRAW_VALUE, true);
+				}
+				else {
+					WM_manipulator_set_scale(axis, 0.2f);
+				}
+				break;
+		}
+
+		switch (axis_type) {
+			case MAN_AXES_TRANSLATE:
+				if (ot_store.translate == NULL) {
+					ot_store.translate = WM_operatortype_find("TRANSFORM_OT_translate", true);
+				}
+				ptr = WM_manipulator_operator_set(axis, 0, ot_store.translate, NULL);
+				break;
+			case MAN_AXES_ROTATE:
+			{
+				wmOperatorType *ot_rotate;
+				if (axis_idx == MAN_AXIS_ROT_T) {
+					if (ot_store.trackball == NULL) {
+						ot_store.trackball = WM_operatortype_find("TRANSFORM_OT_trackball", true);
+					}
+					ot_rotate = ot_store.trackball;
+				}
+				else {
+					if (ot_store.rotate == NULL) {
+						ot_store.rotate = WM_operatortype_find("TRANSFORM_OT_rotate", true);
+					}
+					ot_rotate = ot_store.rotate;
+				}
+				ptr = WM_manipulator_operator_set(axis, 0, ot_rotate, NULL);
+				break;
+			}
+			case MAN_AXES_SCALE:
+			{
+				if (ot_store.resize == NULL) {
+					ot_store.resize = WM_operatortype_find("TRANSFORM_OT_resize", true);
+				}
+				ptr = WM_manipulator_operator_set(axis, 0, ot_store.resize, NULL);
+				break;
+			}
+		}
+
+		{
+			PropertyRNA *prop;
+			if ((prop = RNA_struct_find_property(ptr, "constraint_axis"))) {
+				RNA_property_boolean_set_array(ptr, prop, constraint_axis);
+			}
+		}
+
+		RNA_boolean_set(ptr, "release_confirm", 1);
+	}
+	MAN_ITER_AXES_END;
+}
+
+static void WIDGETGROUP_manipulator_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup *man = mgroup->customdata;
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
+	struct TransformBounds tbounds;
+
+	/* skip, we don't draw anything anyway */
+	if ((man->all_hidden =
+	     (ED_transform_calc_manipulator_stats(
+	             C, &(struct TransformCalcParams){
+	                 .use_only_center = true,
+	             }, &tbounds) == 0)))
+	{
+		return;
+	}
+
+	manipulator_prepare_mat(C, v3d, rv3d, &tbounds);
+
+	/* *** set properties for axes *** */
+
+	MAN_ITER_AXES_BEGIN(axis, axis_idx)
+	{
+		const short axis_type = manipulator_get_axis_type(axis_idx);
+		const int aidx_norm = manipulator_orientation_axis(axis_idx, NULL);
+
+		WM_manipulator_set_matrix_location(axis, rv3d->twmat[3]);
+
+		switch (axis_idx) {
+			case MAN_AXIS_TRANS_X:
+			case MAN_AXIS_TRANS_Y:
+			case MAN_AXIS_TRANS_Z:
+			case MAN_AXIS_SCALE_X:
+			case MAN_AXIS_SCALE_Y:
+			case MAN_AXIS_SCALE_Z:
+			{
+				float start_co[3] = {0.0f, 0.0f, 0.0f};
+				float len;
+
+				manipulator_line_range(man->twtype, axis_type, &start_co[2], &len);
+
+				WM_manipulator_set_matrix_rotation_from_z_axis(axis, rv3d->twmat[aidx_norm]);
+				RNA_float_set(axis->ptr, "length", len);
+				WM_manipulator_set_matrix_offset_location(axis, start_co);
+				WM_manipulator_set_flag(axis, WM_MANIPULATOR_DRAW_OFFSET_SCALE, true);
+				break;
+			}
+			case MAN_AXIS_ROT_X:
+			case MAN_AXIS_ROT_Y:
+			case MAN_AXIS_ROT_Z:
+				WM_manipulator_set_matrix_rotation_from_z_axis(axis, rv3d->twmat[aidx_norm]);
+				break;
+			case MAN_AXIS_TRANS_XY:
+			case MAN_AXIS_TRANS_YZ:
+			case MAN_AXIS_TRANS_ZX:
+			case MAN_AXIS_SCALE_XY:
+			case MAN_AXIS_SCALE_YZ:
+			case MAN_AXIS_SCALE_ZX:
+			{
+				const float *y_axis = rv3d->twmat[aidx_norm - 1 < 0 ? 2 : aidx_norm - 1];
+				const float *z_axis = rv3d->twmat[aidx_norm];
+				WM_manipulator_set_matrix_rotation_from_yz_axis(axis, y_axis, z_axis);
+				break;
+			}
+		}
+	}
+	MAN_ITER_AXES_END;
+}
+
+static void WIDGETGROUP_manipulator_message_subscribe(
+        const bContext *C, wmManipulatorGroup *mgroup, struct wmMsgBus *mbus)
+{
+	Scene *scene = CTX_data_scene(C);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	manipulator_xform_message_subscribe(mgroup, mbus, scene, screen, sa, ar, TRANSFORM_WGT_manipulator);
+}
+
+static void WIDGETGROUP_manipulator_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ManipulatorGroup *man = mgroup->customdata;
+	// ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	// View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
+	float idot[3];
+
+	/* when looking through a selected camera, the manipulator can be at the
+	 * exact same position as the view, skip so we don't break selection */
+	if (man->all_hidden || fabsf(ED_view3d_pixel_size(rv3d, rv3d->twmat[3])) < 1e-6f) {
+		MAN_ITER_AXES_BEGIN(axis, axis_idx)
+		{
+			WM_manipulator_set_flag(axis, WM_MANIPULATOR_HIDDEN, true);
+		}
+		MAN_ITER_AXES_END;
+		return;
+	}
+	manipulator_get_idot(rv3d, idot);
+
+	/* *** set properties for axes *** */
+
+	MAN_ITER_AXES_BEGIN(axis, axis_idx)
+	{
+		const short axis_type = manipulator_get_axis_type(axis_idx);
+		/* XXX maybe unset _HIDDEN flag on redraw? */
+		if (manipulator_is_axis_visible(rv3d, man->twtype, idot, axis_type, axis_idx)) {
+			WM_manipulator_set_flag(axis, WM_MANIPULATOR_HIDDEN, false);
+		}
+		else {
+			WM_manipulator_set_flag(axis, WM_MANIPULATOR_HIDDEN, true);
+			continue;
+		}
+
+		float color[4], color_hi[4];
+		manipulator_get_axis_color(axis_idx, idot, color, color_hi);
+		WM_manipulator_set_color(axis, color);
+		WM_manipulator_set_color_highlight(axis, color_hi);
+
+		switch (axis_idx) {
+			case MAN_AXIS_TRANS_C:
+			case MAN_AXIS_ROT_C:
+			case MAN_AXIS_SCALE_C:
+			case MAN_AXIS_ROT_T:
+				WM_manipulator_set_matrix_rotation_from_z_axis(axis, rv3d->viewinv[2]);
+				break;
+		}
+	}
+	MAN_ITER_AXES_END;
+}
+
+static bool WIDGETGROUP_manipulator_poll(const struct bContext *C, struct wmManipulatorGroupType *wgt)
+{
+	/* it's a given we only use this in 3D view */
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	if (v3d && ((v3d->twflag & V3D_MANIPULATOR_DRAW)) == 0) {
+		return false;
+	}
+
+	bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C);
+	if ((tref_rt == NULL) ||
+	    !STREQ(wgt->idname, tref_rt->manipulator_group))
+	{
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+void TRANSFORM_WGT_manipulator(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Transform Manipulator";
+	wgt->idname = "TRANSFORM_WGT_manipulator";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = WIDGETGROUP_manipulator_poll;
+	wgt->setup = WIDGETGROUP_manipulator_setup;
+	wgt->refresh = WIDGETGROUP_manipulator_refresh;
+	wgt->message_subscribe = WIDGETGROUP_manipulator_message_subscribe;
+	wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
+}
+
+/** \} */
+
+
+/* -------------------------------------------------------------------- */
+/** \name Scale Cage Manipulator
+ * \{ */
+
+struct XFormCageWidgetGroup {
+	wmManipulator *manipulator;
+};
+
+static bool WIDGETGROUP_xform_cage_poll(const bContext *C, wmManipulatorGroupType *wgt)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	if (v3d && ((v3d->twflag & V3D_MANIPULATOR_DRAW)) == 0) {
+		return false;
+	}
+
+	bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C);
+	if (!STREQ(wgt->idname, tref_rt->manipulator_group)) {
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
+		return false;
+	}
+	return true;
+}
+
+static void WIDGETGROUP_xform_cage_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+{
+	struct XFormCageWidgetGroup *xmgroup = MEM_mallocN(sizeof(struct XFormCageWidgetGroup), __func__);
+	const wmManipulatorType *wt_cage = WM_manipulatortype_find("MANIPULATOR_WT_cage_3d", true);
+	xmgroup->manipulator = WM_manipulator_new_ptr(wt_cage, mgroup, NULL);
+	wmManipulator *mpr = xmgroup->manipulator;
+
+	RNA_enum_set(mpr->ptr, "transform",
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE |
+	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE);
+
+	mpr->color[0] = 1;
+	mpr->color_hi[0] = 1;
+
+	mgroup->customdata = xmgroup;
+
+	{
+		wmOperatorType *ot_resize = WM_operatortype_find("TRANSFORM_OT_resize", true);
+		PointerRNA *ptr;
+
+		/* assign operator */
+		PropertyRNA *prop_release_confirm = NULL;
+		PropertyRNA *prop_constraint_axis = NULL;
+
+		int i = ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z;
+		for (int x = 0; x < 3; x++) {
+			for (int y = 0; y < 3; y++) {
+				for (int z = 0; z < 3; z++) {
+					int constraint[3] = {x != 1, y != 1, z != 1};
+					ptr = WM_manipulator_operator_set(mpr, i, ot_resize, NULL);
+					if (prop_release_confirm == NULL) {
+						prop_release_confirm = RNA_struct_find_property(ptr, "release_confirm");
+						prop_constraint_axis = RNA_struct_find_property(ptr, "constraint_axis");
+					}
+					RNA_property_boolean_set(ptr, prop_release_confirm, true);
+					RNA_property_boolean_set_array(ptr, prop_constraint_axis, constraint);
+					i++;
+				}
+			}
+		}
+	}
+}
+
+static void WIDGETGROUP_xform_cage_refresh(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	ARegion *ar = CTX_wm_region(C);
+	RegionView3D *rv3d = ar->regiondata;
+
+	struct XFormCageWidgetGroup *xmgroup = mgroup->customdata;
+	wmManipulator *mpr = xmgroup->manipulator;
+
+	struct TransformBounds tbounds;
+
+	if ((ED_transform_calc_manipulator_stats(
+	             C, &(struct TransformCalcParams) {
+	                 .use_local_axis = true,
+	             }, &tbounds) == 0) ||
+	    equals_v3v3(rv3d->tw_axis_min, rv3d->tw_axis_max))
+	{
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true);
+	}
+	else {
+		manipulator_prepare_mat(C, v3d, rv3d, &tbounds);
+
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false);
+		WM_manipulator_set_flag(mpr, WM_MANIPULATOR_GRAB_CURSOR, true);
+
+		float dims[3];
+		sub_v3_v3v3(dims, rv3d->tw_axis_max, rv3d->tw_axis_min);
+		RNA_float_set_array(mpr->ptr, "dimensions", dims);
+		mul_v3_fl(dims, 0.5f);
+
+		copy_m4_m3(mpr->matrix_offset, rv3d->tw_axis_matrix);
+		mid_v3_v3v3(mpr->matrix_offset[3], rv3d->tw_axis_max, rv3d->tw_axis_min);
+		mul_m3_v3(rv3d->tw_axis_matrix, mpr->matrix_offset[3]);
+
+		PropertyRNA *prop_center_override = NULL;
+		float center[3];
+		float center_global[3];
+		int i = ED_MANIPULATOR_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z;
+		for (int x = 0; x < 3; x++) {
+			center[0] = (float)(1 - x) * dims[0];
+			for (int y = 0; y < 3; y++) {
+				center[1] = (float)(1 - y) * dims[1];
+				for (int z = 0; z < 3; z++) {
+					center[2] = (float)(1 - z) * dims[2];
+					struct wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, i);
+					if (prop_center_override == NULL) {
+						prop_center_override = RNA_struct_find_property(&mpop->ptr, "center_override");
+					}
+					mul_v3_m4v3(center_global, mpr->matrix_offset, center);
+					RNA_property_float_set_array(&mpop->ptr, prop_center_override, center_global);
+					i++;
+				}
+			}
+		}
+	}
+}
+
+static void WIDGETGROUP_xform_cage_message_subscribe(
+        const bContext *C, wmManipulatorGroup *mgroup, struct wmMsgBus *mbus)
+{
+	Scene *scene = CTX_data_scene(C);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	manipulator_xform_message_subscribe(mgroup, mbus, scene, screen, sa, ar, VIEW3D_WGT_xform_cage);
+}
+
+static void WIDGETGROUP_xform_cage_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup)
+{
+	struct XFormCageWidgetGroup *xmgroup = mgroup->customdata;
+	wmManipulator *mpr = xmgroup->manipulator;
+
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	Object *ob = OBACT(view_layer);
+	if (ob && ob->mode & OB_MODE_EDIT) {
+		copy_m4_m4(mpr->matrix_space, ob->obmat);
+	}
+	else {
+		unit_m4(mpr->matrix_space);
+	}
+}
+
+void VIEW3D_WGT_xform_cage(wmManipulatorGroupType *wgt)
+{
+	wgt->name = "Transform Cage";
+	wgt->idname = "VIEW3D_WGT_xform_cage";
+
+	wgt->flag |= WM_MANIPULATORGROUPTYPE_3D;
+
+	wgt->mmap_params.spaceid = SPACE_VIEW3D;
+	wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
+
+	wgt->poll = WIDGETGROUP_xform_cage_poll;
+	wgt->setup = WIDGETGROUP_xform_cage_setup;
+	wgt->refresh = WIDGETGROUP_xform_cage_refresh;
+	wgt->message_subscribe = WIDGETGROUP_xform_cage_message_subscribe;
+	wgt->draw_prepare = WIDGETGROUP_xform_cage_draw_prepare;
+}
+
+/** \} */
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 4157b69fded..1e49d1545af 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -160,11 +160,12 @@ const EnumPropertyItem rna_enum_transform_mode_types[] =
 
 static int select_orientation_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene = CTX_data_scene(C);
 	int orientation = RNA_enum_get(op->ptr, "orientation");
 
-	BIF_selectTransformOrientationValue(C, orientation);
+	BIF_selectTransformOrientationValue(scene, orientation);
 
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+	WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -205,13 +206,10 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot)
 
 static int delete_orientation_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	View3D *v3d = CTX_wm_view3d(C);
-	int selected_index = (v3d->twmode - V3D_MANIP_CUSTOM);
+	Scene *scene = CTX_data_scene(C);
+	BIF_removeTransformOrientationIndex(C, scene->orientation_index_custom);
 
-	BIF_removeTransformOrientationIndex(C, selected_index);
-
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
-	WM_event_add_notifier(C, NC_SCENE | NA_EDITED, CTX_data_scene(C));
+	WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
 
 	return OPERATOR_FINISHED;
 }
@@ -223,18 +221,12 @@ static int delete_orientation_invoke(bContext *C, wmOperator *op, const wmEvent
 
 static int delete_orientation_poll(bContext *C)
 {
-	int selected_index = -1;
-	View3D *v3d = CTX_wm_view3d(C);
+	Scene *scene = CTX_data_scene(C);
 
 	if (ED_operator_areaactive(C) == 0)
 		return 0;
 
-
-	if (v3d) {
-		selected_index = (v3d->twmode - V3D_MANIP_CUSTOM);
-	}
-
-	return selected_index >= 0;
+	return (scene->orientation_type >= V3D_MANIP_CUSTOM) && (scene->orientation_index_custom != -1);
 }
 
 static void TRANSFORM_OT_delete_orientation(struct wmOperatorType *ot)
@@ -289,6 +281,9 @@ static void TRANSFORM_OT_create_orientation(struct wmOperatorType *ot)
 	RNA_def_string(ot->srna, "name", NULL, MAX_NAME, "Name", "Name of the new custom orientation");
 	RNA_def_boolean(ot->srna, "use_view", false, "Use View",
 	                "Use the current view instead of the active object to create the new orientation");
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "use", false, "Use after creation", "Select orientation after its creation");
 	RNA_def_boolean(ot->srna, "overwrite", false, "Overwrite previous",
 	                "Overwrite previously created orientation with same name");
@@ -319,7 +314,8 @@ static void transformops_loopsel_hack(bContext *C, wmOperator *op)
 
 				/* still switch if we were originally in face select mode */
 				if ((ts->selectmode != selectmode_orig) && (selectmode_orig != SCE_SELECT_FACE)) {
-					BMEditMesh *em = BKE_editmesh_from_object(scene->obedit);
+					Object *obedit = CTX_data_edit_object(C);
+					BMEditMesh *em = BKE_editmesh_from_object(obedit);
 					em->selectmode = ts->selectmode = selectmode_orig;
 					EDBM_selectmode_set(em);
 				}
@@ -483,7 +479,10 @@ static int transform_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		return OPERATOR_CANCELLED;
 	}
 
-	if (RNA_struct_property_is_set(op->ptr, "value")) {
+	/* When modal, allow 'value' to set initial offset. */
+	if ((event == NULL) &&
+	    RNA_struct_property_is_set(op->ptr, "value"))
+	{
 		return transform_exec(C, op);
 	}
 	else {
@@ -491,6 +490,15 @@ static int transform_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		WM_event_add_modal_handler(C, op);
 
 		op->flag |= OP_IS_MODAL_GRAB_CURSOR; // XXX maybe we want this with the manipulator only?
+
+		/* Use when modal input has some transformation to begin with. */
+		{
+			TransInfo *t = op->customdata;
+			if (UNLIKELY(!is_zero_v4(t->values_modal_offset))) {
+				transformApply(C, t);
+			}
+		}
+
 		return OPERATOR_RUNNING_MODAL;
 	}
 }
@@ -555,6 +563,10 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
 		RNA_def_boolean(ot->srna, "gpencil_strokes", 0, "Edit Grease Pencil", "Edit selected Grease Pencil strokes");
 	}
 
+	if (flags & P_CURSOR_EDIT) {
+		RNA_def_boolean(ot->srna, "cursor_transform", 0, "Transform Cursor", "");
+	}
+
 	if ((flags & P_OPTIONS) && !(flags & P_NO_TEXSPACE)) {
 		RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Texture Space", "Edit Object data texture space");
 		prop = RNA_def_boolean(ot->srna, "remove_on_cancel", 0, "Remove on Cancel", "Remove elements on cancel");
@@ -562,7 +574,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
 	}
 
 	if (flags & P_CORRECT_UV) {
-		RNA_def_boolean(ot->srna, "correct_uv", 0, "Correct UVs", "Correct UV coordinates when transforming");
+		RNA_def_boolean(ot->srna, "correct_uv", true, "Correct UVs", "Correct UV coordinates when transforming");
 	}
 
 	if (flags & P_CENTER) {
@@ -599,7 +611,12 @@ static void TRANSFORM_OT_translate(struct wmOperatorType *ot)
 
 	RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_OPTIONS | P_GPENCIL_EDIT);
+	WM_operatortype_props_advanced_begin(ot);
+
+	Transform_Properties(
+	        ot,
+	        P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_OPTIONS |
+	        P_GPENCIL_EDIT | P_CURSOR_EDIT);
 }
 
 static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
@@ -619,6 +636,8 @@ static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(
 	        ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_GPENCIL_EDIT | P_CENTER);
 }
@@ -650,6 +669,8 @@ static void TRANSFORM_OT_skin_resize(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_NO_TEXSPACE);
 }
 
@@ -671,6 +692,8 @@ static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
 	/* Maybe we could use float_vector_xyz here too? */
 	RNA_def_float_rotation(ot->srna, "value", 2, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
 
@@ -691,6 +714,8 @@ static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
 
 	RNA_def_float_rotation(ot->srna, "value", 0, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(
 	        ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
@@ -715,6 +740,8 @@ static void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
 
 	RNA_def_float_rotation(ot->srna, "value", 0, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
@@ -735,6 +762,8 @@ static void TRANSFORM_OT_bend(struct wmOperatorType *ot)
 
 	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
 
@@ -755,6 +784,8 @@ static void TRANSFORM_OT_shear(struct wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT);
 	// XXX Shear axis?
 }
@@ -776,6 +807,8 @@ static void TRANSFORM_OT_push_pull(struct wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_CENTER);
 }
 
@@ -798,6 +831,8 @@ static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
 
 	RNA_def_boolean(ot->srna, "use_even_offset", true, "Offset Even", "Scale the offset to give more even thickness");
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
@@ -819,6 +854,8 @@ static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 
 	RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
 
@@ -863,6 +900,9 @@ static void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 	RNA_def_boolean(ot->srna, "use_even", false, "Even",
 	                "Make the edge loop match the shape of the adjacent edge loop");
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "flipped", false, "Flipped",
 	                "When Even mode is active, flips between the two adjacent edge loops");
 	RNA_def_boolean(ot->srna, "use_clamp", true, "Clamp",
@@ -889,6 +929,9 @@ static void TRANSFORM_OT_vert_slide(struct wmOperatorType *ot)
 	RNA_def_float_factor(ot->srna, "value", 0, -10.0f, 10.0f, "Factor", "", -1.0f, 1.0f);
 	RNA_def_boolean(ot->srna, "use_even", false, "Even",
 	                "Make the edge loop match the shape of the adjacent edge loop");
+
+	WM_operatortype_props_advanced_begin(ot);
+
 	RNA_def_boolean(ot->srna, "flipped", false, "Flipped",
 	                "When Even mode is active, flips between the two adjacent edge loops");
 	RNA_def_boolean(ot->srna, "use_clamp", true, "Clamp",
@@ -914,6 +957,8 @@ static void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot)
 
 	RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_SNAP);
 }
 
@@ -955,6 +1000,8 @@ static void TRANSFORM_OT_edge_bevelweight(struct wmOperatorType *ot)
 
 	RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_SNAP);
 }
 
@@ -975,6 +1022,8 @@ static void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot)
 
 	RNA_def_float_vector_xyz(ot->srna, "value", 2, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(ot, P_SNAP);
 }
 
@@ -1000,6 +1049,8 @@ static void TRANSFORM_OT_transform(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
 
+	WM_operatortype_props_advanced_begin(ot);
+
 	Transform_Properties(
 	        ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
@@ -1063,9 +1114,8 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 			kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
 			RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_snap");
 
-			kmi = WM_keymap_add_item(keymap, "WM_OT_context_menu_enum", TABKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
-			RNA_string_set(kmi->ptr, "data_path", "tool_settings.snap_element");
-
+			/* Will fall-through to texture-space transform. */
+			kmi = WM_keymap_add_item(keymap, "OBJECT_OT_transform_axis_target", TKEY, KM_PRESS, KM_SHIFT, 0);
 
 			kmi = WM_keymap_add_item(keymap, OP_TRANSLATION, TKEY, KM_PRESS, KM_SHIFT, 0);
 			RNA_boolean_set(kmi->ptr, "texture_space", true);
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index c38fb15fc89..3065007ea6b 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -38,6 +38,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
@@ -52,6 +53,10 @@
 #include "BKE_report.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
+#include "BKE_scene.h"
+#include "BKE_workspace.h"
+
+#include "DEG_depsgraph_query.h"
 
 #include "BLT_translation.h"
 
@@ -63,14 +68,15 @@
 
 void BIF_clearTransformOrientation(bContext *C)
 {
+	Scene *scene = CTX_data_scene(C);
+	ListBase *transform_orientations = &scene->transform_spaces;
 	View3D *v3d = CTX_wm_view3d(C);
 
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	BLI_freelistN(transform_spaces);
+	BLI_freelistN(transform_orientations);
 
-	// Need to loop over all view3d
-	if (v3d && v3d->twmode >= V3D_MANIP_CUSTOM) {
-		v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */
+	if (v3d && scene->orientation_type == V3D_MANIP_CUSTOM) {
+		scene->orientation_type = V3D_MANIP_GLOBAL; /* fallback to global */
+		scene->orientation_index_custom = -1;
 	}
 }
 
@@ -318,23 +324,24 @@ void BIF_createTransformOrientation(bContext *C, ReportList *reports,
 TransformOrientation *addMatrixSpace(bContext *C, float mat[3][3],
                                      const char *name, const bool overwrite)
 {
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
 	TransformOrientation *ts = NULL;
+	Scene *scene = CTX_data_scene(C);
+	ListBase *transform_orientations = &scene->transform_spaces;
 	char name_unique[sizeof(ts->name)];
 
 	if (overwrite) {
-		ts = findOrientationName(transform_spaces, name);
+		ts = findOrientationName(transform_orientations, name);
 	}
 	else {
 		BLI_strncpy(name_unique, name, sizeof(name_unique));
-		uniqueOrientationName(transform_spaces, name_unique);
+		uniqueOrientationName(transform_orientations, name_unique);
 		name = name_unique;
 	}
 
 	/* if not, create a new one */
 	if (ts == NULL) {
 		ts = MEM_callocN(sizeof(TransformOrientation), "UserTransSpace from matrix");
-		BLI_addtail(transform_spaces, ts);
+		BLI_addtail(transform_orientations, ts);
 		BLI_strncpy(ts->name, name, sizeof(ts->name));
 	}
 
@@ -346,70 +353,54 @@ TransformOrientation *addMatrixSpace(bContext *C, float mat[3][3],
 
 void BIF_removeTransformOrientation(bContext *C, TransformOrientation *target)
 {
-	Scene *scene = CTX_data_scene(C);
-	ListBase *transform_spaces = &scene->transform_spaces;
-	const int i = BLI_findindex(transform_spaces, target);
-
-	if (i != -1) {
-		Main *bmain = CTX_data_main(C);
-		BKE_screen_view3d_main_twmode_remove(&bmain->screen, scene, i);
-		BLI_freelinkN(transform_spaces, target);
-	}
+	BKE_scene_transform_orientation_remove(CTX_data_scene(C), target);
 }
 
 void BIF_removeTransformOrientationIndex(bContext *C, int index)
 {
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	TransformOrientation *ts = BLI_findlink(transform_spaces, index);
-
-	if (ts) {
-		BIF_removeTransformOrientation(C, ts);
-	}
+	TransformOrientation *target = BKE_scene_transform_orientation_find(CTX_data_scene(C), index);
+	BIF_removeTransformOrientation(C, target);
 }
 
 void BIF_selectTransformOrientation(bContext *C, TransformOrientation *target)
 {
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	const int i = BLI_findindex(transform_spaces, target);
+	Scene *scene = CTX_data_scene(C);
+	int index = BKE_scene_transform_orientation_get_index(scene, target);
 
-	if (i != -1) {
-		View3D *v3d = CTX_wm_view3d(C);
-		v3d->twmode = V3D_MANIP_CUSTOM + i;
-	}
+	BLI_assert(index != -1);
+
+	scene->orientation_type = V3D_MANIP_CUSTOM;
+	scene->orientation_index_custom = index;
 }
 
-void BIF_selectTransformOrientationValue(bContext *C, int orientation)
+/**
+ * Activate a transform orientation in a 3D view based on an enum value.
+ *
+ * \param orientation: If this is #V3D_MANIP_CUSTOM or greater, the custom transform orientation
+ *                     with index \a orientation - #V3D_MANIP_CUSTOM gets activated.
+ */
+void BIF_selectTransformOrientationValue(Scene *scene, int orientation)
 {
-	View3D *v3d = CTX_wm_view3d(C);
-	if (v3d) /* currently using generic poll */
-		v3d->twmode = orientation;
+	const bool is_custom = orientation >= V3D_MANIP_CUSTOM;
+	scene->orientation_type = is_custom ? V3D_MANIP_CUSTOM : orientation;
+	scene->orientation_index_custom = is_custom ? (orientation - V3D_MANIP_CUSTOM) : -1;
 }
 
 int BIF_countTransformOrientation(const bContext *C)
 {
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	return BLI_listbase_count(transform_spaces);
+	Scene *scene = CTX_data_scene(C);
+	ListBase *transform_orientations = &scene->transform_spaces;
+	return BLI_listbase_count(transform_orientations);
 }
 
-bool applyTransformOrientation(const bContext *C, float mat[3][3], char *r_name, int index)
+bool applyTransformOrientation(const TransformOrientation *ts, float r_mat[3][3], char *r_name)
 {
-	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	TransformOrientation *ts = BLI_findlink(transform_spaces, index);
-
-	BLI_assert(index >= 0);
-
-	if (ts) {
-		if (r_name) {
-			BLI_strncpy(r_name, ts->name, MAX_NAME);
-		}
-
-		copy_m3_m3(mat, ts->mat);
-		return true;
-	}
-	else {
-		/* invalid index, can happen sometimes */
-		return false;
+	if (r_name) {
+		BLI_strncpy(r_name, ts->name, MAX_NAME);
 	}
+	copy_m3_m3(r_mat, ts->mat);
+
+	return true;
 }
 
 static int count_bone_select(bArmature *arm, ListBase *lb, const bool do_it)
@@ -492,8 +483,16 @@ void initTransformOrientation(bContext *C, TransInfo *t)
 				unit_m3(t->spacemtx);
 			}
 			break;
-		default: /* V3D_MANIP_CUSTOM */
-			if (applyTransformOrientation(C, t->spacemtx, t->spacename, t->current_orientation - V3D_MANIP_CUSTOM)) {
+		case V3D_MANIP_CURSOR:
+		{
+			BLI_strncpy(t->spacename, IFACE_("cursor"), sizeof(t->spacename));
+			ED_view3d_cursor3d_calc_mat3(t->scene, CTX_wm_view3d(C), t->spacemtx);
+			break;
+		}
+		case V3D_MANIP_CUSTOM:
+			BLI_strncpy(t->spacename, t->custom_orientation->name, sizeof(t->spacename));
+
+			if (applyTransformOrientation(t->custom_orientation, t->spacemtx, t->spacename)) {
 				/* pass */
 			}
 			else {
@@ -586,10 +585,10 @@ static unsigned int bm_mesh_faces_select_get_n(BMesh *bm, BMVert **elems, const
 
 int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3], const short around)
 {
-	Scene *scene = CTX_data_scene(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Base *base;
-	Object *ob = OBACT;
+	Object *ob = OBACT(view_layer);
 	int result = ORIENTATION_NONE;
 	const bool activeOnly = (around == V3D_AROUND_ACTIVE);
 
@@ -1017,12 +1016,14 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
 		}
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
-		bArmature *arm = ob->data;
+		const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+		Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+		bArmature *arm = ob_eval->data;
 		bPoseChannel *pchan;
 		float imat[3][3], mat[3][3];
 		bool ok = false;
 
-		if (activeOnly && (pchan = BKE_pose_channel_active(ob))) {
+		if (activeOnly && (pchan = BKE_pose_channel_active(ob_eval))) {
 			add_v3_v3(normal, pchan->pose_mat[2]);
 			add_v3_v3(plane, pchan->pose_mat[1]);
 			ok = true;
@@ -1033,7 +1034,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
 			totsel = count_bone_select(arm, &arm->bonebase, true);
 			if (totsel) {
 				/* use channels to get stats */
-				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+				for (pchan = ob_eval->pose->chanbase.first; pchan; pchan = pchan->next) {
 					if (pchan->bone && pchan->bone->flag & BONE_TRANSFORM) {
 						add_v3_v3(normal, pchan->pose_mat[2]);
 						add_v3_v3(plane, pchan->pose_mat[1]);
@@ -1046,7 +1047,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
 		/* use for both active & all */
 		if (ok) {
 			/* we need the transpose of the inverse for a normal... */
-			copy_m3_m4(imat, ob->obmat);
+			copy_m3_m4(imat, ob_eval->obmat);
 
 			invert_m3_m3(mat, imat);
 			transpose_m3(mat);
@@ -1061,16 +1062,16 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
 	}
 	else {
 		/* we need the one selected object, if its not active */
-		View3D *v3d = CTX_wm_view3d(C);
-		ob = OBACT;
-		if (ob && (ob->flag & SELECT)) {
+		base = BASACT(view_layer);
+		ob = OBACT(view_layer);
+		if (base && ((base->flag & BASE_SELECTED) != 0)) {
 			/* pass */
 		}
 		else {
 			/* first selected */
 			ob = NULL;
-			for (base = scene->base.first; base; base = base->next) {
-				if (TESTBASELIB(v3d, base)) {
+			for (base = view_layer->object_bases.first; base; base = base->next) {
+				if (TESTBASELIB(base)) {
 					ob = base->object;
 					break;
 				}
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 295f27d830f..10de7f3ea36 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -49,7 +49,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BIF_gl.h"
+#include "GPU_immediate.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
@@ -70,6 +70,8 @@
 #include "ED_view3d.h"
 #include "ED_transform_snap_object_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
@@ -164,35 +166,41 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 
 			invert_m4_m4(imat, rv3d->viewmat);
 
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+
 			for (p = t->tsnap.points.first; p; p = p->next) {
 				if (p == t->tsnap.selectedPoint) {
-					glColor4ubv(selectedCol);
+					immUniformColor4ubv(selectedCol);
 				}
 				else {
-					glColor4ubv(col);
+					immUniformColor4ubv(col);
 				}
 
-				drawcircball(GL_LINE_LOOP, p->co, ED_view3d_pixel_size(rv3d, p->co) * size * 0.75f, imat);
+				imm_drawcircball(p->co, ED_view3d_pixel_size(rv3d, p->co) * size * 0.75f, imat, pos);
 			}
 
 			if (t->tsnap.status & POINT_INIT) {
-				glColor4ubv(activeCol);
+				immUniformColor4ubv(activeCol);
 
-				drawcircball(GL_LINE_LOOP, t->tsnap.snapPoint, ED_view3d_pixel_size(rv3d, t->tsnap.snapPoint) * size, imat);
+				imm_drawcircball(t->tsnap.snapPoint, ED_view3d_pixel_size(rv3d, t->tsnap.snapPoint) * size, imat, pos);
 			}
 
 			/* draw normal if needed */
 			if (usingSnappingNormal(t) && validSnappingNormal(t)) {
-				glColor4ubv(activeCol);
-
-				glBegin(GL_LINES);
-				glVertex3f(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
-				glVertex3f(t->tsnap.snapPoint[0] + t->tsnap.snapNormal[0],
-				           t->tsnap.snapPoint[1] + t->tsnap.snapNormal[1],
-				           t->tsnap.snapPoint[2] + t->tsnap.snapNormal[2]);
-				glEnd();
+				immUniformColor4ubv(activeCol);
+
+				immBegin(GWN_PRIM_LINES, 2);
+				immVertex3f(pos, t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
+				immVertex3f(pos, t->tsnap.snapPoint[0] + t->tsnap.snapNormal[0],
+				            t->tsnap.snapPoint[1] + t->tsnap.snapNormal[1],
+				            t->tsnap.snapPoint[2] + t->tsnap.snapNormal[2]);
+				immEnd();
 			}
 
+			immUnbindProgram();
+
 			if (v3d->zbuf)
 				glEnable(GL_DEPTH_TEST);
 		}
@@ -200,35 +208,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 	else if (t->spacetype == SPACE_IMAGE) {
 		if (validSnap(t)) {
 			/* This will not draw, and Im nor sure why - campbell */
-#if 0
-			float xuser_asp, yuser_asp;
-			int wi, hi;
-			float w, h;
-
-			calc_image_view(G.sima, 'f');   // float
-			myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
-			glLoadIdentity();
-
-			ED_space_image_get_aspect(t->sa->spacedata.first, &xuser_aspx, &yuser_asp);
-			ED_space_image_width(t->sa->spacedata.first, &wi, &hi);
-			w = (((float)wi) / IMG_SIZE_FALLBACK) * G.sima->zoom * xuser_asp;
-			h = (((float)hi) / IMG_SIZE_FALLBACK) * G.sima->zoom * yuser_asp;
-
-			cpack(0xFFFFFF);
-			glTranslate2fv(t->tsnap.snapPoint);
-
-			//glRectf(0, 0, 1, 1);
-
-			setlinestyle(0);
-			cpack(0x0);
-			fdrawline(-0.020 / w, 0, -0.1 / w, 0);
-			fdrawline(0.1 / w, 0, 0.020 / w, 0);
-			fdrawline(0, -0.020 / h, 0, -0.1 / h);
-			fdrawline(0, 0.1 / h, 0, 0.020 / h);
-
-			glTranslatef(-t->tsnap.snapPoint[0], -t->tsnap.snapPoint[1], 0.0f);
-			setlinestyle(0);
-#endif
+			/* TODO: see 2.7x for non-working code */
 		}
 	}
 	else if (t->spacetype == SPACE_NODE) {
@@ -241,23 +221,29 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 
 			glEnable(GL_BLEND);
 
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 			for (p = t->tsnap.points.first; p; p = p->next) {
 				if (p == t->tsnap.selectedPoint) {
-					glColor4ubv(selectedCol);
+					immUniformColor4ubv(selectedCol);
 				}
 				else {
-					glColor4ubv(col);
+					immUniformColor4ubv(col);
 				}
 
-				ED_node_draw_snap(&ar->v2d, p->co, size, 0);
+				ED_node_draw_snap(&ar->v2d, p->co, size, 0, pos);
 			}
 
 			if (t->tsnap.status & POINT_INIT) {
-				glColor4ubv(activeCol);
+				immUniformColor4ubv(activeCol);
 
-				ED_node_draw_snap(&ar->v2d, t->tsnap.snapPoint, size, t->tsnap.snapNodeBorder);
+				ED_node_draw_snap(&ar->v2d, t->tsnap.snapPoint, size, t->tsnap.snapNodeBorder, pos);
 			}
 
+			immUnbindProgram();
+
 			glDisable(GL_BLEND);
 		}
 	}
@@ -286,73 +272,75 @@ void applyProject(TransInfo *t)
 {
 	/* XXX FLICKER IN OBJECT MODE */
 	if ((t->tsnap.project) && activeSnap(t) && (t->flag & T_NO_PROJECT) == 0) {
-		TransData *td = t->data;
 		float tvec[3];
-		float imat[4][4];
 		int i;
 
-		if (t->flag & (T_EDIT | T_POSE)) {
-			Object *ob = t->obedit ? t->obedit : t->poseobj;
-			invert_m4_m4(imat, ob->obmat);
-		}
+		FOREACH_TRANS_DATA_CONTAINER(t, tc) {
+			TransData *td = tc->data;
+			for (i = 0; i < tc->data_len; i++, td++) {
+				float iloc[3], loc[3], no[3];
+				float mval_fl[2];
 
-		for (i = 0; i < t->total; i++, td++) {
-			float iloc[3], loc[3], no[3];
-			float mval_fl[2];
-			float dist_px = TRANSFORM_DIST_MAX_PX;
+				if (td->flag & TD_NOACTION)
+					break;
 
-			if (td->flag & TD_NOACTION)
-				break;
+				if (td->flag & TD_SKIP)
+					continue;
 
-			if (td->flag & TD_SKIP)
-				continue;
-
-			if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f))
-				continue;
+				if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f))
+					continue;
 
-			copy_v3_v3(iloc, td->loc);
-			if (t->flag & (T_EDIT | T_POSE)) {
-				Object *ob = t->obedit ? t->obedit : t->poseobj;
-				mul_m4_v3(ob->obmat, iloc);
-			}
-			else if (t->flag & T_OBJECT) {
-				BKE_object_eval_transform_all(G.main->eval_ctx, t->scene, td->ob);
-				copy_v3_v3(iloc, td->ob->obmat[3]);
-			}
+				copy_v3_v3(iloc, td->loc);
+				if (tc->use_local_mat) {
+					mul_m4_v3(tc->mat, iloc);
+				}
+				else if (t->flag & T_OBJECT) {
+					BKE_object_eval_transform_all(t->depsgraph, t->scene, td->ob);
+					copy_v3_v3(iloc, td->ob->obmat[3]);
+				}
 
-			if (ED_view3d_project_float_global(t->ar, iloc, mval_fl, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
-				if (snapObjectsTransform(
-				        t, mval_fl, &dist_px,
-				        loc, no))
-				{
-//					if (t->flag & (T_EDIT|T_POSE)) {
-//						mul_m4_v3(imat, loc);
-//					}
+				if (ED_view3d_project_float_global(t->ar, iloc, mval_fl, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
+					if (ED_transform_snap_object_project_view3d(
+					        t->tsnap.object_context,
+					        SCE_SNAP_MODE_FACE,
+					        &(const struct SnapObjectParams){
+					            .snap_select = t->tsnap.modeSelect,
+					            .use_object_edit_cage = (t->flag & T_EDIT) != 0,
+					            .use_occlusion_test = false,
+					        },
+					        mval_fl, 0, loc, no))
+					{
+#if 0
+						if (tc->use_local_mat) {
+							mul_m4_v3(tc->imat, loc);
+						}
+#endif
 
-					sub_v3_v3v3(tvec, loc, iloc);
+						sub_v3_v3v3(tvec, loc, iloc);
 
-					mul_m3_v3(td->smtx, tvec);
+						mul_m3_v3(td->smtx, tvec);
 
-					add_v3_v3(td->loc, tvec);
+						add_v3_v3(td->loc, tvec);
 
-					if (t->tsnap.align && (t->flag & T_OBJECT)) {
-						/* handle alignment as well */
-						const float *original_normal;
-						float mat[3][3];
+						if (t->tsnap.align && (t->flag & T_OBJECT)) {
+							/* handle alignment as well */
+							const float *original_normal;
+							float mat[3][3];
 
-						/* In pose mode, we want to align normals with Y axis of bones... */
-						original_normal = td->axismtx[2];
+							/* In pose mode, we want to align normals with Y axis of bones... */
+							original_normal = td->axismtx[2];
 
-						rotation_between_vecs_to_mat3(mat, original_normal, no);
+							rotation_between_vecs_to_mat3(mat, original_normal, no);
 
-						transform_data_ext_rotate(td, mat, true);
+							transform_data_ext_rotate(td, mat, true);
 
-						/* TODO support constraints for rotation too? see ElementRotation */
+							/* TODO support constraints for rotation too? see ElementRotation */
+						}
 					}
 				}
-			}
 
-			//XXX constraintTransLim(t, td);
+				//XXX constraintTransLim(t, td);
+			}
 		}
 	}
 }
@@ -361,12 +349,9 @@ void applyGridAbsolute(TransInfo *t)
 {
 	float grid_size = 0.0f;
 	GearsType grid_action;
-	TransData *td;
-	float (*obmat)[4] = NULL;
-	bool use_obmat = false;
 	int i;
 
-	if (!(activeSnap(t) && (ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID))))
+	if (!(activeSnap(t) && (t->tsnap.mode & (SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID))))
 		return;
 
 	grid_action = BIG_GEARS;
@@ -382,57 +367,53 @@ void applyGridAbsolute(TransInfo *t)
 	if (grid_size == 0.0f)
 		return;
 
-	if (t->flag & (T_EDIT | T_POSE)) {
-		Object *ob = t->obedit ? t->obedit : t->poseobj;
-		obmat = ob->obmat;
-		use_obmat = true;
-	}
+	FOREACH_TRANS_DATA_CONTAINER(t, tc) {
+		TransData *td;
 
-	for (i = 0, td = t->data; i < t->total; i++, td++) {
-		float iloc[3], loc[3], tvec[3];
+		for (i = 0, td = tc->data; i < tc->data_len; i++, td++) {
+			float iloc[3], loc[3], tvec[3];
 
-		if (td->flag & TD_NOACTION)
-			break;
+			if (td->flag & TD_NOACTION)
+				break;
 
-		if (td->flag & TD_SKIP)
-			continue;
+			if (td->flag & TD_SKIP)
+				continue;
 
-		if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f))
-			continue;
+			if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f))
+				continue;
 
-		copy_v3_v3(iloc, td->loc);
-		if (use_obmat) {
-			mul_m4_v3(obmat, iloc);
-		}
-		else if (t->flag & T_OBJECT) {
-			BKE_object_eval_transform_all(G.main->eval_ctx, t->scene, td->ob);
-			copy_v3_v3(iloc, td->ob->obmat[3]);
-		}
+			copy_v3_v3(iloc, td->loc);
+			if (tc->use_local_mat) {
+				mul_m4_v3(tc->mat, iloc);
+			}
+			else if (t->flag & T_OBJECT) {
+				BKE_object_eval_transform_all(t->depsgraph, t->scene, td->ob);
+				copy_v3_v3(iloc, td->ob->obmat[3]);
+			}
 
-		mul_v3_v3fl(loc, iloc, 1.0f / grid_size);
-		loc[0] = roundf(loc[0]);
-		loc[1] = roundf(loc[1]);
-		loc[2] = roundf(loc[2]);
-		mul_v3_fl(loc, grid_size);
+			mul_v3_v3fl(loc, iloc, 1.0f / grid_size);
+			loc[0] = roundf(loc[0]);
+			loc[1] = roundf(loc[1]);
+			loc[2] = roundf(loc[2]);
+			mul_v3_fl(loc, grid_size);
 
-		sub_v3_v3v3(tvec, loc, iloc);
-		mul_m3_v3(td->smtx, tvec);
-		add_v3_v3(td->loc, tvec);
+			sub_v3_v3v3(tvec, loc, iloc);
+			mul_m3_v3(td->smtx, tvec);
+			add_v3_v3(td->loc, tvec);
+		}
 	}
 }
 
 void applySnapping(TransInfo *t, float *vec)
 {
-	/* project is not applied this way */
-	if (t->tsnap.project)
-		return;
-
 	if (t->tsnap.status & SNAP_FORCED) {
 		t->tsnap.targetSnap(t);
 
 		t->tsnap.applySnap(t, vec);
 	}
-	else if (!ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID) && activeSnap(t)) {
+	else if (((t->tsnap.mode & ~(SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID)) != 0) &&
+	         activeSnap(t))
+	{
 		double current = PIL_check_seconds_timer();
 
 		// Time base quirky code to go around findnearest slowness
@@ -515,9 +496,10 @@ static bool bm_face_is_snap_target(BMFace *f, void *UNUSED(user_data))
 static void initSnappingMode(TransInfo *t)
 {
 	ToolSettings *ts = t->settings;
-	Object *obedit = t->obedit;
-	Scene *scene = t->scene;
-	Base *base_act = scene->basact;
+	/* All obedit types will match. */
+	const int obedit_type = t->data_container->obedit ? t->data_container->obedit->type : -1;
+	ViewLayer *view_layer = t->view_layer;
+	Base *base_act = view_layer->basact;
 
 	if (t->spacetype == SPACE_NODE) {
 		/* force project off when not supported */
@@ -533,7 +515,7 @@ static void initSnappingMode(TransInfo *t)
 	}
 	else {
 		/* force project off when not supported */
-		if (ts->snap_mode != SCE_SNAP_MODE_FACE)
+		if ((ts->snap_mode & SCE_SNAP_MODE_FACE) == 0)
 			t->tsnap.project = 0;
 
 		t->tsnap.mode = ts->snap_mode;
@@ -546,10 +528,10 @@ static void initSnappingMode(TransInfo *t)
 
 		/* Edit mode */
 		if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-		    (obedit != NULL && ELEM(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE, OB_MBALL)) ) // Temporary limited to edit mode meshes, armature, curves, mballs
+		    ((obedit_type != -1) && ELEM(obedit_type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE, OB_MBALL)) ) // Temporary limited to edit mode meshes, armature, curves, mballs
 		{
 			/* Exclude editmesh if using proportional edit */
-			if ((obedit->type == OB_MESH) && (t->flag & T_PROP_EDIT)) {
+			if ((obedit_type == OB_MESH) && (t->flag & T_PROP_EDIT)) {
 				t->tsnap.modeSelect = SNAP_NOT_ACTIVE;
 			}
 			else {
@@ -558,17 +540,19 @@ static void initSnappingMode(TransInfo *t)
 		}
 		/* Particles edit mode*/
 		else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-		         (obedit == NULL && base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT))
+		         ((obedit_type == -1) && base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT))
 		{
 			t->tsnap.modeSelect = SNAP_ALL;
 		}
 		/* Object mode */
 		else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-		         (obedit == NULL) ) // Object Mode
+		         (obedit_type == -1) ) // Object Mode
 		{
 			/* In "Edit Strokes" mode, Snap tool can perform snap to selected or active objects (see T49632)
 			 * TODO: perform self snap in gpencil_strokes */
-			t->tsnap.modeSelect = ((t->options & CTX_GPENCIL_STROKES) != 0) ? SNAP_ALL : SNAP_NOT_SELECTED;
+			t->tsnap.modeSelect = (
+			        ((t->options & (CTX_GPENCIL_STROKES | CTX_CURSOR)) != 0) ?
+			        SNAP_ALL : SNAP_NOT_SELECTED);
 		}
 		else {
 			/* Grid if snap is not possible */
@@ -598,8 +582,7 @@ static void initSnappingMode(TransInfo *t)
 	if (t->spacetype == SPACE_VIEW3D) {
 		if (t->tsnap.object_context == NULL) {
 			t->tsnap.object_context = ED_transform_snap_object_context_create_view3d(
-			        G.main, t->scene, 0,
-			        t->ar, t->view);
+			        t->scene, t->depsgraph, 0, t->ar, t->view);
 
 			ED_transform_snap_object_context_set_editmesh_callbacks(
 			        t->tsnap.object_context,
@@ -878,7 +861,8 @@ static float TranslationBetween(TransInfo *UNUSED(t), const float p1[3], const f
 	return len_squared_v3v3(p1, p2);
 }
 
-static float RotationBetween(TransInfo *t, const float p1[3], const float p2[3])
+static float RotationBetween(
+        TransInfo *t, const float p1[3], const float p2[3])
 {
 	float angle, start[3], end[3];
 
@@ -889,7 +873,7 @@ static float RotationBetween(TransInfo *t, const float p1[3], const float p2[3])
 	if (t->con.applyRot != NULL && (t->con.mode & CON_APPLY)) {
 		float axis[3], tmp[3];
 
-		t->con.applyRot(t, NULL, axis, NULL);
+		t->con.applyRot(t, NULL, NULL, axis, NULL);
 
 		project_v3_v3v3(tmp, end, axis);
 		sub_v3_v3v3(end, end, tmp);
@@ -969,18 +953,22 @@ static void CalcSnapGeometry(TransInfo *t, float *UNUSED(vec))
 		mval[0] = t->mval[0];
 		mval[1] = t->mval[1];
 
-		if (t->tsnap.mode == SCE_SNAP_MODE_VOLUME) {
-			found = peelObjectsTransform(
-			        t, mval,
-			        (t->settings->snap_flag & SCE_SNAP_PEEL_OBJECT) != 0,
-			        loc, no, NULL);
-		}
-		else {
+		if (t->tsnap.mode &
+		    (SCE_SNAP_MODE_VERTEX |
+		     SCE_SNAP_MODE_EDGE   |
+		     SCE_SNAP_MODE_FACE))
+		{
 			zero_v3(no);  /* objects won't set this */
 			found = snapObjectsTransform(
 			        t, mval, &dist_px,
 			        loc, no);
 		}
+		if ((found == false) && (t->tsnap.mode & SCE_SNAP_MODE_VOLUME)) {
+			found = peelObjectsTransform(
+			        t, mval,
+			        (t->settings->snap_flag & SCE_SNAP_PEEL_OBJECT) != 0,
+			        loc, no, NULL);
+		}
 
 		if (found == true) {
 			copy_v3_v3(t->tsnap.snapPoint, loc);
@@ -992,36 +980,39 @@ static void CalcSnapGeometry(TransInfo *t, float *UNUSED(vec))
 			t->tsnap.status &= ~POINT_INIT;
 		}
 	}
-	else if (t->spacetype == SPACE_IMAGE && t->obedit != NULL && t->obedit->type == OB_MESH) {
-		/* same as above but for UV's */
-		Image *ima = ED_space_image(t->sa->spacedata.first);
-		float co[2];
+	else if (t->spacetype == SPACE_IMAGE && t->obedit_type == OB_MESH) {
+		if (t->tsnap.mode & SCE_SNAP_MODE_VERTEX) {
+			Image *ima = ED_space_image(t->sa->spacedata.first);
+			float co[2];
 
-		UI_view2d_region_to_view(&t->ar->v2d, t->mval[0], t->mval[1], &co[0], &co[1]);
+			UI_view2d_region_to_view(&t->ar->v2d, t->mval[0], t->mval[1], &co[0], &co[1]);
 
-		if (ED_uvedit_nearest_uv(t->scene, t->obedit, ima, co, t->tsnap.snapPoint)) {
-			t->tsnap.snapPoint[0] *= t->aspect[0];
-			t->tsnap.snapPoint[1] *= t->aspect[1];
+			if (ED_uvedit_nearest_uv(t->scene, TRANS_DATA_CONTAINER_FIRST_EVIL(t)->obedit, ima, co, t->tsnap.snapPoint)) {
+				t->tsnap.snapPoint[0] *= t->aspect[0];
+				t->tsnap.snapPoint[1] *= t->aspect[1];
 
-			t->tsnap.status |=  POINT_INIT;
-		}
-		else {
-			t->tsnap.status &= ~POINT_INIT;
+				t->tsnap.status |= POINT_INIT;
+			}
+			else {
+				t->tsnap.status &= ~POINT_INIT;
+			}
 		}
 	}
 	else if (t->spacetype == SPACE_NODE) {
-		float loc[2];
-		float dist_px = SNAP_MIN_DISTANCE; // Use a user defined value here
-		char node_border;
+		if (t->tsnap.mode & (SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y)) {
+			float loc[2];
+			float dist_px = SNAP_MIN_DISTANCE; // Use a user defined value here
+			char node_border;
 
-		if (snapNodesTransform(t, t->mval, loc, &dist_px, &node_border)) {
-			copy_v2_v2(t->tsnap.snapPoint, loc);
-			t->tsnap.snapNodeBorder = node_border;
+			if (snapNodesTransform(t, t->mval, loc, &dist_px, &node_border)) {
+				copy_v2_v2(t->tsnap.snapPoint, loc);
+				t->tsnap.snapNodeBorder = node_border;
 
-			t->tsnap.status |=  POINT_INIT;
-		}
-		else {
-			t->tsnap.status &= ~POINT_INIT;
+				t->tsnap.status |= POINT_INIT;
+			}
+			else {
+				t->tsnap.status &= ~POINT_INIT;
+			}
 		}
 	}
 }
@@ -1074,11 +1065,6 @@ static void TargetSnapActive(TransInfo *t)
 	/* Only need to calculate once */
 	if ((t->tsnap.status & TARGET_INIT) == 0) {
 		if (calculateCenterActive(t, true, t->tsnap.snapTarget)) {
-			if (t->flag & (T_EDIT | T_POSE)) {
-				Object *ob = t->obedit ? t->obedit : t->poseobj;
-				mul_m4_v3(ob->obmat, t->tsnap.snapTarget);
-			}
-
 			TargetSnapOffset(t, NULL);
 
 			t->tsnap.status |= TARGET_INIT;
@@ -1096,23 +1082,30 @@ static void TargetSnapMedian(TransInfo *t)
 {
 	// Only need to calculate once
 	if ((t->tsnap.status & TARGET_INIT) == 0) {
-		TransData *td = NULL;
-		int i;
+		int i_accum = 0;
 
 		t->tsnap.snapTarget[0] = 0;
 		t->tsnap.snapTarget[1] = 0;
 		t->tsnap.snapTarget[2] = 0;
 
-		for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
-			add_v3_v3(t->tsnap.snapTarget, td->center);
+		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
+			TransData *td = tc->data;
+			int i;
+			for (i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) {
+				/* TODO(campbell): perform the global transformation once per TransDataContainer */
+				if (tc->use_local_mat) {
+					float v[3];
+					mul_v3_m4v3(v, tc->mat, td->center);
+					add_v3_v3(t->tsnap.snapTarget, v);
+				}
+				else {
+					add_v3_v3(t->tsnap.snapTarget, td->center);
+				}
+			}
+			i_accum += i;
 		}
 
-		mul_v3_fl(t->tsnap.snapTarget, 1.0 / i);
-
-		if (t->flag & (T_EDIT | T_POSE)) {
-			Object *ob = t->obedit ? t->obedit : t->poseobj;
-			mul_m4_v3(ob->obmat, t->tsnap.snapTarget);
-		}
+		mul_v3_fl(t->tsnap.snapTarget, 1.0 / i_accum);
 
 		TargetSnapOffset(t, NULL);
 
@@ -1125,24 +1118,44 @@ static void TargetSnapClosest(TransInfo *t)
 	// Only valid if a snap point has been selected
 	if (t->tsnap.status & POINT_INIT) {
 		float dist_closest = 0.0f;
-		TransData *closest = NULL, *td = NULL;
+		TransData *closest = NULL;
 
 		/* Object mode */
 		if (t->flag & T_OBJECT) {
 			int i;
-			for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
-				struct BoundBox *bb = BKE_object_boundbox_get(td->ob);
-
-				/* use boundbox if possible */
-				if (bb) {
-					int j;
-
-					for (j = 0; j < 8; j++) {
+			FOREACH_TRANS_DATA_CONTAINER(t, tc) {
+				TransData *td = tc->data;
+				for (td = tc->data, i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) {
+					struct BoundBox *bb = BKE_object_boundbox_get(td->ob);
+
+					/* use boundbox if possible */
+					if (bb) {
+						int j;
+
+						for (j = 0; j < 8; j++) {
+							float loc[3];
+							float dist;
+
+							copy_v3_v3(loc, bb->vec[j]);
+							mul_m4_v3(td->ext->obmat, loc);
+
+							dist = t->tsnap.distance(t, loc, t->tsnap.snapPoint);
+
+							if ((dist != TRANSFORM_DIST_INVALID) &&
+							    (closest == NULL || fabsf(dist) < fabsf(dist_closest)))
+							{
+								copy_v3_v3(t->tsnap.snapTarget, loc);
+								closest = td;
+								dist_closest = dist;
+							}
+						}
+					}
+					/* use element center otherwise */
+					else {
 						float loc[3];
 						float dist;
 
-						copy_v3_v3(loc, bb->vec[j]);
-						mul_m4_v3(td->ext->obmat, loc);
+						copy_v3_v3(loc, td->center);
 
 						dist = t->tsnap.distance(t, loc, t->tsnap.snapPoint);
 
@@ -1151,17 +1164,25 @@ static void TargetSnapClosest(TransInfo *t)
 						{
 							copy_v3_v3(t->tsnap.snapTarget, loc);
 							closest = td;
-							dist_closest = dist;
 						}
 					}
 				}
-				/* use element center otherwise */
-				else {
+			}
+		}
+		else {
+			FOREACH_TRANS_DATA_CONTAINER(t, tc) {
+				TransData *td = tc->data;
+				int i;
+				for (i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) {
 					float loc[3];
 					float dist;
 
 					copy_v3_v3(loc, td->center);
 
+					if (tc->use_local_mat) {
+						mul_m4_v3(tc->mat, loc);
+					}
+
 					dist = t->tsnap.distance(t, loc, t->tsnap.snapPoint);
 
 					if ((dist != TRANSFORM_DIST_INVALID) &&
@@ -1169,34 +1190,11 @@ static void TargetSnapClosest(TransInfo *t)
 					{
 						copy_v3_v3(t->tsnap.snapTarget, loc);
 						closest = td;
+						dist_closest = dist;
 					}
 				}
 			}
 		}
-		else {
-			int i;
-			for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
-				float loc[3];
-				float dist;
-
-				copy_v3_v3(loc, td->center);
-
-				if (t->flag & (T_EDIT | T_POSE)) {
-					Object *ob = t->obedit ? t->obedit : t->poseobj;
-					mul_m4_v3(ob->obmat, loc);
-				}
-
-				dist = t->tsnap.distance(t, loc, t->tsnap.snapPoint);
-
-				if ((dist != TRANSFORM_DIST_INVALID) &&
-				    (closest == NULL || fabsf(dist) < fabsf(dist_closest)))
-				{
-					copy_v3_v3(t->tsnap.snapTarget, loc);
-					closest = td;
-					dist_closest = dist;
-				}
-			}
-		}
 
 		TargetSnapOffset(t, closest);
 
@@ -1209,16 +1207,15 @@ bool snapObjectsTransform(
         float *dist_px,
         float r_loc[3], float r_no[3])
 {
-	return ED_transform_snap_object_project_view3d_ex(
+	return ED_transform_snap_object_project_view3d(
 	        t->tsnap.object_context,
 	        t->scene->toolsettings->snap_mode,
 	        &(const struct SnapObjectParams){
 	            .snap_select = t->tsnap.modeSelect,
 	            .use_object_edit_cage = (t->flag & T_EDIT) != 0,
+	            .use_occlusion_test = t->scene->toolsettings->snap_mode != SCE_SNAP_MODE_FACE,
 	        },
-	        mval, dist_px, NULL,
-	        r_loc, r_no, NULL,
-	        NULL, NULL);
+	        mval, dist_px, r_loc, r_no);
 }
 
 
@@ -1324,15 +1321,14 @@ static bool snapNodeTest(View2D *v2d, bNode *node, eSnapSelect snap_select)
 
 static NodeBorder snapNodeBorder(int snap_node_mode)
 {
-	switch (snap_node_mode) {
-		case SCE_SNAP_MODE_NODE_X:
-			return NODE_LEFT | NODE_RIGHT;
-		case SCE_SNAP_MODE_NODE_Y:
-			return NODE_TOP | NODE_BOTTOM;
-		case SCE_SNAP_MODE_NODE_XY:
-			return NODE_LEFT | NODE_RIGHT | NODE_TOP | NODE_BOTTOM;
+	NodeBorder flag = 0;
+	if (snap_node_mode & SCE_SNAP_MODE_NODE_X) {
+		flag |= NODE_LEFT | NODE_RIGHT;
 	}
-	return 0;
+	if (snap_node_mode & SCE_SNAP_MODE_NODE_Y) {
+		flag |= NODE_TOP | NODE_BOTTOM;
+	}
+	return flag;
 }
 
 static bool snapNode(
@@ -1440,9 +1436,13 @@ void snapGridIncrement(TransInfo *t, float *val)
 {
 	GearsType action;
 
-	/* only do something if using absolute or incremental grid snapping */
-	if (!ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID))
+	/* only do something if using absolute or incremental grid snapping
+	 * and there is no valid snap point */
+	if (!(t->tsnap.mode & (SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID)) ||
+	    validSnap(t))
+	{
 		return;
+	}
 
 	action = activeSnap(t) ? BIG_GEARS : NO_GEARS;
 
@@ -1482,7 +1482,7 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, const fl
 	const float *asp = use_aspect ? t->aspect : asp_local;
 	int i;
 
-	BLI_assert(ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID));
+	BLI_assert(t->tsnap.mode & (SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID));
 	BLI_assert(max_index <= 2);
 
 	/* Early bailing out if no need to snap */
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 1293d26bc65..5932a35bf2b 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -41,16 +41,24 @@
 #include "DNA_curve_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_DerivedMesh.h"
+#include "BKE_bvhutils.h"
+#include "BKE_armature.h"
+#include "BKE_curve.h"
 #include "BKE_object.h"
 #include "BKE_anim.h"  /* for duplis */
 #include "BKE_editmesh.h"
 #include "BKE_main.h"
 #include "BKE_tracking.h"
+#include "BKE_context.h"
+#include "BKE_mesh.h"
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "ED_transform.h"
 #include "ED_transform_snap_object_context.h"
@@ -63,6 +71,8 @@
 /** Internal Data Types
  * \{ */
 
+#define MAX_CLIPPLANE_LEN 3
+
 enum eViewProj {
 	VIEW_PROJ_NONE = -1,
 	VIEW_PROJ_ORTHO = 0,
@@ -70,15 +80,13 @@ enum eViewProj {
 };
 
 typedef struct SnapData {
-	short snap_to;
+	short snap_to_flag;
 	float mval[2];
-	float ray_origin[3];
-	float ray_start[3];
-	float ray_dir[3];
 	float pmat[4][4]; /* perspective matrix */
-	float win_half[2];/* win x and y */
+	float win_size[2];/* win x and y */
 	enum eViewProj view_proj;
-	float depth_range[2];
+	float clip_plane[MAX_CLIPPLANE_LEN][4];
+	short clip_plane_len;
 } SnapData;
 
 typedef struct SnapObjectData {
@@ -90,9 +98,11 @@ typedef struct SnapObjectData {
 
 typedef struct SnapObjectData_Mesh {
 	SnapObjectData sd;
-	BVHTreeFromMesh *bvh_trees[3];
-	MPoly *mpoly;
-	bool poly_allocated;
+	BVHTreeFromMesh treedata;
+	BVHTree *bvhtree[2]; /* from loose verts and from loose edges */
+	uint has_looptris   : 1;
+	uint has_loose_edge : 1;
+	uint has_loose_vert : 1;
 
 } SnapObjectData_Mesh;
 
@@ -103,8 +113,9 @@ typedef struct SnapObjectData_EditMesh {
 } SnapObjectData_EditMesh;
 
 struct SnapObjectContext {
-	Main *bmain;
 	Scene *scene;
+	Depsgraph *depsgraph;
+
 	int flag;
 
 	/* Optional: when performing screen-space projection.
@@ -152,23 +163,25 @@ typedef void(*IterSnapObjsCallback)(SnapObjectContext *sctx, bool is_obedit, Obj
  */
 static void iter_snap_objects(
         SnapObjectContext *sctx,
-        const eSnapSelect snap_select,
-        Object *obedit,
+        const struct SnapObjectParams *params,
         IterSnapObjsCallback sob_callback,
         void *data)
 {
-	Base *base_act = sctx->scene->basact;
-	for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {
-		if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) &&
-		    (base->flag & BA_SNAP_FIX_DEPS_FIASCO) == 0 &&
-		    !((snap_select == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL))) ||
+	ViewLayer *view_layer = DEG_get_evaluated_view_layer(sctx->depsgraph);
+	Object *obedit = params->use_object_edit_cage ? OBEDIT_FROM_VIEW_LAYER(view_layer) : NULL;
+	const eSnapSelect snap_select = params->snap_select;
+
+	Base *base_act = view_layer->basact;
+	for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) {
+		if ((BASE_VISIBLE(base)) && (base->flag_legacy & BA_SNAP_FIX_DEPS_FIASCO) == 0 &&
+		    !((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) ||
 		      (snap_select == SNAP_NOT_ACTIVE && base == base_act)))
 		{
 			bool use_obedit;
 			Object *obj = base->object;
 			if (obj->transflag & OB_DUPLI) {
 				DupliObject *dupli_ob;
-				ListBase *lb = object_duplilist(sctx->bmain->eval_ctx, sctx->scene, obj);
+				ListBase *lb = object_duplilist(sctx->depsgraph, sctx->scene, obj);
 				for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) {
 					use_obedit = obedit && dupli_ob->ob->data == obedit->data;
 					sob_callback(sctx, use_obedit, use_obedit ? obedit : dupli_ob->ob, dupli_ob->mat, data);
@@ -183,47 +196,6 @@ static void iter_snap_objects(
 }
 
 
-/**
- * Generates a struct with the immutable parameters that will be used on all objects.
- *
- * \param snap_to: Element to snap, Vertice, Edge or Face.
- * \param view_proj: ORTHO or PERSP.
- * Currently only works one at a time, but can eventually operate as flag.
- *
- * \param mval: Mouse coords.
- * (When NULL, ray-casting is handled without any projection matrix correction.)
- * \param ray_origin: ray_start before being moved toward the ray_normal at the distance from vew3d clip_min.
- * \param ray_start: ray_origin moved for the start clipping plane (clip_min).
- * \param ray_direction: Unit length direction of the ray.
- * \param depth_range: distances of clipe plane min and clip plane max;
- */
-static void snap_data_set(
-        SnapData *snapdata,
-        const ARegion *ar, const unsigned short snap_to, const enum eViewProj view_proj,
-        const float mval[2], const float ray_origin[3], const float ray_start[3],
-        const float ray_direction[3], const float depth_range[2])
-{
-	copy_m4_m4(snapdata->pmat, ((RegionView3D *)ar->regiondata)->persmat);
-	snapdata->win_half[0] = ar->winx / 2;
-	snapdata->win_half[1] = ar->winy / 2;
-	copy_v2_v2(snapdata->mval, mval);
-	snapdata->snap_to = snap_to;
-	copy_v3_v3(snapdata->ray_origin, ray_origin);
-	copy_v3_v3(snapdata->ray_start, ray_start);
-	copy_v3_v3(snapdata->ray_dir, ray_direction);
-	snapdata->view_proj = view_proj;
-	copy_v2_v2(snapdata->depth_range, depth_range);
-}
-
-
-MINLINE float depth_get(const float co[3], const float ray_start[3], const float ray_dir[3])
-{
-	float dvec[3];
-	sub_v3_v3v3(dvec, co, ray_start);
-	return dot_v3v3(dvec, ray_dir);
-}
-
-
 static bool walk_parent_bvhroot_cb(const BVHTreeAxisRange *bounds, void *userdata)
 {
 	BVHTreeRay *ray = userdata;
@@ -253,9 +225,6 @@ static bool isect_ray_bvhroot_v3(struct BVHTree *tree, const float ray_start[3],
 	}
 }
 
-
-static int dm_looptri_to_poly_index(DerivedMesh *dm, const MLoopTri *lt);
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -338,14 +307,6 @@ static void raycast_all_cb(void *userdata, int index, const BVHTreeRay *ray, BVH
 		mul_m3_v3((float(*)[3])data->timat, normal);
 		normalize_v3(normal);
 
-		/* currently unused, and causes issues when looptri's haven't been calculated.
-		 * since theres some overhead in ensuring this data is valid, it may need to be optional. */
-#if 0
-		if (data->dm) {
-			hit->index = dm_looptri_to_poly_index(data->dm, &data->dm_looptri[hit->index]);
-		}
-#endif
-
 		struct SnapObjectHitDepth *hit_item = hit_depth_create(
 		        depth, location, normal, hit->index,
 		        data->ob, data->obmat, data->ob_uuid);
@@ -354,10 +315,10 @@ static void raycast_all_cb(void *userdata, int index, const BVHTreeRay *ray, BVH
 }
 
 
-static bool raycastDerivedMesh(
+static bool raycastMesh(
         SnapObjectContext *sctx,
         const float ray_start[3], const float ray_dir[3],
-        Object *ob, DerivedMesh *dm, float obmat[4][4], const unsigned int ob_index,
+        Object *ob, Mesh *me, float obmat[4][4], const unsigned int ob_index,
         /* read/write args */
         float *ray_depth,
         /* return args */
@@ -366,7 +327,7 @@ static bool raycastDerivedMesh(
 {
 	bool retval = false;
 
-	if (dm->getNumPolys(dm) == 0) {
+	if (me->totpoly == 0) {
 		return retval;
 	}
 
@@ -392,7 +353,7 @@ static bool raycastDerivedMesh(
 	}
 
 	/* Test BoundBox */
-	BoundBox *bb = BKE_object_boundbox_get(ob);
+	BoundBox *bb = BKE_mesh_boundbox_get(ob);
 	if (bb) {
 		/* was BKE_boundbox_ray_hit_check, see: cf6ca226fa58 */
 		if (!isect_ray_aabb_v3_simple(
@@ -403,7 +364,6 @@ static bool raycastDerivedMesh(
 	}
 
 	SnapObjectData_Mesh *sod = NULL;
-	BVHTreeFromMesh *treedata;
 
 	void **sod_p;
 	if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {
@@ -414,46 +374,35 @@ static bool raycastDerivedMesh(
 		sod->sd.type = SNAP_MESH;
 	}
 
-	if (sod->bvh_trees[2] == NULL) {
-		sod->bvh_trees[2] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(*treedata));
-	}
-
-	treedata = sod->bvh_trees[2];
+	BVHTreeFromMesh *treedata = &sod->treedata;
 
-	if (treedata) {
-		/* the tree is owned by the DM and may have been freed since we last used! */
-		if (treedata->tree) {
-			if (treedata->cached && !bvhcache_has_tree(dm->bvhCache, treedata->tree)) {
-				free_bvhtree_from_mesh(treedata);
+	/* The tree is owned by the DM and may have been freed since we last used. */
+	if (treedata->tree) {
+		BLI_assert(treedata->cached);
+		if (!bvhcache_has_tree(me->runtime.bvh_cache, treedata->tree)) {
+			free_bvhtree_from_mesh(treedata);
+		}
+		else {
+			/* Update Pointers. */
+			if (treedata->vert && treedata->vert_allocated == false) {
+				treedata->vert = me->mvert;
 			}
-			else {
-				if (treedata->vert == NULL) {
-					treedata->vert = DM_get_vert_array(dm, &treedata->vert_allocated);
-				}
-				if (treedata->loop == NULL) {
-					treedata->loop = DM_get_loop_array(dm, &treedata->loop_allocated);
-				}
-				if (treedata->looptri == NULL) {
-					if (sod->mpoly == NULL) {
-						sod->mpoly = DM_get_poly_array(dm, &sod->poly_allocated);
-					}
-					treedata->looptri = dm->getLoopTriArray(dm);
-					treedata->looptri_allocated = false;
-				}
+			if (treedata->loop && treedata->loop_allocated == false) {
+				treedata->loop = me->mloop;
+			}
+			if (treedata->looptri && treedata->looptri_allocated == false) {
+				treedata->looptri = BKE_mesh_runtime_looptri_ensure(me);
 			}
 		}
+	}
 
-		if (treedata->tree == NULL) {
-			bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_LOOPTRI, 4);
+	if (treedata->tree == NULL) {
+		BKE_bvhtree_from_mesh_get(treedata, me, BVHTREE_FROM_LOOPTRI, 4);
 
-			if (treedata->tree == NULL) {
-				return retval;
-			}
+		if (treedata->tree == NULL) {
+			return retval;
 		}
 	}
-	else {
-		return retval;
-	}
 
 	/* Only use closer ray_start in case of ortho view! In perspective one, ray_start may already
 	 * been *inside* boundbox, leading to snap failures (see T38409).
@@ -525,7 +474,7 @@ static bool raycastDerivedMesh(
 				retval = true;
 
 				if (r_index) {
-					*r_index = dm_looptri_to_poly_index(dm, &treedata->looptri[hit.index]);
+					*r_index = treedata->looptri[hit.index].poly;
 				}
 			}
 		}
@@ -566,29 +515,28 @@ static bool raycastEditMesh(
 	}
 	treedata = sod->bvh_trees[2];
 
-	if (treedata) {
-		if (treedata->tree == NULL) {
-			BLI_bitmap *elem_mask = NULL;
-			int looptri_num_active = -1;
-
-			if (sctx->callbacks.edit_mesh.test_face_fn) {
-				elem_mask = BLI_BITMAP_NEW(em->tottri, __func__);
-				looptri_num_active = BM_iter_mesh_bitmap_from_filter_tessface(
-				        em->bm, elem_mask,
-				        sctx->callbacks.edit_mesh.test_face_fn, sctx->callbacks.edit_mesh.user_data);
-			}
-			bvhtree_from_editmesh_looptri_ex(treedata, em, elem_mask, looptri_num_active, 0.0f, 4, 6, NULL);
+	if (treedata->tree == NULL) {
+		BLI_bitmap *elem_mask = NULL;
+		int looptri_num_active = -1;
 
-			if (elem_mask) {
-				MEM_freeN(elem_mask);
-			}
+		if (sctx->callbacks.edit_mesh.test_face_fn) {
+			elem_mask = BLI_BITMAP_NEW(em->tottri, __func__);
+			looptri_num_active = BM_iter_mesh_bitmap_from_filter_tessface(
+			        em->bm, elem_mask,
+			        sctx->callbacks.edit_mesh.test_face_fn, sctx->callbacks.edit_mesh.user_data);
+		}
+		bvhtree_from_editmesh_looptri_ex(treedata, em, elem_mask, looptri_num_active, 0.0f, 4, 6, NULL);
+
+		if (elem_mask) {
+			MEM_freeN(elem_mask);
 		}
 		if (treedata->tree == NULL) {
 			return retval;
 		}
 	}
 	else {
-		return retval;
+		/* COW hack: Update pointers */
+		treedata->em = em;
 	}
 
 	float imat[4][4];
@@ -679,7 +627,7 @@ static bool raycastEditMesh(
 				retval = true;
 
 				if (r_index) {
-					*r_index = hit.index;
+					*r_index = BM_elem_index_get(em->looptris[hit.index][0]->f);
 				}
 			}
 		}
@@ -698,7 +646,7 @@ static bool raycastObj(
         SnapObjectContext *sctx,
         const float ray_start[3], const float ray_dir[3],
         Object *ob, float obmat[4][4], const unsigned int ob_index,
-        bool use_obedit,
+        bool use_obedit, bool use_occlusion_test,
         /* read/write args */
         float *ray_depth,
         /* return args */
@@ -708,44 +656,46 @@ static bool raycastObj(
 {
 	bool retval = false;
 
-	if (ob->type == OB_MESH) {
-		BMEditMesh *em;
-
-		if (use_obedit) {
-			em = BKE_editmesh_from_object(ob);
-			retval = raycastEditMesh(
-			        sctx,
-			        ray_start, ray_dir,
-			        ob, em, obmat, ob_index,
-			        ray_depth, r_loc, r_no, r_index, r_hit_list);
+	if (use_occlusion_test) {
+		if (use_obedit && sctx->use_v3d &&
+		    !(sctx->v3d_data.v3d->flag & V3D_ZBUF_SELECT))
+		{
+			/* Use of occlude geometry in editing mode disabled. */
+			return false;
 		}
-		else {
-			/* in this case we want the mesh from the editmesh, avoids stale data. see: T45978.
-			 * still set the 'em' to NULL, since we only want the 'dm'. */
-			DerivedMesh *dm;
-			em = BKE_editmesh_from_object(ob);
-			if (em) {
-				editbmesh_get_derived_cage_and_final(sctx->scene, ob, em, CD_MASK_BAREMESH, &dm);
+	}
+
+	switch (ob->type) {
+		case OB_MESH:
+			if (use_obedit) {
+				BMEditMesh *em = BKE_editmesh_from_object(ob);
+				retval = raycastEditMesh(
+				        sctx,
+				        ray_start, ray_dir,
+				        ob, em, obmat, ob_index,
+				        ray_depth, r_loc, r_no, r_index, r_hit_list);
 			}
 			else {
-				dm = mesh_get_derived_final(sctx->scene, ob, CD_MASK_BAREMESH);
+				retval = raycastMesh(
+				        sctx,
+				        ray_start, ray_dir,
+				        ob, ob->data, obmat, ob_index,
+				        ray_depth, r_loc, r_no, r_index, r_hit_list);
 			}
-			retval = raycastDerivedMesh(
-			        sctx,
-			        ray_start, ray_dir,
-			        ob, dm, obmat, ob_index,
-			        ray_depth, r_loc, r_no, r_index, r_hit_list);
-		}
+			break;
 	}
 
 	if (retval) {
 		if (r_ob) {
 			*r_ob = ob;
+		}
+		if (r_obmat) {
 			copy_m4_m4(r_obmat, obmat);
 		}
+		return true;
 	}
 
-	return retval;
+	return false;
 }
 
 
@@ -762,16 +712,19 @@ struct RaycastObjUserData {
 	Object **r_ob;
 	float (*r_obmat)[4];
 	ListBase *r_hit_list;
+	bool use_occlusion_test;
 	bool ret;
 };
 
 static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, float obmat[4][4], void *data)
 {
 	struct RaycastObjUserData *dt = data;
+
 	dt->ret |= raycastObj(
 	        sctx,
 	        dt->ray_start, dt->ray_dir,
-	        ob, obmat, dt->ob_index++, is_obedit,
+	        ob, obmat, dt->ob_index++,
+	        is_obedit, dt->use_occlusion_test,
 	        dt->ray_depth,
 	        dt->r_loc, dt->r_no, dt->r_index,
 	        dt->r_ob, dt->r_obmat,
@@ -808,8 +761,8 @@ static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob,
  */
 static bool raycastObjects(
         SnapObjectContext *sctx,
+        const struct SnapObjectParams *params,
         const float ray_start[3], const float ray_dir[3],
-        const eSnapSelect snap_select, const bool use_object_edit_cage,
         /* read/write args */
         float *ray_depth,
         /* return args */
@@ -817,8 +770,6 @@ static bool raycastObjects(
         Object **r_ob, float r_obmat[4][4],
         ListBase *r_hit_list)
 {
-	Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
-
 	struct RaycastObjUserData data = {
 		.ray_start = ray_start,
 		.ray_dir = ray_dir,
@@ -830,10 +781,11 @@ static bool raycastObjects(
 		.r_ob = r_ob,
 		.r_obmat = r_obmat,
 		.r_hit_list = r_hit_list,
+		.use_occlusion_test = params->use_occlusion_test,
 		.ret = false,
 	};
 
-	iter_snap_objects(sctx, snap_select, obedit, raycast_obj_cb, &data);
+	iter_snap_objects(sctx, params, raycast_obj_cb, &data);
 
 	return data.ret;
 }
@@ -845,65 +797,106 @@ static bool raycastObjects(
 /** Snap Nearest utilities
  * \{ */
 
-static void copy_dm_vert_no(const int index, float r_no[3], const BVHTreeFromMesh *data)
+static void cb_mvert_co_get(
+        const int index, const float **co, const BVHTreeFromMesh *data)
+{
+	*co = data->vert[index].co;
+}
+
+static void cb_bvert_co_get(
+        const int index, const float **co, const BMEditMesh *data)
+{
+	BMVert *eve = BM_vert_at_index(data->bm, index);
+	*co = eve->co;
+}
+
+static void cb_mvert_no_copy(
+        const int index, float r_no[3], const BVHTreeFromMesh *data)
 {
 	const MVert *vert = data->vert + index;
 
 	normal_short_to_float_v3(r_no, vert->no);
 }
 
-static void copy_bvert_no(const int index, float r_no[3], const BVHTreeFromEditMesh *data)
+static void cb_bvert_no_copy(
+        const int index, float r_no[3], const BMEditMesh *data)
 {
-	BMVert *eve = BM_vert_at_index(data->em->bm, index);
+	BMVert *eve = BM_vert_at_index(data->bm, index);
 
 	copy_v3_v3(r_no, eve->no);
 }
 
-static void get_dm_edge_verts(const int index, const float *v_pair[2], const BVHTreeFromMesh *data)
+static void cb_medge_verts_get(
+        const int index, int v_index[2], const BVHTreeFromMesh *data)
+{
+	const MEdge *edge = &data->edge[index];
+
+	v_index[0] = edge->v1;
+	v_index[1] = edge->v2;
+
+}
+
+static void cb_bedge_verts_get(
+        const int index, int v_index[2], const BMEditMesh *data)
 {
-	const MVert *vert = data->vert;
-	const MEdge *edge = data->edge + index;
+	BMEdge *eed = BM_edge_at_index(data->bm, index);
+
+	v_index[0] = BM_elem_index_get(eed->v1);
+	v_index[1] = BM_elem_index_get(eed->v2);
+}
 
-	v_pair[0] = vert[edge->v1].co;
-	v_pair[1] = vert[edge->v2].co;
+static void cb_mlooptri_edges_get(
+        const int index, int v_index[3], const BVHTreeFromMesh *data)
+{
+	const MEdge *medge = data->edge;
+	const MLoop *mloop = data->loop;
+	const MLoopTri *lt = &data->looptri[index];
+	for (int j = 2, j_next = 0; j_next < 3; j = j_next++) {
+		const MEdge *ed = &medge[mloop[lt->tri[j]].e];
+		unsigned int tri_edge[2] = {mloop[lt->tri[j]].v, mloop[lt->tri[j_next]].v};
+		if (ELEM(ed->v1, tri_edge[0], tri_edge[1]) &&
+		    ELEM(ed->v2, tri_edge[0], tri_edge[1]))
+		{
+			//printf("real edge found\n");
+			v_index[j] = mloop[lt->tri[j]].e;
+		}
+		else
+			v_index[j] = -1;
+	}
 }
 
-static void get_bedge_verts(const int index, const float *v_pair[2], const BVHTreeFromEditMesh *data)
+static void cb_mlooptri_verts_get(
+        const int index, int v_index[3], const BVHTreeFromMesh *data)
 {
-	BMEdge *eed = BM_edge_at_index(data->em->bm, index);
+	const MLoop *loop = data->loop;
+	const MLoopTri *looptri = &data->looptri[index];
 
-	v_pair[0] = eed->v1->co;
-	v_pair[1] = eed->v2->co;
+	v_index[0] = loop[looptri->tri[0]].v;
+	v_index[1] = loop[looptri->tri[1]].v;
+	v_index[2] = loop[looptri->tri[2]].v;
 }
 
 static bool test_projected_vert_dist(
-        const float depth_range[2], const float mval[2], const float co[3],
-        float pmat[4][4], const float win_half[2], const bool is_persp,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        const bool is_persp, const float co[3],
         float *dist_px_sq, float r_co[3])
 {
-	float depth;
-	if (is_persp) {
-		depth = mul_project_m4_v3_zfac(pmat, co);
-		if (depth < depth_range[0] || depth > depth_range[1]) {
-			return false;
-		}
+	if (!isect_point_planes_v3_negated(clip_plane, clip_plane_len, co)) {
+		return false;
 	}
 
 	float co2d[2] = {
-		(dot_m4_v3_row_x(pmat, co) + pmat[3][0]),
-		(dot_m4_v3_row_y(pmat, co) + pmat[3][1]),
+		(dot_m4_v3_row_x(precalc->pmat, co) + precalc->pmat[3][0]),
+		(dot_m4_v3_row_y(precalc->pmat, co) + precalc->pmat[3][1]),
 	};
 
 	if (is_persp) {
-		mul_v2_fl(co2d, 1 / depth);
+		float w = mul_project_m4_v3_zfac(precalc->pmat, co);
+		mul_v2_fl(co2d, 1.0f / w);
 	}
 
-	co2d[0] += 1.0f;
-	co2d[1] += 1.0f;
-	co2d[0] *= win_half[0];
-	co2d[1] *= win_half[1];
-
-	const float dist_sq = len_squared_v2v2(mval, co2d);
+	const float dist_sq = len_squared_v2v2(precalc->mval, co2d);
 	if (dist_sq < *dist_px_sq) {
 		copy_v3_v3(r_co, co);
 		*dist_px_sq = dist_sq;
@@ -913,395 +906,487 @@ static bool test_projected_vert_dist(
 }
 
 static bool test_projected_edge_dist(
-        const float depth_range[2], const float mval[2],
-        float pmat[4][4], const float win_half[2], const bool is_persp,
-        const float ray_start[3], const float ray_dir[3],
-        const float va[3], const float vb[3],
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        const bool is_persp, const float va[3], const float vb[3],
         float *dist_px_sq, float r_co[3])
 {
+	float near_co[3], lambda;
+	if (!isect_ray_seg_v3(
+	        precalc->ray_origin,
+	        precalc->ray_direction,
+	        va, vb, &lambda))
+	{
+		copy_v3_v3(near_co, va);
+	}
+	else {
+		if (lambda <= 0.0f) {
+			copy_v3_v3(near_co, va);
+		}
+		else if (lambda >= 1.0f) {
+			copy_v3_v3(near_co, vb);
+		}
+		else {
+			interp_v3_v3v3(near_co, va, vb, lambda);
+		}
+	}
 
-	float tmp_co[3], depth;
-	dist_squared_ray_to_seg_v3(ray_start, ray_dir, va, vb, tmp_co, &depth);
-	return test_projected_vert_dist(depth_range, mval, tmp_co, pmat, win_half, is_persp, dist_px_sq, r_co);
+	return test_projected_vert_dist(
+	        precalc, clip_plane, clip_plane_len,
+	        is_persp, near_co, dist_px_sq, r_co);
 }
-typedef struct Nearest2dPrecalc {
-	float ray_origin_local[3];
-	float ray_direction_local[3];
-	float ray_inv_dir[3];
 
-	float ray_min_dist;
-	float pmat[4][4]; /* perspective matrix multiplied by object matrix */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** Walk DFS
+ * \{ */
+
+typedef void (*Nearest2DGetVertCoCallback)(const int index, const float **co, void *data);
+typedef void (*Nearest2DGetEdgeVertsCallback)(const int index, int v_index[2], void *data);
+typedef void (*Nearest2DGetTriVertsCallback)(const int index, int v_index[3], void *data);
+typedef void (*Nearest2DGetTriEdgesCallback)(const int index, int e_index[3], void *data); /* Equal the previous one */
+typedef void (*Nearest2DCopyVertNoCallback)(const int index, float r_no[3], void *data);
+
+typedef struct Nearest2dUserData {
 	bool is_persp;
-	float win_half[2];
 
-	float mval[2];
-	bool sign[3];
-} Nearest2dPrecalc;
+	void *userdata;
+	Nearest2DGetVertCoCallback get_vert_co;
+	Nearest2DGetEdgeVertsCallback get_edge_verts_index;
+	Nearest2DGetTriVertsCallback get_tri_verts_index;
+	Nearest2DGetTriEdgesCallback get_tri_edges_index;
+	Nearest2DCopyVertNoCallback copy_vert_no;
 
-/**
- * \param lpmat: Perspective matrix multiplied by object matrix
- */
-static void dist_squared_to_projected_aabb_precalc(
-        struct Nearest2dPrecalc *neasrest_precalc,
-        float lpmat[4][4], bool is_persp, const float win_half[2],
-        const float ray_min_dist, const float mval[2],
-        const float ray_origin_local[3], const float ray_direction_local[3])
+} Nearest2dUserData;
+
+
+static void cb_snap_vert(
+        void *userdata, int index,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        BVHTreeNearest *nearest)
 {
-	copy_m4_m4(neasrest_precalc->pmat, lpmat);
-	neasrest_precalc->is_persp = is_persp;
-	copy_v2_v2(neasrest_precalc->win_half, win_half);
-	neasrest_precalc->ray_min_dist = ray_min_dist;
+	struct Nearest2dUserData *data = userdata;
 
-	copy_v3_v3(neasrest_precalc->ray_origin_local, ray_origin_local);
-	copy_v3_v3(neasrest_precalc->ray_direction_local, ray_direction_local);
-	copy_v2_v2(neasrest_precalc->mval, mval);
+	const float *co;
+	data->get_vert_co(index, &co, data->userdata);
 
-	for (int i = 0; i < 3; i++) {
-		neasrest_precalc->ray_inv_dir[i] =
-		        (neasrest_precalc->ray_direction_local[i] != 0.0f) ?
-		        (1.0f / neasrest_precalc->ray_direction_local[i]) : FLT_MAX;
-		neasrest_precalc->sign[i] = (neasrest_precalc->ray_inv_dir[i] < 0.0f);
+	if (test_projected_vert_dist(
+	        precalc,
+	        clip_plane,
+	        clip_plane_len,
+	        data->is_persp, co,
+	        &nearest->dist_sq,
+	        nearest->co))
+	{
+		data->copy_vert_no(index, nearest->no, data->userdata);
+		nearest->index = index;
 	}
 }
 
-/* Returns the distance from a 2d coordinate to a BoundBox (Projected) */
-static float dist_squared_to_projected_aabb(
-        struct Nearest2dPrecalc *data,
-        const float bbmin[3], const float bbmax[3],
-        bool r_axis_closest[3])
+static void cb_snap_edge(
+        void *userdata, int index,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        BVHTreeNearest *nearest)
 {
-	float local_bvmin[3], local_bvmax[3];
-	if (data->sign[0]) {
-		local_bvmin[0] = bbmax[0];
-		local_bvmax[0] = bbmin[0];
-	}
-	else {
-		local_bvmin[0] = bbmin[0];
-		local_bvmax[0] = bbmax[0];
-	}
-	if (data->sign[1]) {
-		local_bvmin[1] = bbmax[1];
-		local_bvmax[1] = bbmin[1];
-	}
-	else {
-		local_bvmin[1] = bbmin[1];
-		local_bvmax[1] = bbmax[1];
-	}
-	if (data->sign[2]) {
-		local_bvmin[2] = bbmax[2];
-		local_bvmax[2] = bbmin[2];
-	}
-	else {
-		local_bvmin[2] = bbmin[2];
-		local_bvmax[2] = bbmax[2];
-	}
+	struct Nearest2dUserData *data = userdata;
 
-	const float tmin[3] = {
-		(local_bvmin[0] - data->ray_origin_local[0]) * data->ray_inv_dir[0],
-		(local_bvmin[1] - data->ray_origin_local[1]) * data->ray_inv_dir[1],
-		(local_bvmin[2] - data->ray_origin_local[2]) * data->ray_inv_dir[2],
-	};
-	const float tmax[3] = {
-		(local_bvmax[0] - data->ray_origin_local[0]) * data->ray_inv_dir[0],
-		(local_bvmax[1] - data->ray_origin_local[1]) * data->ray_inv_dir[1],
-		(local_bvmax[2] - data->ray_origin_local[2]) * data->ray_inv_dir[2],
-	};
-	/* `va` and `vb` are the coordinates of the AABB edge closest to the ray */
-	float va[3], vb[3];
-	/* `rtmin` and `rtmax` are the minimum and maximum distances of the ray hits on the AABB */
-	float rtmin, rtmax;
-	int main_axis;
-
-	if ((tmax[0] <= tmax[1]) && (tmax[0] <= tmax[2])) {
-		rtmax = tmax[0];
-		va[0] = vb[0] = local_bvmax[0];
-		main_axis = 3;
-		r_axis_closest[0] = data->sign[0];
-	}
-	else if ((tmax[1] <= tmax[0]) && (tmax[1] <= tmax[2])) {
-		rtmax = tmax[1];
-		va[1] = vb[1] = local_bvmax[1];
-		main_axis = 2;
-		r_axis_closest[1] = data->sign[1];
-	}
-	else {
-		rtmax = tmax[2];
-		va[2] = vb[2] = local_bvmax[2];
-		main_axis = 1;
-		r_axis_closest[2] = data->sign[2];
-	}
+	int vindex[2];
+	data->get_edge_verts_index(index, vindex, data->userdata);
 
-	if ((tmin[0] >= tmin[1]) && (tmin[0] >= tmin[2])) {
-		rtmin = tmin[0];
-		va[0] = vb[0] = local_bvmin[0];
-		main_axis -= 3;
-		r_axis_closest[0] = !data->sign[0];
-	}
-	else if ((tmin[1] >= tmin[0]) && (tmin[1] >= tmin[2])) {
-		rtmin = tmin[1];
-		va[1] = vb[1] = local_bvmin[1];
-		main_axis -= 1;
-		r_axis_closest[1] = !data->sign[1];
-	}
-	else {
-		rtmin = tmin[2];
-		va[2] = vb[2] = local_bvmin[2];
-		main_axis -= 2;
-		r_axis_closest[2] = !data->sign[2];
-	}
-	if (main_axis < 0) {
-		main_axis += 3;
-	}
+	const float *v_pair[2];
+	data->get_vert_co(vindex[0], &v_pair[0], data->userdata);
+	data->get_vert_co(vindex[1], &v_pair[1], data->userdata);
 
-#define IGNORE_BEHIND_RAY
-#ifdef IGNORE_BEHIND_RAY
-	float depth_max = depth_get(local_bvmax, data->ray_origin_local, data->ray_direction_local);
-	if (depth_max < data->ray_min_dist) {
-		return FLT_MAX;
+	if (test_projected_edge_dist(
+	        precalc,
+	        clip_plane,
+	        clip_plane_len,
+	        data->is_persp,
+	        v_pair[0], v_pair[1],
+	        &nearest->dist_sq,
+	        nearest->co))
+	{
+		sub_v3_v3v3(nearest->no, v_pair[0], v_pair[1]);
+		nearest->index = index;
 	}
-#endif
-#undef IGNORE_BEHIND_RAY
+}
 
-	/* if rtmin <= rtmax, ray intersect `AABB` */
-	if (rtmin <= rtmax) {
-		return 0;
+static void cb_snap_edge_verts(
+        void *userdata, int index,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        BVHTreeNearest *nearest)
+{
+	struct Nearest2dUserData *data = userdata;
+
+	int vindex[2];
+	data->get_edge_verts_index(index, vindex, data->userdata);
+
+	for (int i = 2; i--;) {
+		if (vindex[i] == nearest->index) {
+			continue;
+		}
+		cb_snap_vert(
+		        userdata, vindex[i], precalc,
+		        clip_plane, clip_plane_len, nearest);
 	}
+}
+
+static void cb_snap_tri_edges(
+        void *userdata, int index,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        BVHTreeNearest *nearest)
+{
+	struct Nearest2dUserData *data = userdata;
 
-	if (data->sign[main_axis]) {
-		va[main_axis] = local_bvmax[main_axis];
-		vb[main_axis] = local_bvmin[main_axis];
+	int eindex[3];
+	data->get_tri_edges_index(index, eindex, data->userdata);
+	for (int i = 3; i--;) {
+		if (eindex[i] != -1) {
+			if (eindex[i] == nearest->index) {
+				continue;
+			}
+			cb_snap_edge(
+			        userdata, eindex[i], precalc,
+			        clip_plane, clip_plane_len, nearest);
+		}
 	}
-	else {
-		va[main_axis] = local_bvmin[main_axis];
-		vb[main_axis] = local_bvmax[main_axis];
+}
+
+static void cb_snap_tri_verts(
+        void *userdata, int index,
+        const struct DistProjectedAABBPrecalc *precalc,
+        const float (*clip_plane)[4], const int clip_plane_len,
+        BVHTreeNearest *nearest)
+{
+	struct Nearest2dUserData *data = userdata;
+
+	int vindex[3];
+	data->get_tri_verts_index(index, vindex, data->userdata);
+	for (int i = 3; i--;) {
+		if (vindex[i] == nearest->index) {
+			continue;
+		}
+		cb_snap_vert(
+		        userdata, vindex[i], precalc,
+		        clip_plane, clip_plane_len, nearest);
 	}
-	float scale = fabsf(local_bvmax[main_axis] - local_bvmin[main_axis]);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Internal Object Snapping API
+ * \{ */
 
-	float (*pmat)[4] = data->pmat;
+static short snap_mesh_polygon(
+        SnapObjectContext *sctx, SnapData *snapdata,
+        Object *ob, float obmat[4][4],
+        /* read/write args */
+        float *dist_px,
+        /* return args */
+        float r_loc[3], float r_no[3], int *r_index)
+{
+	short elem = 0;
+
+	float lpmat[4][4];
+	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
+
+	struct DistProjectedAABBPrecalc neasrest_precalc;
+	dist_squared_to_projected_aabb_precalc(
+	        &neasrest_precalc, lpmat, snapdata->win_size, snapdata->mval);
 
-	float va2d[2] = {
-		(dot_m4_v3_row_x(pmat, va) + pmat[3][0]),
-		(dot_m4_v3_row_y(pmat, va) + pmat[3][1]),
+	float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+	transpose_m4_m4(tobmat, obmat);
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+	}
+
+	Nearest2dUserData nearest2d = {
+		.is_persp = snapdata->view_proj == VIEW_PROJ_PERSP,
 	};
-	float vb2d[2] = {
-		(va2d[0] + pmat[main_axis][0] * scale),
-		(va2d[1] + pmat[main_axis][1] * scale),
+
+	BVHTreeNearest nearest = {
+		.index = -1,
+		.dist_sq = SQUARE(*dist_px),
 	};
 
-	if (data->is_persp) {
-		float depth_a = mul_project_m4_v3_zfac(pmat, va);
-		float depth_b = depth_a + pmat[main_axis][3] * scale;
-		va2d[0] /= depth_a;
-		va2d[1] /= depth_a;
-		vb2d[0] /= depth_b;
-		vb2d[1] /= depth_b;
-	}
-
-	va2d[0] += 1.0f;
-	va2d[1] += 1.0f;
-	vb2d[0] += 1.0f;
-	vb2d[1] += 1.0f;
-
-	va2d[0] *= data->win_half[0];
-	va2d[1] *= data->win_half[1];
-	vb2d[0] *= data->win_half[0];
-	vb2d[1] *= data->win_half[1];
-
-	float dvec[2], edge[2], lambda, rdist;
-	sub_v2_v2v2(dvec, data->mval, va2d);
-	sub_v2_v2v2(edge, vb2d, va2d);
-	lambda = dot_v2v2(dvec, edge);
-	if (lambda != 0.0f) {
-		lambda /= len_squared_v2(edge);
-		if (lambda <= 0.0f) {
-			rdist = len_squared_v2v2(data->mval, va2d);
-			r_axis_closest[main_axis] = true;
-		}
-		else if (lambda >= 1.0f) {
-			rdist = len_squared_v2v2(data->mval, vb2d);
-			r_axis_closest[main_axis] = false;
+	SnapObjectData *sod = BLI_ghash_lookup(sctx->cache.object_map, ob);
+	BLI_assert(sod != NULL);
+
+	if (sod->type == SNAP_MESH) {
+		BVHTreeFromMesh *treedata = &((SnapObjectData_Mesh *)sod)->treedata;
+
+		nearest2d.userdata             = treedata;
+		nearest2d.get_vert_co          = (Nearest2DGetVertCoCallback)cb_mvert_co_get;
+		nearest2d.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_medge_verts_get;
+		nearest2d.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_mvert_no_copy;
+
+		MPoly *mp = &((Mesh *)ob->data)->mpoly[*r_index];
+		const MLoop *ml;
+		if (snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+			elem = SCE_SNAP_MODE_EDGE;
+			treedata->edge = ((Mesh *)ob->data)->medge;
+			ml = &treedata->loop[mp->loopstart];
+			for (int i = mp->totloop; i--; ml++) {
+				cb_snap_edge(
+				        &nearest2d, ml->e, &neasrest_precalc,
+				        clip_planes_local, snapdata->clip_plane_len,
+				        &nearest);
+			}
 		}
 		else {
-			va2d[0] += edge[0] * lambda;
-			va2d[1] += edge[1] * lambda;
-			rdist = len_squared_v2v2(data->mval, va2d);
-			r_axis_closest[main_axis] = lambda < 0.5f;
+			elem = SCE_SNAP_MODE_VERTEX;
+			ml = &treedata->loop[mp->loopstart];
+			for (int i = mp->totloop; i--; ml++) {
+				cb_snap_vert(
+				        &nearest2d, ml->v, &neasrest_precalc,
+				        clip_planes_local, snapdata->clip_plane_len,
+				        &nearest);
+			}
 		}
 	}
 	else {
-		rdist = len_squared_v2v2(data->mval, va2d);
+		BLI_assert(sod->type == SNAP_EDIT_MESH);
+		BMEditMesh *em = BKE_editmesh_from_object(ob);
+
+		nearest2d.userdata             = em;
+		nearest2d.get_vert_co          = (Nearest2DGetVertCoCallback)cb_bvert_co_get;
+		nearest2d.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_bedge_verts_get;
+		nearest2d.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_bvert_no_copy;
+
+		BM_mesh_elem_table_ensure(em->bm, BM_FACE);
+		BMFace *f = BM_face_at_index(em->bm, *r_index);
+		BMLoop *l_iter, *l_first;
+		l_iter = l_first = BM_FACE_FIRST_LOOP(f);
+		if (snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+			elem = SCE_SNAP_MODE_EDGE;
+			BM_mesh_elem_table_ensure(em->bm, BM_VERT | BM_EDGE);
+			do {
+				cb_snap_edge(
+				        &nearest2d, BM_elem_index_get(l_iter->e),
+				        &neasrest_precalc,
+				        clip_planes_local, snapdata->clip_plane_len,
+				        &nearest);
+			} while ((l_iter = l_iter->next) != l_first);
+		}
+		else {
+			elem = SCE_SNAP_MODE_VERTEX;
+			BM_mesh_elem_table_ensure(em->bm, BM_VERT);
+			do {
+				cb_snap_vert(
+				        &nearest2d, BM_elem_index_get(l_iter->v),
+				        &neasrest_precalc,
+				        clip_planes_local, snapdata->clip_plane_len,
+				        &nearest);
+			} while ((l_iter = l_iter->next) != l_first);
+		}
 	}
-	return rdist;
-}
 
-static float dist_squared_to_projected_aabb_simple(
-        float lpmat[4][4], const float win_half[2],
-        const float ray_min_dist, const float mval[2],
-        const float ray_origin_local[3], const float ray_direction_local[3],
-        const float bbmin[3], const float bbmax[3])
-{
-	struct Nearest2dPrecalc data;
-	dist_squared_to_projected_aabb_precalc(
-	        &data, lpmat, true, win_half, ray_min_dist,
-	        mval, ray_origin_local, ray_direction_local);
+	if (nearest.index != -1) {
+		*dist_px = sqrtf(nearest.dist_sq);
 
-	bool dummy[3] = {true, true, true};
-	return dist_squared_to_projected_aabb(&data, bbmin, bbmax, dummy);
-}
+		copy_v3_v3(r_loc, nearest.co);
+		mul_m4_v3(obmat, r_loc);
 
-/** \} */
+		if (r_no) {
+			float imat[4][4];
+			invert_m4_m4(imat, obmat);
 
-/* -------------------------------------------------------------------- */
-/** Walk DFS
- * \{ */
+			copy_v3_v3(r_no, nearest.no);
+			mul_transposed_mat3_m4_v3(imat, r_no);
+			normalize_v3(r_no);
+		}
 
-typedef void (*Nearest2DGetEdgeVertsCallback)(const int index, const float *v_pair[2], void *data);
-typedef void (*Nearest2DCopyVertNoCallback)(const int index, float r_no[3], void *data);
+		if (r_index) {
+			*r_index = nearest.index;
+		}
 
-typedef struct Nearest2dUserData {
-	struct Nearest2dPrecalc data_precalc;
+		return elem;
+	}
 
-	float dist_px_sq;
+	return 0;
+}
 
-	bool r_axis_closest[3];
 
-	float depth_range[2];
+static short snap_mesh_edge_verts_mixed(
+        SnapObjectContext *sctx, SnapData *snapdata,
+        Object *ob, float obmat[4][4], float original_dist_px,
+        /* read/write args */
+        float *dist_px,
+        /* return args */
+        float r_loc[3], float r_no[3], int *r_index)
+{
+	short elem = SCE_SNAP_MODE_EDGE;
 
-	void *userdata;
-	Nearest2DGetEdgeVertsCallback get_edge_verts;
-	Nearest2DCopyVertNoCallback copy_vert_no;
+	if (ob->type != OB_MESH) {
+		return elem;
+	}
 
-	int index;
-	float co[3];
-	float no[3];
-} Nearest2dUserData;
+	float lpmat[4][4];
+	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
 
+	struct DistProjectedAABBPrecalc neasrest_precalc;
+	dist_squared_to_projected_aabb_precalc(
+	        &neasrest_precalc, lpmat, snapdata->win_size, snapdata->mval);
 
-static bool cb_walk_parent_snap_project(const BVHTreeAxisRange *bounds, void *user_data)
-{
-	Nearest2dUserData *data = user_data;
-	const float bbmin[3] = {bounds[0].min, bounds[1].min, bounds[2].min};
-	const float bbmax[3] = {bounds[0].max, bounds[1].max, bounds[2].max};
-	const float rdist = dist_squared_to_projected_aabb(
-	        &data->data_precalc, bbmin, bbmax, data->r_axis_closest);
-	return rdist < data->dist_px_sq;
-}
+	Nearest2dUserData nearest2d = {
+		.is_persp     = snapdata->view_proj == VIEW_PROJ_PERSP,
+	};
 
-static bool cb_walk_leaf_snap_vert(const BVHTreeAxisRange *bounds, int index, void *userdata)
-{
-	struct Nearest2dUserData *data = userdata;
-	struct Nearest2dPrecalc *neasrest_precalc = &data->data_precalc;
-	const float co[3] = {
-		(bounds[0].min + bounds[0].max) / 2,
-		(bounds[1].min + bounds[1].max) / 2,
-		(bounds[2].min + bounds[2].max) / 2,
+	BVHTreeNearest nearest = {
+		.index = -1,
+		.dist_sq = SQUARE(original_dist_px),
 	};
 
-	if (test_projected_vert_dist(
-	        data->depth_range,
-	        neasrest_precalc->mval, co,
-	        neasrest_precalc->pmat,
-	        neasrest_precalc->win_half,
-	        neasrest_precalc->is_persp,
-	        &data->dist_px_sq,
-	        data->co))
-	{
-		data->copy_vert_no(index, data->no, data->userdata);
-		data->index = index;
+	SnapObjectData *sod = BLI_ghash_lookup(sctx->cache.object_map, ob);
+	BLI_assert(sod != NULL);
+
+	if (sod->type == SNAP_MESH) {
+		nearest2d.userdata             = &((SnapObjectData_Mesh *)sod)->treedata;
+		nearest2d.get_vert_co          = (Nearest2DGetVertCoCallback)cb_mvert_co_get;
+		nearest2d.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_medge_verts_get;
+		nearest2d.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_mvert_no_copy;
+	}
+	else {
+		BLI_assert(sod->type == SNAP_EDIT_MESH);
+		nearest2d.userdata             = BKE_editmesh_from_object(ob);
+		nearest2d.get_vert_co          = (Nearest2DGetVertCoCallback)cb_bvert_co_get;
+		nearest2d.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_bedge_verts_get;
+		nearest2d.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_bvert_no_copy;
 	}
-	return true;
-}
 
-static bool cb_walk_leaf_snap_edge(const BVHTreeAxisRange *UNUSED(bounds), int index, void *userdata)
-{
-	struct Nearest2dUserData *data = userdata;
-	struct Nearest2dPrecalc *neasrest_precalc = &data->data_precalc;
+	int vindex[2];
+	nearest2d.get_edge_verts_index(*r_index, vindex, nearest2d.userdata);
 
 	const float *v_pair[2];
-	data->get_edge_verts(index, v_pair, data->userdata);
-
-	if (test_projected_edge_dist(
-	        data->depth_range,
-	        neasrest_precalc->mval,
-	        neasrest_precalc->pmat,
-	        neasrest_precalc->win_half,
-	        neasrest_precalc->is_persp,
-	        neasrest_precalc->ray_origin_local,
-	        neasrest_precalc->ray_direction_local,
-	        v_pair[0], v_pair[1],
-	        &data->dist_px_sq,
-	        data->co))
+	nearest2d.get_vert_co(vindex[0], &v_pair[0], nearest2d.userdata);
+	nearest2d.get_vert_co(vindex[1], &v_pair[1], nearest2d.userdata);
+
+	float lambda;
+	if (!isect_ray_seg_v3(
+	        neasrest_precalc.ray_origin,
+	        neasrest_precalc.ray_direction,
+	        v_pair[0], v_pair[1], &lambda))
 	{
-		sub_v3_v3v3(data->no, v_pair[0], v_pair[1]);
-		data->index = index;
+		/* do nothing */;
 	}
-	return true;
-}
+	else if (lambda < 0.25f || 0.75f < lambda) {
+		int v_id = lambda < 0.5f ? 0 : 1;
 
-static bool cb_nearest_walk_order(const BVHTreeAxisRange *UNUSED(bounds), char axis, void *userdata)
-{
-	const bool *r_axis_closest = ((struct Nearest2dUserData *)userdata)->r_axis_closest;
-	return r_axis_closest[axis];
-}
+		if (test_projected_vert_dist(
+		        &neasrest_precalc, NULL, 0,
+		        nearest2d.is_persp, v_pair[v_id],
+		        &nearest.dist_sq, nearest.co))
+		{
+			nearest.index = vindex[v_id];
+			nearest2d.copy_vert_no(vindex[v_id], nearest.no, nearest2d.userdata);
+			elem = SCE_SNAP_MODE_VERTEX;
+		}
+	}
 
-/** \} */
+	if (nearest.index != -1) {
+		*dist_px = sqrtf(nearest.dist_sq);
 
-/* -------------------------------------------------------------------- */
-/** \name Internal Object Snapping API
- * \{ */
+		copy_v3_v3(r_loc, nearest.co);
+		mul_m4_v3(obmat, r_loc);
+
+		if (r_no) {
+			float imat[4][4];
+			invert_m4_m4(imat, obmat);
 
-static bool snapArmature(
+			copy_v3_v3(r_no, nearest.no);
+			mul_transposed_mat3_m4_v3(imat, r_no);
+			normalize_v3(r_no);
+		}
+
+		if (r_index) {
+			*r_index = nearest.index;
+		}
+	}
+
+	return elem;
+}
+
+static short snapArmature(
         SnapData *snapdata,
-        Object *ob, bArmature *arm, float obmat[4][4],
+        Object *ob, float obmat[4][4], bool use_obedit,
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float *UNUSED(r_no))
+        float r_loc[3], float *UNUSED(r_no), int *r_index)
 {
-	bool retval = false;
+	short retval = 0;
+
+	if (snapdata->snap_to_flag == SCE_SNAP_MODE_FACE) { /* Currently only edge and vert */
+		return retval;
+	}
 
-	float ray_start_local[3], ray_normal_local[3]; /* Used only in the snap to edges */
-	if (snapdata->snap_to == SCE_SNAP_MODE_EDGE) {
-		float imat[4][4];
-		invert_m4_m4(imat, obmat);
+	float lpmat[4][4], dist_px_sq = SQUARE(*dist_px);
+	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
 
-		copy_v3_v3(ray_start_local, snapdata->ray_origin);
-		copy_v3_v3(ray_normal_local, snapdata->ray_dir);
-		mul_m4_v3(imat, ray_start_local);
-		mul_mat3_m4_v3(imat, ray_normal_local);
+	struct DistProjectedAABBPrecalc neasrest_precalc;
+	dist_squared_to_projected_aabb_precalc(
+	        &neasrest_precalc, lpmat, snapdata->win_size, snapdata->mval);
+
+	if (use_obedit == false) {
+		/* Test BoundBox */
+		BoundBox *bb = BKE_armature_boundbox_get(ob);
+		if (bb) {
+			bool dummy[3];
+			/* In vertex and edges you need to get the pixel distance from ray to BoundBox, see: T46099, T46816 */
+			float bb_dist_px_sq = dist_squared_to_projected_aabb(
+			        &neasrest_precalc, bb->vec[0], bb->vec[6], dummy);
+
+			if (bb_dist_px_sq > dist_px_sq) {
+				return retval;
+			}
+		}
 	}
-	else if (snapdata->snap_to != SCE_SNAP_MODE_VERTEX) { /* Currently only edge and vert */
-		return retval;
+
+	float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+	transpose_m4_m4(tobmat, obmat);
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
 	}
 
 	bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
-	float lpmat[4][4], dist_px_sq;
-	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
-	dist_px_sq = SQUARE(*dist_px);
 
+	bArmature *arm = ob->data;
 	if (arm->edbo) {
 		for (EditBone *eBone = arm->edbo->first; eBone; eBone = eBone->next) {
 			if (eBone->layer & arm->layer) {
 				/* skip hidden or moving (selected) bones */
 				if ((eBone->flag & (BONE_HIDDEN_A | BONE_ROOTSEL | BONE_TIPSEL)) == 0) {
-					switch (snapdata->snap_to) {
-						case SCE_SNAP_MODE_VERTEX:
-							retval |= test_projected_vert_dist(
-							        snapdata->depth_range, snapdata->mval, eBone->head,
-							        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-							        r_loc);
-							retval |= test_projected_vert_dist(
-							        snapdata->depth_range, snapdata->mval, eBone->tail,
-							        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-							        r_loc);
-							break;
-						case SCE_SNAP_MODE_EDGE:
-							retval |= test_projected_edge_dist(
-							        snapdata->depth_range, snapdata->mval, lpmat,
-							        snapdata->win_half, is_persp, ray_start_local, ray_normal_local,
-							        eBone->head, eBone->tail,
-							        &dist_px_sq, r_loc);
-							break;
+					bool has_vert_snap = false;
+
+					if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+						has_vert_snap = test_projected_vert_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, eBone->head, &dist_px_sq, r_loc);
+						has_vert_snap |= test_projected_vert_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, eBone->tail, &dist_px_sq, r_loc);
+
+						if (has_vert_snap) {
+							retval = SCE_SNAP_MODE_VERTEX;
+						}
+					}
+					if (!has_vert_snap && snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+						if (test_projected_edge_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, eBone->head, eBone->tail,
+						        &dist_px_sq, r_loc))
+						{
+							retval = SCE_SNAP_MODE_EDGE;
+						}
 					}
 				}
 			}
@@ -1312,193 +1397,249 @@ static bool snapArmature(
 			Bone *bone = pchan->bone;
 			/* skip hidden bones */
 			if (bone && !(bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) {
+				bool has_vert_snap = false;
 				const float *head_vec = pchan->pose_head;
 				const float *tail_vec = pchan->pose_tail;
 
-				switch (snapdata->snap_to) {
-					case SCE_SNAP_MODE_VERTEX:
-						retval |= test_projected_vert_dist(
-						        snapdata->depth_range, snapdata->mval, head_vec,
-						        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-						        r_loc);
-						retval |= test_projected_vert_dist(
-						        snapdata->depth_range, snapdata->mval, tail_vec,
-						        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-						        r_loc);
-						break;
-					case SCE_SNAP_MODE_EDGE:
-						retval |= test_projected_edge_dist(
-						        snapdata->depth_range, snapdata->mval, lpmat,
-						        snapdata->win_half, is_persp, ray_start_local, ray_normal_local,
-						        head_vec, tail_vec,
-						        &dist_px_sq, r_loc);
-						break;
+				if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+					has_vert_snap = test_projected_vert_dist(
+					        &neasrest_precalc,
+					        clip_planes_local, snapdata->clip_plane_len,
+					        is_persp, head_vec, &dist_px_sq, r_loc);
+					has_vert_snap |= test_projected_vert_dist(
+					        &neasrest_precalc,
+					        clip_planes_local, snapdata->clip_plane_len,
+					        is_persp, tail_vec, &dist_px_sq, r_loc);
+
+					if (has_vert_snap) {
+						retval = SCE_SNAP_MODE_VERTEX;
+					}
+				}
+				if (!has_vert_snap && snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+					if (test_projected_edge_dist(
+					        &neasrest_precalc,
+					        clip_planes_local, snapdata->clip_plane_len,
+					        is_persp, head_vec, tail_vec,
+					        &dist_px_sq, r_loc))
+					{
+						retval = SCE_SNAP_MODE_EDGE;
+					}
 				}
 			}
 		}
 	}
+
 	if (retval) {
 		*dist_px = sqrtf(dist_px_sq);
 		mul_m4_v3(obmat, r_loc);
-		*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
-		return true;
+		if (r_index) {
+			/* Does not support index. */
+			*r_index = -1;
+		}
+		return retval;
 	}
-	return false;
+
+	return 0;
 }
 
-static bool snapCurve(
+static short snapCurve(
         SnapData *snapdata,
-        Object *ob, Curve *cu, float obmat[4][4],
+        Object *ob, float obmat[4][4], bool use_obedit,
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float *UNUSED(r_no))
+        float r_loc[3], float *UNUSED(r_no), int *r_index)
 {
-	bool retval = false;
+	bool has_snap = false;
 
 	/* only vertex snapping mode (eg control points and handles) supported for now) */
-	if (snapdata->snap_to != SCE_SNAP_MODE_VERTEX) {
-		return retval;
+	if (snapdata->snap_to_flag != SCE_SNAP_MODE_VERTEX) {
+		return 0;
 	}
 
-	bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
-	float lpmat[4][4], dist_px_sq;
+	Curve *cu = ob->data;
+	float dist_px_sq = SQUARE(*dist_px);
+
+	float lpmat[4][4];
 	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
-	dist_px_sq = SQUARE(*dist_px);
 
-	for (Nurb *nu = (ob->mode == OB_MODE_EDIT ? cu->editnurb->nurbs.first : cu->nurb.first); nu; nu = nu->next) {
+	struct DistProjectedAABBPrecalc neasrest_precalc;
+	dist_squared_to_projected_aabb_precalc(
+	        &neasrest_precalc, lpmat, snapdata->win_size, snapdata->mval);
+
+	if (use_obedit == false) {
+		/* Test BoundBox */
+		BoundBox *bb = BKE_curve_boundbox_get(ob);
+		if (bb) {
+			bool dummy[3];
+			/* In vertex and edges you need to get the pixel distance from ray to BoundBox, see: T46099, T46816 */
+			float bb_dist_px_sq = dist_squared_to_projected_aabb(
+			        &neasrest_precalc, bb->vec[0], bb->vec[6], dummy);
+
+			if (bb_dist_px_sq > dist_px_sq) {
+				return 0;
+			}
+		}
+	}
+
+	float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+	transpose_m4_m4(tobmat, obmat);
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+	}
+
+	bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
+
+	for (Nurb *nu = (use_obedit ? cu->editnurb->nurbs.first : cu->nurb.first); nu; nu = nu->next) {
 		for (int u = 0; u < nu->pntsu; u++) {
-			switch (snapdata->snap_to) {
-				case SCE_SNAP_MODE_VERTEX:
-				{
-					if (ob->mode == OB_MODE_EDIT) {
-						if (nu->bezt) {
-							/* don't snap to selected (moving) or hidden */
-							if (nu->bezt[u].f2 & SELECT || nu->bezt[u].hide != 0) {
-								break;
-							}
-							retval |= test_projected_vert_dist(
-							        snapdata->depth_range, snapdata->mval, nu->bezt[u].vec[1],
-							        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-							        r_loc);
-							/* don't snap if handle is selected (moving), or if it is aligning to a moving handle */
-							if (!(nu->bezt[u].f1 & SELECT) &&
-							    !(nu->bezt[u].h1 & HD_ALIGN && nu->bezt[u].f3 & SELECT))
-							{
-								retval |= test_projected_vert_dist(
-								        snapdata->depth_range, snapdata->mval, nu->bezt[u].vec[0],
-								        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-								        r_loc);
-							}
-							if (!(nu->bezt[u].f3 & SELECT) &&
-							    !(nu->bezt[u].h2 & HD_ALIGN && nu->bezt[u].f1 & SELECT))
-							{
-								retval |= test_projected_vert_dist(
-								        snapdata->depth_range, snapdata->mval, nu->bezt[u].vec[2],
-								        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-								        r_loc);
-							}
+			if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+				if (use_obedit) {
+					if (nu->bezt) {
+						/* don't snap to selected (moving) or hidden */
+						if (nu->bezt[u].f2 & SELECT || nu->bezt[u].hide != 0) {
+							break;
 						}
-						else {
-							/* don't snap to selected (moving) or hidden */
-							if (nu->bp[u].f1 & SELECT || nu->bp[u].hide != 0) {
-								break;
-							}
-							retval |= test_projected_vert_dist(
-							        snapdata->depth_range, snapdata->mval, nu->bp[u].vec,
-							        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
+						has_snap |= test_projected_vert_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, nu->bezt[u].vec[1], &dist_px_sq,
+						        r_loc);
+						/* don't snap if handle is selected (moving), or if it is aligning to a moving handle */
+						if (!(nu->bezt[u].f1 & SELECT) &&
+						    !(nu->bezt[u].h1 & HD_ALIGN && nu->bezt[u].f3 & SELECT))
+						{
+							has_snap |= test_projected_vert_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, nu->bezt[u].vec[0], &dist_px_sq,
+						        r_loc);
+						}
+						if (!(nu->bezt[u].f3 & SELECT) &&
+						    !(nu->bezt[u].h2 & HD_ALIGN && nu->bezt[u].f1 & SELECT))
+						{
+							has_snap |= test_projected_vert_dist(
+							        &neasrest_precalc,
+							        clip_planes_local, snapdata->clip_plane_len,
+							        is_persp, nu->bezt[u].vec[2], &dist_px_sq,
 							        r_loc);
 						}
 					}
 					else {
-						/* curve is not visible outside editmode if nurb length less than two */
-						if (nu->pntsu > 1) {
-							if (nu->bezt) {
-								retval |= test_projected_vert_dist(
-								        snapdata->depth_range, snapdata->mval, nu->bezt[u].vec[1],
-								        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-								        r_loc);
-							}
-							else {
-								retval |= test_projected_vert_dist(
-								        snapdata->depth_range, snapdata->mval, nu->bp[u].vec,
-								        lpmat, snapdata->win_half, is_persp, &dist_px_sq,
-								        r_loc);
-							}
+						/* don't snap to selected (moving) or hidden */
+						if (nu->bp[u].f1 & SELECT || nu->bp[u].hide != 0) {
+							break;
+						}
+						has_snap |= test_projected_vert_dist(
+						        &neasrest_precalc,
+						        clip_planes_local, snapdata->clip_plane_len,
+						        is_persp, nu->bp[u].vec, &dist_px_sq,
+						        r_loc);
+					}
+				}
+				else {
+					/* curve is not visible outside editmode if nurb length less than two */
+					if (nu->pntsu > 1) {
+						if (nu->bezt) {
+							has_snap |= test_projected_vert_dist(
+							        &neasrest_precalc,
+							        clip_planes_local, snapdata->clip_plane_len,
+							        is_persp, nu->bezt[u].vec[1], &dist_px_sq,
+							        r_loc);
+						}
+						else {
+							has_snap |= test_projected_vert_dist(
+							        &neasrest_precalc,
+							        clip_planes_local, snapdata->clip_plane_len,
+							        is_persp, nu->bp[u].vec, &dist_px_sq,
+							        r_loc);
 						}
 					}
-					break;
 				}
-				default:
-					break;
 			}
 		}
 	}
-	if (retval) {
+	if (has_snap) {
 		*dist_px = sqrtf(dist_px_sq);
 		mul_m4_v3(obmat, r_loc);
-		*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
-		return true;
+		if (r_index) {
+			/* Does not support index yet. */
+			*r_index = -1;
+		}
+		return SCE_SNAP_MODE_VERTEX;
 	}
-	return false;
+
+	return 0;
 }
 
 /* may extend later (for now just snaps to empty center) */
-static bool snapEmpty(
+static short snapEmpty(
         SnapData *snapdata,
         Object *ob, float obmat[4][4],
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float *UNUSED(r_no))
+        float r_loc[3], float *UNUSED(r_no), int *r_index)
 {
-	bool retval = false;
+	short retval = 0;
 
 	if (ob->transflag & OB_DUPLI) {
 		return retval;
 	}
 
 	/* for now only vertex supported */
-	switch (snapdata->snap_to) {
-		case SCE_SNAP_MODE_VERTEX:
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+		struct DistProjectedAABBPrecalc neasrest_precalc;
+		dist_squared_to_projected_aabb_precalc(
+		        &neasrest_precalc, snapdata->pmat, snapdata->win_size, snapdata->mval);
+
+		float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+		transpose_m4_m4(tobmat, obmat);
+		for (int i = snapdata->clip_plane_len; i--;) {
+			mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+		}
+
+		bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
+		float dist_px_sq = SQUARE(*dist_px);
+		float co[3];
+		copy_v3_v3(co, obmat[3]);
+		if (test_projected_vert_dist(
+		        &neasrest_precalc,
+		        clip_planes_local, snapdata->clip_plane_len,
+		        is_persp, co, &dist_px_sq, r_loc))
 		{
-			bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
-			float dist_px_sq = SQUARE(*dist_px);
-			float tmp_co[3];
-			copy_v3_v3(tmp_co, obmat[3]);
-			if (test_projected_vert_dist(
-			        snapdata->depth_range, snapdata->mval, tmp_co,
-			        snapdata->pmat, snapdata->win_half, is_persp, &dist_px_sq,
-			        r_loc))
-			{
-				*dist_px = sqrtf(dist_px_sq);
-				*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
-				retval = true;
-			}
-			break;
+			*dist_px = sqrtf(dist_px_sq);
+			retval = SCE_SNAP_MODE_VERTEX;
 		}
-		default:
-			break;
 	}
 
-	return retval;
+	if (retval) {
+		if (r_index) {
+			/* Does not support index. */
+			*r_index = -1;
+		}
+		return retval;
+	}
+
+	return 0;
 }
 
-static bool snapCamera(
+static short snapCamera(
         const SnapObjectContext *sctx, SnapData *snapdata,
         Object *object, float obmat[4][4],
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float *UNUSED(r_no))
+        float r_loc[3], float *UNUSED(r_no), int *r_index)
 {
+	short retval = 0;
+
+	Depsgraph *depsgraph = sctx->depsgraph;
 	Scene *scene = sctx->scene;
 
 	bool is_persp = snapdata->view_proj == VIEW_PROJ_PERSP;
 	float dist_px_sq = SQUARE(*dist_px);
 
 	float orig_camera_mat[4][4], orig_camera_imat[4][4], imat[4][4];
-	bool retval = false;
 	MovieClip *clip = BKE_object_movieclip_get(scene, object, false);
 	MovieTracking *tracking;
 
@@ -1509,139 +1650,127 @@ static bool snapCamera(
 		return retval;
 	}
 
+	float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+	transpose_m4_m4(tobmat, obmat);
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+	}
+
 	tracking = &clip->tracking;
 
-	BKE_tracking_get_camera_object_matrix(scene, object, orig_camera_mat);
+	BKE_tracking_get_camera_object_matrix(depsgraph, scene, object, orig_camera_mat);
 
 	invert_m4_m4(orig_camera_imat, orig_camera_mat);
 	invert_m4_m4(imat, obmat);
 
-	switch (snapdata->snap_to) {
-		case SCE_SNAP_MODE_VERTEX:
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+		struct DistProjectedAABBPrecalc neasrest_precalc;
+		dist_squared_to_projected_aabb_precalc(
+		        &neasrest_precalc, snapdata->pmat, snapdata->win_size, snapdata->mval);
+
+		MovieTrackingObject *tracking_object;
+		for (tracking_object = tracking->objects.first;
+		     tracking_object;
+		     tracking_object = tracking_object->next)
 		{
-			MovieTrackingObject *tracking_object;
-
-			for (tracking_object = tracking->objects.first;
-			     tracking_object;
-			     tracking_object = tracking_object->next)
-			{
-				ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
-				MovieTrackingTrack *track;
-				float reconstructed_camera_mat[4][4],
-				      reconstructed_camera_imat[4][4];
-				float (*vertex_obmat)[4];
-
-				if ((tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0) {
-					BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object,
-					                                                  CFRA, reconstructed_camera_mat);
-
-					invert_m4_m4(reconstructed_camera_imat, reconstructed_camera_mat);
-				}
+			ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
+			MovieTrackingTrack *track;
+			float reconstructed_camera_mat[4][4],
+			      reconstructed_camera_imat[4][4];
+			float (*vertex_obmat)[4];
 
-				for (track = tracksbase->first; track; track = track->next) {
-					float bundle_pos[3];
+			if ((tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0) {
+				BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object,
+				                                                  CFRA, reconstructed_camera_mat);
 
-					if ((track->flag & TRACK_HAS_BUNDLE) == 0) {
-						continue;
-					}
+				invert_m4_m4(reconstructed_camera_imat, reconstructed_camera_mat);
+			}
 
-					copy_v3_v3(bundle_pos, track->bundle_pos);
-					if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
-						vertex_obmat = orig_camera_mat;
-					}
-					else {
-						mul_m4_v3(reconstructed_camera_imat, bundle_pos);
-						vertex_obmat = obmat;
-					}
+			for (track = tracksbase->first; track; track = track->next) {
+				float bundle_pos[3];
 
-					mul_m4_v3(vertex_obmat, bundle_pos);
-					retval |= test_projected_vert_dist(
-					        snapdata->depth_range, snapdata->mval, bundle_pos,
-					        snapdata->pmat, snapdata->win_half, is_persp, &dist_px_sq,
-					        r_loc);
+				if ((track->flag & TRACK_HAS_BUNDLE) == 0) {
+					continue;
 				}
-			}
 
-			break;
+				copy_v3_v3(bundle_pos, track->bundle_pos);
+				if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
+					vertex_obmat = orig_camera_mat;
+				}
+				else {
+					mul_m4_v3(reconstructed_camera_imat, bundle_pos);
+					vertex_obmat = obmat;
+				}
+
+				mul_m4_v3(vertex_obmat, bundle_pos);
+				if (test_projected_vert_dist(
+				        &neasrest_precalc,
+				        clip_planes_local, snapdata->clip_plane_len,
+				        is_persp, bundle_pos, &dist_px_sq, r_loc))
+				{
+					retval = SCE_SNAP_MODE_VERTEX;
+				}
+			}
 		}
-		default:
-			break;
 	}
 
 	if (retval) {
 		*dist_px = sqrtf(dist_px_sq);
-		*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
-		return true;
+		if (r_index) {
+			/* Does not support index. */
+			*r_index = -1;
+		}
+		return retval;
 	}
-	return false;
-}
 
-static int dm_looptri_to_poly_index(DerivedMesh *dm, const MLoopTri *lt)
-{
-	const int *index_mp_to_orig = dm->getPolyDataArray(dm, CD_ORIGINDEX);
-	return index_mp_to_orig ? index_mp_to_orig[lt->poly] : lt->poly;
+	return 0;
 }
 
-static bool snapDerivedMesh(
+static short snapMesh(
         SnapObjectContext *sctx, SnapData *snapdata,
-        Object *ob, DerivedMesh *dm, float obmat[4][4],
+        Object *ob, Mesh *me, float obmat[4][4],
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float r_no[3])
+        float r_loc[3], float r_no[3], int *r_index)
 {
-	bool retval = false;
+	BLI_assert(snapdata->snap_to_flag != SCE_SNAP_MODE_FACE);
 
-	if (snapdata->snap_to == SCE_SNAP_MODE_EDGE) {
-		if (dm->getNumEdges(dm) == 0) {
-			return retval;
+	if ((snapdata->snap_to_flag & ~SCE_SNAP_MODE_FACE) == SCE_SNAP_MODE_EDGE) {
+		if (me->totedge == 0) {
+			return 0;
 		}
 	}
 	else {
-		if (dm->getNumVerts(dm) == 0) {
-			return retval;
+		if (me->totvert == 0) {
+			return 0;
 		}
 	}
 
-	float imat[4][4];
-	float timat[3][3]; /* transpose inverse matrix for normals */
-	float ray_normal_local[3];
-	float local_scale;
-
-	invert_m4_m4(imat, obmat);
-	transpose_m3_m4(timat, imat);
-
-	copy_v3_v3(ray_normal_local, snapdata->ray_dir);
-
-	mul_mat3_m4_v3(imat, ray_normal_local);
-
-	/* local scale in normal direction */
-	local_scale = normalize_v3(ray_normal_local);
-
 	float lpmat[4][4];
-	float ray_org_local[3];
-	float ray_min_dist;
-
 	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
-	ray_min_dist = snapdata->depth_range[0] * local_scale;
 
-	copy_v3_v3(ray_org_local, snapdata->ray_origin);
-	mul_m4_v3(imat, ray_org_local);
+	float dist_px_sq = SQUARE(*dist_px);
 
 	/* Test BoundBox */
-	BoundBox *bb = BKE_object_boundbox_get(ob);
+	BoundBox *bb = BKE_mesh_boundbox_get(ob);
 	if (bb) {
 		/* In vertex and edges you need to get the pixel distance from ray to BoundBox, see: T46099, T46816 */
-		float dist_px_sq = dist_squared_to_projected_aabb_simple(
-			    lpmat, snapdata->win_half, ray_min_dist, snapdata->mval,
-			    ray_org_local, ray_normal_local, bb->vec[0], bb->vec[6]);
-		if (dist_px_sq > SQUARE(*dist_px)) {
-			return retval;
+
+		struct DistProjectedAABBPrecalc data_precalc;
+		dist_squared_to_projected_aabb_precalc(
+		        &data_precalc, lpmat, snapdata->win_size, snapdata->mval);
+
+		bool dummy[3];
+		float bb_dist_px_sq = dist_squared_to_projected_aabb(
+		        &data_precalc, bb->vec[0], bb->vec[6], dummy);
+
+		if (bb_dist_px_sq > dist_px_sq) {
+			return 0;
 		}
 	}
 
 	SnapObjectData_Mesh *sod = NULL;
-	BVHTreeFromMesh *treedata = NULL;
 
 	void **sod_p;
 	if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {
@@ -1650,140 +1779,207 @@ static bool snapDerivedMesh(
 	else {
 		sod = *sod_p = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(*sod));
 		sod->sd.type = SNAP_MESH;
+		/* start assuming that it has each of these element types */
+		sod->has_looptris = true;
+		sod->has_loose_edge = true;
+		sod->has_loose_vert = true;
 	}
 
-	int tree_index = -1;
-	switch (snapdata->snap_to) {
-		case SCE_SNAP_MODE_EDGE:
-			tree_index = 1;
-			break;
-		case SCE_SNAP_MODE_VERTEX:
-			tree_index = 0;
-			break;
+	BVHTreeFromMesh *treedata, dummy_treedata;
+	BVHTree **bvhtree;
+	treedata = &sod->treedata;
+	bvhtree = sod->bvhtree;
+
+	/* the tree is owned by the DM and may have been freed since we last used! */
+	if ((sod->has_looptris   && treedata->tree && !bvhcache_has_tree(me->runtime.bvh_cache, treedata->tree)) ||
+	    (sod->has_loose_edge && bvhtree[0]     && !bvhcache_has_tree(me->runtime.bvh_cache, bvhtree[0]))     ||
+	    (sod->has_loose_vert && bvhtree[1]     && !bvhcache_has_tree(me->runtime.bvh_cache, bvhtree[1])))
+	{
+		BLI_assert(!treedata->tree || !bvhcache_has_tree(me->runtime.bvh_cache, treedata->tree));
+		BLI_assert(!bvhtree[0]     || !bvhcache_has_tree(me->runtime.bvh_cache, bvhtree[0]));
+		BLI_assert(!bvhtree[1]     || !bvhcache_has_tree(me->runtime.bvh_cache, bvhtree[1]));
+
+		free_bvhtree_from_mesh(treedata);
+		bvhtree[0] = NULL;
+		bvhtree[1] = NULL;
 	}
-	if (tree_index != -1) {
-		if (sod->bvh_trees[tree_index] == NULL) {
-			sod->bvh_trees[tree_index] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(*treedata));
+
+	if (sod->has_looptris && treedata->tree == NULL) {
+		BKE_bvhtree_from_mesh_get(treedata, me, BVHTREE_FROM_LOOPTRI, 4);
+		sod->has_looptris = (treedata->tree != NULL);
+		if (sod->has_looptris) {
+			/* Make sure that the array of edges is referenced in the callbacks. */
+			treedata->edge = me->medge; /* CustomData_get_layer(&me->edata, CD_MEDGE);? */
 		}
-		treedata = sod->bvh_trees[tree_index];
+	}
+	if (sod->has_loose_edge && bvhtree[0] == NULL) {
+		bvhtree[0] = BKE_bvhtree_from_mesh_get(&dummy_treedata, me, BVHTREE_FROM_LOOSEEDGES, 2);
+		sod->has_loose_edge = bvhtree[0] != NULL;
 
-		/* the tree is owned by the DM and may have been freed since we last used! */
-		if (treedata && treedata->tree) {
-			if (treedata->cached && !bvhcache_has_tree(dm->bvhCache, treedata->tree)) {
-				free_bvhtree_from_mesh(treedata);
-			}
-			else {
-				if (treedata->vert == NULL) {
-					treedata->vert = DM_get_vert_array(dm, &treedata->vert_allocated);
-				}
-				if ((tree_index == 1) && (treedata->edge == NULL)) {
-					treedata->edge = DM_get_edge_array(dm, &treedata->edge_allocated);
-				}
-			}
+		if (sod->has_loose_edge) {
+			BLI_assert(treedata->vert_allocated == false);
+			treedata->vert = dummy_treedata.vert;
+			treedata->vert_allocated = dummy_treedata.vert_allocated;
+
+			BLI_assert(treedata->edge_allocated == false);
+			treedata->edge = dummy_treedata.edge;
+			treedata->edge_allocated = dummy_treedata.edge_allocated;
 		}
 	}
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+		if (sod->has_loose_vert && bvhtree[1] == NULL) {
+			bvhtree[1] = BKE_bvhtree_from_mesh_get(&dummy_treedata, me, BVHTREE_FROM_LOOSEVERTS, 2);
+			sod->has_loose_vert = bvhtree[1] != NULL;
 
-	if (treedata) {
-		if (treedata->tree == NULL) {
-			switch (snapdata->snap_to) {
-				case SCE_SNAP_MODE_EDGE:
-					bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_EDGES, 2);
-					break;
-				case SCE_SNAP_MODE_VERTEX:
-					bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_VERTS, 2);
-					break;
+			if (sod->has_loose_vert) {
+				BLI_assert(treedata->vert_allocated == false);
+				treedata->vert = dummy_treedata.vert;
+				treedata->vert_allocated = dummy_treedata.vert_allocated;
 			}
 		}
-		if (treedata->tree == NULL) {
-			return retval;
-		}
 	}
 	else {
-		return retval;
+		/* Not necessary, just to keep the data more consistent. */
+		sod->has_loose_vert = false;
+	}
+
+	/* Update pointers. */
+	if (treedata->vert_allocated == false) {
+		treedata->vert = me->mvert; /* CustomData_get_layer(&me->vdata, CD_MVERT);? */
+	}
+	if (treedata->tree || bvhtree[0]) {
+		if (treedata->edge_allocated == false) {
+			/* If raycast has been executed before, `treedata->edge` can be NULL. */
+			treedata->edge = me->medge; /* CustomData_get_layer(&me->edata, CD_MEDGE);? */
+		}
+		if (treedata->loop && treedata->loop_allocated == false) {
+			treedata->loop = me->mloop; /* CustomData_get_layer(&me->edata, CD_MLOOP);? */
+		}
+		if (treedata->looptri && treedata->looptri_allocated == false) {
+			treedata->looptri = BKE_mesh_runtime_looptri_ensure(me);
+		}
 	}
 
-	/* Warning: the depth_max is currently being used only in perspective view.
-	 * It is not correct to limit the maximum depth for elements obtained with nearest
-	 * since this limitation depends on the normal and the size of the occlusion face.
-	 * And more... ray_depth is being confused with Z-depth here... (varies only the precision) */
-	const float ray_depth_max_global = *ray_depth + snapdata->depth_range[0];
+	Nearest2dUserData nearest2d = {
+		.is_persp             = snapdata->view_proj == VIEW_PROJ_PERSP,
+		.userdata             = treedata,
+		.get_vert_co          = (Nearest2DGetVertCoCallback)cb_mvert_co_get,
+		.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_medge_verts_get,
+		.get_tri_verts_index  = (Nearest2DGetTriVertsCallback)cb_mlooptri_verts_get,
+		.get_tri_edges_index  = (Nearest2DGetTriEdgesCallback)cb_mlooptri_edges_get,
+		.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_mvert_no_copy,
+	};
 
-	Nearest2dUserData neasrest2d = {
-		.dist_px_sq = SQUARE(*dist_px),
-		.r_axis_closest = {1.0f, 1.0f, 1.0f},
-		.depth_range = {snapdata->depth_range[0], ray_depth_max_global},
-		.userdata = treedata,
-		.get_edge_verts = (Nearest2DGetEdgeVertsCallback)get_dm_edge_verts,
-		.copy_vert_no = (Nearest2DCopyVertNoCallback)copy_dm_vert_no,
-		.index = -1};
+	BVHTreeNearest nearest = {
+		.index = -1,
+		.dist_sq = dist_px_sq,
+	};
+	int last_index = nearest.index;
+	short elem = SCE_SNAP_MODE_VERTEX;
 
-	dist_squared_to_projected_aabb_precalc(
-	        &neasrest2d.data_precalc, lpmat,
-	        snapdata->view_proj == VIEW_PROJ_PERSP, snapdata->win_half,
-	        ray_min_dist, snapdata->mval, ray_org_local, ray_normal_local);
+	float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
+	transpose_m4_m4(tobmat, obmat);
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+	}
+
+	if (bvhtree[1] && (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX)) {
+		/* snap to loose verts */
+		BLI_bvhtree_find_nearest_projected(
+		        bvhtree[1], lpmat, snapdata->win_size, snapdata->mval,
+		        clip_planes_local, snapdata->clip_plane_len,
+		        &nearest, cb_snap_vert, &nearest2d);
+
+		last_index = nearest.index;
+	}
+
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+		if (bvhtree[0]) {
+			/* snap to loose edges */
+			BLI_bvhtree_find_nearest_projected(
+			        bvhtree[0], lpmat, snapdata->win_size, snapdata->mval,
+			        clip_planes_local, snapdata->clip_plane_len,
+			        &nearest, cb_snap_edge, &nearest2d);
+		}
+
+		if (treedata->tree) {
+			/* snap to looptris */
+			BLI_bvhtree_find_nearest_projected(
+			        treedata->tree, lpmat, snapdata->win_size, snapdata->mval,
+			        clip_planes_local, snapdata->clip_plane_len,
+			        &nearest, cb_snap_tri_edges, &nearest2d);
+		}
+
+		if (last_index != nearest.index) {
+			elem = SCE_SNAP_MODE_EDGE;
+		}
+	}
+	else {
+		BLI_assert(snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX);
+		if (bvhtree[0]) {
+			/* snap to loose edges */
+			BLI_bvhtree_find_nearest_projected(
+			        bvhtree[0], lpmat, snapdata->win_size, snapdata->mval,
+			        clip_planes_local, snapdata->clip_plane_len,
+			        &nearest, cb_snap_edge_verts, &nearest2d);
+		}
 
-	BVHTree_WalkLeafCallback cb_walk_leaf =
-	        (snapdata->snap_to == SCE_SNAP_MODE_VERTEX) ?
-	        cb_walk_leaf_snap_vert : cb_walk_leaf_snap_edge;
+		if (treedata->tree) {
+			/* snap to looptris */
+			BLI_bvhtree_find_nearest_projected(
+			        treedata->tree, lpmat, snapdata->win_size, snapdata->mval,
+			        clip_planes_local, snapdata->clip_plane_len,
+			        &nearest, cb_snap_tri_verts, &nearest2d);
+		}
+	}
 
-	BLI_bvhtree_walk_dfs(
-	        treedata->tree,
-	        cb_walk_parent_snap_project, cb_walk_leaf, cb_nearest_walk_order, &neasrest2d);
+	if (nearest.index != -1) {
+		*dist_px = sqrtf(nearest.dist_sq);
 
-	if (neasrest2d.index != -1) {
-		copy_v3_v3(r_loc, neasrest2d.co);
+		copy_v3_v3(r_loc, nearest.co);
 		mul_m4_v3(obmat, r_loc);
+
 		if (r_no) {
-			copy_v3_v3(r_no, neasrest2d.no);
-			mul_m3_v3(timat, r_no);
+			float imat[4][4];
+			invert_m4_m4(imat, obmat);
+
+			copy_v3_v3(r_no, nearest.no);
+			mul_transposed_mat3_m4_v3(imat, r_no);
 			normalize_v3(r_no);
 		}
-		*dist_px = sqrtf(neasrest2d.dist_px_sq);
-		*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
+		if (r_index) {
+			*r_index = nearest.index;
+		}
 
-		retval = true;
+		return elem;
 	}
 
-	return retval;
+	return 0;
 }
 
-static bool snapEditMesh(
+static short snapEditMesh(
         SnapObjectContext *sctx, SnapData *snapdata,
         Object *ob, BMEditMesh *em, float obmat[4][4],
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float r_no[3])
+        float r_loc[3], float r_no[3], int *r_index)
 {
-	bool retval = false;
+	BLI_assert(snapdata->snap_to_flag != SCE_SNAP_MODE_FACE);
 
-	if (snapdata->snap_to == SCE_SNAP_MODE_EDGE) {
+	if ((snapdata->snap_to_flag & ~SCE_SNAP_MODE_FACE) == SCE_SNAP_MODE_EDGE) {
 		if (em->bm->totedge == 0) {
-			return retval;
+			return 0;
 		}
 	}
 	else {
 		if (em->bm->totvert == 0) {
-			return retval;
+			return 0;
 		}
 	}
 
-	float imat[4][4];
-	float timat[3][3]; /* transpose inverse matrix for normals */
-	float ray_normal_local[3];
-
-	invert_m4_m4(imat, obmat);
-	transpose_m3_m4(timat, imat);
-
-	copy_v3_v3(ray_normal_local, snapdata->ray_dir);
-
-	mul_mat3_m4_v3(imat, ray_normal_local);
-
-	/* local scale in normal direction */
-	float local_scale = normalize_v3(ray_normal_local);
-
 	SnapObjectData_EditMesh *sod = NULL;
-	BVHTreeFromEditMesh *treedata = NULL;
+	BVHTreeFromEditMesh *treedata_vert = NULL, *treedata_edge = NULL;
 
 	void **sod_p;
 	if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {
@@ -1794,109 +1990,113 @@ static bool snapEditMesh(
 		sod->sd.type = SNAP_EDIT_MESH;
 	}
 
-	int tree_index = -1;
-	switch (snapdata->snap_to) {
-		case SCE_SNAP_MODE_EDGE:
-			tree_index = 1;
-			break;
-		case SCE_SNAP_MODE_VERTEX:
-			tree_index = 0;
-			break;
-	}
-	if (tree_index != -1) {
-		if (sod->bvh_trees[tree_index] == NULL) {
-			sod->bvh_trees[tree_index] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(*treedata));
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+		if (sod->bvh_trees[0] == NULL) {
+			sod->bvh_trees[0] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(**sod->bvh_trees));
+		}
+		treedata_vert = sod->bvh_trees[0];
+		if (treedata_vert->tree == NULL) {
+			BLI_bitmap *verts_mask = NULL;
+			int verts_num_active = -1;
+			if (sctx->callbacks.edit_mesh.test_vert_fn) {
+				verts_mask = BLI_BITMAP_NEW(em->bm->totvert, __func__);
+				verts_num_active = BM_iter_mesh_bitmap_from_filter(
+				        BM_VERTS_OF_MESH, em->bm, verts_mask,
+				        (bool(*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_vert_fn,
+				        sctx->callbacks.edit_mesh.user_data);
+			}
+			bvhtree_from_editmesh_verts_ex(treedata_vert, em, verts_mask, verts_num_active, 0.0f, 2, 6);
+			MEM_SAFE_FREE(verts_mask);
 		}
-		treedata = sod->bvh_trees[tree_index];
 	}
 
-	if (treedata) {
-		if (treedata->tree == NULL) {
-			BLI_bitmap *elem_mask = NULL;
-			switch (snapdata->snap_to) {
-				case SCE_SNAP_MODE_EDGE:
-				{
-					int edges_num_active = -1;
-					if (sctx->callbacks.edit_mesh.test_edge_fn) {
-						elem_mask = BLI_BITMAP_NEW(em->bm->totedge, __func__);
-						edges_num_active = BM_iter_mesh_bitmap_from_filter(
-						        BM_EDGES_OF_MESH, em->bm, elem_mask,
-						        (bool (*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_edge_fn,
-						        sctx->callbacks.edit_mesh.user_data);
-					}
-					bvhtree_from_editmesh_edges_ex(treedata, em, elem_mask, edges_num_active, 0.0f, 2, 6);
-					break;
-				}
-				case SCE_SNAP_MODE_VERTEX:
-				{
-					int verts_num_active = -1;
-					if (sctx->callbacks.edit_mesh.test_vert_fn) {
-						elem_mask = BLI_BITMAP_NEW(em->bm->totvert, __func__);
-						verts_num_active = BM_iter_mesh_bitmap_from_filter(
-						        BM_VERTS_OF_MESH, em->bm, elem_mask,
-						        (bool (*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_vert_fn,
-						        sctx->callbacks.edit_mesh.user_data);
-					}
-					bvhtree_from_editmesh_verts_ex(treedata, em, elem_mask, verts_num_active, 0.0f, 2, 6);
-					break;
-				}
-			}
-			if (elem_mask) {
-				MEM_freeN(elem_mask);
-			}
+	if (snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+		if (sod->bvh_trees[1] == NULL) {
+			sod->bvh_trees[1] = BLI_memarena_calloc(sctx->cache.mem_arena, sizeof(**sod->bvh_trees));
 		}
-		if (treedata->tree == NULL) {
-			return retval;
+		treedata_edge = sod->bvh_trees[1];
+		if (treedata_edge->tree == NULL) {
+			BLI_bitmap *edges_mask = NULL;
+			int edges_num_active = -1;
+			if (sctx->callbacks.edit_mesh.test_edge_fn) {
+				edges_mask = BLI_BITMAP_NEW(em->bm->totedge, __func__);
+				edges_num_active = BM_iter_mesh_bitmap_from_filter(
+				        BM_EDGES_OF_MESH, em->bm, edges_mask,
+				        (bool(*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_edge_fn,
+				        sctx->callbacks.edit_mesh.user_data);
+
+			}
+			bvhtree_from_editmesh_edges_ex(treedata_edge, em, edges_mask, edges_num_active, 0.0f, 2, 6);
+			MEM_SAFE_FREE(edges_mask);
 		}
 	}
-	else {
-		return retval;
-	}
 
-	float ray_org_local[3];
-	copy_v3_v3(ray_org_local, snapdata->ray_origin);
-	mul_m4_v3(imat, ray_org_local);
+	Nearest2dUserData nearest2d = {
+		.is_persp             = snapdata->view_proj == VIEW_PROJ_PERSP,
+		.userdata             = em,
+		.get_vert_co          = (Nearest2DGetVertCoCallback)cb_bvert_co_get,
+		.get_edge_verts_index = (Nearest2DGetEdgeVertsCallback)cb_bedge_verts_get,
+		.copy_vert_no         = (Nearest2DCopyVertNoCallback)cb_bvert_no_copy,
+	};
 
-	Nearest2dUserData neasrest2d = {
-		.dist_px_sq = SQUARE(*dist_px),
-		.r_axis_closest = {1.0f, 1.0f, 1.0f},
-		.depth_range = {snapdata->depth_range[0], *ray_depth + snapdata->depth_range[0]},
-		.userdata = treedata,
-		.get_edge_verts = (Nearest2DGetEdgeVertsCallback)get_bedge_verts,
-		.copy_vert_no = (Nearest2DCopyVertNoCallback)copy_bvert_no,
-		.index = -1};
+	BVHTreeNearest nearest = {
+		.index = -1,
+		.dist_sq = SQUARE(*dist_px),
+	};
+	int last_index = nearest.index;
+	short elem = SCE_SNAP_MODE_VERTEX;
 
-	float lpmat[4][4];
+	float lpmat[4][4], tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
 	mul_m4_m4m4(lpmat, snapdata->pmat, obmat);
-	dist_squared_to_projected_aabb_precalc(
-	        &neasrest2d.data_precalc, lpmat,
-	        snapdata->view_proj == VIEW_PROJ_PERSP, snapdata->win_half,
-	        (snapdata->depth_range[0] * local_scale), snapdata->mval,
-	        ray_org_local, ray_normal_local);
+	transpose_m4_m4(tobmat, obmat);
+
+	for (int i = snapdata->clip_plane_len; i--;) {
+		mul_v4_m4v4(clip_planes_local[i], tobmat, snapdata->clip_plane[i]);
+	}
 
-	BVHTree_WalkLeafCallback cb_walk_leaf =
-	        (snapdata->snap_to == SCE_SNAP_MODE_VERTEX) ?
-	        cb_walk_leaf_snap_vert : cb_walk_leaf_snap_edge;
+	if (treedata_vert && snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX) {
+		BM_mesh_elem_table_ensure(em->bm, BM_VERT);
+		BLI_bvhtree_find_nearest_projected(
+		        treedata_vert->tree, lpmat, snapdata->win_size, snapdata->mval,
+		        clip_planes_local, snapdata->clip_plane_len,
+		        &nearest, cb_snap_vert, &nearest2d);
 
-	BLI_bvhtree_walk_dfs(
-	        treedata->tree,
-	        cb_walk_parent_snap_project, cb_walk_leaf, cb_nearest_walk_order, &neasrest2d);
+		last_index = nearest.index;
+	}
+
+	if (treedata_edge && snapdata->snap_to_flag & SCE_SNAP_MODE_EDGE) {
+		BM_mesh_elem_table_ensure(em->bm, BM_EDGE | BM_VERT);
+		BLI_bvhtree_find_nearest_projected(
+		        treedata_edge->tree, lpmat, snapdata->win_size, snapdata->mval,
+		        clip_planes_local, snapdata->clip_plane_len,
+		        &nearest, cb_snap_edge, &nearest2d);
+
+		if (last_index != nearest.index) {
+			elem = SCE_SNAP_MODE_EDGE;
+		}
+	}
+
+	if (nearest.index != -1) {
+		*dist_px = sqrtf(nearest.dist_sq);
 
-	if (neasrest2d.index != -1) {
-		copy_v3_v3(r_loc, neasrest2d.co);
+		copy_v3_v3(r_loc, nearest.co);
 		mul_m4_v3(obmat, r_loc);
 		if (r_no) {
-			copy_v3_v3(r_no, neasrest2d.no);
-			mul_m3_v3(timat, r_no);
+			float imat[4][4];
+			invert_m4_m4(imat, obmat);
+
+			copy_v3_v3(r_no, nearest.no);
+			mul_transposed_mat3_m4_v3(imat, r_no);
 			normalize_v3(r_no);
 		}
-		*dist_px = sqrtf(neasrest2d.dist_px_sq);
-		*ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
+		if (r_index) {
+			*r_index = nearest.index;
+		}
 
-		retval = true;
+		return elem;
 	}
 
-	return retval;
+	return 0;
 }
 
 /**
@@ -1904,112 +2104,108 @@ static bool snapEditMesh(
  *
  * \note Duplicate args here are documented at #snapObjectsRay
  */
-static bool snapObject(
+static short snapObject(
         SnapObjectContext *sctx, SnapData *snapdata,
-        Object *ob, float obmat[4][4],
-        bool use_obedit,
+        Object *ob, float obmat[4][4], bool use_obedit,
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float r_no[3],
+        float r_loc[3], float r_no[3], int *r_index,
         Object **r_ob, float r_obmat[4][4])
 {
-	bool retval = false;
-
-	if (ob->type == OB_MESH) {
-		BMEditMesh *em;
-
-		if (use_obedit) {
-			em = BKE_editmesh_from_object(ob);
-			retval = snapEditMesh(
-			        sctx, snapdata, ob, em, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
-		}
-		else {
-			/* in this case we want the mesh from the editmesh, avoids stale data. see: T45978.
-			 * still set the 'em' to NULL, since we only want the 'dm'. */
-			DerivedMesh *dm;
-			em = BKE_editmesh_from_object(ob);
-			if (em) {
-				editbmesh_get_derived_cage_and_final(sctx->scene, ob, em, CD_MASK_BAREMESH, &dm);
+	short retval = 0;
+
+	switch (ob->type) {
+		case OB_MESH:
+			if (use_obedit) {
+				BMEditMesh *em = BKE_editmesh_from_object(ob);
+				retval = snapEditMesh(
+				        sctx, snapdata, ob, em, obmat,
+				        dist_px,
+				        r_loc, r_no, r_index);
 			}
 			else {
-				dm = mesh_get_derived_final(sctx->scene, ob, CD_MASK_BAREMESH);
+				retval = snapMesh(
+				        sctx, snapdata, ob, ob->data, obmat,
+				        dist_px,
+				        r_loc, r_no, r_index);
 			}
-			retval = snapDerivedMesh(
-			        sctx, snapdata, ob, dm, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
+			break;
 
-			dm->release(dm);
-		}
-	}
-	else if (snapdata->snap_to != SCE_SNAP_MODE_FACE) {
-		if (ob->type == OB_ARMATURE) {
+		case OB_ARMATURE:
 			retval = snapArmature(
 			        snapdata,
-			        ob, ob->data, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
-		}
-		else if (ob->type == OB_CURVE) {
+			        ob, obmat, use_obedit,
+			        dist_px,
+			        r_loc, r_no, r_index);
+			break;
+
+		case OB_CURVE:
 			retval = snapCurve(
 			        snapdata,
-			        ob, ob->data, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
-		}
-		else if (ob->type == OB_EMPTY) {
+			        ob, obmat, use_obedit,
+			        dist_px,
+			        r_loc, r_no, r_index);
+			break;
+
+		case OB_EMPTY:
 			retval = snapEmpty(
-			        snapdata,
-			        ob, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
-		}
-		else if (ob->type == OB_CAMERA) {
+			        snapdata, ob, obmat,
+			        dist_px,
+			        r_loc, r_no, r_index);
+			break;
+
+		case OB_CAMERA:
 			retval = snapCamera(
 			        sctx, snapdata, ob, obmat,
-			        ray_depth, dist_px,
-			        r_loc, r_no);
-		}
+			        dist_px,
+			        r_loc, r_no, r_index);
+			break;
 	}
 
 	if (retval) {
 		if (r_ob) {
 			*r_ob = ob;
+		}
+		if (r_obmat) {
 			copy_m4_m4(r_obmat, obmat);
 		}
+		return retval;
 	}
 
-	return retval;
+	return 0;
 }
 
 
 struct SnapObjUserData {
 	SnapData *snapdata;
 	/* read/write args */
-	float *ray_depth;
 	float *dist_px;
 	/* return args */
 	float *r_loc;
 	float *r_no;
+	int *r_index;
 	Object **r_ob;
 	float (*r_obmat)[4];
-	bool ret;
+	short ret;
 };
 
 static void sanp_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, float obmat[4][4], void *data)
 {
 	struct SnapObjUserData *dt = data;
-	dt->ret |= snapObject(
+
+	short elem = snapObject(
 	        sctx, dt->snapdata,
 	        ob, obmat, is_obedit,
 	        /* read/write args */
-	        dt->ray_depth, dt->dist_px,
+	        dt->dist_px,
 	        /* return args */
-	        dt->r_loc, dt->r_no,
+	        dt->r_loc, dt->r_no, dt->r_index,
 	        dt->r_ob, dt->r_obmat);
+
+	if (elem) {
+		dt->ret = elem;
+	}
 }
 
 
@@ -2041,29 +2237,27 @@ static void sanp_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, flo
  * \param r_obmat: Object matrix (may not be #Object.obmat with dupli-instances).
  *
  */
-static bool snapObjectsRay(
+static short snapObjectsRay(
         SnapObjectContext *sctx, SnapData *snapdata,
-        const eSnapSelect snap_select, const bool use_object_edit_cage,
+        const struct SnapObjectParams *params,
         /* read/write args */
-        float *ray_depth, float *dist_px,
+        float *dist_px,
         /* return args */
-        float r_loc[3], float r_no[3],
+        float r_loc[3], float r_no[3], int *r_index,
         Object **r_ob, float r_obmat[4][4])
 {
-	Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
-
 	struct SnapObjUserData data = {
 		.snapdata = snapdata,
-		.ray_depth = ray_depth,
 		.dist_px = dist_px,
 		.r_loc = r_loc,
 		.r_no = r_no,
 		.r_ob = r_ob,
+		.r_index = r_index,
 		.r_obmat = r_obmat,
-		.ret = false,
+		.ret = 0,
 	};
 
-	iter_snap_objects(sctx, snap_select, obedit, sanp_obj_cb, &data);
+	iter_snap_objects(sctx, params, sanp_obj_cb, &data);
 
 	return data.ret;
 }
@@ -2075,14 +2269,14 @@ static bool snapObjectsRay(
  * \{ */
 
 SnapObjectContext *ED_transform_snap_object_context_create(
-        Main *bmain, Scene *scene, int flag)
+        Scene *scene, Depsgraph *depsgraph, int flag)
 {
 	SnapObjectContext *sctx = MEM_callocN(sizeof(*sctx), __func__);
 
 	sctx->flag = flag;
 
-	sctx->bmain = bmain;
 	sctx->scene = scene;
+	sctx->depsgraph = depsgraph;
 
 	sctx->cache.object_map = BLI_ghash_ptr_new(__func__);
 	sctx->cache.mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
@@ -2091,11 +2285,11 @@ SnapObjectContext *ED_transform_snap_object_context_create(
 }
 
 SnapObjectContext *ED_transform_snap_object_context_create_view3d(
-        Main *bmain, Scene *scene, int flag,
+        Scene *scene, Depsgraph *depsgraph, int flag,
         /* extra args for view3d */
         const ARegion *ar, const View3D *v3d)
 {
-	SnapObjectContext *sctx = ED_transform_snap_object_context_create(bmain, scene, flag);
+	SnapObjectContext *sctx = ED_transform_snap_object_context_create(scene, depsgraph, flag);
 
 	sctx->use_v3d = true;
 	sctx->v3d_data.ar = ar;
@@ -2110,13 +2304,8 @@ static void snap_object_data_free(void *sod_v)
 		case SNAP_MESH:
 		{
 			SnapObjectData_Mesh *sod = sod_v;
-			for (int i = 0; i < ARRAY_SIZE(sod->bvh_trees); i++) {
-				if (sod->bvh_trees[i]) {
-					free_bvhtree_from_mesh(sod->bvh_trees[i]);
-				}
-			}
-			if (sod->poly_allocated) {
-				MEM_freeN(sod->mpoly);
+			if (sod->treedata.tree) {
+				free_bvhtree_from_mesh(&sod->treedata);
 			}
 			break;
 		}
@@ -2164,9 +2353,8 @@ bool ED_transform_snap_object_project_ray_ex(
         Object **r_ob, float r_obmat[4][4])
 {
 	return raycastObjects(
-	        sctx,
+	        sctx, params,
 	        ray_start, ray_normal,
-	        params->snap_select, params->use_object_edit_cage,
 	        ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL);
 }
 
@@ -2193,9 +2381,8 @@ bool ED_transform_snap_object_project_ray_all(
 #endif
 
 	bool retval = raycastObjects(
-	        sctx,
+	        sctx, params,
 	        ray_start, ray_normal,
-	        params->snap_select, params->use_object_edit_cage,
 	        &ray_depth, NULL, NULL, NULL, NULL, NULL,
 	        r_hit_list);
 
@@ -2256,61 +2443,156 @@ bool ED_transform_snap_object_project_ray(
 	        r_co, r_no);
 }
 
-static bool transform_snap_context_project_view3d_mixed_impl(
+static short transform_snap_context_project_view3d_mixed_impl(
         SnapObjectContext *sctx,
         const unsigned short snap_to_flag,
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
-        bool use_depth,
-        float r_co[3], float r_no[3])
+        float r_loc[3], float r_no[3], int *r_index,
+        Object **r_ob, float r_obmat[4][4])
 {
-	float ray_depth = BVH_RAYCAST_DIST_MAX;
-	bool is_hit = false;
+	BLI_assert(
+	        (snap_to_flag & (
+	        SCE_SNAP_MODE_VERTEX |
+	        SCE_SNAP_MODE_EDGE   |
+	        SCE_SNAP_MODE_FACE)) != 0);
 
-	const int  elem_type[3] = {SCE_SNAP_MODE_VERTEX, SCE_SNAP_MODE_EDGE, SCE_SNAP_MODE_FACE};
+	short retval = 0;
+	bool has_hit = false;
+	int index = -1;
 
-	BLI_assert(snap_to_flag != 0);
-	BLI_assert((snap_to_flag & ~(1 | 2 | 4)) == 0);
+	float loc[3], no[3], obmat[4][4];
+	Object *ob = NULL;
 
-	if (use_depth) {
-		const float dist_px_orig = dist_px ? *dist_px : 0;
-		for (int i = 2; i >= 0; i--) {
-			if (snap_to_flag & (1 << i)) {
-				if (i == 0) {
-					BLI_assert(dist_px != NULL);
-					*dist_px = dist_px_orig;
-				}
-				if (ED_transform_snap_object_project_view3d(
-				        sctx,
-				        elem_type[i], params,
-				        mval, dist_px, &ray_depth,
-				        r_co, r_no))
-				{
-					/* 0.01 is a random but small value to prioritizing
-					 * the first elements of the loop */
-					ray_depth += 0.01f;
-					is_hit = true;
-				}
-			}
+	const ARegion *ar = sctx->v3d_data.ar;
+	const RegionView3D *rv3d = ar->regiondata;
+
+	bool use_occlusion_test =
+	        params->use_occlusion_test &&
+	        !(sctx->v3d_data.v3d->shading.flag & V3D_SHADING_XRAY);
+
+	if (snap_to_flag & SCE_SNAP_MODE_FACE || use_occlusion_test) {
+		float ray_start[3], ray_normal[3];
+
+		if (!ED_view3d_win_to_ray_ex(
+		        sctx->depsgraph,
+		        sctx->v3d_data.ar, sctx->v3d_data.v3d,
+		        mval, NULL, ray_normal, ray_start, true))
+		{
+			return false;
+		}
+
+		float dummy_ray_depth = BVH_RAYCAST_DIST_MAX;
+
+		has_hit = raycastObjects(
+		        sctx, params,
+		        ray_start, ray_normal,
+		        &dummy_ray_depth, loc, no,
+		        &index, &ob, obmat, NULL);
+
+		if (has_hit && (snap_to_flag & SCE_SNAP_MODE_FACE)) {
+			retval = SCE_SNAP_MODE_FACE;
 		}
 	}
-	else {
-		for (int i = 0; i < 3; i++) {
-			if (snap_to_flag & (1 << i)) {
-				if (ED_transform_snap_object_project_view3d(
-				        sctx,
-				        elem_type[i], params,
-				        mval, dist_px, &ray_depth,
-				        r_co, r_no))
-				{
-					is_hit = true;
-					break;
-				}
+
+	if (snap_to_flag & (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE)) {
+		short elem;
+		float dist_px_tmp = *dist_px;
+
+		SnapData snapdata;
+		copy_m4_m4(snapdata.pmat, rv3d->persmat);
+		snapdata.win_size[0] = ar->winx;
+		snapdata.win_size[1] = ar->winy;
+		copy_v2_v2(snapdata.mval, mval);
+		snapdata.snap_to_flag = snap_to_flag;
+		snapdata.view_proj = rv3d->is_persp ? VIEW_PROJ_PERSP : VIEW_PROJ_ORTHO;
+
+		planes_from_projmat(
+		        snapdata.pmat,
+		        NULL, NULL, NULL, NULL,
+		        snapdata.clip_plane[0], snapdata.clip_plane[1]);
+
+		snapdata.clip_plane_len = 2;
+
+		if (has_hit) {
+			/* Compute the new clip_pane but do not add it yet. */
+			float new_clipplane[4];
+			plane_from_point_normal_v3(new_clipplane, loc, no);
+			if (dot_v3v3(snapdata.clip_plane[0], new_clipplane) > 0.0f) {
+				/* The plane is facing the wrong direction. */
+				negate_v4(new_clipplane);
 			}
+
+			/* Try to snap only to the polygon. */
+			elem = snap_mesh_polygon(
+			        sctx, &snapdata, ob, obmat,
+			        &dist_px_tmp, loc, no, &index);
+
+			if (elem) {
+				retval = elem;
+			}
+
+			/* Add the new clip plane to the beginning of the list. */
+			for (int i = snapdata.clip_plane_len; i != 0; i--) {
+				copy_v4_v4(snapdata.clip_plane[i], snapdata.clip_plane[i - 1]);
+			}
+			copy_v4_v4(snapdata.clip_plane[0], new_clipplane);
+			snapdata.clip_plane_len++;
+		}
+
+		elem = snapObjectsRay(
+		        sctx, &snapdata, params,
+		        &dist_px_tmp, loc, no, &index, &ob, obmat);
+
+		if (elem) {
+			retval = elem;
+		}
+
+		if ((retval == SCE_SNAP_MODE_EDGE) &&
+		    (snapdata.snap_to_flag & SCE_SNAP_MODE_VERTEX))
+		{
+			retval = snap_mesh_edge_verts_mixed(
+			        sctx, &snapdata,
+			        ob, obmat, *dist_px,
+			        &dist_px_tmp, loc, no, &index);
+		}
+
+		*dist_px = dist_px_tmp;
+	}
+
+	if (retval) {
+		copy_v3_v3(r_loc, loc);
+		if (r_no) {
+			copy_v3_v3(r_no, no);
+		}
+		if (r_ob) {
+			*r_ob = ob;
+		}
+		if (r_obmat) {
+			copy_m4_m4(r_obmat, obmat);
+		}
+		if (r_index) {
+			*r_index = index;
 		}
+		return retval;
 	}
 
-	return is_hit;
+	return 0;
+}
+
+bool ED_transform_snap_object_project_view3d_ex(
+        SnapObjectContext *sctx,
+        const unsigned short snap_to,
+        const struct SnapObjectParams *params,
+        const float mval[2], float *dist_px,
+        float r_loc[3], float r_no[3], int *r_index,
+        Object **r_ob, float r_obmat[4][4])
+{
+	return transform_snap_context_project_view3d_mixed_impl(
+	        sctx,
+	        snap_to, params,
+	        mval, dist_px,
+	        r_loc, r_no, r_index, r_ob, r_obmat) != 0;
 }
 
 /**
@@ -2321,86 +2603,15 @@ static bool transform_snap_context_project_view3d_mixed_impl(
  * \param sctx: Snap context.
  * \param mval_fl: Screenspace coordinate.
  * \param dist_px: Maximum distance to snap (in pixels).
- * \param use_depth: Snap to the closest element, use when using more than one snap type.
  * \param r_co: hit location.
  * \param r_no: hit normal (optional).
  * \return Snap success
  */
-bool ED_transform_snap_object_project_view3d_mixed(
-        SnapObjectContext *sctx,
-        const unsigned short snap_to_flag,
-        const struct SnapObjectParams *params,
-        const float mval_fl[2], float *dist_px,
-        bool use_depth,
-        float r_co[3], float r_no[3])
-{
-	return transform_snap_context_project_view3d_mixed_impl(
-	        sctx,
-	        snap_to_flag, params,
-	        mval_fl, dist_px, use_depth,
-	        r_co, r_no);
-}
-
-bool ED_transform_snap_object_project_view3d_ex(
-        SnapObjectContext *sctx,
-        const unsigned short snap_to,
-        const struct SnapObjectParams *params,
-        const float mval[2], float *dist_px,
-        float *ray_depth,
-        float r_loc[3], float r_no[3], int *r_index,
-        Object **r_ob, float r_obmat[4][4])
-{
-	float ray_origin[3], ray_start[3], ray_normal[3], depth_range[2], ray_end[3];
-
-	const ARegion *ar = sctx->v3d_data.ar;
-	const RegionView3D *rv3d = ar->regiondata;
-
-	ED_view3d_win_to_origin(ar, mval, ray_origin);
-	ED_view3d_win_to_vector(ar, mval, ray_normal);
-
-	ED_view3d_clip_range_get(
-	        sctx->v3d_data.v3d, sctx->v3d_data.ar->regiondata,
-	        &depth_range[0], &depth_range[1], false);
-
-	madd_v3_v3v3fl(ray_start, ray_origin, ray_normal, depth_range[0]);
-	madd_v3_v3v3fl(ray_end, ray_origin, ray_normal, depth_range[1]);
-
-	if (!ED_view3d_clip_segment(rv3d, ray_start, ray_end)) {
-		return false;
-	}
-
-	float ray_depth_fallback;
-	if (ray_depth == NULL) {
-		ray_depth_fallback = BVH_RAYCAST_DIST_MAX;
-		ray_depth = &ray_depth_fallback;
-	}
-
-	if (snap_to == SCE_SNAP_MODE_FACE) {
-		return raycastObjects(
-		        sctx,
-		        ray_start, ray_normal,
-		        params->snap_select, params->use_object_edit_cage,
-		        ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL);
-	}
-	else {
-		SnapData snapdata;
-		const enum eViewProj view_proj = ((RegionView3D *)ar->regiondata)->is_persp ? VIEW_PROJ_PERSP : VIEW_PROJ_ORTHO;
-		snap_data_set(&snapdata, ar, snap_to, view_proj, mval,
-		        ray_origin, ray_start, ray_normal, depth_range);
-
-		return snapObjectsRay(
-		        sctx, &snapdata,
-		        params->snap_select, params->use_object_edit_cage,
-		        ray_depth, dist_px, r_loc, r_no, r_ob, r_obmat);
-	}
-}
-
 bool ED_transform_snap_object_project_view3d(
         SnapObjectContext *sctx,
         const unsigned short snap_to,
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
-        float *ray_depth,
         float r_loc[3], float r_no[3])
 {
 	return ED_transform_snap_object_project_view3d_ex(
@@ -2408,7 +2619,6 @@ bool ED_transform_snap_object_project_view3d(
 	        snap_to,
 	        params,
 	        mval, dist_px,
-	        ray_depth,
 	        r_loc, r_no, NULL,
 	        NULL, NULL);
 }
@@ -2426,6 +2636,7 @@ bool ED_transform_snap_object_project_all_view3d_ex(
 	float ray_start[3], ray_normal[3];
 
 	if (!ED_view3d_win_to_ray_ex(
+	        sctx->depsgraph,
 	        sctx->v3d_data.ar, sctx->v3d_data.v3d,
 	        mval, NULL, ray_normal, ray_start, true))
 	{
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index d8b194e3336..3950b056e89 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -36,6 +36,7 @@
 #include "CLG_log.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 
 #include "BLI_utildefines.h"
 
@@ -46,6 +47,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
+#include "BKE_layer.h"
 #include "BKE_undo_system.h"
 
 #include "ED_gpencil.h"
@@ -302,12 +304,42 @@ void ED_OT_undo_redo(wmOperatorType *ot)
 
 /** \} */
 
+struct OperatorRepeatContextHandle {
+	ScrArea *restore_area;
+	ARegion *restore_region;
+};
+
+/**
+ * Resets the context to the state \a op was executed in (or at least, was in when registering).
+ * #ED_operator_repeat_reset_context should be called when done repeating!
+ */
+const OperatorRepeatContextHandle *ED_operator_repeat_prepare_context(bContext *C, wmOperator *op)
+{
+	static OperatorRepeatContextHandle context_info;
+
+	context_info.restore_area = CTX_wm_area(C);
+	context_info.restore_region = CTX_wm_region(C);
+
+	CTX_wm_area_set(C, op->execution_area);
+	CTX_wm_region_set(C, op->execution_region);
+
+	return &context_info;
+}
+/**
+ * Resets context to the old state from before #ED_operator_repeat_prepare_context was called.
+ */
+void ED_operator_repeat_reset_context(bContext *C, const OperatorRepeatContextHandle *context_info)
+{
+	CTX_wm_area_set(C, context_info->restore_area);
+	CTX_wm_region_set(C, context_info->restore_region);
+}
+
 /* -------------------------------------------------------------------- */
 /** \name Operator Repeat
  * \{ */
 
 /* ui callbacks should call this rather than calling WM_operator_repeat() themselves */
-int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
+int ED_undo_operator_repeat(bContext *C, wmOperator *op)
 {
 	int ret = 0;
 
@@ -316,12 +348,8 @@ int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
 		wmWindowManager *wm = CTX_wm_manager(C);
 		struct Scene *scene = CTX_data_scene(C);
 
-		/* keep in sync with logic in view3d_panel_operator_redo() */
-		ARegion *ar = CTX_wm_region(C);
-		ARegion *ar1 = BKE_area_find_region_active_win(CTX_wm_area(C));
-
-		if (ar1)
-			CTX_wm_region_set(C, ar1);
+		const OperatorRepeatContextHandle *context_info;
+		context_info = ED_operator_repeat_prepare_context(C, op);
 
 		if ((WM_operator_repeat_check(C, op)) &&
 		    (WM_operator_poll(C, op->type)) &&
@@ -334,8 +362,6 @@ int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
 		{
 			int retval;
 
-			ED_viewport_render_kill_jobs(wm, CTX_data_main(C), true);
-
 			if (G.debug & G_DEBUG)
 				printf("redo_cb: operator redo %s\n", op->type->name);
 
@@ -369,8 +395,7 @@ int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
 			}
 		}
 
-		/* set region back */
-		CTX_wm_region_set(C, ar);
+		ED_operator_repeat_reset_context(C, context_info);
 	}
 	else {
 		CLOG_WARN(&LOG, "called with NULL 'op'");
@@ -495,3 +520,24 @@ void ED_OT_undo_history(wmOperatorType *ot)
 }
 
 /** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Undo Helper Functions
+ * \{ */
+
+void ED_undo_object_set_active_or_warn(ViewLayer *view_layer, Object *ob, const char *info, CLG_LogRef *log)
+{
+	Object *ob_prev = OBACT(view_layer);
+	if (ob_prev != ob) {
+		Base *base = BKE_view_layer_base_find(view_layer, ob);
+		if (base != NULL) {
+			view_layer->basact = base;
+		}
+		else {
+			/* Should never fail, may not crash but can give odd behavior. */
+			CLOG_WARN(log, "'%s' failed to restore active object: '%s'", info, ob->id.name + 2);
+		}
+	}
+}
+
+/** \} */
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c
index bb81da74f88..d45470ab0a1 100644
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@ -76,6 +76,7 @@ static bool memfile_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 	MemFileUndoStep *us_prev = (MemFileUndoStep *)BKE_undosys_step_find_by_type(ustack, BKE_UNDOSYS_TYPE_MEMFILE);
 	us->data = BKE_memfile_undo_encode(bmain, us_prev ? us_prev->data : NULL);
 	us->step.data_size = us->data->undo_size;
+
 	return true;
 }
 
@@ -84,8 +85,6 @@ static void memfile_undosys_step_decode(struct bContext *C, UndoStep *us_p, int
 	/* Loading the content will correctly switch into compatible non-object modes. */
 	ED_object_mode_set(C, OB_MODE_OBJECT);
 
-	/* This is needed so undoing/redoing doesn't crash with threaded previews going */
-	ED_viewport_render_kill_jobs(CTX_wm_manager(C), CTX_data_main(C), true);
 	MemFileUndoStep *us = (MemFileUndoStep *)us_p;
 	BKE_memfile_undo_decode(us->data, C);
 
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 8657c876d47..24cfde90804 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../imbuf
 	../../gpu
 	../../makesdna
@@ -62,6 +63,7 @@ set(SRC
 	../include/ED_lattice.h
 	../include/ED_logic.h
 	../include/ED_markers.h
+	../include/ED_manipulator_library.h
 	../include/ED_mask.h
 	../include/ED_mball.h
 	../include/ED_mesh.h
@@ -73,6 +75,7 @@ set(SRC
 	../include/ED_particle.h
 	../include/ED_physics.h
 	../include/ED_render.h
+	../include/ED_scene.h
 	../include/ED_screen.h
 	../include/ED_screen_types.h
 	../include/ED_sculpt.h
diff --git a/source/blender/editors/util/ed_transverts.c b/source/blender/editors/util/ed_transverts.c
index c3fb653979c..494ae769cf3 100644
--- a/source/blender/editors/util/ed_transverts.c
+++ b/source/blender/editors/util/ed_transverts.c
@@ -39,12 +39,13 @@
 #include "BLI_math.h"
 
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_lattice.h"
 #include "BKE_editmesh.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 
 #include "ED_transverts.h"  /* own include */
@@ -56,7 +57,7 @@ void ED_transverts_update_obedit(TransVertStore *tvs, Object *obedit)
 	const int mode = tvs->mode;
 	BLI_assert(ED_transverts_check_obedit(obedit) == true);
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 
 	if (obedit->type == OB_MESH) {
 		BMEditMesh *em = BKE_editmesh_from_object(obedit);
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 7c3e24c3cc9..44e2fa98f53 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -35,6 +35,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
@@ -55,9 +56,12 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_multires.h"
+#include "BKE_object.h"
 #include "BKE_packedFile.h"
 #include "BKE_paint.h"
 #include "BKE_screen.h"
+#include "BKE_workspace.h"
+#include "BKE_layer.h"
 #include "BKE_undo_system.h"
 
 #include "ED_armature.h"
@@ -71,6 +75,8 @@
 #include "ED_space_api.h"
 #include "ED_util.h"
 
+#include "GPU_immediate.h"
+
 #include "UI_interface.h"
 #include "UI_resources.h"
 
@@ -84,11 +90,8 @@
 
 void ED_editors_init(bContext *C)
 {
-	wmWindowManager *wm = CTX_wm_manager(C);
 	Main *bmain = CTX_data_main(C);
-	Scene *sce = CTX_data_scene(C);
-	Object *ob, *obact = (sce && sce->basact) ? sce->basact->object : NULL;
-	ID *data;
+	wmWindowManager *wm = CTX_wm_manager(C);
 
 	if (wm->undo_stack == NULL) {
 		wm->undo_stack = BKE_undosys_stack_create();
@@ -103,21 +106,31 @@ void ED_editors_init(bContext *C)
 	/* toggle on modes for objects that were saved with these enabled. for
 	 * e.g. linked objects we have to ensure that they are actually the
 	 * active object in this scene. */
-	for (ob = bmain->object.first; ob; ob = ob->id.next) {
-		int mode = ob->mode;
-
-		if (!ELEM(mode, OB_MODE_OBJECT, OB_MODE_POSE)) {
-			ob->mode = OB_MODE_OBJECT;
-			data = ob->data;
+	Object *obact = CTX_data_active_object(C);
+	if (obact != NULL) {
+		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
+			int mode = ob->mode;
 
-			if (ob == obact && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data)))
-				ED_object_mode_toggle(C, mode);
+			if (mode == OB_MODE_OBJECT) {
+				/* pass */
+			}
+			else if (!BKE_object_has_mode_data(ob, mode)) {
+				/* For multi-edit mode we may already have mode data. */
+				ID *data = ob->data;
+				ob->mode = OB_MODE_OBJECT;
+				if ((ob == obact) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) {
+					ED_object_mode_toggle(C, mode);
+				}
+			}
 		}
 	}
 
 	/* image editor paint mode */
-	if (sce) {
-		ED_space_image_paint_update(wm, sce);
+	{
+		Scene *sce = CTX_data_scene(C);
+		if (sce) {
+			ED_space_image_paint_update(wm, sce);
+		}
 	}
 
 	SWAP(int, reports->flag, reports_flag_prev);
@@ -127,7 +140,6 @@ void ED_editors_init(bContext *C)
 void ED_editors_exit(bContext *C)
 {
 	Main *bmain = CTX_data_main(C);
-	Scene *sce;
 
 	if (!bmain)
 		return;
@@ -142,22 +154,19 @@ void ED_editors_exit(bContext *C)
 		}
 	}
 
-	for (sce = bmain->scene.first; sce; sce = sce->id.next) {
-		if (sce->obedit) {
-			Object *ob = sce->obedit;
-
-			if (ob) {
-				if (ob->type == OB_MESH) {
-					Mesh *me = ob->data;
-					if (me->edit_btmesh) {
-						EDBM_mesh_free(me->edit_btmesh);
-						MEM_freeN(me->edit_btmesh);
-						me->edit_btmesh = NULL;
-					}
-				}
-				else if (ob->type == OB_ARMATURE) {
-					ED_armature_edit_free(ob->data);
-				}
+	for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
+		if (ob->type == OB_MESH) {
+			Mesh *me = ob->data;
+			if (me->edit_btmesh) {
+				EDBM_mesh_free(me->edit_btmesh);
+				MEM_freeN(me->edit_btmesh);
+				me->edit_btmesh = NULL;
+			}
+		}
+		else if (ob->type == OB_ARMATURE) {
+			bArmature *arm = ob->data;
+			if (arm->edbo) {
+				ED_armature_edit_free(ob->data);
 			}
 		}
 	}
@@ -329,16 +338,28 @@ void ED_region_draw_mouse_line_cb(const bContext *C, ARegion *ar, void *arg_info
 {
 	wmWindow *win = CTX_wm_window(C);
 	const float *mval_src = (float *)arg_info;
-	const int mval_dst[2] = {win->eventstate->x - ar->winrct.xmin,
-	                         win->eventstate->y - ar->winrct.ymin};
-
-	UI_ThemeColor(TH_VIEW_OVERLAY);
-	setlinestyle(3);
-	glBegin(GL_LINES);
-	glVertex2iv(mval_dst);
-	glVertex2fv(mval_src);
-	glEnd();
-	setlinestyle(0);
+	const float mval_dst[2] = {win->eventstate->x - ar->winrct.xmin,
+	                           win->eventstate->y - ar->winrct.ymin};
+
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 0);  /* "simple" mode */
+	immUniformThemeColor(TH_VIEW_OVERLAY);
+	immUniform1f("dash_width", 6.0f);
+	immUniform1f("dash_factor", 0.5f);
+
+	immBegin(GWN_PRIM_LINES, 2);
+	immVertex2fv(shdr_pos, mval_src);
+	immVertex2fv(shdr_pos, mval_dst);
+	immEnd();
+
+	immUnbindProgram();
 }
 
 /**
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 543ef0e0663..a933717fe98 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenlib
 	../../blentranslation
 	../../bmesh
+	../../depsgraph
 	../../gpu
 	../../makesdna
 	../../makesrna
diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c
index 92e0920da6b..5e867afd58e 100644
--- a/source/blender/editors/uvedit/uvedit_buttons.c
+++ b/source/blender/editors/uvedit/uvedit_buttons.c
@@ -61,22 +61,19 @@
 
 /* UV Utilities */
 
-static int uvedit_center(Scene *scene, BMEditMesh *em, Image *ima, float center[2])
+static int uvedit_center(Scene *scene, Object *obedit, BMEditMesh *em, Image *ima, float center[2])
 {
 	BMFace *f;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	int tot = 0;
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	zero_v2(center);
 	BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(f, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, f, tf))
+		if (!uvedit_face_visible_test(scene, obedit, ima, f))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
@@ -96,20 +93,17 @@ static int uvedit_center(Scene *scene, BMEditMesh *em, Image *ima, float center[
 	return tot;
 }
 
-static void uvedit_translate(Scene *scene, BMEditMesh *em, Image *ima, float delta[2])
+static void uvedit_translate(Scene *scene, Object *obedit, BMEditMesh *em, Image *ima, float delta[2])
 {
 	BMFace *f;
 	BMLoop *l;
 	BMIter iter, liter;
 	MLoopUV *luv;
-	MTexPoly *tf;
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(f, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, f, tf))
+		if (!uvedit_face_visible_test(scene, obedit, ima, f))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
@@ -140,7 +134,7 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block)
 
 	em = BKE_editmesh_from_object(obedit);
 
-	if (uvedit_center(scene, em, ima, center)) {
+	if (uvedit_center(scene, obedit, em, ima, center)) {
 		float range_xy[2][2] = {
 		    {-10.0f, 10.0f},
 		    {-10.0f, 10.0f},
@@ -196,7 +190,7 @@ static void do_uvedit_vertex(bContext *C, void *UNUSED(arg), int event)
 	em = BKE_editmesh_from_object(obedit);
 
 	ED_space_image_get_size(sima, &imx, &imy);
-	uvedit_center(scene, em, ima, center);
+	uvedit_center(scene, obedit, em, ima, center);
 
 	if (sima->flag & SI_COORDFLOATS) {
 		delta[0] = uvedit_old_center[0] - center[0];
@@ -207,7 +201,7 @@ static void do_uvedit_vertex(bContext *C, void *UNUSED(arg), int event)
 		delta[1] = uvedit_old_center[1] / imy - center[1];
 	}
 
-	uvedit_translate(scene, em, ima, delta);
+	uvedit_translate(scene, obedit, em, ima, delta);
 
 	WM_event_add_notifier(C, NC_IMAGE, sima->image);
 }
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 79dcfb3299f..e467c61609d 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -33,6 +33,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -49,12 +51,20 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_editmesh.h"
 #include "BKE_material.h"
+#include "BKE_layer.h"
 
 #include "BKE_scene.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
+#include "GPU_batch.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_matrix.h"
+
 #include "ED_image.h"
 #include "ED_mesh.h"
 #include "ED_uvedit.h"
@@ -65,12 +75,7 @@
 
 #include "uvedit_intern.h"
 
-#include "GPU_basic_shader.h"
-
-/* use editmesh tessface */
-#define USE_EDBM_LOOPTRIS
-
-static void draw_uvs_lineloop_bmface(BMFace *efa, const int cd_loop_uv_offset);
+static void draw_uvs_lineloop_bmfaces(BMesh *bm, const int cd_loop_uv_offset, const uint shdr_pos);
 
 void ED_image_draw_cursor(ARegion *ar, const float cursor[2])
 {
@@ -82,37 +87,58 @@ void ED_image_draw_cursor(ARegion *ar, const float cursor[2])
 	x_fac = zoom[0];
 	y_fac = zoom[1];
 
-	cpack(0xFFFFFF);
-	glTranslate2fv(cursor);
-	fdrawline(-0.05f * x_fac, 0, 0, 0.05f * y_fac);
-	fdrawline(0, 0.05f * y_fac, 0.05f * x_fac, 0.0f);
-	fdrawline(0.05f * x_fac, 0.0f, 0.0f, -0.05f * y_fac);
-	fdrawline(0.0f, -0.05f * y_fac, -0.05f * x_fac, 0.0f);
-
-	setlinestyle(4);
-	cpack(0xFF);
-	fdrawline(-0.05f * x_fac, 0.0f, 0.0f, 0.05f * y_fac);
-	fdrawline(0.0f, 0.05f * y_fac, 0.05f * x_fac, 0.0f);
-	fdrawline(0.05f * x_fac, 0.0f, 0.0f, -0.05f * y_fac);
-	fdrawline(0.0f, -0.05f * y_fac, -0.05f * x_fac, 0.0f);
-
-
-	setlinestyle(0.0f);
-	cpack(0x0);
-	fdrawline(-0.020f * x_fac, 0.0f, -0.1f * x_fac, 0.0f);
-	fdrawline(0.1f * x_fac, 0.0f, 0.020f * x_fac, 0.0f);
-	fdrawline(0.0f, -0.020f * y_fac, 0.0f, -0.1f * y_fac);
-	fdrawline(0.0f, 0.1f * y_fac, 0.0f, 0.020f * y_fac);
-
-	setlinestyle(1);
-	cpack(0xFFFFFF);
-	fdrawline(-0.020f * x_fac, 0.0f, -0.1f * x_fac, 0.0f);
-	fdrawline(0.1f * x_fac, 0.0f, 0.020f * x_fac, 0.0f);
-	fdrawline(0.0f, -0.020f * y_fac, 0.0f, -0.1f * y_fac);
-	fdrawline(0.0f, 0.1f * y_fac, 0.0f, 0.020f * y_fac);
-
-	glTranslatef(-cursor[0], -cursor[1], 0.0);
-	setlinestyle(0);
+	gpuTranslate2fv(cursor);
+
+	const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+	immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+
+	float viewport_size[4];
+	glGetFloatv(GL_VIEWPORT, viewport_size);
+	immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
+
+	immUniform1i("num_colors", 2);  /* "advanced" mode */
+	immUniformArray4fv("colors", (float *)(float[][4]){{1.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, 2);
+	immUniform1f("dash_width", 8.0f);
+
+	immBegin(GWN_PRIM_LINES, 8);
+
+	immVertex2f(shdr_pos, -0.05f * x_fac, 0.0f);
+	immVertex2f(shdr_pos, 0.0f, 0.05f * y_fac);
+
+	immVertex2f(shdr_pos, 0.0f, 0.05f * y_fac);
+	immVertex2f(shdr_pos, 0.05f * x_fac, 0.0f);
+
+	immVertex2f(shdr_pos, 0.05f * x_fac, 0.0f);
+	immVertex2f(shdr_pos, 0.0f, -0.05f * y_fac);
+
+	immVertex2f(shdr_pos, 0.0f, -0.05f * y_fac);
+	immVertex2f(shdr_pos, -0.05f * x_fac, 0.0f);
+
+	immEnd();
+
+	immUniformArray4fv("colors", (float *)(float[][4]){{1.0f, 1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, 2);
+	immUniform1f("dash_width", 2.0f);
+
+	immBegin(GWN_PRIM_LINES, 8);
+
+	immVertex2f(shdr_pos, -0.020f * x_fac, 0.0f);
+	immVertex2f(shdr_pos, -0.1f * x_fac, 0.0f);
+
+	immVertex2f(shdr_pos, 0.1f * x_fac, 0.0f);
+	immVertex2f(shdr_pos, 0.020f * x_fac, 0.0f);
+
+	immVertex2f(shdr_pos, 0.0f, -0.020f * y_fac);
+	immVertex2f(shdr_pos, 0.0f, -0.1f * y_fac);
+
+	immVertex2f(shdr_pos, 0.0f, 0.1f * y_fac);
+	immVertex2f(shdr_pos, 0.0f, 0.020f * y_fac);
+
+	immEnd();
+
+	immUnbindProgram();
+
+	gpuTranslate2f(-cursor[0], -cursor[1]);
 }
 
 static int draw_uvs_face_check(Scene *scene)
@@ -136,46 +162,33 @@ static void draw_uvs_shadow(Object *obedit)
 {
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMesh *bm = em->bm;
-	BMFace *efa;
-	BMIter iter;
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
 
-	/* draws the mesh when painting */
-	UI_ThemeColor(TH_UV_SHADOW);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-		draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
-	}
-}
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-static int draw_uvs_dm_shadow(DerivedMesh *dm)
-{
-	/* draw shadow mesh - this is the mesh with the modifier applied */
+	/* draws the mesh when painting */
+	immUniformThemeColor(TH_UV_SHADOW);
 
-	if (dm && dm->drawUVEdges && CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) {
-		UI_ThemeColor(TH_UV_SHADOW);
-		dm->drawUVEdges(dm);
-		return 1;
-	}
+	draw_uvs_lineloop_bmfaces(bm, cd_loop_uv_offset, pos);
 
-	return 0;
+	immUnbindProgram();
 }
 
-static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTexPoly *activetf)
+static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, Object *obedit, BMEditMesh *em, const BMFace *efa_act)
 {
 	BMesh *bm = em->bm;
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	Image *ima = sima->image;
 	float aspx, aspy, col[4];
 	int i;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, CD_MTEXPOLY);
 
 	BLI_buffer_declare_static(vec2f, tf_uv_buf, BLI_BUFFER_NOP, BM_DEFAULT_NGON_STACK_SIZE);
 	BLI_buffer_declare_static(vec2f, tf_uvorig_buf, BLI_BUFFER_NOP, BM_DEFAULT_NGON_STACK_SIZE);
@@ -191,7 +204,6 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 				const int efa_len = efa->len;
 				float (*tf_uv)[2]     = (float (*)[2])BLI_buffer_reinit_data(&tf_uv_buf,     vec2f, efa_len);
 				float (*tf_uvorig)[2] = (float (*)[2])BLI_buffer_reinit_data(&tf_uvorig_buf, vec2f, efa_len);
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 
 				BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
@@ -203,28 +215,37 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 				totarea += BM_face_calc_area(efa);
 				totuvarea += area_poly_v2(tf_uv, efa->len);
 
-				if (uvedit_face_visible_test(scene, ima, efa, tf)) {
+				if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
 					BM_elem_flag_enable(efa, BM_ELEM_TAG);
 				}
 				else {
-					if (tf == activetf)
-						activetf = NULL;
+					if (efa == efa_act) {
+						efa_act = NULL;
+					}
 					BM_elem_flag_disable(efa, BM_ELEM_TAG);
 				}
 			}
 
+			unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 			if (totarea < FLT_EPSILON || totuvarea < FLT_EPSILON) {
 				col[0] = 1.0;
 				col[1] = col[2] = 0.0;
-				glColor3fv(col);
+
+				immUniformColor3fv(col);
+
 				BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 					if (BM_elem_flag_test(efa, BM_ELEM_TAG)) {
-						glBegin(GL_POLYGON);
+						immBegin(GWN_PRIM_TRI_FAN, efa->len);
+
 						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 							luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-							glVertex2fv(luv->uv);
+							immVertex2fv(pos, luv->uv);
 						}
-						glEnd();
+
+						immEnd();
 					}
 				}
 			}
@@ -254,18 +275,23 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 							areadiff = 1.0f - (area / uvarea);
 
 						weight_to_rgb(col, areadiff);
-						glColor3fv(col);
+						immUniformColor3fv(col);
+
+						/* TODO: use editmesh tessface */
+						immBegin(GWN_PRIM_TRI_FAN, efa->len);
 
-						/* TODO: USE_EDBM_LOOPTRIS */
-						glBegin(GL_POLYGON);
 						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 							luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-							glVertex2fv(luv->uv);
+							immVertex2fv(pos, luv->uv);
 						}
-						glEnd();
+
+						immEnd();
 					}
 				}
 			}
+
+			immUnbindProgram();
+
 			break;
 		}
 		case SI_UVDT_STRETCH_ANGLE:
@@ -279,10 +305,14 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 
 			col[3] = 0.5f; /* hard coded alpha, not that nice */
 
-			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
+			Gwn_VertFormat *format = immVertexFormat();
+			unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
 
-				if (uvedit_face_visible_test(scene, ima, efa, tf)) {
+			immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
+				if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
 					const int efa_len = efa->len;
 					float (*tf_uv)[2]     = (float (*)[2])BLI_buffer_reinit_data(&tf_uv_buf,     vec2f, efa_len);
 					float (*tf_uvorig)[2] = (float (*)[2])BLI_buffer_reinit_data(&tf_uvorig_buf, vec2f, efa_len);
@@ -319,24 +349,26 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 						ang[i] = angle_normalized_v3v3(av[i], av[(i + 1) % efa_len]);
 					}
 
-					/* TODO: USE_EDBM_LOOPTRIS */
-					glBegin(GL_POLYGON);
+					/* TODO: use editmesh tessface */
+					immBegin(GWN_PRIM_TRI_FAN, efa->len);
 					BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 						luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 						a = fabsf(uvang[i] - ang[i]) / (float)M_PI;
 						weight_to_rgb(col, 1.0f - pow2f(1.0f - a));
-						glColor3fv(col);
-						glVertex2fv(luv->uv);
+						immAttrib3fv(color, col);
+						immVertex2fv(pos, luv->uv);
 					}
-					glEnd();
+					immEnd();
 				}
 				else {
-					if (tf == activetf)
-						activetf = NULL;
+					if (efa == efa_act)
+						efa_act = NULL;
 					BM_elem_flag_disable(efa, BM_ELEM_TAG);
 				}
 			}
 
+			immUnbindProgram();
+
 			BLI_buffer_free(&uvang_buf);
 			BLI_buffer_free(&ang_buf);
 			BLI_buffer_free(&av_buf);
@@ -350,58 +382,58 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 	BLI_buffer_free(&tf_uvorig_buf);
 }
 
-static void draw_uvs_lineloop_bmface(BMFace *efa, const int cd_loop_uv_offset)
+static void draw_uvs_lineloop_bmfaces(BMesh *bm, const int cd_loop_uv_offset, const uint shdr_pos)
 {
-	BMIter liter;
+	BMIter iter, liter;
+	BMFace *efa;
 	BMLoop *l;
 	MLoopUV *luv;
 
-	glBegin(GL_LINE_LOOP);
-	BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-		luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-		glVertex2fv(luv->uv);
+	/* For more efficiency first transfer the entire buffer to vram. */
+	Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
+
+	BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+			continue;
+
+		BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
+			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+			immVertex2fv(shdr_pos, luv->uv);
+		}
+	}
+	immEnd();
+
+	/* Then draw each face contour separately. */
+	GWN_batch_program_use_begin(loop_batch);
+	unsigned int index = 0;
+	BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+			continue;
+
+		GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
+		index += efa->len;
 	}
-	glEnd();
+	GWN_batch_program_use_end(loop_batch);
+	GWN_batch_discard(loop_batch);
 }
 
-static void draw_uvs_lineloop_mpoly(Mesh *me, MPoly *mpoly)
+static void draw_uvs_lineloop_mpoly(Mesh *me, MPoly *mpoly, unsigned int pos)
 {
 	MLoopUV *mloopuv;
 	int i;
 
-	glBegin(GL_LINE_LOOP);
+	immBegin(GWN_PRIM_LINE_LOOP, mpoly->totloop);
+
 	mloopuv = &me->mloopuv[mpoly->loopstart];
 	for (i = mpoly->totloop; i != 0; i--, mloopuv++) {
-		glVertex2fv(mloopuv->uv);
-	}
-	glEnd();
-}
-
-static void draw_uvs_other_mesh_texface(Object *ob, const Image *curimage, const int other_uv_filter)
-{
-	Mesh *me = ob->data;
-	MPoly *mpoly = me->mpoly;
-	MTexPoly *mtpoly = me->mtpoly;
-	int a;
-
-	if (me->mloopuv == NULL) {
-		return;
+		immVertex2fv(pos, mloopuv->uv);
 	}
 
-	for (a = me->totpoly; a != 0; a--, mpoly++, mtpoly++) {
-		if (other_uv_filter == SI_FILTER_ALL) {
-			/* Nothing to compare, all UV faces are visible. */
-		}
-		else if (other_uv_filter == SI_FILTER_SAME_IMAGE) {
-			if (mtpoly->tpage != curimage) {
-				continue;
-			}
-		}
-
-		draw_uvs_lineloop_mpoly(me, mpoly);
-	}
+	immEnd();
 }
-static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage, const int other_uv_filter)
+
+static void draw_uvs_other_mesh(Object *ob, const Image *curimage,
+                                const int other_uv_filter, unsigned int pos)
 {
 	Mesh *me = ob->data;
 	MPoly *mpoly = me->mpoly;
@@ -453,53 +485,42 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage, c
 			}
 		}
 
-		draw_uvs_lineloop_mpoly(me, mpoly);
-	}
-}
-static void draw_uvs_other_mesh(Object *ob, const Image *curimage, const bool new_shading_nodes,
-                                const int other_uv_filter)
-{
-	if (new_shading_nodes) {
-		draw_uvs_other_mesh_new_shading(ob, curimage, other_uv_filter);
-	}
-	else {
-		draw_uvs_other_mesh_texface(ob, curimage, other_uv_filter);
+		draw_uvs_lineloop_mpoly(me, mpoly, pos);
 	}
 }
 
-static void draw_uvs_other(Scene *scene, Object *obedit, const Image *curimage, const bool new_shading_nodes,
+static void draw_uvs_other(ViewLayer *view_layer, Object *obedit, const Image *curimage,
                            const int other_uv_filter)
 {
-	Base *base;
-
-	UI_ThemeColor(TH_UV_OTHERS);
+	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
-	for (base = scene->base.first; base; base = base->next) {
-		Object *ob = base->object;
+	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-		if (!(base->flag & SELECT)) continue;
-		if (!(base->lay & scene->lay)) continue;
-		if (ob->restrictflag & OB_RESTRICT_VIEW) continue;
+	immUniformThemeColor(TH_UV_OTHERS);
 
-		if ((ob->type == OB_MESH) && (ob != obedit) && ((Mesh *)ob->data)->mloopuv) {
-			draw_uvs_other_mesh(ob, curimage, new_shading_nodes, other_uv_filter);
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+		if (((base->flag & BASE_SELECTED) != 0) &&
+		    ((base->flag & BASE_VISIBLED) != 0))
+		{
+			Object *ob = base->object;
+			if ((ob->type == OB_MESH) && (ob != obedit) && ((Mesh *)ob->data)->mloopuv) {
+				draw_uvs_other_mesh(ob, curimage, other_uv_filter, pos);
+			}
 		}
 	}
+	immUnbindProgram();
 }
 
-static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
+static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Object *ob)
 {
-	const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
 	Image *curimage = ED_space_image(sima);
 	Mesh *me = ob->data;
 	Material *ma;
 
 	if (sima->flag & SI_DRAW_OTHER) {
-		draw_uvs_other(scene, ob, curimage, new_shading_nodes, sima->other_uv_filter);
+		draw_uvs_other(view_layer, ob, curimage, sima->other_uv_filter);
 	}
 
-	UI_ThemeColor(TH_UV_SHADOW);
-
 	ma = give_current_material(ob, ob->actcol);
 
 	if (me->mloopuv) {
@@ -512,24 +533,33 @@ static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
 			mloopuv = me->mloopuv;
 		}
 
+		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+		immUniformThemeColor(TH_UV_SHADOW);
+
 		mloopuv_base = mloopuv;
 
 		for (a = me->totpoly; a > 0; a--, mpoly++) {
 			if ((scene->toolsettings->uv_flag & UV_SHOW_SAME_IMAGE) && mpoly->mat_nr != ob->actcol - 1)
 				continue;
-			glBegin(GL_LINE_LOOP);
+
+			immBegin(GWN_PRIM_LINE_LOOP, mpoly->totloop);
 
 			mloopuv = mloopuv_base + mpoly->loopstart;
 			for (b = 0; b < mpoly->totloop; b++, mloopuv++) {
-				glVertex2fv(mloopuv->uv);
+				immVertex2fv(pos, mloopuv->uv);
 			}
-			glEnd();
+
+			immEnd();
 		}
+
+		immUnbindProgram();
 	}
 }
 
-#ifdef USE_EDBM_LOOPTRIS
-static void draw_uvs_looptri(BMEditMesh *em, unsigned int *r_loop_index, const int cd_loop_uv_offset)
+static void draw_uvs_looptri(BMEditMesh *em, unsigned int *r_loop_index, const int cd_loop_uv_offset, unsigned int pos)
 {
 	unsigned int i = *r_loop_index;
 	BMFace *f = em->looptris[i][0]->f;
@@ -537,43 +567,34 @@ static void draw_uvs_looptri(BMEditMesh *em, unsigned int *r_loop_index, const i
 		unsigned int j;
 		for (j = 0; j < 3; j++) {
 			MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(em->looptris[i][j], cd_loop_uv_offset);
-			glVertex2fv(luv->uv);
+			immVertex2fv(pos, luv->uv);
 		}
 		i++;
 	} while (i != em->tottri && (f == em->looptris[i][0]->f));
 	*r_loop_index = i - 1;
 }
-#endif
 
 /* draws uv's in the image space */
-static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
+static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Object *obedit, Depsgraph *depsgraph)
 {
-	const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
 	ToolSettings *ts;
 	Mesh *me = obedit->data;
 	BMEditMesh *em = me->edit_btmesh;
 	BMesh *bm = em->bm;
 	BMFace *efa, *efa_act;
-#ifndef USE_EDBM_LOOPTRIS
-	BMFace *activef;
-#endif
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf, *activetf = NULL;
 	MLoopUV *luv;
-	DerivedMesh *finaldm, *cagedm;
-	unsigned char col1[4], col2[4];
+	float col1[4], col2[4];
 	float pointsize;
 	int drawfaces, interpedges;
 	Image *ima = sima->image;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, CD_MTEXPOLY);
 
-	efa_act = EDBM_uv_active_face_get(em, false, false, &activetf); /* will be set to NULL if hidden */
-#ifndef USE_EDBM_LOOPTRIS
-	activef = BM_mesh_active_face_get(bm, false, false);
-#endif
+	unsigned int pos, color;
+
+	efa_act = EDBM_uv_active_face_get(em, false, false); /* will be set to NULL if hidden */
 	ts = scene->toolsettings;
 
 	drawfaces = draw_uvs_face_check(scene);
@@ -586,272 +607,279 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	if (sima->flag & SI_DRAW_OTHER) {
 		Image *curimage;
 
-		if (new_shading_nodes) {
-			if (efa_act) {
-				ED_object_get_active_image(obedit, efa_act->mat_nr + 1, &curimage, NULL, NULL, NULL);
-			}
-			else {
-				curimage = ima;
-			}
+		if (efa_act) {
+			ED_object_get_active_image(obedit, efa_act->mat_nr + 1, &curimage, NULL, NULL, NULL);
 		}
 		else {
-			curimage = (activetf) ? activetf->tpage : ima;
+			curimage = ima;
 		}
 
-		draw_uvs_other(scene, obedit, curimage, new_shading_nodes, sima->other_uv_filter);
+		draw_uvs_other(view_layer, obedit, curimage, sima->other_uv_filter);
 	}
 
 	/* 1. draw shadow mesh */
 
 	if (sima->flag & SI_DRAWSHADOW) {
-		DM_update_materials(em->derivedFinal, obedit);
-		/* first try existing derivedmesh */
-		if (!draw_uvs_dm_shadow(em->derivedFinal)) {
-			/* create one if it does not exist */
-			cagedm = editbmesh_get_derived_cage_and_final(
-			        scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH | CD_MASK_MTFACE,
-			        &finaldm);
-
-			/* when sync selection is enabled, all faces are drawn (except for hidden)
-			 * so if cage is the same as the final, theres no point in drawing this */
-			if (!((ts->uv_flag & UV_SYNC_SELECTION) && (cagedm == finaldm)))
-				draw_uvs_dm_shadow(finaldm);
-
-			/* release derivedmesh again */
-			if (cagedm != finaldm) cagedm->release(cagedm);
-			finaldm->release(finaldm);
+		Object *ob_cage_eval = DEG_get_evaluated_object(depsgraph, obedit);
+		/* XXX TODO: Need to check if shadow mesh is different than original mesh. */
+		bool is_cage_like_final_meshes = (ob_cage_eval == obedit);
+
+		/* When sync selection is enabled, all faces are drawn (except for hidden)
+		 * so if cage is the same as the final, there is no point in drawing this. */
+		if (((ts->uv_flag & UV_SYNC_SELECTION) == 0) || is_cage_like_final_meshes) {
+			draw_uvs_shadow(ob_cage_eval);
 		}
 	}
 
 	/* 2. draw colored faces */
 
 	if (sima->flag & SI_DRAW_STRETCH) {
-		draw_uvs_stretch(sima, scene, em, activetf);
+		draw_uvs_stretch(sima, scene, obedit, em, efa_act);
 	}
-	else if (!(sima->flag & SI_NO_DRAWFACES)) {
-		/* draw transparent faces */
-		UI_GetThemeColor4ubv(TH_FACE, col1);
-		UI_GetThemeColor4ubv(TH_FACE_SELECT, col2);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glEnable(GL_BLEND);
+	else {
+		unsigned int tri_count = 0;
+		BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+			if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
+				BM_elem_flag_enable(efa, BM_ELEM_TAG);
+				tri_count += efa->len - 2;
+			}
+			else {
+				BM_elem_flag_disable(efa, BM_ELEM_TAG);
+			}
+		}
 
-#ifdef USE_EDBM_LOOPTRIS
-		{
-			unsigned int i;
-			for (i = 0; i < em->tottri; i++) {
+		if (tri_count && !(sima->flag & SI_NO_DRAWFACES)) {
+			/* draw transparent faces */
+			UI_GetThemeColor4fv(TH_FACE, col1);
+			UI_GetThemeColor4fv(TH_FACE_SELECT, col2);
+			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+			glEnable(GL_BLEND);
+
+			Gwn_VertFormat *format = immVertexFormat();
+			pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+			immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+			Gwn_Batch *face_batch = immBeginBatch(GWN_PRIM_TRIS, tri_count * 3);
+			for (unsigned int i = 0; i < em->tottri; i++) {
 				efa = em->looptris[i][0]->f;
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-				if (uvedit_face_visible_test(scene, ima, efa, tf)) {
+				if (BM_elem_flag_test(efa, BM_ELEM_TAG)) {
 					const bool is_select = uvedit_face_select_test(scene, efa, cd_loop_uv_offset);
-					BM_elem_flag_enable(efa, BM_ELEM_TAG);
 
-					if (tf == activetf) {
+					if (efa == efa_act) {
 						/* only once */
-						GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-						GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_QUARTTONE);
-						UI_ThemeColor4(TH_EDITMESH_ACTIVE);
+						float tmp_col[4];
+						UI_GetThemeColor4fv(TH_EDITMESH_ACTIVE, tmp_col);
+						immAttrib4fv(color, tmp_col);
 					}
 					else {
-						glColor4ubv((GLubyte *)(is_select ? col2 : col1));
+						immAttrib4fv(color, is_select ? col2 : col1);
 					}
 
-					glBegin(GL_TRIANGLES);
-					draw_uvs_looptri(em, &i, cd_loop_uv_offset);
-					glEnd();
-
-					if (tf == activetf) {
-						GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-					}
-				}
-				else {
-					BM_elem_flag_disable(efa, BM_ELEM_TAG);
+					draw_uvs_looptri(em, &i, cd_loop_uv_offset, pos);
 				}
 			}
-		}
-#else
-		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
-				BM_elem_flag_enable(efa, BM_ELEM_TAG);
-				if (tf == activetf) continue;  /* important the temp boolean is set above */
+			immEnd();
 
-				if (uvedit_face_select_test(scene, efa, cd_loop_uv_offset))
-					glColor4ubv((GLubyte *)col2);
-				else
-					glColor4ubv((GLubyte *)col1);
+			/* XXX performance: we should not create and throw away result. */
+			GWN_batch_draw(face_batch);
+			GWN_batch_program_use_end(face_batch);
+			GWN_batch_discard(face_batch);
 
-				glBegin(GL_POLYGON);
-				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-					glVertex2fv(luv->uv);
-				}
-				glEnd();
-			}
-			else {
-				if (tf == activetf)
-					activetf = NULL;
-				BM_elem_flag_disable(efa, BM_ELEM_TAG);
-			}
-		}
-#endif
-		glDisable(GL_BLEND);
-	}
-	else {
-		/* would be nice to do this within a draw loop but most below are optional, so it would involve too many checks */
-
-		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
+			immUnbindProgram();
 
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
-				BM_elem_flag_enable(efa, BM_ELEM_TAG);
-			}
-			else {
-				if (tf == activetf)
-					activetf = NULL;
-				BM_elem_flag_disable(efa, BM_ELEM_TAG);
+			glDisable(GL_BLEND);
+		}
+		else {
+			if (efa_act && !uvedit_face_visible_test(scene, obedit, ima, efa_act)) {
+				efa_act = NULL;
 			}
 		}
-
 	}
 
 	/* 3. draw active face stippled */
-#ifndef USE_EDBM_LOOPTRIS
-	if (activef) {
-		tf = BM_ELEM_CD_GET_VOID_P(activef, cd_poly_tex_offset);
-		if (uvedit_face_visible_test(scene, ima, activef, tf)) {
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			UI_ThemeColor4(TH_EDITMESH_ACTIVE);
-
-			GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-			GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_QUARTTONE);
-
-			glBegin(GL_POLYGON);
-			BM_ITER_ELEM (l, &liter, activef, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				glVertex2fv(luv->uv);
-			}
-			glEnd();
-
-			GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-			glDisable(GL_BLEND);
-		}
-	}
-#endif
+	/* (removed during OpenGL upgrade, reimplement if needed) */
 
 	/* 4. draw edges */
 
 	if (sima->flag & SI_SMOOTH_UV) {
 		glEnable(GL_LINE_SMOOTH);
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	}
 
-	glLineWidth(1);
+	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
 	switch (sima->dt_uv) {
 		case SI_UVDT_DASH:
-			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
-					continue;
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-				if (tf) {
-					cpack(0x111111);
-
-					draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
+		{
+			immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
-					setlinestyle(2);
-					cpack(0x909090);
+			float viewport_size[4];
+			glGetFloatv(GL_VIEWPORT, viewport_size);
+			immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
 
-					draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
+			immUniform1i("num_colors", 2);  /* "advanced" mode */
+			immUniformArray4fv("colors", (float *)(float[][4]){{0.56f, 0.56f, 0.56f, 1.0f}, {0.07f, 0.07f, 0.07f, 1.0f}}, 2);
+			immUniform1f("dash_width", 4.0f);
+			glLineWidth(1.0f);
 
-					setlinestyle(0);
-				}
-			}
 			break;
+		}
 		case SI_UVDT_BLACK: /* black/white */
 		case SI_UVDT_WHITE:
-			if (sima->dt_uv == SI_UVDT_WHITE) glColor3f(1.0f, 1.0f, 1.0f);
-			else glColor3f(0.0f, 0.0f, 0.0f);
-
-			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
-					continue;
-
-				draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			if (sima->dt_uv == SI_UVDT_WHITE) {
+				immUniformColor3f(1.0f, 1.0f, 1.0f);
 			}
+			else {
+				immUniformColor3f(0.0f, 0.0f, 0.0f);
+			}
+			glLineWidth(1.0f);
+
 			break;
 		case SI_UVDT_OUTLINE:
-			glLineWidth(3);
-			cpack(0x0);
+			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+			imm_cpack(0x0);
+			glLineWidth(3.0f);
 
-			BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-				if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
-					continue;
+			break;
+	}
 
-				draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
-			}
+	/* For more efficiency first transfer the entire buffer to vram. */
+	Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
+	Gwn_VertBuf *loop_vbo = loop_batch->verts[0];
+	BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+			continue;
 
-			glLineWidth(1);
-			UI_GetThemeColor4ubv(TH_WIRE_EDIT, col2);
-			glColor4ubv((unsigned char *)col2);
+		BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
+			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+			immVertex2fv(pos, luv->uv);
+		}
+	}
+	immEnd();
+
+	/* Then draw each face contour separately. */
+	if (loop_vbo->vertex_ct != 0) {
+		GWN_batch_program_use_begin(loop_batch);
+		unsigned int index = 0, loop_vbo_count;
+		BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+				continue;
+
+			GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
+			index += efa->len;
+		}
+		loop_vbo_count = index;
+		GWN_batch_program_use_end(loop_batch);
+		immUnbindProgram();
+
+
+		if (sima->dt_uv == SI_UVDT_OUTLINE) {
+			glLineWidth(1.0f);
+			UI_GetThemeColor4fv(TH_WIRE_EDIT, col2);
 
 			if (me->drawflag & ME_DRAWEDGES) {
-				int sel, lastsel = -1;
-				UI_GetThemeColor4ubv(TH_EDGE_SELECT, col1);
+				int sel;
+				UI_GetThemeColor4fv(TH_EDGE_SELECT, col1);
 
 				if (interpedges) {
-					GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-					BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
+					/* Create a color buffer. */
+					static Gwn_VertFormat format = { 0 };
+					static uint shdr_col;
+					if (format.attrib_ct == 0) {
+						shdr_col = GWN_vertformat_attr_add(&format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+					}
+
+					Gwn_VertBuf *vbo_col = GWN_vertbuf_create_with_format(&format);
+					GWN_vertbuf_data_alloc(vbo_col, loop_vbo_count);
+
+					index = 0;
+					BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
 						if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 							continue;
 
-						glBegin(GL_LINE_LOOP);
-						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+						BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
 							sel = uvedit_uv_select_test(scene, l, cd_loop_uv_offset);
-							glColor4ubv(sel ? (GLubyte *)col1 : (GLubyte *)col2);
-
-							luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-							glVertex2fv(luv->uv);
+							GWN_vertbuf_attr_set(vbo_col, shdr_col, index++, sel ? col1 : col2);
 						}
-						glEnd();
 					}
+					/* Reuse the UV buffer and add the color buffer. */
+					GWN_batch_vertbuf_add_ex(loop_batch, vbo_col, true);
+
+					/* Now draw each face contour separately with another builtin program. */
+					GWN_batch_program_set_builtin(loop_batch, GPU_SHADER_2D_SMOOTH_COLOR);
+					gpuBindMatrices(loop_batch->interface);
+
+					GWN_batch_program_use_begin(loop_batch);
+					index = 0;
+					BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
+						if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+							continue;
+
+						GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
+						index += efa->len;
+					}
+					GWN_batch_program_use_end(loop_batch);
 				}
 				else {
-					BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
+					Gwn_VertFormat *format = immVertexFormat();
+					pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+					color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 4, GWN_FETCH_FLOAT);
+
+					immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
+
+					/* Use batch here to avoid problems with `IMM_BUFFER_SIZE`. */
+					Gwn_Batch *flat_edges_batch = immBeginBatchAtMost(GWN_PRIM_LINES, loop_vbo_count * 2);
+					BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
 						if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 							continue;
 
-						glBegin(GL_LINES);
-						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+						BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
 							sel = uvedit_edge_select_test(scene, l, cd_loop_uv_offset);
-							if (sel != lastsel) {
-								glColor4ubv(sel ? (GLubyte *)col1 : (GLubyte *)col2);
-								lastsel = sel;
-							}
+							immAttrib4fv(color, sel ? col1 : col2);
+
 							luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-							glVertex2fv(luv->uv);
+							immVertex2fv(pos, luv->uv);
 							luv = BM_ELEM_CD_GET_VOID_P(l->next, cd_loop_uv_offset);
-							glVertex2fv(luv->uv);
+							immVertex2fv(pos, luv->uv);
 						}
-						glEnd();
 					}
+					immEnd();
+
+					GWN_batch_draw(flat_edges_batch);
+					GWN_batch_discard(flat_edges_batch);
+
+					immUnbindProgram();
 				}
 			}
 			else {
+				GWN_batch_uniform_4fv(loop_batch, "color", col2);
+				immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 				/* no nice edges */
-				BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
+				GWN_batch_program_use_begin(loop_batch);
+				index = 0;
+				BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
 					if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 						continue;
 
-					draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
+					GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
+					index += efa->len;
 				}
+				GWN_batch_program_use_end(loop_batch);
+				immUnbindProgram();
 			}
-
-			break;
+		}
+	}
+	else {
+		immUnbindProgram();
 	}
 
+	GWN_batch_discard(loop_batch);
+
 	if (sima->flag & SI_SMOOTH_UV) {
 		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
@@ -861,50 +889,80 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 
 	if (drawfaces) {
 		float cent[2];
+		bool col_set = false;
+
+		Gwn_VertFormat *format = immVertexFormat();
+		pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		color = GWN_vertformat_attr_add(format, "color", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
 
 		pointsize = UI_GetThemeValuef(TH_FACEDOT_SIZE);
 		glPointSize(pointsize);
 
-		glBegin(GL_POINTS);
+		immBeginAtMost(GWN_PRIM_POINTS, bm->totface);
 
 		/* unselected faces */
-		UI_ThemeColor(TH_WIRE);
 
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			if (!uvedit_face_select_test(scene, efa, cd_loop_uv_offset)) {
+				/* Only set color for the first face */
+				if (!col_set) {
+					UI_GetThemeColor3fv(TH_WIRE, col1);
+					immAttrib3fv(color, col1);
+
+					col_set = true;
+				}
+
 				uv_poly_center(efa, cent, cd_loop_uv_offset);
-				glVertex2fv(cent);
+				immVertex2fv(pos, cent);
 			}
 		}
 
+		col_set = false;
+
 		/* selected faces */
-		UI_ThemeColor(TH_FACE_DOT);
 
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
 
 			if (uvedit_face_select_test(scene, efa, cd_loop_uv_offset)) {
+				/* Only set color for the first face */
+				if (!col_set) {
+					UI_GetThemeColor3fv(TH_FACE_DOT, col1);
+					immAttrib3fv(color, col1);
+
+					col_set = true;
+				}
+
 				uv_poly_center(efa, cent, cd_loop_uv_offset);
-				glVertex2fv(cent);
+				immVertex2fv(pos, cent);
 			}
 		}
 
-		glEnd();
+		immEnd();
+
+		immUnbindProgram();
 	}
 
 	/* 6. draw uv vertices */
 
 	if (drawfaces != 2) { /* 2 means Mesh Face Mode */
+		pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
 		/* unselected uvs */
-		UI_ThemeColor(TH_VERTEX);
+		immUniformThemeColor(TH_VERTEX);
 		pointsize = UI_GetThemeValuef(TH_VERTEX_SIZE);
 		glPointSize(pointsize);
 
-		glBegin(GL_POINTS);
+		immBeginAtMost(GWN_PRIM_POINTS, bm->totloop);
+
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
@@ -912,17 +970,19 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 				if (!uvedit_uv_select_test(scene, l, cd_loop_uv_offset))
-					glVertex2fv(luv->uv);
+					immVertex2fv(pos, luv->uv);
 			}
 		}
-		glEnd();
+
+		immEnd();
 
 		/* pinned uvs */
 		/* give odd pointsizes odd pin pointsizes */
 		glPointSize(pointsize * 2 + (((int)pointsize % 2) ? (-1) : 0));
-		cpack(0xFF);
+		imm_cpack(0xFF);
+
+		immBeginAtMost(GWN_PRIM_POINTS, bm->totloop);
 
-		glBegin(GL_POINTS);
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
@@ -931,16 +991,18 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
 				if (luv->flag & MLOOPUV_PINNED)
-					glVertex2fv(luv->uv);
+					immVertex2fv(pos, luv->uv);
 			}
 		}
-		glEnd();
+
+		immEnd();
 
 		/* selected uvs */
-		UI_ThemeColor(TH_VERTEX_SELECT);
+		immUniformThemeColor(TH_VERTEX_SELECT);
 		glPointSize(pointsize);
 
-		glBegin(GL_POINTS);
+		immBeginAtMost(GWN_PRIM_POINTS, bm->totloop);
+
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 				continue;
@@ -949,15 +1011,20 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
 				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset))
-					glVertex2fv(luv->uv);
+					immVertex2fv(pos, luv->uv);
 			}
 		}
-		glEnd();
+
+		immEnd();
+
+		immUnbindProgram();
 	}
 }
 
 
-static void draw_uv_shadows_get(SpaceImage *sima, Object *ob, Object *obedit, bool *show_shadow, bool *show_texpaint)
+static void draw_uv_shadows_get(
+        SpaceImage *sima, Object *ob, Object *obedit,
+        bool *show_shadow, bool *show_texpaint)
 {
 	*show_shadow = *show_texpaint = false;
 
@@ -973,7 +1040,9 @@ static void draw_uv_shadows_get(SpaceImage *sima, Object *ob, Object *obedit, bo
 	*show_texpaint = (ob && ob->type == OB_MESH && ob->mode == OB_MODE_TEXTURE_PAINT);
 }
 
-void ED_uvedit_draw_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedit, Object *obact)
+void ED_uvedit_draw_main(
+        SpaceImage *sima,
+        ARegion *ar, Scene *scene, ViewLayer *view_layer, Object *obedit, Object *obact, Depsgraph *depsgraph)
 {
 	ToolSettings *toolsettings = scene->toolsettings;
 	bool show_uvedit, show_uvshadow, show_texpaint_uvshadow;
@@ -982,12 +1051,21 @@ void ED_uvedit_draw_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *ob
 	draw_uv_shadows_get(sima, obact, obedit, &show_uvshadow, &show_texpaint_uvshadow);
 
 	if (show_uvedit || show_uvshadow || show_texpaint_uvshadow) {
-		if (show_uvshadow)
+		if (show_uvshadow) {
 			draw_uvs_shadow(obedit);
-		else if (show_uvedit)
-			draw_uvs(sima, scene, obedit);
-		else
-			draw_uvs_texpaint(sima, scene, obact);
+		}
+		else if (show_uvedit) {
+			uint objects_len = 0;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
+			for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+				Object *ob_iter = objects[ob_index];
+				draw_uvs(sima, scene, view_layer, ob_iter, depsgraph);
+			}
+			MEM_freeN(objects);
+		}
+		else {
+			draw_uvs_texpaint(sima, scene, view_layer, obact);
+		}
 
 		if (show_uvedit && !(toolsettings->use_uv_sculpt))
 			ED_image_draw_cursor(ar, sima->cursor);
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index a9162d26d72..eed9d68f39c 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -32,7 +32,6 @@
 #ifndef __UVEDIT_INTERN_H__
 #define __UVEDIT_INTERN_H__
 
-struct MTexPoly;
 struct Image;
 struct Object;
 struct Scene;
@@ -52,9 +51,10 @@ void  uv_poly_center(struct BMFace *f, float r_cent[2], const int cd_loop_uv_off
 /* find nearest */
 
 typedef struct UvNearestHit {
+	/** Only for `*_multi(..)` versions of functions. */
+	struct Object *ob;
 	/** Always set if we have a hit. */
 	struct BMFace *efa;
-	struct MTexPoly *tf;
 	struct BMLoop *l;
 	struct MLoopUV *luv, *luv_next;
 	/** Index of loop within face. */
@@ -66,15 +66,24 @@ typedef struct UvNearestHit {
 #define UV_NEAREST_HIT_INIT { .dist_sq = FLT_MAX, }
 
 bool uv_find_nearest_vert(
-        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
+        struct Scene *scene, struct Image *ima, struct Object *obedit,
+        const float co[2], const float penalty_dist, struct UvNearestHit *hit_final);
+bool uv_find_nearest_vert_multi(
+        struct Scene *scene, struct Image *ima, struct Object **objects, const uint objects_len,
         const float co[2], const float penalty_dist, struct UvNearestHit *hit_final);
 
 bool uv_find_nearest_edge(
-        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
+        struct Scene *scene, struct Image *ima, struct Object *obedit,
+        const float co[2], struct UvNearestHit *hit_final);
+bool uv_find_nearest_edge_multi(
+        struct Scene *scene, struct Image *ima, struct Object **objects, const uint objects_len,
         const float co[2], struct UvNearestHit *hit_final);
 
 bool uv_find_nearest_face(
-        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
+        struct Scene *scene, struct Image *ima, struct Object *obedit,
+        const float co[2], struct UvNearestHit *hit_final);
+bool uv_find_nearest_face_multi(
+        struct Scene *scene, struct Image *ima, struct Object **objects, const uint objects_len,
         const float co[2], struct UvNearestHit *hit_final);
 
 /* utility tool functions */
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 0fa5fb9a48d..6d5a1925dd5 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -29,6 +29,7 @@
  *  \ingroup eduv
  */
 
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -56,7 +57,6 @@
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
@@ -66,6 +66,9 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
 
 #include "ED_image.h"
 #include "ED_mesh.h"
@@ -87,7 +90,10 @@
 
 #include "uvedit_intern.h"
 
-static void uv_select_all_perform(Scene *scene, Image *ima, BMEditMesh *em, int action);
+static bool uv_select_is_any_selected(Scene *scene, Image *ima, Object *obedit);
+static bool uv_select_is_any_selected_multi(Scene *scene, Image *ima, Object **objects, const uint objects_len);
+static void uv_select_all_perform(Scene *scene, Image *ima, Object *obedit, int action);
+static void uv_select_all_perform_multi(Scene *scene, Image *ima, Object **objects, const uint objects_len, int action);
 static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object *obedit, const bool select);
 static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object *obedit, const bool select);
 
@@ -189,144 +195,6 @@ void ED_object_assign_active_image(Main *bmain, Object *ob, int mat_nr, Image *i
 
 //#define USE_SWITCH_ASPECT
 
-void ED_uvedit_assign_image(Main *UNUSED(bmain), Scene *scene, Object *obedit, Image *ima, Image *previma)
-{
-	BMEditMesh *em;
-	BMIter iter;
-	MTexPoly *tf;
-	bool update = false;
-	const bool selected = !(scene->toolsettings->uv_flag & UV_SYNC_SELECTION);
-
-	/* skip assigning these procedural images... */
-	if (ima && (ima->type == IMA_TYPE_R_RESULT || ima->type == IMA_TYPE_COMPOSITE))
-		return;
-
-	/* verify we have a mesh we can work with */
-	if (!obedit || (obedit->type != OB_MESH))
-		return;
-
-	em = BKE_editmesh_from_object(obedit);
-	if (!em || !em->bm->totface) {
-		return;
-	}
-
-	if (BKE_scene_use_new_shading_nodes(scene)) {
-		/* new shading system, do not assign anything */
-	}
-	else {
-		BMFace *efa;
-
-		int cd_loop_uv_offset;
-		int cd_poly_tex_offset;
-
-		/* old shading system, assign image to selected faces */
-#ifdef USE_SWITCH_ASPECT
-		float prev_aspect[2], fprev_aspect;
-		float aspect[2], faspect;
-
-		ED_image_get_uv_aspect(previma, prev_aspect, prev_aspect + 1);
-		ED_image_get_uv_aspect(ima, aspect, aspect + 1);
-
-		fprev_aspect = prev_aspect[0] / prev_aspect[1];
-		faspect = aspect[0] / aspect[1];
-#endif
-
-		/* ensure we have a uv map */
-		if (!CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY)) {
-			BM_data_layer_add(em->bm, &em->bm->pdata, CD_MTEXPOLY);
-			BM_data_layer_add(em->bm, &em->bm->ldata, CD_MLOOPUV);
-			/* make UVs all nice 0-1 */
-			ED_mesh_uv_loop_reset_ex(obedit->data, CustomData_get_active_layer(&em->bm->pdata, CD_MTEXPOLY));
-			update = true;
-		}
-
-		cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-		cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
-
-		/* now assign to all visible faces */
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (uvedit_face_visible_test(scene, previma, efa, tf) &&
-			    (selected == true || uvedit_face_select_test(scene, efa, cd_loop_uv_offset)))
-			{
-				if (ima) {
-					tf->tpage = ima;
-
-					if (ima->id.us == 0) id_us_plus(&ima->id);
-					else id_lib_extern(&ima->id);
-
-#ifdef USE_SWITCH_ASPECT
-					/* we also need to correct the aspect of uvs */
-					if (scene->toolsettings->uvcalc_flag & UVCALC_NO_ASPECT_CORRECT) {
-						/* do nothing */
-					}
-					else {
-						BMIter liter;
-						BMLoop *l;
-
-						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-							MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-
-							luv->uv[0] *= fprev_aspect;
-							luv->uv[0] /= faspect;
-						}
-					}
-#endif
-				}
-				else {
-					tf->tpage = NULL;
-				}
-
-				update = true;
-			}
-		}
-
-		/* and update depdency graph */
-		if (update) {
-			DAG_id_tag_update(obedit->data, 0);
-		}
-	}
-
-}
-
-/* dotile - 1, set the tile flag (from the space image)
- *          2, set the tile index for the faces. */
-static bool uvedit_set_tile(Object *obedit, Image *ima, int curtile)
-{
-	BMEditMesh *em;
-	BMFace *efa;
-	BMIter iter;
-	MTexPoly *tf;
-	int cd_poly_tex_offset;
-
-	/* verify if we have something to do */
-	if (!ima || !ED_uvedit_test(obedit))
-		return false;
-
-	if ((ima->tpageflag & IMA_TILES) == 0)
-		return false;
-
-	/* skip assigning these procedural images... */
-	if (ima->type == IMA_TYPE_R_RESULT || ima->type == IMA_TYPE_COMPOSITE)
-		return false;
-
-	em = BKE_editmesh_from_object(obedit);
-
-	cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
-
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-		if (BM_elem_flag_test(efa, BM_ELEM_SELECT))
-			tf->tile = curtile;  /* set tile index */
-	}
-
-	DAG_id_tag_update(obedit->data, 0);
-
-	return true;
-}
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -380,14 +248,18 @@ bool uvedit_face_visible_nolocal(Scene *scene, BMFace *efa)
 		return (BM_elem_flag_test(efa, BM_ELEM_HIDDEN) == 0 && BM_elem_flag_test(efa, BM_ELEM_SELECT));
 }
 
-bool uvedit_face_visible_test(Scene *scene, Image *ima, BMFace *efa, MTexPoly *tf)
+bool uvedit_face_visible_test(Scene *scene, Object *obedit, Image *ima, BMFace *efa)
 {
 	ToolSettings *ts = scene->toolsettings;
 
-	if (ts->uv_flag & UV_SHOW_SAME_IMAGE)
-		return (tf->tpage == ima) ? uvedit_face_visible_nolocal(scene, efa) : false;
-	else
+	if (ts->uv_flag & UV_SHOW_SAME_IMAGE) {
+		Image *face_image;
+		ED_object_get_active_image(obedit, efa->mat_nr + 1, &face_image, NULL, NULL, NULL);
+		return (face_image == ima) ? uvedit_face_visible_nolocal(scene, efa) : false;
+	}
+	else {
 		return uvedit_face_visible_nolocal(scene, efa);
+	}
 }
 
 bool uvedit_face_select_test(
@@ -695,38 +567,45 @@ void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float as
 	}
 }
 
-bool ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2])
+bool ED_uvedit_minmax_multi(
+        Scene *scene, Image *ima, Object **objects_edit, uint objects_len,
+        float r_min[2], float r_max[2])
 {
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MTexPoly *tf;
-	MLoopUV *luv;
 	bool changed = false;
+	INIT_MINMAX2(r_min, r_max);
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects_edit[ob_index];
 
-	INIT_MINMAX2(r_min, r_max);
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+		MLoopUV *luv;
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tf))
-			continue;
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				minmax_v2v2_v2(r_min, r_max, luv->uv);
-				changed = true;
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
+				continue;
+
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+					minmax_v2v2_v2(r_min, r_max, luv->uv);
+					changed = true;
+				}
 			}
 		}
 	}
-
 	return changed;
 }
 
+bool ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2])
+{
+	return ED_uvedit_minmax_multi(scene, ima, &obedit, 1, r_min, r_max);
+}
+
 /* Be careful when using this, it bypasses all synchronization options */
 void ED_uvedit_select_all(BMesh *bm)
 {
@@ -745,30 +624,32 @@ void ED_uvedit_select_all(BMesh *bm)
 	}
 }
 
-static bool ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[2])
+static bool ED_uvedit_median_multi(Scene *scene, Image *ima, Object **objects_edit, uint objects_len, float co[2])
 {
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MTexPoly *tf;
-	MLoopUV *luv;
 	unsigned int sel = 0;
+	zero_v2(co);
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects_edit[ob_index];
 
-	zero_v2(co);
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tf))
-			continue;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+		MLoopUV *luv;
 
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-			if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
-				add_v2_v2(co, luv->uv);
-				sel++;
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
+				continue;
+
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+					add_v2_v2(co, luv->uv);
+					sel++;
+				}
 			}
 		}
 	}
@@ -778,19 +659,24 @@ static bool ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[
 	return (sel != 0);
 }
 
-static bool uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2], char mode)
+static bool UNUSED_FUNCTION(ED_uvedit_median)(Scene *scene, Image *ima, Object *obedit, float co[2])
+{
+	return ED_uvedit_median_multi(scene, ima, &obedit, 1, co);
+}
+
+bool ED_uvedit_center_multi(Scene *scene, Image *ima, Object **objects_edit, uint objects_len, float cent[2], char mode)
 {
 	bool changed = false;
 
 	if (mode == V3D_AROUND_CENTER_BOUNDS) {  /* bounding box */
 		float min[2], max[2];
-		if (ED_uvedit_minmax(scene, ima, obedit, min, max)) {
+		if (ED_uvedit_minmax_multi(scene, ima, objects_edit, objects_len, min, max)) {
 			mid_v2_v2v2(cent, min, max);
 			changed = true;
 		}
 	}
 	else {
-		if (ED_uvedit_median(scene, ima, obedit, cent)) {
+		if (ED_uvedit_median_multi(scene, ima, objects_edit, objects_len, cent)) {
 			changed = true;
 		}
 	}
@@ -798,6 +684,11 @@ static bool uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2
 	return changed;
 }
 
+bool ED_uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2], char mode)
+{
+	return ED_uvedit_center_multi(scene, ima, &obedit, 1, cent, mode);
+}
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -805,10 +696,10 @@ static bool uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2
  * \{ */
 
 bool uv_find_nearest_edge(
-        Scene *scene, Image *ima, BMEditMesh *em, const float co[2],
+        Scene *scene, Image *ima, Object *obedit, const float co[2],
         UvNearestHit *hit)
 {
-	MTexPoly *tf;
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
@@ -817,13 +708,11 @@ bool uv_find_nearest_edge(
 	bool found = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
 			continue;
 		}
 		BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
@@ -833,7 +722,6 @@ bool uv_find_nearest_edge(
 			const float dist_test_sq = dist_squared_to_line_segment_v2(co, luv->uv, luv_next->uv);
 
 			if (dist_test_sq < hit->dist_sq) {
-				hit->tf = tf;
 				hit->efa = efa;
 
 				hit->l = l;
@@ -849,19 +737,34 @@ bool uv_find_nearest_edge(
 	return found;
 }
 
+bool uv_find_nearest_edge_multi(
+        Scene *scene, Image *ima, Object **objects, const uint objects_len,
+        const float co[2], UvNearestHit *hit_final)
+{
+	bool found = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		if (uv_find_nearest_edge(scene, ima, obedit, co, hit_final)) {
+			hit_final->ob = obedit;
+			found = true;
+		}
+	}
+	return found;
+}
+
 bool uv_find_nearest_face(
-        Scene *scene, Image *ima, BMEditMesh *em, const float co[2],
+        Scene *scene, Image *ima, Object *obedit, const float co[2],
         UvNearestHit *hit_final)
 {
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	bool found = false;
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	/* this will fill in hit.vert1 and hit.vert2 */
 	float dist_sq_init = hit_final->dist_sq;
 	UvNearestHit hit = *hit_final;
-	if (uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+	if (uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
 		hit.dist_sq = dist_sq_init;
 		hit.l = NULL;
 		hit.luv = hit.luv_next = NULL;
@@ -870,8 +773,7 @@ bool uv_find_nearest_face(
 		BMFace *efa;
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
 				continue;
 			}
 
@@ -893,6 +795,21 @@ bool uv_find_nearest_face(
 	return found;
 }
 
+bool uv_find_nearest_face_multi(
+        Scene *scene, Image *ima, Object **objects, const uint objects_len,
+        const float co[2], UvNearestHit *hit_final)
+{
+	bool found = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		if (uv_find_nearest_face(scene, ima, obedit, co, hit_final)) {
+			hit_final->ob = obedit;
+			found = true;
+		}
+	}
+	return found;
+}
+
 static bool uv_nearest_between(
         const BMLoop *l, const float co[2],
         const int cd_loop_uv_offset)
@@ -906,7 +823,7 @@ static bool uv_nearest_between(
 }
 
 bool uv_find_nearest_vert(
-        Scene *scene, Image *ima, BMEditMesh *em,
+        Scene *scene, Image *ima, Object *obedit,
         float const co[2], const float penalty_dist, UvNearestHit *hit_final)
 {
 	bool found = false;
@@ -914,23 +831,22 @@ bool uv_find_nearest_vert(
 	/* this will fill in hit.vert1 and hit.vert2 */
 	float dist_sq_init = hit_final->dist_sq;
 	UvNearestHit hit = *hit_final;
-	if (uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+	if (uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
 		hit.dist_sq = dist_sq_init;
 
 		hit.l = NULL;
 		hit.luv = hit.luv_next = NULL;
 
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		BMFace *efa;
 		BMIter iter;
 
 		BM_mesh_elem_index_ensure(em->bm, BM_VERT);
 
 		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-		const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
 				continue;
 			}
 
@@ -975,26 +891,38 @@ bool uv_find_nearest_vert(
 	return found;
 }
 
+bool uv_find_nearest_vert_multi(
+        Scene *scene, Image *ima, Object **objects, const uint objects_len,
+        float const co[2], const float penalty_dist, UvNearestHit *hit_final)
+{
+	bool found = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		if (uv_find_nearest_vert(scene, ima, obedit, co, penalty_dist, hit_final)) {
+			hit_final->ob = obedit;
+			found = true;
+		}
+	}
+	return found;
+}
+
 bool ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, const float co[2], float r_uv[2])
 {
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	float mindist, dist;
 	bool found = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	mindist = 1e10f;
 	copy_v2_v2(r_uv, co);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tf))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1103,13 +1031,13 @@ static bool uv_select_edgeloop_edge_tag_faces(BMEditMesh *em, UvMapVert *first1,
 }
 
 static int uv_select_edgeloop(
-        Scene *scene, Image *ima, BMEditMesh *em, UvNearestHit *hit,
+        Scene *scene, Image *ima, Object *obedit, UvNearestHit *hit,
         const float limit[2], const bool extend)
 {
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMIter iter, liter;
 	BMLoop *l;
-	MTexPoly *tf;
 	UvVertMap *vmap;
 	UvMapVert *iterv_curr;
 	UvMapVert *iterv_next;
@@ -1117,7 +1045,6 @@ static int uv_select_edgeloop(
 	bool looking, select;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	/* setup */
 	BM_mesh_elem_table_ensure(em->bm, BM_FACE);
@@ -1126,7 +1053,7 @@ static int uv_select_edgeloop(
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT | BM_FACE);
 
 	if (!extend) {
-		uv_select_all_perform(scene, ima, em, SEL_DESELECT);
+		uv_select_all_perform(scene, ima, obedit, SEL_DESELECT);
 	}
 
 	BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
@@ -1150,9 +1077,7 @@ static int uv_select_edgeloop(
 		/* find correct valence edges which are not tagged yet, but connect to tagged one */
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (!BM_elem_flag_test(efa, BM_ELEM_TAG) && uvedit_face_visible_test(scene, ima, efa, tf)) {
+			if (!BM_elem_flag_test(efa, BM_ELEM_TAG) && uvedit_face_visible_test(scene, obedit, ima, efa)) {
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 					/* check face not hidden and not tagged */
 					if (!(iterv_curr = uv_select_edgeloop_vertex_map_get(vmap, efa, l)))
@@ -1211,190 +1136,193 @@ static int uv_select_edgeloop(
 /** \name Select Linked
  * \{ */
 
-static void uv_select_linked(
-        Scene *scene, Image *ima, BMEditMesh *em, const float limit[2], UvNearestHit *hit_final,
-        bool extend, bool deselect, bool toggle, bool select_faces)
+static void uv_select_linked_multi(
+        Scene *scene, Image *ima, Object **objects, const uint objects_len, const float limit[2],
+        UvNearestHit *hit_final, bool extend, bool deselect, bool toggle, bool select_faces)
 {
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MLoopUV *luv;
-	UvVertMap *vmap;
-	UvMapVert *vlist, *iterv, *startv;
-	int i, stacksize = 0, *stack;
-	unsigned int a;
-	char *flag;
+	/* loop over objects, or just use hit_final->ob */
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		if (hit_final && ob_index != 0) {
+			break;
+		}
+		Object *obedit = hit_final ? hit_final->ob : objects[ob_index];
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+		MLoopUV *luv;
+		UvVertMap *vmap;
+		UvMapVert *vlist, *iterv, *startv;
+		int i, stacksize = 0, *stack;
+		unsigned int a;
+		char *flag;
 
-	BM_mesh_elem_table_ensure(em->bm, BM_FACE); /* we can use this too */
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-	/* Note, we had 'use winding' so we don't consider overlapping islands as connected, see T44320
-	 * this made *every* projection split the island into front/back islands.
-	 * Keep 'use_winding' to false, see: T50970.
-	 *
-	 * Better solve this by having a delimit option for select-linked operator,
-	 * keeping island-select working as is. */
-	vmap = BM_uv_vert_map_create(em->bm, limit, !select_faces, false);
+		BM_mesh_elem_table_ensure(em->bm, BM_FACE); /* we can use this too */
 
-	if (vmap == NULL)
-		return;
+		/* Note, we had 'use winding' so we don't consider overlapping islands as connected, see T44320
+		 * this made *every* projection split the island into front/back islands.
+		 * Keep 'use_winding' to false, see: T50970.
+		 *
+		 * Better solve this by having a delimit option for select-linked operator,
+		 * keeping island-select working as is. */
+		vmap = BM_uv_vert_map_create(em->bm, limit, !select_faces, false);
 
-	stack = MEM_mallocN(sizeof(*stack) * (em->bm->totface + 1), "UvLinkStack");
-	flag = MEM_callocN(sizeof(*flag) * em->bm->totface, "UvLinkFlag");
+		if (vmap == NULL)
+			return;
 
-	if (hit_final == NULL) {
-		/* Use existing selection */
-		BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
-			MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
+		stack = MEM_mallocN(sizeof(*stack) * (em->bm->totface + 1), "UvLinkStack");
+		flag = MEM_callocN(sizeof(*flag) * em->bm->totface, "UvLinkFlag");
 
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
-				if (select_faces) {
-					if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
-						stack[stacksize] = a;
-						stacksize++;
-						flag[a] = 1;
-					}
-				}
-				else {
-					BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-						luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-
-						if (luv->flag & MLOOPUV_VERTSEL) {
+		if (hit_final == NULL) {
+			/* Use existing selection */
+			BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
+				if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
+					if (select_faces) {
+						if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 							stack[stacksize] = a;
 							stacksize++;
 							flag[a] = 1;
+						}
+					}
+					else {
+						BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+							luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-							break;
+							if (luv->flag & MLOOPUV_VERTSEL) {
+								stack[stacksize] = a;
+								stacksize++;
+								flag[a] = 1;
+
+								break;
+							}
 						}
 					}
 				}
 			}
 		}
-	}
-	else {
-		BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
-			if (efa == hit_final->efa) {
-				stack[stacksize] = a;
-				stacksize++;
-				flag[a] = 1;
-				break;
+		else {
+			BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
+				if (efa == hit_final->efa) {
+					stack[stacksize] = a;
+					stacksize++;
+					flag[a] = 1;
+					break;
+				}
 			}
 		}
-	}
 
-	while (stacksize > 0) {
+		while (stacksize > 0) {
 
-		stacksize--;
-		a = stack[stacksize];
+			stacksize--;
+			a = stack[stacksize];
 
-		efa = BM_face_at_index(em->bm, a);
+			efa = BM_face_at_index(em->bm, a);
 
-		BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
+			BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 
-			/* make_uv_vert_map_EM sets verts tmp.l to the indices */
-			vlist = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
+				/* make_uv_vert_map_EM sets verts tmp.l to the indices */
+				vlist = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 
-			startv = vlist;
+				startv = vlist;
 
-			for (iterv = vlist; iterv; iterv = iterv->next) {
-				if (iterv->separate)
-					startv = iterv;
-				if (iterv->f == a)
-					break;
-			}
+				for (iterv = vlist; iterv; iterv = iterv->next) {
+					if (iterv->separate)
+						startv = iterv;
+					if (iterv->f == a)
+						break;
+				}
 
-			for (iterv = startv; iterv; iterv = iterv->next) {
-				if ((startv != iterv) && (iterv->separate))
-					break;
-				else if (!flag[iterv->f]) {
-					flag[iterv->f] = 1;
-					stack[stacksize] = iterv->f;
-					stacksize++;
+				for (iterv = startv; iterv; iterv = iterv->next) {
+					if ((startv != iterv) && (iterv->separate))
+						break;
+					else if (!flag[iterv->f]) {
+						flag[iterv->f] = 1;
+						stack[stacksize] = iterv->f;
+						stacksize++;
+					}
 				}
 			}
 		}
-	}
-
-	/* Toggling - if any of the linked vertices is selected (and visible), we deselect. */
-	if ((toggle == true) && (extend == false) && (deselect == false)) {
-		BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
-			bool found_selected = false;
-			if (!flag[a]) {
-				continue;
-			}
 
-			if (select_faces) {
-				if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-					found_selected = true;
+		/* Toggling - if any of the linked vertices is selected (and visible), we deselect. */
+		if ((toggle == true) && (extend == false) && (deselect == false)) {
+			BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
+				bool found_selected = false;
+				if (!flag[a]) {
+					continue;
 				}
-			}
-			else {
-				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-					if (luv->flag & MLOOPUV_VERTSEL) {
+				if (select_faces) {
+					if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
 						found_selected = true;
 					}
 				}
+				else {
+					BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+						luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-				if (found_selected) {
-					deselect = true;
-					break;
+						if (luv->flag & MLOOPUV_VERTSEL) {
+							found_selected = true;
+						}
+					}
+
+					if (found_selected) {
+						deselect = true;
+						break;
+					}
 				}
 			}
 		}
-	}
 
 #define SET_SELECTION(value) \
-	if (select_faces) { \
-		BM_face_select_set(em->bm, efa, value); \
-	} \
-	else { \
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { \
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); \
-			luv->flag = (value) ? (luv->flag | MLOOPUV_VERTSEL) : (luv->flag & ~MLOOPUV_VERTSEL); \
+		if (select_faces) { \
+			BM_face_select_set(em->bm, efa, value); \
 		} \
-	} (void)0
+		else { \
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { \
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); \
+				luv->flag = (value) ? (luv->flag | MLOOPUV_VERTSEL) : (luv->flag & ~MLOOPUV_VERTSEL); \
+			} \
+		} (void)0
 
-	BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
-		if (!flag[a]) {
-			if (!extend && !deselect && !toggle) {
-				SET_SELECTION(false);
+		BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
+			if (!flag[a]) {
+				if (!extend && !deselect && !toggle) {
+					SET_SELECTION(false);
+				}
+				continue;
 			}
-			continue;
-		}
 
-		if (!deselect) {
-			SET_SELECTION(true);
-		}
-		else {
-			SET_SELECTION(false);
+			if (!deselect) {
+				SET_SELECTION(true);
+			}
+			else {
+				SET_SELECTION(false);
+			}
 		}
-	}
 
 #undef SET_SELECTION
 
-	MEM_freeN(stack);
-	MEM_freeN(flag);
-	BM_uv_vert_map_free(vmap);
+		MEM_freeN(stack);
+		MEM_freeN(flag);
+		BM_uv_vert_map_free(vmap);
+	}
 }
 
 /* WATCH IT: this returns first selected UV,
  * not ideal in many cases since there could be multiple */
-static float *uv_sel_co_from_eve(Scene *scene, Image *ima, BMEditMesh *em, BMVert *eve)
+static float *uv_sel_co_from_eve(Scene *scene, Object *obedit, Image *ima, BMEditMesh *em, BMVert *eve)
 {
 	BMIter liter;
 	BMLoop *l;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_ELEM (l, &liter, eve, BM_LOOPS_OF_VERT) {
-		MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(l->f, cd_poly_tex_offset);
-
-		if (!uvedit_face_visible_test(scene, ima, l->f, tf))
+		if (!uvedit_face_visible_test(scene, obedit, ima, l->f))
 			continue;
 
 		if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
@@ -1426,7 +1354,6 @@ static int uv_select_more_less(bContext *C, const bool select)
 	ToolSettings *ts = scene->toolsettings;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
 		if (select) {
@@ -1447,9 +1374,7 @@ static int uv_select_more_less(bContext *C, const bool select)
 
 		/* mark loops to be selected */
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
+			if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
 
 #define IS_SEL   1
 #define IS_UNSEL 2
@@ -1492,9 +1417,7 @@ static int uv_select_more_less(bContext *C, const bool select)
 
 		/* mark loops to be selected */
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
+			if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 
 					MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
@@ -1565,11 +1488,9 @@ static void uv_weld_align(bContext *C, int tool)
 	SpaceImage *sima;
 	Scene *scene;
 	Image *ima;
-	MTexPoly *tf;
 	float cent[2], min[2], max[2];
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	scene = CTX_data_scene(C);
 	ima = CTX_data_edit_image(C);
@@ -1583,9 +1504,7 @@ static void uv_weld_align(bContext *C, int tool)
 		BMLoop *l;
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1599,7 +1518,7 @@ static void uv_weld_align(bContext *C, int tool)
 		tool = (max[0] - min[0] >= max[1] - min[1]) ? 'y' : 'x';
 	}
 
-	uvedit_center(scene, ima, obedit, cent, 0);
+	ED_uvedit_center(scene, ima, obedit, cent, 0);
 
 	if (tool == 'x' || tool == 'w') {
 		BMIter iter, liter;
@@ -1607,8 +1526,7 @@ static void uv_weld_align(bContext *C, int tool)
 		BMLoop *l;
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1627,8 +1545,7 @@ static void uv_weld_align(bContext *C, int tool)
 		BMLoop *l;
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1654,9 +1571,7 @@ static void uv_weld_align(bContext *C, int tool)
 		/* tag verts with a selected UV */
 		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
 			BM_ITER_ELEM (l, &liter, eve, BM_LOOPS_OF_VERT) {
-				tf = BM_ELEM_CD_GET_VOID_P(l->f, cd_poly_tex_offset);
-
-				if (!uvedit_face_visible_test(scene, ima, l->f, tf))
+				if (!uvedit_face_visible_test(scene, obedit, ima, l->f))
 					continue;
 
 				if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
@@ -1725,8 +1640,10 @@ static void uv_weld_align(bContext *C, int tool)
 			if (BLI_array_len(eve_line) > 2) {
 
 				/* we know the returns from these must be valid */
-				const float *uv_start = uv_sel_co_from_eve(scene, ima, em, eve_line[0]);
-				const float *uv_end   = uv_sel_co_from_eve(scene, ima, em, eve_line[BLI_array_len(eve_line) - 1]);
+				const float *uv_start = uv_sel_co_from_eve(
+				        scene, obedit, ima, em, eve_line[0]);
+				const float *uv_end   = uv_sel_co_from_eve(
+				        scene, obedit, ima, em, eve_line[BLI_array_len(eve_line) - 1]);
 				/* For t & u modes */
 				float a = 0.0f;
 
@@ -1746,9 +1663,7 @@ static void uv_weld_align(bContext *C, int tool)
 				/* go over all verts except for endpoints */
 				for (i = 0; i < BLI_array_len(eve_line); i++) {
 					BM_ITER_ELEM (l, &liter, eve_line[i], BM_LOOPS_OF_VERT) {
-						tf = BM_ELEM_CD_GET_VOID_P(l->f, cd_poly_tex_offset);
-
-						if (!uvedit_face_visible_test(scene, ima, l->f, tf))
+						if (!uvedit_face_visible_test(scene, obedit, ima, l->f))
 							continue;
 
 						if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
@@ -1782,7 +1697,7 @@ static void uv_weld_align(bContext *C, int tool)
 
 
 	uvedit_live_unwrap_update(sima, scene, obedit);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 }
 
@@ -1839,7 +1754,6 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	Image *ima;
-	MTexPoly *tf;
 	int uv_a_index;
 	int uv_b_index;
 	float *uv_a;
@@ -1850,7 +1764,6 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
 	BMLoop *l;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	sima = CTX_wm_space_image(C);
 	scene = CTX_data_scene(C);
@@ -1864,8 +1777,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
 
 		/* TODO, use kd-tree as with MESH_OT_remove_doubles, this isn't optimal */
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1927,8 +1839,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
 		BLI_array_declare(loop_arr_unselected);
 
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -1965,7 +1876,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
 	}
 
 	uvedit_live_unwrap_update(sima, scene, obedit);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -2020,20 +1931,65 @@ static void UV_OT_weld(wmOperatorType *ot)
 /** \name (De)Select All Operator
  * \{ */
 
-static void uv_select_all_perform(Scene *scene, Image *ima, BMEditMesh *em, int action)
+
+static bool uv_select_is_any_selected(Scene *scene, Image *ima, Object *obedit)
+{
+	ToolSettings *ts = scene->toolsettings;
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	BMFace *efa;
+	BMLoop *l;
+	BMIter iter, liter;
+	MLoopUV *luv;
+
+	if (ts->uv_flag & UV_SYNC_SELECTION) {
+		return (em->bm->totvertsel || em->bm->totedgesel || em->bm->totfacesel);
+	}
+	else {
+		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
+				continue;
+			}
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+				if (luv->flag & MLOOPUV_VERTSEL) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+static bool uv_select_is_any_selected_multi(Scene *scene, Image *ima, Object **objects, const uint objects_len)
+{
+	bool found = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		if (uv_select_is_any_selected(scene, ima, obedit)) {
+			found = true;
+			break;
+		}
+	}
+	return found;
+}
+
+static void uv_select_all_perform(Scene *scene, Image *ima, Object *obedit, int action)
 {
 	ToolSettings *ts = scene->toolsettings;
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
-	if (ts->uv_flag & UV_SYNC_SELECTION) {
+	if (action == SEL_TOGGLE) {
+		action = uv_select_is_any_selected(scene, ima, obedit) ? SEL_DESELECT : SEL_SELECT;
+	}
 
+	if (ts->uv_flag & UV_SYNC_SELECTION) {
 		switch (action) {
 			case SEL_TOGGLE:
 				EDBM_select_toggle_all(em);
@@ -2051,30 +2007,8 @@ static void uv_select_all_perform(Scene *scene, Image *ima, BMEditMesh *em, int
 		}
 	}
 	else {
-		if (action == SEL_TOGGLE) {
-			action = SEL_SELECT;
-			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-				if (!uvedit_face_visible_test(scene, ima, efa, tf))
-					continue;
-
-				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-
-					if (luv->flag & MLOOPUV_VERTSEL) {
-						action = SEL_DESELECT;
-						break;
-					}
-				}
-			}
-		}
-
-
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
+			if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 				continue;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -2096,18 +2030,38 @@ static void uv_select_all_perform(Scene *scene, Image *ima, BMEditMesh *em, int
 	}
 }
 
+static void uv_select_all_perform_multi(
+        Scene *scene, Image *ima, Object **objects, const uint objects_len, int action)
+{
+	if (action == SEL_TOGGLE) {
+		action = uv_select_is_any_selected_multi(scene, ima, objects, objects_len) ? SEL_DESELECT : SEL_SELECT;
+	}
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		uv_select_all_perform(scene, ima, obedit, action);
+	}
+}
+
 static int uv_select_all_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
 	Image *ima = CTX_data_edit_image(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	int action = RNA_enum_get(op->ptr, "action");
 
-	uv_select_all_perform(scene, ima, em, action);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	uv_select_all_perform_multi(scene, ima, objects, objects_len, action);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -2156,18 +2110,17 @@ static bool uv_sticky_select(float *limit, int hitv[], int v, float *hituv[], fl
 	return false;
 }
 
-static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loop)
+static int uv_mouse_select_multi(
+        bContext *C, Object **objects, uint objects_len,
+        const float co[2], bool extend, bool loop)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
-	Object *obedit = CTX_data_edit_object(C);
 	Image *ima = CTX_data_edit_image(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	UvNearestHit hit = UV_NEAREST_HIT_INIT;
 	int i, selectmode, sticky, sync, *hitv = NULL;
@@ -2175,9 +2128,6 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	int flush = 0, hitlen = 0; /* 0 == don't flush, 1 == sel, -1 == desel;  only use when selection sync is enabled */
 	float limit[2], **hituv = NULL;
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
-
 	/* notice 'limit' is the same no matter the zoom level, since this is like
 	 * remove doubles and could annoying if it joined points when zoomed out.
 	 * 'penalty' is in screen pixel space otherwise zooming in on a uv-vert and
@@ -2214,7 +2164,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	/* find nearest element */
 	if (loop) {
 		/* find edge */
-		if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+		if (!uv_find_nearest_edge_multi(scene, ima, objects, objects_len, co, &hit)) {
 			return OPERATOR_CANCELLED;
 		}
 
@@ -2222,7 +2172,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	}
 	else if (selectmode == UV_SELECT_VERTEX) {
 		/* find vertex */
-		if (!uv_find_nearest_vert(scene, ima, em, co, penalty_dist, &hit)) {
+		if (!uv_find_nearest_vert_multi(scene, ima, objects, objects_len, co, penalty_dist, &hit)) {
 			return OPERATOR_CANCELLED;
 		}
 
@@ -2238,7 +2188,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	}
 	else if (selectmode == UV_SELECT_EDGE) {
 		/* find edge */
-		if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+		if (!uv_find_nearest_edge_multi(scene, ima, objects, objects_len, co, &hit)) {
 			return OPERATOR_CANCELLED;
 		}
 
@@ -2256,10 +2206,13 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	}
 	else if (selectmode == UV_SELECT_FACE) {
 		/* find face */
-		if (!uv_find_nearest_face(scene, ima, em, co, &hit)) {
+		if (!uv_find_nearest_face_multi(scene, ima, objects, objects_len, co, &hit)) {
 			return OPERATOR_CANCELLED;
 		}
 
+		BMEditMesh *em = BKE_editmesh_from_object(hit.ob);
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
 		/* make active */
 		BM_mesh_active_face_set(em->bm, hit.efa);
 
@@ -2276,7 +2229,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 		hitlen = hit.efa->len;
 	}
 	else if (selectmode == UV_SELECT_ISLAND) {
-		if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+		if (!uv_find_nearest_edge_multi(scene, ima, objects, objects_len, co, &hit)) {
 			return OPERATOR_CANCELLED;
 		}
 
@@ -2287,13 +2240,25 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 		return OPERATOR_CANCELLED;
 	}
 
+	Object *obedit = hit.ob;
+	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
 	/* do selection */
 	if (loop) {
-		flush = uv_select_edgeloop(scene, ima, em, &hit, limit, extend);
+		if (!extend) {
+			/* TODO(MULTI_EDIT): We only need to de-select non-active */
+			uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
+		}
+		flush = uv_select_edgeloop(scene, ima, obedit, &hit, limit, extend);
 	}
 	else if (selectmode == UV_SELECT_ISLAND) {
+		if (!extend) {
+			/* TODO(MULTI_EDIT): We only need to de-select non-active */
+			uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
+		}
 		/* Current behavior of 'extend' is actually toggling, so pass extend flag as 'toggle' here */
-		uv_select_linked(scene, ima, em, limit, &hit, false, false, extend, false);
+		uv_select_linked_multi(scene, ima, objects, objects_len, limit, &hit, false, false, extend, false);
 	}
 	else if (extend) {
 		if (selectmode == UV_SELECT_VERTEX) {
@@ -2328,8 +2293,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 			BM_mesh_elem_index_ensure(em->bm, BM_VERT);
 
 			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-				if (!uvedit_face_visible_test(scene, ima, efa, tf))
+				if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 					continue;
 
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -2344,7 +2308,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 	}
 	else {
 		/* deselect all */
-		uv_select_all_perform(scene, ima, em, SEL_DESELECT);
+		uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
 
 		if (selectmode == UV_SELECT_VERTEX) {
 			/* select vertex */
@@ -2364,8 +2328,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 		/* select sticky uvs */
 		if (sticky != SI_STICKY_DISABLE) {
 			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-				tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-				if (!uvedit_face_visible_test(scene, ima, efa, tf))
+				if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 					continue;
 
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -2408,11 +2371,20 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
 #endif
 	}
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
 	return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED;
 }
+static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loop)
+{
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
+	int ret = uv_mouse_select_multi(C, objects, objects_len, co, extend, loop);
+	MEM_freeN(objects);
+	return ret;
+}
 
 static int uv_select_exec(bContext *C, wmOperator *op)
 {
@@ -2517,9 +2489,8 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
-	Object *obedit = CTX_data_edit_object(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Image *ima = CTX_data_edit_image(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	float limit[2];
 	int extend, deselect;
 	bool select_faces = (ts->uv_flag & UV_SYNC_SELECTION) && (ts->selectmode & SCE_SELECT_FACE);
@@ -2535,6 +2506,9 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent
 	deselect = RNA_boolean_get(op->ptr, "deselect");
 	uvedit_pixel_to_float(sima, limit, 0.05f);
 
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
+
 	if (pick) {
 		float co[2];
 
@@ -2550,15 +2524,34 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent
 			RNA_float_get_array(op->ptr, "location", co);
 		}
 
-		if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
+		if (!uv_find_nearest_edge_multi(scene, ima, objects, objects_len, co, &hit)) {
+			MEM_freeN(objects);
 			return OPERATOR_CANCELLED;
 		}
 	}
 
-	uv_select_linked(scene, ima, em, limit, pick ? &hit : NULL, extend, deselect, false, select_faces);
+	if (!extend) {
+		uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
+	}
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	uv_select_linked_multi(
+	        scene, ima, objects, objects_len, limit, pick ? &hit : NULL,
+	        extend, deselect, false, select_faces);
+
+	/* weak!, but works */
+	Object **objects_free = objects;
+	if (pick) {
+		objects = &hit.ob;
+		objects_len = 1;
+	}
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
+
+	MEM_SAFE_FREE(objects_free);
 
 	return OPERATOR_FINISHED;
 }
@@ -2632,12 +2625,10 @@ static int uv_select_split_exec(bContext *C, wmOperator *op)
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	bool changed = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, CD_MTEXPOLY);
 
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
 		BKE_report(op->reports, RPT_ERROR, "Cannot split selection when sync selection is enabled");
@@ -2649,9 +2640,8 @@ static int uv_select_split_exec(bContext *C, wmOperator *op)
 	BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 		bool is_sel = false;
 		bool is_unsel = false;
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 
-		if (!uvedit_face_visible_test(scene, ima, efa, tf))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		/* are we all selected? */
@@ -2796,7 +2786,6 @@ static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	/* MTexPoly *tf; */
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
 	if ((ts->uv_flag & UV_SYNC_SELECTION) == 0 && sima->sticky == SI_STICKY_VERTEX) {
@@ -2882,7 +2871,6 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	/* MTexPoly *tf; */
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
@@ -2960,25 +2948,20 @@ static int uv_border_select_exec(bContext *C, wmOperator *op)
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
-	Object *obedit = CTX_data_edit_object(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Image *ima = CTX_data_edit_image(C);
 	ARegion *ar = CTX_wm_region(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	rctf rectf;
-	bool changed, pinned, select, extend;
+	bool pinned, select, extend;
 	const bool use_face_center = (
 	        (ts->uv_flag & UV_SYNC_SELECTION) ?
 	        (ts->selectmode == SCE_SELECT_FACE) :
 	        (ts->uv_selectmode == UV_SELECT_FACE));
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
-
 	/* get rectangle from operator */
 	WM_operator_properties_border_to_rctf(op, &rectf);
 	UI_view2d_region_to_view_rctf(&ar->v2d, &rectf, &rectf);
@@ -2988,80 +2971,95 @@ static int uv_border_select_exec(bContext *C, wmOperator *op)
 	extend = RNA_boolean_get(op->ptr, "extend");
 	pinned = RNA_boolean_get(op->ptr, "pinned");
 
-	if (!extend)
-		uv_select_all_perform(scene, ima, em, SEL_DESELECT);
+	bool changed_multi = false;
 
-	/* do actual selection */
-	if (use_face_center && !pinned) {
-		/* handle face selection mode */
-		float cent[2];
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
 
-		changed = false;
+	/* don't indent to avoid diff noise! */
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			/* assume not touched */
-			BM_elem_flag_disable(efa, BM_ELEM_TAG);
+		bool changed = false;
 
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
-				uv_poly_center(efa, cent, cd_loop_uv_offset);
-				if (BLI_rctf_isect_pt_v(&rectf, cent)) {
-					BM_elem_flag_enable(efa, BM_ELEM_TAG);
-					changed = true;
+		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
+		if (!extend)
+			uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
+
+		/* do actual selection */
+		if (use_face_center && !pinned) {
+			/* handle face selection mode */
+			float cent[2];
+
+			changed = false;
+
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				/* assume not touched */
+				BM_elem_flag_disable(efa, BM_ELEM_TAG);
+
+				if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
+					uv_poly_center(efa, cent, cd_loop_uv_offset);
+					if (BLI_rctf_isect_pt_v(&rectf, cent)) {
+						BM_elem_flag_enable(efa, BM_ELEM_TAG);
+						changed = true;
+					}
 				}
 			}
-		}
 
-		/* (de)selects all tagged faces and deals with sticky modes */
-		if (changed) {
-			uv_select_flush_from_tag_face(sima, scene, obedit, select);
+			/* (de)selects all tagged faces and deals with sticky modes */
+			if (changed) {
+				uv_select_flush_from_tag_face(sima, scene, obedit, select);
+			}
 		}
-	}
-	else {
-		/* other selection modes */
-		changed = true;
-		BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT, BM_ELEM_TAG, false);
+		else {
+			/* other selection modes */
+			changed = true;
+			BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT, BM_ELEM_TAG, false);
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (!uvedit_face_visible_test(scene, ima, efa, tf))
-				continue;
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!uvedit_face_visible_test(scene, obedit, ima, efa))
+					continue;
+				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-				if (!pinned || (ts->uv_flag & UV_SYNC_SELECTION)) {
+					if (!pinned || (ts->uv_flag & UV_SYNC_SELECTION)) {
 
-					/* UV_SYNC_SELECTION - can't do pinned selection */
-					if (BLI_rctf_isect_pt_v(&rectf, luv->uv)) {
-						uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
-						BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+						/* UV_SYNC_SELECTION - can't do pinned selection */
+						if (BLI_rctf_isect_pt_v(&rectf, luv->uv)) {
+							uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
+							BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+						}
 					}
-				}
-				else if (pinned) {
-					if ((luv->flag & MLOOPUV_PINNED) && BLI_rctf_isect_pt_v(&rectf, luv->uv)) {
-						uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
-						BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+					else if (pinned) {
+						if ((luv->flag & MLOOPUV_PINNED) && BLI_rctf_isect_pt_v(&rectf, luv->uv)) {
+							uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
+							BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+						}
 					}
 				}
 			}
-		}
 
-		if (sima->sticky == SI_STICKY_VERTEX) {
-			uvedit_vertex_select_tagged(em, scene, select, cd_loop_uv_offset);
+			if (sima->sticky == SI_STICKY_VERTEX) {
+				uvedit_vertex_select_tagged(em, scene, select, cd_loop_uv_offset);
+			}
 		}
-	}
 
-	if (changed) {
-		uv_select_sync_flush(ts, em, select);
+		if (changed) {
+			changed_multi = true;
 
-		if (ts->uv_flag & UV_SYNC_SELECTION) {
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
-		}
+			uv_select_sync_flush(ts, em, select);
 
-		return OPERATOR_FINISHED;
+			if (ts->uv_flag & UV_SYNC_SELECTION) {
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+			}
+		}
 	}
 
-	return OPERATOR_CANCELLED;
+	MEM_freeN(objects);
+
+	return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 static void UV_OT_select_border(wmOperatorType *ot)
@@ -3216,102 +3214,112 @@ static void UV_OT_circle_select(wmOperatorType *ot)
 /** \name Lasso Select Operator
  * \{ */
 
-static bool do_lasso_select_mesh_uv(
-        bContext *C, const int mcords[][2], short moves,
-        const bool select, const bool extend)
+static bool do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short moves,
+                                    const bool select, const bool extend)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Image *ima = CTX_data_edit_image(C);
 	ARegion *ar = CTX_wm_region(C);
-	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	const bool use_face_center = (
 	        (ts->uv_flag & UV_SYNC_SELECTION) ?
 	        (ts->selectmode == SCE_SELECT_FACE) :
 	        (ts->uv_selectmode == UV_SELECT_FACE));
 
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BMIter iter, liter;
 
 	BMFace *efa;
 	BMLoop *l;
-	MTexPoly *tf;
 	int screen_uv[2];
-	bool changed = false;
+	bool changed_multi = false;
 	rcti rect;
 
 	BLI_lasso_boundbox(&rect, mcords, moves);
 
-	if (!extend && select) {
-		uv_select_all_perform(scene, ima, em, SEL_DESELECT);
-	}
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
 
-	if (use_face_center) { /* Face Center Sel */
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			BM_elem_flag_disable(efa, BM_ELEM_TAG);
-			/* assume not touched */
-			if (select != uvedit_face_select_test(scene, efa, cd_loop_uv_offset)) {
-				float cent[2];
-				uv_poly_center(efa, cent, cd_loop_uv_offset);
+	/* don't indent to avoid diff noise! */
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
 
-				if (UI_view2d_view_to_region_clip(&ar->v2d, cent[0], cent[1], &screen_uv[0], &screen_uv[1]) &&
-				    BLI_rcti_isect_pt_v(&rect, screen_uv) &&
-				    BLI_lasso_is_point_inside(mcords, moves, screen_uv[0], screen_uv[1], V2D_IS_CLIPPED))
-				{
-					BM_elem_flag_enable(efa, BM_ELEM_TAG);
-					changed = true;
+		bool changed = false;
+
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+
+		if (!extend && select) {
+			uv_select_all_perform_multi(scene, ima, objects, objects_len, SEL_DESELECT);
+		}
+
+		if (use_face_center) { /* Face Center Sel */
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				BM_elem_flag_disable(efa, BM_ELEM_TAG);
+				/* assume not touched */
+				if (select != uvedit_face_select_test(scene, efa, cd_loop_uv_offset)) {
+					float cent[2];
+					uv_poly_center(efa, cent, cd_loop_uv_offset);
+
+					if (UI_view2d_view_to_region_clip(&ar->v2d, cent[0], cent[1], &screen_uv[0], &screen_uv[1]) &&
+					    BLI_rcti_isect_pt_v(&rect, screen_uv) &&
+					    BLI_lasso_is_point_inside(mcords, moves, screen_uv[0], screen_uv[1], V2D_IS_CLIPPED))
+					{
+						BM_elem_flag_enable(efa, BM_ELEM_TAG);
+						changed = true;
+					}
 				}
 			}
-		}
 
-		/* (de)selects all tagged faces and deals with sticky modes */
-		if (changed) {
-			uv_select_flush_from_tag_face(sima, scene, obedit, select);
+			/* (de)selects all tagged faces and deals with sticky modes */
+			if (changed) {
+				uv_select_flush_from_tag_face(sima, scene, obedit, select);
+			}
 		}
-	}
-	else { /* Vert Sel */
-		BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT, BM_ELEM_TAG, false);
+		else { /* Vert Sel */
+			BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT, BM_ELEM_TAG, false);
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-			if (uvedit_face_visible_test(scene, ima, efa, tf)) {
-				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-					if ((select) != (uvedit_uv_select_test(scene, l, cd_loop_uv_offset))) {
-						MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-						if (UI_view2d_view_to_region_clip(
-						            &ar->v2d,
-						            luv->uv[0], luv->uv[1],
-						            &screen_uv[0], &screen_uv[1]) &&
-						    BLI_rcti_isect_pt_v(&rect, screen_uv) &&
-						    BLI_lasso_is_point_inside(mcords, moves, screen_uv[0], screen_uv[1], V2D_IS_CLIPPED))
-						{
-							uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
-							changed = true;
-							BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
+					BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+						if ((select) != (uvedit_uv_select_test(scene, l, cd_loop_uv_offset))) {
+							MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+							if (UI_view2d_view_to_region_clip(
+							            &ar->v2d,
+							            luv->uv[0], luv->uv[1],
+							            &screen_uv[0], &screen_uv[1]) &&
+							    BLI_rcti_isect_pt_v(&rect, screen_uv) &&
+							    BLI_lasso_is_point_inside(mcords, moves, screen_uv[0], screen_uv[1], V2D_IS_CLIPPED))
+							{
+								uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
+								changed = true;
+								BM_elem_flag_enable(l->v, BM_ELEM_TAG);
+							}
 						}
 					}
 				}
 			}
-		}
 
-		if (sima->sticky == SI_STICKY_VERTEX) {
-			uvedit_vertex_select_tagged(em, scene, select, cd_loop_uv_offset);
+			if (sima->sticky == SI_STICKY_VERTEX) {
+				uvedit_vertex_select_tagged(em, scene, select, cd_loop_uv_offset);
+			}
 		}
-	}
 
-	if (changed) {
-		uv_select_sync_flush(scene->toolsettings, em, select);
+		if (changed) {
+			changed_multi = true;
 
-		if (ts->uv_flag & UV_SYNC_SELECTION) {
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+			uv_select_sync_flush(scene->toolsettings, em, select);
+
+			if (ts->uv_flag & UV_SYNC_SELECTION) {
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+			}
 		}
 	}
 
-	return changed;
+	return changed_multi;
 }
 
 static int uv_lasso_select_exec(bContext *C, wmOperator *op)
@@ -3374,17 +3382,16 @@ static void uv_snap_cursor_to_pixels(SpaceImage *sima)
 	uv_snap_to_pixel(sima->cursor, width, height);
 }
 
-static bool uv_snap_cursor_to_selection(Scene *scene, Image *ima, Object *obedit, SpaceImage *sima)
+static bool uv_snap_cursor_to_selection(
+        Scene *scene, Image *ima, Object **objects_edit, uint objects_len, SpaceImage *sima)
 {
-	return uvedit_center(scene, ima, obedit, sima->cursor, sima->around);
+	return ED_uvedit_center_multi(scene, ima, objects_edit, objects_len, sima->cursor, sima->around);
 }
 
 static int uv_snap_cursor_exec(bContext *C, wmOperator *op)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	Image *ima = CTX_data_edit_image(C);
+
 	bool changed = false;
 
 	switch (RNA_enum_get(op->ptr, "target")) {
@@ -3393,8 +3400,18 @@ static int uv_snap_cursor_exec(bContext *C, wmOperator *op)
 			changed = true;
 			break;
 		case 1:
-			changed = uv_snap_cursor_to_selection(scene, ima, obedit, sima);
+		{
+			Scene *scene = CTX_data_scene(C);
+			Image *ima = CTX_data_edit_image(C);
+			ViewLayer *view_layer = CTX_data_view_layer(C);
+
+			uint objects_len = 0;
+			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
+			        view_layer, &objects_len);
+			changed = uv_snap_cursor_to_selection(scene, ima, objects, objects_len, sima);
+			MEM_freeN(objects);
 			break;
+		}
 	}
 
 	if (!changed)
@@ -3438,16 +3455,13 @@ static bool uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, cons
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tface;
 	MLoopUV *luv;
 	bool changed = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tface = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tface))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -3468,16 +3482,13 @@ static bool uv_snap_uvs_offset(Scene *scene, Image *ima, Object *obedit, const f
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *mtexpoly;
 	MLoopUV *luv;
 	bool changed = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		mtexpoly = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, mtexpoly))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -3499,17 +3510,14 @@ static bool uv_snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object
 	BMFace *f;
 	BMLoop *l, *lsub;
 	BMIter iter, liter, lsubiter;
-	MTexPoly *tface;
 	MLoopUV *luv;
 	bool changed = false;
 	const int cd_loop_uv_offset  = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, CD_MTEXPOLY);
 
 	/* index every vert that has a selected UV using it, but only once so as to
 	 * get unique indices and to count how much to malloc */
 	BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
-		tface = BM_ELEM_CD_GET_VOID_P(f, cd_poly_tex_offset);
-		if (uvedit_face_visible_test(scene, ima, f, tface)) {
+		if (uvedit_face_visible_test(scene, obedit, ima, f)) {
 			BM_elem_flag_enable(f, BM_ELEM_TAG);
 			BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
 				BM_elem_flag_set(l, BM_ELEM_TAG, uvedit_uv_select_test(scene, l, cd_loop_uv_offset));
@@ -3557,22 +3565,19 @@ static bool uv_snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tface;
 	MLoopUV *luv;
 	int width = 0, height = 0;
 	float w, h;
 	bool changed = false;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	ED_space_image_get_size(sima, &width, &height);
 	w = (float)width;
 	h = (float)height;
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tface = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tface))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -3606,7 +3611,7 @@ static int uv_snap_selection_exec(bContext *C, wmOperator *op)
 		case 2:
 		{
 			float center[2];
-			if (uvedit_center(scene, ima, obedit, center, sima->around)) {
+			if (ED_uvedit_center(scene, ima, obedit, center, sima->around)) {
 				float offset[2];
 				sub_v2_v2v2(offset, sima->cursor, center);
 				changed = uv_snap_uvs_offset(scene, ima, obedit, offset);
@@ -3622,7 +3627,7 @@ static int uv_snap_selection_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	uvedit_live_unwrap_update(sima, scene, obedit);
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -3666,16 +3671,13 @@ static int uv_pin_exec(bContext *C, wmOperator *op)
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tface;
 	MLoopUV *luv;
 	const bool clear = RNA_boolean_get(op->ptr, "clear");
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tface = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tface))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -3728,15 +3730,12 @@ static int uv_select_pinned_exec(bContext *C, wmOperator *UNUSED(op))
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tface;
 	MLoopUV *luv;
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tface = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tface))
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -3805,13 +3804,11 @@ static int uv_hide_exec(bContext *C, wmOperator *op)
 	BMLoop *l;
 	BMIter iter, liter;
 	MLoopUV *luv;
-	MTexPoly *tf;
 	const bool swap = RNA_boolean_get(op->ptr, "unselected");
 	Image *ima = sima ? sima->image : NULL;
 	const int use_face_center = (ts->uv_selectmode == UV_SELECT_FACE);
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
 
 	if (ts->uv_flag & UV_SYNC_SELECTION) {
 		EDBM_mesh_hide(em, swap);
@@ -3823,9 +3820,7 @@ static int uv_hide_exec(bContext *C, wmOperator *op)
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 		int hide = 0;
 
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-
-		if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
+		if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
 			continue;
 		}
 
@@ -4117,76 +4112,6 @@ static void UV_OT_cursor_set(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Set Tile Operator
- * \{ */
-
-static int set_tile_exec(bContext *C, wmOperator *op)
-{
-	Image *ima = CTX_data_edit_image(C);
-	int tile[2];
-	Object *obedit = CTX_data_edit_object(C);
-
-	RNA_int_get_array(op->ptr, "tile", tile);
-
-	if (uvedit_set_tile(obedit, ima, tile[0] + ima->xrep * tile[1])) {
-		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_IMAGE, NULL);
-
-		return OPERATOR_FINISHED;
-	}
-
-	return OPERATOR_CANCELLED;
-}
-
-static int set_tile_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-	SpaceImage *sima = CTX_wm_space_image(C);
-	Image *ima = CTX_data_edit_image(C);
-	ARegion *ar = CTX_wm_region(C);
-	float fx, fy;
-	int tile[2];
-
-	if (!ima || !(ima->tpageflag & IMA_TILES))
-		return OPERATOR_CANCELLED;
-
-	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fx, &fy);
-
-	if (fx >= 0.0f && fy >= 0.0f && fx < 1.0f && fy < 1.0f) {
-		fx = fx * ima->xrep;
-		fy = fy * ima->yrep;
-
-		tile[0] = fx;
-		tile[1] = fy;
-
-		sima->curtile = tile[1] * ima->xrep + tile[0];
-		RNA_int_set_array(op->ptr, "tile", tile);
-	}
-
-	return set_tile_exec(C, op);
-}
-
-static void UV_OT_tile_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Set Tile";
-	ot->description = "Set UV image tile coordinates";
-	ot->idname = "UV_OT_tile_set";
-
-	/* api callbacks */
-	ot->exec = set_tile_exec;
-	ot->invoke = set_tile_invoke;
-	ot->poll = ED_operator_image_active;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, "Tile", "Tile coordinate", 0, 10);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
 /** \name Seam from UV Islands Operator
  * \{ */
 
@@ -4299,7 +4224,7 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op)
 
 	BM_uv_vert_map_free(vmap);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 	return OPERATOR_FINISHED;
@@ -4355,9 +4280,9 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op)
 	me->drawflag |= ME_DRAWSEAMS;
 
 	if (scene->toolsettings->edge_mode_live_unwrap)
-		ED_unwrap_lscm(scene, ob, false);
+		ED_unwrap_lscm(scene, ob, false, false);
 
-	DAG_id_tag_update(&me->id, 0);
+	DEG_id_tag_update(&me->id, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
 	return OPERATOR_FINISHED;
@@ -4450,7 +4375,6 @@ void ED_operatortypes_uvedit(void)
 	WM_operatortype_append(UV_OT_hide);
 
 	WM_operatortype_append(UV_OT_cursor_set);
-	WM_operatortype_append(UV_OT_tile_set);
 }
 
 void ED_keymap_uvedit(wmKeyConfig *keyconf)
@@ -4538,7 +4462,6 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
 
 	/* cursor */
 	WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "UV_OT_tile_set", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0);
 
 	/* menus */
 	WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index e4452af4790..f39498b08f3 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -52,10 +52,11 @@
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 
 #include "ED_mesh.h"
@@ -63,6 +64,8 @@
 #include "ED_screen.h"
 #include "ED_space_api.h"
 
+#include "GPU_batch.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -154,6 +157,8 @@ typedef struct StitchState {
 	bool snap_islands;
 	/* stitch at midpoints or at islands */
 	bool midpoints;
+	/* object for editmesh */
+	Object *obedit;
 	/* editmesh, cached for use in modal handler */
 	BMEditMesh *em;
 	/* clear seams of stitched edges after stitch */
@@ -1538,63 +1543,126 @@ static void stitch_calculate_edge_normal(BMEditMesh *em, UvEdge *edge, float *no
 	normalize_v2(normal);
 }
 
+/**
+ */
+static void stitch_draw_vbo(Gwn_VertBuf *vbo, Gwn_PrimType prim_type, const float col[4])
+{
+	Gwn_Batch *batch = GWN_batch_create_ex(prim_type, vbo, NULL, GWN_BATCH_OWNS_VBO);
+	GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_UNIFORM_COLOR);
+	GWN_batch_uniform_4fv(batch, "color", col);
+	GWN_batch_draw(batch);
+	GWN_batch_discard(batch);
+}
+
+/* TODO make things pretier : store batches inside StitchPreviewer instead of the bare verts pos */
 static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *arg)
 {
-	int i, index = 0;
+	int j, index = 0;
+	unsigned int num_line = 0, num_tri, tri_idx = 0, line_idx = 0;
 	StitchState *state = (StitchState *)arg;
 	StitchPreviewer *stitch_preview = state->stitch_preview;
+	Gwn_VertBuf *vbo, *vbo_line;
+	float col[4];
 
-	glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
-	glEnableClientState(GL_VERTEX_ARRAY);
+	static Gwn_VertFormat format = { 0 };
+	static unsigned int pos_id;
+	if (format.attrib_ct == 0) {
+		pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	}
 
 	glEnable(GL_BLEND);
 
-	UI_ThemeColor4(TH_STITCH_PREVIEW_ACTIVE);
-	glVertexPointer(2, GL_FLOAT, 0, stitch_preview->static_tris);
-	glDrawArrays(GL_TRIANGLES, 0, stitch_preview->num_static_tris * 3);
-
-	glVertexPointer(2, GL_FLOAT, 0, stitch_preview->preview_polys);
-	for (i = 0; i < stitch_preview->num_polys; i++) {
-		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-		UI_ThemeColor4(TH_STITCH_PREVIEW_FACE);
-		glDrawArrays(GL_POLYGON, index, stitch_preview->uvs_per_polygon[i]);
-		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-		UI_ThemeColor4(TH_STITCH_PREVIEW_EDGE);
-		glDrawArrays(GL_POLYGON, index, stitch_preview->uvs_per_polygon[i]);
-#if 0
-		glPolygonMode(GL_FRONT_AND_BACK, GL_POINT);
-		UI_ThemeColor4(TH_STITCH_PREVIEW_VERT);
-		glDrawArrays(GL_POLYGON, index, stitch_preview->uvs_per_polygon[i]);
-#endif
-
-		index += stitch_preview->uvs_per_polygon[i];
+	/* Static Tris */
+	UI_GetThemeColor4fv(TH_STITCH_PREVIEW_ACTIVE, col);
+	vbo = GWN_vertbuf_create_with_format(&format);
+	GWN_vertbuf_data_alloc(vbo, stitch_preview->num_static_tris * 3);
+	for (int i = 0; i < stitch_preview->num_static_tris * 3; i++) {
+		GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->static_tris[i * 2]);
 	}
+	stitch_draw_vbo(vbo, GWN_PRIM_TRIS, col);
+
+
+	/* Preview Polys */
+	for (int i = 0; i < stitch_preview->num_polys; i++)
+		num_line += stitch_preview->uvs_per_polygon[i];
+
+	num_tri = num_line - 2 * stitch_preview->num_polys;
+
+	/* we need to convert the polys into triangles / lines */
+	vbo = GWN_vertbuf_create_with_format(&format);
+	vbo_line = GWN_vertbuf_create_with_format(&format);
+
+	GWN_vertbuf_data_alloc(vbo, num_tri * 3);
+	GWN_vertbuf_data_alloc(vbo_line, num_line * 2);
+
+	for (int i = 0; i < stitch_preview->num_polys; i++) {
+		BLI_assert(stitch_preview->uvs_per_polygon[i] >= 3);
+
+		/* Start line */
+		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index]);
+		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + 2]);
+
+		for (j = 1; j < stitch_preview->uvs_per_polygon[i] - 1; ++j) {
+			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index]);
+			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
+
+			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
+		}
+
+		/* Closing line */
+		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index]);
+		/* j = uvs_per_polygon[i] - 1*/
+		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + j * 2]);
+
+		index += stitch_preview->uvs_per_polygon[i] * 2;
+	}
+	UI_GetThemeColor4fv(TH_STITCH_PREVIEW_FACE, col);
+	stitch_draw_vbo(vbo, GWN_PRIM_TRIS, col);
+	UI_GetThemeColor4fv(TH_STITCH_PREVIEW_EDGE, col);
+	stitch_draw_vbo(vbo_line, GWN_PRIM_LINES, col);
+
 	glDisable(GL_BLEND);
 
-	/* draw vert preview */
+
+	/* draw stitch vert/lines preview */
 	if (state->mode == STITCH_VERT) {
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) * 2.0f);
 
-		UI_ThemeColor4(TH_STITCH_PREVIEW_STITCHABLE);
-		glVertexPointer(2, GL_FLOAT, 0, stitch_preview->preview_stitchable);
-		glDrawArrays(GL_POINTS, 0, stitch_preview->num_stitchable);
+		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
+		vbo = GWN_vertbuf_create_with_format(&format);
+		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable);
+		for (int i = 0; i < stitch_preview->num_stitchable; i++) {
+			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+		}
+		stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
 
-		UI_ThemeColor4(TH_STITCH_PREVIEW_UNSTITCHABLE);
-		glVertexPointer(2, GL_FLOAT, 0, stitch_preview->preview_unstitchable);
-		glDrawArrays(GL_POINTS, 0, stitch_preview->num_unstitchable);
+		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
+		vbo = GWN_vertbuf_create_with_format(&format);
+		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable);
+		for (int i = 0; i < stitch_preview->num_unstitchable; i++) {
+			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+		}
+		stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
 	}
 	else {
-		UI_ThemeColor4(TH_STITCH_PREVIEW_STITCHABLE);
-		glVertexPointer(2, GL_FLOAT, 0, stitch_preview->preview_stitchable);
-		glDrawArrays(GL_LINES, 0, 2 * stitch_preview->num_stitchable);
+		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
+		vbo = GWN_vertbuf_create_with_format(&format);
+		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable * 2);
+		for (int i = 0; i < stitch_preview->num_stitchable * 2; i++) {
+			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+		}
+		stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
 
-		UI_ThemeColor4(TH_STITCH_PREVIEW_UNSTITCHABLE);
-		glVertexPointer(2, GL_FLOAT, 0, stitch_preview->preview_unstitchable);
-		glDrawArrays(GL_LINES, 0, 2 * stitch_preview->num_unstitchable);
+		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
+		vbo = GWN_vertbuf_create_with_format(&format);
+		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable * 2);
+		for (int i = 0; i < stitch_preview->num_unstitchable * 2; i++) {
+			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+		}
+		stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
 	}
-
-	glPopClientAttrib();
-	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }
 
 static UvEdge *uv_edge_get(BMLoop *l, StitchState *state)
@@ -1653,6 +1721,7 @@ static int stitch_init(bContext *C, wmOperator *op)
 	/* initialize state */
 	state->use_limit = RNA_boolean_get(op->ptr, "use_limit");
 	state->limit_dist = RNA_float_get(op->ptr, "limit");
+	state->obedit = obedit;
 	state->em = em;
 	state->snap_islands = RNA_boolean_get(op->ptr, "snap_islands");
 	state->static_island = RNA_int_get(op->ptr, "static_island");
@@ -2024,7 +2093,7 @@ static void stitch_exit(bContext *C, wmOperator *op, int finished)
 
 	ED_region_draw_cb_exit(CTX_wm_region(C)->type, state->draw_handle);
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	state_delete(state);
@@ -2066,7 +2135,7 @@ static void stitch_select(bContext *C, Scene *scene, const wmEvent *event, Stitc
 
 	if (state->mode == STITCH_VERT) {
 		if (uv_find_nearest_vert(
-		            scene, ima, state->em, co, 0.0f, &hit))
+		            scene, ima, state->obedit, co, 0.0f, &hit))
 		{
 			/* Add vertex to selection, deselect all common uv's of vert other
 			 * than selected and update the preview. This behavior was decided so that
@@ -2080,7 +2149,7 @@ static void stitch_select(bContext *C, Scene *scene, const wmEvent *event, Stitc
 	}
 	else {
 		if (uv_find_nearest_edge(
-		            scene, ima, state->em, co, &hit))
+		            scene, ima, state->obedit, co, &hit))
 		{
 			UvEdge *edge = uv_edge_get(hit.l, state);
 			stitch_select_edge(edge, state, false);
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index dbe8796ba8b..78b412579e6 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -55,12 +55,15 @@
 #include "BKE_subsurf.h"
 #include "BKE_context.h"
 #include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_material.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_editmesh.h"
+#include "BKE_layer.h"
+
+#include "DEG_depsgraph.h"
 
 #include "PIL_time.h"
 
@@ -100,9 +103,8 @@ static void modifier_unwrap_state(Object *obedit, Scene *scene, bool *r_use_subs
 	*r_use_subsurf = subsurf;
 }
 
-static bool ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
+static bool ED_uvedit_ensure_uvs(bContext *C, Scene *UNUSED(scene), Object *obedit)
 {
-	Main *bmain = CTX_data_main(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	BMFace *efa;
 	BMIter iter;
@@ -116,7 +118,7 @@ static bool ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
 	if (ED_uvedit_test(obedit))
 		return 1;
 
-	if (em && em->bm->totface && !CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY))
+	if (em && em->bm->totface && !CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV))
 		ED_mesh_uv_texture_add(obedit->data, NULL, true);
 
 	if (!ED_uvedit_test(obedit))
@@ -146,9 +148,6 @@ static bool ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
 		}
 	}
 
-	if (ima)
-		ED_uvedit_assign_image(bmain, scene, obedit, ima, NULL);
-
 	/* select new UV's (ignore UV_SYNC_SELECTION in this case) */
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 		BMIter liter;
@@ -200,7 +199,22 @@ static bool uvedit_have_selection(Scene *scene, BMEditMesh *em, bool implicit)
 	return false;
 }
 
-void ED_uvedit_get_aspect(Scene *scene, Object *ob, BMesh *bm, float *aspx, float *aspy)
+static bool uvedit_have_selection_multi(
+        Scene *scene, Object **objects, const uint objects_len, bool implicit)
+{
+	bool have_select = false;
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		if (uvedit_have_selection(scene, em, implicit)) {
+			have_select = true;
+			break;
+		}
+	}
+	return have_select;
+}
+
+void ED_uvedit_get_aspect(Scene *UNUSED(scene), Object *ob, BMesh *bm, float *aspx, float *aspy)
 {
 	bool sloppy = true;
 	bool selected = false;
@@ -210,13 +224,7 @@ void ED_uvedit_get_aspect(Scene *scene, Object *ob, BMesh *bm, float *aspx, floa
 	efa = BM_mesh_active_face_get(bm, sloppy, selected);
 
 	if (efa) {
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			ED_object_get_active_image(ob, efa->mat_nr + 1, &ima, NULL, NULL, NULL);
-		}
-		else {
-			MTexPoly *tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY);
-			ima = tf->tpage;
-		}
+		ED_object_get_active_image(ob, efa->mat_nr + 1, &ima, NULL, NULL, NULL);
 
 		ED_image_get_uv_aspect(ima, NULL, aspx, aspy);
 	}
@@ -257,9 +265,11 @@ static void construct_param_handle_face_add(ParamHandle *handle, Scene *scene,
 	param_face_add(handle, key, i, vkeys, co, uv, pin, select, efa->no);
 }
 
-static ParamHandle *construct_param_handle(Scene *scene, Object *ob, BMesh *bm,
-                                           const bool implicit, const bool fill, const bool sel,
-                                           const bool correct_aspect)
+/* See: construct_param_handle_multi to handle multiple objects at once. */
+static ParamHandle *construct_param_handle(
+        Scene *scene, Object *ob, BMesh *bm,
+        const bool implicit, const bool fill, const bool sel,
+        const bool correct_aspect)
 {
 	ParamHandle *handle;
 	BMFace *efa;
@@ -323,6 +333,89 @@ static ParamHandle *construct_param_handle(Scene *scene, Object *ob, BMesh *bm,
 	return handle;
 }
 
+/**
+ * Version of #construct_param_handle_single that handles multiple objects.
+ */
+static ParamHandle *construct_param_handle_multi(
+        Scene *scene, Object **objects, const uint objects_len,
+        const bool implicit, const bool fill, const bool sel,
+        const bool correct_aspect)
+{
+	ParamHandle *handle;
+	BMFace *efa;
+	BMLoop *l;
+	BMEdge *eed;
+	BMIter iter, liter;
+	int i;
+
+
+	handle = param_construct_begin();
+
+	if (correct_aspect) {
+		Object *ob = objects[0];
+		BMEditMesh *em = BKE_editmesh_from_object(ob);
+		BMesh *bm = em->bm;
+		float aspx, aspy;
+
+		ED_uvedit_get_aspect(scene, ob, bm, &aspx, &aspy);
+		if (aspx != aspy) {
+			param_aspect_ratio(handle, aspx, aspy);
+		}
+	}
+
+	/* we need the vert indices */
+	EDBM_mesh_elem_index_ensure_multi(objects, objects_len, BM_VERT);
+
+	int offset = 0;
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
+
+		const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
+
+		BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, i) {
+
+			if ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT) == 0)) {
+				continue;
+			}
+
+			if (implicit) {
+				bool is_loopsel = false;
+
+				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+					if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+						is_loopsel = true;
+						break;
+					}
+				}
+				if (is_loopsel == false) {
+					continue;
+				}
+			}
+
+			construct_param_handle_face_add(handle, scene, efa, i + offset, cd_loop_uv_offset);
+		}
+
+		if (!implicit) {
+			BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
+				if (BM_elem_flag_test(eed, BM_ELEM_SEAM)) {
+					ParamKey vkeys[2];
+					vkeys[0] = (ParamKey)BM_elem_index_get(eed->v1);
+					vkeys[1] = (ParamKey)BM_elem_index_get(eed->v2);
+					param_edge_set_seam(handle, vkeys);
+				}
+			}
+		}
+		offset += bm->totface;
+	}
+
+	param_construct_end(handle, fill, implicit);
+
+	return handle;
+}
+
 
 static void texface_from_original_index(BMFace *efa, int index, float **uv, ParamBool *pin, ParamBool *select,
                                         Scene *scene, const int cd_loop_uv_offset)
@@ -570,7 +663,7 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac
 
 		ms->lasttime = PIL_check_seconds_timer();
 
-		DAG_id_tag_update(ms->obedit->data, 0);
+		DEG_id_tag_update(ms->obedit->data, 0);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, ms->obedit->data);
 	}
 }
@@ -593,7 +686,7 @@ static void minimize_stretch_exit(bContext *C, wmOperator *op, bool cancel)
 	param_stretch_end(ms->handle);
 	param_delete(ms->handle);
 
-	DAG_id_tag_update(ms->obedit->data, 0);
+	DEG_id_tag_update(ms->obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ms->obedit->data);
 
 	MEM_freeN(ms);
@@ -714,6 +807,7 @@ void UV_OT_minimize_stretch(wmOperatorType *ot)
 
 /* ******************** Pack Islands operator **************** */
 
+
 void ED_uvedit_pack_islands(Scene *scene, Object *ob, BMesh *bm, bool selected, bool correct_aspect, bool do_rotate)
 {
 	ParamHandle *handle;
@@ -723,14 +817,29 @@ void ED_uvedit_pack_islands(Scene *scene, Object *ob, BMesh *bm, bool selected,
 	param_delete(handle);
 }
 
+void ED_uvedit_pack_islands_multi(
+        Scene *scene, Object **objects, const uint objects_len,
+        bool selected, bool correct_aspect, bool do_rotate)
+{
+	ParamHandle *handle;
+	handle = construct_param_handle_multi(
+	        scene, objects, objects_len, true, false, selected, correct_aspect);
+	param_pack(handle, scene->toolsettings->uvcalc_margin, do_rotate);
+	param_flush(handle);
+	param_delete(handle);
+}
+
 static int pack_islands_exec(bContext *C, wmOperator *op)
 {
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	bool do_rotate = RNA_boolean_get(op->ptr, "rotate");
 
-	if (!uvedit_have_selection(scene, em, true)) {
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len);
+
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, true)) {
+		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
 	}
 
@@ -739,10 +848,15 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
 	else
 		RNA_float_set(op->ptr, "margin", scene->toolsettings->uvcalc_margin);
 
-	ED_uvedit_pack_islands(scene, obedit, em->bm, true, true, do_rotate);
+	ED_uvedit_pack_islands_multi(scene, objects, objects_len, true, true, do_rotate);
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -784,7 +898,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op))
 	param_flush(handle);
 	param_delete(handle);
 
-	DAG_id_tag_update(obedit->data, 0);
+	DEG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
@@ -855,7 +969,7 @@ void ED_uvedit_live_unwrap(Scene *scene, Object *obedit)
 	if (scene->toolsettings->edge_mode_live_unwrap &&
 	    CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV))
 	{
-		ED_unwrap_lscm(scene, obedit, false); /* unwrap all not just sel */
+		ED_unwrap_lscm(scene, obedit, false, false); /* unwrap all not just sel */
 	}
 }
 
@@ -903,7 +1017,7 @@ static void uv_map_transform_center(
         float r_bounds[2][3])
 {
 	/* only operates on the edit object - this is all that's needed now */
-	const int around = (v3d) ? v3d->around : V3D_AROUND_CENTER_BOUNDS;
+	const int around = (v3d) ? scene->toolsettings->transform_pivot_point : V3D_AROUND_CENTER_BOUNDS;
 
 	float bounds[2][3];
 	INIT_MINMAX(bounds[0], bounds[1]);
@@ -925,7 +1039,7 @@ static void uv_map_transform_center(
 		case V3D_AROUND_CURSOR:  /* cursor center */
 		{
 			invert_m4_m4(ob->imat, ob->obmat);
-			mul_v3_m4v3(r_center, ob->imat, ED_view3d_cursor3d_get(scene, v3d));
+			mul_v3_m4v3(r_center, ob->imat, ED_view3d_cursor3d_get(scene, v3d)->location);
 			break;
 		}
 		case V3D_AROUND_ACTIVE:
@@ -1108,7 +1222,7 @@ static void uv_map_clip_correct_properties(wmOperatorType *ot)
 	                "Scale UV coordinates to bounds after unwrapping");
 }
 
-static void uv_map_clip_correct(Scene *scene, Object *ob, BMEditMesh *em, wmOperator *op)
+static void uv_map_clip_correct_multi(Scene *scene, Object **objects, uint objects_len, wmOperator *op)
 {
 	BMFace *efa;
 	BMLoop *l;
@@ -1119,25 +1233,46 @@ static void uv_map_clip_correct(Scene *scene, Object *ob, BMEditMesh *em, wmOper
 	const bool clip_to_bounds = RNA_boolean_get(op->ptr, "clip_to_bounds");
 	const bool scale_to_bounds = RNA_boolean_get(op->ptr, "scale_to_bounds");
 
-	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+	INIT_MINMAX2(min, max);
 
-	/* correct for image aspect ratio */
-	if (correct_aspect)
-		correct_uv_aspect(scene, ob, em);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *ob = objects[ob_index];
 
-	if (scale_to_bounds) {
-		INIT_MINMAX2(min, max);
+		BMEditMesh *em = BKE_editmesh_from_object(ob);
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				continue;
+		/* correct for image aspect ratio */
+		if (correct_aspect)
+			correct_uv_aspect(scene, ob, em);
 
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				minmax_v2v2_v2(min, max, luv->uv);
+		if (scale_to_bounds) {
+			/* find uv limits */
+			BM_ITER_MESH(efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+					continue;
+
+				BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+					minmax_v2v2_v2(min, max, luv->uv);
+				}
 			}
 		}
+		else if (clip_to_bounds) {
+			/* clipping and wrapping */
+			BM_ITER_MESH(efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+					continue;
 
+				BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+					CLAMP(luv->uv[0], 0.0f, 1.0f);
+					CLAMP(luv->uv[1], 0.0f, 1.0f);
+				}
+			}
+		}
+	}
+
+	if (scale_to_bounds) {
 		/* rescale UV to be in 1/1 */
 		dx = (max[0] - min[0]);
 		dy = (max[1] - min[1]);
@@ -1147,37 +1282,36 @@ static void uv_map_clip_correct(Scene *scene, Object *ob, BMEditMesh *em, wmOper
 		if (dy > 0.0f)
 			dy = 1.0f / dy;
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				continue;
+		for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+			Object *ob = objects[ob_index];
 
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+			BMEditMesh *em = BKE_editmesh_from_object(ob);
+			const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-				luv->uv[0] = (luv->uv[0] - min[0]) * dx;
-				luv->uv[1] = (luv->uv[1] - min[1]) * dy;
-			}
-		}
-	}
-	else if (clip_to_bounds) {
-		/* clipping and wrapping */
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				continue;
+			BM_ITER_MESH(efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+					continue;
 
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				CLAMP(luv->uv[0], 0.0f, 1.0f);
-				CLAMP(luv->uv[1], 0.0f, 1.0f);
+				BM_ITER_ELEM(l, &liter, efa, BM_LOOPS_OF_FACE) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+
+					luv->uv[0] = (luv->uv[0] - min[0]) * dx;
+					luv->uv[1] = (luv->uv[1] - min[1]) * dy;
+				}
 			}
 		}
 	}
 }
 
+static void uv_map_clip_correct(Scene *scene, Object *ob, wmOperator *op)
+{
+	uv_map_clip_correct_multi(scene, &ob, 1, op);
+}
+
 /* ******************** Unwrap operator **************** */
 
 /* assumes UV Map is checked, doesn't run update funcs */
-void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel)
+void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel, const bool pack)
 {
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	ParamHandle *handle;
@@ -1198,7 +1332,10 @@ void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel)
 	param_lscm_end(handle);
 
 	param_average(handle);
-	param_pack(handle, scene->toolsettings->uvcalc_margin, false);
+
+	if (pack) {
+		param_pack(handle, scene->toolsettings->uvcalc_margin, false);
+	}
 
 	param_flush(handle);
 
@@ -1207,33 +1344,48 @@ void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel)
 
 static int unwrap_exec(bContext *C, wmOperator *op)
 {
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	int method = RNA_enum_get(op->ptr, "method");
 	const bool fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
 	const bool correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect");
 	const bool use_subsurf = RNA_boolean_get(op->ptr, "use_subsurf_data");
-	bool use_subsurf_final;
 	float obsize[3];
 	bool implicit = false;
 
-	if (!uvedit_have_selection(scene, em, implicit)) {
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, implicit)) {
+		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
 	}
 
 	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		bool use_subsurf_final;
+
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	mat4_to_size(obsize, obedit->obmat);
-	if (!(fabsf(obsize[0] - obsize[1]) < 1e-4f && fabsf(obsize[1] - obsize[2]) < 1e-4f))
-		BKE_report(op->reports, RPT_INFO,
-		           "Object has non-uniform scale, unwrap will operate on a non-scaled version of the mesh");
-	else if (is_negative_m4(obedit->obmat))
-		BKE_report(op->reports, RPT_INFO,
-		           "Object has negative scale, unwrap will operate on a non-flipped version of the mesh");
+		mat4_to_size(obsize, obedit->obmat);
+		if (!(fabsf(obsize[0] - obsize[1]) < 1e-4f && fabsf(obsize[1] - obsize[2]) < 1e-4f))
+			BKE_report(op->reports, RPT_INFO,
+			           "Object has non-uniform scale, unwrap will operate on a non-scaled version of the mesh");
+		else if (is_negative_m4(obedit->obmat))
+			BKE_report(op->reports, RPT_INFO,
+			           "Object has negative scale, unwrap will operate on a non-flipped version of the mesh");
+
+
+		/* double up the check here but better keep ED_unwrap_lscm interface simple and not
+		 * pass operator for warning append */
+		modifier_unwrap_state(obedit, scene, &use_subsurf_final);
+		if (use_subsurf != use_subsurf_final) {
+			BKE_report(op->reports, RPT_INFO, "Subdivision Surface modifier needs to be first to work with unwrap");
+		}
+	}
 
 	/* remember last method for live unwrap */
 	if (RNA_struct_property_is_set(op->ptr, "method"))
@@ -1256,17 +1408,17 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 	if (use_subsurf) scene->toolsettings->uvcalc_flag |= UVCALC_USESUBSURF;
 	else scene->toolsettings->uvcalc_flag &= ~UVCALC_USESUBSURF;
 
-	/* double up the check here but better keep ED_unwrap_lscm interface simple and not
-	 * pass operator for warning append */
-	modifier_unwrap_state(obedit, scene, &use_subsurf_final);
-	if (use_subsurf != use_subsurf_final)
-		BKE_report(op->reports, RPT_INFO, "Subdivision Surface modifier needs to be first to work with unwrap");
-
 	/* execute unwrap */
-	ED_unwrap_lscm(scene, obedit, true);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		ED_unwrap_lscm(scene, obedit, true, false);
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	ED_uvedit_pack_islands_multi(scene, objects, objects_len, true, true, true);
+
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1321,9 +1473,8 @@ static int uv_from_view_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
 
 static int uv_from_view_exec(bContext *C, wmOperator *op)
 {
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
@@ -1333,69 +1484,98 @@ static int uv_from_view_exec(bContext *C, wmOperator *op)
 	BMIter iter, liter;
 	MLoopUV *luv;
 	float rotmat[4][4];
+	bool changed_multi = false;
+
+	/* Note: objects that aren't touched are set to NULL (to skip clipping). */
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		bool changed = false;
+
+		/* add uvs if they don't exist yet */
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	int cd_loop_uv_offset;
-
-	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-	cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		if (RNA_boolean_get(op->ptr, "orthographic")) {
+			uv_map_rotation_matrix(rotmat, rv3d, obedit, 90.0f, 0.0f, 1.0f);
 
-	if (RNA_boolean_get(op->ptr, "orthographic")) {
-		uv_map_rotation_matrix(rotmat, rv3d, obedit, 90.0f, 0.0f, 1.0f);
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+					continue;
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				continue;
+				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+					BLI_uvproject_from_view_ortho(luv->uv, l->v->co, rotmat);
+				}
+				changed = true;
+			}
+		}
+		else if (camera) {
+			const bool camera_bounds = RNA_boolean_get(op->ptr, "camera_bounds");
+			struct ProjCameraInfo *uci = BLI_uvproject_camera_info(
+			        v3d->camera, obedit->obmat,
+			        camera_bounds ? (scene->r.xsch * scene->r.xasp) : 1.0f,
+			        camera_bounds ? (scene->r.ysch * scene->r.yasp) : 1.0f);
+
+			if (uci) {
+				BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+					if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+						continue;
+
+					BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+						luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+						BLI_uvproject_from_camera(luv->uv, l->v->co, uci);
+					}
+					changed = true;
+				}
 
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				BLI_uvproject_from_view_ortho(luv->uv, l->v->co, rotmat);
+				MEM_freeN(uci);
 			}
 		}
-	}
-	else if (camera) {
-		const bool camera_bounds = RNA_boolean_get(op->ptr, "camera_bounds");
-		struct ProjCameraInfo *uci = BLI_uvproject_camera_info(v3d->camera, obedit->obmat,
-		                                                       camera_bounds ? (scene->r.xsch * scene->r.xasp) : 1.0f,
-		                                                       camera_bounds ? (scene->r.ysch * scene->r.yasp) : 1.0f);
+		else {
+			copy_m4_m4(rotmat, obedit->obmat);
 
-		if (uci) {
 			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 				if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
 					continue;
 
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 					luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-					BLI_uvproject_from_camera(luv->uv, l->v->co, uci);
+					BLI_uvproject_from_view(luv->uv, l->v->co, rv3d->persmat, rotmat, ar->winx, ar->winy);
 				}
+				changed = true;
 			}
+		}
 
-			MEM_freeN(uci);
+		if (changed) {
+			changed_multi = true;
+			DEG_id_tag_update(obedit->data, 0);
+			WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		}
+		else {
+			ARRAY_DELETE_REORDER_LAST(objects, ob_index, 1, objects_len);
+			objects_len -= 1;
+			ob_index -= 1;
 		}
 	}
-	else {
-		copy_m4_m4(rotmat, obedit->obmat);
 
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				continue;
-
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				BLI_uvproject_from_view(luv->uv, l->v->co, rv3d->persmat, rotmat, ar->winx, ar->winy);
-			}
-		}
+	if (changed_multi) {
+		uv_map_clip_correct_multi(scene, objects, objects_len, op);
 	}
 
-	uv_map_clip_correct(scene, obedit, em, op);
+	MEM_freeN(objects);
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-
-	return OPERATOR_FINISHED;
+	if (changed_multi) {
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
 }
 
 static int uv_from_view_poll(bContext *C)
@@ -1435,18 +1615,30 @@ void UV_OT_project_from_view(wmOperatorType *ot)
 static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
-	Mesh *me = (Mesh *)obedit->data;
 
-	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		Mesh *me = (Mesh *)obedit->data;
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	ED_mesh_uv_loop_reset(C, me);
+		/* add uvs if they don't exist yet */
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		ED_mesh_uv_loop_reset(C, me);
+
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1481,7 +1673,7 @@ static void uv_sphere_project(float target[2], float source[3], float center[3],
 		target[0] -= 1.0f;
 }
 
-static void uv_map_mirror(BMEditMesh *em, BMFace *efa, MTexPoly *UNUSED(tf))
+static void uv_map_mirror(BMEditMesh *em, BMFace *efa)
 {
 	BMLoop *l;
 	BMIter liter;
@@ -1513,46 +1705,53 @@ static void uv_map_mirror(BMEditMesh *em, BMFace *efa, MTexPoly *UNUSED(tf))
 static int sphere_project_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MTexPoly *tf;
-	MLoopUV *luv;
-	float center[3], rotmat[4][4];
 
-	int cd_loop_uv_offset;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+		MLoopUV *luv;
 
-	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		/* add uvs if they don't exist yet */
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	uv_map_transform(C, op, rotmat);
-	uv_map_transform_center(scene, v3d, obedit, em, center, NULL);
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		float center[3], rotmat[4][4];
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-			continue;
+		uv_map_transform(C, op, rotmat);
+		uv_map_transform_center(scene, v3d, obedit, em, center, NULL);
 
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+				continue;
 
-			uv_sphere_project(luv->uv, l->v->co, center, rotmat);
-		}
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
-		uv_map_mirror(em, efa, tf);
-	}
+				uv_sphere_project(luv->uv, l->v->co, center, rotmat);
+			}
 
-	uv_map_clip_correct(scene, obedit, em, op);
+			uv_map_mirror(em, efa);
+		}
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		uv_map_clip_correct(scene, obedit, op);
+
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1594,46 +1793,53 @@ static void uv_cylinder_project(float target[2], float source[3], float center[3
 static int cylinder_project_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *obedit = CTX_data_edit_object(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MTexPoly *tf;
-	MLoopUV *luv;
-	float center[3], rotmat[4][4];
 
-	int cd_loop_uv_offset;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMFace *efa;
+		BMLoop *l;
+		BMIter iter, liter;
+		MLoopUV *luv;
 
-	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		/* add uvs if they don't exist yet */
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	uv_map_transform(C, op, rotmat);
-	uv_map_transform_center(scene, v3d, obedit, em, center, NULL);
+		const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+		float center[3], rotmat[4][4];
 
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
-			continue;
+		uv_map_transform(C, op, rotmat);
+		uv_map_transform_center(scene, v3d, obedit, em, center, NULL);
 
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+			if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
+				continue;
 
-			uv_cylinder_project(luv->uv, l->v->co, center, rotmat);
-		}
+			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
 
-		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
-		uv_map_mirror(em, efa, tf);
-	}
+				uv_cylinder_project(luv->uv, l->v->co, center, rotmat);
+			}
+
+			uv_map_mirror(em, efa);
+		}
 
-	uv_map_clip_correct(scene, obedit, em, op);
+		uv_map_clip_correct(scene, obedit, op);
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }
@@ -1663,7 +1869,6 @@ void ED_uvedit_unwrap_cube_project(BMesh *bm, float cube_size, bool use_select,
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	/* MTexPoly *tf; */ /* UNUSED */
 	MLoopUV *luv;
 	float loc[3];
 	int cox, coy;
@@ -1701,40 +1906,57 @@ static int cube_project_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
 	PropertyRNA *prop_cube_size = RNA_struct_find_property(op->ptr, "cube_size");
-	float cube_size = RNA_property_float_get(op->ptr, prop_cube_size);
-	float center[3];
-	float bounds[2][3];
-	float (*bounds_buf)[3] = NULL;
+	const float cube_size_init = RNA_property_float_get(op->ptr, prop_cube_size);
 
-	/* add uvs if they don't exist yet */
-	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
-		return OPERATOR_CANCELLED;
-	}
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-	if (!RNA_property_is_set(op->ptr, prop_cube_size)) {
-		bounds_buf = bounds;
-	}
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
 
-	uv_map_transform_center(scene, v3d, obedit, em, center, bounds_buf);
+		/* add uvs if they don't exist yet */
+		if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
+			continue;
+		}
 
-	/* calculate based on bounds */
-	if (bounds_buf) {
-		float dims[3];
-		sub_v3_v3v3(dims, bounds[1], bounds[0]);
-		cube_size = max_fff(UNPACK3(dims));
-		cube_size = cube_size ? 2.0f / cube_size : 1.0f;
-		RNA_property_float_set(op->ptr, prop_cube_size, cube_size);
-	}
+		float bounds[2][3];
+		float (*bounds_buf)[3] = NULL;
+
+		if (!RNA_property_is_set(op->ptr, prop_cube_size)) {
+			bounds_buf = bounds;
+		}
+
+		float center[3];
+		uv_map_transform_center(scene, v3d, obedit, em, center, bounds_buf);
+
+		/* calculate based on bounds */
+		float cube_size = cube_size_init;
+		if (bounds_buf) {
+			float dims[3];
+			sub_v3_v3v3(dims, bounds[1], bounds[0]);
+			cube_size = max_fff(UNPACK3(dims));
+			cube_size = cube_size ? 2.0f / cube_size : 1.0f;
+			if (ob_index == 0) {
+				/* This doesn't fit well with, multiple objects. */
+				RNA_property_float_set(op->ptr, prop_cube_size, cube_size);
+			}
+		}
 
-	ED_uvedit_unwrap_cube_project(em->bm, cube_size, true, center);
+		ED_uvedit_unwrap_cube_project(em->bm, cube_size, true, center);
 
-	uv_map_clip_correct(scene, obedit, em, op);
+		uv_map_clip_correct(scene, obedit, op);
 
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+		DEG_id_tag_update(obedit->data, 0);
+		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }