Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2007-10-29 16:11:42 +0300
committerTon Roosendaal <ton@blender.org>2007-10-29 16:11:42 +0300
commit8a3f92693843445c877f14e08a25394e720519fa (patch)
treefe63f3161dbb1317fb811afc7631ede6b183b232 /source/blender/render
parent6405ed8d3c27f303b4914f2879d1a051d55773c7 (diff)
Stampinfo: added correct redraw after adding stamp.
The issue: while renderprogress is in use, the rr->renlay has to be set
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index c368840c264..61bc6a84556 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1936,6 +1936,8 @@ static void do_render_composite_fields_blur_3d(Render *re)
}
}
+ /* weak... the display callback wants an active renderlayer pointer... */
+ re->result->renlay= render_get_active_layer(re, re->result);
re->display_draw(re->result, NULL);
}
@@ -2045,11 +2047,13 @@ static void do_render_all_options(Render *re)
re->i.lastframetime= PIL_check_seconds_timer()- re->i.starttime;
+ re->stats_draw(&re->i);
+
/* stamp image info here */
- if(G.scene->r.scemode & R_STAMP_INFO && G.scene->r.stamp & R_STAMP_DRAW)
+ if((G.scene->r.scemode & R_STAMP_INFO) && (G.scene->r.stamp & R_STAMP_DRAW)) {
renderresult_stampinfo();
-
- re->stats_draw(&re->i);
+ re->display_draw(re->result, NULL);
+ }
}
static int is_rendering_allowed(Render *re)