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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Wed Nov 17 01:58:03 CET 2010


Revision: 33113
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33113
Author:   kjym3
Date:     2010-11-17 01:58:03 +0100 (Wed, 17 Nov 2010)

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

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/doc/manpage/blender.1
    branches/soc-2008-mxcurioni/doc/manpage/blender.1.py
    branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/import_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/nla.py
    branches/soc-2008-mxcurioni/release/scripts/op/uv.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/release/text/readme.html
    branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
    branches/soc-2008-mxcurioni/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/soc-2008-mxcurioni/source/blender/modifiers/Makefile
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/release/windows/BlenderPlayer/
    branches/soc-2008-mxcurioni/release/windows/extra/
    branches/soc-2008-mxcurioni/release/windows/specific.sh
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bfile.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_bfile.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_report.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/writeimage.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/
    branches/soc-2008-mxcurioni/source/tools/cygwin/
    branches/soc-2008-mxcurioni/source/tools/hmake/
    branches/soc-2008-mxcurioni/source/tools/wrap.pl

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-11-16 23:18:17 UTC (rev 33112)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-11-17 00:58:03 UTC (rev 33113)
@@ -311,24 +311,58 @@
 		SET(BINRELOC_INC ${BINRELOC}/include)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-	IF(WITH_OPENMP)
-		LIST(APPEND LLIBS -lgomp)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-	ENDIF(WITH_OPENMP)
-
 	SET(PLATFORM_LINKFLAGS "-pthread")
 
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
 
+	# GNU Compiler
 	IF(CMAKE_COMPILER_IS_GNUCC)
+		IF(WITH_OPENMP)
+			LIST(APPEND LLIBS -lgomp)
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+		ENDIF(WITH_OPENMP)
+
 		SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	
 		# Better warnings
 		# note: -Wunused-parameter is added below for all GCC compilers
 		SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
 		SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
+	# Intel C++ Compiler
+	ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Intel")
+		IF(WITH_OPENMP)
+			LIST(APPEND LLIBS -lgomp)
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -openmp")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -openmp")
+		ENDIF(WITH_OPENMP)
+
+		# think these next two are broken
+		FIND_PROGRAM(XIAR xiar) 
+		IF(XIAR) 
+			SET(CMAKE_AR "${XIAR}")
+		ENDIF(XIAR) 
+		MARK_AS_ADVANCED(XIAR)
+
+		FIND_PROGRAM(XILD xild) 
+		IF(XILD) 
+			SET(CMAKE_LINKER "${XILD}")
+		ENDIF(XILD) 
+		MARK_AS_ADVANCED(XILD)
+
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div -parallel")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model precise -prec_div -parallel")
+
+		SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+
+		# SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -diag-enable sc3")
+
+		SET(C_WARNINGS "-Wall -Wpointer-arith -Wno-unknown-pragmas")
+		SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
+		SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
 	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(UNIX AND NOT APPLE)
 
@@ -409,8 +443,8 @@
 			SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
 		ENDIF(CMAKE_CL_64)
 		
-		SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
-		SET(CMAKE_C_FLAGS   "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
+		SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
+		SET(CMAKE_C_FLAGS   "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
 
 		IF(CMAKE_CL_64)
 			SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)

Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2010-11-16 23:18:17 UTC (rev 33112)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2010-11-17 00:58:03 UTC (rev 33113)
@@ -14,17 +14,15 @@
 	ADD_LIBRARY(${name} ${INC_ALL} ${sources})
 
 	# Group by location on disk
-	SOURCE_GROUP(Files FILES CMakeLists.txt)
+	SOURCE_GROUP("Source Files" FILES CMakeLists.txt)
 	SET(ALL_FILES ${sources} ${INC_ALL})
 	FOREACH(SRC ${ALL_FILES})
-		STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
-		STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
-		STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
-		IF(REL_DIR)
-			SOURCE_GROUP(${REL_DIR} FILES ${SRC})
-		ELSE(REL_DIR)
-			SOURCE_GROUP(Files FILES ${SRC})
-		ENDIF(REL_DIR)
+		GET_FILENAME_COMPONENT(SRC_EXT ${SRC} EXT)
+		IF(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp") 
+			SOURCE_GROUP("Header Files" FILES ${SRC})
+		ELSE()
+			SOURCE_GROUP("Source Files" FILES ${SRC})
+		ENDIF()
 	ENDFOREACH(SRC)
 ENDMACRO(BLENDERLIB_NOLIST)
 

Modified: branches/soc-2008-mxcurioni/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: branches/soc-2008-mxcurioni/doc/manpage/blender.1.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/manpage/blender.1.py	2010-11-16 23:18:17 UTC (rev 33112)
+++ branches/soc-2008-mxcurioni/doc/manpage/blender.1.py	2010-11-17 00:58:03 UTC (rev 33113)
@@ -44,7 +44,7 @@
     return data
 
 
-blender_bin = os.path.join(os.path.dirname(__file__), "../../blender")
+blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
 
 blender_help = subprocess.Popen([blender_bin, "--help"], stdout=subprocess.PIPE).communicate()[0].decode()
 

Modified: branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp	2010-11-16 23:18:17 UTC (rev 33112)
+++ branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp	2010-11-17 00:58:03 UTC (rev 33113)
@@ -1044,18 +1044,13 @@
 
 	try
 	{
-		if(device->device->pause(self->handle))
-		{
-			Py_RETURN_TRUE;
-		}
+		return PyBool_FromLong((long)device->device->pause(self->handle));
 	}
 	catch(AUD_Exception& e)
 	{
 		PyErr_SetString(AUDError, e.str);
 		return NULL;
 	}
-
-	Py_RETURN_FALSE;
 }
 
 PyDoc_STRVAR(M_aud_Handle_resume_doc,
@@ -1071,18 +1066,13 @@
 
 	try
 	{
-		if(device->device->resume(self->handle))
-		{
-			Py_RETURN_TRUE;
-		}
+		return PyBool_FromLong((long)device->device->resume(self->handle));
 	}
 	catch(AUD_Exception& e)
 	{
 		PyErr_SetString(AUDError, e.str);
 		return NULL;
 	}
-
-	Py_RETURN_FALSE;
 }
 
 PyDoc_STRVAR(M_aud_Handle_stop_doc,
@@ -1099,18 +1089,13 @@
 
 	try
 	{
-		if(device->device->stop(self->handle))
-		{
-			Py_RETURN_TRUE;
-		}
+		return PyBool_FromLong((long)device->device->stop(self->handle));
 	}
 	catch(AUD_Exception& e)
 	{
 		PyErr_SetString(AUDError, e.str);
 		return NULL;
 	}
-
-	Py_RETURN_FALSE;
 }
 
 static PyMethodDef Handle_methods[] = {
@@ -1185,14 +1170,7 @@
 
 	try
 	{
-		if(device->device->getKeep(self->handle))
-		{
-			Py_RETURN_TRUE;
-		}
-		else
-		{
-			Py_RETURN_FALSE;
-		}
+		return PyBool_FromLong((long)device->device->getKeep(self->handle));
 	}
 	catch(AUD_Exception& e)
 	{
@@ -1237,7 +1215,7 @@
 
 	try
 	{
-		return Py_BuildValue("i", device->device->getStatus(self->handle));
+		return PyBool_FromLong((long)device->device->getStatus(self->handle));
 	}
 	catch(AUD_Exception& e)
 	{
@@ -1568,14 +1546,7 @@
 		AUD_I3DDevice* device = dynamic_cast<AUD_I3DDevice*>(dev->device);
 		if(device)
 		{
-			if(device->isRelative(self->handle))
-			{
-				Py_RETURN_TRUE;
-			}
-			else
-			{
-				Py_RETURN_FALSE;
-			}
+			return PyBool_FromLong((long)device->isRelative(self->handle));
 		}
 		else
 		{

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-11-16 23:18:17 UTC (rev 33112)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-11-17 00:58:03 UTC (rev 33113)
@@ -399,6 +399,84 @@
 	return GHOST_System::exit();
 }
 
+void GHOST_SystemWin32::triggerKey(GHOST_IWindow *window, bool down, GHOST_TKey key)
+{
+	GHOST_Event *extra = new GHOST_EventKey(getSystem()->getMilliSeconds(), down ? GHOST_kEventKeyDown : GHOST_kEventKeyUp, window, key, '\0');
+	((GHOST_SystemWin32*)getSystem())->pushEvent(extra);
+}
+void GHOST_SystemWin32::handleModifierKeys(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam, GHOST_ModifierKeys &oldModifiers, GHOST_ModifierKeys &newModifiers) const
+{
+	switch(wParam) {
+		case VK_SHIFT:
+			{
+				bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftAlt) != newModifiers.get(GHOST_kModifierKeyLeftAlt);
+				if(lchanged) {
+					((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftAlt), GHOST_kKeyLeftAlt);
+				} else {
+					bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightAlt) != newModifiers.get(GHOST_kModifierKeyRightAlt);
+					if (rchanged) {
+						((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightAlt), GHOST_kKeyRightAlt);
+					}
+				}
+				lchanged = oldModifiers.get(GHOST_kModifierKeyLeftControl) != newModifiers.get(GHOST_kModifierKeyLeftControl);
+				if(lchanged) {
+					((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftControl), GHOST_kKeyLeftControl);
+				} else {
+					bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightControl) != newModifiers.get(GHOST_kModifierKeyRightControl);
+					if (rchanged) {
+						((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightControl), GHOST_kKeyRightControl);
+					}
+				}
+			}
+			break;
+		case VK_CONTROL:
+			{
+				bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftAlt) != newModifiers.get(GHOST_kModifierKeyLeftAlt);
+				if(lchanged) {
+					((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftAlt), GHOST_kKeyLeftAlt);
+				} else {
+					bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightAlt) != newModifiers.get(GHOST_kModifierKeyRightAlt);
+					if (rchanged) {
+						((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightAlt), GHOST_kKeyRightAlt);
+					}
+				}
+				lchanged = oldModifiers.get(GHOST_kModifierKeyLeftShift) != newModifiers.get(GHOST_kModifierKeyLeftShift);
+				if(lchanged) {

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list