diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
| commit | d65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch) | |
| tree | 2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/blender/blenkernel/BKE_blender.h | |
| parent | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff) | |
| parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) | |
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 07f0885372a..7c11f9e964e 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -43,7 +43,7 @@ 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 257 +#define BLENDER_VERSION 258 #define BLENDER_SUBVERSION 1 #define BLENDER_MINVERSION 250 @@ -51,9 +51,9 @@ extern "C" { /* used by packaging tools */ /* can be left blank, otherwise a,b,c... etc with no quotes */ -#define BLENDER_VERSION_CHAR b +#define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE beta +#define BLENDER_VERSION_CYCLE release struct ListBase; struct MemFile; |