diff options
| -rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index b573d621052..d41c74770f1 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -131,6 +131,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity( ret = true; break; case DT_TYPE_FREESTYLE_EDGE: + *r_threshold = true; ret = true; break; /* Loop/Poly data */ @@ -143,9 +144,11 @@ bool BKE_object_data_transfer_get_dttypes_capacity( ret = true; break; case DT_TYPE_SHARP_FACE: + *r_threshold = true; ret = true; break; case DT_TYPE_FREESTYLE_FACE: + *r_threshold = true; ret = true; break; } diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 6892dc16aad..f6cf0312e2d 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -226,7 +226,7 @@ static EnumPropertyItem *dt_mix_mode_itemf(bContext *C, PointerRNA *ptr, Propert BKE_object_data_transfer_get_dttypes_capacity(dtdata_type, &support_advanced_mixing, &support_threshold); - if (support_advanced_mixing) { + if (support_threshold) { RNA_enum_items_add_value(&item, &totitem, DT_mix_mode_items, CDT_MIX_REPLACE_ABOVE_THRESHOLD); RNA_enum_items_add_value(&item, &totitem, DT_mix_mode_items, CDT_MIX_REPLACE_BELOW_THRESHOLD); } diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 3b9ff43ab13..c412fd460b3 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -993,7 +993,7 @@ static EnumPropertyItem *rna_DataTransferModifier_mix_mode_itemf(bContext *C, Po BKE_object_data_transfer_get_dttypes_capacity(dtmd->data_types, &support_advanced_mixing, &support_threshold); - if (support_advanced_mixing) { + if (support_threshold) { RNA_enum_items_add_value(&item, &totitem, DT_mix_mode_items, CDT_MIX_REPLACE_ABOVE_THRESHOLD); RNA_enum_items_add_value(&item, &totitem, DT_mix_mode_items, CDT_MIX_REPLACE_BELOW_THRESHOLD); } |