diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-07 20:41:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-07 20:41:59 +0400 |
| commit | f81c88a949a8882e808a3ce439602620d45f4bc9 (patch) | |
| tree | 4563a68bc7fcca88a8251f4006a5ea60655c77f9 | |
| parent | a4cf8b377985bcb4d74d7e83082cb0698296c04c (diff) | |
| parent | aa959b4e7d6d44df35c1efc990e5e4bd0c541e1d (diff) | |
Merging r56528 through r56532 from trunk into blender-2.67-release
| -rw-r--r-- | release/datafiles/splash.png | bin | 128911 -> 115554 bytes | |||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 8 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex 7affcab8a82..5b3dddd535e 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png 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; |
