diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-10-26 18:33:54 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-10-26 18:33:54 +0300 |
| commit | 253ae3d3f0acbf8455f085abed59f07c23e387a0 (patch) | |
| tree | 88a034eebd1d8d63b05c9d1ba09125653b1c1a2c /source/blender/modifiers | |
| parent | 841eaebfa4056d4964226813855d1d30b9b8544f (diff) | |
| parent | 47eabae951b059f9ecb753cec96bf27b187a5522 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_datatransfer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 9b6a21c840d..d4c941d144d 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -267,7 +267,14 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(sub, ptr, "use_object_transform", 0, "", ICON_ORIENTATION_GLOBAL); uiItemR(layout, ptr, "mix_mode", 0, NULL, ICON_NONE); - uiItemR(layout, ptr, "mix_factor", 0, NULL, ICON_NONE); + + row = uiLayoutRow(layout, false); + uiLayoutSetActive(row, + !ELEM(RNA_enum_get(ptr, "mix_mode"), + CDT_MIX_NOMIX, + CDT_MIX_REPLACE_ABOVE_THRESHOLD, + CDT_MIX_REPLACE_BELOW_THRESHOLD)); + uiItemR(row, ptr, "mix_factor", 0, NULL, ICON_NONE); modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL); |