[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36758] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 36757.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu May 19 03:40:39 CEST 2011


Revision: 36758
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36758
Author:   kjym3
Date:     2011-05-19 01:40:37 +0000 (Thu, 19 May 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36757.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
    branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
    branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source
    branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
    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/iksolver/intern/IK_QSegment.cpp
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.FFT
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.cygwin
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.linux
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.mac
    branches/soc-2008-mxcurioni/release/environment-mswindows
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/__init__.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_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_export.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_mesh_add.py
    branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
    branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_icons.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.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/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.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/sketch.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rand.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_writefile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenloader/SConscript
    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/readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_image.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_particle.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.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/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.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_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.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.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.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/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/util_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineonfile.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logmemfile.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.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_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/shading.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm.h
    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/creator.c
    branches/soc-2008-mxcurioni/source/darwin/blender.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/darwin/blenderplayer.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    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/BL_Material.h
    branches/soc-2008-mxcurioni/source/icons/blender.exe.manifest

Added Paths:
-----------
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py
    branches/soc-2008-mxcurioni/build_files/cmake/project_info.py
    branches/soc-2008-mxcurioni/intern/smoke/intern/main.cpp_disabled
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_runtime.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/runtime.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/intern/smoke/intern/main.cpp.back
    branches/soc-2008-mxcurioni/release/release_todo.txt
    branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/image_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/mesh_utils.py
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_render.c
    branches/soc-2008-mxcurioni/source/blender/readblenfile/
    branches/soc-2008-mxcurioni/source/tools/darwin/

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/build_files/buildbot/master.cfg
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2008-mxcurioni/build_files/package_spec/debian/docs
    branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
    branches/soc-2008-mxcurioni/doc/python_api/blender-org/static/default.css_t
    branches/soc-2008-mxcurioni/doc/python_api/blender-org/static/jquery.sidebar.js
    branches/soc-2008-mxcurioni/doc/python_api/blender-org/theme.conf
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_html_compact.diff
    branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/SVD
    branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/Edge.hpp
    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/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/glew/ChangeLog
    branches/soc-2008-mxcurioni/extern/libopenjpeg/patches/fbsd.patch
    branches/soc-2008-mxcurioni/extern/libredcode/AUTHOR
    branches/soc-2008-mxcurioni/extern/libredcode/LICENSE
    branches/soc-2008-mxcurioni/extern/libredcode/NOTES
    branches/soc-2008-mxcurioni/extern/lzo/minilzo/COPYING
    branches/soc-2008-mxcurioni/extern/lzo/minilzo/Makefile.bak
    branches/soc-2008-mxcurioni/extern/lzo/minilzo/README.LZO
    branches/soc-2008-mxcurioni/intern/audaspace/COPYING
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.FFT
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.cygwin
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.linux
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile.mac
    branches/soc-2008-mxcurioni/release/environment-macosx
    branches/soc-2008-mxcurioni/release/environment-mswindows
    branches/soc-2008-mxcurioni/release/environment-unix
    branches/soc-2008-mxcurioni/release/freedesktop/blender.desktop
    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
    branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
    branches/soc-2008-mxcurioni/scons/scons-LICENSE
    branches/soc-2008-mxcurioni/scons/scons-README
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Action.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Builder.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/CacheDir.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Conftest.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Debug.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Defaults.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Environment.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Errors.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Executor.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Job.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Memoize.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Node/Alias.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Node/FS.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Node/Python.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Node/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/BoolOption.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/EnumOption.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/ListOption.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/PackageOption.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/PathOption.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Options/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/PathList.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/aix.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/cygwin.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/darwin.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/hpux.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/irix.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/os2.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/posix.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/sunos.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/win32.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/SConf.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/SConsign.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/C.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/D.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Dir.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Fortran.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/IDL.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/LaTeX.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/Prog.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/RC.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Scanner/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Script/Interactive.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Script/Main.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Script/SConsOptions.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Script/SConscript.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Script/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Sig.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Subst.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Taskmaster.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/386asm.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/BitKeeper.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/CVS.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/FortranCommon.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/JavaCommon.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/common.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/netframework.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/sdk.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/Perforce.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/PharLapCommon.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/RCS.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/SCCS.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/Subversion.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixc++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixcc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixf77.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/aixlink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/applelink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/ar.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/as.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/bcc32.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/c++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/cc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/cvf.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/default.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/dmd.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvi.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvipdf.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/dvips.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/f77.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/f90.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/f95.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/filesystem.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/fortran.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/g++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/g77.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/gas.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/gcc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/gfortran.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/gnulink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/gs.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpc++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/hpcc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/hplink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/icc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/icl.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifl.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/ifort.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/ilink32.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/install.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/intelc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/jar.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/javac.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/javah.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/latex.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/lex.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/link.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/linkloc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/m4.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/masm.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/midl.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mingw.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslib.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mslink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mssdk.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/msvs.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwcc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/mwld.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/nasm.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/ipk.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/msi.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/rpm.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_tarbz2.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_targz.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/src_zip.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/tarbz2.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/targz.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/zip.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdf.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdflatex.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/pdftex.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/qt.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/rmic.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpcgen.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/rpm.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgiar.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgic++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgicc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sgilink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunar.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunc++.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/suncc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf77.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf90.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunf95.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/sunlink.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/swig.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/tar.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/tex.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/tlib.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/wix.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/yacc.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Tool/zip.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Util.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/BoolVariable.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/EnumVariable.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/ListVariable.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/PackageVariable.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/PathVariable.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Variables/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Warnings.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/__init__.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_UserString.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_hashlib.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_itertools.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_optparse.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_sets15.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_subprocess.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_textwrap.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/builtins.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/cpp.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/dblite.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/exitfuncs.py
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/soc-2008-mxcurioni/source/darwin/blender.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/darwin/blenderplayer.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/apparmor/README
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/apparmor/usr.bin.blenderplayer-web
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/icons/blender.exe.manifest


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-36551
   + /trunk/blender:34011-36757

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-05-18 19:42:30 UTC (rev 36757)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-05-19 01:40:37 UTC (rev 36758)
@@ -175,6 +175,10 @@
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
+# disable for now, but plan to support on all platforms eventually
+option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
+mark_as_advanced(WITH_MEM_JEMALLOC)
+
 # Debug
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
@@ -198,9 +202,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()
@@ -375,13 +376,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)
@@ -424,6 +418,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)
@@ -627,14 +630,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)
@@ -870,7 +866,7 @@
 		set(GETTEXT_LIB intl iconv)
 		set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 	endif()
-  
+
 	if(WITH_FFTW3)
 		set(FFTW3 ${LIBDIR}/fftw3)
 		set(FFTW3_INC ${FFTW3}/include)
@@ -897,13 +893,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/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2011-05-18 19:42:30 UTC (rev 36757)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2011-05-19 01:40:37 UTC (rev 36758)
@@ -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/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py	2011-05-18 19:42:30 UTC (rev 36757)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py	2011-05-19 01:40:37 UTC (rev 36758)
@@ -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/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py	2011-05-18 19:42:30 UTC (rev 36757)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py	2011-05-19 01:40:37 UTC (rev 36758)
@@ -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/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2011-05-18 19:42:30 UTC (rev 36757)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2011-05-19 01:40:37 UTC (rev 36758)
@@ -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/soc-2008-mxcurioni/build_files/buildbot/master.cfg
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
___________________________________________________________________
Added: svn:executable
   + *

Copied: branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py (from rev 36757, trunk/blender/build_files/cmake/cmake_netbeans_project.py)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py	2011-05-19 01:40:37 UTC (rev 36758)
@@ -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')
+        f.write('    <configuration>\n')
+        f.write('        <data xmlns="http://www.netbeans.org/ns/make-project/1">\n')
+        f.write('            <name>%s</name>\n' % PROJECT_NAME)
+        f.write('            <c-extensions>c,m</c-extensions>\n')
+        f.write('            <cpp-extensions>cpp,mm</cpp-extensions>\n')
+        f.write('            <header-extensions>h,hpp,inl</header-extensions>\n')
+        f.write('            <sourceEncoding>UTF-8</sourceEncoding>\n')

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list