Merge branch 'blender-v2.91-release'

This commit is contained in:
Campbell Barton 2020-10-22 17:13:04 +11:00
commit fe963b5a41
2 changed files with 5 additions and 3 deletions

View File

@ -109,6 +109,7 @@ static bool is_appdir_init = false;
void BKE_appdir_init(void)
{
#ifndef NDEBUG
BLI_assert(is_appdir_init == false);
is_appdir_init = true;
#endif
}

View File

@ -48,6 +48,7 @@
# include "BKE_blender_version.h"
# include "BKE_context.h"
# include "BKE_appdir.h"
# include "BKE_global.h"
# include "BKE_image.h"
# include "BKE_lib_id.h"
@ -56,9 +57,7 @@
# include "BKE_scene.h"
# include "BKE_sound.h"
# ifdef WITH_FFMPEG
# include "IMB_imbuf.h"
# endif
# include "IMB_imbuf.h"
# ifdef WITH_PYTHON
# include "BPY_extern_python.h"
@ -1205,6 +1204,8 @@ static int arg_handle_playback_mode(int argc, const char **argv, void *UNUSED(da
{
/* not if -b was given first */
if (G.background == 0) {
BKE_appdir_init();
IMB_init();
# ifdef WITH_FFMPEG
/* Setup FFmpeg with current debug flags. */
IMB_ffmpeg_init();