diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-05-20 01:59:41 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-20 02:03:05 +0300 |
commit | 183ba284f213903f2208349fe1dd57c07c327ad9 (patch) | |
tree | 28690e868340794bd18b5a40d56ca24d7f304cfd /source/creator | |
parent | 120e9924c177c7a8fde06b9c5eca98e4e2a19180 (diff) |
Cleanup: make guarded memory allocation always thread safe
Previously this would be enabled when threads were used, but threads are now
basically always in use so there is no point. Further, this is only needed for
guarded allocation with --debug-memory which is not performance critical.
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator_args.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 88c5cc9e53d..7acf649c3ab 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1592,7 +1592,6 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data) } re = RE_NewSceneRender(scene); - BLI_threaded_malloc_begin(); BKE_reports_init(&reports, RPT_STORE); RE_SetReports(re, &reports); for (int i = 0; i < frames_range_len; i++) { @@ -1608,7 +1607,6 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data) } RE_SetReports(re, NULL); BKE_reports_clear(&reports); - BLI_threaded_malloc_end(); MEM_freeN(frame_range_arr); return 1; } @@ -1634,13 +1632,11 @@ static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(arg Main *bmain = CTX_data_main(C); Render *re = RE_NewSceneRender(scene); ReportList reports; - BLI_threaded_malloc_begin(); BKE_reports_init(&reports, RPT_STORE); RE_SetReports(re, &reports); RE_RenderAnim(re, bmain, scene, NULL, NULL, scene->r.sfra, scene->r.efra, scene->r.frame_step); RE_SetReports(re, NULL); BKE_reports_clear(&reports); - BLI_threaded_malloc_end(); } else { printf("\nError: no blend loaded. cannot use '-a'.\n"); |