More UI messages and BKE_reportf->BKE_report fixes...

4 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 9af0eda880a..bc5d289d04c 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -937,7 +937,7 @@ static int multiresbake_check(bContext *C, wmOperator *op)
 		ob = base->object;
 
 		if (ob->type != OB_MESH) {
-			BKE_report(op->reports, RPT_ERROR, "Basking of multires data only works with active object which is a mesh");
+			BKE_report(op->reports, RPT_ERROR, "Baking of multires data only works with an active mesh object");
 
 			ok = 0;
 			break;
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index a6afe6b2d04..8bc249974f2 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -442,7 +442,7 @@ static int add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *ob
 	ok = object_hook_index_array(scene, obedit, &tot, &indexar, name, cent);
 
 	if (!ok) {
-		BKE_report(reports, RPT_ERROR, "Requires selected vertices or active Vertex Group");
+		BKE_report(reports, RPT_ERROR, "Requires selected vertices or active vertex group");
 		return FALSE;
 	}
 
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 3b508f1d3c6..4c95884a51a 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -417,7 +417,8 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 			cu = ob->data;
 
 			if (!(cu->flag & CU_3D) && (apply_rot || apply_loc)) {
-				BKE_report(reports, RPT_ERROR, "Neither rotation nor location could be applied to a 2d curve, doing nothing");
+				BKE_report(reports, RPT_ERROR,
+				           "Neither rotation nor location could be applied to a 2D curve, doing nothing");
 				change = 0;
 			}
 			if (cu->key) {
@@ -961,9 +962,9 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 	/* Warn if any errors occurred */
 	if (tot_lib_error + tot_multiuser_arm_error) {
-		BKE_reportf(op->reports, RPT_WARNING, "%i Object(s) Not Centered, %i Changed:", tot_lib_error + tot_multiuser_arm_error, tot_change);
+		BKE_reportf(op->reports, RPT_WARNING, "%i object(s) not centered, %i changed:", tot_lib_error + tot_multiuser_arm_error, tot_change);
 		if (tot_lib_error)
-			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library objects", tot_lib_error);
+			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library object(s)", tot_lib_error);
 		if (tot_multiuser_arm_error)
 			BKE_reportf(op->reports, RPT_WARNING, "|%i multiuser armature object(s)", tot_multiuser_arm_error);
 	}
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 95be54814f0..1be09847ef2 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -482,7 +482,7 @@ static int ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGrou
 
 	/* sanity check */
 	if (!me_src->dvert) {
-		BKE_reportf(op->reports, RPT_ERROR, "Transfer failed. Source mesh does not have any vertex groups");
+		BKE_report(op->reports, RPT_ERROR, "Transfer failed (source mesh does not have any vertex groups)");
 		return 0;
 	}
 
@@ -528,7 +528,7 @@ static int ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGrou
 				if (dv_array_src) MEM_freeN(dv_array_src);
 				if (dv_array_dst) MEM_freeN(dv_array_dst);
 				dmesh_src->release(dmesh_src);
-				BKE_reportf(op->reports, RPT_ERROR, "Transfer failed. Indices are not matching");
+				BKE_report(op->reports, RPT_ERROR, "Transfer failed (indices are not matching)");
 				return 0;
 			}
 
@@ -3126,7 +3126,7 @@ static int vertex_group_limit_total_exec(bContext *C, wmOperator *op)
 		return OPERATOR_FINISHED;
 	}
 	else {
-		BKE_reportf(op->reports, RPT_WARNING, "No vertex groups limited");
+		BKE_report(op->reports, RPT_WARNING, "No vertex groups limited");
 
 		/* note, would normally return cancelled, except we want the redo
 		 * UI to show up for users to change */
@@ -3248,7 +3248,7 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
 
 	if ((change == 0 && fail == 0) || fail) {
 		BKE_reportf(op->reports, RPT_ERROR,
-		            "Copy to VGroups to Selected warning done %d, failed %d, object data must have matching indices",
+		            "Copy VGroups to Selected warning, %d done, %d failed (object data must have matching indices)",
 		            change, fail);
 	}