[Bf-blender-cvs] [427f3978e1f] blender2.7: Always show version when running in background mode
Sergey Sharybin
noreply at git.blender.org
Fri Feb 22 15:50:22 CET 2019
Commit: 427f3978e1fe0f7d477f13f095450dd883cb5947
Author: Sergey Sharybin
Date: Fri Feb 22 15:47:54 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB427f3978e1fe0f7d477f13f095450dd883cb5947
Always show version when running in background mode
The goal is to make it easy to know which exact blender version
and built was used for a job on a farm. This includes but not
exclusively render farms. But same is handy for simulation tasks
as well.
===================================================================
M source/creator/creator_args.c
===================================================================
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 04e95a5b26c..676bb036b90 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -445,10 +445,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
@@ -464,8 +461,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;
}
@@ -711,6 +727,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;
}
More information about the Bf-blender-cvs
mailing list