diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
| commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
| tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /source/blender/blenkernel/BKE_blender_version.h | |
| parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
| parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) | |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'source/blender/blenkernel/BKE_blender_version.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index dd1fff9ce47..f1c45ac0b45 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,7 +27,7 @@ * \note Use #STRINGIFY() rather than defining with quotes. */ #define BLENDER_VERSION 282 -#define BLENDER_SUBVERSION 1 +#define BLENDER_SUBVERSION 3 /** Several breakages with 280, e.g. collections vs layers. */ #define BLENDER_MINVERSION 280 #define BLENDER_MINSUBVERSION 0 |