[Bf-blender-cvs] [a96b382] multiview: From review: leftover from d9d94d0c (remove viewname from RE_display_update_cb)
Dalai Felinto
noreply at git.blender.org
Wed Nov 26 19:45:16 CET 2014
Commit: a96b3822060c894d2e32e2234f9498b752673d78
Author: Dalai Felinto
Date: Wed Nov 26 16:35:36 2014 -0200
Branches: multiview
https://developer.blender.org/rBa96b3822060c894d2e32e2234f9498b752673d78
>From review: leftover from d9d94d0c (remove viewname from RE_display_update_cb)
===================================================================
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/rendercore.c
===================================================================
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 1da9c0b..fa56cdf 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -254,7 +254,7 @@ struct Render
void *dih;
void (*display_clear)(void *handle, RenderResult *rr);
void *dch;
- void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect, const char *viewname);
+ void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect);
void *duh;
void (*current_scene_update)(void *handle, struct Scene *scene);
void *suh;
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 891dc2c..b5261ef 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -243,7 +243,7 @@ void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
if (result) {
result->renlay = result->layers.first; /* weak, draws first layer always */
- re->display_update(re->duh, result, NULL, re->viewname);
+ re->display_update(re->duh, result, NULL);
}
}
@@ -282,7 +282,7 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int cancel
/* draw */
if (!re->test_break(re->tbh)) {
result->renlay = result->layers.first; /* weak, draws first layer always */
- re->display_update(re->duh, result, NULL, re->viewname);
+ re->display_update(re->duh, result, NULL);
}
}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 3244f2d..c1d01eb 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -143,7 +143,7 @@ static int thread_break(void *UNUSED(arg))
/* default callbacks, set in each new render */
static void result_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr)) {}
-static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect), const char *UNUSED(viewname)) {}
+static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect)) {}
static void current_scene_nothing(void *UNUSED(arg), Scene *UNUSED(scene)) {}
static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) {}
static void float_nothing(void *UNUSED(arg), float UNUSED(val)) {}
@@ -1171,7 +1171,7 @@ typedef struct RenderThread {
int number;
- void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect, const char *viewname);
+ void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect);
void *duh;
} RenderThread;
@@ -1185,7 +1185,7 @@ static void *do_render_thread(void *thread_v)
do_part_thread(pa);
if (thread->display_update) {
- thread->display_update(thread->duh, pa->result, NULL, RR_ALL_VIEWS);
+ thread->display_update(thread->duh, pa->result, NULL);
}
BLI_thread_queue_push(thread->donequeue, pa);
@@ -1327,7 +1327,7 @@ static void threaded_tile_processor(Render *re)
if (render_display_update_enabled(re))
for (pa = re->parts.first; pa; pa = pa->next)
if ((pa->status == PART_STATUS_IN_PROGRESS) && pa->nr && pa->result)
- re->display_update(re->duh, pa->result, &pa->result->renrect, re->viewname);
+ re->display_update(re->duh, pa->result, &pa->result->renrect);
lastdraw = PIL_check_seconds_timer();
}
@@ -1579,7 +1579,7 @@ static void do_render_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_update(re->duh, re->result, NULL, re->viewname);
+ re->display_update(re->duh, re->result, NULL);
}
@@ -1697,7 +1697,7 @@ static void do_render_fields_3d(Render *re)
BLI_rw_mutex_unlock(&re->resultmutex);
- re->display_update(re->duh, re->result, NULL, re->viewname);
+ re->display_update(re->duh, re->result, NULL);
}
/* make sure disprect is not affected by the render border */
@@ -1761,7 +1761,7 @@ static void do_render_fields_blur_3d(Render *re)
BLI_rw_mutex_unlock(&re->resultmutex);
re->display_init(re->dih, re->result);
- re->display_update(re->duh, re->result, NULL, re->viewname);
+ re->display_update(re->duh, re->result, NULL);
/* restore the disprect from border */
re->disprect = orig_disprect;
@@ -2261,7 +2261,8 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
if (sample != re->osa - 1) {
/* weak... the display callback wants an active renderlayer pointer... */
re->result->renlay = render_get_active_layer(re, re->result);
- re->display_update(re->duh, re->result, NULL, rv->name);
+ RE_SetActiveRenderView(re, rv->name);
+ re->display_update(re->duh, re->result, NULL);
}
}
}
@@ -2467,7 +2468,7 @@ 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_update(re->duh, re->result, NULL, 0);
+ re->display_update(re->duh, re->result, NULL);
}
static void renderresult_stampinfo(Render *re)
@@ -2583,7 +2584,8 @@ static void do_render_seq(Render *re)
BLI_rw_mutex_unlock(&re->resultmutex);
/* would mark display buffers as invalid */
- re->display_update(re->duh, re->result, NULL, rv->name);
+ RE_SetActiveRenderView(re, rv->name);
+ re->display_update(re->duh, re->result, NULL);
}
MEM_freeN(ibuf);
@@ -2623,7 +2625,7 @@ static void do_render_all_options(Render *re)
do_render_seq(re);
re->stats_draw(re->sdh, &re->i);
- re->display_update(re->duh, re->result, NULL, re->viewname);
+ re->display_update(re->duh, re->result, NULL);
}
else {
re->pool = BKE_image_pool_new();
@@ -2641,7 +2643,7 @@ static void do_render_all_options(Render *re)
/* stamp image info here */
if ((re->r.stamp & R_STAMP_ALL) && (re->r.stamp & R_STAMP_DRAW)) {
renderresult_stampinfo(re);
- re->display_update(re->duh, re->result, NULL, re->viewname);
+ re->display_update(re->duh, re->result, NULL);
}
}
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 0aef17d..ccb0559 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -2013,7 +2013,7 @@ void add_halo_flare(Render *re)
if (do_draw) {
/* weak... the display callback wants an active renderlayer pointer... */
rr->renlay= rl;
- re->display_update(re->duh, rr, NULL, re->viewname);
+ re->display_update(re->duh, rr, NULL);
}
R.r.mode= mode;
More information about the Bf-blender-cvs
mailing list