[Bf-blender-cvs] [b95f2ee] mesh-transfer-data: Some UI tweaks (renames only for now), from review.

Bastien Montagne noreply at git.blender.org
Wed Nov 12 20:50:44 CET 2014


Commit: b95f2ee3c04e49a17f43511922cc2ea3d22eb4a4
Author: Bastien Montagne
Date:   Wed Nov 12 20:32:54 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBb95f2ee3c04e49a17f43511922cc2ea3d22eb4a4

Some UI tweaks (renames only for now), from review.

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

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

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

diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 4e19653..ff49a8f 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -76,13 +76,13 @@ static EnumPropertyItem DT_layer_items[] = {
 	{DT_DATA_SEAM, "SEAM", 0, "Seam", "Transfer UV seam flag"},
 	{DT_DATA_CREASE, "CREASE", 0, "Subsurf Crease", "Transfer crease values"},
 	{DT_DATA_BWEIGHT_EDGE, "BEVEL_WEIGHT_EDGE", 0, "Bevel Weight", "Transfer bevel weights"},
-	{DT_DATA_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Flag", "Transfer Freestyle edge flag"},
+	{DT_DATA_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Mark", "Transfer Freestyle edge mark"},
 	{0, "", 0, "Face Corner Data", ""},
 	{DT_DATA_VCOL, "VCOL", 0, "VCol", "Vertex (face corners) colors"},
 	{0, "", 0, "Face Data", ""},
 	{DT_DATA_UV, "UV", 0, "UVs", "Transfer UV layers"},
 	{DT_DATA_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer flat/smooth flag"},
-	{DT_DATA_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Flag", "Transfer Freestyle face flag"},
+	{DT_DATA_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Mark", "Transfer Freestyle face mark"},
 	{0, NULL, 0, NULL, NULL}
 };
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 176809e..df8b964 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -192,7 +192,7 @@ EnumPropertyItem DT_method_poly_items[] = {
 /* How to filter out some elements (to leave untouched).
  * Note those options are highly dependent on type of transferred data! */
 EnumPropertyItem DT_mix_mode_items[] = {
-	{CDT_MIX_TRANSFER, "REPLACE", 0, "All", "Overwrite all elements' data"},
+	{CDT_MIX_TRANSFER, "REPLACE", 0, "Replace", "Overwrite all elements' data"},
 	{CDT_MIX_REPLACE_ABOVE_THRESHOLD, "ABOVE_THRESHOLD", 0, "Above Threshold",
 			"Only replace dest elements where data is above given threshold (exact behavior depends on data type)"},
 	{CDT_MIX_REPLACE_BELOW_THRESHOLD, "BELOW_THRESHOLD", 0, "Below Threshold",
@@ -226,7 +226,7 @@ EnumPropertyItem DT_fromlayers_select_items[] = {
 EnumPropertyItem DT_tolayers_select_items[] = {
 	{DT_TOLAYERS_ACTIVE, "ACTIVE", 0, "Active Layer", "Affect active data layer of all targets"},
 	{DT_TOLAYERS_NAME, "NAME", 0, "By Name", "Match target data layers to affect by name"},
-	{DT_TOLAYERS_INDEX, "INDEX", 0, "By Position", "Match target data layers to affect by position (indices)"},
+	{DT_TOLAYERS_INDEX, "INDEX", 0, "By Order", "Match target data layers to affect by order (indices)"},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -4019,7 +4019,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
 		{DT_DATA_SEAM, "SEAM", 0, "Seam", "Transfer UV seam flag"},
 		{DT_DATA_CREASE, "CREASE", 0, "Subsurf Crease", "Transfer crease values"},
 		{DT_DATA_BWEIGHT_EDGE, "BEVEL_WEIGHT_EDGE", 0, "Bevel Weight", "Transfer bevel weights"},
-		{DT_DATA_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Flag", "Transfer Freestyle edge flag"},
+		{DT_DATA_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Mark", "Transfer Freestyle edge mark"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -4033,7 +4033,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
 
 	static EnumPropertyItem DT_layer_poly_items[] = {
 		{DT_DATA_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer flat/smooth flag"},
-		{DT_DATA_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Flag", "Transfer Freestyle face flag"},
+		{DT_DATA_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Mark", "Transfer Freestyle face mark"},
 		{0, NULL, 0, NULL, NULL}
 	};
 	static EnumPropertyItem DT_layer_poly_uv_items[] = {




More information about the Bf-blender-cvs mailing list