Commit: b3c2926bc06bf55c169b1a74d29a285a906efe3a Author: Antonioya Date: Thu Jun 27 19:11:39 2019 +0200 Branches: temp-gpencil-drw-engine https://developer.blender.org/rBb3c2926bc06bf55c169b1a74d29a285a906efe3a
GPencil: Remove redundant parameter =================================================================== M source/blender/draw/engines/gpencil/gpencil_engine.c =================================================================== diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index a35c4a06f75..3a34deafa4f 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -819,14 +819,14 @@ static void gpencil_draw_pass_range(GPENCIL_FramebufferList *fbl, Object *ob, bGPdata *gpd, DRWShadingGroup *init_shgrp, - DRWShadingGroup *end_shgrp, - bool multi) + DRWShadingGroup *end_shgrp) { if (init_shgrp == NULL) { return; } - const bool do_antialiasing = ((!stl->storage->is_mat_preview) && (multi)); + const bool do_antialiasing = ((!stl->storage->is_mat_preview) && + (stl->storage->multisamples > 0)); DRWShadingGroup *shgrp = init_shgrp; DRWShadingGroup *from_shgrp = init_shgrp; @@ -834,10 +834,6 @@ static void gpencil_draw_pass_range(GPENCIL_FramebufferList *fbl, int stencil_tot = 0; bool do_last = true; - if (do_antialiasing) { - MULTISAMPLE_GP_SYNC_ENABLE(stl->storage->multisamples, fbl); - } - /* Loop all shading groups to separate by stencil groups. */ while ((shgrp) && (shgrp != end_shgrp)) { do_last = true; @@ -898,10 +894,6 @@ static void gpencil_draw_pass_range(GPENCIL_FramebufferList *fbl, from_shgrp, to_shgrp); } - - if (do_antialiasing) { - MULTISAMPLE_GP_SYNC_DISABLE(stl->storage->multisamples, fbl, fb, txl); - } } /* draw strokes to use for selection */ @@ -1052,14 +1044,14 @@ void GPENCIL_draw_scene(void *ved) } gpencil_draw_pass_range( - fbl, stl, psl, txl, fbl->temp_fb_a, ob, gpd, init_shgrp, end_shgrp, false); + fbl, stl, psl, txl, fbl->temp_fb_a, ob, gpd, init_shgrp, end_shgrp); } else { /* Draw current group in separated texture to blend later. */ GPU_framebuffer_bind(fbl->temp_fb_fx); GPU_framebuffer_clear_color_depth_stencil(fbl->temp_fb_fx, clearcol, 1.0f, 0x0); gpencil_draw_pass_range( - fbl, stl, psl, txl, fbl->temp_fb_a, ob, gpd, init_shgrp, end_shgrp, false); + fbl, stl, psl, txl, fbl->temp_fb_a, ob, gpd, init_shgrp, end_shgrp); /* Draw Blended texture over MSAA texture */ GPU_framebuffer_bind(fbl->multisample_fb); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs