Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-26 13:15:23 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-26 13:15:23 +0300
commit1746c5da6772a86e22404be567972cb884c8ee7c (patch)
tree24b6c51fb14795fb2074b29381e7041b8b247fab
parent9177bf2f30e0080cc6a10f9666e5b1a97a1aae08 (diff)
Blender 2.77 release: Bump subversion and go into RC cycle now
Splash and RC1 AHOY are incoming.
-rw-r--r--source/blender/blenkernel/BKE_blender.h6
-rw-r--r--source/blender/editors/interface/resources.c15
2 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index e7060e64d2a..5c91d42babd 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -41,8 +41,8 @@ extern "C" {
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION 276
-#define BLENDER_SUBVERSION 11
+#define BLENDER_VERSION 277
+#define BLENDER_SUBVERSION 0
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 6
@@ -51,7 +51,7 @@ extern "C" {
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE rc
extern char versionstr[]; /* from blender.c */
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index c23df5cf010..b1d2e329da1 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2694,12 +2694,7 @@ void init_userdef_do_versions(void)
}
}
- /**
- * Include next version bump.
- *
- * (keep this block even if it becomes empty).
- */
- {
+ if (!USER_VERSION_ATLEAST(277, 0)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
if (memcmp(btheme->tui.wcol_list_item.item, btheme->tui.wcol_list_item.text_sel, sizeof(char) * 3) == 0) {
@@ -2709,6 +2704,14 @@ void init_userdef_do_versions(void)
}
}
+ /**
+ * Include next version bump.
+ *
+ * (keep this block even if it becomes empty).
+ */
+ {
+ }
+
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;