diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
commit | d52400bfbd2a7e4d09b5a71bc461a554d232af15 (patch) | |
tree | 08815f065fc90aac0ae62ae5f3a89d20e19399e6 /tools/Blender.py | |
parent | 1ac0d54fea831c485e8e27e8bfa887e15beb58de (diff) | |
parent | 28f6d223d079b1e5cb67e3fc22fb7f818deb8dcb (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317
Notes:
* Sequence transform strip uses G.scene global, this is commented
out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
2.5 got merged, but no new files were added. Calls to these files
are commented out with "XXX etch-a-ton". editarmature.c and
transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
(player still fails to link).
Diffstat (limited to 'tools/Blender.py')
-rw-r--r-- | tools/Blender.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index a087223bdb5..8286a3a4714 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -433,11 +433,11 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS']) lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS']) if compileflags: - lenv.Append(CFLAGS = compileflags) + lenv.Replace(CFLAGS = compileflags) if cc_compileflags: - lenv.Append(CCFLAGS = cc_compileflags) + lenv.Replace(CCFLAGS = cc_compileflags) if cxx_compileflags: - lenv.Append(CXXFLAGS = cxx_compileflags) + lenv.Replace(CXXFLAGS = cxx_compileflags) lenv.Append(CFLAGS = lenv['C_WARN']) lenv.Append(CCFLAGS = lenv['CC_WARN']) lenv.Append(CXXFLAGS = lenv['CXX_WARN']) |