[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51441] trunk/blender/source/blender/ makesrna/intern: More UI messages fixes and tweaks, and BKE_report<-> BKE_reportf.

Bastien Montagne montagne29 at wanadoo.fr
Sat Oct 20 12:28:36 CEST 2012


Revision: 51441
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51441
Author:   mont29
Date:     2012-10-20 10:28:34 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
More UI messages fixes and tweaks, and BKE_report<->BKE_reportf.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/makesrna/intern/rna_armature.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/makesrna/intern/rna_group.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c
    trunk/blender/source/blender/makesrna/intern/rna_meta.c
    trunk/blender/source/blender/makesrna/intern/rna_nla.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2012-10-20 10:11:26 UTC (rev 51440)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2012-10-20 10:28:34 UTC (rev 51441)
@@ -3169,7 +3169,7 @@
 						itemtype = RNA_property_type(iprop);
 					}
 					else {
-						BKE_reportf(reports, RPT_ERROR, "Property named %s not found", propname);
+						BKE_reportf(reports, RPT_ERROR, "Property named '%s' not found", propname);
 						err = 1;
 						break;
 					}

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-10-20 10:11:26 UTC (rev 51440)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-10-20 10:28:34 UTC (rev 51441)
@@ -103,7 +103,7 @@
 static EditBone *rna_Armature_edit_bone_new(bArmature *arm, ReportList *reports, const char *name)
 {
 	if (arm->edbo == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in editmode, cant add an editbone", arm->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in edit mode, cannot add an editbone", arm->id.name + 2);
 		return NULL;
 	}
 	return ED_armature_edit_bone_add(arm, name);
@@ -112,12 +112,12 @@
 static void rna_Armature_edit_bone_remove(bArmature *arm, ReportList *reports, EditBone *ebone)
 {
 	if (arm->edbo == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in editmode, cant remove an editbone", arm->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in edit mode, cannot remove an editbone", arm->id.name + 2);
 		return;
 	}
 
 	if (BLI_findindex(arm->edbo, ebone) == -1) {
-		BKE_reportf(reports, RPT_ERROR, "Armature '%s' doesn't contain bone '%s'", arm->id.name + 2, ebone->name);
+		BKE_reportf(reports, RPT_ERROR, "Armature '%s' does not contain bone '%s'", arm->id.name + 2, ebone->name);
 		return;
 	}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2012-10-20 10:11:26 UTC (rev 51440)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2012-10-20 10:28:34 UTC (rev 51441)
@@ -511,7 +511,7 @@
 static void rna_Curve_spline_points_add(ID *id, Nurb *nu, ReportList *reports, int number)
 {
 	if (nu->type == CU_BEZIER) {
-		BKE_report(reports, RPT_ERROR, "Bezier spline can't have points added");
+		BKE_report(reports, RPT_ERROR, "Bezier spline cannot have points added");
 	}
 	else if (number == 0) {
 		/* do nothing */
@@ -581,7 +581,7 @@
 	found = BLI_remlink_safe(nurbs, nu);
 
 	if (!found) {
-		BKE_reportf(reports, RPT_ERROR, "Curve \"%s\" does not contain spline given", cu->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Curve '%s' does not contain spline given", cu->id.name + 2);
 		return;
 	}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_group.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_group.c	2012-10-20 10:11:26 UTC (rev 51440)
+++ trunk/blender/source/blender/makesrna/intern/rna_group.c	2012-10-20 10:28:34 UTC (rev 51441)
@@ -54,7 +54,7 @@
 static void rna_Group_objects_link(Group *group, bContext *C, ReportList *reports, Object *object)
 {
 	if (!add_to_group(group, object, CTX_data_scene(C), NULL)) {
-		BKE_reportf(reports, RPT_ERROR, "Object \"%s\" already in group \"%s\"", object->id.name + 2, group->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' already in group '%s'", object->id.name + 2, group->id.name + 2);
 		return;
 	}
 
@@ -64,7 +64,7 @@
 static void rna_Group_objects_unlink(Group *group, bContext *C, ReportList *reports, Object *object)
 {
 	if (!rem_from_group(group, object, CTX_data_scene(C), NULL)) {
-		BKE_reportf(reports, RPT_ERROR, "Object \"%s\" not in group \"%s\"", object->id.name + 2, group->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in group '%s'", object->id.name + 2, group->id.name + 2);
 		return;
 	}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2012-10-20 10:11:26 UTC (rev 51440)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2012-10-20 10:28:34 UTC (rev 51441)
@@ -110,7 +110,7 @@
 	if (ID_REAL_USERS(camera) <= 0)
 		BKE_libblock_free(&bmain->camera, camera);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Camera \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Camera '%s' must have zero users to be removed, found %d",
 		            camera->id.name + 2, ID_REAL_USERS(camera));
 
 	/* XXX python now has invalid pointer? */
@@ -130,7 +130,7 @@
 	else if (scene->id.next)
 		newscene = scene->id.next;
 	else {
-		BKE_reportf(reports, RPT_ERROR, "Scene \"%s\" is the last, can't be removed", scene->id.name + 2);
+		BKE_reportf(reports, RPT_ERROR, "Scene '%s' is the last, cannot be removed", scene->id.name + 2);
 		return;
 	}
 
@@ -177,7 +177,7 @@
 				if (RNA_enum_id_from_value(id_type_items, GS(data->name), &idname) == 0)
 					idname = "UNKNOWN";
 
-				BKE_reportf(reports, RPT_ERROR, "ID type '%s' is not valid for a object", idname);
+				BKE_reportf(reports, RPT_ERROR, "ID type '%s' is not valid for an object", idname);
 				return NULL;
 			}
 		}
@@ -201,7 +201,7 @@
 		BKE_libblock_free(&bmain->object, object);
 	}
 	else {
-		BKE_reportf(reports, RPT_ERROR, "Object \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' must have zero users to be removed, found %d",
 		            object->id.name + 2, ID_REAL_USERS(object));
 	}
 }
@@ -217,7 +217,7 @@
 	if (ID_REAL_USERS(material) <= 0)
 		BKE_libblock_free(&bmain->mat, material);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Material \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Material '%s' must have zero users to be removed, found %d",
 		            material->id.name + 2, ID_REAL_USERS(material));
 
 	/* XXX python now has invalid pointer? */
@@ -235,7 +235,7 @@
 	if (ID_REAL_USERS(tree) <= 0)
 		BKE_libblock_free(&bmain->nodetree, tree);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Node Tree \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Node tree '%s' must have zero users to be removed, found %d",
 		            tree->id.name + 2, ID_REAL_USERS(tree));
 
 	/* XXX python now has invalid pointer? */
@@ -252,7 +252,7 @@
 	if (ID_REAL_USERS(mesh) <= 0)
 		BKE_libblock_free(&bmain->mesh, mesh);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Mesh \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Mesh '%s' must have zero users to be removed, found %d",
 		            mesh->id.name + 2, ID_REAL_USERS(mesh));
 
 	/* XXX python now has invalid pointer? */
@@ -270,7 +270,7 @@
 	if (ID_REAL_USERS(lamp) <= 0)
 		BKE_libblock_free(&bmain->lamp, lamp);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Lamp \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Lamp '%s' must have zero users to be removed, found %d",
 		            lamp->id.name + 2, ID_REAL_USERS(lamp));
 
 	/* XXX python now has invalid pointer? */
@@ -291,8 +291,8 @@
 	ima = BKE_image_load(filepath);
 
 	if (!ima)
-		BKE_reportf(reports, RPT_ERROR, "Can't read \"%s\": %s", filepath,
-		            errno ? strerror(errno) : TIP_("Unsupported image format"));
+		BKE_reportf(reports, RPT_ERROR, "Cannot read '%s': %s", filepath,
+		            errno ? strerror(errno) : TIP_("unsupported image format"));
 
 	return ima;
 }
@@ -301,7 +301,7 @@
 	if (ID_REAL_USERS(image) <= 0)
 		BKE_libblock_free(&bmain->image, image);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Image \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Image '%s' must have zero users to be removed, found %d",
 		            image->id.name + 2, ID_REAL_USERS(image));
 
 	/* XXX python now has invalid pointer? */
@@ -318,7 +318,7 @@
 	if (ID_REAL_USERS(lt) <= 0)
 		BKE_libblock_free(&bmain->latt, lt);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Lattice \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Lattice '%s' must have zero users to be removed, found %d",
 		            lt->id.name + 2, ID_REAL_USERS(lt));
 }
 
@@ -333,7 +333,7 @@
 	if (ID_REAL_USERS(cu) <= 0)
 		BKE_libblock_free(&bmain->curve, cu);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Curve \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Curve '%s' must have zero users to be removed, found %d",
 		            cu->id.name + 2, ID_REAL_USERS(cu));
 }
 
@@ -348,7 +348,7 @@
 	if (ID_REAL_USERS(mb) <= 0)
 		BKE_libblock_free(&bmain->mball, mb);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Metaball \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Metaball '%s' must have zero users to be removed, found %d",
 		            mb->id.name + 2, ID_REAL_USERS(mb));
 }
 
@@ -360,8 +360,8 @@
 	font = BKE_vfont_load(bmain, filepath);
 
 	if (!font)
-		BKE_reportf(reports, RPT_ERROR, "Can't read \"%s\": %s", filepath,
-		            errno ? strerror(errno) : TIP_("Unsupported font format"));
+		BKE_reportf(reports, RPT_ERROR, "Cannot read '%s': %s", filepath,
+		            errno ? strerror(errno) : TIP_("unsupported font format"));
 
 	return font;
 
@@ -371,7 +371,7 @@
 	if (ID_REAL_USERS(vfont) <= 0)
 		BKE_libblock_free(&bmain->vfont, vfont);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Font \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Font '%s' must have zero users to be removed, found %d",
 		            vfont->id.name + 2, ID_REAL_USERS(vfont));
 
 	/* XXX python now has invalid pointer? */
@@ -389,7 +389,7 @@
 	if (ID_REAL_USERS(tex) <= 0)
 		BKE_libblock_free(&bmain->tex, tex);
 	else
-		BKE_reportf(reports, RPT_ERROR, "Texture \"%s\" must have zero users to be removed, found %d",
+		BKE_reportf(reports, RPT_ERROR, "Texture '%s' must have zero users to be removed, found %d",

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list