forked from bartvdbraak/blender
Missing build_files updates in the merger in revision 55847.
This commit is contained in:
parent
36cc2fd6da
commit
eeb95280be
@ -110,9 +110,6 @@ if CC[:-2].endswith('4.6'):
|
|||||||
else:
|
else:
|
||||||
WITH_BF_OPENMP = False
|
WITH_BF_OPENMP = False
|
||||||
|
|
||||||
# enable freestyle support
|
|
||||||
WITH_BF_FREESTYLE = True
|
|
||||||
|
|
||||||
# enable ffmpeg support
|
# enable ffmpeg support
|
||||||
WITH_BF_FFMPEG = True
|
WITH_BF_FFMPEG = True
|
||||||
BF_FFMPEG = LIBDIR + '/ffmpeg'
|
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_NVCC = '/usr/local/cuda/bin/nvcc'
|
||||||
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
|
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
|
@ -162,6 +162,9 @@ WITH_GHOST_XDND = False
|
|||||||
|
|
||||||
WITH_BF_OPENMP = True
|
WITH_BF_OPENMP = True
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
||||||
|
@ -162,6 +162,9 @@ WITH_BF_OPENMP = True
|
|||||||
|
|
||||||
WITH_GHOST_XDND = False
|
WITH_GHOST_XDND = False
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
||||||
|
@ -162,6 +162,9 @@ WITH_BF_OPENMP = True
|
|||||||
|
|
||||||
WITH_GHOST_XDND = False
|
WITH_GHOST_XDND = False
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
|
||||||
|
@ -226,6 +226,9 @@ BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
|
|||||||
BF_3DMOUSE_LIB = 'spnav'
|
BF_3DMOUSE_LIB = 'spnav'
|
||||||
BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
|
BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
##
|
##
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
CXX = 'g++'
|
CXX = 'g++'
|
||||||
|
@ -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_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
|
||||||
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
|
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
|
||||||
|
@ -176,6 +176,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = False
|
|||||||
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
|
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
|
||||||
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
##
|
##
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
CXX = 'g++'
|
CXX = 'g++'
|
||||||
|
@ -195,6 +195,9 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
|||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
WITH_BF_STATICOPENGL = False
|
WITH_BF_STATICOPENGL = False
|
||||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||||
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
||||||
|
@ -174,6 +174,9 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
|
|||||||
#May produce errors with unsupported MinGW-w64 builds
|
#May produce errors with unsupported MinGW-w64 builds
|
||||||
WITH_BF_OPENMP = False
|
WITH_BF_OPENMP = False
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
##
|
##
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
CXX = 'g++'
|
CXX = 'g++'
|
||||||
|
@ -192,6 +192,9 @@ WITH_BF_RAYOPTIMIZATION = True
|
|||||||
# No need to manually specify SSE/SSE2 on x64 systems.
|
# No need to manually specify SSE/SSE2 on x64 systems.
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
|
||||||
|
|
||||||
|
#Freestyle
|
||||||
|
WITH_BF_FREESTYLE = True
|
||||||
|
|
||||||
WITH_BF_STATICOPENGL = False
|
WITH_BF_STATICOPENGL = False
|
||||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||||
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
|
||||||
|
@ -252,7 +252,6 @@ def read_opts(env, cfg, args):
|
|||||||
localopts.AddVariables(
|
localopts.AddVariables(
|
||||||
('LCGDIR', 'Location of SVN lib dir'),
|
('LCGDIR', 'Location of SVN lib dir'),
|
||||||
('LIBDIR', 'Root dir of libs'),
|
('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', '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)),
|
(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', ''),
|
('BF_PYTHON', 'Base path for python', ''),
|
||||||
@ -392,6 +391,8 @@ def read_opts(env, cfg, args):
|
|||||||
('BF_ICONV_LIB', 'iconv library', ''),
|
('BF_ICONV_LIB', 'iconv library', ''),
|
||||||
('BF_ICONV_LIBPATH', 'iconv library path', ''),
|
('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_GAMEENGINE', 'Build with gameengine' , False)),
|
||||||
|
|
||||||
(BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
|
(BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
|
||||||
|
@ -233,7 +233,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
|
|||||||
|
|
||||||
/* closing bracket and multiplication sign */
|
/* closing bracket and multiplication sign */
|
||||||
if ( (i != (data->poly_order - 1)) || ((i == 0) && data->poly_order == 2) ) {
|
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 */
|
/* set up new row for the next pair of coefficients */
|
||||||
row = uiLayoutRow(layout, TRUE);
|
row = uiLayoutRow(layout, TRUE);
|
||||||
|
Loading…
Reference in New Issue
Block a user