[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22179] branches/soc-2009-kazanbas: Merge with 2.5 -r 21756:22173.

Arystanbek Dyussenov arystan.d at gmail.com
Mon Aug 3 16:06:48 CEST 2009


Revision: 22179
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22179
Author:   kazanbas
Date:     2009-08-03 16:06:47 +0200 (Mon, 03 Aug 2009)

Log Message:
-----------
Merge with 2.5 -r 21756:22173.

Modified Paths:
--------------
    branches/soc-2009-kazanbas/CMakeLists.txt
    branches/soc-2009-kazanbas/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2009-kazanbas/blenderplayer/CMakeLists.txt
    branches/soc-2009-kazanbas/config/darwin-config.py
    branches/soc-2009-kazanbas/config/irix6-config.py
    branches/soc-2009-kazanbas/config/linux2-config.py
    branches/soc-2009-kazanbas/config/linuxcross-config.py
    branches/soc-2009-kazanbas/config/openbsd3-config.py
    branches/soc-2009-kazanbas/config/sunos5-config.py
    branches/soc-2009-kazanbas/config/win32-mingw-config.py
    branches/soc-2009-kazanbas/config/win32-vc-config.py
    branches/soc-2009-kazanbas/intern/CMakeLists.txt
    branches/soc-2009-kazanbas/intern/Makefile
    branches/soc-2009-kazanbas/intern/SConscript
    branches/soc-2009-kazanbas/intern/elbeem/intern/solver_init.cpp
    branches/soc-2009-kazanbas/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2009-kazanbas/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2009-kazanbas/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2009-kazanbas/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2009-kazanbas/po/ja.po
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/loader/BLO_loader.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/render/BRE_render.vcproj
    branches/soc-2009-kazanbas/release/Makefile
    branches/soc-2009-kazanbas/release/datafiles/blenderbuttons
    branches/soc-2009-kazanbas/release/datafiles/splash.jpg
    branches/soc-2009-kazanbas/release/io/export_fbx.py
    branches/soc-2009-kazanbas/release/io/export_ply.py
    branches/soc-2009-kazanbas/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2009-kazanbas/release/scripts/bvh_import.py
    branches/soc-2009-kazanbas/release/scripts/collada_export.py
    branches/soc-2009-kazanbas/release/scripts/export_dxf.py
    branches/soc-2009-kazanbas/release/scripts/export_fbx.py
    branches/soc-2009-kazanbas/release/scripts/export_map.py
    branches/soc-2009-kazanbas/release/scripts/export_obj.py
    branches/soc-2009-kazanbas/release/scripts/import_dxf.py
    branches/soc-2009-kazanbas/release/scripts/import_obj.py
    branches/soc-2009-kazanbas/release/scripts/object_active_to_other.py
    branches/soc-2009-kazanbas/release/scripts/vertexpaint_selfshadow_ao.py
    branches/soc-2009-kazanbas/release/ui/bpy_ops.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_empty.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lamp.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lattice.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_modifier.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_text.py
    branches/soc-2009-kazanbas/release/ui/buttons_game.py
    branches/soc-2009-kazanbas/release/ui/buttons_material.py
    branches/soc-2009-kazanbas/release/ui/buttons_object_constraint.py
    branches/soc-2009-kazanbas/release/ui/buttons_physics_cloth.py
    branches/soc-2009-kazanbas/release/ui/buttons_physics_field.py
    branches/soc-2009-kazanbas/release/ui/buttons_physics_fluid.py
    branches/soc-2009-kazanbas/release/ui/buttons_physics_softbody.py
    branches/soc-2009-kazanbas/release/ui/buttons_scene.py
    branches/soc-2009-kazanbas/release/ui/buttons_texture.py
    branches/soc-2009-kazanbas/release/ui/buttons_world.py
    branches/soc-2009-kazanbas/release/ui/space_buttons.py
    branches/soc-2009-kazanbas/release/ui/space_console.py
    branches/soc-2009-kazanbas/release/ui/space_filebrowser.py
    branches/soc-2009-kazanbas/release/ui/space_image.py
    branches/soc-2009-kazanbas/release/ui/space_info.py
    branches/soc-2009-kazanbas/release/ui/space_logic.py
    branches/soc-2009-kazanbas/release/ui/space_outliner.py
    branches/soc-2009-kazanbas/release/ui/space_sequencer.py
    branches/soc-2009-kazanbas/release/ui/space_text.py
    branches/soc-2009-kazanbas/release/ui/space_view3d.py
    branches/soc-2009-kazanbas/release/ui/space_view3d_toolbar.py
    branches/soc-2009-kazanbas/release/windows/extra/python26.zip
    branches/soc-2009-kazanbas/source/Makefile
    branches/soc-2009-kazanbas/source/blender/avi/intern/avi.c
    branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_blender.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_nla.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_object.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_screen.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_sequence.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_softbody.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/blenkernel/SConscript
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/blender.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/boids.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/image.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/key.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/mesh.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/nla.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/object.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/screen.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/softbody.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/texture.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/world.c
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_arithb.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_kdtree.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_storage_types.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_vfontdata.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/arithb.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/fileops.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/storage.c
    branches/soc-2009-kazanbas/source/blender/blenloader/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/blenloader/SConscript
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-kazanbas/source/blender/editors/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/editors/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_channels.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_markers.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframing.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyingsets.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/armature_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/poseobject.c
    branches/soc-2009-kazanbas/source/blender/editors/curve/editcurve.c
    branches/soc-2009-kazanbas/source/blender/editors/curve/editfont.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_anim_api.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_armature.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_fileselect.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframing.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_object.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_previewrender.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_screen.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_screen_types.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_util.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_icons.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_interface.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_view2d.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_anim.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_style.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/view2d.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/view2d_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/meshtools.c
    branches/soc-2009-kazanbas/source/blender/editors/object/editconstraint.c
    branches/soc-2009-kazanbas/source/blender/editors/object/editkey.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/object/object_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/ed_fluidsim.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/ed_pointcache.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/editparticle.c
    branches/soc-2009-kazanbas/source/blender/editors/preview/previewrender.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/area.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_context.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screendump.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/space_action.c
    branches/soc-2009-kazanbas/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_console/console_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_console/console_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_console/console_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_console/space_console.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_panels.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/filelist.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/filesel.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/fsmenu.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/space_file.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/writeimage.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/space_graph.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/space_image.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/info_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/space_info.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_window.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/space_logic.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/space_nla.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_state.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/space_node.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/space_text.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_python.c
    branches/soc-2009-kazanbas/source/blender/editors/space_time/space_time.c
    branches/soc-2009-kazanbas/source/blender/editors/space_time/time_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform.h
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_input.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/util/editmode_undo.c
    branches/soc-2009-kazanbas/source/blender/editors/util/undo.c
    branches/soc-2009-kazanbas/source/blender/editors/util/util_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2009-kazanbas/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2009-kazanbas/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/IMB_targa.h
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/filter.c
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/iris.c
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/readimage.c
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/targa.c
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/util.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_action_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_material_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_object_force.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_object_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_view2d_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_world_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/intern/makesdna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/SConscript
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/SConscript
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_key.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-kazanbas/source/blender/nodes/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/nodes/SConscript
    branches/soc-2009-kazanbas/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    branches/soc-2009-kazanbas/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
    branches/soc-2009-kazanbas/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/soc-2009-kazanbas/source/blender/nodes/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/soc-2009-kazanbas/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/soc-2009-kazanbas/source/blender/python/BPY_extern.h
    branches/soc-2009-kazanbas/source/blender/python/epy_doc_gen.py
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.h
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-kazanbas/source/blender/python/intern/stubs.c
    branches/soc-2009-kazanbas/source/blender/render/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/render/SConscript
    branches/soc-2009-kazanbas/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2009-kazanbas/source/blender/render/intern/source/Makefile
    branches/soc-2009-kazanbas/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/imagetexture.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/occlusion.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/rayshade.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/shadbuf.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/shadeinput.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/texture.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/zbuf.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/WM_api.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/WM_types.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_event_types.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_window.h
    branches/soc-2009-kazanbas/source/creator/CMakeLists.txt
    branches/soc-2009-kazanbas/source/creator/creator.c
    branches/soc-2009-kazanbas/source/darwin/Makefile
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_ConvertSensors.h
    branches/soc-2009-kazanbas/source/gameengine/Expressions/Value.cpp
    branches/soc-2009-kazanbas/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2009-kazanbas/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2009-kazanbas/source/gameengine/PyDoc/API_intro.py
    branches/soc-2009-kazanbas/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2009-kazanbas/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2009-kazanbas/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2009-kazanbas/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2009-kazanbas/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2009-kazanbas/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2009-kazanbas/source/nan_definitions.mk
    branches/soc-2009-kazanbas/tools/Blender.py

Added Paths:
-----------
    branches/soc-2009-kazanbas/intern/smoke/
    branches/soc-2009-kazanbas/intern/smoke/CMakeLists.txt
    branches/soc-2009-kazanbas/intern/smoke/Makefile
    branches/soc-2009-kazanbas/intern/smoke/SConscript
    branches/soc-2009-kazanbas/intern/smoke/extern/
    branches/soc-2009-kazanbas/intern/smoke/extern/smoke_API.h
    branches/soc-2009-kazanbas/intern/smoke/intern/
    branches/soc-2009-kazanbas/intern/smoke/intern/EIGENVALUE_HELPER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FFT_NOISE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/IMAGE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/INTERPOLATE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/LICENSE.txt
    branches/soc-2009-kazanbas/intern/smoke/intern/LU_HELPER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/MERSENNETWISTER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.FFT
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.cygwin
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.linux
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.mac
    branches/soc-2009-kazanbas/intern/smoke/intern/OBSTACLE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/SPHERE.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/SPHERE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/VEC3.h
    branches/soc-2009-kazanbas/intern/smoke/intern/WAVELET_NOISE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/WTURBULENCE.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/WTURBULENCE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/main.cpp.back
    branches/soc-2009-kazanbas/intern/smoke/intern/smoke_API.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/jama_eig.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/jama_lu.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array1d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array1d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array2d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array2d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array3d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array3d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_cmat.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array1d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array2d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array3d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_i_refvec.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_math_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_stopwatch.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_subscript.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_vec.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_version.h
    branches/soc-2009-kazanbas/intern/smoke/make/
    branches/soc-2009-kazanbas/intern/smoke/make/msvc_9_0/
    branches/soc-2009-kazanbas/intern/smoke/make/msvc_9_0/smoke.vcproj
    branches/soc-2009-kazanbas/release/io/engine_render_pov.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_metaball.py
    branches/soc-2009-kazanbas/release/ui/buttons_object.py
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_sketch.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_smoke.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/sketch.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/smoke.c
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_mball.h
    branches/soc-2009-kazanbas/source/blender/editors/metaball/
    branches/soc-2009-kazanbas/source/blender/editors/metaball/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/metaball/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/metaball/editmball.c
    branches/soc-2009-kazanbas/source/blender/editors/metaball/mball_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/metaball/mball_ops.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_render.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_smoke.c

Removed Paths:
-------------
    branches/soc-2009-kazanbas/ChangeLog
    branches/soc-2009-kazanbas/intern/smoke/CMakeLists.txt
    branches/soc-2009-kazanbas/intern/smoke/Makefile
    branches/soc-2009-kazanbas/intern/smoke/SConscript
    branches/soc-2009-kazanbas/intern/smoke/extern/
    branches/soc-2009-kazanbas/intern/smoke/extern/smoke_API.h
    branches/soc-2009-kazanbas/intern/smoke/intern/
    branches/soc-2009-kazanbas/intern/smoke/intern/EIGENVALUE_HELPER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FFT_NOISE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D.h
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/IMAGE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/INTERPOLATE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/LICENSE.txt
    branches/soc-2009-kazanbas/intern/smoke/intern/LU_HELPER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/MERSENNETWISTER.h
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.FFT
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.cygwin
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.linux
    branches/soc-2009-kazanbas/intern/smoke/intern/Makefile.mac
    branches/soc-2009-kazanbas/intern/smoke/intern/OBSTACLE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/SPHERE.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/SPHERE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/VEC3.h
    branches/soc-2009-kazanbas/intern/smoke/intern/WAVELET_NOISE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/WTURBULENCE.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/WTURBULENCE.h
    branches/soc-2009-kazanbas/intern/smoke/intern/main.cpp.back
    branches/soc-2009-kazanbas/intern/smoke/intern/smoke_API.cpp
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/jama_eig.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/jama_lu.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array1d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array1d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array2d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array2d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array3d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_array3d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_cmat.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array1d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array2d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array3d.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_i_refvec.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_math_utils.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_stopwatch.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_subscript.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_vec.h
    branches/soc-2009-kazanbas/intern/smoke/intern/tnt/tnt_version.h
    branches/soc-2009-kazanbas/intern/smoke/make/
    branches/soc-2009-kazanbas/intern/smoke/make/msvc_9_0/
    branches/soc-2009-kazanbas/intern/smoke/make/msvc_9_0/smoke.vcproj
    branches/soc-2009-kazanbas/release/ui/buttons_objects.py
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/psfont.c
    branches/soc-2009-kazanbas/source/blender/editors/metaball/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/metaball/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/metaball/editmball.c
    branches/soc-2009-kazanbas/source/blender/editors/metaball/mball_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/metaball/mball_ops.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_scriptlink_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scriptlink.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_vpaint.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_scriptlink.c

Modified: branches/soc-2009-kazanbas/CMakeLists.txt
===================================================================
--- branches/soc-2009-kazanbas/CMakeLists.txt	2009-08-03 14:00:23 UTC (rev 22178)
+++ branches/soc-2009-kazanbas/CMakeLists.txt	2009-08-03 14:06:47 UTC (rev 22179)
@@ -339,17 +339,29 @@
     ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
-  SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-  SET(PYTHON_VERSION 2.5)
-  SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
-  SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
-  SET(PYTHON_LIB "")
-  SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
-  IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
-	SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-  ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
+
+  SET(PYTHON_VERSION 3.1)
+
+  IF(PYTHON_VERSION MATCHES 3.1)
+    # we use precompiled libraries for py 3.1 and up by default
+
+    SET(PYTHON ${LIBDIR}/python)
+    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+    SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+    SET(PYTHON_LIB python${PYTHON_VERSION})
+    SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+  ELSE(PYTHON_VERSION MATCHES 3.1)
+    # otherwise, use custom system framework
+
+    SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
+    SET(PYTHON_VERSION 2.5)
+    SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
+    SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
+    SET(PYTHON_LIB "")
+    SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
     SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-  ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
+  ENDIF(PYTHON_VERSION MATCHES 3.1)
 
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC "${GETTEXT}/include")
@@ -370,11 +382,7 @@
 
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
-  IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(OPENEXR_LIB Iex Half IlmImf Imath)
-  ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 
   SET(LLIBS stdc++ SystemStubs)

Deleted: branches/soc-2009-kazanbas/ChangeLog
===================================================================
--- branches/soc-2009-kazanbas/ChangeLog	2009-08-03 14:00:23 UTC (rev 22178)
+++ branches/soc-2009-kazanbas/ChangeLog	2009-08-03 14:06:47 UTC (rev 22179)
@@ -1,114 +0,0 @@
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
-	Added Goofsters alt-m menu for merging verts in edit mode.
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
-	Added MacOSX plugin stuff
-
-Thu Apr 24 00:48:43 CST 2003 cwant at ualberta.ca
-	Added auto-skinning support. When parenting a mesh to an
-	armature the user is confronted with a menu about creating
-	weight groups. They can either create empty groups,
-	create groups that are populated based on a closest bone
-	algorithm, or create no groups.
-
-Mon Apr 28 04:04:44 CET 2003 phaseIV at zonnet.nl
-	Added Quicktime image and movie import for textures.
-	Added Quicktime movie export for rendering.
-	Note: the selected export codec isn't saved in the blendfile.
-	Enable with the WITH_QUICKTIME compile flag.
-
-Mon Apr 28 12:32:12 CET 2003 phaseIV at zonnet.nl
-	Added (Win32) text clipboard support and a rightmouse menu to
-	the text editor. Added the possibility to export text from
-	the editor to a 3D Font object with alt-m. (up to 1000 chars)
-	Added rename/delete popups to the file and imageselectors.
-	Redesigned the userpreference window layout. (unfinished atm.)
-
-Mon Apr 28 23:17:04 CET 2003 phaseIV at zonnet.nl
-	Added a 3D font loader that uses the Freetype2 library to
-	parse the vector data. Freetype2 supports many font formats
-	including Type1, TrueType and OpenType fonts.
-	Enable with the WITH_FREETYPE2 compile flag.
-
-Initial Change Log for Blender 2.26 Sun Feb  9 10:53:10 UTC 2003
-
-New features of Blender 2.26:
------------------------------
-
-- Mousewheel support for all windows. Two user settings are added in the
-   top window for mousewheel usage. The zoom direction [WZoom] and the
-   number of lines that get scrolled [WLines] can be set here.
-   The mousewheel also works to increase/decrease the size of the circle
-   while selecting or doing proportional scaling. 
-
-- A "fake user" button next to the material popup has been added, to keep
-   the data when it has been unlinked from an object. (Basically a shortcut
-   for pressing Shift+F4 and F)
-
-- Added support for manipulating Ipo bezier handles through the action
-   window. Selecting action keys and pressing VKEY, HKEY, or shift-HKEY
-   modifies the handles of the keys in the same way it does in the IPO
-   window.
-
-- CKEY in the action window scrolls the window so that the current frame
-   is in the center.
-
-- Extra selection support for the action window, including:
-     - border select initiated in the channel names border selects the
-       channels and constraint channels.
-     - right click or border select initiated in the horizontal scroll
-       causes blender to select all keys for the selected frames.
-     - right click or border select in the vertical scroll causes blender
-       to select all keys for the channel or constraint channels that are
-       to the left of the selection.
-
-- X-ray bones support for showing armature bones in shaded mode (disabled
-   depth test). The new x-ray button is added in the edit buttons when the
-   armature is selected.
-
-- TKEY in the action window changes the Ipo type (constant/linear/bezier)
-   for the Ipo curves owned by the selected channels
-
-- Simple shaded+wire and solid+wire drawmodes. It basically draws the
-   wireframe after drawing the model in solid/shaded/textured mode.
-   The user can set this per object using the "Wire" button in the edit
-   buttons window.
-
-- A headerbutton for drawing linenumbers in the texteditor.
-
-- Ctrl keystrokes for cut/copy/paste/undo/redo in the texteditor.
-
-- NTSC render preset (Image size - 720x480, Aspect ratio - 10x11, 30 fps)
-
-
-Bugfixes:
----------
-
-- Make switching to bottom, back, and left view (shift+pad7, shift+pad1
-   and shift+pad1) work when in camera view.
-
-- Full screen by default under Unix.
-
-- Ignore WM_DELETE_WINDOW on IRIX.
-
-- Icons in the imageselect window get drawn properly.
-
-
-Workarounds:
-------------
-
-- A small modification is made that prevents closing the renderwindow on
-   Mac OSX, so the GUI won't becoming irresponsive.
-
-
-Still Not working:
------------------
-
-Plugins in MacOSX
-
-Older Python API
-
-New build system using configure (this is partially working but
-        needs some work)
-

Modified: branches/soc-2009-kazanbas/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/soc-2009-kazanbas/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2009-kazanbas/blenderplayer/CMakeLists.txt	2009-08-03 14:00:23 UTC (rev 22178)
+++ branches/soc-2009-kazanbas/blenderplayer/CMakeLists.txt	2009-08-03 14:06:47 UTC (rev 22179)
@@ -69,7 +69,6 @@
     bf_blenkernel 
     verse 
     bf_blenkernel 
-    bf_decimation 
     bf_blenloader 
     bf_blenpluginapi 
     bf_blroutines 

Modified: branches/soc-2009-kazanbas/config/darwin-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/darwin-config.py	2009-08-03 14:00:23 UTC (rev 22178)
+++ branches/soc-2009-kazanbas/config/darwin-config.py	2009-08-03 14:06:47 UTC (rev 22179)
@@ -10,8 +10,6 @@
 # IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
 USE_SDK=True
 
-BF_PYTHON_VERSION = '2.3'
-
 cmd = 'uname -p'
 MAC_PROC=commands.getoutput(cmd) 
 cmd = 'uname -r'
@@ -29,12 +27,17 @@
 	LCGDIR = '#../lib/darwin-8.x.i386'
 LIBDIR = '${LCGDIR}'
 
+BF_PYTHON_VERSION = '3.1'
+
 if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
 	MAC_MIN_VERS = '10.3'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-else:
+elif MAC_CUR_VER=='10.4':
 	MAC_MIN_VERS = '10.4'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+else:
+	MAC_MIN_VERS = '10.5'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
 
 
 # enable ffmpeg  support
@@ -46,24 +49,33 @@
 #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 #BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
 
-# python.org libs install in /library we want to use that for 2.5 
-#
-# if you want py2.5 on leopard without installing
-# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
-# BEWARE: in that case it will work only on leopard
+if BF_PYTHON_VERSION=='3.1':
+	# python 3.1 uses precompiled libraries in bf svn /lib by default
 
-if BF_PYTHON_VERSION=='2.3':
-	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+	BF_PYTHON = LIBDIR + '/python'
+	BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System'
 else:
-	BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+	# python 2.5 etc. uses built-in framework
 
-BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = ''
-BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
-BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
-if MAC_CUR_VER=='10.3' or  MAC_CUR_VER=='10.4':
-	BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
+	# python.org libs install in /library we want to use that for 2.5 
+	#
+	# if you want py2.5 on leopard without installing

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list