diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2017-03-09 15:27:36 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2017-03-09 15:27:36 +0300 |
| commit | bb332043f0fb85bb9bcf3556b1f84f9dc1ebdb98 (patch) | |
| tree | fbacf1f24d5e60883da7841f5da6acbb441f7857 /source/creator/creator_args.c | |
| parent | 459d429fec1c007b6a80e792a43cd99c5db2656e (diff) | |
| parent | 4ab322fdd2e019ba337b2560a2d36f2175c03a32 (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/creator/creator_args.c')
| -rw-r--r-- | source/creator/creator_args.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 27579e58dba..658a0b2db08 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -946,7 +946,7 @@ static int arg_handle_native_pixels_set(int UNUSED(argc), const char **UNUSED(ar } static const char arg_handle_with_borders_doc[] = -"\n\tForce opening without borders" +"\n\tForce opening with borders" ; static int arg_handle_with_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) { @@ -1364,7 +1364,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data) re = RE_NewRender(scene->id.name); BLI_begin_threaded_malloc(); - BKE_reports_init(&reports, RPT_PRINT); + BKE_reports_init(&reports, RPT_STORE); RE_SetReports(re, &reports); for (int i = 0; i < frames_range_len; i++) { @@ -1379,6 +1379,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data) } } RE_SetReports(re, NULL); + BKE_reports_clear(&reports); BLI_end_threaded_malloc(); MEM_freeN(frame_range_arr); return 1; @@ -1406,10 +1407,11 @@ static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(arg Render *re = RE_NewRender(scene->id.name); ReportList reports; BLI_begin_threaded_malloc(); - BKE_reports_init(&reports, RPT_PRINT); + BKE_reports_init(&reports, RPT_STORE); RE_SetReports(re, &reports); RE_BlenderAnim(re, bmain, scene, NULL, scene->lay, scene->r.sfra, scene->r.efra, scene->r.frame_step); RE_SetReports(re, NULL); + BKE_reports_clear(&reports); BLI_end_threaded_malloc(); } else { |