diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-22 17:50:36 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-22 17:50:36 +0300 |
commit | 86dd9bf53d4aef0d56c8a9ea831d4d785dcf4fdb (patch) | |
tree | e63abd7c7aaf30395c81e24c61e1a2dec889f181 /source/creator | |
parent | bef82f72d2795f4841f9a0fc67a30b4fc02fc69d (diff) | |
parent | 427f3978e1fe0f7d477f13f095450dd883cb5947 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator_args.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index e4cb604b803..bdd4f49c528 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -434,10 +434,7 @@ static void arg_py_context_restore( * * \{ */ -static const char arg_handle_print_version_doc[] = -"\n\tPrint Blender version and exit." -; -static int arg_handle_print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) +static void print_version_full(void) { printf(BLEND_VERSION_STRING_FMT); #ifdef BUILD_DATE @@ -453,8 +450,27 @@ static int arg_handle_print_version(int UNUSED(argc), const char **UNUSED(argv), printf("\tbuild link flags: %s\n", build_linkflags); printf("\tbuild system: %s\n", build_system); #endif - exit(0); +} +static void print_version_short(void) +{ +#ifdef BUILD_DATE + /* NOTE: We include built time since sometimes we need to tell broken from + * working built of the same hash. */ + printf(BLEND_VERSION_FMT " (hash %s built %s %s)\n + BLEND_VERSION_ARG, build_hash, build_date, build_time); +#else + printf(BLEND_VERSION_STRING_FMT); +#endif +} + +static const char arg_handle_print_version_doc[] = +"\n\tPrint Blender version and exit." +; +static int arg_handle_print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) +{ + print_version_full(); + exit(0); return 0; } @@ -695,6 +711,7 @@ static const char arg_handle_background_mode_set_doc[] = ; static int arg_handle_background_mode_set(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) { + print_version_short(); G.background = 1; return 0; } |