diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:04:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:16:49 +0300 |
| commit | 01f576e87b54159bb360cf1ed85518bb75231107 (patch) | |
| tree | 0ac38f90154f8ee08a35fb88c5cf742403bbcb3c /source/blender/blenkernel/BKE_blender_version.h | |
| parent | 469408de725353b461d073097d88b6b810c16c38 (diff) | |
| parent | 799779d432309e518922d23e3a1d1b5baaece71d (diff) | |
Merge branch 'master' into blender2.8
The Eevee AO node supports the new Normal socket, but ignores Distance,
Samples, Inside and Only Local settings.
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 c3dbb362206..0dddb8e7b0b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -28,7 +28,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 280 -#define BLENDER_SUBVERSION 17 +#define BLENDER_SUBVERSION 18 /* Several breakages with 280, e.g. collections vs layers */ #define BLENDER_MINVERSION 280 #define BLENDER_MINSUBVERSION 0 |