Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,

by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.

6 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 4ac418fdd9a..8ae13531a87 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4389,7 +4389,7 @@ useless:
 				}
 				look = look->next;
 			}
-		} /* end uv layer loop */
+		} /* end uv map loop */
 	} /* end uvlay_tot */
 
 
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 46076d0bec4..aa94b48c1e9 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -337,8 +337,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_uv_texture_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add UV Texture";
-	ot->description= "Add UV texture layer";
+	ot->name= "Add UV Map";
+	ot->description= "Add UV Map";
 	ot->idname= "MESH_OT_uv_texture_add";
 	
 	/* api callbacks */
@@ -417,8 +417,8 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void MESH_OT_drop_named_image(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Assign Image to UV Texture";
-	ot->description= "Assigns Image to active UV layer, or creates a UV layer";
+	ot->name= "Assign Image to UV Map";
+	ot->description= "Assigns Image to active UV Map, or creates a UV Map";
 	ot->idname= "MESH_OT_drop_named_image";
 	
 	/* api callbacks */
@@ -447,8 +447,8 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_uv_texture_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove UV Texture";
-	ot->description= "Remove UV texture layer";
+	ot->name= "Remove UV Map";
+	ot->description= "Remove UV Map";
 	ot->idname= "MESH_OT_uv_texture_remove";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index e1a45a6367c..d557a3bd144 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -263,7 +263,7 @@ typedef struct ProjPaintState {
 	MVert 		   *dm_mvert;
 	MFace 		   *dm_mface;
 	MTFace 		   *dm_mtface;
-	MTFace 		   *dm_mtface_clone;	/* other UV layer, use for cloning between layers */
+	MTFace 		   *dm_mtface_clone;	/* other UV map, use for cloning between layers */
 	MTFace 		   *dm_mtface_stencil;
 	
 	/* projection painting only */
@@ -1347,7 +1347,7 @@ static float project_paint_uvpixel_mask(
 	
 	/* Image Mask */
 	if (ps->do_layer_stencil) {
-		/* another UV layers image is masking this one's */
+		/* another UV maps image is masking this one's */
 		ImBuf *ibuf_other;
 		Image *other_tpage = project_paint_face_image(ps, ps->dm_mtface_stencil, face_index);
 		const MTFace *tf_other = ps->dm_mtface_stencil + face_index;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 73a71a25eba..cee7b19470b 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4740,7 +4740,7 @@ static int createSlideVerts(TransInfo *t)
 				}
 				look = look->next;
 			}
-		} /* end uv layer loop */
+		} /* end uv map loop */
 	} /* end uvlay_tot */
 
 	sld->uvhash = uvarray;
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 7fc878de3f9..92bd74db68a 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -165,7 +165,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im
 	else {
 		/* old shading system, assign image to selected faces */
 		
-		/* ensure we have a uv layer */
+		/* ensure we have a uv map */
 		if(!CustomData_has_layer(&em->fdata, CD_MTFACE)) {
 			EM_add_data_layer(em, &em->fdata, CD_MTFACE, NULL);
 			update= 1;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 11cd50a7d4e..c565e2fc305 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -896,7 +896,7 @@ static void uv_map_clip_correct(EditMesh *em, wmOperator *op)
 
 /* ******************** Unwrap operator **************** */
 
-/* assumes UV layer is checked, doesn't run update funcs */
+/* assumes UV Map is checked, doesn't run update funcs */
 void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel)
 {
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);