Revision: 22607 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22607 Author: imbusy Date: 2009-08-18 20:06:11 +0200 (Tue, 18 Aug 2009)
Log Message: ----------- merge from 22334 to 22606 Modified Paths: -------------- branches/soc-2009-imbusy/CMake/macros.cmake branches/soc-2009-imbusy/CMakeLists.txt branches/soc-2009-imbusy/SConstruct branches/soc-2009-imbusy/blenderplayer/CMakeLists.txt branches/soc-2009-imbusy/config/darwin-config.py branches/soc-2009-imbusy/config/linux2-config.py branches/soc-2009-imbusy/config/win32-mingw-config.py branches/soc-2009-imbusy/config/win32-vc-config.py branches/soc-2009-imbusy/extern/glew/CMakeLists.txt branches/soc-2009-imbusy/extern/libopenjpeg/CMakeLists.txt branches/soc-2009-imbusy/intern/CMakeLists.txt branches/soc-2009-imbusy/intern/Makefile branches/soc-2009-imbusy/intern/SConscript branches/soc-2009-imbusy/intern/audaspace/CMakeLists.txt branches/soc-2009-imbusy/intern/audaspace/Makefile branches/soc-2009-imbusy/intern/audaspace/SConscript branches/soc-2009-imbusy/intern/audaspace/SDL/AUD_SDLDevice.cpp branches/soc-2009-imbusy/intern/audaspace/SDL/AUD_SDLDevice.h branches/soc-2009-imbusy/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp branches/soc-2009-imbusy/intern/audaspace/SDL/AUD_SDLMixerReader.cpp branches/soc-2009-imbusy/intern/audaspace/SDL/Makefile branches/soc-2009-imbusy/intern/audaspace/SRC/Makefile branches/soc-2009-imbusy/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2009-imbusy/intern/audaspace/ffmpeg/Makefile branches/soc-2009-imbusy/intern/audaspace/intern/AUD_C-API.cpp branches/soc-2009-imbusy/intern/audaspace/intern/AUD_ConverterReader.cpp branches/soc-2009-imbusy/intern/audaspace/intern/AUD_FloatMixer.cpp branches/soc-2009-imbusy/intern/audaspace/intern/AUD_Space.h branches/soc-2009-imbusy/intern/audaspace/intern/Makefile branches/soc-2009-imbusy/intern/elbeem/CMakeLists.txt branches/soc-2009-imbusy/intern/elbeem/intern/paraloopend.h branches/soc-2009-imbusy/intern/ghost/CMakeLists.txt branches/soc-2009-imbusy/intern/ghost/intern/GHOST_System.cpp branches/soc-2009-imbusy/intern/ghost/intern/GHOST_System.h branches/soc-2009-imbusy/intern/ghost/intern/GHOST_WindowX11.cpp branches/soc-2009-imbusy/intern/guardedalloc/BLO_sys_types.h branches/soc-2009-imbusy/intern/guardedalloc/CMakeLists.txt branches/soc-2009-imbusy/intern/opennl/superlu/BLO_sys_types.h branches/soc-2009-imbusy/intern/smoke/extern/smoke_API.h branches/soc-2009-imbusy/intern/smoke/intern/FFT_NOISE.h branches/soc-2009-imbusy/intern/smoke/intern/FLUID_3D.cpp branches/soc-2009-imbusy/intern/smoke/intern/FLUID_3D.h branches/soc-2009-imbusy/intern/smoke/intern/FLUID_3D_SOLVERS.cpp branches/soc-2009-imbusy/intern/smoke/intern/FLUID_3D_STATIC.cpp branches/soc-2009-imbusy/intern/smoke/intern/VEC3.h branches/soc-2009-imbusy/intern/smoke/intern/WAVELET_NOISE.h branches/soc-2009-imbusy/intern/smoke/intern/WTURBULENCE.cpp branches/soc-2009-imbusy/intern/smoke/intern/smoke_API.cpp branches/soc-2009-imbusy/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.sln branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.vcproj branches/soc-2009-imbusy/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 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/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/soc-2009-imbusy/projectfiles_vc9/blender/loader/BLO_loader.vcproj branches/soc-2009-imbusy/projectfiles_vc9/blender/nodes/nodes.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/converter/KX_converter.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj branches/soc-2009-imbusy/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj branches/soc-2009-imbusy/release/Makefile branches/soc-2009-imbusy/release/io/engine_render_pov.py branches/soc-2009-imbusy/release/scripts/textplugin_convert_ge.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_curve.py branches/soc-2009-imbusy/release/ui/buttons_data_empty.py branches/soc-2009-imbusy/release/ui/buttons_data_lamp.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_metaball.py branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py branches/soc-2009-imbusy/release/ui/buttons_data_text.py branches/soc-2009-imbusy/release/ui/buttons_game.py branches/soc-2009-imbusy/release/ui/buttons_material.py branches/soc-2009-imbusy/release/ui/buttons_object.py branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py branches/soc-2009-imbusy/release/ui/buttons_particle.py branches/soc-2009-imbusy/release/ui/buttons_physics_cloth.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_smoke.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_buttons.py branches/soc-2009-imbusy/release/ui/space_info.py branches/soc-2009-imbusy/release/ui/space_sequencer.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/CMakeLists.txt branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_dir.c branches/soc-2009-imbusy/source/blender/blenkernel/BKE_animsys.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_blender.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_brush.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_cloth.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_context.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_global.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_node.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_pointcache.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_scene.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_sculpt.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_sequence.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_smoke.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_softbody.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_sound.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_utildefines.h branches/soc-2009-imbusy/source/blender/blenkernel/CMakeLists.txt branches/soc-2009-imbusy/source/blender/blenkernel/SConscript branches/soc-2009-imbusy/source/blender/blenkernel/intern/DerivedMesh.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/anim_sys.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/blender.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/brush.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/cloth.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/collision.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/displist.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/idprop.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/ipo.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/node.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/sca.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/scene.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/smoke.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/softbody.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/sound.c branches/soc-2009-imbusy/source/blender/blenlib/CMakeLists.txt branches/soc-2009-imbusy/source/blender/blenlib/intern/BLI_kdopbvh.c branches/soc-2009-imbusy/source/blender/blenlib/intern/BLI_kdtree.c branches/soc-2009-imbusy/source/blender/blenlib/intern/boxpack2d.c branches/soc-2009-imbusy/source/blender/blenlib/intern/listbase.c branches/soc-2009-imbusy/source/blender/blenlib/intern/storage.c branches/soc-2009-imbusy/source/blender/blenloader/BLO_sys_types.h branches/soc-2009-imbusy/source/blender/blenloader/intern/readfile.c branches/soc-2009-imbusy/source/blender/blenloader/intern/readfile.h branches/soc-2009-imbusy/source/blender/blenloader/intern/writefile.c branches/soc-2009-imbusy/source/blender/editors/CMakeLists.txt 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_deps.c branches/soc-2009-imbusy/source/blender/editors/animation/anim_filter.c branches/soc-2009-imbusy/source/blender/editors/animation/anim_ipo_utils.c branches/soc-2009-imbusy/source/blender/editors/animation/keyingsets.c branches/soc-2009-imbusy/source/blender/editors/armature/editarmature.c branches/soc-2009-imbusy/source/blender/editors/armature/editarmature_sketch.c branches/soc-2009-imbusy/source/blender/editors/armature/poseobject.c branches/soc-2009-imbusy/source/blender/editors/include/ED_anim_api.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_screen_types.h branches/soc-2009-imbusy/source/blender/editors/include/ED_space_api.h branches/soc-2009-imbusy/source/blender/editors/include/ED_view3d.h branches/soc-2009-imbusy/source/blender/editors/include/UI_interface.h branches/soc-2009-imbusy/source/blender/editors/interface/Makefile branches/soc-2009-imbusy/source/blender/editors/interface/SConscript branches/soc-2009-imbusy/source/blender/editors/interface/interface.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_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/mesh/editmesh.c branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_add.c branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_loop.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/mesh_layers.c branches/soc-2009-imbusy/source/blender/editors/mesh/mesh_ops.c branches/soc-2009-imbusy/source/blender/editors/object/editconstraint.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_modifier.c 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_pointcache.c branches/soc-2009-imbusy/source/blender/editors/physics/editparticle.c branches/soc-2009-imbusy/source/blender/editors/physics/physics_boids.c branches/soc-2009-imbusy/source/blender/editors/preview/previewrender.c branches/soc-2009-imbusy/source/blender/editors/screen/CMakeLists.txt branches/soc-2009-imbusy/source/blender/editors/screen/Makefile branches/soc-2009-imbusy/source/blender/editors/screen/SConscript branches/soc-2009-imbusy/source/blender/editors/screen/area.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/paint_intern.h branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_utils.c branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_vertex.c branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/sculpt.c branches/soc-2009-imbusy/source/blender/editors/space_action/action_draw.c branches/soc-2009-imbusy/source/blender/editors/space_action/action_intern.h branches/soc-2009-imbusy/source/blender/editors/space_action/space_action.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_ops.c branches/soc-2009-imbusy/source/blender/editors/space_file/Makefile branches/soc-2009-imbusy/source/blender/editors/space_file/SConscript branches/soc-2009-imbusy/source/blender/editors/space_file/file_panels.c branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_buttons.c branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_draw.c branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_intern.h branches/soc-2009-imbusy/source/blender/editors/space_graph/space_graph.c branches/soc-2009-imbusy/source/blender/editors/space_image/Makefile branches/soc-2009-imbusy/source/blender/editors/space_image/SConscript 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_info/info_intern.h branches/soc-2009-imbusy/source/blender/editors/space_logic/logic_window.c branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_channels.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_intern.h branches/soc-2009-imbusy/source/blender/editors/space_nla/space_nla.c branches/soc-2009-imbusy/source/blender/editors/space_node/node_draw.c branches/soc-2009-imbusy/source/blender/editors/space_node/node_edit.c branches/soc-2009-imbusy/source/blender/editors/space_node/space_node.c branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner.c branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner_header.c branches/soc-2009-imbusy/source/blender/editors/space_sequencer/SConscript branches/soc-2009-imbusy/source/blender/editors/space_sequencer/sequencer_draw.c branches/soc-2009-imbusy/source/blender/editors/space_time/space_time.c branches/soc-2009-imbusy/source/blender/editors/space_time/time_header.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawarmature.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawmesh.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_draw.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_edit.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_header.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_intern.h branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_select.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_snap.c branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_toolbar.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_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_orientations.c branches/soc-2009-imbusy/source/blender/editors/util/undo.c branches/soc-2009-imbusy/source/blender/gpu/GPU_draw.h branches/soc-2009-imbusy/source/blender/gpu/GPU_extensions.h branches/soc-2009-imbusy/source/blender/gpu/GPU_material.h branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_codegen.c branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_codegen.h branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_draw.c branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_extensions.c branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_material.c branches/soc-2009-imbusy/source/blender/makesdna/DNA_actuator_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_brush_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_material_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_modifier_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_object_force.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_smoke_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_sound_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_space_types.h branches/soc-2009-imbusy/source/blender/makesdna/DNA_texture_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_enum_types.h branches/soc-2009-imbusy/source/blender/makesrna/RNA_types.h branches/soc-2009-imbusy/source/blender/makesrna/intern/CMakeLists.txt branches/soc-2009-imbusy/source/blender/makesrna/intern/makesrna.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ID.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_access.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_actuator.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_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_fcurve.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_fluidsim.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_group.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_image.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_internal.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_main.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_meta.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_modifier.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_nla.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_nodetree.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_object.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_object_force.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_render.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_sculpt_paint.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_sequence.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_smoke.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_sound.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_timeline.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ui.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ui_api.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_wm.c branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_world.c branches/soc-2009-imbusy/source/blender/nodes/CMakeLists.txt branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_at.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_compose.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_coord.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_distance.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_scale.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_util.c branches/soc-2009-imbusy/source/blender/nodes/intern/TEX_util.h branches/soc-2009-imbusy/source/blender/python/BPY_extern.h branches/soc-2009-imbusy/source/blender/python/epy_doc_gen.py branches/soc-2009-imbusy/source/blender/python/generic/BGL.c branches/soc-2009-imbusy/source/blender/python/generic/BGL.h branches/soc-2009-imbusy/source/blender/python/generic/Makefile branches/soc-2009-imbusy/source/blender/python/generic/euler.c branches/soc-2009-imbusy/source/blender/python/generic/matrix.c branches/soc-2009-imbusy/source/blender/python/generic/quat.c branches/soc-2009-imbusy/source/blender/python/generic/vector.c branches/soc-2009-imbusy/source/blender/python/intern/Makefile branches/soc-2009-imbusy/source/blender/python/intern/bpy_interface.c branches/soc-2009-imbusy/source/blender/python/intern/bpy_rna.c branches/soc-2009-imbusy/source/blender/python/intern/bpy_rna.h 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/render/extern/include/RE_pipeline.h branches/soc-2009-imbusy/source/blender/render/extern/include/RE_shader_ext.h branches/soc-2009-imbusy/source/blender/render/intern/source/convertblender.c branches/soc-2009-imbusy/source/blender/render/intern/source/pipeline.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/shadeoutput.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/render/intern/source/zbuf.c branches/soc-2009-imbusy/source/blender/windowmanager/CMakeLists.txt 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/Makefile branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm.c branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_event_system.c branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_files.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_window.c branches/soc-2009-imbusy/source/creator/CMakeLists.txt branches/soc-2009-imbusy/source/creator/creator.c branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/KX_BlenderSystem.h branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/Makefile branches/soc-2009-imbusy/source/gameengine/BlenderRoutines/SConscript branches/soc-2009-imbusy/source/gameengine/Converter/BL_ArmatureObject.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/soc-2009-imbusy/source/gameengine/Converter/BL_DeformableGameObject.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_MeshDeformer.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_ModifierDeformer.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_ShapeDeformer.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_SkinDeformer.h branches/soc-2009-imbusy/source/gameengine/Converter/BL_SkinMeshObject.h branches/soc-2009-imbusy/source/gameengine/Converter/BlenderWorldInfo.h branches/soc-2009-imbusy/source/gameengine/Converter/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/Converter/KX_BlenderScalarInterpolator.h branches/soc-2009-imbusy/source/gameengine/Converter/KX_BlenderSceneConverter.h branches/soc-2009-imbusy/source/gameengine/Converter/KX_ConvertActuators.cpp branches/soc-2009-imbusy/source/gameengine/Converter/Makefile branches/soc-2009-imbusy/source/gameengine/Converter/SConscript branches/soc-2009-imbusy/source/gameengine/Expressions/BoolValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/ConstExpr.h branches/soc-2009-imbusy/source/gameengine/Expressions/EmptyValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/ErrorValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/Expression.h branches/soc-2009-imbusy/source/gameengine/Expressions/FloatValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/IdentifierExpr.h branches/soc-2009-imbusy/source/gameengine/Expressions/IfExpr.h branches/soc-2009-imbusy/source/gameengine/Expressions/InputParser.h branches/soc-2009-imbusy/source/gameengine/Expressions/IntValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/KX_HashedPtr.h branches/soc-2009-imbusy/source/gameengine/Expressions/KX_Python.h branches/soc-2009-imbusy/source/gameengine/Expressions/Operator1Expr.h branches/soc-2009-imbusy/source/gameengine/Expressions/Operator2Expr.h branches/soc-2009-imbusy/source/gameengine/Expressions/PyObjectPlus.h branches/soc-2009-imbusy/source/gameengine/Expressions/StringValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/Value.h branches/soc-2009-imbusy/source/gameengine/Expressions/VectorValue.h branches/soc-2009-imbusy/source/gameengine/Expressions/VoidValue.h branches/soc-2009-imbusy/source/gameengine/GameLogic/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_ActuatorEventManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_AlwaysEventManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_EventManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_ExpressionController.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_IActuator.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_IInputDevice.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_IScene.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_JoystickManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_KeyboardManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_LogicManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_MouseManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_PropertyEventManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_RandomEventManager.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h branches/soc-2009-imbusy/source/gameengine/GameLogic/SCA_TimeEventManager.h branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/Makefile branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/SConscript branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/unix/Makefile branches/soc-2009-imbusy/source/gameengine/GamePlayer/common/windows/Makefile branches/soc-2009-imbusy/source/gameengine/GamePlayer/ghost/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/GamePlayer/ghost/GPG_Application.cpp branches/soc-2009-imbusy/source/gameengine/GamePlayer/ghost/Makefile branches/soc-2009-imbusy/source/gameengine/GamePlayer/ghost/SConscript branches/soc-2009-imbusy/source/gameengine/GamePlayer/netscape/src/Makefile branches/soc-2009-imbusy/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile branches/soc-2009-imbusy/source/gameengine/Ketsji/BL_BlenderShader.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/BL_BlenderShader.h branches/soc-2009-imbusy/source/gameengine/Ketsji/BL_Material.h branches/soc-2009-imbusy/source/gameengine/Ketsji/BL_Shader.h branches/soc-2009-imbusy/source/gameengine/Ketsji/BL_Texture.h branches/soc-2009-imbusy/source/gameengine/Ketsji/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_BlenderMaterial.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_BlenderMaterial.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_BulletPhysicsController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_CameraIpoSGController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ClientObjectInfo.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_Dome.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_EmptyObject.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_IInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_IPO_SGController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_IPhysicsController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_IScalarInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ISceneConverter.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ISystem.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_LightIpoSGController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_MaterialIpoController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_MotionState.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ObColorIpoSGController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_OrientationInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_PolygonMaterial.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_PolygonMaterial.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_PositionInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_PythonInitTypes.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_RayCast.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_RayEventManager.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_SG_NodeRelationships.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ScalarInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_ScalingInterpolator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_SoundActuator.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_SoundActuator.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_TimeCategoryLogger.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_TimeLogger.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_TouchEventManager.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_WorldInfo.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_WorldIpoController.h branches/soc-2009-imbusy/source/gameengine/Ketsji/Makefile branches/soc-2009-imbusy/source/gameengine/Ketsji/SConscript branches/soc-2009-imbusy/source/gameengine/Makefile branches/soc-2009-imbusy/source/gameengine/Network/NG_NetworkDeviceInterface.h branches/soc-2009-imbusy/source/gameengine/Network/NG_NetworkMessage.h branches/soc-2009-imbusy/source/gameengine/Network/NG_NetworkObject.h branches/soc-2009-imbusy/source/gameengine/Network/NG_NetworkScene.h branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/CcdGraphicController.h branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/Makefile branches/soc-2009-imbusy/source/gameengine/Physics/Bullet/SConscript branches/soc-2009-imbusy/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h branches/soc-2009-imbusy/source/gameengine/Physics/common/Makefile branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IController.h branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IGraphicController.h branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IMotionState.h branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IPhysicsController.h branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h branches/soc-2009-imbusy/source/gameengine/Physics/common/PHY_IVehicle.h branches/soc-2009-imbusy/source/gameengine/PyDoc/GameLogic.py branches/soc-2009-imbusy/source/gameengine/PyDoc/GameTypes.py branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_2DFilterManager.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_BucketManager.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_Deformer.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_FramingManager.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_ICanvas.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_IRasterizer.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_IRenderTools.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_MaterialBucket.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_MeshObject.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_Polygon.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_Rect.h branches/soc-2009-imbusy/source/gameengine/Rasterizer/RAS_TexVert.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_BBox.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_Controller.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_DList.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_IObject.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_Node.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_ParentRelation.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_QList.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_Spatial.h branches/soc-2009-imbusy/source/gameengine/SceneGraph/SG_Tree.h branches/soc-2009-imbusy/source/gameengine/VideoTexture/CMakeLists.txt branches/soc-2009-imbusy/source/gameengine/VideoTexture/Makefile branches/soc-2009-imbusy/source/gameengine/VideoTexture/SConscript branches/soc-2009-imbusy/source/kernel/gen_system/SYS_SingletonSystem.cpp branches/soc-2009-imbusy/source/kernel/gen_system/SYS_SingletonSystem.h branches/soc-2009-imbusy/source/nan_compile.mk branches/soc-2009-imbusy/source/nan_definitions.mk branches/soc-2009-imbusy/source/nan_link.mk branches/soc-2009-imbusy/tools/Blender.py branches/soc-2009-imbusy/tools/btools.py Added Paths: ----------- branches/soc-2009-imbusy/intern/audaspace/intern/AUD_C-API.h branches/soc-2009-imbusy/intern/audaspace/jack/ branches/soc-2009-imbusy/intern/audaspace/jack/AUD_JackDevice.cpp branches/soc-2009-imbusy/intern/audaspace/jack/AUD_JackDevice.h branches/soc-2009-imbusy/intern/audaspace/jack/Makefile branches/soc-2009-imbusy/intern/audaspace/make/ branches/soc-2009-imbusy/intern/audaspace/make/msvc_9_0/ branches/soc-2009-imbusy/intern/audaspace/make/msvc_9_0/audaspace.vcproj branches/soc-2009-imbusy/intern/guardedalloc/cpp/ branches/soc-2009-imbusy/intern/guardedalloc/cpp/mallocn.cpp branches/soc-2009-imbusy/release/ui/space_time.py branches/soc-2009-imbusy/release/ui/space_userpref.py branches/soc-2009-imbusy/source/blender/blenkernel/BKE_paint.h branches/soc-2009-imbusy/source/blender/blenkernel/BKE_unit.h branches/soc-2009-imbusy/source/blender/blenkernel/intern/paint.c branches/soc-2009-imbusy/source/blender/blenkernel/intern/unit.c branches/soc-2009-imbusy/source/blender/editors/animation/anim_channels_defines.c branches/soc-2009-imbusy/source/blender/editors/animation/anim_channels_edit.c branches/soc-2009-imbusy/source/blender/editors/space_userpref/ branches/soc-2009-imbusy/source/blender/editors/space_userpref/Makefile branches/soc-2009-imbusy/source/blender/editors/space_userpref/SConscript branches/soc-2009-imbusy/source/blender/editors/space_userpref/space_userpref.c branches/soc-2009-imbusy/source/blender/editors/space_userpref/userpref_intern.h branches/soc-2009-imbusy/source/blender/editors/space_userpref/userpref_ops.c Removed Paths: ------------- branches/soc-2009-imbusy/intern/SoundSystem/ branches/soc-2009-imbusy/intern/audaspace/AUD_C-API.h branches/soc-2009-imbusy/intern/audaspace/jack/AUD_JackDevice.cpp branches/soc-2009-imbusy/intern/audaspace/jack/AUD_JackDevice.h branches/soc-2009-imbusy/intern/audaspace/jack/Makefile branches/soc-2009-imbusy/intern/audaspace/make/msvc_9_0/ branches/soc-2009-imbusy/intern/audaspace/make/msvc_9_0/audaspace.vcproj branches/soc-2009-imbusy/intern/guardedalloc/cpp/mallocn.cpp branches/soc-2009-imbusy/source/blender/editors/animation/anim_channels.c branches/soc-2009-imbusy/source/blender/editors/space_userpref/Makefile branches/soc-2009-imbusy/source/blender/editors/space_userpref/SConscript branches/soc-2009-imbusy/source/blender/editors/space_userpref/space_userpref.c branches/soc-2009-imbusy/source/blender/editors/space_userpref/userpref_intern.h branches/soc-2009-imbusy/source/blender/editors/space_userpref/userpref_ops.c branches/soc-2009-imbusy/source/gameengine/Expressions/KX_Python_dynamic.h branches/soc-2009-imbusy/source/gameengine/Expressions/KX_Python_static.h branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_CDActuator.cpp branches/soc-2009-imbusy/source/gameengine/Ketsji/KX_CDActuator.h Modified: branches/soc-2009-imbusy/CMake/macros.cmake =================================================================== --- branches/soc-2009-imbusy/CMake/macros.cmake 2009-08-18 17:01:59 UTC (rev 22606) +++ branches/soc-2009-imbusy/CMake/macros.cmake 2009-08-18 18:06:11 UTC (rev 22607) @@ -42,17 +42,37 @@ 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(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) + + LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) + + IF(WITH_PYTHON) + LINK_DIRECTORIES(${PYTHON_LIBPATH}) + ENDIF(WITH_PYTHON) 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_FFMPEG) + LINK_DIRECTORIES(${FFMPEG_LIBPATH}) + ENDIF(WITH_FFMPEG) + IF(WITH_OPENEXR) + LINK_DIRECTORIES(${OPENEXR_LIBPATH}) + ENDIF(WITH_OPENEXR) + IF(WITH_QUICKTIME) + LINK_DIRECTORIES(${QUICKTIME_LIBPATH}) + ENDIF(WITH_QUICKTIME) 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) + ENDIF(WITH_FFTW3) IF(WIN32) LINK_DIRECTORIES(${PTHREADS_LIBPATH}) @@ -62,48 +82,45 @@ 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} ${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 - IF(WIN32) - - TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) - - TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) - + TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) ELSE(WIN32) - - TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) - + TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) ENDIF(WIN32) + + 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}) - - 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}) - # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions IF(WIN32) - - TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) - - TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) - - ELSE(WIN32) - - TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) - + TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) + ELSE(WIN32) + TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) ENDIF(WIN32) IF(WITH_INTERNATIONAL) 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_FFTW3) + TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB}) + ENDIF(WITH_FFTW3) + 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) @@ -120,3 +137,4 @@ TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB}) ENDIF(WIN32) ENDMACRO(SETUP_LIBLINKS) + Modified: branches/soc-2009-imbusy/CMakeLists.txt =================================================================== --- branches/soc-2009-imbusy/CMakeLists.txt 2009-08-18 17:01:59 UTC (rev 22606) +++ branches/soc-2009-imbusy/CMakeLists.txt 2009-08-18 18:06:11 UTC (rev 22607) @@ -53,22 +53,25 @@ #----------------------------------------------------------------------------- # Set default config options -OPTION(WITH_PLAYER "Build Player" OFF) -OPTION(WITH_GAMEENGINE "Enable Game Engine" ON) -OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) -OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) -OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) -OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) -OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) -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) -OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF) -OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF) +OPTION(WITH_PLAYER "Build Player" OFF) +OPTION(WITH_GAMEENGINE "Enable Game Engine" ON) +OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) +OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) +OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) +OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) +OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) +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) +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_CXX_GUARDEDALLOC "" 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 +97,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 +119,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 +167,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 +184,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") + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs