[Bf-blender-cvs] [15af75d79e5] master: msvc: Fix msvc2013 new despgraph related build errors.

Ray Molenkamp noreply at git.blender.org
Fri Mar 23 16:23:20 CET 2018


Commit: 15af75d79e5a25049d901764d5cf99fea8348f41
Author: Ray Molenkamp
Date:   Fri Mar 23 09:23:08 2018 -0600
Branches: master
https://developer.blender.org/rB15af75d79e5a25049d901764d5cf99fea8348f41

msvc: Fix msvc2013 new despgraph related build errors.

msvc's function.hpp does not like NULL for function pointers. disabled support for this platform.

===================================================================

M	source/blender/depsgraph/util/deg_util_function.h

===================================================================

diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h
index 63cd1d6f5eb..99625e57f4b 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>



More information about the Bf-blender-cvs mailing list