Merge branch 'master' into blender2.8

2018-03-26 14:56:00 +02:00
parent 13f80a152a 3c45fdd171
commit 21aca14e43
15 changed files with 189 additions and 106 deletions
--- 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>