diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-20 18:55:16 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-20 18:55:16 +0300 |
| commit | e0388bc61a8825b68d584f799a2b03dec5f36d96 (patch) | |
| tree | 5a66d4d3c2749e32b8f4e8fef1534856755499f2 /source/blender/depsgraph | |
| parent | ebbb55dd80531f1932b089d39f7350f265db7323 (diff) | |
| parent | 69e35429bf879fcfe893b7824479274c2ae8d051 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_types.h | 1 | ||||
| -rw-r--r-- | source/blender/depsgraph/util/deg_util_function.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index f8699186866..b4a0dde1f35 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -43,6 +43,7 @@ */ #include <string> #include <vector> +#include <algorithm> struct bAction; struct ChannelDriver; diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h index da31bb037f9..96f52147fe7 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) +#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) #include <functional> |