diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
| commit | 33f9fe3c620fef1d1ad2cb3443bf503afdb9db3b (patch) | |
| tree | a841b5f04d635d0af308f6bfce94c69ca6a2e6c1 /source/blender/draw/engines | |
| parent | 25c67a65d686aa04570db7409618ad779318c17a (diff) | |
| parent | f24e9bb0380936bcaf6c194b54342a2977784cff (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_antialiasing.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_engine.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_antialiasing.c b/source/blender/draw/engines/gpencil/gpencil_antialiasing.c index e81073db4a5..4dd5e3b2da1 100644 --- a/source/blender/draw/engines/gpencil/gpencil_antialiasing.c +++ b/source/blender/draw/engines/gpencil/gpencil_antialiasing.c @@ -115,6 +115,8 @@ void GPENCIL_antialiasing_init(struct GPENCIL_Data *vedata) DRW_shgroup_uniform_texture(grp, "colorTex", pd->color_tx); DRW_shgroup_uniform_texture(grp, "revealTex", pd->reveal_tx); DRW_shgroup_uniform_vec4_copy(grp, "viewportMetrics", metrics); + DRW_shgroup_uniform_float_copy( + grp, "lumaWeight", pd->scene->grease_pencil_settings.smaa_threshold); DRW_shgroup_clear_framebuffer(grp, GPU_COLOR_BIT, 0, 0, 0, 0, 0.0f, 0x0); DRW_shgroup_call_procedural_triangles(grp, NULL, 1); diff --git a/source/blender/draw/engines/gpencil/gpencil_shader.c b/source/blender/draw/engines/gpencil/gpencil_shader.c index fe095b1b916..6284e0a648c 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader.c @@ -135,10 +135,11 @@ GPUShader *GPENCIL_shader_antialiasing(int stage) }, .defs = (const char *[]){ + "uniform float lumaWeight;\n", "#define SMAA_GLSL_3\n", "#define SMAA_RT_METRICS viewportMetrics\n", "#define SMAA_PRESET_HIGH\n", - "#define SMAA_LUMA_WEIGHT float4(1.0, 1.0, 1.0, 0.0)\n", + "#define SMAA_LUMA_WEIGHT float4(lumaWeight, lumaWeight, lumaWeight, 0.0)\n", "#define SMAA_NO_DISCARD\n", stage_define, NULL, diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index 395ea9f9a8f..e875f2c8291 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -30,6 +30,7 @@ #include "ED_view3d.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "overlay_engine.h" #include "overlay_private.h" @@ -237,7 +238,8 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob) const bool in_particle_edit_mode = ob->mode == OB_MODE_PARTICLE_EDIT; const bool in_paint_mode = (ob == draw_ctx->obact) && (draw_ctx->object_mode & OB_MODE_ALL_PAINT); - const bool in_sculpt_mode = (ob == draw_ctx->obact) && (ob->sculpt != NULL); + const bool in_sculpt_mode = (ob == draw_ctx->obact) && (ob->sculpt != NULL) && + (ob->sculpt->mode_type == OB_MODE_SCULPT); const bool has_surface = ELEM(ob->type, OB_MESH, OB_CURVE, |