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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2004-07-25 14:49:25 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2004-07-25 14:49:25 +0400
commit5881af930604fe978da16c72a821ff429ad8631d (patch)
treee0183a54d17dad43ed7ba499ad05eb509f0c952e /SConstruct
parent86d0d50479e6ff08d2ce4e2188af4e35ea2dde91 (diff)
Fix bug #1466: Crash on decimating non-manifold mesh in scons build.
- Enabled the NDEBUG define (to disable assertions) on all platforms in scons. This is already the default in Makefiles. - Free MEdge data after decimating, it is not valid anymore.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct7
1 files changed, 3 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index dcd450fb9e1..4a31262adcb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -264,7 +264,7 @@ elif sys.platform == 'cygwin':
debug_flags = ['-O2', '-g']
extra_flags = ['-pipe', '-mno-cygwin', '-mwindows', '-funsigned-char']
cxxflags = []
- defines = ['FREE_WINDOWS', 'NDEBUG']
+ defines = ['FREE_WINDOWS']
warn_flags = ['-Wall', '-Wno-char-subscripts']
platform_libs = ['png', 'jpeg', 'netapi32',
'opengl32', 'glu32', 'winmm',
@@ -900,8 +900,7 @@ else:
if user_options_dict['BUILD_BINARY'] == 'release':
cflags = extra_flags + release_flags + warn_flags
- if sys.platform == 'win32':
- defines += ['NDEBUG']
+ defines += ['NDEBUG']
else:
cflags = extra_flags + debug_flags + warn_flags
if sys.platform == 'win32':
@@ -1671,4 +1670,4 @@ if enable_clean == 0: # only set up dependencies when not cleaning
if user_options_dict['BUILD_BLENDER_PLAYER'] == 1:
env.Depends(default_target, playername)
env.Depends(default_target, appname)
- \ No newline at end of file
+