[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21115] branches/soc-2009-kazanbas: Merge from 2.5 r21037 through r21112

Arystanbek Dyussenov arystan.d at gmail.com
Tue Jun 23 21:17:59 CEST 2009


Revision: 21115
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21115
Author:   kazanbas
Date:     2009-06-23 21:17:59 +0200 (Tue, 23 Jun 2009)

Log Message:
-----------
Merge from 2.5 r21037 through r21112

Modified Paths:
--------------
    branches/soc-2009-kazanbas/SConstruct
    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/config/win64-vc-config.py
    branches/soc-2009-kazanbas/extern/CMakeLists.txt
    branches/soc-2009-kazanbas/extern/Makefile
    branches/soc-2009-kazanbas/extern/SConscript
    branches/soc-2009-kazanbas/intern/bsp/test/Makefile
    branches/soc-2009-kazanbas/intern/guardedalloc/intern/mallocn.c
    branches/soc-2009-kazanbas/intern/iksolver/test/Makefile
    branches/soc-2009-kazanbas/intern/moto/include/MT_Matrix3x3.h
    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/editors/ED_editors.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/gameengine/converter/KX_converter.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2009-kazanbas/release/ui/buttons_data_armature.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_text.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_texture.py
    branches/soc-2009-kazanbas/release/ui/buttons_world.py
    branches/soc-2009-kazanbas/release/ui/space_image.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/source/Makefile
    branches/soc-2009-kazanbas/source/blender/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/Makefile
    branches/soc-2009-kazanbas/source/blender/SConscript
    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/blenfont/intern/blf_internal_types.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_exotic.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_gpencil.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_utildefines.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/blender.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/constraint.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/effect.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/idprop.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/multires.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/sequence.c
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_listbase.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_noise.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_rect.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_storage.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_string.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/dynamiclist.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/dynamiclist.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/listbase.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/psfont.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/storage.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/string.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/util.c
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/readblenentry.c
    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/blenpluginapi/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/animation/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_channels.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/animation/drivers.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyingsets.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-kazanbas/source/blender/editors/curve/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/Bfont.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-kazanbas/source/blender/editors/gpencil/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/include/BIF_gl.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_fluidsim.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframing.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_particle.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_resources.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_draw.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_style.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/resources.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-kazanbas/source/blender/editors/object/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/object/object_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/physics/editparticle.c
    branches/soc-2009-kazanbas/source/blender/editors/preview/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/screen/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/screen/glutil.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_action/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_api/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_file/filesel.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/Makefile
    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_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/Makefile
    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/space_image.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_info/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_window.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_node/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_script/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sound/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_text/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_time/Makefile
    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/drawobject.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_buttons.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_view.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/Makefile
    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_ndofinput.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_numinput.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_snap.c
    branches/soc-2009-kazanbas/source/blender/editors/util/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2009-kazanbas/source/blender/gpu/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/imbuf.h
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/readimage.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_object_force.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_space_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_windowmanager_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_enum_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image.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_lattice.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_packedfile.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.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_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/python/BPY_extern.h
    branches/soc-2009-kazanbas/source/blender/python/Makefile
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.c
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Makefile
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.c
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.c
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.h
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.c
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.c
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.h
    branches/soc-2009-kazanbas/source/blender/python/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.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_util.c
    branches/soc-2009-kazanbas/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2009-kazanbas/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-kazanbas/source/blender/render/intern/source/zbuf.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/WM_types.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_init_exit.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_subwindow.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_cursors.h
    branches/soc-2009-kazanbas/source/creator/CMakeLists.txt
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2009-kazanbas/source/gameengine/CMakeLists.txt
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Converter/SConscript
    branches/soc-2009-kazanbas/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2009-kazanbas/source/gameengine/Expressions/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/unix/Makefile
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    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_KetsjiEngine.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/SConscript
    branches/soc-2009-kazanbas/source/gameengine/Physics/Dummy/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Physics/Makefile
    branches/soc-2009-kazanbas/source/gameengine/Physics/common/Makefile
    branches/soc-2009-kazanbas/source/gameengine/SConscript
    branches/soc-2009-kazanbas/source/nan_compile.mk
    branches/soc-2009-kazanbas/source/nan_definitions.mk
    branches/soc-2009-kazanbas/source/nan_link.mk
    branches/soc-2009-kazanbas/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-kazanbas/release/ui/space_buttons.py
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_pointcache.h
    branches/soc-2009-kazanbas/source/blender/editors/physics/ed_pointcache.c

Removed Paths:
-------------
    branches/soc-2009-kazanbas/extern/qhull/
    branches/soc-2009-kazanbas/extern/solid/
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_radio_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_radio.c
    branches/soc-2009-kazanbas/source/blender/python/BPY_menus.c
    branches/soc-2009-kazanbas/source/blender/python/BPY_menus.h
    branches/soc-2009-kazanbas/source/blender/radiosity/
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/soc-2009-kazanbas/source/gameengine/Physics/BlOde/
    branches/soc-2009-kazanbas/source/gameengine/Physics/Sumo/

Property Changed:
----------------
    branches/soc-2009-kazanbas/config/win64-vc-config.py
    branches/soc-2009-kazanbas/release/scripts/flt_toolbar.py
    branches/soc-2009-kazanbas/release/scripts/scripttemplate_gamelogic.py
    branches/soc-2009-kazanbas/release/scripts/scripttemplate_gamelogic_basic.py
    branches/soc-2009-kazanbas/release/scripts/scripttemplate_ipo_gen.py
    branches/soc-2009-kazanbas/release/scripts/scripttemplate_metaball_create.py
    branches/soc-2009-kazanbas/release/scripts/scripttemplate_pyconstraint.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_material.py
    branches/soc-2009-kazanbas/release/ui/buttons_object_constraint.py
    branches/soc-2009-kazanbas/release/ui/buttons_objects.py
    branches/soc-2009-kazanbas/release/ui/buttons_physic_cloth.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_image.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/source/blender/blenfont/BLF_api.h
    branches/soc-2009-kazanbas/source/blender/blenfont/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/blenfont/Makefile
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_util.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_gpencil.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_report.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_sequence.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/report.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_listbase.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_noise.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_rect.h
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_string.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/dynamiclist.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/dynamiclist.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/listbase.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/string.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/animation/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_channels.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_deps.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_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_ipo_utils.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/drivers.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframes_general.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/BIF_generate.h
    branches/soc-2009-kazanbas/source/blender/editors/armature/BIF_retarget.h
    branches/soc-2009-kazanbas/source/blender/editors/armature/Makefile
    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_generate.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/meshlaplacian.h
    branches/soc-2009-kazanbas/source/blender/editors/armature/reeb.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/reeb.h
    branches/soc-2009-kazanbas/source/blender/editors/curve/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/curve/curve_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/curve/curve_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/Bfont.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/bfont.ttf.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/bmonofont.ttf.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/splash.jpg.c
    branches/soc-2009-kazanbas/source/blender/editors/gpencil/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/gpencil/gpencil_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/include/BIF_gl.h
    branches/soc-2009-kazanbas/source/blender/editors/include/BIF_glutil.h
    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_curve.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_datafiles.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_fluidsim.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_image.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_interface.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframes_edit.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframing.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_markers.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_node.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_object.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_particle.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_sculpt.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_sequencer.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_space_api.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_text.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_transform.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_types.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_util.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_uvedit.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_view3d.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_resources.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_view2d.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/Makefile
    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_draw.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_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/resources.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/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/object/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/object/object_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/object/object_modifier.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/physics/editparticle.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/physics_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/preview/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/preview/previewrender_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/editors/screen/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/screen/area.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/glutil.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/sculpt_paint/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt_stroke.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/space_action.c
    branches/soc-2009-kazanbas/source/blender/editors/space_api/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_api/space.c
    branches/soc-2009-kazanbas/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-kazanbas/source/blender/editors/space_buttons/Makefile
    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_file/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/filesel.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/space_file.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/Makefile
    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_intern.h
    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/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_image/space_image.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_info/info_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/info_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_info/space_info.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/Makefile
    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_intern.h
    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/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_nla/space_nla.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_ops.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/Makefile
    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_script/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_script/script_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_script/script_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_script/script_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_script/script_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_script/space_script.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sound/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_sound/sound_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sound/sound_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_sound/space_sound.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_text/space_text.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_python.c
    branches/soc-2009-kazanbas/source/blender/editors/space_time/Makefile
    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_time/time_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_time/time_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/Makefile
    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_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_ops.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/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_input.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ndofinput.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-kazanbas/source/blender/editors/util/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/util/ed_util.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/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/makesrna/Makefile
    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/intern/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
    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_action.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_actuator.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_camera.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_color.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_group.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal_types.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_lattice.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_main.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_main_api.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_nodetree.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_nodetree_types.h
    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_packedfile.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_property.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_screen.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scriptlink.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sequence.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_text.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_timeline.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_vfont.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_vpaint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-kazanbas/source/blender/python/BPY_extern.h
    branches/soc-2009-kazanbas/source/blender/python/Makefile
    branches/soc-2009-kazanbas/source/blender/python/epy_doc_gen.py
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.c
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Makefile
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.c
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.c
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.h
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.c
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.c
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.h
    branches/soc-2009-kazanbas/source/blender/python/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_compat.h
    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.h
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.h
    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_scriptlink.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_ui.h
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.h
    branches/soc-2009-kazanbas/source/blender/python/intern/stubs.c
    branches/soc-2009-kazanbas/source/blender/python/rna_dump.py
    branches/soc-2009-kazanbas/source/blender/python/simple_enum_gen.py
    branches/soc-2009-kazanbas/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/windowmanager/Makefile
    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/Makefile
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_draw.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_gesture.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_subwindow.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_cursors.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_draw.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_event_system.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_event_types.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_files.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_subwindow.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_window.h

Modified: branches/soc-2009-kazanbas/SConstruct
===================================================================
--- branches/soc-2009-kazanbas/SConstruct	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/SConstruct	2009-06-23 19:17:59 UTC (rev 21115)
@@ -285,9 +285,7 @@
 	target_env_defs['WITH_BF_SDL'] = False
 	target_env_defs['WITH_BF_JPEG'] = False
 	target_env_defs['WITH_BF_PNG'] = False
-	target_env_defs['WITH_BF_ODE'] = False
 	target_env_defs['WITH_BF_BULLET'] = False
-	target_env_defs['WITH_BF_SOLID'] = False
 	target_env_defs['WITH_BF_BINRELOC'] = False
 	target_env_defs['BF_BUILDINFO'] = False
 	target_env_defs['BF_NO_ELBEEM'] = True

Modified: branches/soc-2009-kazanbas/config/darwin-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/darwin-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/darwin-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -141,20 +141,11 @@
 WITH_BF_GAMEENGINE=True
 WITH_BF_PLAYER=True
 
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-kazanbas/config/irix6-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/irix6-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/irix6-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -74,20 +74,11 @@
 
 WITH_BF_GAMEENGINE='false'
 
-WITH_BF_ODE = 'false'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-kazanbas/config/linux2-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/linux2-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/linux2-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -77,20 +77,11 @@
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-kazanbas/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/linuxcross-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/linuxcross-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -74,20 +74,11 @@
 
 WITH_BF_GAMEENGINE = False
 
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 

Modified: branches/soc-2009-kazanbas/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/openbsd3-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/openbsd3-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -61,20 +61,11 @@
 
 WITH_BF_GAMEENGINE=False
 
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-kazanbas/config/sunos5-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/sunos5-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/sunos5-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -69,20 +69,11 @@
 
 WITH_BF_GAMEENGINE=False
 
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-kazanbas/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win32-mingw-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/win32-mingw-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -77,20 +77,11 @@
 
 WITH_BF_GAMEENGINE = False
 
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 

Modified: branches/soc-2009-kazanbas/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win32-vc-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/win32-vc-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -90,20 +90,11 @@
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 

Modified: branches/soc-2009-kazanbas/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win64-vc-config.py	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/config/win64-vc-config.py	2009-06-23 19:17:59 UTC (rev 21115)
@@ -93,20 +93,11 @@
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = False
 
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 


Property changes on: branches/soc-2009-kazanbas/config/win64-vc-config.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/soc-2009-kazanbas/extern/CMakeLists.txt
===================================================================
--- branches/soc-2009-kazanbas/extern/CMakeLists.txt	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/extern/CMakeLists.txt	2009-06-23 19:17:59 UTC (rev 21115)
@@ -24,11 +24,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-IF(WITH_GAMEENGINE)
-  ADD_SUBDIRECTORY(qhull)
-  ADD_SUBDIRECTORY(solid)
-ENDIF(WITH_GAMEENGINE)
-
 IF(WITH_BULLET)
   ADD_SUBDIRECTORY(bullet2)
 ENDIF(WITH_BULLET)

Modified: branches/soc-2009-kazanbas/extern/Makefile
===================================================================
--- branches/soc-2009-kazanbas/extern/Makefile	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/extern/Makefile	2009-06-23 19:17:59 UTC (rev 21115)
@@ -30,7 +30,7 @@
 
 SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid glew/src
+DIRS = glew/src
 
 ifeq ($(WITH_FFMPEG), true)
 ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)

Modified: branches/soc-2009-kazanbas/extern/SConscript
===================================================================
--- branches/soc-2009-kazanbas/extern/SConscript	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/extern/SConscript	2009-06-23 19:17:59 UTC (rev 21115)
@@ -4,10 +4,6 @@
 
 SConscript(['glew/SConscript'])
 
-if env['WITH_BF_GAMEENGINE']:
-	if env['WITH_BF_SOLID']:
-		SConscript(['qhull/SConscript', 'solid/SConscript'])
-
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 

Modified: branches/soc-2009-kazanbas/intern/bsp/test/Makefile
===================================================================
--- branches/soc-2009-kazanbas/intern/bsp/test/Makefile	2009-06-23 18:26:01 UTC (rev 21114)
+++ branches/soc-2009-kazanbas/intern/bsp/test/Makefile	2009-06-23 19:17:59 UTC (rev 21115)
@@ -47,7 +47,7 @@
 SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
 SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
 
-ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
+ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd"))
     LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
 endif
 

Modified: branches/soc-2009-kazanbas/intern/guardedalloc/intern/mallocn.c
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list