Revision: 26185
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26185
Author: broken
Date: 2010-01-22 07:48:29 +0100 (Fri, 22 Jan 2010)
Log Message:
-----------
Cleaned up some printfs in editors/ - converted some to reports, hid others
behind G_DEBUG.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_style.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/particle_object.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -1051,7 +1051,7 @@
/* try to insert keyframes for the channels specified by KeyingSet */
success= modify_keyframes(scene, &dsources, NULL, ks,
MODIFYKEY_MODE_INSERT, cfra);
if (G.f & G_DEBUG)
- printf("KeyingSet '%s' - Successfully added %d Keyframes \n",
ks->name, success);
+ BKE_reportf(op->reports, RPT_INFO, "KeyingSet '%s' -
Successfully added %d Keyframes \n", ks->name, success);
/* report failure or do updates? */
if (success) {
@@ -1320,7 +1320,7 @@
}
}
- printf("Ob '%s' - Successfully removed %d keyframes \n",
id->name+2, success);
+ BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully
removed %d keyframes \n", id->name+2, success);
ob->recalc |= OB_RECALC_OB;
}
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2010-01-22 05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2010-01-22 06:48:29 UTC (rev 26185)
@@ -320,7 +320,8 @@
if (fBone->parent==eBone)
fBone->parent= eBone->parent;
}
- printf("Warning: removed zero sized bone: %s\n",
eBone->name);
+ if (G.f & G_DEBUG)
+ printf("Warning: removed zero sized bone:
%s\n", eBone->name);
bone_free(arm, eBone);
}
}
@@ -3006,8 +3007,7 @@
}
else {
// FIXME.. figure out a method for multiple bones
- BKE_report(op->reports, RPT_ERROR, "Too many points selected");
- printf("Points selected: %d \n", count);
+ BKE_reportf(op->reports, RPT_ERROR, "Too many points selected:
%d \n", count);
BLI_freelistN(&points);
return OPERATOR_CANCELLED;
}
@@ -3047,8 +3047,10 @@
/* check if same bone */
if (start == end) {
- printf("Error: same bone! \n");
- printf("\tstart = %s, end = %s \n", start->name, end->name);
+ if (G.f & G_DEBUG) {
+ printf("Error: same bone! \n");
+ printf("\tstart = %s, end = %s \n", start->name,
end->name);
+ }
}
/* step 1: add a new bone
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -1303,7 +1303,8 @@
if (pld->act->markers.first) {
/* just use first one then... */
pld->marker= pld->act->markers.first;
- if (pose_index > -2) printf("PoseLib had no active
pose\n");
+ if (pose_index > -2)
+ BKE_report(op->reports, RPT_WARNING, "PoseLib
had no active pose");
}
else {
BKE_report(op->reports, RPT_ERROR, "PoseLib has no
poses to preview/apply");
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -1004,7 +1004,8 @@
}
}
if(newu==0 || newv==0) {
- printf("Can't duplicate Nurb\n");
+ if (G.f & G_DEBUG)
+ printf("Can't duplicate
Nurb\n");
}
else {
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-01-22 05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-01-22 06:48:29 UTC (rev 26185)
@@ -684,23 +684,19 @@
if( (line= ui_is_a_link(from, to)) ) {
line->flag |= UI_SELECT;
ui_delete_active_linkline(from->block);
- printf("already exists, means deletion now\n");
return;
}
if (from->type==INLINK && to->type==INLINK) {
- printf("cannot link\n");
return;
}
else if (from->type==LINK && to->type==INLINK) {
if( from->link->tocode != (int)to->hardmin ) {
- printf("cannot link\n");
return;
}
}
else if(from->type==INLINK && to->type==LINK) {
if( to->link->tocode == (int)from->hardmin ) {
- printf("cannot link\n");
return;
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c
2010-01-22 05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c
2010-01-22 06:48:29 UTC (rev 26185)
@@ -50,6 +50,7 @@
#include "DNA_userdef_types.h"
#include "BKE_context.h"
+#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_icons.h"
#include "BKE_utildefines.h"
@@ -474,7 +475,8 @@
if (BLI_exists(iconfilestr)) {
bbuf = IMB_loadiffname(iconfilestr, IB_rect);
if(bbuf->x < ICON_IMAGE_W || bbuf->y < ICON_IMAGE_H) {
- printf("\n***WARNING***\nIcons file %s too
small.\nUsing built-in Icons instead\n", iconfilestr);
+ if (G.f & G_DEBUG)
+ printf("\n***WARNING***\nIcons file %s
too small.\nUsing built-in Icons instead\n", iconfilestr);
IMB_freeImBuf(bbuf);
bbuf= NULL;
}
@@ -694,7 +696,8 @@
icon = BKE_icon_get(icon_id);
if (!icon) {
- printf("UI_icon_get_width: Internal error, no icon for icon ID:
%d\n", icon_id);
+ if (G.f & G_DEBUG)
+ printf("UI_icon_get_width: Internal error, no icon for
icon ID: %d\n", icon_id);
return 0;
}
@@ -718,7 +721,8 @@
icon = BKE_icon_get(icon_id);
if (!icon) {
- printf("UI_icon_get_height: Internal error, no icon for icon
ID: %d\n", icon_id);
+ if (G.f & G_DEBUG)
+ printf("UI_icon_get_height: Internal error, no icon for
icon ID: %d\n", icon_id);
return 0;
}
@@ -757,7 +761,8 @@
unsigned int size = preview_render_size(miplevel);
if (!prv_img) {
- printf("Error: requested preview image does not exist");
+ if (G.f & G_DEBUG)
+ printf("Error: requested preview image does not exist");
}
if (!prv_img->rect[miplevel]) {
prv_img->w[miplevel] = size;
@@ -772,7 +777,8 @@
static void icon_set_image(bContext *C, ID *id, PreviewImage* prv_img, int
miplevel)
{
if (!prv_img) {
- printf("No preview image for this ID: %s\n", id->name);
+ if (G.f & G_DEBUG)
+ printf("No preview image for this ID: %s\n", id->name);
return;
}
@@ -802,13 +808,14 @@
/* draw */
if((w<1 || h<1)) {
// XXX - TODO 2.5 verify whether this case can happen
- // and only print in debug
- printf("what the heck! - icons are %i x %i pixels?\n", w, h);
+ if (G.f & G_DEBUG)
+ printf("what the heck! - icons are %i x %i pixels?\n",
w, h);
}
/* rect contains image in 'rendersize', we only scale if needed */
else if(rw!=w && rh!=h) {
if(w>2000 || h>2000) { /* something has gone wrong! */
- printf("insane icon size w=%d h=%d\n",w,h);
+ if (G.f & G_DEBUG)
+ printf("insane icon size w=%d h=%d\n",w,h);
}
else {
ImBuf *ima;
@@ -891,7 +898,8 @@
icon = BKE_icon_get(icon_id);
if (!icon) {
- printf("icon_draw_mipmap: Internal error, no icon for icon ID:
%d\n", icon_id);
+ if (G.f & G_DEBUG)
+ printf("icon_draw_mipmap: Internal error, no icon for
icon ID: %d\n", icon_id);
return;
}
Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c
2010-01-22 05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/interface/interface_style.c
2010-01-22 06:48:29 UTC (rev 26185)
@@ -291,8 +291,10 @@
font->blf_id= BLF_load_mem("default", (unsigned
char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size);
}
- if (font->blf_id == -1)
- printf("uiStyleInit error, no fonts available\n");
+ if (font->blf_id == -1) {
+ if (G.f & G_DEBUG)
+ printf("uiStyleInit error, no fonts
available\n");
+ }
else {
BLF_set(font->blf_id);
/* ? just for speed to initialize?
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -838,7 +838,8 @@
height -= V2D_SCROLL_HEIGHT;
if (ELEM3(0, v2d, width, height)) {
- printf("Error: View2D totRect set exiting: v2d=%p width=%d
height=%d \n", v2d, width, height); // XXX temp debug info
+ if (G.f & G_DEBUG)
+ printf("Error: View2D totRect set exiting: v2d=%p
width=%d height=%d \n", v2d, width, height); // XXX temp debug info
return;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -766,7 +766,8 @@
else if( convex(neweve[0]->co,
neweve[3]->co, neweve[1]->co, neweve[2]->co) ) {
efa= addfacelist(em,
neweve[0], neweve[3], neweve[1], neweve[2], NULL, NULL);
}
- else printf("cannot find nice
quad from concave set of vertices\n");
+ else BKE_report(op->reports,
RPT_ERROR, "cannot find nice quad from concave set of vertices");
+
}
}
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-01-22
05:47:09 UTC (rev 26184)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-01-22
06:48:29 UTC (rev 26185)
@@ -432,7 +432,7 @@
if(efa->e3->fgoni) index= efa->e3->fgoni;
if(efa->v4 && efa->e4->fgoni) index= efa->e4->fgoni;
- if(index==0) printf("wrong fgon select\n");
+ if((index==0) && (G.f & G_DEBUG))printf("wrong fgon select\n");
// select all ngon faces with index
for(efa= em->faces.first; efa; efa= efa->next) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loop.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
