[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36748] branches/cycles: Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/ blender/
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed May 18 15:56:21 CEST 2011
Revision: 36748
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36748
Author: blendix
Date: 2011-05-18 13:56:20 +0000 (Wed, 18 May 2011)
Log Message:
-----------
Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36495
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/SConstruct
branches/cycles/build_files/buildbot/config/user-config-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py
branches/cycles/build_files/buildbot/config/user-config-x86_64.py
branches/cycles/build_files/cmake/cmake_qtcreator_project.py
branches/cycles/build_files/cmake/macros.cmake
branches/cycles/build_files/cmake/packaging.cmake
branches/cycles/build_files/scons/config/linux2-config.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/doxygen/doxygen.source
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/intern/container/CMakeLists.txt
branches/cycles/intern/container/CTR_Map.h
branches/cycles/intern/container/SConscript
branches/cycles/intern/cycles/blender/addon/xml.py
branches/cycles/intern/ghost/CMakeLists.txt
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.h
branches/cycles/intern/ghost/intern/GHOST_SystemX11.cpp
branches/cycles/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/cycles/intern/iksolver/intern/IK_QSegment.cpp
branches/cycles/intern/smoke/intern/Makefile.FFT
branches/cycles/intern/smoke/intern/Makefile.cygwin
branches/cycles/intern/smoke/intern/Makefile.linux
branches/cycles/intern/smoke/intern/Makefile.mac
branches/cycles/release/environment-mswindows
branches/cycles/release/scripts/modules/bpy/path.py
branches/cycles/release/scripts/modules/bpy/utils.py
branches/cycles/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/cycles/release/scripts/startup/bl_ui/__init__.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_camera.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_empty.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_sequencer.py
branches/cycles/release/scripts/startup/bl_ui/space_text.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/templates/operator_export.py
branches/cycles/release/scripts/templates/operator_mesh_add.py
branches/cycles/release/windows/installer/00.sconsblender.nsi
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
branches/cycles/source/CMakeLists.txt
branches/cycles/source/SConscript
branches/cycles/source/blender/CMakeLists.txt
branches/cycles/source/blender/SConscript
branches/cycles/source/blender/blenfont/CMakeLists.txt
branches/cycles/source/blender/blenfont/intern/blf_dir.c
branches/cycles/source/blender/blenfont/intern/blf_internal.h
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_brush.h
branches/cycles/source/blender/blenkernel/BKE_colortools.h
branches/cycles/source/blender/blenkernel/BKE_sequencer.h
branches/cycles/source/blender/blenkernel/BKE_sketch.h
branches/cycles/source/blender/blenkernel/BKE_text.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/action.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/brush.c
branches/cycles/source/blender/blenkernel/intern/colortools.c
branches/cycles/source/blender/blenkernel/intern/displist.c
branches/cycles/source/blender/blenkernel/intern/icons.c
branches/cycles/source/blender/blenkernel/intern/object.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/seqeffects.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/sketch.c
branches/cycles/source/blender/blenkernel/intern/text.c
branches/cycles/source/blender/blenkernel/intern/texture.c
branches/cycles/source/blender/blenlib/BLI_math_geom.h
branches/cycles/source/blender/blenlib/BLI_scanfill.h
branches/cycles/source/blender/blenlib/CMakeLists.txt
branches/cycles/source/blender/blenlib/intern/bpath.c
branches/cycles/source/blender/blenlib/intern/dynlib.c
branches/cycles/source/blender/blenlib/intern/math_geom.c
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenlib/intern/rand.c
branches/cycles/source/blender/blenlib/intern/scanfill.c
branches/cycles/source/blender/blenloader/BLO_readfile.h
branches/cycles/source/blender/blenloader/BLO_writefile.h
branches/cycles/source/blender/blenloader/CMakeLists.txt
branches/cycles/source/blender/blenloader/SConscript
branches/cycles/source/blender/blenloader/intern/readblenentry.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/readfile.h
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/editors/animation/anim_filter.c
branches/cycles/source/blender/editors/animation/keyframing.c
branches/cycles/source/blender/editors/animation/keyingsets.c
branches/cycles/source/blender/editors/armature/armature_intern.h
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/editarmature_sketch.c
branches/cycles/source/blender/editors/armature/poselib.c
branches/cycles/source/blender/editors/curve/editcurve.c
branches/cycles/source/blender/editors/gpencil/gpencil_edit.c
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/include/ED_armature.h
branches/cycles/source/blender/editors/include/ED_curve.h
branches/cycles/source/blender/editors/include/ED_gpencil.h
branches/cycles/source/blender/editors/include/ED_image.h
branches/cycles/source/blender/editors/include/ED_keyframing.h
branches/cycles/source/blender/editors/include/ED_mball.h
branches/cycles/source/blender/editors/include/ED_mesh.h
branches/cycles/source/blender/editors/include/ED_object.h
branches/cycles/source/blender/editors/include/ED_particle.h
branches/cycles/source/blender/editors/include/ED_util.h
branches/cycles/source/blender/editors/include/ED_view3d.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_icons.c
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_ops.c
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/interface_widgets.c
branches/cycles/source/blender/editors/interface/view2d.c
branches/cycles/source/blender/editors/interface/view2d_ops.c
branches/cycles/source/blender/editors/mesh/editface.c
branches/cycles/source/blender/editors/mesh/editmesh_loop.c
branches/cycles/source/blender/editors/mesh/editmesh_mods.c
branches/cycles/source/blender/editors/mesh/editmesh_tools.c
branches/cycles/source/blender/editors/metaball/mball_edit.c
branches/cycles/source/blender/editors/object/object_edit.c
branches/cycles/source/blender/editors/object/object_lattice.c
branches/cycles/source/blender/editors/object/object_modifier.c
branches/cycles/source/blender/editors/object/object_select.c
branches/cycles/source/blender/editors/object/object_transform.c
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/physics_intern.h
branches/cycles/source/blender/editors/physics/physics_ops.c
branches/cycles/source/blender/editors/physics/physics_pointcache.c
branches/cycles/source/blender/editors/render/CMakeLists.txt
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/paint_intern.h
branches/cycles/source/blender/editors/sculpt_paint/paint_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_vertex.c
branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
branches/cycles/source/blender/editors/space_action/action_select.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_graph/graph_select.c
branches/cycles/source/blender/editors/space_image/CMakeLists.txt
branches/cycles/source/blender/editors/space_image/SConscript
branches/cycles/source/blender/editors/space_image/image_buttons.c
branches/cycles/source/blender/editors/space_image/image_draw.c
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_info/info_report.c
branches/cycles/source/blender/editors/space_nla/nla_select.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_select.c
branches/cycles/source/blender/editors/space_node/node_state.c
branches/cycles/source/blender/editors/space_outliner/outliner.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_intern.h
branches/cycles/source/blender/editors/space_sequencer/sequencer_select.c
branches/cycles/source/blender/editors/space_text/text_draw.c
branches/cycles/source/blender/editors/space_text/text_ops.c
branches/cycles/source/blender/editors/space_text/text_python.c
branches/cycles/source/blender/editors/space_view3d/CMakeLists.txt
branches/cycles/source/blender/editors/space_view3d/SConscript
branches/cycles/source/blender/editors/space_view3d/drawobject.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_fly.c
branches/cycles/source/blender/editors/space_view3d/view3d_header.c
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
branches/cycles/source/blender/editors/space_view3d/view3d_view.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform.h
branches/cycles/source/blender/editors/transform/transform_constraints.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/editors/transform/transform_input.c
branches/cycles/source/blender/editors/transform/transform_manipulator.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/editors/util/undo.c
branches/cycles/source/blender/editors/util/util_intern.h
branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
branches/cycles/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/cycles/source/blender/gpu/CMakeLists.txt
branches/cycles/source/blender/gpu/intern/gpu_draw.c
branches/cycles/source/blender/imbuf/IMB_imbuf_types.h
branches/cycles/source/blender/imbuf/intern/allocimbuf.c
branches/cycles/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/cycles/source/blender/imbuf/intern/cineon/cineonfile.h
branches/cycles/source/blender/imbuf/intern/cineon/cineonlib.c
branches/cycles/source/blender/imbuf/intern/cineon/logmemfile.c
branches/cycles/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/cycles/source/blender/imbuf/intern/dds/BlockDXT.h
branches/cycles/source/blender/imbuf/intern/dds/Color.h
branches/cycles/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/cycles/source/blender/imbuf/intern/dds/ColorBlock.h
branches/cycles/source/blender/imbuf/intern/dds/Common.h
branches/cycles/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/cycles/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/cycles/source/blender/imbuf/intern/dds/Image.cpp
branches/cycles/source/blender/imbuf/intern/dds/Image.h
branches/cycles/source/blender/imbuf/intern/dds/PixelFormat.h
branches/cycles/source/blender/imbuf/intern/dds/Stream.cpp
branches/cycles/source/blender/imbuf/intern/dds/Stream.h
branches/cycles/source/blender/imbuf/intern/dds/dds_api.cpp
branches/cycles/source/blender/imbuf/intern/dds/dds_api.h
branches/cycles/source/blender/imbuf/intern/filter.c
branches/cycles/source/blender/imbuf/intern/png.c
branches/cycles/source/blender/imbuf/intern/tiff.c
branches/cycles/source/blender/makesdna/DNA_ID.h
branches/cycles/source/blender/makesdna/DNA_camera_types.h
branches/cycles/source/blender/makesdna/DNA_object_fluidsim.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_sequence_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_view3d_types.h
branches/cycles/source/blender/makesdna/DNA_windowmanager_types.h
branches/cycles/source/blender/makesrna/RNA_access.h
branches/cycles/source/blender/makesrna/RNA_types.h
branches/cycles/source/blender/makesrna/SConscript
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/SConscript
branches/cycles/source/blender/makesrna/intern/rna_ID.c
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_animation.c
branches/cycles/source/blender/makesrna/intern/rna_armature.c
branches/cycles/source/blender/makesrna/intern/rna_camera.c
branches/cycles/source/blender/makesrna/intern/rna_color.c
branches/cycles/source/blender/makesrna/intern/rna_constraint.c
branches/cycles/source/blender/makesrna/intern/rna_fluidsim.c
branches/cycles/source/blender/makesrna/intern/rna_image.c
branches/cycles/source/blender/makesrna/intern/rna_internal.h
branches/cycles/source/blender/makesrna/intern/rna_key.c
branches/cycles/source/blender/makesrna/intern/rna_material.c
branches/cycles/source/blender/makesrna/intern/rna_mesh.c
branches/cycles/source/blender/makesrna/intern/rna_mesh_api.c
branches/cycles/source/blender/makesrna/intern/rna_modifier.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_particle.c
branches/cycles/source/blender/makesrna/intern/rna_property.c
branches/cycles/source/blender/makesrna/intern/rna_render.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
branches/cycles/source/blender/makesrna/intern/rna_smoke.c
branches/cycles/source/blender/makesrna/intern/rna_space.c
branches/cycles/source/blender/makesrna/intern/rna_texture.c
branches/cycles/source/blender/makesrna/intern/rna_ui.c
branches/cycles/source/blender/makesrna/intern/rna_ui_api.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/makesrna/intern/rna_wm_api.c
branches/cycles/source/blender/makesrna/intern/rna_world.c
branches/cycles/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/cycles/source/blender/modifiers/intern/MOD_warp.c
branches/cycles/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
branches/cycles/source/blender/python/generic/IDProp.c
branches/cycles/source/blender/python/intern/bpy_library.c
branches/cycles/source/blender/python/intern/bpy_operator.c
branches/cycles/source/blender/python/intern/bpy_operator_wrap.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_rna.h
branches/cycles/source/blender/python/intern/bpy_rna_anim.c
branches/cycles/source/blender/render/CMakeLists.txt
branches/cycles/source/blender/render/extern/include/RE_pipeline.h
branches/cycles/source/blender/render/intern/include/shading.h
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/rayshade.c
branches/cycles/source/blender/render/intern/source/rendercore.c
branches/cycles/source/blender/render/intern/source/renderdatabase.c
branches/cycles/source/blender/render/intern/source/strand.c
branches/cycles/source/blender/render/intern/source/sunsky.c
branches/cycles/source/blender/render/intern/source/volume_precache.c
branches/cycles/source/blender/render/intern/source/volumetric.c
branches/cycles/source/blender/windowmanager/CMakeLists.txt
branches/cycles/source/blender/windowmanager/SConscript
branches/cycles/source/blender/windowmanager/WM_api.h
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm.c
branches/cycles/source/blender/windowmanager/intern/wm_draw.c
branches/cycles/source/blender/windowmanager/intern/wm_event_system.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/blender/windowmanager/wm.h
branches/cycles/source/blenderplayer/CMakeLists.txt
branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/creator/SConscript
branches/cycles/source/creator/creator.c
branches/cycles/source/darwin/blender.app/Contents/Info.plist
branches/cycles/source/darwin/blenderplayer.app/Contents/Info.plist
branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cycles/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/cycles/source/gameengine/BlenderRoutines/SConscript
branches/cycles/source/gameengine/Converter/BL_ActionActuator.h
branches/cycles/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureActuator.h
branches/cycles/source/gameengine/Converter/BL_ArmatureChannel.h
branches/cycles/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.h
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/cycles/source/gameengine/Converter/BL_DeformableGameObject.h
branches/cycles/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_MeshDeformer.h
branches/cycles/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/cycles/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_SkinDeformer.h
branches/cycles/source/gameengine/Converter/CMakeLists.txt
branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/cycles/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/cycles/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/cycles/source/gameengine/Converter/SConscript
branches/cycles/source/gameengine/Expressions/CMakeLists.txt
branches/cycles/source/gameengine/Expressions/SConscript
branches/cycles/source/gameengine/GameLogic/CMakeLists.txt
branches/cycles/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/cycles/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/cycles/source/gameengine/GameLogic/SCA_LogicManager.h
branches/cycles/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/cycles/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/cycles/source/gameengine/GameLogic/SConscript
branches/cycles/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/cycles/source/gameengine/GamePlayer/common/SConscript
branches/cycles/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/SConscript
branches/cycles/source/gameengine/Ketsji/BL_Material.h
branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KXNetwork/SConscript
branches/cycles/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_CameraActuator.h
branches/cycles/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.h
branches/cycles/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/cycles/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_ParentActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/cycles/source/gameengine/Ketsji/KX_Scene.cpp
branches/cycles/source/gameengine/Ketsji/KX_Scene.h
branches/cycles/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_SceneActuator.h
branches/cycles/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/cycles/source/gameengine/Ketsji/SConscript
branches/cycles/source/gameengine/Network/CMakeLists.txt
branches/cycles/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/cycles/source/gameengine/Network/LoopBackNetwork/SConscript
branches/cycles/source/gameengine/Network/NG_NetworkScene.h
branches/cycles/source/gameengine/Network/SConscript
branches/cycles/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/cycles/source/gameengine/Physics/Bullet/SConscript
branches/cycles/source/gameengine/Rasterizer/CMakeLists.txt
branches/cycles/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/cycles/source/gameengine/Rasterizer/RAS_Deformer.h
branches/cycles/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/cycles/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/cycles/source/gameengine/Rasterizer/SConscript
branches/cycles/source/gameengine/VideoTexture/CMakeLists.txt
branches/cycles/source/gameengine/VideoTexture/SConscript
branches/cycles/source/icons/blender.exe.manifest
Added Paths:
-----------
branches/cycles/build_files/cmake/cmake_netbeans_project.py
branches/cycles/build_files/cmake/project_info.py
branches/cycles/build_files/package_spec/rpm/
branches/cycles/build_files/package_spec/rpm/blender.spec.in
branches/cycles/intern/container/CTR_HashedPtr.h
branches/cycles/intern/smoke/intern/main.cpp_disabled
branches/cycles/release/scripts/modules/bpy_extras/
branches/cycles/release/scripts/modules/bpy_extras/__init__.py
branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
branches/cycles/source/blender/blenlib/BLI_dynlib.h
branches/cycles/source/blender/blenloader/BLO_runtime.h
branches/cycles/source/blender/blenloader/intern/runtime.c
branches/cycles/source/gameengine/BlenderRoutines/BL_System.cpp
branches/cycles/source/gameengine/BlenderRoutines/BL_System.h
Removed Paths:
-------------
branches/cycles/build_files/package_spec/rpm/blender.spec.in
branches/cycles/intern/smoke/intern/main.cpp.back
branches/cycles/intern/tools/cpifdiff.sh
branches/cycles/intern/tools/cvs-tools/
branches/cycles/intern/tools/tinderbox/
branches/cycles/intern/tools/update-cvs/
branches/cycles/release/release_todo.txt
branches/cycles/release/scripts/modules/add_object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/__init__.py
branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
branches/cycles/release/scripts/modules/image_utils.py
branches/cycles/release/scripts/modules/io_utils.py
branches/cycles/release/scripts/modules/mesh_utils.py
branches/cycles/source/blender/blenkernel/BKE_exotic.h
branches/cycles/source/blender/blenkernel/intern/exotic.c
branches/cycles/source/blender/blenlib/PIL_dynlib.h
branches/cycles/source/blender/editors/space_image/image_render.c
branches/cycles/source/blender/readblenfile/
branches/cycles/source/kernel/
branches/cycles/source/tools/darwin/
Property Changed:
----------------
branches/cycles/
branches/cycles/build_files/buildbot/master.cfg
branches/cycles/build_files/cmake/cmake_consistency_check.py
branches/cycles/build_files/cmake/cmake_qtcreator_project.py
branches/cycles/build_files/package_spec/debian/docs
branches/cycles/doc/python_api/blender-org/static/default.css_t
branches/cycles/doc/python_api/blender-org/static/jquery.sidebar.js
branches/cycles/doc/python_api/blender-org/theme.conf
branches/cycles/doc/python_api/sphinx_html_compact.diff
branches/cycles/extern/Eigen2/Eigen/SVD
branches/cycles/extern/eltopo/common/meshes/Edge.hpp
branches/cycles/extern/eltopo/common/meshes/ObjLoader.hpp
branches/cycles/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/cycles/extern/eltopo/eltopo3d/Makefile.example_defs
branches/cycles/extern/eltopo/eltopo3d/Makefile.inc
branches/cycles/extern/eltopo/eltopo3d/Makefile.local_defs
branches/cycles/extern/glew/ChangeLog
branches/cycles/extern/libopenjpeg/patches/fbsd.patch
branches/cycles/extern/libredcode/AUTHOR
branches/cycles/extern/libredcode/LICENSE
branches/cycles/extern/libredcode/NOTES
branches/cycles/extern/lzo/minilzo/COPYING
branches/cycles/extern/lzo/minilzo/Makefile.bak
branches/cycles/extern/lzo/minilzo/README.LZO
branches/cycles/intern/audaspace/COPYING
branches/cycles/intern/smoke/intern/Makefile.FFT
branches/cycles/intern/smoke/intern/Makefile.cygwin
branches/cycles/intern/smoke/intern/Makefile.linux
branches/cycles/intern/smoke/intern/Makefile.mac
branches/cycles/release/environment-macosx
branches/cycles/release/environment-mswindows
branches/cycles/release/environment-unix
branches/cycles/release/freedesktop/blender.desktop
branches/cycles/release/windows/installer/00.sconsblender.nsi
branches/cycles/scons/scons-LICENSE
branches/cycles/scons/scons-README
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Action.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Builder.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/CacheDir.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Conftest.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Debug.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Defaults.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Environment.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Errors.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Executor.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Job.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Memoize.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Node/Alias.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Node/FS.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Node/Python.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Node/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/BoolOption.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/EnumOption.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/ListOption.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/PackageOption.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/PathOption.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Options/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/PathList.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/aix.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/cygwin.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/darwin.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/hpux.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/irix.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/os2.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/posix.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/sunos.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Platform/win32.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/SConf.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/SConsign.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/C.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/D.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Dir.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Fortran.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/IDL.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/LaTeX.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Prog.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/RC.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Scanner/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Script/Interactive.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Script/Main.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Script/SConsOptions.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Script/SConscript.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Script/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Sig.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Subst.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Taskmaster.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/386asm.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/BitKeeper.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/CVS.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/FortranCommon.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/JavaCommon.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/common.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/netframework.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/sdk.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/Perforce.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/PharLapCommon.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/RCS.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/SCCS.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/Subversion.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixc++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixcc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixf77.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixlink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/applelink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/ar.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/as.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/bcc32.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/c++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/cc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/cvf.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/default.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/dmd.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvi.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvipdf.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvips.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/f77.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/f90.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/f95.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/filesystem.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/fortran.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/g++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/g77.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/gas.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/gcc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/gfortran.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/gnulink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/gs.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpc++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpcc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/hplink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/icc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/icl.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifl.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifort.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink32.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/install.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/intelc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/jar.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/javac.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/javah.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/latex.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/lex.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/link.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/linkloc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/m4.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/masm.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/midl.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mingw.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslib.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mssdk.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvs.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwcc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwld.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/nasm.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/ipk.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/msi.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/rpm.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_tarbz2.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_targz.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_zip.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/tarbz2.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/targz.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/zip.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdf.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdflatex.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdftex.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/qt.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/rmic.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpcgen.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpm.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgiar.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgic++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgicc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgilink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunar.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunc++.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/suncc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf77.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf90.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf95.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunlink.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/swig.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/tar.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/tex.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/tlib.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/wix.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/yacc.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Tool/zip.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Util.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/BoolVariable.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/EnumVariable.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/ListVariable.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/PackageVariable.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/PathVariable.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Variables/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/Warnings.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/__init__.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_UserString.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_hashlib.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_itertools.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_optparse.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets15.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_subprocess.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_textwrap.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/compat/builtins.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/cpp.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/dblite.py
branches/cycles/scons/scons-local-1.2.0.d20090223/SCons/exitfuncs.py
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/gpu/intern/gpu_shader_material.glsl
branches/cycles/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/cycles/source/darwin/blender.app/Contents/Info.plist
branches/cycles/source/darwin/blenderplayer.app/Contents/Info.plist
branches/cycles/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/xembed/apparmor/README
branches/cycles/source/gameengine/GamePlayer/xembed/apparmor/usr.bin.blenderplayer-web
branches/cycles/source/gameengine/VideoTexture/CMakeLists.txt
branches/cycles/source/icons/blender.exe.manifest
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36353-36495
+ /trunk/blender:36353-36747
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/CMakeLists.txt 2011-05-18 13:56:20 UTC (rev 36748)
@@ -180,6 +180,10 @@
# Cycles
option(WITH_CYCLES "Enable Cycles Render Engine" 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)
@@ -203,9 +207,6 @@
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
-# only for developers who want to make this functional
-# option(WITH_LCMS "Enable color correction with lcms" OFF)
-
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -380,13 +381,6 @@
find_package(ZLIB REQUIRED)
- if(WITH_LCMS)
- set(LCMS /usr CACHE FILEPATH "LCMS directory")
- set(LCMS_INCLUDE_DIR ${LCMS}/include)
- set(LCMS_LIBRARY lcms)
- set(LCMS_LIBPATH ${LCMS}/lib)
- endif()
-
if(WITH_CODEC_FFMPEG)
set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
@@ -429,6 +423,15 @@
set(EXPAT_LIB expat)
endif()
+ if(WITH_MEM_JEMALLOC)
+ set(JEMALLOC /usr)
+ set(JEMALLOC_LIBRARY jemalloc 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)
@@ -632,14 +635,7 @@
set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
set(PCRE_LIB pcre)
endif()
-
- if(WITH_LCMS)
- set(LCMS ${LIBDIR}/lcms)
- set(LCMS_INCLUDE_DIR ${LCMS}/include)
- set(LCMS_LIBPATH ${LCMS}/lib)
- set(LCMS_LIB lcms)
- endif()
-
+
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
@@ -875,7 +871,7 @@
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
-
+
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
@@ -902,13 +898,6 @@
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
- if(WITH_LCMS)
- set(LCMS ${LIBDIR}/lcms)
- set(LCMS_INCLUDE_DIR ${LCMS}/include)
- set(LCMS_LIBRARY lcms)
- set(LCMS_LIBPATH ${LCMS}/lib)
- endif()
-
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INC ${FFMPEG}/include)
Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/SConstruct 2011-05-18 13:56:20 UTC (rev 36748)
@@ -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 = []
Modified: branches/cycles/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-i686.py 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/build_files/buildbot/config/user-config-i686.py 2011-05-18 13:56:20 UTC (rev 36748)
@@ -74,6 +74,12 @@
# Blender player (would be enabled in it's own config)
WITH_BF_PLAYER = False
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/cycles/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-player-i686.py 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/build_files/buildbot/config/user-config-player-i686.py 2011-05-18 13:56:20 UTC (rev 36748)
@@ -59,6 +59,12 @@
WITH_BF_NOBLENDER = True
WITH_BF_PLAYER = True
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py 2011-05-18 13:56:20 UTC (rev 36748)
@@ -59,6 +59,12 @@
WITH_BF_NOBLENDER = True
WITH_BF_PLAYER = True
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/cycles/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-x86_64.py 2011-05-18 12:56:58 UTC (rev 36747)
+++ branches/cycles/build_files/buildbot/config/user-config-x86_64.py 2011-05-18 13:56:20 UTC (rev 36748)
@@ -74,6 +74,12 @@
# Blender player (would be enabled in it's own config)
WITH_BF_PLAYER = False
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Property changes on: branches/cycles/build_files/buildbot/master.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/build_files/cmake/cmake_consistency_check.py
___________________________________________________________________
Added: svn:executable
+ *
Copied: branches/cycles/build_files/cmake/cmake_netbeans_project.py (from rev 36747, trunk/blender/build_files/cmake/cmake_netbeans_project.py)
===================================================================
--- branches/cycles/build_files/cmake/cmake_netbeans_project.py (rev 0)
+++ branches/cycles/build_files/cmake/cmake_netbeans_project.py 2011-05-18 13:56:20 UTC (rev 36748)
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton, M.G. Kishalmi
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
+"""
+Example linux usage
+ python .~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
+
+Windows not supported so far
+"""
+
+from project_info import *
+
+import os
+from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+
+
+def create_nb_project_main():
+ files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
+ files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel.sort()
+
+ if SIMPLE_PROJECTFILE:
+ pass
+ else:
+ includes, defines = cmake_advanced_info()
+ # for some reason it doesnt give all internal includes
+ includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f)))
+ includes.sort()
+
+ PROJECT_NAME = "Blender"
+ FILE_NAME = PROJECT_NAME.lower()
+
+ # --------------- NB spesific
+ defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
+ defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
+
+ def file_list_to_nested(files):
+ # convert paths to hierarchy
+ paths_nested = {}
+
+ def ensure_path(filepath):
+ filepath_split = filepath.split(os.sep)
+
+ pn = paths_nested
+ for subdir in filepath_split[:-1]:
+ pn = pn.setdefault(subdir, {})
+ pn[filepath_split[-1]] = None
+
+ for path in files:
+ ensure_path(path)
+ return paths_nested
+
+ PROJECT_DIR_NB = join(PROJECT_DIR, "nbproject")
+ if not exists(PROJECT_DIR_NB):
+ os.mkdir(PROJECT_DIR_NB)
+
+ SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+
+ f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
+
+ f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
+ f.write('<project xmlns="http://www.netbeans.org/ns/project/1">\n')
+ f.write(' <type>org.netbeans.modules.cnd.makeproject</type>\n')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list