svn merge ^/trunk/blender -r50091:50107
[blender.git] / CMakeLists.txt
index 77af06f6260c2dda9c4244d64f26d43cbcb411c2..0b6bb3f44bd56a70d88e94a42603c1e2f814c31b 100644 (file)
@@ -1070,6 +1070,8 @@ elseif(WIN32)
                        set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
                        
                        add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
+                       #Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
+                       set(WITH_OPENMP OFF)
                endif()
 
                add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)