Revision: 41847
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41847
Author: campbellbarton
Date: 2011-11-15 02:05:32 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
svn merge -r41751:41779 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41751
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/bmesh/blender/intern/boolop/intern/BOP_Face2Face.cpp
branches/bmesh/blender/intern/boolop/intern/BOP_Interface.cpp
branches/bmesh/blender/intern/boolop/intern/BOP_Mesh.cpp
branches/bmesh/blender/intern/bsp/intern/CSG_BooleanOps.cpp
branches/bmesh/blender/intern/container/CTR_UHeap.h
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
branches/bmesh/blender/intern/cycles/device/device_opencl.cpp
branches/bmesh/blender/intern/cycles/kernel/kernel_globals.h
branches/bmesh/blender/intern/cycles/kernel/kernel_random.h
branches/bmesh/blender/intern/cycles/render/mesh.cpp
branches/bmesh/blender/intern/cycles/render/mesh.h
branches/bmesh/blender/intern/cycles/render/object.cpp
branches/bmesh/blender/intern/cycles/util/util_cuda.cpp
branches/bmesh/blender/intern/cycles/util/util_transform.h
branches/bmesh/blender/intern/decimation/intern/LOD_QSDecimator.cpp
branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
branches/bmesh/blender/intern/ghost/GHOST_ISystemPaths.h
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_System.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPaths.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/bmesh/blender/intern/ghost/test/gears/GHOST_Test.cpp
branches/bmesh/blender/intern/memutil/MEM_CacheLimiter.h
branches/bmesh/blender/release/plugins/sequence/dnr.c
branches/bmesh/blender/release/plugins/sequence/gamma.c
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/source/blender/avi/intern/avi.c
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_anim.h
branches/bmesh/blender/source/blender/blenkernel/BKE_bmfont.h
branches/bmesh/blender/source/blender/blenkernel/BKE_fluidsim.h
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/BLI_edgehash.h
branches/bmesh/blender/source/blender/blenlib/BLI_fnmatch.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
branches/bmesh/blender/source/blender/blenlib/BLI_pbvh.h
branches/bmesh/blender/source/blender/blenlib/BLI_vfontdata.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_heap.c
branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
branches/bmesh/blender/source/blender/blenlib/intern/math_rotation.c
branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/collada/ArmatureExporter.cpp
branches/bmesh/blender/source/blender/collada/ArmatureImporter.cpp
branches/bmesh/blender/source/blender/collada/ArmatureImporter.h
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/armature/reeb.c
branches/bmesh/blender/source/blender/editors/curve/curve_intern.h
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/include/ED_sculpt.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_select.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_stroke.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_select.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/bmesh/blender/source/blender/editors/space_text/text_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/ikplugin/intern/iksolver_plugin.c
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/imbuf/intern/IMB_indexer.h
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
branches/bmesh/blender/source/blender/imbuf/intern/png.c
branches/bmesh/blender/source/blender/imbuf/intern/scaling.c
branches/bmesh/blender/source/blender/imbuf/intern/thumbs_blend.c
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_sensor_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_animviz.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_meta.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_armature.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_curve.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_hook.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_lattice.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_smooth.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_image.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_math.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/bmesh/blender/source/blender/python/generic/noise_py_api.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_import.m
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_export.c
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_import.c
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/envmap.c
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/shadbuf.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/bmesh/blender/source/gameengine/Expressions/IntValue.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Action.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Shader.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_NearSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/Texture.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41751
+ /trunk/blender:39992-41779
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-11-14 20:39:53 UTC (rev
41846)
+++ branches/bmesh/blender/CMakeLists.txt 2011-11-15 02:05:32 UTC (rev
41847)
@@ -361,6 +361,19 @@
set(CMAKE_LIBRARY_PATH
"/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
endif()
+ # set lib directory if it exists
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
+ else()
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+ endif()
+
+ if(NOT EXISTS ${LIBDIR})
+ unset(LIBDIR)
+ endif()
+ endif()
+
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
@@ -435,10 +448,17 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT FFMPEG)
+ set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG
Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice
swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc
theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG
Libraries")
+ else()
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice
swscale CACHE STRING "FFMPEG Libraries")
+ endif()
+
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale
CACHE STRING "FFMPEG Libraries")
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-D__STDC_CONSTANT_MACROS")
@@ -504,10 +524,15 @@
endif()
if(WITH_BOOST)
-
# uses in build instructions to override include and library
variables
if(NOT BOOST_CUSTOM)
- set(Boost_USE_MULTITHREADED ON)
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT BOOST_ROOT)
+ set(BOOST_ROOT ${LIBDIR}/boost)
+ set(Boost_USE_MULTITHREADED OFF)
+ else()
+ set(Boost_USE_MULTITHREADED ON)
+ endif()
find_package(Boost 1.34 COMPONENTS filesystem regex
system thread)
mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif()
@@ -519,6 +544,11 @@
endif()
if(WITH_OPENIMAGEIO)
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
+ set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
+ endif()
+
find_package(OpenImageIO)
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES}
${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES}
${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
Modified: branches/bmesh/blender/build_files/scons/config/linux-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linux-config.py
2011-11-14 20:39:53 UTC (rev 41846)
+++ branches/bmesh/blender/build_files/scons/config/linux-config.py
2011-11-15 02:05:32 UTC (rev 41847)
@@ -1,5 +1,12 @@
-LCGDIR = '../lib/linux'
-LIBDIR = "${LCGDIR}"
+# find library directory
+import platform
+import os
+bitness = platform.architecture()[0]
+if bitness == '64bit':
+ LCGDIR = '../lib/linux64'
+else:
+ LCGDIR = '../lib/linux'
+LIBDIR = "#${LCGDIR}"
BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros
BF_PYTHON = '/usr'
@@ -113,7 +120,18 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = '/usr'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
+if os.path.exists(LCGDIR + '/ffmpeg'):
+ WITH_BF_STATICFFMPEG = True
+ BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a
${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+ '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a
${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+ '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a
${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+ '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a
${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+ '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a
' + \
+ '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+ '${BF_FFMPEG_LIBPATH}/libfaad.a'
+else:
+ BF_FFMPEG = '/usr'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -178,20 +196,26 @@
BF_JEMALLOC_LIB = 'jemalloc'
BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
-WITH_BF_CYCLES = False
-
-WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/oiio'
+if not os.path.exists(LCGDIR + '/oiio'):
+ WITH_BF_OIIO = False
+ BF_OIIO = '/usr'
BF_OIIO_INC = BF_OIIO + '/include'
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
WITH_BF_BOOST = True
BF_BOOST = LIBDIR + '/boost'
+if not os.path.exists(LCGDIR + '/boost'):
+ WITH_BF_BOOST = False
+ BF_BOOST = '/usr'
BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt
boost_system-mt boost_thread-mt'
+BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system
boost_thread'
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
+WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
+
WITH_BF_OPENMP = True
#Ray trace optimization
Modified: branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
2011-11-14 20:39:53 UTC (rev 41846)
+++ branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
2011-11-15 02:05:32 UTC (rev 41847)
@@ -395,7 +395,7 @@
{
data_size = AUD_MIN(pkgbuf_pos, left * sample_size);
m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(),
- data_size / AUD_FORMAT_SIZE(m_specs.format));
+ data_size / AUD_FORMAT_SIZE(m_specs.format));
buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
left -= data_size/sample_size;
}
Modified: branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
2011-11-14 20:39:53 UTC (rev 41846)
+++ branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
2011-11-15 02:05:32 UTC (rev 41847)
@@ -73,5 +73,5 @@
m_reader->read(length, eos, m_buffer.getBuffer());
m_convert((data_t*)buffer, (data_t*)m_buffer.getBuffer(),
- length * specs.channels);
+ length * specs.channels);
}
Modified: branches/bmesh/blender/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- branches/bmesh/blender/intern/boolop/intern/BOP_Face2Face.cpp
2011-11-14 20:39:53 UTC (rev 41846)
+++ branches/bmesh/blender/intern/boolop/intern/BOP_Face2Face.cpp
2011-11-15 02:05:32 UTC (rev 41847)
@@ -167,39 +167,41 @@
MT_Point3 p2 = mesh->getVertex(faceA->getVertex(1))->getPoint();
MT_Point3 p3 = mesh->getVertex(faceA->getVertex(2))->getPoint();
- /* get (or create) bounding box for face A */
+ /* get (or create) bounding box for face A */
if( faceA->getBBox() == NULL )
- faceA->setBBox(p1,p2,p3);
+ faceA->setBBox(p1,p2,p3);
BOP_BBox *boxA = faceA->getBBox();
/* start checking B faces with the previously stored split index */
for(unsigned int idxFaceB=faceA->getSplit();
- idxFaceB<facesB->size() && (faceA->getTAG() != BROKEN)
&& (faceA->getTAG() != PHANTOM);) {
+ idxFaceB<facesB->size() && (faceA->getTAG() != BROKEN) &&
(faceA->getTAG() != PHANTOM);) {
BOP_Face *faceB = (*facesB)[idxFaceB];
faceA->setSplit(idxFaceB);
if ((faceB->getTAG() != BROKEN) && (faceB->getTAG() !=
PHANTOM)) {
- /* get (or create) bounding box for face B */
- if( faceB->getBBox() == NULL )
-
faceB->setBBox(mesh->getVertex(faceB->getVertex(0))->getPoint(),
- mesh->getVertex(faceB->getVertex(1))->getPoint(),
- mesh->getVertex(faceB->getVertex(2))->getPoint());
- BOP_BBox *boxB = faceB->getBBox();
+ /* get (or create) bounding box for face B */
+ if( faceB->getBBox() == NULL ) {
+
faceB->setBBox(mesh->getVertex(faceB->getVertex(0))->getPoint(),
+
mesh->getVertex(faceB->getVertex(1))->getPoint(),
+
mesh->getVertex(faceB->getVertex(2))->getPoint());
+ }
+ BOP_BBox *boxB = faceB->getBBox();
- if (boxA->intersect(*boxB)) {
- MT_Plane3 planeB = faceB->getPlane();
- if (BOP_containsPoint(planeB,p1) &&
- BOP_containsPoint(planeB,p2) &&
- BOP_containsPoint(planeB,p3)) {
- if (BOP_orientation(planeB,planeA)>0) {
-
BOP_intersectCoplanarFaces(mesh,facesB,faceA,faceB,false);
- }
- }
- else {
-
BOP_intersectNonCoplanarFaces(mesh,facesA,facesB,faceA,faceB);
- }
- }
+ if (boxA->intersect(*boxB)) {
+ MT_Plane3 planeB = faceB->getPlane();
+ if (BOP_containsPoint(planeB,p1) &&
+ BOP_containsPoint(planeB,p2) &&
+ BOP_containsPoint(planeB,p3))
+ {
+ if
(BOP_orientation(planeB,planeA)>0) {
+
BOP_intersectCoplanarFaces(mesh,facesB,faceA,faceB,false);
+ }
+ }
+ else {
+
BOP_intersectNonCoplanarFaces(mesh,facesA,facesB,faceA,faceB);
+ }
+ }
}
idxFaceB++;
}
@@ -656,16 +658,16 @@
* @param invert indicates if faceA has priority over faceB
* @param segmemts array of the output x-segments
*/
- void BOP_createXS(BOP_Mesh* mesh,
- BOP_Face* faceA,
- BOP_Face* faceB,
- BOP_Segment sA,
- BOP_Segment sB,
- bool invert,
- BOP_Segment* segments) {
- BOP_createXS(mesh, faceA, faceB, faceA->getPlane(), faceB->getPlane(),
- sA, sB, invert, segments);
- }
+void BOP_createXS(BOP_Mesh* mesh,
+ BOP_Face* faceA,
+ BOP_Face* faceB,
+ BOP_Segment sA,
+ BOP_Segment sB,
+ bool invert,
+ BOP_Segment* segments) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
