diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-17 17:39:18 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-17 17:39:18 +0300 |
| commit | 81ede7060948ce695b5620b3d887926b07f4b449 (patch) | |
| tree | 7ffb381ea11e3c18c5881f9ad8ba0657f5750246 /source | |
| parent | d26b7592b888ffcbf77c96e74f03970425fed697 (diff) | |
| parent | d442e0ad63ac54c92acc4d66af9b1e27c025a23e (diff) | |
Merge branch 'blender2.8' into blender2.8-workbench
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_effects.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_render.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 977eb14a1bb..719ff879e8e 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -423,7 +423,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) /* Save the final texture and framebuffer for final transformation or read. */ effects->final_tx = effects->source_buffer; - effects->final_fb = (effects->target_buffer != fbl->main_fb) ? fbl->main_fb : fbl->effect_fb; + effects->final_fb = (effects->target_buffer != fbl->main_color_fb) ? fbl->main_fb : fbl->effect_fb; /* If no post processes is enabled, buffers are still not swapped, do it now. */ SWAP_DOUBLE_BUFFERS(); diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 130999adb39..08dcb626964 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -288,6 +288,7 @@ static void eevee_render_result_z( if ((view_layer->passflag & SCE_PASS_Z) != 0) { RenderPass *rp = RE_pass_find_by_name(rl, RE_PASSNAME_Z, viewname); + GPU_framebuffer_bind(vedata->fbl->main_fb); GPU_framebuffer_read_depth(vedata->fbl->main_fb, rect->xmin, rect->ymin, BLI_rcti_size_x(rect), BLI_rcti_size_y(rect), diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 682eac6a352..04de8f6c94c 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1211,6 +1211,8 @@ static void icon_draw_size( h = (int)(fdraw_size / aspect + 0.5f); if (di->type == ICON_TYPE_VECTOR) { + /* We need to flush widget base first to ensure correct ordering. */ + UI_widgetbase_draw_cache_flush(); /* vector icons use the uiBlock transformation, they are not drawn * with untransformed coordinates like the other icons */ di->data.vector.func((int)x, (int)y, w, h, 1.0f); |