diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:32:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:34:23 +0300 |
| commit | fd1bc90679a89a29172683939827be9c565e2217 (patch) | |
| tree | 02d4bc3389f29df59b3a32e5842cb14556a6e8fc /intern/cycles/util | |
| parent | 0ffd288fab5686f55d68d0d39baf59568f4389e7 (diff) | |
Cycles: sync changes from standalone repository
* Windows build fixes
* Workaround for Hydra + OpenColorIO link issue
* Bump version
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/version.h b/intern/cycles/util/version.h index 8260dd4f55d..fb02c3eaeb7 100644 --- a/intern/cycles/util/version.h +++ b/intern/cycles/util/version.h @@ -9,7 +9,7 @@ CCL_NAMESPACE_BEGIN #define CYCLES_VERSION_MAJOR 3 -#define CYCLES_VERSION_MINOR 2 +#define CYCLES_VERSION_MINOR 4 #define CYCLES_VERSION_PATCH 0 #define CYCLES_MAKE_VERSION_STRING2(a, b, c) #a "." #b "." #c @@ -19,7 +19,7 @@ CCL_NAMESPACE_BEGIN /* Blender libraries version compatible with this version */ -#define CYCLES_BLENDER_LIBRARIES_VERSION 3.1 +#define CYCLES_BLENDER_LIBRARIES_VERSION 3.3 CCL_NAMESPACE_END |