archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Sergey Sharybin
2019-02-22 15:50:36 +01:00
parent bef82f72d2 427f3978e1
commit 86dd9bf53d
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/creator/creator_args.c
View File

@@ -434,10 +434,7 @@ static void arg_py_context_restore(
* *
* \{ */ * \{ */
static const char arg_handle_print_version_doc[] = static void print_version_full(void)
"\n\tPrint Blender version and exit."
;
static int arg_handle_print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{ {
printf(BLEND_VERSION_STRING_FMT); printf(BLEND_VERSION_STRING_FMT);
#ifdef BUILD_DATE #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 link flags: %s\n", build_linkflags);
printf("\tbuild system: %s\n", build_system); printf("\tbuild system: %s\n", build_system);
#endif #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; 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)) static int arg_handle_background_mode_set(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{ {
print_version_short();
G.background = 1; G.background = 1;
return 0; return 0;
} }