diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
commit | c98148a963d37fc2f25e125afeb4cf21df6fbf14 (patch) | |
tree | 691a051e27f08e35bf09d35b6fb9c88e4c37b8d2 /source/blender/blenkernel/BKE_blender.h | |
parent | 0bba684d08952d0be822f3906ffb2a03b2674cc2 (diff) | |
parent | fa63c297753636c149fbb1a3877d9b3d93601357 (diff) |
=bmesh= merge from trunk at r36153
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 44ce6060f1b..eae75d58a0a 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -43,17 +43,17 @@ extern "C" { /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather then defining with quotes */ -#define BLENDER_VERSION 256 -#define BLENDER_SUBVERSION 2 +#define BLENDER_VERSION 257 +#define BLENDER_SUBVERSION 0 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 /* used by packaging tools */ /* can be left blank, otherwise a,b,c... etc with no quotes */ -#define BLENDER_VERSION_CHAR a - /* alpha/beta/rc/releases */ -#define BLENDER_VERSION_CYCLE beta +#define BLENDER_VERSION_CHAR + /* alpha/beta/rc/release, docs use this */ +#define BLENDER_VERSION_CYCLE release struct ListBase; struct MemFile; |