From ef850d75f52726e9d479cd9873ec8b6343cdf3f2 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Thu, 7 Jun 2012 08:04:58 +0000
Subject: Fix unaligned array crash in Eigen3 because of compilation option.
 The EIGEN_DONT_ALIGN_STATICALLY compilation option was added for Win32 only
 in revision 41283 because of some compilation problem. But this option is
 causing alignment problem for Eigen3 local variables when SSE optimization is
 enabled. I do not have any compilation problem when the option is not
 defined, so I just remove it as it should.

---
 intern/itasc/CMakeLists.txt | 3 ---
 intern/itasc/SConscript     | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'intern')

diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index 3d24a0cb8c6..f4bc0326ea1 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -318,8 +318,5 @@ set(SRC
 	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
 )
 
-if(WIN32)
-	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
 
 blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript
index 69dddf40228..c1ad931c665 100644
--- a/intern/itasc/SConscript
+++ b/intern/itasc/SConscript
@@ -9,8 +9,5 @@ incs = '. ../../extern/Eigen3'
 
 defs = []
 
-if env['PLATFORM'] == 'win32':
-    defs.append('EIGEN_DONT_ALIGN_STATICALLY')
-
 env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] )
 
-- 
cgit v1.2.3