Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-01-22 09:48:29 +0300
committerMatt Ebb <matt@mke3.net>2010-01-22 09:48:29 +0300
commit38aacb92f32ef5ea80a5e9b4b7b2757a6cc4b8bf (patch)
treed74cf38589aa9c94091d83f16198455b7537ffd2 /source/blender/editors/screen
parent0de9b98a31e4306d5cd41fba0c7ef28413484fef (diff)
Cleaned up some printfs in editors/ - converted some to reports, hid others behind G_DEBUG.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/area.c3
-rw-r--r--source/blender/editors/screen/screen_edit.c3
-rw-r--r--source/blender/editors/screen/screen_ops.c18
-rw-r--r--source/blender/editors/screen/screendump.c16
4 files changed, 28 insertions, 12 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 7fb4dd57672..a7a3754d16f 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -728,7 +728,8 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int
if(count!=4) {
/* let's stop adding regions */
BLI_init_rcti(remainder, 0, 0, 0, 0);
- printf("region quadsplit failed\n");
+ if (G.f & G_DEBUG)
+ printf("region quadsplit failed\n");
}
else quad= 1;
}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 20c629ab69c..786f9ee9e3f 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1473,7 +1473,8 @@ ScrArea *ed_screen_fullarea(bContext *C, wmWindow *win, ScrArea *sa)
for(old= sc->areabase.first; old; old= old->next)
if(old->full) break;
if(old==NULL) {
- printf("something wrong in areafullscreen\n");
+ if (G.f & G_DEBUG)
+ printf("something wrong in areafullscreen\n");
return NULL;
}
// old feature described below (ton)
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 0b26b531d89..ef559615e2b 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2268,7 +2268,6 @@ static int header_flip_exec(bContext *C, wmOperator *op)
#endif
WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
- printf("executed header region flip\n");
return OPERATOR_FINISHED;
}
@@ -2946,7 +2945,8 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
/* very weak... but 512 characters is quite safe */
if(spos >= str+IMA_RW_MAXTEXT)
- printf("WARNING! renderwin text beyond limit \n");
+ if (G.f & G_DEBUG)
+ printf("WARNING! renderwin text beyond limit \n");
}
@@ -3484,15 +3484,23 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
if(ibuf) {
if(BKE_imtype_is_movie(scene->r.imtype)) {
ok= oglrender->mh->append_movie(&scene->r, CFRA, (int*)ibuf->rect, oglrender->sizex, oglrender->sizey, oglrender->reports);
- if(ok)
+ if(ok) {
printf("Append frame %d", scene->r.cfra);
+ BKE_reportf(op->reports, RPT_INFO, "Appended frame: %d", scene->r.cfra);
+ }
}
else {
BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION);
ok= BKE_write_ibuf(scene, ibuf, name, scene->r.imtype, scene->r.subimtype, scene->r.quality);
- if(ok==0) printf("write error: cannot save %s\n", name);
- else printf("saved: %s", name);
+ if(ok==0) {
+ printf("Write error: cannot save %s\n", name);
+ BKE_reportf(op->reports, RPT_ERROR, "Write error: cannot save %s", name);
+ }
+ else {
+ printf("Saved: %s", name);
+ BKE_reportf(op->reports, RPT_INFO, "Saved file: %s", name);
+ }
}
}
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index a756eff8c11..6f2052958ce 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -249,9 +249,10 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update)
if(sj->dumprect) {
if(mh) {
- if(mh->append_movie(&rd, cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports))
- printf("Append frame %d\n", cfra);
- else
+ if(mh->append_movie(&rd, cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports)) {
+ BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", cfra);
+ printf("Appended frame %d\n", cfra);
+ } else
break;
}
else {
@@ -266,9 +267,13 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update)
if(ok==0) {
printf("Write error: cannot save %s\n", name);
+ BKE_reportf(&sj->reports, RPT_INFO, "Write error: cannot save %s\n", name);
break;
}
- else printf("Saved: %s\n", name);
+ else {
+ printf("Saved file: %s\n", name);
+ BKE_reportf(&sj->reports, RPT_INFO, "Saved file: %s", name);
+ }
/* imbuf knows which rects are not part of ibuf */
IMB_freeImBuf(ibuf);
@@ -288,7 +293,8 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update)
if(mh)
mh->end_movie();
- printf("screencast job stopped\n");
+
+ BKE_report(&sj->reports, RPT_INFO, "Screencast job stopped");
}
static int screencast_exec(bContext *C, wmOperator *op)