diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2018-02-21 20:22:25 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2018-02-21 20:22:25 +0300 |
| commit | ec6545efad5fed99980fc3e2d5962b40fbeb12ae (patch) | |
| tree | 31729e5064a46f3663d92cf74a422de50fbd2780 /source/blender/editors/mask | |
| parent | 3f0871dfcfbb1dda15c176dba92d36639305385a (diff) | |
| parent | 813204838a268fd8108e9f9bc96bb1b4680c7929 (diff) | |
Merge branch 'blender2.8' into topbar
Diffstat (limited to 'source/blender/editors/mask')
| -rw-r--r-- | source/blender/editors/mask/mask_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_select.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index c60b673ec69..689a96a3dec 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -555,7 +555,7 @@ static void draw_masklays(const bContext *C, Mask *mask, const char draw_flag, c const int width, const int height) { glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); GPU_enable_program_point_size(); MaskLayer *masklay; diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 9f2f6de8a09..7ffd82e262c 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" #include "BLI_rect.h" -#include "BLI_lasso.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BKE_context.h" |