diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 16:59:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 16:59:54 +0400 |
| commit | a7815053eff706f8c08ca774ed3dcddc884bb504 (patch) | |
| tree | e30457d40cba58cfbc19c4be3bce7090fa0c3f3c /source/blenderplayer | |
| parent | e005c3136ecb72972b1e500a5710bebe63bdc50e (diff) | |
| parent | 22c68cd748257e63391e6b23b1d0b7e5895d3121 (diff) | |
svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 15c3b2a4743..80f3642748a 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -56,8 +56,4 @@ if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() -if(WITH_INTERNATIONAL) - add_definitions(-DWITH_FREETYPE2) -endif() - blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}") |