[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22576] branches/soc-2009-jaguarandi: svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender
Andre Susano Pinto
andresusanopinto at gmail.com
Mon Aug 17 19:43:50 CEST 2009
Revision: 22576
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22576
Author: jaguarandi
Date: 2009-08-17 19:43:49 +0200 (Mon, 17 Aug 2009)
Log Message:
-----------
svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/soc-2009-jaguarandi/CMake/macros.cmake
branches/soc-2009-jaguarandi/CMakeLists.txt
branches/soc-2009-jaguarandi/SConstruct
branches/soc-2009-jaguarandi/config/darwin-config.py
branches/soc-2009-jaguarandi/config/linux2-config.py
branches/soc-2009-jaguarandi/config/win32-mingw-config.py
branches/soc-2009-jaguarandi/config/win32-vc-config.py
branches/soc-2009-jaguarandi/extern/glew/CMakeLists.txt
branches/soc-2009-jaguarandi/extern/libopenjpeg/CMakeLists.txt
branches/soc-2009-jaguarandi/intern/audaspace/CMakeLists.txt
branches/soc-2009-jaguarandi/intern/audaspace/Makefile
branches/soc-2009-jaguarandi/intern/audaspace/SConscript
branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.cpp
branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.h
branches/soc-2009-jaguarandi/intern/audaspace/SDL/Makefile
branches/soc-2009-jaguarandi/intern/audaspace/SRC/Makefile
branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/Makefile
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.h
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_FloatMixer.cpp
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Space.h
branches/soc-2009-jaguarandi/intern/audaspace/intern/Makefile
branches/soc-2009-jaguarandi/intern/elbeem/CMakeLists.txt
branches/soc-2009-jaguarandi/intern/elbeem/intern/paraloopend.h
branches/soc-2009-jaguarandi/intern/ghost/CMakeLists.txt
branches/soc-2009-jaguarandi/intern/guardedalloc/BLO_sys_types.h
branches/soc-2009-jaguarandi/intern/opennl/superlu/BLO_sys_types.h
branches/soc-2009-jaguarandi/intern/smoke/extern/smoke_API.h
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D.h
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2009-jaguarandi/intern/smoke/intern/VEC3.h
branches/soc-2009-jaguarandi/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2009-jaguarandi/intern/smoke/intern/smoke_API.cpp
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2009-jaguarandi/release/Makefile
branches/soc-2009-jaguarandi/release/io/engine_render_pov.py
branches/soc-2009-jaguarandi/release/ui/bpy_ops.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_armature.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py
branches/soc-2009-jaguarandi/release/ui/buttons_game.py
branches/soc-2009-jaguarandi/release/ui/buttons_material.py
branches/soc-2009-jaguarandi/release/ui/buttons_object.py
branches/soc-2009-jaguarandi/release/ui/buttons_object_constraint.py
branches/soc-2009-jaguarandi/release/ui/buttons_particle.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_cloth.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_field.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_fluid.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_smoke.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_softbody.py
branches/soc-2009-jaguarandi/release/ui/buttons_scene.py
branches/soc-2009-jaguarandi/release/ui/buttons_texture.py
branches/soc-2009-jaguarandi/release/ui/buttons_world.py
branches/soc-2009-jaguarandi/release/ui/space_info.py
branches/soc-2009-jaguarandi/release/ui/space_sequencer.py
branches/soc-2009-jaguarandi/release/ui/space_view3d.py
branches/soc-2009-jaguarandi/release/ui/space_view3d_toolbar.py
branches/soc-2009-jaguarandi/source/Makefile
branches/soc-2009-jaguarandi/source/blender/blenfont/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_dir.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_animsys.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_blender.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_brush.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_cloth.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_context.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_global.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_node.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_scene.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sculpt.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sequence.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_softbody.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sound.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/blender.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/brush.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cloth.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/context.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/ipo.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/material.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/multires.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/node.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/scene.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sound.c
branches/soc-2009-jaguarandi/source/blender/blenlib/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/listbase.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/storage.c
branches/soc-2009-jaguarandi/source/blender/blenloader/BLO_sys_types.h
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2009-jaguarandi/source/blender/editors/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_filter.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyingsets.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/poseobject.c
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_object.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_screen.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_view3d.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_layout.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_panel.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_regions.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_templates.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_utils.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_layers.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editconstraint.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/object/object_modifier.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_vgroup.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/editparticle.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/physics_boids.c
branches/soc-2009-jaguarandi/source/blender/editors/preview/previewrender.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/editors/screen/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/screen/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/screen/area.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_context.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_action/space_action.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/space_file/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_panels.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/space_image/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_channels.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_time/space_time.c
branches/soc-2009-jaguarandi/source/blender/editors/space_time/time_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_generics.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-jaguarandi/source/blender/editors/util/undo.c
branches/soc-2009-jaguarandi/source/blender/gpu/GPU_draw.h
branches/soc-2009-jaguarandi/source/blender/gpu/GPU_extensions.h
branches/soc-2009-jaguarandi/source/blender/gpu/GPU_material.h
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_material.c
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_brush_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_texture_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_access.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_define.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_meta.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_render.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-jaguarandi/source/blender/nodes/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/python/epy_doc_gen.py
branches/soc-2009-jaguarandi/source/blender/python/generic/BGL.c
branches/soc-2009-jaguarandi/source/blender/python/generic/BGL.h
branches/soc-2009-jaguarandi/source/blender/python/generic/euler.c
branches/soc-2009-jaguarandi/source/blender/python/generic/matrix.c
branches/soc-2009-jaguarandi/source/blender/python/generic/quat.c
branches/soc-2009-jaguarandi/source/blender/python/generic/vector.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_interface.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.h
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_ui.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.c
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/pipeline.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rendercore.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeoutput.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/strand.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/zbuf.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/windowmanager/WM_api.h
branches/soc-2009-jaguarandi/source/blender/windowmanager/WM_types.h
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-jaguarandi/source/creator/CMakeLists.txt
branches/soc-2009-jaguarandi/source/creator/creator.c
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/Makefile
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/Makefile
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/netscape/src/Makefile
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/Makefile
branches/soc-2009-jaguarandi/source/gameengine/Makefile
branches/soc-2009-jaguarandi/source/nan_definitions.mk
branches/soc-2009-jaguarandi/source/nan_link.mk
branches/soc-2009-jaguarandi/tools/Blender.py
branches/soc-2009-jaguarandi/tools/btools.py
Added Paths:
-----------
branches/soc-2009-jaguarandi/intern/audaspace/jack/
branches/soc-2009-jaguarandi/intern/audaspace/jack/AUD_JackDevice.cpp
branches/soc-2009-jaguarandi/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2009-jaguarandi/intern/audaspace/jack/Makefile
branches/soc-2009-jaguarandi/release/ui/space_time.py
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_paint.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_unit.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/paint.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/unit.c
Removed Paths:
-------------
branches/soc-2009-jaguarandi/intern/audaspace/jack/AUD_JackDevice.cpp
branches/soc-2009-jaguarandi/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2009-jaguarandi/intern/audaspace/jack/Makefile
Property Changed:
----------------
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_defines.c
Modified: branches/soc-2009-jaguarandi/CMake/macros.cmake
===================================================================
--- branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-08-17 17:34:15 UTC (rev 22575)
+++ branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-08-17 17:43:49 UTC (rev 22576)
@@ -42,14 +42,21 @@
if(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
- LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
+ LINK_DIRECTORIES(${PYTHON_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
IF(WITH_INTERNATIONAL)
+ LINK_DIRECTORIES(${ICONV_LIBPATH})
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
ENDIF(WITH_INTERNATIONAL)
+ IF(WITH_SDL)
+ LINK_DIRECTORIES(${SDL_LIBPATH})
+ ENDIF(WITH_SDL)
IF(WITH_OPENAL)
LINK_DIRECTORIES(${OPENAL_LIBPATH})
ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ LINK_DIRECTORIES(${JACK_LIBPATH})
+ ENDIF(WITH_JACK)
IF(WITH_FFTW3)
LINK_DIRECTORIES(${FFTW3_LIBPATH})
ENDIF(WITH_FFTW3)
@@ -62,9 +69,9 @@
MACRO(SETUP_LIBLINKS
target)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
- #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+ #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIBRARY} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
@@ -81,8 +88,8 @@
ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
@@ -102,8 +109,14 @@
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
ENDIF(WITH_INTERNATIONAL)
IF(WITH_OPENAL)
- TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+ ENDIF(WITH_JACK)
+ IF(WITH_SDL)
+ TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
IF(WIN32)
TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
ENDIF(WIN32)
Modified: branches/soc-2009-jaguarandi/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/CMakeLists.txt 2009-08-17 17:34:15 UTC (rev 22575)
+++ branches/soc-2009-jaguarandi/CMakeLists.txt 2009-08-17 17:43:49 UTC (rev 22576)
@@ -69,6 +69,8 @@
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
+OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -94,13 +96,18 @@
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
- SET(OPENAL_LIB ${OPENAL_LIBRARY})
- SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
ELSE(OPENAL_FOUND)
SET(WITH_OPENAL OFF)
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ SET(JACK /usr)
+ SET(JACK_INC ${JACK}/include/jack)
+ SET(JACK_LIB jack)
+ SET(JACK_LIBPATH ${JACK}/lib)
+ ENDIF(WITH_JACK)
+
FIND_LIBRARY(INTL_LIBRARY
NAMES intl
PATHS
@@ -111,34 +118,34 @@
PATHS
/sw/lib
)
+
IF(INTL_LIBRARY AND ICONV_LIBRARY)
SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+
+ FIND_PACKAGE(Freetype)
+ # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+
+ # No way to set py31. remove for now.
+ # FIND_PACKAGE(PythonLibs)
+ SET(PYTHON /usr)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+ SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
- FIND_PATH(FREETYPE_INC
- freetype
- PATHS
- /usr/local/include/freetype2
- /usr/include/freetype2
- /sw/include/freetype2
- /opt/local/include/freetype2
- /opt/csw/include/freetype2
- /opt/include/freetype2
- NO_DEFAULT_PATH
- )
- SET(FREETYPE_LIB freetype)
-
- FIND_PACKAGE(PythonLibs)
- SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
- SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
- FIND_PACKAGE(PythonInterp)
- SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+ # FIND_PACKAGE(PythonInterp) # not used yet
+ # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
IF(WITH_SDL)
FIND_PACKAGE(SDL)
- SET(SDL_INC ${SDL_INCLUDE_DIR})
- SET(SDL_LIB ${SDL_LIBRARY})
+ # UNSET(SDLMAIN_LIBRARY CACHE)
+ IF(NOT SDL_FOUND)
+ SET(WITH_SDL OFF)
+ ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
FIND_PATH(OPENEXR_INC
@@ -159,10 +166,10 @@
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(WITH_FFTW3)
- SET(FFTW3 /usr)
- SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB fftw3)
- SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ SET(FFTW3 /usr)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB fftw3)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
SET(LIBSAMPLERATE /usr)
@@ -176,8 +183,14 @@
FIND_PACKAGE(ZLIB REQUIRED)
- SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")
+ # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+ SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ # BSD's dont use libdl.so
+ SET(LLIBS "${LLIBS} -ldl")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
IF(WITH_OPENMP)
SET(LLIBS "${LLIBS} -lgomp")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
@@ -211,22 +224,29 @@
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
- SET(PYTHON_BINARY python)
+ # SET(PYTHON_BINARY python) # not used yet
SET(PYTHON_LIB python31)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
IF(CMAKE_CL_64)
SET(WITH_OPENAL OFF)
ELSE(CMAKE_CL_64)
- #SET(WITH_OPENAL ON)
- SET(OPENAL ${LIBDIR}/openal)
- SET(OPENAL_INC ${OPENAL}/include)
- SET(OPENAL_LIB wrap_oal)
- SET(OPENAL_LIBPATH ${OPENAL}/lib)
+ #SET(WITH_OPENAL ON)
+ SET(OPENAL ${LIBDIR}/openal)
+ SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+ SET(OPENAL_LIBRARY wrap_oal)
+ SET(OPENAL_LIBPATH ${OPENAL}/lib)
ENDIF(CMAKE_CL_64)
+ IF(WITH_JACK)
+ SET(JACK ${LIBDIR}/jack)
+ SET(JACK_INC ${JACK}/include/jack)
+ SET(JACK_LIB jack)
+ SET(JACK_LIBPATH ${JACK}/lib)
+ ENDIF(WITH_JACK)
+
IF(CMAKE_CL_64)
- SET(PNG_LIBRARIES libpng)
+ SET(PNG_LIBRARIES libpng)
ELSE(CMAKE_CL_64)
SET(PNG_LIBRARIES libpng_st)
ENDIF(CMAKE_CL_64)
@@ -248,25 +268,25 @@
SET(ICONV_LIBPATH ${ICONV}/lib)
IF(WITH_FFTW3)
- SET(FFTW3 ${LIBDIR}/fftw3)
- SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB libfftw)
- SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ SET(FFTW3 ${LIBDIR}/fftw3)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
IF(CMAKE_CL_64)
- SET(GETTEXT_LIB gettextlib)
+ SET(GETTEXT_LIB gettextlib)
ELSE(CMAKE_CL_64)
- SET(GETTEXT_LIB gnu_gettext)
+ SET(GETTEXT_LIB gnu_gettext)
ENDIF(CMAKE_CL_64)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
SET(FREETYPE ${LIBDIR}/freetype)
- SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+ SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
- SET(FREETYPE_LIB freetype2ST)
+ SET(FREETYPE_LIBRARY freetype2ST)
SET(OPENEXR ${LIBDIR}/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
@@ -317,8 +337,8 @@
ENDIF(WITH_OPENMP)
SET(SDL ${LIBDIR}/sdl)
- SET(SDL_INC ${SDL}/include)
- SET(SDL_LIB SDL)
+ SET(SDL_INCLUDE_DIR ${SDL}/include)
+ SET(SDL_LIBRARY SDL)
SET(SDL_LIBPATH ${SDL}/lib)
SET(PNG "${LIBDIR}/png")
@@ -353,13 +373,17 @@
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
- SET(OPENAL_LIB ${OPENAL_LIBRARY})
- SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
ELSE(OPENAL_FOUND)
SET(WITH_OPENAL OFF)
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ SET(JACK /usr)
+ SET(JACK_INC ${JACK}/include/jack)
+ SET(JACK_LIB jack)
+ SET(JACK_LIBPATH ${JACK}/lib)
+ ENDIF(WITH_JACK)
SET(PYTHON_VERSION 3.1)
@@ -368,7 +392,7 @@
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
- SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+ # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
SET(PYTHON_LIB python${PYTHON_VERSION})
SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
# SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
@@ -378,7 +402,7 @@
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list