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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Tue Jul 27 02:08:17 CEST 2010 

Revision: 30784
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30784
Author:   kjym3
Date:     2010-07-27 02:08:15 +0200 (Tue, 27 Jul 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 30781.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30781

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/Makefile
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IReader.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.h
    branches/soc-2008-mxcurioni/po/Makefile
    branches/soc-2008-mxcurioni/release/Makefile
    branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
    branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/op/object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.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/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.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/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage_types.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.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/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_datafiles.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    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_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.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/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
    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_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.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_file/file_ops.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_stats.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_edit.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_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.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_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.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_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_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_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/Makefile
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.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_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.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/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/volume_precache.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.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/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    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/darwin/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/build_files/make/dlltool/
    branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile
    branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def
    branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def
    branches/soc-2008-mxcurioni/build_files/make/dlltool/python.def
    branches/soc-2008-mxcurioni/release/bin/
    branches/soc-2008-mxcurioni/release/bin/.blender/
    branches/soc-2008-mxcurioni/release/bin/.blender/.Blanguages
    branches/soc-2008-mxcurioni/release/bin/.blender/.bfont.ttf
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py
    branches/soc-2008-mxcurioni/release/windows/installer/01.installer.bmp
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/bin/
    branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile
    branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def
    branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def
    branches/soc-2008-mxcurioni/build_files/make/dlltool/python.def
    branches/soc-2008-mxcurioni/dlltool/
    branches/soc-2008-mxcurioni/release/bin/.blender/
    branches/soc-2008-mxcurioni/release/bin/.blender/.Blanguages
    branches/soc-2008-mxcurioni/release/bin/.blender/.bfont.ttf
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/soc-2008-mxcurioni/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-07-27 00:03:02 UTC (rev 30783)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-07-27 00:08:15 UTC (rev 30784)
@@ -115,6 +115,7 @@
 OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -130,6 +131,10 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+	MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+
 TEST_SSE_SUPPORT()
 
 # disabled for now, not supported

Modified: branches/soc-2008-mxcurioni/Makefile
===================================================================
--- branches/soc-2008-mxcurioni/Makefile	2010-07-27 00:03:02 UTC (rev 30783)
+++ branches/soc-2008-mxcurioni/Makefile	2010-07-27 00:08:15 UTC (rev 30784)
@@ -45,7 +45,7 @@
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool extern intern source po
+    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
 else
     DIRS ?= extern intern source po
 endif

Copied: branches/soc-2008-mxcurioni/build_files/make/dlltool (from rev 30781, trunk/blender/build_files/make/dlltool)

Deleted: branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile
===================================================================
--- trunk/blender/build_files/make/dlltool/Makefile	2010-07-26 23:49:23 UTC (rev 30781)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile	2010-07-27 00:08:15 UTC (rev 30784)
@@ -1,27 +0,0 @@
-include nan_definitions.mk
-
-all: ${NAN_GETTEXT}/lib/freegettext.a  ${NAN_ICONV}/lib/freeiconv.a \
-		${NAN_PYTHON}/lib/freepy.a
-
-debug: all
-
-${NAN_GETTEXT}/lib/freegettext.a: gettext.def \
-			${NAN_GETTEXT}/lib/gnu_gettext.dll
-	cp ${NAN_GETTEXT}/lib/gnu_gettext.dll .
-	dlltool.exe -v --output-lib ${NAN_GETTEXT}/lib/freegettext.a \
-		--input-def gettext.def \
-		--dllname gnu_gettext.dll
-	ranlib ${NAN_GETTEXT}/lib/freegettext.a
-	rm ./gnu_gettext.dll
-
-${NAN_ICONV}/lib/freeiconv.a: iconv.def ${NAN_ICONV}/lib/iconv.dll
-	cp ${NAN_ICONV}/lib/iconv.dll .
-	dlltool.exe -v --output-lib ${NAN_ICONV}/lib/freeiconv.a \
-		--input-def iconv.def \
-		--dllname iconv.dll
-	ranlib ${NAN_ICONV}/lib/freeiconv.a
-	rm ./iconv.dll
-
-clean:
-	$(RM) ${NAN_GETTEXT}/lib/freegettext.a \
-		${NAN_ICONV}/lib/freeiconv.a

Copied: branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile (from rev 30781, trunk/blender/build_files/make/dlltool/Makefile)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/Makefile	2010-07-27 00:08:15 UTC (rev 30784)
@@ -0,0 +1,27 @@
+include nan_definitions.mk
+
+all: ${NAN_GETTEXT}/lib/freegettext.a  ${NAN_ICONV}/lib/freeiconv.a \
+		${NAN_PYTHON}/lib/freepy.a
+
+debug: all
+
+${NAN_GETTEXT}/lib/freegettext.a: gettext.def \
+			${NAN_GETTEXT}/lib/gnu_gettext.dll
+	cp ${NAN_GETTEXT}/lib/gnu_gettext.dll .
+	dlltool.exe -v --output-lib ${NAN_GETTEXT}/lib/freegettext.a \
+		--input-def gettext.def \
+		--dllname gnu_gettext.dll
+	ranlib ${NAN_GETTEXT}/lib/freegettext.a
+	rm ./gnu_gettext.dll
+
+${NAN_ICONV}/lib/freeiconv.a: iconv.def ${NAN_ICONV}/lib/iconv.dll
+	cp ${NAN_ICONV}/lib/iconv.dll .
+	dlltool.exe -v --output-lib ${NAN_ICONV}/lib/freeiconv.a \
+		--input-def iconv.def \
+		--dllname iconv.dll
+	ranlib ${NAN_ICONV}/lib/freeiconv.a
+	rm ./iconv.dll
+
+clean:
+	$(RM) ${NAN_GETTEXT}/lib/freegettext.a \
+		${NAN_ICONV}/lib/freeiconv.a

Deleted: branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def
===================================================================
--- trunk/blender/build_files/make/dlltool/gettext.def	2010-07-26 23:49:23 UTC (rev 30781)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def	2010-07-27 00:08:15 UTC (rev 30784)
@@ -1,8 +0,0 @@
-LIBRARY GNU_GETTEXT.DLL
-EXPORTS
-bindtextdomain
-dcgettext
-dgettext
-gettext
-gettext_putenv
-textdomain

Copied: branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def (from rev 30781, trunk/blender/build_files/make/dlltool/gettext.def)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/gettext.def	2010-07-27 00:08:15 UTC (rev 30784)
@@ -0,0 +1,8 @@
+LIBRARY GNU_GETTEXT.DLL
+EXPORTS
+bindtextdomain
+dcgettext
+dgettext
+gettext
+gettext_putenv
+textdomain

Deleted: branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def
===================================================================
--- trunk/blender/build_files/make/dlltool/iconv.def	2010-07-26 23:49:23 UTC (rev 30781)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def	2010-07-27 00:08:15 UTC (rev 30784)
@@ -1,5 +0,0 @@
-LIBRARY ICONV.DLL
-EXPORTS
-libiconv_close
-libiconv_open
-libiconv
\ No newline at end of file

Copied: branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def (from rev 30781, trunk/blender/build_files/make/dlltool/iconv.def)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/iconv.def	2010-07-27 00:08:15 UTC (rev 30784)
@@ -0,0 +1,5 @@
+LIBRARY ICONV.DLL
+EXPORTS
+libiconv_close
+libiconv_open
+libiconv
\ No newline at end of file

Deleted: branches/soc-2008-mxcurioni/build_files/make/dlltool/python.def
===================================================================
--- trunk/blender/build_files/make/dlltool/python.def	2010-07-26 23:49:23 UTC (rev 30781)
+++ branches/soc-2008-mxcurioni/build_files/make/dlltool/python.def	2010-07-27 00:08:15 UTC (rev 30784)
@@ -1,758 +0,0 @@
-LIBRARY PYTHON22.DLL
-EXPORTS
-PyArg_Parse
-PyArg_ParseTuple
-PyArg_ParseTupleAndKeywords
-PyArg_UnpackTuple
-PyArg_VaParse
-PyBaseObject_Type
-PyBool_Type
-PyBool_FromLong
-PyBuffer_FromMemory
-PyBuffer_FromObject
-PyBuffer_FromReadWriteMemory
-PyBuffer_FromReadWriteObject
-PyBuffer_New
-PyBuffer_Type
-PyCFunction_Call
-PyCFunction_Fini
-PyCFunction_GetFlags
-PyCFunction_GetFunction
-PyCFunction_GetSelf
-PyCFunction_New
-PyCFunction_NewEx
-PyCFunction_Type
-PyCObject_AsVoidPtr
-PyCObject_FromVoidPtr
-PyCObject_FromVoidPtrAndDesc
-PyCObject_GetDesc
-PyCObject_Import
-PyCObject_Type
-PyCallIter_New
-PyCallIter_Type
-PyCallable_Check
-PyCell_Get
-PyCell_New
-PyCell_Set
-PyCell_Type
-PyClassMethod_New
-PyClassMethod_Type
-PyClass_IsSubclass
-PyClass_New
-PyClass_Type
-PyCode_Addr2Line
-PyCode_New
-PyCode_Type
-PyCodec_Decode
-PyCodec_Decoder
-PyCodec_Encode
-PyCodec_Encoder
-PyCodec_Register
-PyCodec_StreamReader
-PyCodec_StreamWriter
-PyComplex_AsCComplex
-PyComplex_FromCComplex
-PyComplex_FromDoubles
-PyComplex_ImagAsDouble
-PyComplex_RealAsDouble
-PyComplex_Type
-PyDescr_IsData
-PyDescr_NewGetSet
-PyDescr_NewMember
-PyDescr_NewMethod
-PyDescr_NewWrapper
-PyDictProxy_New
-PyDict_Clear
-PyDict_Copy
-PyDict_DelItem
-PyDict_DelItemString
-PyDict_GetItem
-PyDict_GetItemString
-PyDict_Items
-PyDict_Keys
-PyDict_Merge
-PyDict_MergeFromSeq2
-PyDict_New
-PyDict_Next
-PyDict_SetItem
-PyDict_SetItemString
-PyDict_Size
-PyDict_Type
-PyDict_Update
-PyDict_Values
-PyErr_BadArgument
-PyErr_BadInternalCall
-PyErr_CheckSignals
-PyErr_Clear
-PyErr_Display
-PyErr_ExceptionMatches
-PyErr_Fetch
-PyErr_Format
-PyErr_GivenExceptionMatches
-PyErr_NewException
-PyErr_NoMemory
-PyErr_NormalizeException
-PyErr_Occurred
-PyErr_Print
-PyErr_PrintEx
-PyErr_ProgramText
-PyErr_Restore
-PyErr_SetFromErrno
-PyErr_SetFromErrnoWithFilename
-PyErr_SetFromWindowsErr
-PyErr_SetFromWindowsErrWithFilename
-PyErr_SetInterrupt
-PyErr_SetNone
-PyErr_SetObject
-PyErr_SetString
-PyErr_SyntaxLocation
-PyErr_Warn
-PyErr_WarnExplicit
-PyErr_WriteUnraisable
-PyEval_AcquireLock
-PyEval_AcquireThread
-PyEval_CallFunction
-PyEval_CallMethod
-PyEval_CallObject
-PyEval_CallObjectWithKeywords
-PyEval_EvalCode
-PyEval_EvalCodeEx
-PyEval_GetBuiltins
-PyEval_GetFrame
-PyEval_GetFuncDesc
-PyEval_GetFuncName
-PyEval_GetGlobals
-PyEval_GetLocals
-PyEval_GetRestricted
-PyEval_InitThreads
-PyEval_MergeCompilerFlags
-PyEval_ReInitThreads
-PyEval_ReleaseLock
-PyEval_ReleaseThread
-PyEval_RestoreThread
-PyEval_SaveThread
-PyEval_SetProfile
-PyEval_SetTrace
-PyExc_ArithmeticError
-PyExc_AssertionError
-PyExc_AttributeError
-PyExc_DeprecationWarning
-PyExc_EOFError
-PyExc_EnvironmentError
-PyExc_Exception
-PyExc_FloatingPointError
-PyExc_IOError
-PyExc_ImportError
-PyExc_IndentationError
-PyExc_IndexError
-PyExc_KeyError
-PyExc_KeyboardInterrupt
-PyExc_LookupError
-PyExc_MemoryError
-PyExc_MemoryErrorInst
-PyExc_NameError
-PyExc_NotImplementedError
-PyExc_OSError
-PyExc_OverflowError
-PyExc_OverflowWarning
-PyExc_ReferenceError
-PyExc_RuntimeError
-PyExc_RuntimeWarning
-PyExc_StandardError
-PyExc_StopIteration
-PyExc_SyntaxError
-PyExc_SyntaxWarning
-PyExc_SystemError
-PyExc_SystemExit
-PyExc_TabError
-PyExc_TypeError
-PyExc_UnboundLocalError
-PyExc_UnicodeError
-PyExc_UserWarning
-PyExc_ValueError
-PyExc_Warning
-PyExc_WindowsError
-PyExc_ZeroDivisionError
-PyFile_AsFile
-PyFile_FromFile
-PyFile_FromString
-PyFile_GetLine
-PyFile_Name
-PyFile_SetBufSize
-PyFile_SoftSpace
-PyFile_Type
-PyFile_WriteObject
-PyFile_WriteString
-PyFloat_AsDouble
-PyFloat_AsReprString
-PyFloat_AsString
-PyFloat_Fini
-PyFloat_FromDouble
-PyFloat_FromString
-PyFloat_Type
-PyFrame_BlockPop
-PyFrame_BlockSetup
-PyFrame_FastToLocals
-PyFrame_Fini
-PyFrame_LocalsToFast
-PyFrame_New
-PyFrame_Type
-PyFunction_GetClosure
-PyFunction_GetCode
-PyFunction_GetDefaults
-PyFunction_GetGlobals
-PyFunction_New
-PyFunction_SetClosure
-PyFunction_SetDefaults
-PyFunction_Type
-PyImport_AddModule
-PyImport_AppendInittab
-PyImport_Cleanup
-PyImport_ExecCodeModule
-PyImport_ExecCodeModuleEx
-PyImport_ExtendInittab
-PyImport_FrozenModules
-PyImport_GetMagicNumber

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list