[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23647] branches/soc-2009-jaguarandi: svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Andre Susano Pinto
andresusanopinto at gmail.com
Tue Oct 6 03:58:28 CEST 2009
Revision: 23647
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23647
Author: jaguarandi
Date: 2009-10-06 03:58:22 +0200 (Tue, 06 Oct 2009)
Log Message:
-----------
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/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/win64-vc-config.py
branches/soc-2009-jaguarandi/extern/bullet2/CMakeLists.txt
branches/soc-2009-jaguarandi/extern/bullet2/src/SConscript
branches/soc-2009-jaguarandi/extern/ffmpeg/SConscript
branches/soc-2009-jaguarandi/extern/lzma/SConscript
branches/soc-2009-jaguarandi/extern/lzo/SConscript
branches/soc-2009-jaguarandi/extern/x264/SConscript
branches/soc-2009-jaguarandi/extern/xvidcore/SConscript
branches/soc-2009-jaguarandi/intern/ghost/CMakeLists.txt
branches/soc-2009-jaguarandi/intern/ghost/GHOST_C-api.h
branches/soc-2009-jaguarandi/intern/ghost/GHOST_IWindow.h
branches/soc-2009-jaguarandi/intern/ghost/GHOST_Types.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_DisplayManager.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowManager.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowManager.h
branches/soc-2009-jaguarandi/intern/guardedalloc/intern/mallocn.c
branches/soc-2009-jaguarandi/intern/smoke/SConscript
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2009-jaguarandi/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/render/BRE_render.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/soc-2009-jaguarandi/release/scripts/io/netrender/client.py
branches/soc-2009-jaguarandi/release/scripts/io/netrender/master.py
branches/soc-2009-jaguarandi/release/scripts/io/netrender/master_html.py
branches/soc-2009-jaguarandi/release/scripts/io/netrender/model.py
branches/soc-2009-jaguarandi/release/scripts/io/netrender/slave.py
branches/soc-2009-jaguarandi/release/scripts/modules/bpy_ops.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_data_bone.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_data_lamp.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_material.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_object.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_object_constraint.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_particle.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_physics_cloth.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_physics_field.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_physics_softbody.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_texture.py
branches/soc-2009-jaguarandi/release/scripts/ui/space_info.py
branches/soc-2009-jaguarandi/release/scripts/ui/space_userpref.py
branches/soc-2009-jaguarandi/release/scripts/ui/space_view3d.py
branches/soc-2009-jaguarandi/source/Makefile
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_blender.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_collision.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_effect.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_image.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_node.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_paint.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/action.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/boids.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cloth.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/collision.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/customdata.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/effect.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/image.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/implicit.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/ipo.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/lattice.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/library.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/nla.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/sequence.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/texture.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/world.c
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_threads.h
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/dynlib.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/threads.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/util.c
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/blenpluginapi/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenpluginapi/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/animation/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_markers.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyingsets.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/armature/armature_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-jaguarandi/source/blender/editors/include/BIF_glutil.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_image.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_mesh.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_particle.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_physics.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_transform.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface_icons.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/SConscript
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_icons.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_templates.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/resources.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editface.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/loopcut.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/object/object_add.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/physics/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/physics/physics_intern.h
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/glutil.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screendump.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_console/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_file/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/space_file.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/writeimage.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_utils.c
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_image/image_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/space_image.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_node/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/space_node.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-jaguarandi/source/blender/editors/space_script/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_sound/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_text/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/SConscript
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_header.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.h
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_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_snap.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_material.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_action_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_anim_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_customdata_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_texture_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_animation.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_boid.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_image.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal.h
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_mesh.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_mesh_api.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_particle.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.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_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/nodes/SConscript
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_util.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_util.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_util.h
branches/soc-2009-jaguarandi/source/blender/python/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/python/generic/matrix.c
branches/soc-2009-jaguarandi/source/blender/render/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/render/SConscript
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/render_types.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/volume_precache.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/volumetric.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/renderdatabase.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/sss.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/texture.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/volume_precache.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/volumetric.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/voxeldata.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/windowmanager/SConscript
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_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_jobs.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/wm_subwindow.h
branches/soc-2009-jaguarandi/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2009-jaguarandi/source/creator/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/SConscript
branches/soc-2009-jaguarandi/source/gameengine/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureChannel.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_ConvertControllers.h
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2009-jaguarandi/source/gameengine/Converter/SConscript
branches/soc-2009-jaguarandi/source/gameengine/Expressions/BoolValue.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/BoolValue.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/FloatValue.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/IntValue.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/IntValue.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/KX_Python.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/ListValue.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/ListValue.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/SConscript
branches/soc-2009-jaguarandi/source/gameengine/Expressions/StringValue.h
branches/soc-2009-jaguarandi/source/gameengine/Expressions/Value.cpp
branches/soc-2009-jaguarandi/source/gameengine/Expressions/Value.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_NORController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ORController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_XORController.cpp
branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SConscript
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/SConscript
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Light.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PyConstraintBinding.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInitTypes.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonSeq.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/SConscript
branches/soc-2009-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2009-jaguarandi/source/gameengine/Physics/Bullet/SConscript
branches/soc-2009-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2009-jaguarandi/source/gameengine/Rasterizer/SConscript
branches/soc-2009-jaguarandi/source/gameengine/SConscript
branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/SConscript
branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2009-jaguarandi/tools/Blender.py
Added Paths:
-----------
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2009-jaguarandi/release/scripts/io/export_3ds.py
branches/soc-2009-jaguarandi/release/scripts/io/export_fbx.py
branches/soc-2009-jaguarandi/release/scripts/io/export_obj.py
branches/soc-2009-jaguarandi/release/scripts/io/export_x3d.py
branches/soc-2009-jaguarandi/release/scripts/io/import_3ds.py
branches/soc-2009-jaguarandi/release/scripts/io/import_obj.py
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_physics_common.py
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_render.h
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_data.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/particle_boids.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/particle_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/particle_object.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/physics_fluid.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/physics_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/physics_pointcache.c
branches/soc-2009-jaguarandi/source/blender/editors/render/
branches/soc-2009-jaguarandi/source/blender/editors/render/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/render/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/render/render_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/render/render_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/render/render_preview.c
branches/soc-2009-jaguarandi/source/blender/editors/render/render_shading.c
branches/soc-2009-jaguarandi/source/blender/gpu/gpu_buffers.h
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_buffers.c
Removed Paths:
-------------
branches/soc-2009-jaguarandi/release/scripts/io/export_3ds.py
branches/soc-2009-jaguarandi/release/scripts/io/export_fbx.py
branches/soc-2009-jaguarandi/release/scripts/io/export_obj.py
branches/soc-2009-jaguarandi/release/scripts/io/export_x3d.py
branches/soc-2009-jaguarandi/release/scripts/io/import_3ds.py
branches/soc-2009-jaguarandi/release/scripts/io/import_obj.py
branches/soc-2009-jaguarandi/source/.obj.Makefile
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_layers.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_fluidsim.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/
branches/soc-2009-jaguarandi/source/blender/editors/render/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/render/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/render/render_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/render/render_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/render/render_preview.c
branches/soc-2009-jaguarandi/source/blender/editors/render/render_shading.c
Property Changed:
----------------
branches/soc-2009-jaguarandi/extern/binreloc/SConscript
branches/soc-2009-jaguarandi/extern/glew/SConscript
branches/soc-2009-jaguarandi/extern/libmp3lame/SConscript
branches/soc-2009-jaguarandi/extern/libopenjpeg/SConscript
branches/soc-2009-jaguarandi/extern/libredcode/SConscript
branches/soc-2009-jaguarandi/extern/lzma/SConscript
branches/soc-2009-jaguarandi/extern/lzo/SConscript
branches/soc-2009-jaguarandi/extern/x264/SConscript
branches/soc-2009-jaguarandi/extern/xvidcore/SConscript
branches/soc-2009-jaguarandi/intern/audaspace/SConscript
branches/soc-2009-jaguarandi/intern/itasc/SConscript
branches/soc-2009-jaguarandi/intern/smoke/SConscript
branches/soc-2009-jaguarandi/release/scripts/modules/autocomplete.py
branches/soc-2009-jaguarandi/release/scripts/modules/bpy_sys.py
branches/soc-2009-jaguarandi/source/blender/blenfont/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/animation/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/armature/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/curve/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/datafiles/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/interface/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/mesh/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/metaball/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/object/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/physics/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/screen/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/sound/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_action/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_api/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_console/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_file/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_image/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_info/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_logic/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_node/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_script/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_sound/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_text/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_time/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/transform/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/util/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/SConscript
branches/soc-2009-jaguarandi/source/blender/gpu/SConscript
branches/soc-2009-jaguarandi/source/blender/ikplugin/SConscript
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/dds/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/SConscript
branches/soc-2009-jaguarandi/source/blender/python/SConscript
branches/soc-2009-jaguarandi/source/blender/windowmanager/SConscript
branches/soc-2009-jaguarandi/source/gameengine/PyDoc/SConscript
branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/SConscript
Modified: branches/soc-2009-jaguarandi/CMake/macros.cmake
===================================================================
--- branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-10-06 01:58:22 UTC (rev 23647)
@@ -85,33 +85,32 @@
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_LIBRARY} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${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})
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
- ENDIF(WIN32)
+ IF(WITH_PYTHON)
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${LLIBS})
+ 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})
+ ENDIF(WIN32)
+ ENDIF(WITH_PYTHON)
+
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
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
-
- 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})
- ENDIF(WIN32)
-
IF(WITH_INTERNATIONAL)
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+
+ IF(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+ ENDIF(WIN32)
ENDIF(WITH_INTERNATIONAL)
+
IF(WITH_OPENAL)
TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
ENDIF(WITH_OPENAL)
@@ -127,9 +126,6 @@
IF(WITH_SDL)
TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
ENDIF(WITH_SDL)
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
- ENDIF(WIN32)
IF(WITH_QUICKTIME)
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
ENDIF(WITH_QUICKTIME)
Modified: branches/soc-2009-jaguarandi/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/CMakeLists.txt 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/CMakeLists.txt 2009-10-06 01:58:22 UTC (rev 23647)
@@ -81,6 +81,10 @@
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+IF (APPLE)
+OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" OFF)
+ENDIF (APPLE)
+
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -402,6 +406,7 @@
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
+ SET(OPENAL_INCLUDE_DIR "${OPENAL_INCLUDE_DIR};${LIBDIR}/openal/include")
ELSE(OPENAL_FOUND)
SET(WITH_OPENAL OFF)
ENDIF(OPENAL_FOUND)
@@ -485,9 +490,13 @@
SET(LLIBS stdc++ SystemStubs)
+ IF (WITH_COCOA)
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DGHOST_COCOA")
+ SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ ELSE (WITH_COCOA)
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
-
+ ENDIF (WITH_COCOA)
IF(WITH_OPENMP)
SET(LLIBS "${LLIBS} -lgomp ")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
Modified: branches/soc-2009-jaguarandi/SConstruct
===================================================================
--- branches/soc-2009-jaguarandi/SConstruct 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/SConstruct 2009-10-06 01:58:22 UTC (rev 23647)
@@ -643,7 +643,6 @@
except: epydoc = None
if epydoc:
- SConscript('source/blender/python/api2_2x/doc/SConscript')
SConscript('source/gameengine/PyDoc/SConscript')
else:
print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
Modified: branches/soc-2009-jaguarandi/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-jaguarandi/config/win64-vc-config.py 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/config/win64-vc-config.py 2009-10-06 01:58:22 UTC (rev 23647)
@@ -164,7 +164,7 @@
CFLAGS = []
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE2']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
Property changes on: branches/soc-2009-jaguarandi/extern/binreloc/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/soc-2009-jaguarandi/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/extern/bullet2/CMakeLists.txt 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/extern/bullet2/CMakeLists.txt 2009-10-06 01:58:22 UTC (rev 23647)
@@ -32,14 +32,12 @@
src/BulletCollision/CollisionShapes/*.cpp
src/BulletCollision/NarrowPhaseCollision/*.cpp
src/BulletCollision/Gimpact/*.cpp
- src/BulletCollision//CollisionDispatch/*.cpp
+ src/BulletCollision/CollisionDispatch/*.cpp
src/BulletDynamics/ConstraintSolver/*.cpp
src/BulletDynamics/Vehicle/*.cpp
src/BulletDynamics/Dynamics/*.cpp
src/BulletSoftBody/*.cpp
)
-ADD_DEFINITIONS(-D_LIB)
-
BLENDERLIB(extern_bullet "${SRC}" "${INC}")
-#, libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+
Modified: branches/soc-2009-jaguarandi/extern/bullet2/src/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/extern/bullet2/src/SConscript 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/extern/bullet2/src/SConscript 2009-10-06 01:58:22 UTC (rev 23647)
@@ -4,11 +4,11 @@
Import('env')
-defs = 'USE_DOUBLES QHULL _LIB'
+defs = ''
cflags = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+ defs += ' WIN32 NDEBUG _WINDOWS'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
elif env['OURPLATFORM']=='win32-mingw':
Modified: branches/soc-2009-jaguarandi/extern/ffmpeg/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/extern/ffmpeg/SConscript 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/extern/ffmpeg/SConscript 2009-10-06 01:58:22 UTC (rev 23647)
@@ -28,7 +28,7 @@
from sets import Set
-ff_env = env.Copy();
+ff_env = env.Clone()
ff_env.Replace(CCFLAGS = '')
ff_env.Replace(BF_DEBUG_FLAGS = '')
Property changes on: branches/soc-2009-jaguarandi/extern/glew/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-jaguarandi/extern/libmp3lame/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-jaguarandi/extern/libopenjpeg/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-jaguarandi/extern/libredcode/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/soc-2009-jaguarandi/extern/lzma/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/extern/lzma/SConscript 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/extern/lzma/SConscript 2009-10-06 01:58:22 UTC (rev 23647)
@@ -1,9 +1,9 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('./*.c')
-
-defs = ''
-incs = ' . '
-
-env.BlenderLib ('bf_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('./*.c')
+
+defs = ''
+incs = ' . '
+
+env.BlenderLib ('bf_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
Property changes on: branches/soc-2009-jaguarandi/extern/lzma/SConscript
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/soc-2009-jaguarandi/extern/lzo/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/extern/lzo/SConscript 2009-10-06 00:28:07 UTC (rev 23646)
+++ branches/soc-2009-jaguarandi/extern/lzo/SConscript 2009-10-06 01:58:22 UTC (rev 23647)
@@ -1,9 +1,9 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('minilzo/*.c')
-
-defs = ''
-incs = ' include '
-
-env.BlenderLib ('bf_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('minilzo/*.c')
+
+defs = ''
+incs = ' include '
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list