[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36553] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 36551.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon May 9 03:38:33 CEST 2011
Revision: 36553
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36553
Author: kjym3
Date: 2011-05-09 01:38:29 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36551.
Conflicts resolved:
source/creator/SConscript
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36551
Modified Paths:
--------------
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/SConscript
branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/container/CTR_Map.h
branches/soc-2008-mxcurioni/intern/container/SConscript
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Debug.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/CMakeLists.txt
branches/soc-2008-mxcurioni/source/SConscript
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/dynlib.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_thumbs.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Color.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Common.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Image.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Image.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/PixelFormat.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Stream.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2008-mxcurioni/source/blender/readblenfile/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/readblenfile/SConscript
branches/soc-2008-mxcurioni/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Expressions/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Network/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkScene.h
branches/soc-2008-mxcurioni/source/gameengine/Network/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/SConscript
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/package_spec/rpm/
branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
branches/soc-2008-mxcurioni/extern/eltopo/
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/SConscript
branches/soc-2008-mxcurioni/extern/eltopo/common/
branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3_utils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.h
branches/soc-2008-mxcurioni/extern/eltopo/common/blas_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.h
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.h
branches/soc-2008-mxcurioni/extern/eltopo/common/cubic_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fe_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.h
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
branches/soc-2008-mxcurioni/extern/eltopo/common/grid3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/hashtable.h
branches/soc-2008-mxcurioni/extern/eltopo/common/lapack_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.h
branches/soc-2008-mxcurioni/extern/eltopo/common/mat.h
branches/soc-2008-mxcurioni/extern/eltopo/common/matlapack.h
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/Edge.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/linear_operator.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sos_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/cgsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/crsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparseilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsematrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsemilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/tunicate.h
branches/soc-2008-mxcurioni/extern/eltopo/common/util.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vec.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vector_math.h
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.example_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.inc
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.local_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/obj/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/obj_debug/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/options.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/readme.txt
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.h
branches/soc-2008-mxcurioni/extern/eltopo/readme.txt
branches/soc-2008-mxcurioni/intern/container/CTR_HashedPtr.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dynlib.h
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_System.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_System.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
branches/soc-2008-mxcurioni/extern/bullet2/uninitialized_stack_vec.patch
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/SConscript
branches/soc-2008-mxcurioni/extern/eltopo/common/
branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3_utils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.h
branches/soc-2008-mxcurioni/extern/eltopo/common/blas_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.h
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.h
branches/soc-2008-mxcurioni/extern/eltopo/common/cubic_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fe_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.h
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
branches/soc-2008-mxcurioni/extern/eltopo/common/grid3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/hashtable.h
branches/soc-2008-mxcurioni/extern/eltopo/common/lapack_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.h
branches/soc-2008-mxcurioni/extern/eltopo/common/mat.h
branches/soc-2008-mxcurioni/extern/eltopo/common/matlapack.h
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/Edge.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/linear_operator.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sos_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/cgsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/crsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparseilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsematrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsemilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/tunicate.h
branches/soc-2008-mxcurioni/extern/eltopo/common/util.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vec.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vector_math.h
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.example_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.inc
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.local_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/obj/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/obj_debug/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/options.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/readme.txt
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.h
branches/soc-2008-mxcurioni/extern/eltopo/readme.txt
branches/soc-2008-mxcurioni/intern/tools/cpifdiff.sh
branches/soc-2008-mxcurioni/intern/tools/cvs-tools/
branches/soc-2008-mxcurioni/intern/tools/tinderbox/
branches/soc-2008-mxcurioni/intern/tools/update-cvs/
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_exotic.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenlib/PIL_dynlib.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_header.c
branches/soc-2008-mxcurioni/source/kernel/
branches/soc-2008-mxcurioni/source/tools/to_dos
branches/soc-2008-mxcurioni/source/tools/to_unix
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-36408
+ /trunk/blender:34011-36551
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-05-08 23:43:18 UTC (rev 36552)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-05-09 01:38:29 UTC (rev 36553)
@@ -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/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake 2011-05-08 23:43:18 UTC (rev 36552)
+++ branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake 2011-05-09 01:38:29 UTC (rev 36553)
@@ -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 "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()
Modified: branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu 2011-05-08 23:43:18 UTC (rev 36552)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu 2011-05-09 01:38:29 UTC (rev 36553)
@@ -1,4 +1,4 @@
?package(blender-snapshot):needs="X11" section="Applications/Graphics"\
longtitle="Blender 3D modeler / renderer"\
- icon="/usr/share/pixmaps/blender.svg"\
+ icon="/usr/share/icons/hicolor/scalable/apps/blender.svg"\
title="blender" command="/usr/bin/blender"
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- trunk/blender/build_files/package_spec/rpm/blender.spec.in 2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in 2011-05-09 01:38:29 UTC (rev 36553)
@@ -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@
-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/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in (from rev 36551, trunk/blender/build_files/package_spec/rpm/blender.spec.in)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in 2011-05-09 01:38:29 UTC (rev 36553)
@@ -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@
+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@
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-05-08 23:43:18 UTC (rev 36552)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-05-09 01:38:29 UTC (rev 36553)
@@ -99,7 +99,7 @@
'WITH_BF_INTERNATIONAL',
'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
- 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+ 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'WITH_BF_ELTOPO', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
'BF_WINTAB', 'BF_WINTAB_INC',
'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -365,6 +365,8 @@
(BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
(BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
+ (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
+
('BF_BULLET', 'Bullet base dir', ''),
('BF_BULLET_INC', 'Bullet include path', ''),
('BF_BULLET_LIB', 'Bullet library', ''),
Modified: branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list