From eeb95280be1eb2845266e4e4dc8ef1d4905154b8 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sun, 7 Apr 2013 06:44:33 +0000 Subject: Missing build_files updates in the merger in revision 55847. --- build_files/scons/config/darwin-config.py | 6 +++--- build_files/scons/config/freebsd7-config.py | 3 +++ build_files/scons/config/freebsd8-config.py | 3 +++ build_files/scons/config/freebsd9-config.py | 3 +++ build_files/scons/config/linux-config.py | 3 +++ build_files/scons/config/linuxcross-config.py | 3 +++ build_files/scons/config/win32-mingw-config.py | 3 +++ build_files/scons/config/win32-vc-config.py | 3 +++ build_files/scons/config/win64-mingw-config.py | 3 +++ build_files/scons/config/win64-vc-config.py | 3 +++ build_files/scons/tools/Blender.py | 2 +- build_files/scons/tools/btools.py | 3 ++- source/blender/editors/animation/fmodifier_ui.c | 2 +- 13 files changed, 34 insertions(+), 6 deletions(-) diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 64fe395caa1..0e413711210 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -110,9 +110,6 @@ if CC[:-2].endswith('4.6'): else: WITH_BF_OPENMP = False -# enable freestyle support -WITH_BF_FREESTYLE = True - # enable ffmpeg support WITH_BF_FFMPEG = True BF_FFMPEG = LIBDIR + '/ffmpeg' @@ -320,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = False 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/scons/config/freebsd7-config.py b/build_files/scons/config/freebsd7-config.py index 02c9093567a..6c39039c4fb 100644 --- a/build_files/scons/config/freebsd7-config.py +++ b/build_files/scons/config/freebsd7-config.py @@ -162,6 +162,9 @@ WITH_GHOST_XDND = False WITH_BF_OPENMP = True +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index 5d3308c50d4..3318e21bf1d 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -162,6 +162,9 @@ WITH_BF_OPENMP = True WITH_GHOST_XDND = False +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index 98c2c8fa500..b6c5c0d45eb 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -162,6 +162,9 @@ WITH_BF_OPENMP = True WITH_GHOST_XDND = False +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index bef34727014..2aec75edb08 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -226,6 +226,9 @@ BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib' BF_3DMOUSE_LIB = 'spnav' BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a' +#Freestyle +WITH_BF_FREESTYLE = True + ## CC = 'gcc' CXX = 'g++' diff --git a/build_files/scons/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py index 54faf59b2a4..925ca5bb889 100644 --- a/build_files/scons/config/linuxcross-config.py +++ b/build_files/scons/config/linuxcross-config.py @@ -160,6 +160,9 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}' +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index acf2347f677..507768c4207 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -176,6 +176,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = False #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +#Freestyle +WITH_BF_FREESTYLE = True + ## CC = 'gcc' CXX = 'g++' diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 72866a75ff4..76d2bb7c525 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -195,6 +195,9 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE'] +#Freestyle +WITH_BF_FREESTYLE = True + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index e8fd3f175e1..b817f24da11 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -174,6 +174,9 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] #May produce errors with unsupported MinGW-w64 builds WITH_BF_OPENMP = False +#Freestyle +WITH_BF_FREESTYLE = True + ## CC = 'gcc' CXX = 'g++' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 0f0c457d1e8..18e64bba7d7 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -192,6 +192,9 @@ WITH_BF_RAYOPTIMIZATION = True # No need to manually specify SSE/SSE2 on x64 systems. BF_RAYOPTIMIZATION_SSE_FLAGS = [''] +#Freestyle +WITH_BF_FREESTYLE = True + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 37db10bbe5b..816287cdc73 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -388,7 +388,7 @@ def creator(env): defs.append('WITH_PYTHON') if env['BF_DEBUG']: defs.append('_DEBUG') - + if env['WITH_BF_FREESTYLE']: incs.append('#/source/blender/freestyle') defs.append('WITH_FREESTYLE') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 885c8f3d4c4..8db39833451 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -252,7 +252,6 @@ def read_opts(env, cfg, args): localopts.AddVariables( ('LCGDIR', 'Location of SVN lib dir'), ('LIBDIR', 'Root dir of libs'), - (BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)), (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)), (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)), ('BF_PYTHON', 'Base path for python', ''), @@ -392,6 +391,8 @@ def read_opts(env, cfg, args): ('BF_ICONV_LIB', 'iconv library', ''), ('BF_ICONV_LIBPATH', 'iconv library path', ''), + (BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)), + (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)), (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)), diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index dcdab8dba37..a1cb931030a 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -233,7 +233,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s /* closing bracket and multiplication sign */ if ( (i != (data->poly_order - 1)) || ((i == 0) && data->poly_order == 2) ) { - uiDefBut(block, LABEL, 1, ") ×", 0, 0, 40, 20, NULL, 0.0, 0.0, 0, 0, ""); + uiDefBut(block, LABEL, 1, ") \xc3\x97", 0, 0, 40, 20, NULL, 0.0, 0.0, 0, 0, ""); /* set up new row for the next pair of coefficients */ row = uiLayoutRow(layout, TRUE); -- cgit v1.2.3