[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55867] trunk/blender: Missing build_files updates in the merger in revision 55847.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Apr 7 08:44:33 CEST 2013


Revision: 55867
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55867
Author:   kjym3
Date:     2013-04-07 06:44:33 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
Missing build_files updates in the merger in revision 55847.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55847

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/build_files/scons/config/freebsd7-config.py
    trunk/blender/build_files/scons/config/freebsd8-config.py
    trunk/blender/build_files/scons/config/freebsd9-config.py
    trunk/blender/build_files/scons/config/linux-config.py
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-mingw-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -110,9 +110,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 @@
 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

Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -162,6 +162,9 @@
 
 WITH_BF_OPENMP = True
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']

Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -162,6 +162,9 @@
 
 WITH_GHOST_XDND = False
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']

Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -162,6 +162,9 @@
 
 WITH_GHOST_XDND = False
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']

Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/linux-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -226,6 +226,9 @@
 BF_3DMOUSE_LIB = 'spnav'
 BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -160,6 +160,9 @@
 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']

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -176,6 +176,9 @@
 #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++'

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -195,6 +195,9 @@
 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'

Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -174,6 +174,9 @@
 #May produce errors with unsupported MinGW-w64 builds
 WITH_BF_OPENMP = False
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -192,6 +192,9 @@
 # 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'

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/tools/Blender.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -388,7 +388,7 @@
         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')

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/build_files/scons/tools/btools.py	2013-04-07 06:44:33 UTC (rev 55867)
@@ -252,7 +252,6 @@
     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 @@
         ('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)),

Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2013-04-07 05:13:00 UTC (rev 55866)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2013-04-07 06:44:33 UTC (rev 55867)
@@ -233,7 +233,7 @@
 				
 				/* 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);




More information about the Bf-blender-cvs mailing list