Fix color-management ignoring the data-path command line value

Initialize ImBuf (and color-management) after passing arguments
that set environment variables such as `--env-system-datapath`

This also fixes a bug where BKE_appdir logging failed since it was
called before the `--log` argument was passed.

Add asserts so this doesn't happen again.
This commit is contained in:
2020-10-04 21:48:48 +11:00
parent 7456ac6e4b
commit 9d30fade3e
3 changed files with 46 additions and 1 deletions

View File

@@ -377,7 +377,6 @@ int main(int argc,
BKE_blender_globals_init(); /* blender.c */
BKE_idtype_init();
IMB_init();
BKE_cachefiles_init();
BKE_images_init();
BKE_modifier_init();
@@ -413,9 +412,16 @@ int main(int argc,
G.factory_startup = true;
#endif
/* After parsing the first level of arguments as `--env-*` impact BKE_appdir behavior. */
BKE_appdir_init();
/* After parsing number of threads argument. */
BLI_task_scheduler_init();
/* After parsing `--env-system-datafiles` which control where paths are searched
* (color-management) uses BKE_appdir to initialize. */
IMB_init();
#ifdef WITH_FFMPEG
IMB_ffmpeg_init();
#endif