[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53197] branches/soc-2008-mxcurioni: Another big patch set by Bastien Montagne, thanks a lot!

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu Dec 20 08:57:30 CET 2012 

Revision: 53197
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53197
Author:   kjym3
Date:     2012-12-20 07:57:26 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Another big patch set by Bastien Montagne, thanks a lot!

* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenfont/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenloader/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/bmesh/SConscript
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_similar.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/animation/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/interface/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/render/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesdna/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/python/SConscript
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_build_options.c
    branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/render/SConscript
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-12-20 07:57:26 UTC (rev 53197)
@@ -229,6 +229,9 @@
 # Camera/motion tracking
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
+# Freestyle
+option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
+
 # Misc
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/SConstruct	2012-12-20 07:57:26 UTC (rev 53197)
@@ -269,6 +269,7 @@
     target_env_defs['WITH_BF_PYTHON'] = False
     target_env_defs['WITH_BF_3DMOUSE'] = False
     target_env_defs['WITH_BF_LIBMV'] = False
+    target_env_defs['WITH_BF_FREESTYLE'] = False
 
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():
@@ -675,6 +676,10 @@
                 if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn:
                     dn.remove('addons_contrib')
 
+                # do not install freestyle if disabled
+                if not env['WITH_BF_FREESTYLE'] and "freestyle" in dn:
+                    dn.remove("freestyle")
+
                 dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
                 dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
 

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -317,6 +317,9 @@
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
     WITH_BF_RAYOPTIMIZATION = True

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -225,6 +225,9 @@
 BF_3DMOUSE_LIB = 'spnav'
 BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -176,6 +176,9 @@
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -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: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -364,7 +364,7 @@
 def creator(env):
     sources = ['creator.c']# + Blender.buildinfo(env, "dynamic") + Blender.resources
 
-    incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', '#/source/blender/freestyle', env['BF_OPENGL_INC']]
+    incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
 
     defs = []
 
@@ -388,6 +388,10 @@
         if env['BF_DEBUG']:
             defs.append('_DEBUG')
 
+    if env['WITH_BF_FREESTYLE']:
+        incs.append('#/source/blender/freestyle')
+        defs.append('WITH_FREESTYLE')
+
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
         incs.append(env['BF_PTHREADS_INC'])
         incs.append('#/intern/utfconv')

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-12-20 05:07:14 UTC (rev 53196)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-12-20 07:57:26 UTC (rev 53197)
@@ -116,6 +116,7 @@
             'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC',
             'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC',
             'WITH_BF_INTERNATIONAL',

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list