Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2022-06-21 20:09:54 +0300
committerAntonio Vazquez <blendergit@gmail.com>2022-06-21 20:09:54 +0300
commitdd6d0aefcc56288bfe154fe06df56163d6961372 (patch)
tree7b74c26bcd48d0fbd844fd8b286c9a399813b203 /release/scripts/startup/bl_ui/properties_mask_common.py
parentc27a395d8cd8b58b3155cfdc26ae35198fbcdb14 (diff)
parent714001683888770f9d870ba73edd65f4c2757bda (diff)
Merge branch 'master' into asset-greasepencilasset-greasepencil
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_mask_common.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_mask_common.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py
index 3131833454b..47a25db20b1 100644
--- a/release/scripts/startup/bl_ui/properties_mask_common.py
+++ b/release/scripts/startup/bl_ui/properties_mask_common.py
@@ -239,6 +239,9 @@ class MASK_PT_display:
sub = row.row()
sub.active = space_data.show_mask_overlay
sub.prop(space_data, "mask_overlay_mode", text="")
+ row = layout.row()
+ row.active = (space_data.mask_overlay_mode in ['COMBINED'] and space_data.show_mask_overlay)
+ row.prop(space_data, "blend_factor", text="Blending Factor")
class MASK_PT_transforms: