Remove Blender Internal and legacy viewport from Blender 2.8.

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

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

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

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

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

7 files changed, 54 insertions, 1258 deletions

diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index 2bc96a7f218..a1f646aefc1 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -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 22e62c9ba0a..89dbd3da16d 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1078,623 +1078,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;
-	Depsgraph *depsgraph;
-	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, Depsgraph *depsgraph,
-                                  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, depsgraph, 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(
-        Depsgraph *depsgraph,
-        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(depsgraph, 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->depsgraph, 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->depsgraph,
-	                                    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, &rp->scene->view_layers, rp->scene->active_view_layer, NULL, rp->ar->winx, rp->ar->winy, &cliprct);
-		}
-		else
-			RE_InitState(re, NULL, &rdata, &rp->scene->view_layers, rp->scene->active_view_layer, 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(rp->depsgraph, 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)
-{
-	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);
-	Depsgraph *depsgraph = CTX_data_depsgraph(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 */
-		Object *obedit = CTX_data_edit_object(C);
-		if (obedit) {
-			ED_object_editmode_load(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(depsgraph, 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, depsgraph, 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);
-	Depsgraph *depsgraph = CTX_data_depsgraph(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->depsgraph = depsgraph;
-	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);
-		Depsgraph *depsgraph = CTX_data_depsgraph(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, depsgraph, 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);
-				IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
-				immDrawPixelsTex(&state, xof, yof, rres.rectx, rres.recty,
-				                 GL_RGBA, GL_FLOAT, GL_NEAREST, rres.rectf,
-				                 scale_x, scale_y, NULL);;
-				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);
-			IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
-			immDrawPixelsTex(&state, xof, yof, rres.rectx, rres.recty,
-			                 GL_RGBA, GL_UNSIGNED_BYTE,
-			                 GL_NEAREST, display_buffer,
-			                 scale_x, scale_y, NULL);
-			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);
@@ -1716,6 +1099,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 840c5c2b5aa..1c6938cbdb3 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -270,7 +270,6 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
 {
 	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Scene *scene = oglrender->scene;
-	ViewLayer *view_layer = oglrender->view_layer;
 	ARegion *ar = oglrender->ar;
 	View3D *v3d = oglrender->v3d;
 	RegionView3D *rv3d = oglrender->rv3d;
@@ -278,7 +277,6 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
 	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);
 	float *rectf = NULL;
 	const char *viewname = RE_GetActiveRenderView(oglrender->re);
@@ -356,10 +354,8 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
 		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(
-			       depsgraph, scene, view_layer, v3d->drawtype,
+			       depsgraph, scene, v3d->drawtype,
 			       v3d, ar, sizex, sizey,
 			       IB_rectfloat, draw_flags, alpha_mode, oglrender->ofs_samples, viewname,
 			       oglrender->ofs, err_out);
@@ -370,9 +366,9 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
 			}
 		}
 		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(
-			        depsgraph, scene, view_layer, OB_SOLID,
+			        depsgraph, scene, OB_SOLID,
 			        scene->camera, oglrender->sizex, oglrender->sizey,
 			        IB_rectfloat, draw_flags,
 			        alpha_mode, oglrender->ofs_samples, viewname,
diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c
index bd75c6879e1..13fe40e768a 100644
--- a/source/blender/editors/render/render_ops.c
+++ b/source/blender/editors/render/render_ops.c
@@ -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 f2f147ab874..9a179ce3b47 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -242,32 +242,6 @@ void ED_preview_free_dbase(void)
 		BKE_main_free(G_pr_main_cycles);
 }
 
-static int preview_mat_has_sss(Material *mat, bNodeTree *ntree)
-{
-	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;
-			}
-		}
-	}
-	return 0;
-}
-
 static Scene *preview_get_scene(Main *pr_main)
 {
 	if (pr_main == NULL) return NULL;
@@ -382,7 +356,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));
@@ -397,83 +371,22 @@ 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(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 *base = view_layer->object_bases.first; base; base = base->next) {
-						Object *ob = base->object;
-						if (ob->id.name[2] == 'c') {
-							Material *shadmat = give_current_material(ob, ob->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 *base = view_layer->object_bases.first; base; base = base->next) {
-						Object *ob = base->object;
-						if (ob->type == OB_LAMP) {
-							/* if doesn't match 'Lamp.002' --> main key light */
-							if (!STREQ(ob->id.name + 2, "Lamp.002")) {
-								if (mat->material_type == MA_TYPE_VOLUME) {
-									base->flag &= ~BASE_VISIBLED;
-								}
-								else {
-									base->flag |= BASE_VISIBLED;
-								}
-							}
-						}
-					}
+				/* 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 {
-					/* 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 (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) {
-						set_preview_layer(view_layer, MA_FLAT);
-					}
-					else {
-						set_preview_layer(view_layer, MA_SPHERE_A);
-					}
+					set_preview_layer(view_layer, MA_SPHERE_A);
 				}
 				else {
 					set_preview_layer(view_layer, mat->pr_type);
@@ -486,7 +399,7 @@ 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);
 				
 			}
 			
@@ -519,29 +432,6 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 			}
 			set_preview_layer(view_layer, MA_TEXTURE);
 			
-			for (Base *base = view_layer->object_bases.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;
-							}
-						}
-					}
-				}
-			}
-
 			if (tex && tex->nodetree && sp->pr_method == PR_NODE_RENDER) {
 				/* two previews, they get copied by wmJob */
 				BKE_node_preview_init_tree(origtex->nodetree, sp->sizex, sp->sizey, true);
@@ -558,28 +448,14 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
 				BLI_addtail(&pr_main->lamp, la);
 			}
 
-			if (!BKE_scene_use_new_shading_nodes(scene)) {
-				if (la && la->type == LA_SUN && (la->sun_effect_type & LA_SUN_EFFECT_SKY)) {
-					set_preview_layer(view_layer, MA_ATMOS);
-					sce->world = preview_get_localized_world(sp, 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);
-					set_preview_layer(view_layer, MA_LAMP);
-				}
-			}
-			else {
-				set_preview_layer(view_layer, MA_LAMP);
+			set_preview_layer(view_layer, MA_LAMP);
 
-				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 *base = view_layer->object_bases.first; base; base = base->next) {
@@ -1132,12 +1008,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);
-			}
 		}
 	}
 }
@@ -1182,7 +1052,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;
@@ -1207,19 +1076,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);
@@ -1344,10 +1208,9 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 	short id_type = GS(id->name);
 
 	/* Use workspace render only for buttons Window, since the other previews are related to the datablock. */
-	bool use_new_shading = BKE_scene_use_new_shading_nodes(scene);
 
 	/* 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;
 	}
 
@@ -1368,9 +1231,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 Eevee + 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 {
@@ -1388,11 +1251,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 270ba2a7947..c5787a1d46c 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -460,7 +460,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 +471,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 +532,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 +560,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 +571,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 */
@@ -1457,15 +1441,6 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op)
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act - 1, -1, 0);
 				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);
 			}
@@ -1479,15 +1454,6 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op)
 				BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act + 1, -1, 0);
 				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);
 			}
@@ -1524,180 +1490,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 */
@@ -1769,17 +1561,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;
@@ -1807,17 +1588,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 9ae103ae017..1864cb0af6a 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -59,9 +59,7 @@
 #include "BKE_scene.h"
 #include "BKE_workspace.h"
 
-#include "GPU_lamp.h"
 #include "GPU_material.h"
-#include "GPU_buffers.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
@@ -145,20 +143,18 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update
 
 				}
 				else {
-					RenderEngineType *engine_type = RE_engines_find(win->scene->r.engine);
-					if ((engine_type->flag & RE_USE_LEGACY_PIPELINE) == 0) {
-						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
-							        }));
-						}
+					RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
+					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
+						        }));
 					}
 				}
 			}
@@ -243,69 +239,8 @@ static void render_engine_flag_changed(Main *bmain, int update_flag)
 	}
 }
 
-static int mtex_use_tex(MTex **mtex, int tot, Tex *tex)
+static void material_changed(Main *UNUSED(bmain), Material *ma)
 {
-	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)
-{
-	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));
 
@@ -315,86 +250,22 @@ static void material_changed(Main *bmain, Material *ma)
 			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;
-					}
-				}
-			}
-		}
-	}
-
 }
 
-static void lamp_changed(Main *bmain, Lamp *la)
+static void lamp_changed(Main *UNUSED(bmain), Lamp *la)
 {
-	Object *ob;
-
 	/* 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);
-
 	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;
 	ViewLayer *view_layer;
-	Object *ob;
 	bNode *node;
-	bool texture_draw = false;
 
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&tex->id));
@@ -406,48 +277,6 @@ static void texture_changed(Main *bmain, Tex *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;
-		}
-	}
-
-	/* 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) {
@@ -456,32 +285,6 @@ 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;
-					}
-				}
-			}
-		}
 	}
 }
 
@@ -526,7 +329,6 @@ static void scene_changed(Main *bmain, Scene *scene)
 		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);
 		}
 	}
 }
@@ -568,12 +370,3 @@ void ED_render_id_flush_update(const DEGEditorUpdateContext *update_ctx, ID *id)
 	}
 }
 
-
-void ED_render_internal_init(void)
-{
-	RenderEngineType *ret = RE_engines_find(RE_engine_id_BLENDER_RENDER);
-	
-	ret->view_update = render_view3d_update;
-	ret->render_to_view = render_view3d_draw;
-	
-}