[Bf-blender-cvs] [197e889] master: Transfer Data: resurrect fake AND/OR when transferring 'boolean' values like UVSeam, Freestyle marks, etc.

[Bastien Montagne]

Commit: 197e889104697603f8da7793e8e55b6eebc45799
Author: Bastien Montagne
Date:   Wed Jan 14 10:51:41 2015 +0100
Branches: master
https://developer.blender.org/rB197e889104697603f8da7793e8e55b6eebc45799

Transfer Data: resurrect fake AND/OR when transferring 'boolean' values like UVSeam, Freestyle marks, etc.

===================================================================

M	source/blender/blenkernel/intern/data_transfer.c
M	source/blender/editors/object/object_data_transfer.c
M	source/blender/makesrna/intern/rna_modifier.c

===================================================================

diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index b573d62..d41c747 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 6892dc1..f6cf031 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 3b9ff43..c412fd4 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);
 	}