[Bf-blender-cvs] [057c7c6] master: Cleanup: do not use _reportf() when not doing any string formating!

Bastien Montagne noreply at git.blender.org
Mon Apr 13 21:01:08 CEST 2015


Commit: 057c7c6fabdb6106079fe4af90721c79c5c59142
Author: Bastien Montagne
Date:   Mon Apr 13 21:00:06 2015 +0200
Branches: master
https://developer.blender.org/rB057c7c6fabdb6106079fe4af90721c79c5c59142

Cleanup: do not use _reportf() when not doing any string formating!

Also usual minor i18n messages stuff...

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

M	release/scripts/modules/bl_i18n_utils/settings.py
M	source/blender/makesrna/intern/rna_color.c
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/windowmanager/intern/wm_stereo.c

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

diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index 920a56a..c1d9b92 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -324,6 +324,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
     "y",
     # Sub-strings.
     "available with",
+    "brown fox",
     "can't save image while rendering",
     "expected a timeline/animation area to be active",
     "expected a view3d region",
@@ -332,6 +333,8 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
     "image file not found",
     "image path can't be written to",
     "in memory to enable editing!",
+    "jumps over",
+    "the lazy dog",
     "unable to load movie clip",
     "unable to load text",
     "unable to open the file",
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 0c87131..8ea67a3 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -673,7 +673,7 @@ static void rna_ColorManagement_update(Main *UNUSED(bmain), Scene *UNUSED(scene)
 static float rna_CurveMap_evaluateF(struct CurveMap *cuma, ReportList *reports, float value)
 {
 	if (!cuma->table) {
-		BKE_reportf(reports, RPT_ERROR, "CurveMap table not initialized, call initialize() on CurveMapping owner of the CurveMap");
+		BKE_report(reports, RPT_ERROR, "CurveMap table not initialized, call initialize() on CurveMapping owner of the CurveMap");
 		return 0.0f;
 	}
 	return curvemap_evaluateF(cuma, value);
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 075b139..da77b9e 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1578,7 +1578,7 @@ static bNodeSocket *rna_Node_outputs_new(ID *id, bNode *node, ReportList *report
 	sock = nodeAddSocket(ntree, node, SOCK_OUT, type, identifier, name);
 	
 	if (sock == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to create socket");
+		BKE_report(reports, RPT_ERROR, "Unable to create socket");
 	}
 	else {
 		ntreeUpdateTree(G.main, ntree);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index f93cdc5..ee77bcc 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1907,7 +1907,7 @@ static void rna_FreestyleSettings_module_remove(
 		if (module->script)
 			BKE_reportf(reports, RPT_ERROR, "Style module '%s' could not be removed", module->script->id.name + 2);
 		else
-			BKE_reportf(reports, RPT_ERROR, "Style module could not be removed");
+			BKE_report(reports, RPT_ERROR, "Style module could not be removed");
 		return;
 	}
 
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index c619b2e..3282236 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -464,8 +464,7 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op)
 	/* pageflip requires a new window to be created with the proper OS flags */
 	if (win->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP) {
 		if (wm_stereo3d_quadbuffer_supported() == false) {
-			BKE_reportf(op->reports, RPT_ERROR,
-			            "Quadbuffer not supported by the system");
+			BKE_report(op->reports, RPT_ERROR, "Quad-buffer not supported by the system");
 			win->stereo3d_format->display_mode = display_mode;
 			return OPERATOR_CANCELLED;
 		}
@@ -474,8 +473,8 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op)
 			win = wm->windows.last;
 		}
 		else {
-			BKE_reportf(op->reports, RPT_ERROR,
-			            "Fail to create a window compatible with time sequential (page-flip) display method");
+			BKE_report(op->reports, RPT_ERROR,
+			           "Fail to create a window compatible with time sequential (page-flip) display method");
 			win->stereo3d_format->display_mode = display_mode;
 			return OPERATOR_CANCELLED;
 		}
@@ -483,7 +482,7 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op)
 
 	if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) {
 		if (!is_fullscreen) {
-			BKE_reportf(op->reports, RPT_INFO, "Stereo 3D Mode requires the window to be fullscreen");
+			BKE_report(op->reports, RPT_INFO, "Stereo 3D Mode requires the window to be fullscreen");
 		}
 	}




More information about the Bf-blender-cvs mailing list