[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28103] trunk/blender/source/blender/ editors/render/render_internal.c: Fix for previous commit - better to just use NewRender rather than GetRender

[Matt Ebb]

Revision: 28103
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28103
Author:   broken
Date:     2010-04-09 09:47:57 +0200 (Fri, 09 Apr 2010)

Log Message:
-----------
Fix for previous commit - better to just use NewRender rather than GetRender

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-04-09 07:00:27 UTC (rev 28102)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-04-09 07:47:57 UTC (rev 28103)
@@ -385,15 +385,11 @@
 	BKE_report(reports, RPT_ERROR, str);
 }
 
-static void result_nothing(void *unused, RenderResult *rr) {}
-static void result_rcti_nothing(void *unused, RenderResult *rr, volatile struct rcti *rect) {}
-static void stats_nothing(void *unused, RenderStats *rs) {}
-
 /* executes blocking render */
 static int screen_render_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
-	Render *re= RE_GetRender(scene->id.name);
+	Render *re= RE_NewRender(scene->id.name);
 	Image *ima;
 	View3D *v3d= CTX_wm_view3d(C);
 	int lay= (v3d)? v3d->lay|scene->lay: scene->lay;
@@ -406,12 +402,6 @@
 	RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
 	RE_error_cb(re, op->reports, render_error_reports);
 
-	/* clear other callbacks that may have previosuly been used by interactive render */
-	RE_display_init_cb(re, NULL, result_nothing);
-	RE_display_clear_cb(re, NULL, result_nothing);
-	RE_display_draw_cb(re, NULL, result_rcti_nothing);
-	RE_stats_draw_cb(re, NULL, stats_nothing);
-
 	ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 	BKE_image_backup_render(scene, ima);