[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21581] branches/itasc: svn merge -r 21196 :21580 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Tue Jul 14 19:31:51 CEST 2009
Revision: 21581
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21581
Author: ben2610
Date: 2009-07-14 19:31:50 +0200 (Tue, 14 Jul 2009)
Log Message:
-----------
svn merge -r 21196:21580 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/CMake/macros.cmake
branches/itasc/CMakeLists.txt
branches/itasc/config/win32-mingw-config.py
branches/itasc/intern/ghost/GHOST_C-api.h
branches/itasc/intern/ghost/GHOST_IWindow.h
branches/itasc/intern/ghost/intern/GHOST_C-api.cpp
branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
branches/itasc/intern/ghost/intern/GHOST_Window.cpp
branches/itasc/intern/ghost/intern/GHOST_Window.h
branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp
branches/itasc/intern/ghost/intern/GHOST_WindowX11.h
branches/itasc/intern/string/intern/STR_String.cpp
branches/itasc/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/itasc/projectfiles_vc9/blender/blender.sln
branches/itasc/projectfiles_vc9/blender/blender.vcproj
branches/itasc/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/itasc/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/itasc/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/itasc/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
branches/itasc/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/itasc/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
branches/itasc/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/itasc/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/itasc/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
branches/itasc/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/itasc/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/itasc/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/itasc/projectfiles_vc9/kernel/system/SYS_system.vcproj
branches/itasc/release/ui/buttons_data_armature.py
branches/itasc/release/ui/buttons_data_bone.py
branches/itasc/release/ui/buttons_data_camera.py
branches/itasc/release/ui/buttons_data_curve.py
branches/itasc/release/ui/buttons_data_lamp.py
branches/itasc/release/ui/buttons_data_lattice.py
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/buttons_data_text.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_object_constraint.py
branches/itasc/release/ui/buttons_objects.py
branches/itasc/release/ui/buttons_particle.py
branches/itasc/release/ui/buttons_physic_cloth.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_buttons.py
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_sequencer.py
branches/itasc/release/ui/space_text.py
branches/itasc/source/Makefile
branches/itasc/source/blender/blenfont/BLF_api.h
branches/itasc/source/blender/blenfont/intern/blf.c
branches/itasc/source/blender/blenfont/intern/blf_font.c
branches/itasc/source/blender/blenfont/intern/blf_glyph.c
branches/itasc/source/blender/blenfont/intern/blf_internal.h
branches/itasc/source/blender/blenfont/intern/blf_internal_types.h
branches/itasc/source/blender/blenkernel/BKE_action.h
branches/itasc/source/blender/blenkernel/BKE_context.h
branches/itasc/source/blender/blenkernel/BKE_effect.h
branches/itasc/source/blender/blenkernel/BKE_fcurve.h
branches/itasc/source/blender/blenkernel/BKE_fluidsim.h
branches/itasc/source/blender/blenkernel/BKE_modifier.h
branches/itasc/source/blender/blenkernel/BKE_nla.h
branches/itasc/source/blender/blenkernel/BKE_packedFile.h
branches/itasc/source/blender/blenkernel/BKE_particle.h
branches/itasc/source/blender/blenkernel/BKE_pointcache.h
branches/itasc/source/blender/blenkernel/BKE_report.h
branches/itasc/source/blender/blenkernel/BKE_screen.h
branches/itasc/source/blender/blenkernel/BKE_utildefines.h
branches/itasc/source/blender/blenkernel/BKE_writeffmpeg.h
branches/itasc/source/blender/blenkernel/intern/action.c
branches/itasc/source/blender/blenkernel/intern/anim.c
branches/itasc/source/blender/blenkernel/intern/anim_sys.c
branches/itasc/source/blender/blenkernel/intern/cdderivedmesh.c
branches/itasc/source/blender/blenkernel/intern/cloth.c
branches/itasc/source/blender/blenkernel/intern/context.c
branches/itasc/source/blender/blenkernel/intern/depsgraph.c
branches/itasc/source/blender/blenkernel/intern/displist.c
branches/itasc/source/blender/blenkernel/intern/effect.c
branches/itasc/source/blender/blenkernel/intern/exotic.c
branches/itasc/source/blender/blenkernel/intern/fcurve.c
branches/itasc/source/blender/blenkernel/intern/fluidsim.c
branches/itasc/source/blender/blenkernel/intern/font.c
branches/itasc/source/blender/blenkernel/intern/image.c
branches/itasc/source/blender/blenkernel/intern/ipo.c
branches/itasc/source/blender/blenkernel/intern/lattice.c
branches/itasc/source/blender/blenkernel/intern/material.c
branches/itasc/source/blender/blenkernel/intern/modifier.c
branches/itasc/source/blender/blenkernel/intern/nla.c
branches/itasc/source/blender/blenkernel/intern/object.c
branches/itasc/source/blender/blenkernel/intern/packedFile.c
branches/itasc/source/blender/blenkernel/intern/particle.c
branches/itasc/source/blender/blenkernel/intern/particle_system.c
branches/itasc/source/blender/blenkernel/intern/pointcache.c
branches/itasc/source/blender/blenkernel/intern/report.c
branches/itasc/source/blender/blenkernel/intern/scene.c
branches/itasc/source/blender/blenkernel/intern/screen.c
branches/itasc/source/blender/blenkernel/intern/sequence.c
branches/itasc/source/blender/blenkernel/intern/subsurf_ccg.c
branches/itasc/source/blender/blenkernel/intern/texture.c
branches/itasc/source/blender/blenkernel/intern/writeavi.c
branches/itasc/source/blender/blenkernel/intern/writeffmpeg.c
branches/itasc/source/blender/blenlib/BLI_editVert.h
branches/itasc/source/blender/blenlib/BLI_graph.h
branches/itasc/source/blender/blenlib/BLI_util.h
branches/itasc/source/blender/blenlib/intern/fileops.c
branches/itasc/source/blender/blenlib/intern/storage.c
branches/itasc/source/blender/blenlib/intern/util.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/blenloader/intern/writefile.c
branches/itasc/source/blender/editors/CMakeLists.txt
branches/itasc/source/blender/editors/animation/anim_channels.c
branches/itasc/source/blender/editors/animation/anim_deps.c
branches/itasc/source/blender/editors/animation/anim_draw.c
branches/itasc/source/blender/editors/animation/anim_filter.c
branches/itasc/source/blender/editors/animation/anim_markers.c
branches/itasc/source/blender/editors/animation/anim_ops.c
branches/itasc/source/blender/editors/animation/drivers.c
branches/itasc/source/blender/editors/animation/keyframes_draw.c
branches/itasc/source/blender/editors/animation/keyframes_edit.c
branches/itasc/source/blender/editors/animation/keyframes_general.c
branches/itasc/source/blender/editors/animation/keyframing.c
branches/itasc/source/blender/editors/animation/keyingsets.c
branches/itasc/source/blender/editors/armature/BIF_retarget.h
branches/itasc/source/blender/editors/armature/armature_intern.h
branches/itasc/source/blender/editors/armature/armature_ops.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/editarmature_generate.c
branches/itasc/source/blender/editors/armature/editarmature_retarget.c
branches/itasc/source/blender/editors/armature/editarmature_sketch.c
branches/itasc/source/blender/editors/armature/poselib.c
branches/itasc/source/blender/editors/armature/poseobject.c
branches/itasc/source/blender/editors/armature/reeb.c
branches/itasc/source/blender/editors/armature/reeb.h
branches/itasc/source/blender/editors/curve/curve_intern.h
branches/itasc/source/blender/editors/curve/curve_ops.c
branches/itasc/source/blender/editors/curve/editcurve.c
branches/itasc/source/blender/editors/datafiles/B.blend.c
branches/itasc/source/blender/editors/datafiles/blenderbuttons.c
branches/itasc/source/blender/editors/include/BIF_gl.h
branches/itasc/source/blender/editors/include/BIF_glutil.h
branches/itasc/source/blender/editors/include/ED_anim_api.h
branches/itasc/source/blender/editors/include/ED_armature.h
branches/itasc/source/blender/editors/include/ED_curve.h
branches/itasc/source/blender/editors/include/ED_fileselect.h
branches/itasc/source/blender/editors/include/ED_fluidsim.h
branches/itasc/source/blender/editors/include/ED_keyframes_draw.h
branches/itasc/source/blender/editors/include/ED_keyframing.h
branches/itasc/source/blender/editors/include/ED_markers.h
branches/itasc/source/blender/editors/include/ED_mesh.h
branches/itasc/source/blender/editors/include/ED_object.h
branches/itasc/source/blender/editors/include/ED_screen.h
branches/itasc/source/blender/editors/include/ED_screen_types.h
branches/itasc/source/blender/editors/include/UI_icons.h
branches/itasc/source/blender/editors/include/UI_interface.h
branches/itasc/source/blender/editors/include/UI_view2d.h
branches/itasc/source/blender/editors/interface/interface.c
branches/itasc/source/blender/editors/interface/interface_anim.c
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/interface/interface_icons.c
branches/itasc/source/blender/editors/interface/interface_intern.h
branches/itasc/source/blender/editors/interface/interface_layout.c
branches/itasc/source/blender/editors/interface/interface_panel.c
branches/itasc/source/blender/editors/interface/interface_regions.c
branches/itasc/source/blender/editors/interface/interface_style.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/interface/interface_utils.c
branches/itasc/source/blender/editors/interface/interface_widgets.c
branches/itasc/source/blender/editors/interface/resources.c
branches/itasc/source/blender/editors/interface/view2d.c
branches/itasc/source/blender/editors/interface/view2d_ops.c
branches/itasc/source/blender/editors/mesh/editmesh.c
branches/itasc/source/blender/editors/mesh/editmesh_add.c
branches/itasc/source/blender/editors/mesh/editmesh_loop.c
branches/itasc/source/blender/editors/mesh/editmesh_mods.c
branches/itasc/source/blender/editors/mesh/editmesh_tools.c
branches/itasc/source/blender/editors/mesh/mesh_intern.h
branches/itasc/source/blender/editors/mesh/mesh_ops.c
branches/itasc/source/blender/editors/mesh/meshtools.c
branches/itasc/source/blender/editors/object/editconstraint.c
branches/itasc/source/blender/editors/object/editgroup.c
branches/itasc/source/blender/editors/object/editkey.c
branches/itasc/source/blender/editors/object/editlattice.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_modifier.c
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/physics/ed_fluidsim.c
branches/itasc/source/blender/editors/physics/ed_pointcache.c
branches/itasc/source/blender/editors/physics/editparticle.c
branches/itasc/source/blender/editors/screen/area.c
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/sculpt_paint/paint_image.c
branches/itasc/source/blender/editors/sculpt_paint/paint_vertex.c
branches/itasc/source/blender/editors/sculpt_paint/sculpt.c
branches/itasc/source/blender/editors/space_action/action_draw.c
branches/itasc/source/blender/editors/space_action/action_edit.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_action/action_intern.h
branches/itasc/source/blender/editors/space_action/action_ops.c
branches/itasc/source/blender/editors/space_action/action_select.c
branches/itasc/source/blender/editors/space_action/space_action.c
branches/itasc/source/blender/editors/space_api/spacetypes.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/buttons_header.c
branches/itasc/source/blender/editors/space_buttons/buttons_intern.h
branches/itasc/source/blender/editors/space_buttons/buttons_ops.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_file/file_draw.c
branches/itasc/source/blender/editors/space_file/file_intern.h
branches/itasc/source/blender/editors/space_file/file_ops.c
branches/itasc/source/blender/editors/space_file/filelist.c
branches/itasc/source/blender/editors/space_file/filelist.h
branches/itasc/source/blender/editors/space_file/filesel.c
branches/itasc/source/blender/editors/space_file/fsmenu.c
branches/itasc/source/blender/editors/space_file/fsmenu.h
branches/itasc/source/blender/editors/space_file/space_file.c
branches/itasc/source/blender/editors/space_file/writeimage.c
branches/itasc/source/blender/editors/space_graph/graph_buttons.c
branches/itasc/source/blender/editors/space_graph/graph_draw.c
branches/itasc/source/blender/editors/space_graph/graph_edit.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_graph/graph_intern.h
branches/itasc/source/blender/editors/space_graph/graph_ops.c
branches/itasc/source/blender/editors/space_graph/graph_select.c
branches/itasc/source/blender/editors/space_graph/space_graph.c
branches/itasc/source/blender/editors/space_image/image_buttons.c
branches/itasc/source/blender/editors/space_image/image_draw.c
branches/itasc/source/blender/editors/space_image/image_header.c
branches/itasc/source/blender/editors/space_image/image_ops.c
branches/itasc/source/blender/editors/space_image/space_image.c
branches/itasc/source/blender/editors/space_info/info_intern.h
branches/itasc/source/blender/editors/space_info/space_info.c
branches/itasc/source/blender/editors/space_nla/nla_header.c
branches/itasc/source/blender/editors/space_nla/nla_intern.h
branches/itasc/source/blender/editors/space_nla/space_nla.c
branches/itasc/source/blender/editors/space_node/node_edit.c
branches/itasc/source/blender/editors/space_node/node_intern.h
branches/itasc/source/blender/editors/space_node/node_ops.c
branches/itasc/source/blender/editors/space_node/node_select.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_outliner/outliner_intern.h
branches/itasc/source/blender/editors/space_outliner/outliner_ops.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_edit.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_intern.h
branches/itasc/source/blender/editors/space_sequencer/sequencer_ops.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_select.c
branches/itasc/source/blender/editors/space_text/space_text.c
branches/itasc/source/blender/editors/space_text/text_draw.c
branches/itasc/source/blender/editors/space_text/text_intern.h
branches/itasc/source/blender/editors/space_text/text_ops.c
branches/itasc/source/blender/editors/space_text/text_python.c
branches/itasc/source/blender/editors/space_time/time_header.c
branches/itasc/source/blender/editors/space_view3d/drawarmature.c
branches/itasc/source/blender/editors/space_view3d/drawobject.c
branches/itasc/source/blender/editors/space_view3d/space_view3d.c
branches/itasc/source/blender/editors/space_view3d/view3d_buttons.c
branches/itasc/source/blender/editors/space_view3d/view3d_draw.c
branches/itasc/source/blender/editors/space_view3d/view3d_edit.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/editors/space_view3d/view3d_intern.h
branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
branches/itasc/source/blender/editors/space_view3d/view3d_select.c
branches/itasc/source/blender/editors/space_view3d/view3d_toolbar.c
branches/itasc/source/blender/editors/space_view3d/view3d_view.c
branches/itasc/source/blender/editors/transform/transform.c
branches/itasc/source/blender/editors/transform/transform.h
branches/itasc/source/blender/editors/transform/transform_constraints.c
branches/itasc/source/blender/editors/transform/transform_conversions.c
branches/itasc/source/blender/editors/transform/transform_generics.c
branches/itasc/source/blender/editors/transform/transform_input.c
branches/itasc/source/blender/editors/transform/transform_manipulator.c
branches/itasc/source/blender/editors/transform/transform_ndofinput.c
branches/itasc/source/blender/editors/transform/transform_ops.c
branches/itasc/source/blender/editors/transform/transform_orientations.c
branches/itasc/source/blender/editors/transform/transform_snap.c
branches/itasc/source/blender/editors/util/undo.c
branches/itasc/source/blender/editors/uvedit/uvedit_draw.c
branches/itasc/source/blender/editors/uvedit/uvedit_ops.c
branches/itasc/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/itasc/source/blender/gpu/GPU_draw.h
branches/itasc/source/blender/gpu/intern/gpu_draw.c
branches/itasc/source/blender/makesdna/DNA_action_types.h
branches/itasc/source/blender/makesdna/DNA_anim_types.h
branches/itasc/source/blender/makesdna/DNA_brush_types.h
branches/itasc/source/blender/makesdna/DNA_camera_types.h
branches/itasc/source/blender/makesdna/DNA_curve_types.h
branches/itasc/source/blender/makesdna/DNA_image_types.h
branches/itasc/source/blender/makesdna/DNA_material_types.h
branches/itasc/source/blender/makesdna/DNA_meshdata_types.h
branches/itasc/source/blender/makesdna/DNA_modifier_types.h
branches/itasc/source/blender/makesdna/DNA_object_fluidsim.h
branches/itasc/source/blender/makesdna/DNA_object_force.h
branches/itasc/source/blender/makesdna/DNA_object_types.h
branches/itasc/source/blender/makesdna/DNA_particle_types.h
branches/itasc/source/blender/makesdna/DNA_scene_types.h
branches/itasc/source/blender/makesdna/DNA_screen_types.h
branches/itasc/source/blender/makesdna/DNA_space_types.h
branches/itasc/source/blender/makesdna/DNA_userdef_types.h
branches/itasc/source/blender/makesdna/DNA_view2d_types.h
branches/itasc/source/blender/makesdna/DNA_view3d_types.h
branches/itasc/source/blender/makesdna/DNA_windowmanager_types.h
branches/itasc/source/blender/makesdna/intern/dna_genfile.c
branches/itasc/source/blender/makesdna/intern/makesdna.c
branches/itasc/source/blender/makesrna/RNA_access.h
branches/itasc/source/blender/makesrna/RNA_define.h
branches/itasc/source/blender/makesrna/RNA_types.h
branches/itasc/source/blender/makesrna/SConscript
branches/itasc/source/blender/makesrna/intern/CMakeLists.txt
branches/itasc/source/blender/makesrna/intern/Makefile
branches/itasc/source/blender/makesrna/intern/SConscript
branches/itasc/source/blender/makesrna/intern/makesrna.c
branches/itasc/source/blender/makesrna/intern/rna_access.c
branches/itasc/source/blender/makesrna/intern/rna_animation.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_camera.c
branches/itasc/source/blender/makesrna/intern/rna_cloth.c
branches/itasc/source/blender/makesrna/intern/rna_color.c
branches/itasc/source/blender/makesrna/intern/rna_constraint.c
branches/itasc/source/blender/makesrna/intern/rna_context.c
branches/itasc/source/blender/makesrna/intern/rna_curve.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_fcurve.c
branches/itasc/source/blender/makesrna/intern/rna_fluidsim.c
branches/itasc/source/blender/makesrna/intern/rna_image.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_internal_types.h
branches/itasc/source/blender/makesrna/intern/rna_key.c
branches/itasc/source/blender/makesrna/intern/rna_lamp.c
branches/itasc/source/blender/makesrna/intern/rna_lattice.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_mesh.c
branches/itasc/source/blender/makesrna/intern/rna_mesh_api.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_object_force.c
branches/itasc/source/blender/makesrna/intern/rna_particle.c
branches/itasc/source/blender/makesrna/intern/rna_rna.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_screen.c
branches/itasc/source/blender/makesrna/intern/rna_sequence.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_texture.c
branches/itasc/source/blender/makesrna/intern/rna_ui.c
branches/itasc/source/blender/makesrna/intern/rna_ui_api.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/makesrna/intern/rna_wm.c
branches/itasc/source/blender/makesrna/intern/rna_world.c
branches/itasc/source/blender/python/BPY_extern.h
branches/itasc/source/blender/python/generic/BGL.c
branches/itasc/source/blender/python/generic/Geometry.c
branches/itasc/source/blender/python/generic/Mathutils.c
branches/itasc/source/blender/python/generic/Mathutils.h
branches/itasc/source/blender/python/generic/euler.c
branches/itasc/source/blender/python/generic/euler.h
branches/itasc/source/blender/python/generic/matrix.c
branches/itasc/source/blender/python/generic/matrix.h
branches/itasc/source/blender/python/generic/quat.c
branches/itasc/source/blender/python/generic/quat.h
branches/itasc/source/blender/python/generic/vector.c
branches/itasc/source/blender/python/generic/vector.h
branches/itasc/source/blender/python/intern/bpy_compat.h
branches/itasc/source/blender/python/intern/bpy_interface.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_operator_wrap.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/python/intern/bpy_util.c
branches/itasc/source/blender/render/intern/source/convertblender.c
branches/itasc/source/blender/render/intern/source/initrender.c
branches/itasc/source/blender/render/intern/source/pipeline.c
branches/itasc/source/blender/render/intern/source/zbuf.c
branches/itasc/source/blender/windowmanager/WM_api.h
branches/itasc/source/blender/windowmanager/WM_types.h
branches/itasc/source/blender/windowmanager/intern/wm_cursors.c
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/intern/wm_files.c
branches/itasc/source/blender/windowmanager/intern/wm_keymap.c
branches/itasc/source/blender/windowmanager/intern/wm_operators.c
branches/itasc/source/creator/CMakeLists.txt
branches/itasc/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/itasc/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/itasc/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/itasc/source/gameengine/BlenderRoutines/Makefile
branches/itasc/source/gameengine/BlenderRoutines/SConscript
branches/itasc/source/gameengine/Converter/BL_ActionActuator.cpp
branches/itasc/source/gameengine/Converter/BL_ActionActuator.h
branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/itasc/source/gameengine/Expressions/BoolValue.cpp
branches/itasc/source/gameengine/Expressions/IntValue.cpp
branches/itasc/source/gameengine/Expressions/ListValue.cpp
branches/itasc/source/gameengine/Expressions/ListValue.h
branches/itasc/source/gameengine/Expressions/PyObjectPlus.cpp
branches/itasc/source/gameengine/Expressions/PyObjectPlus.h
branches/itasc/source/gameengine/Expressions/StringValue.h
branches/itasc/source/gameengine/Expressions/Value.cpp
branches/itasc/source/gameengine/Expressions/Value.h
branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/itasc/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ANDController.h
branches/itasc/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/itasc/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/itasc/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IActuator.h
branches/itasc/source/gameengine/GameLogic/SCA_IController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IController.h
branches/itasc/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/itasc/source/gameengine/GameLogic/SCA_IObject.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IObject.h
branches/itasc/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ISensor.h
branches/itasc/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/itasc/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_NANDController.h
branches/itasc/source/gameengine/GameLogic/SCA_NORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_NORController.h
branches/itasc/source/gameengine/GameLogic/SCA_ORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ORController.h
branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/itasc/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/itasc/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PythonController.h
branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/itasc/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/itasc/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_XNORController.h
branches/itasc/source/gameengine/GameLogic/SCA_XORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_XORController.h
branches/itasc/source/gameengine/Ketsji/BL_Shader.cpp
branches/itasc/source/gameengine/Ketsji/BL_Shader.h
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/itasc/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_CDActuator.h
branches/itasc/source/gameengine/Ketsji/KX_Camera.cpp
branches/itasc/source/gameengine/Ketsji/KX_Camera.h
branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.h
branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/itasc/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameActuator.h
branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.h
branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.h
branches/itasc/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/itasc/source/gameengine/Ketsji/KX_Light.cpp
branches/itasc/source/gameengine/Ketsji/KX_Light.h
branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.h
branches/itasc/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/itasc/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_NearSensor.h
branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.h
branches/itasc/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/itasc/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_PolyProxy.h
branches/itasc/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/itasc/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/itasc/source/gameengine/Ketsji/KX_PyMath.cpp
branches/itasc/source/gameengine/Ketsji/KX_PyMath.h
branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.h
branches/itasc/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_RaySensor.h
branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/itasc/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/itasc/source/gameengine/Ketsji/KX_Scene.cpp
branches/itasc/source/gameengine/Ketsji/KX_Scene.h
branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.h
branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.h
branches/itasc/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_StateActuator.h
branches/itasc/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_TouchSensor.h
branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/itasc/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/itasc/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_VertexProxy.h
branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/itasc/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/itasc/source/gameengine/VideoTexture/FilterColor.cpp
branches/itasc/source/gameengine/VideoTexture/FilterNormal.cpp
branches/itasc/source/gameengine/VideoTexture/ImageRender.cpp
branches/itasc/source/gameengine/VideoTexture/ImageViewport.cpp
branches/itasc/source/gameengine/VideoTexture/VideoBase.cpp
branches/itasc/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/itasc/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/itasc/source/nan_definitions.mk
Added Paths:
-----------
branches/itasc/release/ui/buttons_physics_field.py
branches/itasc/release/ui/buttons_physics_fluid.py
branches/itasc/release/ui/buttons_physics_softbody.py
branches/itasc/release/ui/space_filebrowser.py
branches/itasc/release/ui/space_info.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/blender/blenkernel/intern/fmodifier.c
branches/itasc/source/blender/blenkernel/nla_private.h
branches/itasc/source/blender/editors/animation/fmodifier_ui.c
branches/itasc/source/blender/editors/include/ED_physics.h
branches/itasc/source/blender/editors/include/ED_retopo.h
branches/itasc/source/blender/editors/include/ED_transform.h
branches/itasc/source/blender/editors/mesh/mesh_layers.c
branches/itasc/source/blender/editors/object/object_vgroup.c
branches/itasc/source/blender/editors/space_file/file_panels.c
branches/itasc/source/blender/editors/space_graph/graph_utils.c
branches/itasc/source/blender/editors/space_info/info_ops.c
branches/itasc/source/blender/editors/space_nla/nla_buttons.c
branches/itasc/source/blender/editors/space_nla/nla_channels.c
branches/itasc/source/blender/editors/space_nla/nla_draw.c
branches/itasc/source/blender/editors/space_nla/nla_edit.c
branches/itasc/source/blender/editors/space_nla/nla_ops.c
branches/itasc/source/blender/editors/space_nla/nla_select.c
branches/itasc/source/blender/makesrna/intern/rna_nla.c
Removed Paths:
-------------
branches/itasc/source/blender/editors/include/BIF_retopo.h
branches/itasc/source/blender/editors/include/BIF_transform.h
branches/itasc/source/blender/editors/include/ED_pointcache.h
branches/itasc/source/blender/editors/include/ED_transform.h
branches/itasc/source/blender/editors/interface/keyval.c
branches/itasc/source/blender/editors/mesh/editdeform.c
branches/itasc/source/blender/editors/space_file/file_header.c
branches/itasc/source/blender/editors/space_info/info_header.c
Modified: branches/itasc/CMake/macros.cmake
===================================================================
--- branches/itasc/CMake/macros.cmake 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/CMake/macros.cmake 2009-07-14 17:31:50 UTC (rev 21581)
@@ -61,7 +61,7 @@
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
#TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/CMakeLists.txt 2009-07-14 17:31:50 UTC (rev 21581)
@@ -87,9 +87,9 @@
#-----------------------------------------------------------------------------
#Platform specifics
-IF(UNIX)
+IF(UNIX AND NOT APPLE)
IF(WITH_OPENAL)
- INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
+ FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
SET(OPENAL_LIB ${OPENAL_LIBRARY})
@@ -102,22 +102,12 @@
FIND_LIBRARY(INTL_LIBRARY
NAMES intl
PATHS
- /usr/local/lib
- /usr/lib
/sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
)
FIND_LIBRARY(ICONV_LIBRARY
NAMES iconv
PATHS
- /usr/local/lib
- /usr/lib
/sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
)
IF(INTL_LIBRARY AND ICONV_LIBRARY)
SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
@@ -136,14 +126,14 @@
)
SET(FREETYPE_LIB freetype)
- INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
+ FIND_PACKAGE(PythonLibs)
SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
- INCLUDE(${CMAKE_ROOT}/Modules/FindPythonInterp.cmake)
+ FIND_PACKAGE(PythonInterp)
SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
- INCLUDE(${CMAKE_ROOT}/Modules/FindSDL.cmake)
+ FIND_PACKAGE(SDL)
SET(SDL_INC ${SDL_INCLUDE_DIR})
SET(SDL_LIB ${SDL_LIBRARY})
@@ -164,11 +154,11 @@
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
- SET(JPEG_LIB jpeg)
+ FIND_PACKAGE(JPEG REQUIRED)
- SET(PNG_LIB png)
+ FIND_PACKAGE(PNG REQUIRED)
- SET(ZLIB_LIB z)
+ FIND_PACKAGE(ZLIB REQUIRED)
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")
@@ -186,12 +176,13 @@
# Better warnings
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
- INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
-ENDIF(UNIX)
+ INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
- INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+ # this file is included anyway when building under Windows with cl.exe
+ # INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
@@ -202,10 +193,10 @@
ENDIF(CMAKE_CL_64)
SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 2.5)
+ SET(PYTHON_VERSION 2.6)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
SET(PYTHON_BINARY python)
- SET(PYTHON_LIB python25)
+ SET(PYTHON_LIB python26)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
IF(CMAKE_CL_64)
@@ -219,15 +210,15 @@
ENDIF(CMAKE_CL_64)
IF(CMAKE_CL_64)
- SET(PNG_LIB libpng)
+ SET(PNG_LIBRARIES libpng)
ELSE(CMAKE_CL_64)
- SET(PNG_LIB libpng_st)
+ SET(PNG_LIBRARIES libpng_st)
ENDIF(CMAKE_CL_64)
- SET(JPEG_LIB libjpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(ZLIB ${LIBDIR}/zlib)
SET(ZLIB_INC ${ZLIB}/include)
- SET(ZLIB_LIB libz)
+ SET(ZLIB_LIBRARIES zlib)
SET(ZLIB_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads)
@@ -335,7 +326,7 @@
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
IF(WITH_OPENAL)
- INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
+ FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
SET(OPENAL_LIB ${OPENAL_LIBRARY})
@@ -362,12 +353,12 @@
SET(GETTEXT_LIB intl iconv)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
- SET(PNG_LIB png)
- SET(JPEG_LIB jpeg)
+ SET(PNG_LIBRARIES png)
+ SET(JPEG_LIBRARY jpeg)
SET(ZLIB /usr)
SET(ZLIB_INC "${ZLIB}/include")
- SET(ZLIB_LIB z)
+ SET(ZLIB_LIBRARIES z)
SET(FREETYPE ${LIBDIR}/freetype)
SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
@@ -438,7 +429,7 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
-INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
+FIND_PACKAGE(OpenGL)
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
#-----------------------------------------------------------------------------
# Extra compile flags
Modified: branches/itasc/config/win32-mingw-config.py
===================================================================
--- branches/itasc/config/win32-mingw-config.py 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/config/win32-mingw-config.py 2009-07-14 17:31:50 UTC (rev 21581)
@@ -3,12 +3,16 @@
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '2.5'
+#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python25'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+#BF_PYTHON_LIB = 'python25'
+#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
+#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
Modified: branches/itasc/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/itasc/intern/ghost/GHOST_C-api.h 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/intern/ghost/GHOST_C-api.h 2009-07-14 17:31:50 UTC (rev 21581)
@@ -367,6 +367,17 @@
GHOST_TInt32 x,
GHOST_TInt32 y);
+/**
+ * Grabs the cursor for a modal operation, to keep receiving
+ * events when the mouse is outside the window. X11 only, others
+ * do this automatically.
+ * @param windowhandle The handle to the window
+ * @param grab The new grab state of the cursor.
+ * @return Indication of success.
+ */
+extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
+ int grab);
+
/***************************************************************************************
** Access to mouse button and keyboard states.
***************************************************************************************/
Modified: branches/itasc/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/itasc/intern/ghost/GHOST_IWindow.h 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/intern/ghost/GHOST_IWindow.h 2009-07-14 17:31:50 UTC (rev 21581)
@@ -252,6 +252,14 @@
* @return Indication of success.
*/
virtual GHOST_TSuccess setCursorVisibility(bool visible) = 0;
+
+ /**
+ * Grabs the cursor for a modal operation.
+ * @param grab The new grab state of the cursor.
+ * @return Indication of success.
+ */
+ virtual GHOST_TSuccess setCursorGrab(bool grab) { return GHOST_kSuccess; };
+
};
#endif // _GHOST_IWINDOW_H_
Modified: branches/itasc/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_C-api.cpp 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/intern/ghost/intern/GHOST_C-api.cpp 2009-07-14 17:31:50 UTC (rev 21581)
@@ -354,7 +354,15 @@
}
+GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
+ int grab)
+{
+ GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+
+ return window->setCursorGrab(grab?true:false);
+}
+
GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
GHOST_TModifierKeyMask mask,
int* isDown)
Modified: branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-07-14 17:31:50 UTC (rev 21581)
@@ -550,11 +550,26 @@
// We're not interested in the following things.(yet...)
case NoExpose :
case GraphicsExpose :
+ break;
case EnterNotify:
case LeaveNotify:
+ {
// XCrossingEvents pointer leave enter window.
+ // also do cursor move here, MotionNotify only
+ // happens when motion starts & ends inside window
+ XCrossingEvent &xce = xe->xcrossing;
+
+ g_event = new
+ GHOST_EventCursor(
+ getMilliSeconds(),
+ GHOST_kEventCursorMove,
+ window,
+ xce.x_root,
+ xce.y_root
+ );
break;
+ }
case MapNotify:
/*
* From ICCCM:
Modified: branches/itasc/intern/ghost/intern/GHOST_Window.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_Window.cpp 2009-07-14 15:54:02 UTC (rev 21580)
+++ branches/itasc/intern/ghost/intern/GHOST_Window.cpp 2009-07-14 17:31:50 UTC (rev 21581)
@@ -50,6 +50,7 @@
:
m_drawingContextType(type),
m_cursorVisible(true),
+ m_cursorGrabbed(true),
m_cursorShape(GHOST_kStandardCursorDefault),
m_stereoVisual(stereoVisual)
{
@@ -93,6 +94,20 @@
}
}
+GHOST_TSuccess GHOST_Window::setCursorGrab(bool grab)
+{
+ if(m_cursorGrabbed == grab)
+ return GHOST_kSuccess;
+
+ if (setWindowCursorGrab(grab)) {
+ m_cursorGrabbed = grab;
+ return GHOST_kSuccess;
+ }
+ else {
+ return GHOST_kFailure;
+ }
+}
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list