Missing build_files updates in the merger in revision 55847.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Apr 2013 06:44:33 +0000 (06:44 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Apr 2013 06:44:33 +0000 (06:44 +0000)
13 files changed:
build_files/scons/config/darwin-config.py
build_files/scons/config/freebsd7-config.py
build_files/scons/config/freebsd8-config.py
build_files/scons/config/freebsd9-config.py
build_files/scons/config/linux-config.py
build_files/scons/config/linuxcross-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/editors/animation/fmodifier_ui.c

index 64fe395caa1f2d39793f6144aaf7dd78f132ecef..0e4137112102093797858bf2320f306042275ff5 100644 (file)
@@ -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
index 02c9093567a964c3275dbfd659692a48c3fc2a5e..6c39039c4fb74a3d660602e9975233b3c9690ff1 100644 (file)
@@ -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']
index 5d3308c50d4c1a399498899115b1b1c13e1f77ad..3318e21bf1db08aea0106ed9ee7f04c607a39c86 100644 (file)
@@ -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']
index 98c2c8fa50018b4620696404235b10f3c1f66436..b6c5c0d45eb5cad9f62732e0a5f0c6cb68b58286 100644 (file)
@@ -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']
index bef34727014320b292823392f3966fca9ae0a5e3..2aec75edb0853e398101871789a75ebdfdecdee1 100644 (file)
@@ -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++'
index 54faf59b2a47092792971ddc169670365b2209a5..925ca5bb8890d34ae92d5b110e53f50d7ecd3c69 100644 (file)
@@ -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']
index acf2347f67794242a0600395d591b953b989005a..507768c4207d99cc53db7395f230dc641e9584b6 100644 (file)
@@ -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++'
index 72866a75ff4a15b68eedba33b09192b3da118205..76d2bb7c525b23c38c8707fa788efdbbf2dcdafd 100644 (file)
@@ -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'
index e8fd3f175e11948e0e41292742953f505a3fb83a..b817f24da11573985615ab488865711a51bab644 100644 (file)
@@ -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++'
index 0f0c457d1e8f81abfc85a63d8a3f6392c1867aff..18e64bba7d7b3035a3a7345b16d460feb5114d1e 100644 (file)
@@ -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'
index 37db10bbe5b837e732fb1f4233a456c5bd2dadf8..816287cdc73616ac79f0c2fec60bc2cab40637ae 100644 (file)
@@ -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')
index 885c8f3d4c4df87e66f68f89f91a9171228d03f9..8db39833451a3986ff6ec3e7baafba1a109b947a 100644 (file)
@@ -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)),
index dcdab8dba37d74043c22fdb5d65d379de54be1fd..a1cb931030a5fef4cc6121344c22e36298954767 100644 (file)
@@ -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);