[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26084] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 26083.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon Jan 18 21:02:50 CET 2010
Revision: 26084
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26084
Author: kjym3
Date: 2010-01-18 21:01:58 +0100 (Mon, 18 Jan 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 26083.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26083
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMake/macros.cmake
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/config/darwin-config.py
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.h
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
branches/soc-2008-mxcurioni/intern/ghost/SConscript
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/copy.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/finger_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/palm_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_text.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/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.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/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.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/sca.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/Makefile
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.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_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.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/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_boids.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.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_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.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_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.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_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.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_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_text_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.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_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_array.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rayobject.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
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/Makefile
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_gesture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.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/blender/windowmanager/wm.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
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/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/API_intro.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameLogic.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameTypes.py
branches/soc-2008-mxcurioni/tools/Blender.py
branches/soc-2008-mxcurioni/tools/btools.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventTrackpad.h
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_quadruped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/mouth.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/stretch.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/stretch_twist.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/track_dual.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/track_reverse.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_uv.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/PhysicsConstraints.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/VideoTexture.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped_generic.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_biped_generic.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_quadruped_generic.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/source/blender/collada/Makefile
Modified: branches/soc-2008-mxcurioni/CMake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/CMake/macros.cmake 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/CMake/macros.cmake 2010-01-18 20:01:58 UTC (rev 26084)
@@ -135,15 +135,35 @@
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
ENDIF(WITH_QUICKTIME)
IF(WITH_OPENEXR)
- TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+ IF(WIN32)
+ FOREACH(loop_var ${OPENEXR_LIB})
+ TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+ ENDFOREACH(loop_var)
+ ELSE(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+ ENDIF(WIN32)
ENDIF(WITH_OPENEXR)
IF(WITH_FFMPEG)
TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
ENDIF(WITH_FFMPEG)
IF(WITH_OPENCOLLADA)
- TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
- TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+ IF(WIN32)
+ FOREACH(loop_var ${OPENCOLLADA_LIB})
+ TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+ ENDFOREACH(loop_var)
+ TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
+ IF(EXPAT_LIB)
+ TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
+ ENDIF(EXPAT_LIB)
+ ELSE(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+ ENDIF(WIN32)
ENDIF(WITH_OPENCOLLADA)
IF(WIN32)
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-01-18 20:01:58 UTC (rev 26084)
@@ -79,14 +79,14 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
# Unix defaults to OpenMP On
-IF (UNIX)
+IF(UNIX AND NOT APPLE)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE(UNIX)
+ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF(UNIX)
+ENDIF()
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/SConstruct 2010-01-18 20:01:58 UTC (rev 26084)
@@ -500,7 +500,7 @@
else: dir = os.path.join(env['BF_INSTALLDIR'], '.blender')
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
- source=[os.path.join(dp, f) for f in df]
+ source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
@@ -611,7 +611,11 @@
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
- '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
+ '${LCGDIR}/ffmpeg/lib/swscale-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+ '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libx264-67.dll']
if env['WITH_BF_JACK']:
dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/soc-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py 2010-01-18 20:01:58 UTC (rev 26084)
@@ -321,7 +321,7 @@
if USE_SDK==True:
SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
- PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
+ PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
Modified: branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2010-01-18 20:01:58 UTC (rev 26084)
@@ -20,7 +20,7 @@
#
# ***** END LGPL LICENSE BLOCK *****
-SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
+SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC} ${OPENAL_INCLUDE_DIR})
FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
Modified: branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2010-01-18 20:01:58 UTC (rev 26084)
@@ -270,8 +270,24 @@
specs.channels = AUD_CHANNELS_STEREO;
specs.format = AUD_FORMAT_S16;
- m_device = alcOpenDevice(NULL);
+#if 0
+ if(alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT") == AL_TRUE)
+ {
+ ALCchar* devices = const_cast<ALCchar*>(alcGetString(NULL, ALC_DEVICE_SPECIFIER));
+ printf("OpenAL devices (standard is: %s):\n", alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER));
+ while(*devices)
+ {
+ printf("%s\n", devices);
+ devices += strlen(devices) + 1;
+ }
+ }
+#endif
+
+ m_device = alcOpenDevice("ALSA Software");
+ if(m_device == NULL)
+ m_device = alcOpenDevice(NULL);
+
if(!m_device)
AUD_THROW(AUD_ERROR_OPENAL);
Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp 2010-01-18 20:01:58 UTC (rev 26084)
@@ -33,6 +33,9 @@
#include "MT_Plane3.h"
#include "BSP_CSGException.h"
+// for insert_iterator
+#include <iterator>
+
// for vector reverse
#include <iostream>
#include <algorithm>
Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.h 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.h 2010-01-18 20:01:58 UTC (rev 26084)
@@ -83,7 +83,7 @@
DestroyEdges(
);
- // return a new seperate copy of the
+ // return a new separate copy of the
// mesh allocated on the heap.
BSP_CSGMesh *
Modified: branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-01-18 20:01:58 UTC (rev 26084)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC . ../string)
+SET(INC . ../string ../../extern/glew/include)
FILE(GLOB SRC intern/*.cpp intern/*.mm)
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h 2010-01-18 20:01:58 UTC (rev 26084)
@@ -151,6 +151,7 @@
GHOST_kEventButtonDown, /// Mouse button event
GHOST_kEventButtonUp, /// Mouse button event
GHOST_kEventWheel, /// Mouse wheel event
+ GHOST_kEventTrackpad, /// Trackpad event
GHOST_kEventNDOFMotion, /// N degree of freedom device motion event
GHOST_kEventNDOFButton, /// N degree of freedom device button event
@@ -373,7 +374,29 @@
GHOST_TInt32 z;
} GHOST_TEventWheelData;
+typedef enum {
+ GHOST_kTrackpadEventUnknown =0,
+ GHOST_kTrackpadEventScroll,
+ GHOST_kTrackpadEventRotate,
+ GHOST_kTrackpadEventSwipe, /* Reserved, not used for now */
+ GHOST_kTrackpadEventMagnify
+} GHOST_TTrackpadEventSubTypes;
+
+typedef struct {
+ /** The event subtype */
+ GHOST_TTrackpadEventSubTypes subtype;
+ /** The x-location of the trackpad event */
+ GHOST_TInt32 x;
+ /** The y-location of the trackpad event */
+ GHOST_TInt32 y;
+ /** The x-delta or value of the trackpad event */
+ GHOST_TInt32 deltaX;
+ /** The y-delta (currently only for scroll subtype) of the trackpad event */
+ GHOST_TInt32 deltaY;
+} GHOST_TEventTrackpadData;
+
+
typedef enum {
GHOST_kDragnDropTypeUnknown =0,
GHOST_kDragnDropTypeFilenames, /*Array of strings representing file names (full path) */
Modified: branches/soc-2008-mxcurioni/intern/ghost/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/SConscript 2010-01-18 18:52:03 UTC (rev 26083)
+++ branches/soc-2008-mxcurioni/intern/ghost/SConscript 2010-01-18 20:01:58 UTC (rev 26084)
@@ -57,7 +57,7 @@
if env['BF_GHOST_DEBUG']:
defs.append('BF_GHOST_DEBUG')
-incs = '. ../string ' + env['BF_OPENGL_INC']
+incs = '. ../string #extern/glew/include ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list