Revision: 35479
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35479
Author: jesterking
Date: 2011-03-11 23:27:15 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
Fix [#25659] crash when unwrapping specific mesh
Reported by Jan Hohoho
Running the unwrap causes stack to overflow. Double the size from default 1MB.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-03-11 23:12:58 UTC (rev 35478)
+++ trunk/blender/CMakeLists.txt 2011-03-11 23:27:15 UTC (rev 35479)
@@ -636,9 +636,9 @@
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/MACHINE:X64
/NODEFAULTLIB:libc.lib ")
+ set(PLATFORM_LINKFLAGS "/MACHINE:X64
/NODEFAULTLIB:libc.lib /STACK:2147483648 ")
else()
- set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+ set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib
/STACK:2147483648 ")
endif()
set(CMAKE_EXE_LINKER_FLAGS_DEBUG
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2011-03-11
23:12:58 UTC (rev 35478)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2011-03-11
23:27:15 UTC (rev 35479)
@@ -187,7 +187,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32',
'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS =
['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"',
'/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"',
'/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS =
['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2147483648','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"',
'/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"',
'/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2011-03-11
23:12:58 UTC (rev 35478)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2011-03-11
23:27:15 UTC (rev 35479)
@@ -194,7 +194,7 @@
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS =
['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"',
'/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"',
'/NODEFAULTLIB:"msvcurt.lib"']
+PLATFORM_LINKFLAGS =
['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2147483648','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"',
'/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"',
'/NODEFAULTLIB:"msvcurt.lib"']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
