[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21723] branches/soc-2009-imbusy: merge from 21532 to 21721 + fixed msvc9 projectfiles

Lukas Steiblys imbusy at imbusy.org
Mon Jul 20 18:26:50 CEST 2009 

Revision: 21723
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21723
Author:   imbusy
Date:     2009-07-20 18:26:50 +0200 (Mon, 20 Jul 2009)

Log Message:
-----------
merge from 21532 to 21721 + fixed msvc9 projectfiles

Modified Paths:
--------------
    branches/soc-2009-imbusy/CMakeLists.txt
    branches/soc-2009-imbusy/blenderplayer/CMakeLists.txt
    branches/soc-2009-imbusy/config/win32-mingw-config.py
    branches/soc-2009-imbusy/config/win32-vc-config.py
    branches/soc-2009-imbusy/config/win64-vc-config.py
    branches/soc-2009-imbusy/extern/binreloc/CMakeLists.txt
    branches/soc-2009-imbusy/extern/binreloc/Makefile
    branches/soc-2009-imbusy/extern/bullet2/src/SConscript
    branches/soc-2009-imbusy/extern/ffmpeg/SConscript
    branches/soc-2009-imbusy/extern/libopenjpeg/SConscript
    branches/soc-2009-imbusy/intern/elbeem/SConscript
    branches/soc-2009-imbusy/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-imbusy/release/datafiles/preview.blend
    branches/soc-2009-imbusy/release/io/export_ply.py
    branches/soc-2009-imbusy/release/ui/buttons_data_armature.py
    branches/soc-2009-imbusy/release/ui/buttons_data_bone.py
    branches/soc-2009-imbusy/release/ui/buttons_data_camera.py
    branches/soc-2009-imbusy/release/ui/buttons_data_lattice.py
    branches/soc-2009-imbusy/release/ui/buttons_data_mesh.py
    branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py
    branches/soc-2009-imbusy/release/ui/buttons_material.py
    branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
    branches/soc-2009-imbusy/release/ui/buttons_objects.py
    branches/soc-2009-imbusy/release/ui/buttons_particle.py
    branches/soc-2009-imbusy/release/ui/buttons_physics_field.py
    branches/soc-2009-imbusy/release/ui/buttons_physics_fluid.py
    branches/soc-2009-imbusy/release/ui/buttons_physics_softbody.py
    branches/soc-2009-imbusy/release/ui/buttons_scene.py
    branches/soc-2009-imbusy/release/ui/buttons_texture.py
    branches/soc-2009-imbusy/release/ui/buttons_world.py
    branches/soc-2009-imbusy/release/ui/space_filebrowser.py
    branches/soc-2009-imbusy/release/ui/space_image.py
    branches/soc-2009-imbusy/release/ui/space_info.py
    branches/soc-2009-imbusy/release/ui/space_outliner.py
    branches/soc-2009-imbusy/release/ui/space_sequencer.py
    branches/soc-2009-imbusy/release/ui/space_text.py
    branches/soc-2009-imbusy/release/ui/space_view3d.py
    branches/soc-2009-imbusy/release/ui/space_view3d_toolbar.py
    branches/soc-2009-imbusy/source/Makefile
    branches/soc-2009-imbusy/source/blender/blenfont/BLF_api.h
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf.c
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_report.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2009-imbusy/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/colortools.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/context.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/effect.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/image.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/material.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/object.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/report.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/texture.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2009-imbusy/source/blender/blenkernel/nla_private.h
    branches/soc-2009-imbusy/source/blender/blenlib/BLI_arithb.h
    branches/soc-2009-imbusy/source/blender/blenlib/BLI_editVert.h
    branches/soc-2009-imbusy/source/blender/blenlib/BLI_fileops.h
    branches/soc-2009-imbusy/source/blender/blenlib/SConscript
    branches/soc-2009-imbusy/source/blender/blenlib/intern/arithb.c
    branches/soc-2009-imbusy/source/blender/blenlib/intern/fileops.c
    branches/soc-2009-imbusy/source/blender/blenlib/intern/util.c
    branches/soc-2009-imbusy/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-imbusy/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-imbusy/source/blender/editors/Makefile
    branches/soc-2009-imbusy/source/blender/editors/SConscript
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-imbusy/source/blender/editors/animation/drivers.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframes_general.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframing.c
    branches/soc-2009-imbusy/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-imbusy/source/blender/editors/armature/editarmature.c
    branches/soc-2009-imbusy/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2009-imbusy/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-imbusy/source/blender/editors/armature/poselib.c
    branches/soc-2009-imbusy/source/blender/editors/armature/poseobject.c
    branches/soc-2009-imbusy/source/blender/editors/curve/editcurve.c
    branches/soc-2009-imbusy/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-imbusy/source/blender/editors/datafiles/preview.blend.c
    branches/soc-2009-imbusy/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2009-imbusy/source/blender/editors/include/BIF_glutil.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_armature.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_curve.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_keyframing.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_mesh.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_object.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_screen.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_space_api.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_transform.h
    branches/soc-2009-imbusy/source/blender/editors/interface/interface.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_anim.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_style.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-imbusy/source/blender/editors/interface/resources.c
    branches/soc-2009-imbusy/source/blender/editors/interface/view2d.c
    branches/soc-2009-imbusy/source/blender/editors/interface/view2d_ops.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/meshtools.c
    branches/soc-2009-imbusy/source/blender/editors/object/editconstraint.c
    branches/soc-2009-imbusy/source/blender/editors/object/editgroup.c
    branches/soc-2009-imbusy/source/blender/editors/object/object_edit.c
    branches/soc-2009-imbusy/source/blender/editors/object/object_intern.h
    branches/soc-2009-imbusy/source/blender/editors/object/object_ops.c
    branches/soc-2009-imbusy/source/blender/editors/object/object_vgroup.c
    branches/soc-2009-imbusy/source/blender/editors/physics/ed_fluidsim.c
    branches/soc-2009-imbusy/source/blender/editors/physics/editparticle.c
    branches/soc-2009-imbusy/source/blender/editors/preview/previewrender.c
    branches/soc-2009-imbusy/source/blender/editors/screen/area.c
    branches/soc-2009-imbusy/source/blender/editors/screen/glutil.c
    branches/soc-2009-imbusy/source/blender/editors/screen/screen_context.c
    branches/soc-2009-imbusy/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-imbusy/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_select.c
    branches/soc-2009-imbusy/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-imbusy/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-imbusy/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/filesel.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/writeimage.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/space_graph.c
    branches/soc-2009-imbusy/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-imbusy/source/blender/editors/space_image/image_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_image/image_render.c
    branches/soc-2009-imbusy/source/blender/editors/space_info/space_info.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_node/SConscript
    branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/space_text.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_python.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform.h
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_constraints.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-imbusy/source/blender/gpu/GPU_draw.h
    branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2009-imbusy/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2009-imbusy/source/blender/imbuf/intern/divers.c
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_material_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_object_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_access.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_define.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/SConscript
    branches/soc-2009-imbusy/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2009-imbusy/source/blender/makesrna/intern/Makefile
    branches/soc-2009-imbusy/source/blender/makesrna/intern/SConscript
    branches/soc-2009-imbusy/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_color.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_key.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_vpaint.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-imbusy/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2009-imbusy/source/blender/python/SConscript
    branches/soc-2009-imbusy/source/blender/python/generic/Mathutils.c
    branches/soc-2009-imbusy/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_util.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_util.h
    branches/soc-2009-imbusy/source/blender/render/intern/include/shading.h
    branches/soc-2009-imbusy/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/initrender.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/pixelshading.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/rayshade.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/rendercore.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/shadeinput.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/sss.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/strand.c
    branches/soc-2009-imbusy/source/blender/render/intern/source/texture.c
    branches/soc-2009-imbusy/source/blender/windowmanager/WM_api.h
    branches/soc-2009-imbusy/source/blender/windowmanager/WM_types.h
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2009-imbusy/source/blender/windowmanager/wm.h
    branches/soc-2009-imbusy/source/creator/CMakeLists.txt
    branches/soc-2009-imbusy/source/creator/creator.c
    branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2009-imbusy/source/gameengine/Expressions/SConscript
    branches/soc-2009-imbusy/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2009-imbusy/source/gameengine/GameLogic/SConscript
    branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2009-imbusy/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2009-imbusy/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2009-imbusy/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/soc-2009-imbusy/source/gameengine/Ketsji/SConscript
    branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2009-imbusy/source/gameengine/Physics/common/SConscript
    branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/soc-2009-imbusy/source/gameengine/Rasterizer/SConscript
    branches/soc-2009-imbusy/source/gameengine/SceneGraph/SConscript
    branches/soc-2009-imbusy/source/gameengine/VideoTexture/SConscript
    branches/soc-2009-imbusy/tools/Blender.py

Added Paths:
-----------
    branches/soc-2009-imbusy/release/ui/bpy_ops.py
    branches/soc-2009-imbusy/release/ui/buttons_physics_cloth.py
    branches/soc-2009-imbusy/release/ui/space_console.py
    branches/soc-2009-imbusy/release/windows/extra/python30.zip
    branches/soc-2009-imbusy/release/windows/extra/python31.zip
    branches/soc-2009-imbusy/source/blender/blenlib/BLI_dlrbTree.h
    branches/soc-2009-imbusy/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/
    branches/soc-2009-imbusy/source/blender/editors/space_console/Makefile
    branches/soc-2009-imbusy/source/blender/editors/space_console/SConscript
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_report.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/space_console.c

Removed Paths:
-------------
    branches/soc-2009-imbusy/release/beos-4.5-i386/
    branches/soc-2009-imbusy/release/beos-5.0-i386/
    branches/soc-2009-imbusy/release/ui/buttons_physic_cloth.py
    branches/soc-2009-imbusy/source/blender/editors/space_console/Makefile
    branches/soc-2009-imbusy/source/blender/editors/space_console/SConscript
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/console_report.c
    branches/soc-2009-imbusy/source/blender/editors/space_console/space_console.c

Property Changed:
----------------
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2009-imbusy/source/blender/blenkernel/nla_private.h
    branches/soc-2009-imbusy/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2009-imbusy/source/blender/python/generic/BGL.h

Modified: branches/soc-2009-imbusy/CMakeLists.txt
===================================================================
--- branches/soc-2009-imbusy/CMakeLists.txt	2009-07-20 16:21:55 UTC (rev 21722)
+++ branches/soc-2009-imbusy/CMakeLists.txt	2009-07-20 16:26:50 UTC (rev 21723)
@@ -63,6 +63,7 @@
 OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
 OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
+OPTION(WITH_SDL			"Enable SDL for sound and joystick support"				ON)
 OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
@@ -133,9 +134,11 @@
   SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
-  FIND_PACKAGE(SDL)
-  SET(SDL_INC ${SDL_INCLUDE_DIR})
-  SET(SDL_LIB ${SDL_LIBRARY})
+  IF(WITH_SDL)
+    FIND_PACKAGE(SDL)
+    SET(SDL_INC ${SDL_INCLUDE_DIR})
+    SET(SDL_LIB ${SDL_LIBRARY})
+  ENDIF(WITH_SDL)
 
   FIND_PATH(OPENEXR_INC
     ImfXdr.h

Modified: branches/soc-2009-imbusy/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2009-imbusy/blenderplayer/CMakeLists.txt	2009-07-20 16:21:55 UTC (rev 21722)
+++ branches/soc-2009-imbusy/blenderplayer/CMakeLists.txt	2009-07-20 16:26:50 UTC (rev 21723)
@@ -32,10 +32,10 @@
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c

Modified: branches/soc-2009-imbusy/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-imbusy/config/win32-mingw-config.py	2009-07-20 16:21:55 UTC (rev 21722)
+++ branches/soc-2009-imbusy/config/win32-mingw-config.py	2009-07-20 16:26:50 UTC (rev 21723)
@@ -2,7 +2,7 @@
 LIBDIR = "${LCGDIR}"
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.1'
 #BF_PYTHON_VERSION = '2.6'
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -148,7 +148,7 @@
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
 BF_PROFILE = False

Modified: branches/soc-2009-imbusy/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-imbusy/config/win32-vc-config.py	2009-07-20 16:21:55 UTC (rev 21722)
+++ branches/soc-2009-imbusy/config/win32-vc-config.py	2009-07-20 16:26:50 UTC (rev 21723)
@@ -9,10 +9,10 @@
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_VERSION = '3.1'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIB = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = True
@@ -149,7 +149,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -165,7 +165,7 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
 
 # # Todo
 # BF_PROFILE_CCFLAGS = ['-pg', '-g ']

Modified: branches/soc-2009-imbusy/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-imbusy/config/win64-vc-config.py	2009-07-20 16:21:55 UTC (rev 21722)
+++ branches/soc-2009-imbusy/config/win64-vc-config.py	2009-07-20 16:26:50 UTC (rev 21723)
@@ -10,10 +10,10 @@
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
+BF_PYTHON_VERSION = '3.1'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
+BF_PYTHON_LIB = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = False 
@@ -162,7 +162,8 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -182,186 +183,7 @@
 
 BF_DEBUG=False
 BF_BSC=False
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/openmp']
-CXXFLAGS = ['/EHsc']
 
-if BF_DEBUG:
-	BF_NUMJOBS=1
-else:
-	BF_NUMJOBS=6
-
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
-
-BF_BUILDDIR = '..\\build\\blender25-win64-vc'
-BF_INSTALLDIR='..\\install\\blender25-win64-vc'
-BF_DOCDIR='..\\install\\blender25-win64-vc\\doc'
-
-
-
-######################### MERGE WITH ABOVE ################################
-
-
-
-
-=======
-LCGDIR = '#../lib/win64'
-LIBDIR = '${LCGDIR}'
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = False # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-
-WITH_BF_OPENAL = False 
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'dxguid openal_static'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-# TODO - are these useful on win32?
-# BF_CXX = '/usr'
-# WITH_BF_STATICCXX = False
-# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + '/iconv'
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL.lib'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-BF_PTHREADS = LIBDIR + '/pthreads'
-BF_PTHREADS_INC = '${BF_PTHREADS}/include'
-BF_PTHREADS_LIB = 'pthreadVC2'
-BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
-BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = False
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettext'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = False
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-WITH_BF_BINRELOC = False
-
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
-# enable freetype2 support for text objects
-BF_WITH_FREETYPE = True
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype2ST'

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list