diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-10-22 09:07:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-22 09:07:56 +0300 |
commit | 9ea345d1cf82f0770d7bb90ccac4bc6df00f9a94 (patch) | |
tree | b78fe6136d1de431a9bf5e5ede7632ebc436bbf8 | |
parent | ef969fb85f83b648bf04471534fa7a980102cfd7 (diff) |
Fix animation player initialization
Updates from 9d30fade3ea9b weren't applied to the animation player
causing an assert and missing call to IMB_init.
-rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 1 | ||||
-rw-r--r-- | source/creator/creator_args.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 00c62340e16..2038079744d 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -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 } diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 47ab96bbc7e..3b54811657d 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -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(); |