[Bf-blender-cvs] [f0a37dc31ca] blender-v3.0-release: Revert "Blender 3.1 bcon1 - alpha"

[Dalai Felinto]

Commit: f0a37dc31caa1920441b98dc56b9e56dfdb8c45d
Author: Dalai Felinto
Date:   Wed Oct 27 18:39:39 2021 +0200
Branches: blender-v3.0-release
https://developer.blender.org/rBf0a37dc31caa1920441b98dc56b9e56dfdb8c45d

Revert "Blender 3.1 bcon1 - alpha"

This reverts commit 7b9e3534cfd1dd4bf3aefb98407f2e42a6efac4a.

This was supposed to go to master, not the 3.0 branch.

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

M	doc/doxygen/Doxyfile
M	source/blender/blenkernel/BKE_blender_version.h

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

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 89954d8a155..96eb30a852e 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = V3.1
+PROJECT_NUMBER         = V3.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 6fc2fa37d9f..e5b63e7286b 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -31,7 +31,7 @@ extern "C" {
  */
 
 /* Blender major and minor version. */
-#define BLENDER_VERSION 301
+#define BLENDER_VERSION 300
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
@@ -39,7 +39,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 0
+#define BLENDER_FILE_SUBVERSION 40
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file