diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-16 13:54:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-16 13:54:49 +0400 |
commit | 3ad3630438fc2aa3181c9aeef0642d2bb8a4e23f (patch) | |
tree | c8954f00455aac3d95d0d8681cd14946b2a1d192 /source/blender | |
parent | 6bdf87cd3d3f40a77053cad697782a8815873723 (diff) | |
parent | aa959b4e7d6d44df35c1efc990e5e4bd0c541e1d (diff) |
svn merge ^/trunk/blender -r56528:56532
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
2 files changed, 6 insertions, 6 deletions
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 */ 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; |