Merge with default

--HG--
branch : sse2

code/CMakeModules/nel.cmake

@@ -617,6 +617,10 @@ MACRO(NL_SETUP_BUILD)
       ENDIF(CLANG)
     ENDIF(WIN32)
 
+    IF(WITH_SSE3)
+      ADD_PLATFORM_FLAGS("-msse3")
+    ENDIF(WITH_SSE3)
+
     IF(APPLE)
       IF(NOT XCODE)
         IF(CMAKE_OSX_ARCHITECTURES)

code/nel/src/misc/object_arena_allocator.cpp

@@ -68,7 +68,7 @@ void *CObjectArenaAllocator::alloc(uint size)
 	if (size >= _MaxAllocSize)
 	{
 		// use standard allocator
-		nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT > sizeof(uint));
+		nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT >= sizeof(uint));
 		uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block
 		if (!block) return NULL;
 		#ifdef NL_DEBUG