diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:56:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:56:00 +0300 |
| commit | 21aca14e43326ea9af45f1e848ebca52808f8470 (patch) | |
| tree | 25c5838a8b40ecb5996c7f1ccdfc1a90f69bd23b /source/blender/depsgraph | |
| parent | 13f80a152a3a84286330b1bc6d9818279b976e91 (diff) | |
| parent | 3c45fdd171fa6ebd65f19f9fac9b204865e13136 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/util/deg_util_function.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h index 96f52147fe7..41669919c99 100644 --- a/source/blender/depsgraph/util/deg_util_function.h +++ b/source/blender/depsgraph/util/deg_util_function.h @@ -30,7 +30,7 @@ #pragma once -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) +#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1900) #include <functional> |