Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-04 18:47:37 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-04 18:47:37 +0400
commit6737a040614180f8ac27221e29bb35a09485fedf (patch)
tree7bcaf60c3cbe7de715bc2493ec54cccc623f38b3 /intern
parentd1827ff5d7817c6ab1d95cbdc4e731ec98433ec8 (diff)
Attempt to fix #36935: disable SSE optimizations on 32 bit windows too. Something
strange is going on here, but I don't think it can be fixed before the release, if it is worth at all spending time on this.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_system.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 40ec93b6124..2bb15b9074a 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -116,8 +116,8 @@ int system_cpu_bits()
return (sizeof(void*)*8);
}
-/* SSE optimization disabled for now on 32 bit GCC, see bug #36316 */
-#if defined(__x86_64__) || defined(_M_X64) || ((defined(i386) || defined(_M_IX86)) && !defined(__GNUC__))
+/* SSE optimization disabled for now on 32 bit, see bug #36316 and #36935 */
+#if defined(__x86_64__) || defined(_M_X64) // ((defined(i386) || defined(_M_IX86))
struct CPUCapabilities {
bool x64;