[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36658] branches/particles-2010: svn merge -r36492:36657 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Fri May 13 12:09:42 CEST 2011
Revision: 36658
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36658
Author: lukastoenne
Date: 2011-05-13 10:09:41 +0000 (Fri, 13 May 2011)
Log Message:
-----------
svn merge -r36492:36657 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36492
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/SConstruct
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/build_files/cmake/packaging.cmake
branches/particles-2010/doc/doxygen/doxygen.source
branches/particles-2010/doc/python_api/sphinx_doc_gen.py
branches/particles-2010/intern/container/CMakeLists.txt
branches/particles-2010/intern/container/CTR_Map.h
branches/particles-2010/intern/container/SConscript
branches/particles-2010/intern/ghost/CMakeLists.txt
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/particles-2010/intern/iksolver/intern/IK_QSegment.cpp
branches/particles-2010/intern/smoke/intern/Makefile.FFT
branches/particles-2010/intern/smoke/intern/Makefile.cygwin
branches/particles-2010/intern/smoke/intern/Makefile.linux
branches/particles-2010/intern/smoke/intern/Makefile.mac
branches/particles-2010/release/environment-mswindows
branches/particles-2010/release/scripts/modules/bpy/path.py
branches/particles-2010/release/scripts/modules/bpy/utils.py
branches/particles-2010/release/scripts/modules/io_utils.py
branches/particles-2010/release/scripts/startup/bl_ui/properties_data_camera.py
branches/particles-2010/release/scripts/startup/bl_ui/properties_data_empty.py
branches/particles-2010/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/particles-2010/release/scripts/startup/bl_ui/space_text.py
branches/particles-2010/release/windows/installer/00.sconsblender.nsi
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
branches/particles-2010/source/CMakeLists.txt
branches/particles-2010/source/SConscript
branches/particles-2010/source/blender/CMakeLists.txt
branches/particles-2010/source/blender/SConscript
branches/particles-2010/source/blender/blenfont/CMakeLists.txt
branches/particles-2010/source/blender/blenfont/intern/blf_dir.c
branches/particles-2010/source/blender/blenfont/intern/blf_internal.h
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_brush.h
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/BKE_sketch.h
branches/particles-2010/source/blender/blenkernel/BKE_text.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenkernel/intern/brush.c
branches/particles-2010/source/blender/blenkernel/intern/displist.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/object.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
branches/particles-2010/source/blender/blenkernel/intern/sketch.c
branches/particles-2010/source/blender/blenkernel/intern/text.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenlib/BLI_math_geom.h
branches/particles-2010/source/blender/blenlib/CMakeLists.txt
branches/particles-2010/source/blender/blenlib/intern/dynlib.c
branches/particles-2010/source/blender/blenlib/intern/math_geom.c
branches/particles-2010/source/blender/blenlib/intern/path_util.c
branches/particles-2010/source/blender/blenlib/intern/rand.c
branches/particles-2010/source/blender/blenloader/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/SConscript
branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/editors/animation/anim_filter.c
branches/particles-2010/source/blender/editors/armature/armature_intern.h
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/armature/editarmature_sketch.c
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
branches/particles-2010/source/blender/editors/include/ED_armature.h
branches/particles-2010/source/blender/editors/include/ED_curve.h
branches/particles-2010/source/blender/editors/include/ED_gpencil.h
branches/particles-2010/source/blender/editors/include/ED_image.h
branches/particles-2010/source/blender/editors/include/ED_mball.h
branches/particles-2010/source/blender/editors/include/ED_mesh.h
branches/particles-2010/source/blender/editors/include/ED_object.h
branches/particles-2010/source/blender/editors/include/ED_particle.h
branches/particles-2010/source/blender/editors/include/ED_util.h
branches/particles-2010/source/blender/editors/include/ED_view3d.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_layout.c
branches/particles-2010/source/blender/editors/interface/interface_ops.c
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_widgets.c
branches/particles-2010/source/blender/editors/interface/view2d.c
branches/particles-2010/source/blender/editors/interface/view2d_ops.c
branches/particles-2010/source/blender/editors/mesh/editface.c
branches/particles-2010/source/blender/editors/mesh/editmesh_loop.c
branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
branches/particles-2010/source/blender/editors/metaball/mball_edit.c
branches/particles-2010/source/blender/editors/object/object_edit.c
branches/particles-2010/source/blender/editors/object/object_lattice.c
branches/particles-2010/source/blender/editors/object/object_select.c
branches/particles-2010/source/blender/editors/object/object_transform.c
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/physics/physics_intern.h
branches/particles-2010/source/blender/editors/physics/physics_ops.c
branches/particles-2010/source/blender/editors/render/CMakeLists.txt
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_intern.h
branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/space_graph/graph_select.c
branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_image/image_buttons.c
branches/particles-2010/source/blender/editors/space_image/image_draw.c
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_info/info_report.c
branches/particles-2010/source/blender/editors/space_nla/nla_select.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_node/node_select.c
branches/particles-2010/source/blender/editors/space_node/node_state.c
branches/particles-2010/source/blender/editors/space_outliner/outliner.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_intern.h
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_select.c
branches/particles-2010/source/blender/editors/space_text/text_draw.c
branches/particles-2010/source/blender/editors/space_text/text_ops.c
branches/particles-2010/source/blender/editors/space_text/text_python.c
branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/SConscript
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_select.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_snap.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/transform.c
branches/particles-2010/source/blender/editors/transform/transform.h
branches/particles-2010/source/blender/editors/transform/transform_constraints.c
branches/particles-2010/source/blender/editors/transform/transform_conversions.c
branches/particles-2010/source/blender/editors/transform/transform_input.c
branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
branches/particles-2010/source/blender/editors/util/util_intern.h
branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
branches/particles-2010/source/blender/gpu/CMakeLists.txt
branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
branches/particles-2010/source/blender/imbuf/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/IMB_imbuf_types.h
branches/particles-2010/source/blender/imbuf/SConscript
branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
branches/particles-2010/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/particles-2010/source/blender/imbuf/intern/cineon/cineonfile.h
branches/particles-2010/source/blender/imbuf/intern/cineon/cineonlib.c
branches/particles-2010/source/blender/imbuf/intern/cineon/logmemfile.c
branches/particles-2010/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/BlockDXT.h
branches/particles-2010/source/blender/imbuf/intern/dds/Color.h
branches/particles-2010/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/ColorBlock.h
branches/particles-2010/source/blender/imbuf/intern/dds/Common.h
branches/particles-2010/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/particles-2010/source/blender/imbuf/intern/dds/Image.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/Image.h
branches/particles-2010/source/blender/imbuf/intern/dds/PixelFormat.h
branches/particles-2010/source/blender/imbuf/intern/dds/Stream.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/Stream.h
branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.h
branches/particles-2010/source/blender/imbuf/intern/filter.c
branches/particles-2010/source/blender/makesdna/DNA_camera_types.h
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesdna/DNA_object_fluidsim.h
branches/particles-2010/source/blender/makesdna/DNA_object_types.h
branches/particles-2010/source/blender/makesdna/DNA_space_types.h
branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
branches/particles-2010/source/blender/makesrna/intern/rna_camera.c
branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
branches/particles-2010/source/blender/makesrna/intern/rna_mesh_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_object.c
branches/particles-2010/source/blender/makesrna/intern/rna_render.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
branches/particles-2010/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/particles-2010/source/blender/modifiers/intern/MOD_warp.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/particles-2010/source/blender/python/generic/IDProp.c
branches/particles-2010/source/blender/python/intern/bpy_library.c
branches/particles-2010/source/blender/python/intern/bpy_operator.c
branches/particles-2010/source/blender/python/intern/bpy_operator_wrap.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna.h
branches/particles-2010/source/blender/python/intern/bpy_rna_anim.c
branches/particles-2010/source/blender/render/CMakeLists.txt
branches/particles-2010/source/blender/render/intern/include/shading.h
branches/particles-2010/source/blender/render/intern/source/convertblender.c
branches/particles-2010/source/blender/render/intern/source/rayshade.c
branches/particles-2010/source/blender/render/intern/source/renderdatabase.c
branches/particles-2010/source/blender/render/intern/source/strand.c
branches/particles-2010/source/blender/render/intern/source/sunsky.c
branches/particles-2010/source/blender/render/intern/source/volume_precache.c
branches/particles-2010/source/blender/render/intern/source/volumetric.c
branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
branches/particles-2010/source/blender/windowmanager/SConscript
branches/particles-2010/source/blender/windowmanager/WM_api.h
branches/particles-2010/source/blender/windowmanager/WM_types.h
branches/particles-2010/source/blender/windowmanager/intern/wm_draw.c
branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
branches/particles-2010/source/blenderplayer/CMakeLists.txt
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/SConscript
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/darwin/blender.app/Contents/Info.plist
branches/particles-2010/source/darwin/blenderplayer.app/Contents/Info.plist
branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/particles-2010/source/gameengine/BlenderRoutines/SConscript
branches/particles-2010/source/gameengine/Converter/BL_ActionActuator.h
branches/particles-2010/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/particles-2010/source/gameengine/Converter/BL_ArmatureActuator.h
branches/particles-2010/source/gameengine/Converter/BL_ArmatureChannel.h
branches/particles-2010/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/particles-2010/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/particles-2010/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/particles-2010/source/gameengine/Converter/BL_ArmatureObject.h
branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/particles-2010/source/gameengine/Converter/BL_DeformableGameObject.h
branches/particles-2010/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/particles-2010/source/gameengine/Converter/BL_MeshDeformer.h
branches/particles-2010/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/particles-2010/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/particles-2010/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/particles-2010/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/particles-2010/source/gameengine/Converter/BL_SkinDeformer.h
branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/particles-2010/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/particles-2010/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/particles-2010/source/gameengine/Converter/SConscript
branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
branches/particles-2010/source/gameengine/Expressions/SConscript
branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
branches/particles-2010/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/particles-2010/source/gameengine/GameLogic/SCA_LogicManager.h
branches/particles-2010/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/particles-2010/source/gameengine/GameLogic/SConscript
branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/particles-2010/source/gameengine/GamePlayer/common/SConscript
branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/SConscript
branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/SConscript
branches/particles-2010/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_CameraActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.h
branches/particles-2010/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_ParentActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_Scene.h
branches/particles-2010/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_SceneActuator.h
branches/particles-2010/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/particles-2010/source/gameengine/Ketsji/SConscript
branches/particles-2010/source/gameengine/Network/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/SConscript
branches/particles-2010/source/gameengine/Network/NG_NetworkScene.h
branches/particles-2010/source/gameengine/Network/SConscript
branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Bullet/SConscript
branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/particles-2010/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/particles-2010/source/gameengine/Rasterizer/RAS_Deformer.h
branches/particles-2010/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/particles-2010/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/particles-2010/source/gameengine/Rasterizer/SConscript
branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
branches/particles-2010/source/gameengine/VideoTexture/SConscript
branches/particles-2010/source/icons/blender.exe.manifest
Added Paths:
-----------
branches/particles-2010/build_files/package_spec/rpm/
branches/particles-2010/build_files/package_spec/rpm/blender.spec.in
branches/particles-2010/intern/container/CTR_HashedPtr.h
branches/particles-2010/intern/smoke/intern/main.cpp_disabled
branches/particles-2010/release/scripts/modules/view3d_utils.py
branches/particles-2010/source/blender/blenlib/BLI_dynlib.h
branches/particles-2010/source/blender/blenloader/BLO_runtime.h
branches/particles-2010/source/blender/blenloader/intern/runtime.c
branches/particles-2010/source/gameengine/BlenderRoutines/BL_System.cpp
branches/particles-2010/source/gameengine/BlenderRoutines/BL_System.h
Removed Paths:
-------------
branches/particles-2010/build_files/package_spec/rpm/blender.spec.in
branches/particles-2010/intern/smoke/intern/main.cpp.back
branches/particles-2010/intern/tools/cpifdiff.sh
branches/particles-2010/intern/tools/cvs-tools/
branches/particles-2010/intern/tools/tinderbox/
branches/particles-2010/intern/tools/update-cvs/
branches/particles-2010/source/blender/blenkernel/BKE_exotic.h
branches/particles-2010/source/blender/blenkernel/intern/exotic.c
branches/particles-2010/source/blender/blenlib/PIL_dynlib.h
branches/particles-2010/source/blender/editors/space_image/image_render.c
branches/particles-2010/source/blender/readblenfile/
branches/particles-2010/source/kernel/
branches/particles-2010/source/tools/darwin/
Property Changed:
----------------
branches/particles-2010/
branches/particles-2010/build_files/buildbot/master.cfg
branches/particles-2010/build_files/package_spec/debian/docs
branches/particles-2010/doc/python_api/blender-org/static/default.css_t
branches/particles-2010/doc/python_api/blender-org/static/jquery.sidebar.js
branches/particles-2010/doc/python_api/blender-org/theme.conf
branches/particles-2010/doc/python_api/sphinx_html_compact.diff
branches/particles-2010/extern/Eigen2/Eigen/SVD
branches/particles-2010/extern/eltopo/common/meshes/Edge.hpp
branches/particles-2010/extern/eltopo/common/meshes/ObjLoader.hpp
branches/particles-2010/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/particles-2010/extern/eltopo/eltopo3d/Makefile.example_defs
branches/particles-2010/extern/eltopo/eltopo3d/Makefile.inc
branches/particles-2010/extern/eltopo/eltopo3d/Makefile.local_defs
branches/particles-2010/extern/glew/ChangeLog
branches/particles-2010/extern/libopenjpeg/patches/fbsd.patch
branches/particles-2010/extern/libredcode/AUTHOR
branches/particles-2010/extern/libredcode/LICENSE
branches/particles-2010/extern/libredcode/NOTES
branches/particles-2010/extern/lzo/minilzo/COPYING
branches/particles-2010/extern/lzo/minilzo/Makefile.bak
branches/particles-2010/extern/lzo/minilzo/README.LZO
branches/particles-2010/intern/audaspace/COPYING
branches/particles-2010/intern/smoke/intern/Makefile.FFT
branches/particles-2010/intern/smoke/intern/Makefile.cygwin
branches/particles-2010/intern/smoke/intern/Makefile.linux
branches/particles-2010/intern/smoke/intern/Makefile.mac
branches/particles-2010/release/environment-macosx
branches/particles-2010/release/environment-mswindows
branches/particles-2010/release/environment-unix
branches/particles-2010/release/freedesktop/blender.desktop
branches/particles-2010/release/windows/installer/00.sconsblender.nsi
branches/particles-2010/scons/scons-LICENSE
branches/particles-2010/scons/scons-README
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Action.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Builder.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/CacheDir.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Conftest.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Debug.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Defaults.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Environment.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Errors.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Executor.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Job.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Memoize.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Node/Alias.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Node/FS.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Node/Python.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Node/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/BoolOption.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/EnumOption.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/ListOption.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/PackageOption.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/PathOption.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Options/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/PathList.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/aix.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/cygwin.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/darwin.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/hpux.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/irix.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/os2.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/posix.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/sunos.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Platform/win32.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/SConf.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/SConsign.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/C.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/D.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Dir.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Fortran.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/IDL.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/LaTeX.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Prog.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/RC.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Scanner/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Script/Interactive.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Script/Main.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Script/SConsOptions.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Script/SConscript.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Script/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Sig.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Subst.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Taskmaster.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/386asm.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/BitKeeper.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/CVS.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/FortranCommon.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/JavaCommon.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/common.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/netframework.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/sdk.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/Perforce.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/PharLapCommon.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/RCS.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/SCCS.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/Subversion.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixc++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixcc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixf77.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixlink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/applelink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/ar.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/as.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/bcc32.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/c++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/cc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/cvf.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/default.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/dmd.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvi.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvipdf.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvips.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/f77.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/f90.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/f95.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/filesystem.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/fortran.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/g++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/g77.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/gas.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/gcc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/gfortran.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/gnulink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/gs.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpc++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpcc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/hplink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/icc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/icl.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifl.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifort.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink32.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/install.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/intelc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/jar.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/javac.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/javah.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/latex.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/lex.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/link.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/linkloc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/m4.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/masm.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/midl.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mingw.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslib.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mssdk.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvs.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwcc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwld.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/nasm.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/ipk.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/msi.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/rpm.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_tarbz2.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_targz.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_zip.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/tarbz2.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/targz.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/zip.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdf.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdflatex.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdftex.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/qt.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/rmic.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpcgen.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpm.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgiar.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgic++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgicc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgilink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunar.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunc++.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/suncc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf77.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf90.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf95.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunlink.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/swig.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/tar.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/tex.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/tlib.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/wix.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/yacc.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/zip.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Util.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/BoolVariable.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/EnumVariable.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/ListVariable.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/PackageVariable.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/PathVariable.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Variables/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Warnings.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/__init__.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_UserString.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_hashlib.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_itertools.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_optparse.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets15.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_subprocess.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_textwrap.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/compat/builtins.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/cpp.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/dblite.py
branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/exitfuncs.py
branches/particles-2010/source/blender/editors/uvedit/uvedit_buttons.c
branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl
branches/particles-2010/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/particles-2010/source/darwin/blender.app/Contents/Info.plist
branches/particles-2010/source/darwin/blenderplayer.app/Contents/Info.plist
branches/particles-2010/source/gameengine/GamePlayer/xembed/apparmor/README
branches/particles-2010/source/gameengine/GamePlayer/xembed/apparmor/usr.bin.blenderplayer-web
branches/particles-2010/source/icons/blender.exe.manifest
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-36492
+ /trunk/blender:33741-36657
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-05-13 06:52:51 UTC (rev 36657)
+++ branches/particles-2010/CMakeLists.txt 2011-05-13 10:09:41 UTC (rev 36658)
@@ -175,6 +175,10 @@
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+# disable for now, but plan to support on all platforms eventually
+option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
+mark_as_advanced(WITH_MEM_JEMALLOC)
+
# Debug
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
@@ -424,6 +428,15 @@
set(EXPAT_LIB expat)
endif()
+ if(WITH_MEM_JEMALLOC)
+ set(JEMALLOC /usr)
+ set(JEMALLOC_LIBRARY ljemalloc CACHE STRING "JeMalloc library")
+ set(JEMALLOC_LIBPATH ${JEMALLOC}/lib CACHE FILEPATH "JeMalloc library path")
+ # no use for this yet.
+ # set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include CACHE FILEPATH "JeMalloc include path")
+ unset(JEMALLOC)
+ endif()
+
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@ -870,7 +883,7 @@
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
-
+
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct 2011-05-13 06:52:51 UTC (rev 36657)
+++ branches/particles-2010/SConstruct 2011-05-13 10:09:41 UTC (rev 36658)
@@ -568,9 +568,10 @@
plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
plugininstall = []
-for targetdir,srcfile in zip(plugtargetlist, pluglist):
- td, tf = os.path.split(targetdir)
- plugininstall.append(env.Install(dir=td, source=srcfile))
+# plugins in blender 2.5 don't work at the moment.
+#for targetdir,srcfile in zip(plugtargetlist, pluglist):
+# td, tf = os.path.split(targetdir)
+# plugininstall.append(env.Install(dir=td, source=srcfile))
textlist = []
texttargetlist = []
Property changes on: branches/particles-2010/build_files/buildbot/master.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/particles-2010/build_files/cmake/macros.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/macros.cmake 2011-05-13 06:52:51 UTC (rev 36657)
+++ branches/particles-2010/build_files/cmake/macros.cmake 2011-05-13 10:09:41 UTC (rev 36658)
@@ -114,6 +114,9 @@
link_directories(${PCRE_LIBPATH})
link_directories(${EXPAT_LIBPATH})
endif()
+ if(WITH_MEM_JEMALLOC)
+ link_directories(${JEMALLOC_LIBPATH})
+ endif()
if(WIN32 AND NOT UNIX)
link_directories(${PTHREADS_LIBPATH})
@@ -220,6 +223,9 @@
target_link_libraries(${target} optimized ${LCMS_LIB})
endif()
endif()
+ if(WITH_MEM_JEMALLOC)
+ target_link_libraries(${target} ${JEMALLOC_LIBRARY})
+ endif()
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIB})
endif()
Modified: branches/particles-2010/build_files/cmake/packaging.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/packaging.cmake 2011-05-13 06:52:51 UTC (rev 36657)
+++ branches/particles-2010/build_files/cmake/packaging.cmake 2011-05-13 10:09:41 UTC (rev 36658)
@@ -31,17 +31,20 @@
# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
include(build_files/cmake/RpmBuild.cmake)
if(RPMBUILD_FOUND AND NOT WIN32)
set(CPACK_GENERATOR "RPM")
- set(CPACK_SET_DESTDIR TRUE)
+ set(CPACK_RPM_PACKAGE_RELEASE "1.r${BUILD_REV}")
+ set(CPACK_SET_DESTDIR "true")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+ set(CPACK_PACKAGE_RELOCATABLE "false")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Graphics")
+ set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
endif()
endif()
Property changes on: branches/particles-2010/build_files/package_spec/debian/docs
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: branches/particles-2010/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- trunk/blender/build_files/package_spec/rpm/blender.spec.in 2011-05-13 06:52:51 UTC (rev 36657)
+++ branches/particles-2010/build_files/package_spec/rpm/blender.spec.in 2011-05-13 10:09:41 UTC (rev 36658)
@@ -1,69 +0,0 @@
-# -*- rpm-spec -*-
-%global __python %{__python3}
-
-BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
-Summary: @CPACK_RPM_PACKAGE_SUMMARY@
-Name: @CPACK_RPM_PACKAGE_NAME@
-Version: @CPACK_RPM_PACKAGE_VERSION@
-Release: @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
-License: @CPACK_RPM_PACKAGE_LICENSE@
-Group: @CPACK_RPM_PACKAGE_GROUP@
-Vendor: @CPACK_RPM_PACKAGE_VENDOR@
-
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
-
-%description
-Blender is an integrated 3d suite for modelling, animation, rendering,
-post-production, interactive creation and playback (games). Blender has its
-own particular user interface, which is implemented entirely in OpenGL and
-designed with speed in mind. Python bindings are available for scripting;
-import/export features for popular file formats like 3D Studio and Wavefront
-Obj are implemented as scripts by the community. Stills, animations, models
-for games or other third party engines and interactive content in the form of
-a standalone binary and/or a web plug-in are common products of Blender use.
-
-# This is a shortcutted spec file generated by CMake RPM generator
-# we skip _install step because CPack does that for us.
-# We do only save CPack installed tree in _prepr
-# and then restore it in build.
-%prep
-mv ${RPM_BUILD_ROOT} "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot"
-
-%install
-if [ -e ${RPM_BUILD_ROOT} ];
-then
- rm -rf ${RPM_BUILD_ROOT}
-fi
-mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
-
-%postun
-%{_bindir}/update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi || :
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/blender
-%{_mandir}/man1/blender.*
-
-%changelog
- at CPACK_RPM_SPEC_CHANGELOG@
Copied: branches/particles-2010/build_files/package_spec/rpm/blender.spec.in (from rev 36657, trunk/blender/build_files/package_spec/rpm/blender.spec.in)
===================================================================
--- branches/particles-2010/build_files/package_spec/rpm/blender.spec.in (rev 0)
+++ branches/particles-2010/build_files/package_spec/rpm/blender.spec.in 2011-05-13 10:09:41 UTC (rev 36658)
@@ -0,0 +1,69 @@
+# -*- rpm-spec -*-
+%global __python %{__python3}
+
+BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary: @CPACK_RPM_PACKAGE_SUMMARY@
+Name: @CPACK_RPM_PACKAGE_NAME@
+Version: @CPACK_RPM_PACKAGE_VERSION@
+Release: @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
+License: @CPACK_RPM_PACKAGE_LICENSE@
+Group: @CPACK_RPM_PACKAGE_GROUP@
+Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
+%description
+Blender is an integrated 3d suite for modelling, animation, rendering,
+post-production, interactive creation and playback (games). Blender has its
+own particular user interface, which is implemented entirely in OpenGL and
+designed with speed in mind. Python bindings are available for scripting;
+import/export features for popular file formats like 3D Studio and Wavefront
+Obj are implemented as scripts by the community. Stills, animations, models
+for games or other third party engines and interactive content in the form of
+a standalone binary and/or a web plug-in are common products of Blender use.
+
+# This is a shortcutted spec file generated by CMake RPM generator
+# we skip _install step because CPack does that for us.
+# We do only save CPack installed tree in _prepr
+# and then restore it in build.
+%prep
+mv ${RPM_BUILD_ROOT} "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot"
+
+%install
+if [ -e ${RPM_BUILD_ROOT} ];
+then
+ rm -rf ${RPM_BUILD_ROOT}
+fi
+mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+%{_bindir}/update-desktop-database %{_datadir}/applications || :
+
+%postun
+%{_bindir}/update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list