[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41532] branches/cycles: Cycles: svn merge -r41467:41531 ^/trunk/blender

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Nov 4 21:21:41 CET 2011


Revision: 41532
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41532
Author:   blendix
Date:     2011-11-04 20:21:40 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Cycles: svn merge -r41467:41531 ^/trunk/blender

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

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt
    branches/cycles/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/cycles/build_files/cmake/project_info.py
    branches/cycles/build_files/scons/config/win32-vc-config.py
    branches/cycles/build_files/scons/config/win64-vc-config.py
    branches/cycles/build_files/scons/tools/Blender.py
    branches/cycles/build_files/scons/tools/btools.py
    branches/cycles/doc/python_api/sphinx_doc_gen.py
    branches/cycles/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/cycles/intern/ghost/CMakeLists.txt
    branches/cycles/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/cycles/release/scripts/modules/bpy/__init__.py
    branches/cycles/release/scripts/startup/bl_operators/presets.py
    branches/cycles/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/cycles/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/cycles/release/scripts/startup/bl_ui/space_graph.py
    branches/cycles/release/scripts/startup/bl_ui/space_nla.py
    branches/cycles/release/scripts/startup/bl_ui/space_sequencer.py
    branches/cycles/release/scripts/startup/bl_ui/space_time.py
    branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
    branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/cycles/source/blender/blenfont/intern/blf_font.c
    branches/cycles/source/blender/blenkernel/BKE_blender.h
    branches/cycles/source/blender/blenkernel/BKE_curve.h
    branches/cycles/source/blender/blenkernel/BKE_depsgraph.h
    branches/cycles/source/blender/blenkernel/BKE_global.h
    branches/cycles/source/blender/blenkernel/BKE_object.h
    branches/cycles/source/blender/blenkernel/BKE_screen.h
    branches/cycles/source/blender/blenkernel/intern/anim.c
    branches/cycles/source/blender/blenkernel/intern/constraint.c
    branches/cycles/source/blender/blenkernel/intern/curve.c
    branches/cycles/source/blender/blenkernel/intern/depsgraph.c
    branches/cycles/source/blender/blenkernel/intern/node.c
    branches/cycles/source/blender/blenkernel/intern/object.c
    branches/cycles/source/blender/blenkernel/intern/scene.c
    branches/cycles/source/blender/blenkernel/intern/screen.c
    branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/cycles/source/blender/blenlib/BLI_math_rotation.h
    branches/cycles/source/blender/blenlib/CMakeLists.txt
    branches/cycles/source/blender/blenlib/intern/math_rotation.c
    branches/cycles/source/blender/blenlib/intern/path_util.c
    branches/cycles/source/blender/blenlib/intern/uvproject.c
    branches/cycles/source/blender/blenloader/intern/readfile.c
    branches/cycles/source/blender/collada/CameraExporter.cpp
    branches/cycles/source/blender/collada/DocumentImporter.cpp
    branches/cycles/source/blender/editors/include/ED_render.h
    branches/cycles/source/blender/editors/interface/interface.c
    branches/cycles/source/blender/editors/interface/interface_handlers.c
    branches/cycles/source/blender/editors/interface/interface_ops.c
    branches/cycles/source/blender/editors/object/object_bake.c
    branches/cycles/source/blender/editors/object/object_transform.c
    branches/cycles/source/blender/editors/render/render_internal.c
    branches/cycles/source/blender/editors/render/render_view.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
    branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
    branches/cycles/source/blender/editors/space_image/image_ops.c
    branches/cycles/source/blender/editors/space_node/drawnode.c
    branches/cycles/source/blender/editors/space_outliner/outliner_tree.c
    branches/cycles/source/blender/editors/space_view3d/drawobject.c
    branches/cycles/source/blender/editors/space_view3d/view3d_buttons.c
    branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
    branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
    branches/cycles/source/blender/editors/space_view3d/view3d_intern.h
    branches/cycles/source/blender/editors/space_view3d/view3d_view.c
    branches/cycles/source/blender/imbuf/intern/moviecache.c
    branches/cycles/source/blender/makesdna/DNA_camera_types.h
    branches/cycles/source/blender/makesdna/DNA_object_types.h
    branches/cycles/source/blender/makesrna/RNA_access.h
    branches/cycles/source/blender/makesrna/intern/rna_actuator.c
    branches/cycles/source/blender/makesrna/intern/rna_camera.c
    branches/cycles/source/blender/makesrna/intern/rna_controller.c
    branches/cycles/source/blender/makesrna/intern/rna_curve.c
    branches/cycles/source/blender/makesrna/intern/rna_main.c
    branches/cycles/source/blender/makesrna/intern/rna_main_api.c
    branches/cycles/source/blender/makesrna/intern/rna_object.c
    branches/cycles/source/blender/makesrna/intern/rna_sensor.c
    branches/cycles/source/blender/modifiers/intern/MOD_uvproject.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/cycles/source/blender/python/BPY_extern.h
    branches/cycles/source/blender/python/generic/IDProp.c
    branches/cycles/source/blender/python/generic/IDProp.h
    branches/cycles/source/blender/python/generic/py_capi_utils.c
    branches/cycles/source/blender/python/intern/bpy_app_handlers.c
    branches/cycles/source/blender/python/intern/bpy_operator.c
    branches/cycles/source/blender/python/intern/bpy_props.c
    branches/cycles/source/blender/quicktime/apple/qtkit_import.m
    branches/cycles/source/blender/render/extern/include/RE_pipeline.h
    branches/cycles/source/blender/render/intern/include/render_types.h
    branches/cycles/source/blender/render/intern/source/convertblender.c
    branches/cycles/source/blender/render/intern/source/envmap.c
    branches/cycles/source/blender/render/intern/source/initrender.c
    branches/cycles/source/blender/render/intern/source/pipeline.c
    branches/cycles/source/blender/render/intern/source/shadbuf.c
    branches/cycles/source/blender/windowmanager/intern/wm_files.c
    branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
    branches/cycles/source/blender/windowmanager/intern/wm_operators.c
    branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/cycles/source/creator/creator.c
    branches/cycles/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/cycles/source/gameengine/Expressions/ListValue.cpp
    branches/cycles/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/cycles/source/gameengine/Expressions/StringValue.h
    branches/cycles/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/cycles/source/gameengine/Ketsji/KX_Camera.cpp
    branches/cycles/source/gameengine/Ketsji/KX_Camera.h
    branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonSeq.h
    branches/cycles/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/cycles/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/cycles/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/cycles/source/gameengine/VideoTexture/BlendType.h
    branches/cycles/source/gameengine/VideoTexture/FilterBase.cpp
    branches/cycles/source/gameengine/VideoTexture/ImageBase.cpp
    branches/cycles/source/gameengine/VideoTexture/ImageRender.cpp
    branches/cycles/source/gameengine/VideoTexture/Texture.cpp
    branches/cycles/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/cycles/doc/python_api/examples/bpy.app.handlers.1.py
    branches/cycles/doc/python_api/examples/bpy.app.handlers.py
    branches/cycles/release/scripts/presets/camera/
    branches/cycles/release/scripts/presets/camera/APS-C_DSLR.py
    branches/cycles/release/scripts/presets/camera/Blender.py
    branches/cycles/release/scripts/presets/camera/Canon_1100D.py
    branches/cycles/release/scripts/presets/camera/Canon_1D.py
    branches/cycles/release/scripts/presets/camera/Canon_1DS.py
    branches/cycles/release/scripts/presets/camera/Canon_500D.py
    branches/cycles/release/scripts/presets/camera/Canon_550D.py
    branches/cycles/release/scripts/presets/camera/Canon_5D.py
    branches/cycles/release/scripts/presets/camera/Canon_600D.py
    branches/cycles/release/scripts/presets/camera/Canon_60D.py
    branches/cycles/release/scripts/presets/camera/Canon_7D.py
    branches/cycles/release/scripts/presets/camera/Nikon_D300S.py
    branches/cycles/release/scripts/presets/camera/Nikon_D3100.py
    branches/cycles/release/scripts/presets/camera/Nikon_D35.py
    branches/cycles/release/scripts/presets/camera/Nikon_D5000.py
    branches/cycles/release/scripts/presets/camera/Nikon_D5100.py
    branches/cycles/release/scripts/presets/camera/Nikon_D7000.py
    branches/cycles/release/scripts/presets/camera/Nikon_D90.py
    branches/cycles/release/scripts/presets/camera/Red_Epic.py
    branches/cycles/release/scripts/presets/camera/Red_One_2K.py
    branches/cycles/release/scripts/presets/camera/Red_One_3K.py
    branches/cycles/release/scripts/presets/camera/Red_One_4K.py
    branches/cycles/release/scripts/presets/camera/full_frame_35mm_film.py
    branches/cycles/release/scripts/presets/camera/micro_four_thirds.py
    branches/cycles/release/scripts/presets/camera/super_16_film.py
    branches/cycles/release/scripts/presets/camera/super_35_film.py

Removed Paths:
-------------
    branches/cycles/release/scripts/presets/camera/APS-C_DSLR.py
    branches/cycles/release/scripts/presets/camera/Blender.py
    branches/cycles/release/scripts/presets/camera/Canon_1100D.py
    branches/cycles/release/scripts/presets/camera/Canon_1D.py
    branches/cycles/release/scripts/presets/camera/Canon_1DS.py
    branches/cycles/release/scripts/presets/camera/Canon_500D.py
    branches/cycles/release/scripts/presets/camera/Canon_550D.py
    branches/cycles/release/scripts/presets/camera/Canon_5D.py
    branches/cycles/release/scripts/presets/camera/Canon_600D.py
    branches/cycles/release/scripts/presets/camera/Canon_60D.py
    branches/cycles/release/scripts/presets/camera/Canon_7D.py
    branches/cycles/release/scripts/presets/camera/Nikon_D300S.py
    branches/cycles/release/scripts/presets/camera/Nikon_D3100.py
    branches/cycles/release/scripts/presets/camera/Nikon_D35.py
    branches/cycles/release/scripts/presets/camera/Nikon_D5000.py
    branches/cycles/release/scripts/presets/camera/Nikon_D5100.py
    branches/cycles/release/scripts/presets/camera/Nikon_D7000.py
    branches/cycles/release/scripts/presets/camera/Nikon_D90.py
    branches/cycles/release/scripts/presets/camera/Red_Epic.py
    branches/cycles/release/scripts/presets/camera/Red_One_2K.py
    branches/cycles/release/scripts/presets/camera/Red_One_3K.py
    branches/cycles/release/scripts/presets/camera/Red_One_4K.py
    branches/cycles/release/scripts/presets/camera/full_frame_35mm_film.py
    branches/cycles/release/scripts/presets/camera/micro_four_thirds.py
    branches/cycles/release/scripts/presets/camera/super_16_film.py
    branches/cycles/release/scripts/presets/camera/super_35_film.py

Property Changed:
----------------
    branches/cycles/
    branches/cycles/intern/
    branches/cycles/release/
    branches/cycles/source/blender/editors/datafiles/startup.blend.c
    branches/cycles/source/blender/editors/render/render_update.c
    branches/cycles/source/blender/editors/space_outliner/
    branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
    branches/cycles/source/blender/python/intern/


Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:37695-37700
/trunk/blender:36353-40411,40935-41467
   + /trunk:37695-37700
/trunk/blender:36353-40411,40935-41531

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/CMakeLists.txt	2011-11-04 20:21:40 UTC (rev 41532)
@@ -158,6 +158,8 @@
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
+	mark_as_advanced(WITH_XDG_USER_DIRS)
 else()
 	# not an option for other OS's
 	set(WITH_BUILTIN_GLEW ON)

Modified: branches/cycles/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-04 20:21:40 UTC (rev 41532)
@@ -44,8 +44,19 @@
 MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
 
 
+# if the user passes these defines as args, we dont want to overwrite
+SET(_IS_INC_DEF OFF)
+SET(_IS_LIB_DEF OFF)
+IF(DEFINED PYTHON_INCLUDE_DIR)
+  SET(_IS_INC_DEF ON)
+ENDIF()
+IF(DEFINED PYTHON_LIBRARY)
+  SET(_IS_LIB_DEF ON)
+ENDIF()
+
+
 # only search for the dirs if we havn't already
-IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
 
   SET(_python_ABI_FLAGS
     "m;mu;u; "    # release
@@ -66,30 +77,38 @@
     #ENDIF()
     STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
 
-    FIND_PATH(PYTHON_INCLUDE_DIR
-      NAMES
-        Python.h
-      HINTS
-        ${_python_SEARCH_DIRS}
-      PATH_SUFFIXES
-        include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-    )
+    IF(NOT DEFINED PYTHON_INCLUDE_DIR)
+      FIND_PATH(PYTHON_INCLUDE_DIR
+        NAMES
+          Python.h
+        HINTS
+          ${_python_SEARCH_DIRS}
+        PATH_SUFFIXES
+          include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+      )
+    ENDIF()
 
-    FIND_LIBRARY(PYTHON_LIBRARY
-      NAMES
-        "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
-      HINTS
-        ${_python_SEARCH_DIRS}
-      PATH_SUFFIXES
-        lib64 lib
-    )
+    IF(NOT DEFINED PYTHON_LIBRARY)
+      FIND_LIBRARY(PYTHON_LIBRARY
+        NAMES
+          "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
+        HINTS
+          ${_python_SEARCH_DIRS}
+        PATH_SUFFIXES
+          lib64 lib
+      )
+    ENDIF()
 
     IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
       break()
     ELSE()
       # ensure we dont find values from 2 different ABI versions
-      UNSET(PYTHON_INCLUDE_DIR CACHE)
-      UNSET(PYTHON_LIBRARY CACHE)
+      IF(NOT _IS_INC_DEF)
+        UNSET(PYTHON_INCLUDE_DIR CACHE)
+      ENDIF()
+      IF(NOT _IS_LIB_DEF)
+        UNSET(PYTHON_LIBRARY CACHE)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 
@@ -100,6 +119,9 @@
   UNSET(_python_SEARCH_DIRS)
 ENDIF()
 
+UNSET(_IS_INC_DEF)
+UNSET(_IS_LIB_DEF)
+
 # handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)

Modified: branches/cycles/build_files/cmake/project_info.py
===================================================================
--- branches/cycles/build_files/cmake/project_info.py	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/cmake/project_info.py	2011-11-04 20:21:40 UTC (rev 41532)
@@ -234,4 +234,3 @@
             if "/branches/" in l:
                 return prefix + l.rsplit("/branches/", 1)[-1].split("/", 1)[0]
     return fallback
-

Modified: branches/cycles/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/cycles/build_files/scons/config/win32-vc-config.py	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/scons/config/win32-vc-config.py	2011-11-04 20:21:40 UTC (rev 41532)
@@ -149,6 +149,20 @@
 
 WITH_BF_OPENMP = True
 
+'''
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = LIBDIR + '/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_46_1 libboost_filesystem-vc90-mt-s-1_46_1 libboost_regex-vc90-mt-s-1_46_1 libboost_system-vc90-mt-s-1_46_1 libboost_thread-vc90-mt-s-1_46_1'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+'''
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']

Modified: branches/cycles/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/cycles/build_files/scons/config/win64-vc-config.py	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/scons/config/win64-vc-config.py	2011-11-04 20:21:40 UTC (rev 41532)
@@ -153,6 +153,20 @@
 
 WITH_BF_OPENMP = True
 
+'''
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = LIBDIR + '/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_45 libboost_filesystem-vc90-mt-s-1_45 libboost_regex-vc90-mt-s-1_45 libboost_system-vc90-mt-s-1_45 libboost_thread-vc90-mt-s-1_45'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+'''
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']

Modified: branches/cycles/build_files/scons/tools/Blender.py
===================================================================
--- branches/cycles/build_files/scons/tools/Blender.py	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/scons/tools/Blender.py	2011-11-04 20:21:40 UTC (rev 41532)
@@ -192,6 +192,11 @@
     if lenv['WITH_BF_OPENMP']:
         if lenv['OURPLATFORM'] == 'linuxcross':
             libincs += Split(lenv['BF_OPENMP_LIBPATH'])
+            
+    if lenv['WITH_BF_OIIO']:
+        libincs += Split(lenv['BF_OIIO_LIBPATH'])
+    if lenv['WITH_BF_BOOST']:
+        libincs += Split(lenv['BF_BOOST_LIBPATH'])
 
     # setting this last so any overriding of manually libs could be handled
     if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
@@ -275,6 +280,11 @@
             if not lenv['WITH_BF_STATIC3DMOUSE']:
                 syslibs += Split(lenv['BF_3DMOUSE_LIB'])
 
+    if lenv['WITH_BF_OIIO']:
+        syslibs += Split(lenv['BF_OIIO_LIB'])
+    if lenv['WITH_BF_BOOST']:
+        syslibs += Split(lenv['BF_BOOST_LIB'])
+
     syslibs += lenv['LLIBS']
 
     return syslibs

Modified: branches/cycles/build_files/scons/tools/btools.py
===================================================================
--- branches/cycles/build_files/scons/tools/btools.py	2011-11-04 18:10:50 UTC (rev 41531)
+++ branches/cycles/build_files/scons/tools/btools.py	2011-11-04 20:21:40 UTC (rev 41532)
@@ -116,7 +116,9 @@
             'WITH_BF_INTERNATIONAL',
             'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
-            'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'WITH_BF_ELTOPO', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+            'WITH_BF_GAMEENGINE',
+            'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+            'WITH_BF_ELTOPO',
             'BF_WINTAB', 'BF_WINTAB_INC',
             'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
             'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -133,12 +135,10 @@
             'WITHOUT_BF_INSTALL',
             'WITHOUT_BF_PYTHON_INSTALL',
             'WITHOUT_BF_OVERWRITE_INSTALL',
-            'WITH_BF_OPENMP',
-            'BF_OPENMP',
-            'BF_OPENMP_INC',
-            'BF_OPENMP_LIBPATH',
+            'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
             'WITH_GHOST_COCOA',
             'WITH_GHOST_SDL',
+            'BF_GHOST_DEBUG',
             'USE_QTKIT',
             'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
             'BF_X264_CONFIG',
@@ -147,7 +147,6 @@
             'BF_NUMJOBS',
             'BF_MSVS',
             'BF_VERSION',
-            'BF_GHOST_DEBUG',
             'WITH_BF_RAYOPTIMIZATION',
             'BF_RAYOPTIMIZATION_SSE_FLAGS',
             'WITH_BF_FLUID',
@@ -155,7 +154,10 @@
             'WITH_BF_BOOLEAN',
             'WITH_BF_CXX_GUARDEDALLOC',
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
-            'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
+            'BUILDBOT_BRANCH',
+            'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
+            'WITH_BF_OIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIBPATH',
+            'WITH_BF_BOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIBPATH'
             ]
     
     # Have options here that scons expects to be lists
@@ -239,9 +241,9 @@
         ('LCGDIR', 'location of cvs lib dir'),
         (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', ''),
+        ('BF_PYTHON', 'Base path for python', ''),
         ('BF_PYTHON_VERSION', 'Python version to use', ''),
-        ('BF_PYTHON_INC', 'include path for Python headers', ''),

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list