[Bf-blender-cvs] [edcf60b] soc-2016-cycles_denoising: Cycles: Fix building after the debug_fpe commit

Lukas Stockner noreply at git.blender.org
Wed Aug 10 03:22:12 CEST 2016


Commit: edcf60b4ef17f801a1eb36cfa1c5b9a26d6de0a7
Author: Lukas Stockner
Date:   Tue Aug 9 03:48:06 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBedcf60b4ef17f801a1eb36cfa1c5b9a26d6de0a7

Cycles: Fix building after the debug_fpe commit

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

M	intern/cycles/util/util_system.cpp

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

diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index e52a953..9e51f24 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -304,7 +304,7 @@ static bool system_check_fpe()
 {
 #ifdef __GNUC__
 	return fegetexcept() & FE_INVALID;
-#elif
+#elif defined(_MSC_VER)
 	return !(_controlfp(0, 0) & _EM_INVALID);
 #endif
 }




More information about the Bf-blender-cvs mailing list