From a0800cb8b3546fb103330ef0db02664adc4f5168 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 7 May 2013 16:27:55 +0000 Subject: And here's the epic 2.67 splash and version! Celebrating Freestyle :) Kudos to dfeveloper Tamito and Malaysian artist Mclelun! --- release/datafiles/splash.png | Bin 128911 -> 115554 bytes source/blender/blenkernel/BKE_blender.h | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index 7affcab8a82..5b3dddd535e 100644 Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index ce6f77ec472..ba17bdb2e8c 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 266 -#define BLENDER_SUBVERSION 6 +#define BLENDER_VERSION 267 +#define BLENDER_SUBVERSION 0 /* 262 was the last editmesh release but it has compatibility code for bmesh data */ #define BLENDER_MINVERSION 262 @@ -50,9 +50,9 @@ extern "C" { /* used by packaging tools */ /* can be left blank, otherwise a,b,c... etc with no quotes */ -#define BLENDER_VERSION_CHAR a +#define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE alpha +#define BLENDER_VERSION_CYCLE release extern char versionstr[]; /* from blender.c */ -- cgit v1.2.3 From aa959b4e7d6d44df35c1efc990e5e4bd0c541e1d Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 7 May 2013 16:35:37 +0000 Subject: Putting undefined versioning to only older than 2.67. --- source/blender/blenloader/intern/readfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f0dfd0aa84e..5e01b03cd64 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9346,7 +9346,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } /* default values in Freestyle settings */ - { + if (main->versionfile < 267) { Scene *sce; SceneRenderLayer *srl; FreestyleLineStyle *linestyle; @@ -9404,7 +9404,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } - { + if (main->versionfile < 267) { /* Initialize the active_viewer_key for compositing */ bScreen *screen; Scene *scene; -- cgit v1.2.3