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:
authorCampbell Barton <ideasman42@gmail.com>2018-02-15 17:13:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-15 17:13:46 +0300
commit2aef87bfae4a6a91f626780767aab68b7791c9d4 (patch)
tree8c920050c424fd30fc649ad5b9a374b517f2ebad /source/creator
parentccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff)
Cleanup: rename BLI_thread.h API
- Use BLI_threadpool_ prefix for (deprecated) thread/listbase API. - Use BLI_thread as prefix for other functions. See P614 to apply instead of manually resolving conflicts.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator_args.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index a9da1e8c794..c9cdc1c9ccf 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1376,7 +1376,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
}
re = RE_NewSceneRender(scene);
- BLI_begin_threaded_malloc();
+ BLI_threaded_malloc_begin();
BKE_reports_init(&reports, RPT_STORE);
RE_SetReports(re, &reports);
@@ -1393,7 +1393,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();
+ BLI_threaded_malloc_end();
MEM_freeN(frame_range_arr);
return 1;
}
@@ -1419,13 +1419,13 @@ 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_begin_threaded_malloc();
+ BLI_threaded_malloc_begin();
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();
+ BLI_threaded_malloc_end();
}
else {
printf("\nError: no blend loaded. cannot use '-a'.\n");