diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-03-16 04:47:03 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-03-16 04:48:19 +0300 |
| commit | d438120fe3ff564d8b3184aca82060f76b4829c0 (patch) | |
| tree | ea9239ae3358571e6d2e95df8a640bc626746b66 /source/blender/draw/engines/workbench/workbench_render.c | |
| parent | bd1d80d0cf9c8aa856b37a91750c94a0048528f5 (diff) | |
Fix T61526 hair doesn't render in workbench but does with openGL
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_render.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_render.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_render.c b/source/blender/draw/engines/workbench/workbench_render.c index 423134f5d6c..7a0e4150d28 100644 --- a/source/blender/draw/engines/workbench/workbench_render.c +++ b/source/blender/draw/engines/workbench/workbench_render.c @@ -124,6 +124,7 @@ static void workbench_render_framebuffers_finish(void) void workbench_render(WORKBENCH_Data *data, RenderEngine *engine, RenderLayer *render_layer, const rcti *rect) { + DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); const DRWContextState *draw_ctx = DRW_context_state_get(); const Scene *scene = draw_ctx->scene; Depsgraph *depsgraph = draw_ctx->depsgraph; @@ -146,6 +147,10 @@ void workbench_render(WORKBENCH_Data *data, RenderEngine *engine, RenderLayer *r workbench_deferred_cache_finish(data); DRW_render_instance_buffer_finish(); + /* Also we weed to have a correct fbo bound for DRW_hair_update */ + GPU_framebuffer_bind(dfbl->color_only_fb); + DRW_hair_update(); + /* Draw. */ int num_samples = workbench_taa_calculate_num_iterations(data); for (int sample = 0; sample < num_samples; sample++) { @@ -171,6 +176,10 @@ void workbench_render(WORKBENCH_Data *data, RenderEngine *engine, RenderLayer *r workbench_forward_cache_finish(data); DRW_render_instance_buffer_finish(); + /* Also we weed to have a correct fbo bound for DRW_hair_update */ + GPU_framebuffer_bind(dfbl->color_only_fb); + DRW_hair_update(); + /* Draw. */ int num_samples = workbench_taa_calculate_num_iterations(data); for (int sample = 0; sample < num_samples; sample++) { @@ -189,7 +198,6 @@ void workbench_render(WORKBENCH_Data *data, RenderEngine *engine, RenderLayer *r const char *viewname = RE_GetActiveRenderView(engine->re); RenderPass *rp = RE_pass_find_by_name(render_layer, RE_PASSNAME_COMBINED, viewname); - DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); GPU_framebuffer_bind(dfbl->color_only_fb); GPU_framebuffer_read_color(dfbl->color_only_fb, rect->xmin, rect->ymin, |