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.

1 files changed, 1 insertions, 617 deletions

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)