diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-07 23:05:09 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-07 23:05:09 +0400 |
| commit | 0be5ba84b2b2a145985686325b5dfcc750391041 (patch) | |
| tree | 346c6703224ef7f0426ac17a03a333f0362861e8 | |
| parent | f81c88a949a8882e808a3ce439602620d45f4bc9 (diff) | |
| parent | 13c0ef139fa2c571b14fe2d10a73c8b1a0eb1bd0 (diff) | |
Merging r56533 through r56534 from trunk into blender-2.67-releasev2.67
Only brings OSX 32bit compilation error fix, does not affect
other platforms, no re-AHOY for other platforms needed.
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/WM_keymap.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index e39b13039c5..e7b1b688100 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 0331bdf3ab2..f5f6bf84796 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 6f3b90c00a1..8d37db000c0 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -32,6 +32,7 @@ /* dna-savable wmStructs here */ #include "DNA_windowmanager_types.h" +#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { |