Merge branch 'blender-v2.83-release'

2020-06-01 12:12:06 +10:00
parent fcccee0c33 d5a92b188b
commit d0e028a78e
1 changed files with 2 additions and 2 deletions
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -102,7 +102,7 @@ void BKE_blender_free(void)
  free_nodesystem();
 }

-static void blender_version_init()
+static void blender_version_init(void)
 {
  const char *version_cycle = "";
  if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "alpha")) {
@@ -130,7 +130,7 @@ static void blender_version_init()
               version_cycle);
 }

-const char *BKE_blender_version_string()
+const char *BKE_blender_version_string(void)
 {
  return blender_version_string;
 }