[Bf-blender-cvs] [5a842b3412c] master: Merge branch 'blender-v2.83-release'

[Campbell Barton]

Commit: 5a842b3412c100588bc1f7a9d4532e810e8e1792
Author: Campbell Barton
Date:   Mon May 25 15:55:54 2020 +1000
Branches: master
https://developer.blender.org/rB5a842b3412c100588bc1f7a9d4532e810e8e1792

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_splash_screen.c
index 8445fac0498,17dc3e22984..c821f5bfe89
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@@ -119,16 -122,49 +119,17 @@@ static void get_version_string(char *ve
      version_cycle_number = " " STRINGIFY(BLENDER_VERSION_CYCLE_NUMBER);
    }
  
 -  char version_buf[256] = "\0";
 -  BLI_snprintf(version_buf,
 -               sizeof(version_buf),
 -               "v %d.%d%s%s",
 +  BLI_snprintf(ver,
 +               max_length,
 +               "%d.%d.%d%s%s",
                 BLENDER_VERSION / 100,
                 BLENDER_VERSION % 100,
 +               BLENDER_SUBVERSION,
                 version_cycle,
                 version_cycle_number);
 -
 -  wm_block_splash_add_label(block, version_buf, x, &y);
 -
 -#ifdef WITH_BUILDINFO
 -  if (show_build_info) {
 -    extern unsigned long build_commit_timestamp;
 -    extern char build_hash[], build_commit_date[], build_commit_time[], build_branch[];
 -
 -    /* Date, hidden for builds made from tag. */
 -    if (build_commit_timestamp != 0) {
 -      char date_buf[256] = "\0";
 -      BLI_snprintf(
 -          date_buf, sizeof(date_buf), "Date: %s %s", build_commit_date, build_commit_time);
 -      wm_block_splash_add_label(block, date_buf, x, &y);
 -    }
 -
 -    /* Hash. */
 -    char hash_buf[256] = "\0";
 -    BLI_snprintf(hash_buf, sizeof(hash_buf), "Hash: %s", build_hash);
 -    wm_block_splash_add_label(block, hash_buf, x, &y);
 -
 -    /* Branch. */
 -    if (!STREQ(build_branch, "master")) {
 -      char branch_buf[256] = "\0";
 -      BLI_snprintf(branch_buf, sizeof(branch_buf), "Branch: %s", build_branch);
 -
 -      wm_block_splash_add_label(block, branch_buf, x, &y);
 -    }
 -  }
 -#else
 -  UNUSED_VARS(show_build_info);
 -#endif /* WITH_BUILDINFO */
  }
  
+ #ifndef WITH_HEADLESS
  static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf)
  {
    uchar *rct = (uchar *)ibuf->rect;