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:
authorSybren A. Stüvel <sybren@stuvel.eu>2015-09-17 11:14:08 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2015-09-17 11:14:08 +0300
commiteca704f579981b5d96f56999a298c0a74c3ef582 (patch)
tree533ba60ad21330f8171a30dd42b7d5b25ff9d5a0 /source/blender/python/SConscript
parent79c668dbec52f8834ac5013f254c12d8315d4924 (diff)
Fix T46090: Blender game embedded player crash
SCons didn't pass `-DWITH_AUDASPACE` to the compiler, so it skipped the instantiation of the "aud" Python module. This caused a crash of the BGE, which did get the `-DWITH_AUDASPACE` directive, and expected that module to exist. Reviewed by: lukastoenne
Diffstat (limited to 'source/blender/python/SConscript')
-rw-r--r--source/blender/python/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index f7b01259ead..79c53760302 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -93,8 +93,8 @@ if env['WITH_BF_PYTHON_SAFETY']:
if env['BF_BUILDINFO']:
defs.append('BUILD_DATE')
-
-# Audaspace is always on currently
+if env['WITH_BF_AUDASPACE']:
+ defs += env['BF_AUDASPACE_DEF']
if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET')